From 8359b14931d0996b86c56461170900d6cc126813 Mon Sep 17 00:00:00 2001 From: dadaloop82 Date: Thu, 30 Apr 2026 05:21:50 +0000 Subject: [PATCH 01/16] Banner: adapt expired icon/color/title to safety level (non-alarmist) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ok level (long-life/freezer safe): green banner, βœ… icon, 'Scaduto (ancora ok)' - warning level: amber banner, πŸ‘€ icon, 'Scaduto (controlla)' - danger level: unchanged red 🚫 banner - Added banner-expired-ok / banner-expired-warning CSS variants - Added expiry.expired_suffix_ok / expired_suffix_warning i18n keys (IT/EN/DE) - Updated README and CHANGELOG --- CHANGELOG.md | 10 ++++++++++ README.md | 5 +++-- assets/css/style.css | 22 ++++++++++++++++++++++ assets/js/app.js | 21 ++++++++++++++++----- translations/de.json | 2 ++ translations/en.json | 2 ++ translations/it.json | 2 ++ 7 files changed, 57 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b7bb16..4654f4e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,16 @@ All notable changes to EverShelf will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [Unreleased] - 2026-04-30 + +### Changed +- **Non-alarmist expired banner** β€” Banner icon, CSS class, and title suffix now adapt to the `getExpiredSafety()` level: + - `ok` (long-life products, freezer within margin): green banner, βœ… icon, "β€” Scaduto (ancora ok)" + - `warning` (items that should be inspected): amber/yellow banner, πŸ‘€ icon, "β€” Scaduto (controlla)" + - `danger` (raw meat, dairy, fish, etc.): unchanged red 🚫 banner and "β€” Scaduto!" title +- Added `expiry.expired_suffix_ok` and `expiry.expired_suffix_warning` i18n keys to all three language files (IT/EN/DE) +- Added `banner-expired-ok` and `banner-expired-warning` CSS variants (green / amber) in `style.css` + ## [1.5.0] - 2026-04-28 ### Added diff --git a/README.md b/README.md index 746282e..797ac7e 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,9 @@ --- -## 🌍 Recent i18n Updates +## 🌍 Recent Updates +- **Non-alarmist expired banner** β€” The expired-product banner now adapts its icon, colour, and title to the actual safety level: green βœ… for long-life products that are still safe, amber πŸ‘€ for items that should be checked, and the original red 🚫 only for genuinely dangerous items (raw meat, dairy, fish). Low-risk products like canned tomatoes or pasta are no longer shown with a scary red banner. - Recipe and meal-plan labels now resolve at runtime from translations, preventing raw placeholders like `meal_types.*` and `meal_plan_types.*` from appearing in the UI. - Recipe generation now receives the selected app language (`it`/`en`/`de`) and enforces localized output in both streaming and non-streaming API flows. - Added missing shared error keys (`error.network`, `error.no_api_key`) across all language files to keep fallback/error toasts fully translated. @@ -64,7 +65,7 @@ - **Opened products panel** β€” Tracks partially-used items; expiry is recalculated from the opening date using AI (Gemini) + per-category rule fallback; whole sealed packages always keep their original manufacturer expiry; conf items with mixed whole + fractional units are shown as two separate entries - **Freezer shelf-life** β€” Granular per-product estimates (USDA/EFSA): fish 120 d, poultry 270 d, whole red-meat cuts 365 d, mince 120 d, vegetables/fruit 270 d, generic 180 d; AI + cache still take priority over rules - **Safety ratings** β€” Smart assessment of expired product safety (by category and location); expired unsafe items shown with a red danger banner and "L'ho buttato" as the primary action -- **Expired product banner** β€” Products that have passed their effective shelf-life (including opened-product reduced expiry) appear in the top notification banner with safety tip, danger styling for high-risk items, and a prominent discard action +- **Expired product banner** β€” Products that have passed their effective shelf-life (including opened-product reduced expiry) appear in the top notification banner; icon, colour and title adapt to the actual safety level (βœ… green for safe, πŸ‘€ amber to check, 🚫 red for danger); high-risk items get a prominent discard action - **Quick recipe bar** β€” One-tap recipe suggestion using expiring products - **Anomaly banner** β€” Scrollable banner with suspicious quantities and consumption prediction mismatches, with one-tap correction or inline edit - **Expired/expiring alerts** β€” Priority-sorted banner notifications for expired and soon-to-expire products with use, throw, edit, and dismiss actions diff --git a/assets/css/style.css b/assets/css/style.css index 5ebdf2a..5b8cefe 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -5641,6 +5641,28 @@ body { background: #fee2e2; color: #dc2626; } +.alert-banner.banner-expired-ok { + background: linear-gradient(135deg, #f0fdf4 0%, #dcfce7 100%); + border-color: #16a34a; +} +.banner-expired-ok .alert-banner-title { + color: #14532d; +} +.banner-expired-ok .alert-banner-counter { + color: #15803d; +} +.banner-expired-ok .banner-dot.active { background: #16a34a; } +.alert-banner.banner-expired-warning { + background: linear-gradient(135deg, #fffbeb 0%, #fef3c7 100%); + border-color: #d97706; +} +.banner-expired-warning .alert-banner-title { + color: #78350f; +} +.banner-expired-warning .alert-banner-counter { + color: #92400e; +} +.banner-expired-warning .banner-dot.active { background: #d97706; } .alert-banner.banner-expired-danger { background: linear-gradient(135deg, #fca5a5 0%, #f87171 100%); border-color: #b91c1c; diff --git a/assets/js/app.js b/assets/js/app.js index 2f1a433..f0096aa 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -2840,11 +2840,22 @@ function renderBannerItem() { ? t('expiry.expired_today_long') : t('expiry.expired_ago_long').replace('{n}', item.days_expired); const safety = getExpiredSafety(item, item.days_expired); - banner.className = safety.level === 'danger' - ? 'alert-banner banner-expired banner-expired-danger' - : 'alert-banner banner-expired'; - iconEl.textContent = '🚫'; - titleEl.textContent = `${item.name}${item.brand ? ' (' + item.brand + ')' : ''} ${t('expiry.expired_suffix')}`; + if (safety.level === 'danger') { + banner.className = 'alert-banner banner-expired banner-expired-danger'; + iconEl.textContent = '🚫'; + } else if (safety.level === 'warning') { + banner.className = 'alert-banner banner-expired banner-expired-warning'; + iconEl.textContent = 'πŸ‘€'; + } else { + banner.className = 'alert-banner banner-expired banner-expired-ok'; + iconEl.textContent = 'βœ…'; + } + const expiredSuffix = safety.level === 'ok' + ? t('expiry.expired_suffix_ok') + : safety.level === 'warning' + ? t('expiry.expired_suffix_warning') + : t('expiry.expired_suffix'); + titleEl.textContent = `${item.name}${item.brand ? ' (' + item.brand + ')' : ''} ${expiredSuffix}`; const baseDetail = t('dashboard.banner_expired_detail').replace('{when}', daysText).replace('{qty}', qtyDisplay); detailEl.innerHTML = `${baseDetail} `; let btns = ''; diff --git a/translations/de.json b/translations/de.json index 81221ca..11b66fd 100644 --- a/translations/de.json +++ b/translations/de.json @@ -641,6 +641,8 @@ "expired_today_long": "Heute abgelaufen", "expired_ago_long": "Seit {n} Tagen abgelaufen", "expired_suffix": "β€” Abgelaufen!", + "expired_suffix_ok": "β€” Abgelaufen (noch ok)", + "expired_suffix_warning": "β€” Abgelaufen (erst prΓΌfen)", "days_compact": "{n}T" }, "status": { diff --git a/translations/en.json b/translations/en.json index 3b4cb5f..f05e281 100644 --- a/translations/en.json +++ b/translations/en.json @@ -640,6 +640,8 @@ "expired_today_long": "Expired today", "expired_ago_long": "Expired {n} days ago", "expired_suffix": "β€” Expired!", + "expired_suffix_ok": "β€” Expired (still ok)", + "expired_suffix_warning": "β€” Expired (check first)", "days_compact": "{n}d" }, "status": { diff --git a/translations/it.json b/translations/it.json index 2f8d458..9f2efd9 100644 --- a/translations/it.json +++ b/translations/it.json @@ -640,6 +640,8 @@ "expired_today_long": "Scaduto oggi", "expired_ago_long": "Scaduto da {n} giorni", "expired_suffix": "β€” Scaduto!", + "expired_suffix_ok": "β€” Scaduto (ancora ok)", + "expired_suffix_warning": "β€” Scaduto (controlla)", "days_compact": "{n}gg" }, "status": { From 4e583127dd3d43e5d0f9c5b5d537e58c61983631 Mon Sep 17 00:00:00 2001 From: dadaloop82 Date: Thu, 30 Apr 2026 05:28:43 +0000 Subject: [PATCH 02/16] Banner: suppress low-qty alert when sibling product entries exist elsewhere A partially-used fridge entry (e.g. 191 ml of milk) triggered a 'suspiciously low quantity' banner even when sealed packages of the same product were present in another location (e.g. pantry). Fix: before pushing a low-qty review alert, group all inventory rows by product key (barcode, or name+brand fallback). If any sibling entry for the same product has qty > 0 in a different row, skip the alert. High-qty and suspicious package-size alerts are unaffected. --- CHANGELOG.md | 3 +++ README.md | 1 + assets/js/app.js | 39 ++++++++++++++++++++++++++++++--------- 3 files changed, 34 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4654f4e..e86dcfc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] - 2026-04-30 +### Fixed +- **Low-qty banner false positive** β€” A "suspiciously low quantity" review alert is now suppressed for a partially-used inventory entry when one or more sibling entries for the same product (identified by barcode, or name+brand as fallback) exist in other locations with stock > 0. Prevents noise like "191 ml of milk" when 11 sealed packages are stored in the pantry. + ### Changed - **Non-alarmist expired banner** β€” Banner icon, CSS class, and title suffix now adapt to the `getExpiredSafety()` level: - `ok` (long-life products, freezer within margin): green banner, βœ… icon, "β€” Scaduto (ancora ok)" diff --git a/README.md b/README.md index 797ac7e..3b75426 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ ## 🌍 Recent Updates +- **Smarter low-quantity alerts** β€” The "suspiciously low quantity" banner is no longer raised for a partially-used entry (e.g. 191 ml of milk in the fridge) when the same product has stock in another location (e.g. 11 sealed packages in the pantry). Sibling entries are detected by barcode or name+brand. - **Non-alarmist expired banner** β€” The expired-product banner now adapts its icon, colour, and title to the actual safety level: green βœ… for long-life products that are still safe, amber πŸ‘€ for items that should be checked, and the original red 🚫 only for genuinely dangerous items (raw meat, dairy, fish). Low-risk products like canned tomatoes or pasta are no longer shown with a scary red banner. - Recipe and meal-plan labels now resolve at runtime from translations, preventing raw placeholders like `meal_types.*` and `meal_plan_types.*` from appearing in the UI. - Recipe generation now receives the selected app language (`it`/`en`/`de`) and enforces localized output in both streaming and non-streaming API flows. diff --git a/assets/js/app.js b/assets/js/app.js index f0096aa..50aeaff 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -2726,18 +2726,39 @@ async function loadBannerAlerts() { }); // 2. Suspicious quantities ("expiring soon" shown only in dashboard sections, not in banner) + // Group items by product identity to detect sibling entries in other locations. + // A "low quantity" alert is suppressed when other stock of the same product exists + // (e.g. 191 ml of milk in the fridge is fine if there are 11 sealed packages in the pantry). + const _productKey = item => item.barcode || `${item.name}||${item.brand || ''}`; + const _productGroups = {}; + items.forEach(item => { + const k = _productKey(item); + if (!_productGroups[k]) _productGroups[k] = []; + _productGroups[k].push(item); + }); + items.forEach(item => { if (confirmed[item.id]) return; - if (isSuspiciousQty(item.quantity, item.unit) || isSuspiciousDefaultQty(item.default_quantity, item.unit, item.package_unit)) { - const t_ = QTY_THRESHOLDS[item.unit] || QTY_THRESHOLDS['pz']; - const suspQty = isSuspiciousQty(item.quantity, item.unit); - const suspDq = isSuspiciousDefaultQty(item.default_quantity, item.unit, item.package_unit); - let warning; - if (suspDq && !suspQty) warning = 'πŸ“¦ Conf. sospetta'; - else if (parseFloat(item.quantity) < t_.min) warning = '⬇️ Troppo poco'; - else warning = '⬆️ Troppo'; - _bannerQueue.push({ type: 'review', data: { ...item, warning } }); + const t_ = QTY_THRESHOLDS[item.unit] || QTY_THRESHOLDS['pz']; + const qty = parseFloat(item.quantity); + const isLow = !isNaN(qty) && qty > 0 && qty < t_.min; + const isHigh = !isNaN(qty) && qty > t_.max; + const suspDq = isSuspiciousDefaultQty(item.default_quantity, item.unit, item.package_unit); + + if (!isLow && !isHigh && !suspDq) return; + + // Suppress low-qty warning when sibling entries for the same product exist + // in other locations β€” the user is simply tracking a partial/opened unit. + if (isLow && !isHigh && !suspDq) { + const siblings = (_productGroups[_productKey(item)] || []).filter(s => s.id !== item.id && parseFloat(s.quantity) > 0); + if (siblings.length > 0) return; } + + let warning; + if (suspDq && !isLow && !isHigh) warning = 'πŸ“¦ Conf. sospetta'; + else if (isLow) warning = '⬇️ Troppo poco'; + else warning = '⬆️ Troppo'; + _bannerQueue.push({ type: 'review', data: { ...item, warning } }); }); // 4. Consumption predictions that don't match actual quantity From c814d99d1f83e5705751c4bac145395027cedb11 Mon Sep 17 00:00:00 2001 From: dadaloop82 Date: Sun, 3 May 2026 13:12:35 +0000 Subject: [PATCH 03/16] feat: smart use-all context, scale baseline reset, freezer-ok alert suppression, conf qty fix, low-stock finish button MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - submitUseAll() now detects opened packages: if current location has an opened pack, finishes only that; if exactly one opened pack exists elsewhere, uses it automatically; multiple opened packs β†’ disambiguation modal - quickUse() resets scale baseline on page open so stale weight doesn't immediately trigger auto-fill - Expired alerts (dashboard + banner) now filter out freezer items within their safety window (level='ok') - Review banner: conf unit quantity displayed as sub-unit total (e.g. 800g) instead of raw pack count; high-qty threshold evaluated on sub-unit volume to prevent '400 confezioni' nonsense - Low-stock review banner gains 'È finito tutto' button β†’ new bannerFinishAll() handler - New _submitUseAllAt() helper and _showUseAllDisambiguation() modal - New translation keys: toast_opened_finished, disambiguation_hint, disambiguation_all, banner_review_action_finish (it/en/de) --- assets/js/app.js | 189 ++++++++++++++++++++++++++++++++++++++++--- translations/de.json | 6 +- translations/en.json | 6 +- translations/it.json | 6 +- 4 files changed, 192 insertions(+), 15 deletions(-) diff --git a/assets/js/app.js b/assets/js/app.js index 50aeaff..2a840f4 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -2477,12 +2477,16 @@ async function loadDashboard() { expiringSection.style.display = 'none'; } - // Expired items + // Expired items β€” items in the freezer that are still within the safety window are hidden const expiredSection = document.getElementById('alert-expired'); const expiredList = document.getElementById('expired-list'); - if (statsData.expired && statsData.expired.length > 0) { + const visibleExpired = (statsData.expired || []).filter(item => { + const days = Math.abs(daysUntilExpiry(item.expiry_date)); + return getExpiredSafety(item, days).level !== 'ok'; + }); + if (visibleExpired.length > 0) { expiredSection.style.display = 'block'; - expiredList.innerHTML = statsData.expired.map(item => { + expiredList.innerHTML = visibleExpired.map(item => { const days = Math.abs(daysUntilExpiry(item.expiry_date)); let daysText; if (days === 0) daysText = t('expiry.expired_today'); @@ -2722,6 +2726,8 @@ async function loadBannerAlerts() { } if (daysExpired === null) return; // not expired by any measure + // Skip items the freezer bonus still considers safe β€” no need to alarm the user + if (getExpiredSafety(item, daysExpired).level === 'ok') return; _bannerQueue.push({ type: 'expired', data: { ...item, days_expired: daysExpired } }); }); @@ -2741,8 +2747,25 @@ async function loadBannerAlerts() { if (confirmed[item.id]) return; const t_ = QTY_THRESHOLDS[item.unit] || QTY_THRESHOLDS['pz']; const qty = parseFloat(item.quantity); - const isLow = !isNaN(qty) && qty > 0 && qty < t_.min; - const isHigh = !isNaN(qty) && qty > t_.max; + let isLow = !isNaN(qty) && qty > 0 && qty < t_.min; + let isHigh = !isNaN(qty) && qty > t_.max; + + // For conf unit: evaluate thresholds on total sub-unit volume when possible, + // not on raw package count. "400 conf" with no package size is uninterpretable + // (could be grams entered with the wrong unit) β€” skip the high check. + if (item.unit === 'conf') { + const pkgSize = parseFloat(item.default_quantity); + if (pkgSize > 0 && item.package_unit) { + const totalSub = qty * pkgSize; + const subTh = QTY_THRESHOLDS[item.package_unit] || QTY_THRESHOLDS['pz']; + isLow = totalSub > 0 && totalSub < subTh.min; + isHigh = totalSub > subTh.max; + } else { + // No package size known β€” can't judge quantity; suppress high-qty noise + isHigh = false; + } + } + const suspDq = isSuspiciousDefaultQty(item.default_quantity, item.unit, item.package_unit); if (!isLow && !isHigh && !suspDq) return; @@ -2758,7 +2781,7 @@ async function loadBannerAlerts() { if (suspDq && !isLow && !isHigh) warning = 'πŸ“¦ Conf. sospetta'; else if (isLow) warning = '⬇️ Troppo poco'; else warning = '⬆️ Troppo'; - _bannerQueue.push({ type: 'review', data: { ...item, warning } }); + _bannerQueue.push({ type: 'review', data: { ...item, warning, _isLow: isLow } }); }); // 4. Consumption predictions that don't match actual quantity @@ -2893,17 +2916,25 @@ function renderBannerItem() { } else if (entry.type === 'review') { const item = entry.data; - const qtyDisplay = formatQuantity(item.quantity, item.unit, item.default_quantity, item.package_unit); + // For conf unit with known package size, display the sub-unit total (e.g., 800g) + // instead of a raw conf count that could be confused with "N confezioni". + let qtyDisplay; + if (item.unit === 'conf' && parseFloat(item.default_quantity) > 0 && item.package_unit) { + const totalSub = Math.round(parseFloat(item.quantity) * parseFloat(item.default_quantity)); + qtyDisplay = `${totalSub} ${item.package_unit}`; + } else { + qtyDisplay = formatQuantity(item.quantity, item.unit, item.default_quantity, item.package_unit); + } const suspDq = isSuspiciousDefaultQty(item.default_quantity, item.unit, item.package_unit); - const suspQty = isSuspiciousQty(item.quantity, item.unit); + const isLow = !!item._isLow; // set when banner item was built const t_ = QTY_THRESHOLDS[item.unit] || QTY_THRESHOLDS['pz']; banner.className = 'alert-banner'; iconEl.textContent = '⚠️'; let titleText, detailText; - if (suspDq && !suspQty) { + if (suspDq && !isLow) { titleText = `${t('dashboard.banner_review_unusual_pkg_title')}: ${item.name}${item.brand ? ' (' + item.brand + ')' : ''}`; detailText = t('dashboard.banner_review_unusual_pkg_detail', { qty: item.default_quantity, unit: item.package_unit }); - } else if (parseFloat(item.quantity) < t_.min) { + } else if (isLow) { titleText = `${t('dashboard.banner_review_low_qty_title')}: ${item.name}${item.brand ? ' (' + item.brand + ')' : ''}`; detailText = t('dashboard.banner_review_low_qty_detail', { qty: qtyDisplay }); } else { @@ -2913,6 +2944,9 @@ function renderBannerItem() { titleEl.textContent = titleText; detailEl.textContent = detailText; let btns = ``; + if (isLow) { + btns += ``; + } btns += ``; if (hasScale) { btns += ``; @@ -3103,6 +3137,25 @@ function bannerThrowAway() { dismissBannerItem(); } +function bannerFinishAll() { + const entry = _bannerQueue[_bannerIndex]; + if (!entry) return; + const item = entry.data; + dismissBannerItem(); + api('inventory_use', {}, 'POST', { + product_id: item.product_id, + use_all: true, + location: '__all__', + }).then(res => { + if (res.success) { + showToast(`πŸ“€ ${item.name} terminato!`, 'success'); + showLowStockBringPrompt(res, () => loadDashboard()); + } else { + showToast(res.error || 'Errore', 'error'); + } + }).catch(() => showToast(t('error.connection'), 'error')); +} + function editBannerExpiry() { const entry = _bannerQueue[_bannerIndex]; if (!entry || (entry.type !== 'expired' && entry.type !== 'expiring')) return; @@ -3649,6 +3702,17 @@ async function quickUse(productId, location) { }); renderUsePreview(); + + // Reset scale state so the stale weight already on the scale doesn't + // immediately trigger an auto-fill. Only a weight *change* (β‰₯10 g) after + // the page opens should be treated as a new product being placed. + _cancelScaleAutoConfirm(false); // stops timers, clears _scaleStabilityVal & _scaleLastConfirmedGrams + if (_scaleLatestWeight) { + const _baselineG = _scaleToGrams(parseFloat(_scaleLatestWeight.value), _scaleLatestWeight.unit); + if (_baselineG !== null && _baselineG >= 10) _scaleLastConfirmedGrams = _baselineG; + _scaleLatestWeight = null; // prevent immediate call inside loadUseInventoryInfo + } + loadUseInventoryInfo(); showLoading(false); showPage('use'); @@ -5942,6 +6006,7 @@ function renderUsePreview() { // Conf-mode tracking for USE form let _useConfMode = null; // null = normal, { packageSize, packageUnit, totalSub, unit } = conf mode active let _useNormalUnit = 'pz'; // unit when not in conf mode +let _useCurrentItems = []; // cached inventory items for the current product on the use page /** * Mostra un suggerimento giallo sotto le info inventario quando ci sono piΓΉ @@ -6018,6 +6083,7 @@ async function loadUseInventoryInfo() { try { const data = await api('inventory_list'); const items = (data.inventory || []).filter(i => i.product_id == currentProduct.id); + _useCurrentItems = items; // cache for submitUseAll context detection const infoEl = document.getElementById('use-inventory-info'); const unitSwitch = document.getElementById('use-unit-switch'); @@ -6573,14 +6639,47 @@ async function confirmMoveAfterUse(productId, fromLoc, toLoc, openedId) { async function submitUseAll() { showLoading(true); try { + const currentLoc = document.getElementById('use-location').value; + const items = _useCurrentItems.filter(i => parseFloat(i.quantity) > 0); + + const openedAtCurrentLoc = items.find(i => i.location === currentLoc && _isOpenedInventoryItem(i)); + const allOpened = items.filter(_isOpenedInventoryItem); + + let useLocation; + + if (openedAtCurrentLoc) { + // Opened package at the currently selected location β†’ finish only the opened item. + // The PHP backend fetches fractional (opened) rows first, so use_all on a specific + // location will clear the opened row and leave sealed packages untouched. + useLocation = currentLoc; + } else if (allOpened.length === 1) { + // One opened package somewhere else β†’ almost certainly this is what the user means + useLocation = allOpened[0].location; + } else if (allOpened.length > 1) { + // Multiple opened packages at different locations β†’ ask the user + showLoading(false); + _showUseAllDisambiguation(allOpened, items); + return; + } else { + // No opened packages anywhere β†’ finish everything (original behaviour) + useLocation = '__all__'; + } + + const isOpenedFinish = useLocation !== '__all__' && items.some( + i => i.location === useLocation && _isOpenedInventoryItem(i) + ); + const result = await api('inventory_use', {}, 'POST', { product_id: currentProduct.id, use_all: true, - location: '__all__', + location: useLocation, }); showLoading(false); if (result.success) { - showToast(`πŸ“€ ${currentProduct.name} terminato!`, 'success'); + const toastMsg = isOpenedFinish + ? `πŸ”“ ${t('use.toast_opened_finished').replace('{name}', currentProduct.name)}` + : `πŸ“€ ${currentProduct.name} terminato!`; + showToast(toastMsg, 'success'); if (result.added_to_bring) { setTimeout(() => showToast(t('use.toast_bring'), 'info'), 1500); } @@ -6595,6 +6694,72 @@ async function submitUseAll() { } } +/** + * Show a modal asking which opened package to mark as finished. + * Called when multiple opened packages exist across different locations. + */ +function _showUseAllDisambiguation(openedItems, allItems) { + const contentEl = document.getElementById('modal-content'); + const locButtons = openedItems.map(item => { + const locInfo = LOCATIONS[item.location] || { icon: 'πŸ“¦', label: item.location }; + const qtyStr = formatQuantity(parseFloat(item.quantity), item.unit, item.default_quantity, item.package_unit); + return ``; + }).join(''); + + // Option to finish everything + const totalQty = allItems.reduce((s, i) => s + parseFloat(i.quantity), 0); + const unit = allItems[0]?.unit || 'pz'; + const defaultQty = allItems[0]?.default_quantity; + const pkgUnit = allItems[0]?.package_unit; + const totalStr = formatQuantity(totalQty, unit, defaultQty, pkgUnit); + + contentEl.innerHTML = ` +
+

${t('use.use_all')}

+ +
+

${t('use.disambiguation_hint')}

+ ${locButtons} + + `; + document.getElementById('modal-overlay').style.display = 'flex'; +} + +async function _submitUseAllAt(location, isOpenedOnly) { + showLoading(true); + try { + const result = await api('inventory_use', {}, 'POST', { + product_id: currentProduct.id, + use_all: true, + location, + }); + showLoading(false); + if (result.success) { + const toastMsg = isOpenedOnly + ? `πŸ”“ ${t('use.toast_opened_finished').replace('{name}', currentProduct.name)}` + : `πŸ“€ ${currentProduct.name} terminato!`; + showToast(toastMsg, 'success'); + if (result.added_to_bring) { + setTimeout(() => showToast(t('use.toast_bring'), 'info'), 1500); + } + showLowStockBringPrompt(result, () => showPage('dashboard')); + } else { + showToast(result.error || 'Errore', 'error'); + } + } catch (err) { + showLoading(false); + showToast(t('error.connection'), 'error'); + } +} + async function submitUse(e) { e.preventDefault(); if (_useSubmitting) return; // prevent double-submit from scale auto-confirm diff --git a/translations/de.json b/translations/de.json index 11b66fd..05ae61a 100644 --- a/translations/de.json +++ b/translations/de.json @@ -87,6 +87,7 @@ "quick_recipe": "🍳 Schnelles Rezept mit ablaufenden Produkten", "banner_review_title": "UngewΓΆhnliche Menge", "banner_review_action_ok": "Ist korrekt", + "banner_review_action_finish": "πŸ—‘οΈ Alles aufgebraucht", "banner_review_action_edit": "Korrigieren", "banner_review_action_weigh": "Wiegen", "banner_review_dismiss": "Ignorieren", @@ -238,7 +239,10 @@ "when_tomorrow": "lΓ€uft morgen ab", "when_days": "lΓ€uft in {n} Tagen ab", "toast_used": "πŸ“€ {qty} von {name} verwendet", - "toast_bring": "πŸ›’ Produkt aufgebraucht β†’ zu Bring! hinzugefΓΌgt" + "toast_bring": "πŸ›’ Produkt aufgebraucht β†’ zu Bring! hinzugefΓΌgt", + "toast_opened_finished": "πŸ”“ GeΓΆffnete Packung von {name} aufgebraucht!", + "disambiguation_hint": "Was meinst du mit \"alles aufgebraucht\"?", + "disambiguation_all": "πŸ—‘οΈ ALLES aufgebraucht ({qty})" }, "product": { "title_new": "Neues Produkt", diff --git a/translations/en.json b/translations/en.json index f05e281..009d2ea 100644 --- a/translations/en.json +++ b/translations/en.json @@ -87,6 +87,7 @@ "quick_recipe": "🍳 Quick recipe with expiring products", "banner_review_title": "Anomalous quantity", "banner_review_action_ok": "It's correct", + "banner_review_action_finish": "πŸ—‘οΈ All gone", "banner_review_action_edit": "Correct", "banner_review_action_weigh": "Weigh", "banner_review_dismiss": "Dismiss", @@ -237,7 +238,10 @@ "when_tomorrow": "expires tomorrow", "when_days": "expires in {n} days", "toast_used": "πŸ“€ Used {qty} of {name}", - "toast_bring": "πŸ›’ Product finished β†’ added to Bring!" + "toast_bring": "πŸ›’ Product finished β†’ added to Bring!", + "toast_opened_finished": "πŸ”“ Opened package of {name} finished!", + "disambiguation_hint": "What do you mean by \"all done\"?", + "disambiguation_all": "πŸ—‘οΈ Finish EVERYTHING ({qty})" }, "product": { "title_new": "New Product", diff --git a/translations/it.json b/translations/it.json index 9f2efd9..7cf3ca0 100644 --- a/translations/it.json +++ b/translations/it.json @@ -87,6 +87,7 @@ "quick_recipe": "🍳 Ricetta veloce con prodotti in scadenza", "banner_review_title": "QuantitΓ  anomala", "banner_review_action_ok": "È corretto", + "banner_review_action_finish": "πŸ—‘οΈ È finito tutto", "banner_review_action_edit": "Correggi", "banner_review_action_weigh": "Pesa", "banner_review_dismiss": "Ignora", @@ -237,7 +238,10 @@ "when_tomorrow": "scade domani", "when_days": "scade tra {n} giorni", "toast_used": "πŸ“€ Usato {qty} di {name}", - "toast_bring": "πŸ›’ Prodotto finito β†’ aggiunto a Bring!" + "toast_bring": "πŸ›’ Prodotto finito β†’ aggiunto a Bring!", + "toast_opened_finished": "πŸ”“ Confezione aperta di {name} finita!", + "disambiguation_hint": "Cosa intendi con \"finito tutto\"?", + "disambiguation_all": "πŸ—‘οΈ Finito TUTTO ({qty})" }, "product": { "title_new": "Nuovo Prodotto", From a6c2fb93cf631973489f17ab6e1134c7a4643710 Mon Sep 17 00:00:00 2001 From: dadaloop82 Date: Sun, 3 May 2026 13:17:14 +0000 Subject: [PATCH 04/16] feat: offline OCR (Tesseract) + embedding category classifier (@xenova/transformers) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Tesseract OCR (PHP, server-side): - Dockerfile: adds tesseract-ocr + tesseract-ocr-ita + libgd-dev (gd extension) - api/index.php: new tesseractReadExpiry() β€” decodes base64 image, pre-processes with GD (2Γ— upscale, greyscale, auto-contrast, sharpen), runs tesseract CLI with ita+eng PSM-6, extracts date with multi-pattern regex (DD/MM/YYYY, MM/YYYY, ISO, named-month), returns YYYY-MM-DD + confidence - geminiReadExpiry() now: (1) tries Tesseract first; (2) falls back to Gemini Vision if OCR returns null or no date found; (3) passes source ('ocr'|'gemini') in response @xenova/transformers embedding classifier (browser-side): - index.html: ES-module bootstrap that lazy-loads 'Xenova/all-MiniLM-L6-v2' quantized (~23 MB, cached in browser) via window._getCategoryPipeline(); pre-warms on first scan page visit - assets/js/app.js: classifyCategoryByEmbedding(name) β€” embeds product name + 16 category anchor descriptions, cosine similarity, threshold 0.30; results cached in _embeddingCache Map - autoDetectCategory(): after keyword map misses, fires classifyCategoryByEmbedding async and updates select when resolved (respects manuallySet flag) - createQuickProduct(): if regex returned 'altro', silently patches category with embedding result via a background api call --- Dockerfile | 8 +- api/index.php | 191 ++++++++++++++++++++++++++++++++++++++++++++--- assets/js/app.js | 144 ++++++++++++++++++++++++++++++++++- index.html | 33 ++++++++ 4 files changed, 363 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5fa13f2..68f7d39 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,15 @@ FROM php:8.2-apache -# Install required PHP extensions +# Install required PHP extensions + Tesseract OCR for offline expiry date reading RUN apt-get update && apt-get install -y \ libsqlite3-dev \ libcurl4-openssl-dev \ libonig-dev \ - && docker-php-ext-install pdo_sqlite curl mbstring \ + libgd-dev \ + tesseract-ocr \ + tesseract-ocr-ita \ + tesseract-ocr-eng \ + && docker-php-ext-install pdo_sqlite curl mbstring gd \ && apt-get clean && rm -rf /var/lib/apt/lists/* # Enable Apache mod_rewrite and mod_headers diff --git a/api/index.php b/api/index.php index 315a05f..2f9a47e 100644 --- a/api/index.php +++ b/api/index.php @@ -2243,21 +2243,194 @@ function getOpenedShelfLifeAction(): void { echo json_encode(['days' => $days]); } -function geminiReadExpiry(): void { - $apiKey = env('GEMINI_API_KEY'); - if (empty($apiKey)) { - echo json_encode(['success' => false, 'error' => 'no_api_key']); - return; +// ===== TESSERACT OFFLINE OCR HELPER ===== + +/** + * Try to extract an expiry date from a base64 image using Tesseract OCR (offline). + * Returns ['found'=>true,'date'=>'YYYY-MM-DD','raw_text'=>'...','confidence'=>float] + * or ['found'=>false,'raw_text'=>'...'] + * + * Strategy: + * 1. Decode base64 β†’ temp JPEG + * 2. Pre-process with GD: desaturate, auto-contrast, sharpen, 2Γ— upscale + * 3. Run tesseract with Italian+English langs, PSM-6 (block of text) + * 4. Run date-format regexes (Italian & international patterns) + * 5. Normalise to YYYY-MM-DD + * + * Returns null if tesseract binary is not available or GD is not compiled in. + */ +function tesseractReadExpiry(string $imageBase64): ?array { + // Require both the binary and the GD extension + if (!function_exists('imagecreatefromstring')) return null; + $tesseract = trim(shell_exec('which tesseract 2>/dev/null') ?? ''); + if (empty($tesseract)) return null; + + // ── 1. Decode image ──────────────────────────────────────────────────── + $imgData = base64_decode($imageBase64); + if ($imgData === false || strlen($imgData) < 100) return null; + + $src = @imagecreatefromstring($imgData); + if (!$src) return null; + + $w = imagesx($src); + $h = imagesy($src); + + // ── 2. Pre-process ───────────────────────────────────────────────────── + // 2a. Upscale Γ—2 – Tesseract performs best on β‰₯300 DPI; packaging photos + // are often low-res so doubling helps character recognition. + $w2 = $w * 2; + $h2 = $h * 2; + $dst = imagecreatetruecolor($w2, $h2); + imagecopyresampled($dst, $src, 0, 0, 0, 0, $w2, $h2, $w, $h); + imagedestroy($src); + + // 2b. Greyscale + auto-contrast + imagefilter($dst, IMG_FILTER_GRAYSCALE); + imagefilter($dst, IMG_FILTER_CONTRAST, -40); // negative = increase contrast in GD + + // 2c. Sharpen (convolution kernel) + $kernel = [[0,-1,0],[-1,5,-1],[0,-1,0]]; + imageconvolution($dst, $kernel, 1, 0); + + // ── 3. Write temp file & run Tesseract ──────────────────────────────── + $tmpIn = sys_get_temp_dir() . '/ocr_in_' . uniqid() . '.png'; + $tmpOut = sys_get_temp_dir() . '/ocr_out_' . uniqid(); + imagepng($dst, $tmpIn); + imagedestroy($dst); + + // PSM 6 = assume a single uniform block of text (good for cropped label areas) + $cmd = escapeshellcmd($tesseract) + . ' ' . escapeshellarg($tmpIn) + . ' ' . escapeshellarg($tmpOut) + . ' -l ita+eng --psm 6 --oem 1' + . ' quiet 2>/dev/null'; + shell_exec($cmd); + + $rawText = ''; + if (file_exists($tmpOut . '.txt')) { + $rawText = trim(file_get_contents($tmpOut . '.txt')); + unlink($tmpOut . '.txt'); } - + if (file_exists($tmpIn)) unlink($tmpIn); + + if (empty($rawText)) return ['found' => false, 'raw_text' => '']; + + // ── 4. Parse date patterns ───────────────────────────────────────────── + $today = new DateTime(); + $currentYear = (int)$today->format('Y'); + + // Normalise confusable OCR chars: Oβ†’0, I/lβ†’1, Sβ†’5 + $clean = preg_replace('/\bO\b/', '0', $rawText); + $clean = preg_replace('/[Il](?=\d)/', '1', $clean); + + $patterns = [ + // DD/MM/YYYY or DD-MM-YYYY or DD.MM.YYYY + '/\b(\d{1,2})[\/\-\.](\d{1,2})[\/\-\.](\d{4})\b/', + // MM/YYYY or MM-YYYY (best-before month/year only) + '/\b(\d{1,2})[\/\-\.](\d{4})\b/', + // YYYY-MM-DD (ISO) + '/\b(\d{4})-(\d{2})-(\d{2})\b/', + // DD MMM YYYY (e.g. 15 APR 2026) + '/\b(\d{1,2})\s+(gen|feb|mar|apr|mag|giu|lug|ago|set|ott|nov|dic|jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\.?\s*(\d{4})\b/i', + // MMM YYYY (e.g. APR 2026) + '/\b(gen|feb|mar|apr|mag|giu|lug|ago|set|ott|nov|dic|jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\.?\s*(\d{4})\b/i', + ]; + + $monthMap = [ + 'gen'=>1,'jan'=>1,'feb'=>2,'mar'=>3,'apr'=>4,'mag'=>5,'may'=>5, + 'giu'=>6,'jun'=>6,'lug'=>7,'jul'=>7,'ago'=>8,'aug'=>8, + 'set'=>9,'sep'=>9,'ott'=>10,'oct'=>10,'nov'=>11,'dic'=>12,'dec'=>12, + ]; + + $candidates = []; + foreach ($patterns as $pat) { + if (!preg_match_all($pat, $clean, $m, PREG_SET_ORDER)) continue; + foreach ($m as $match) { + $full = $match[0]; + // Determine Y/M/D from which pattern matched + if (preg_match('/^\d{4}-\d{2}-\d{2}$/', $full)) { + // ISO + $y = (int)$match[1]; $mo = (int)$match[2]; $d = (int)$match[3]; + } elseif (isset($monthMap[strtolower($match[2] ?? '')])) { + // DD MMM YYYY + $d = (int)$match[1]; + $mo = $monthMap[strtolower($match[2])]; + $y = (int)$match[3]; + } elseif (isset($monthMap[strtolower($match[1] ?? '')])) { + // MMM YYYY + $d = 1; + $mo = $monthMap[strtolower($match[1])]; + $y = (int)$match[2]; + } elseif (count($match) === 3) { + // MM/YYYY + $mo = (int)$match[1]; $y = (int)$match[2]; $d = 1; + } else { + // DD/MM/YYYY + $d = (int)$match[1]; $mo = (int)$match[2]; $y = (int)$match[3]; + } + // Sanity + if ($y < 2020 || $y > 2040) continue; + if ($mo < 1 || $mo > 12) continue; + if ($d < 1 || $d > 31) continue; + $dateStr = sprintf('%04d-%02d-%02d', $y, $mo, $d); + // Prefer dates in the future or near past (within 2 years) + $dt = new DateTime($dateStr); + $diff = (int)$today->diff($dt)->days * ($dt >= $today ? 1 : -1); + $candidates[] = ['date' => $dateStr, 'score' => $diff, 'raw' => $full]; + } + } + + if (empty($candidates)) { + return ['found' => false, 'raw_text' => $rawText]; + } + + // Pick candidate closest to today (but prefer future dates, then near-past) + usort($candidates, fn($a, $b) => abs($a['score']) - abs($b['score'])); + $best = $candidates[0]; + + return [ + 'found' => true, + 'date' => $best['date'], + 'raw_text' => $rawText, + 'raw_match' => $best['raw'], + 'confidence' => count($candidates) === 1 ? 0.9 : 0.75, + 'source' => 'tesseract', + ]; +} + +function geminiReadExpiry(): void { $input = json_decode(file_get_contents('php://input'), true); $imageBase64 = $input['image'] ?? ''; - + if (empty($imageBase64)) { echo json_encode(['success' => false, 'error' => 'No image provided']); return; } - + + // ── Step 1: Try Tesseract offline OCR first ──────────────────────────── + $ocrResult = tesseractReadExpiry($imageBase64); + if ($ocrResult !== null && !empty($ocrResult['found']) && !empty($ocrResult['date'])) { + echo json_encode([ + 'success' => true, + 'expiry_date' => $ocrResult['date'], + 'raw_text' => $ocrResult['raw_text'] ?? '', + 'source' => 'ocr', + ]); + return; + } + + // ── Step 2: Fall back to Gemini Vision ──────────────────────────────── + $apiKey = env('GEMINI_API_KEY'); + if (empty($apiKey)) { + // No Gemini key and OCR failed/unavailable + echo json_encode([ + 'success' => false, + 'error' => 'no_api_key', + 'raw_text' => $ocrResult['raw_text'] ?? '', + ]); + return; + } + // Call Gemini API $payload = [ 'contents' => [ @@ -2305,7 +2478,7 @@ function geminiReadExpiry(): void { // Validate date format $date = $parsed['date']; if (preg_match('/^\d{4}-\d{2}-\d{2}$/', $date)) { - echo json_encode(['success' => true, 'expiry_date' => $date, 'raw_text' => $parsed['raw_text'] ?? '']); + echo json_encode(['success' => true, 'expiry_date' => $date, 'raw_text' => $parsed['raw_text'] ?? '', 'source' => 'gemini']); return; } } diff --git a/assets/js/app.js b/assets/js/app.js index 2a840f4..8daeade 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -1086,6 +1086,106 @@ function guessCategoryFromName(name) { return 'altro'; } +// ───────────────────────────────────────────────────────────────────────────── +// Embedding-based category classifier (async, @xenova/transformers) +// ───────────────────────────────────────────────────────────────────────────── + +// Canonical descriptions for each local category (used as embedding anchors). +const _CATEGORY_DESCRIPTIONS = { + latticini: 'latte yogurt formaggio burro panna mozzarella latticini dairy', + carne: 'carne pollo manzo maiale vitello prosciutto salame bresaola meat', + pesce: 'pesce tonno salmone merluzzo gamberi seafood fish', + frutta: 'frutta mela banana arancia pera fragola uva kiwi fruit', + verdura: 'verdura insalata zucchina carota cipolla spinaci tomato vegetables', + pasta: 'pasta spaghetti penne fusilli riso risotto noodles rice', + pane: 'pane fette biscottate grissini cracker toast bread bakery', + surgelati: 'surgelati congelato frozen gelato ice cream', + bevande: 'acqua birra vino succo caffΓ¨ tΓ¨ bevande drinks beverages', + condimenti: 'olio aceto sale zucchero farina ketchup maionese senape spezie condiments', + snack: 'biscotti cioccolato patatine snack caramelle wafer merendine', + conserve: 'conserve pelati passata marmellata miele legumi ceci beans canned', + cereali: 'cereali muesli granola fiocchi d\'avena oat breakfast cereal', + igiene: 'sapone shampoo dentifricio deodorante igiene personale hygiene', + pulizia: 'detersivo detergente pulizia casa sgrassatore cleaning', + altro: 'prodotto generico varie altro miscellaneous', +}; + +// In-memory cache: productName β†’ category (avoids re-embedding the same product) +const _embeddingCache = new Map(); + +/** + * Cosine similarity between two Float32Array vectors. + */ +function _cosineSim(a, b) { + let dot = 0, na = 0, nb = 0; + for (let i = 0; i < a.length; i++) { + dot += a[i] * b[i]; + na += a[i] * a[i]; + nb += b[i] * b[i]; + } + return dot / (Math.sqrt(na) * Math.sqrt(nb) + 1e-9); +} + +/** + * Mean-pool a [1, tokens, dims] tensor β†’ Float32Array of length dims. + */ +function _meanPool(tensor) { + const [, tokens, dims] = tensor.dims; + const data = tensor.data; + const out = new Float32Array(dims); + for (let t = 0; t < tokens; t++) { + for (let d = 0; d < dims; d++) { + out[d] += data[t * dims + d]; + } + } + for (let d = 0; d < dims; d++) out[d] /= tokens; + return out; +} + +/** + * Async: returns the best-matching category key for `productName`. + * Returns null if the model is unavailable or similarity is too low. + * THRESHOLD 0.30 β€” below this the regex fallback is more reliable. + */ +async function classifyCategoryByEmbedding(productName) { + if (!productName) return null; + const key = productName.toLowerCase().trim(); + if (_embeddingCache.has(key)) return _embeddingCache.get(key); + + if (typeof window._getCategoryPipeline !== 'function') return null; + const pipe = await window._getCategoryPipeline(); + if (!pipe) return null; + + try { + const labels = Object.keys(_CATEGORY_DESCRIPTIONS); + const texts = [key, ...labels.map(l => _CATEGORY_DESCRIPTIONS[l])]; + + // Embed all texts in one batched call for efficiency + const output = await pipe(texts, { pooling: 'mean', normalize: true }); + const vectors = labels.map((_, i) => { + const t = output[i + 1]; + // output[i] may be a Tensor or already a plain array-like + return t.dims ? _meanPool(t) : new Float32Array(t.data ?? t); + }); + const queryVec = output[0].dims + ? _meanPool(output[0]) + : new Float32Array(output[0].data ?? output[0]); + + let bestLabel = null, bestSim = 0; + for (let i = 0; i < labels.length; i++) { + const sim = _cosineSim(queryVec, vectors[i]); + if (sim > bestSim) { bestSim = sim; bestLabel = labels[i]; } + } + + const result = (bestSim >= 0.30 && bestLabel !== 'altro') ? bestLabel : null; + _embeddingCache.set(key, result); + return result; + } catch (e) { + console.warn('[EverShelf] Embedding classify error:', e); + return null; + } +} + // Determine safety level for expired products // Returns { level: 'danger'|'warning'|'ok', icon, label, tip } function getExpiredSafety(item, daysExpired) { @@ -2024,7 +2124,12 @@ function showPage(pageId, param = null) { } loadInventory(); break; - case 'scan': initScanner(); clearQuickNameResults(); updateSpesaBanner(); break; + case 'scan': initScanner(); clearQuickNameResults(); updateSpesaBanner(); + // Pre-warm the embedding model the first time user visits scan page + if (typeof window._getCategoryPipeline === 'function' && !window._categoryPipelineReady) { + window._getCategoryPipeline(); // fire-and-forget + } + break; case 'products': loadAllProducts(); break; case 'shopping': loadShoppingList(); break; case 'recipe': loadRecipeArchive(); break; @@ -4470,7 +4575,7 @@ function selectQuickProduct(product) { async function createQuickProduct(name) { showLoading(true); - // Auto-detect category from name + // Auto-detect category from name (sync regex first) const category = guessCategoryFromName(name); try { @@ -4494,6 +4599,27 @@ async function createQuickProduct(name) { showLoading(false); clearQuickNameResults(); showToast('Prodotto creato!', 'success'); + + // If regex gave 'altro', try embedding in background and silently update + if (category === 'altro' && typeof classifyCategoryByEmbedding === 'function') { + classifyCategoryByEmbedding(name).then(async embCat => { + if (!embCat || !result.id) return; + try { + await api('product_save', {}, 'POST', { + id: result.id, + name: name, + brand: '', + category: embCat, + unit: 'pz', + default_quantity: 1, + }); + if (currentProduct && currentProduct.id === result.id) { + currentProduct.category = embCat; + } + } catch (_) { /* silent */ } + }); + } + showProductAction(); } else { showLoading(false); @@ -4614,6 +4740,20 @@ function autoDetectCategory() { return; } } + + // ── Embedding fallback: async, only when keywords didn't match ────────── + // Kick off model load (no-op if already loaded/loading) and update the + // select once the result is ready. Only runs when pipeline is available. + if (typeof classifyCategoryByEmbedding === 'function') { + classifyCategoryByEmbedding(document.getElementById('pf-name').value).then(embCat => { + if (!embCat) return; + // Re-check manuallySet β€” user might have picked something while awaiting + const sel = document.getElementById('pf-category'); + if (!sel || sel.dataset.manuallySet === 'true') return; + sel.value = embCat; + onCategoryChange(true); + }); + } } function onCategoryChange(fromAutoDetect = false) { diff --git a/index.html b/index.html index 7f44b00..b2e81af 100644 --- a/index.html +++ b/index.html @@ -14,6 +14,39 @@ + + From f2e151d89b1c1711bde21bce785e0c6d2598618c Mon Sep 17 00:00:00 2001 From: dadaloop82 Date: Sun, 3 May 2026 15:36:03 +0000 Subject: [PATCH 05/16] =?UTF-8?q?feat:=20centralized=20error=20reporting?= =?UTF-8?q?=20=E2=86=92=20auto=20GitHub=20Issues?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PHP (api/index.php): - reportError() endpoint (POST ?action=report_error): accepts source/type/message/stack/context/ua/version - _createOrCommentGithubIssue(): creates new issue OR adds comment on existing one (dedup by sha1 fingerprint via GitHub search API) - _appendErrorLog(): local data/error_reports.log fallback (500 KB rotation) - _phpErrorReport(): called by set_exception_handler + register_shutdown_function β†’ catches all PHP fatals and uncaught exceptions - _githubRequest(): minimal curl-based GitHub REST v3 helper - Rate limit bucket: error_report (20 req/min) - Labels auto-created: auto-report, php-crash, js-error, kiosk-error, scale-error JS (assets/js/app.js): - reportError(payload): single POST to report_error, session-level dedup via _reportedFingerprints Set - window.onerror: reports uncaught-error with message+stack+location context - window.unhandledrejection: reports unhandled-promise with reason+stack - api(): reports api-server-error on HTTP 5xx responses Android Kiosk: - ErrorReporter.kt: singleton with init(context, serverUrl), report(Throwable), reportMessage(type, message) - Thread.setDefaultUncaughtExceptionHandler β†’ catches ALL unhandled JVM crashes - Async executor (single thread), per-session fingerprint dedup, synchronous fallback for crash handler - doPost(): HttpURLConnection POST to /api/?action=report_error with device/version info - KioskActivity: ErrorReporter.init() in onCreate + finishWizard() - onReceivedError: reports webview-load-error with URL + error code - onConsoleMessage: reports webview-js-error for ERROR level console messages Config: GITHUB_ISSUE_TOKEN + GITHUB_REPO added to .env.example --- .env.example | 8 + api/index.php | 256 ++++++++++++++++++ assets/js/app.js | 63 ++++- .../dadaloop/evershelf/kiosk/ErrorReporter.kt | 164 +++++++++++ .../dadaloop/evershelf/kiosk/KioskActivity.kt | 31 ++- 5 files changed, 516 insertions(+), 6 deletions(-) create mode 100644 evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/ErrorReporter.kt diff --git a/.env.example b/.env.example index 16bb48a..cd3455b 100644 --- a/.env.example +++ b/.env.example @@ -20,3 +20,11 @@ TTS_AUTH_TYPE=bearer TTS_CONTENT_TYPE=application/json TTS_PAYLOAD_KEY=message TTS_ENABLED=false + +# GitHub Error Reporting (optional but recommended) +# Creates GitHub Issues automatically on crashes/errors from app, kiosk and server. +# Create a fine-grained PAT at https://github.com/settings/tokens?type=beta +# β†’ Only selected repos: EverShelf +# β†’ Permissions: Issues (Read+Write), Metadata (Read-only) +GITHUB_ISSUE_TOKEN= +GITHUB_REPO=dadaloop82/EverShelf diff --git a/api/index.php b/api/index.php index 2f9a47e..f89512b 100644 --- a/api/index.php +++ b/api/index.php @@ -11,6 +11,28 @@ // database.php must always be loaded (used both by HTTP router and cron) require_once __DIR__ . '/database.php'; +// ── Global PHP error/exception reporters ───────────────────────────────────── +// These are registered immediately so any crash anywhere in this file is caught. +// The handler function _phpErrorReport() is defined later; PHP resolves function +// names at call time so forward-referencing is safe. +if (!defined('CRON_MODE')) { + set_exception_handler(function (Throwable $e): void { + _phpErrorReport( + $e->getMessage(), + $e->getFile(), + $e->getLine(), + $e->getTraceAsString(), + get_class($e) + ); + }); + register_shutdown_function(function (): void { + $err = error_get_last(); + if ($err && in_array($err['type'], [E_ERROR, E_PARSE, E_CORE_ERROR, E_COMPILE_ERROR], true)) { + _phpErrorReport($err['message'], $err['file'], $err['line'], '', 'PHP Fatal'); + } + }); +} + /** * Load environment variables from .env file. * Returns associative array of key => value pairs. @@ -67,6 +89,7 @@ function checkRateLimit(string $action): void { $aiActions = ['gemini_readExpiry', 'gemini_chat', 'gemini_identify', 'gemini_suggest_shopping']; $loginActions = []; $recipeActions = ['generate_recipe', 'generate_recipe_stream']; + $errorActions = ['report_error']; if (in_array($action, $aiActions)) { $limit = 15; @@ -76,6 +99,10 @@ function checkRateLimit(string $action): void { $limit = 5; $window = 60; $bucket = 'recipe'; + } elseif (in_array($action, $errorActions)) { + $limit = 20; + $window = 60; + $bucket = 'error_report'; } elseif (in_array($action, $loginActions)) { $limit = 5; $window = 60; @@ -325,6 +352,10 @@ try { getOpenedShelfLifeAction(); break; + case 'report_error': + reportError(); + break; + default: http_response_code(404); echo json_encode(['error' => 'Unknown action: ' . $action]); @@ -5535,3 +5566,228 @@ function migrateUnitsToBase(PDO $db): void { echo json_encode(['success' => true, 'changes' => $changes]); } + +// ============================================================================= +// ===== CENTRALIZED ERROR REPORTING β†’ GITHUB ISSUES ========================== +// ============================================================================= + +/** + * POST /api/?action=report_error + * + * Accepts error payloads from any client (PWA browser, Android kiosk, cron). + * Creates a GitHub issue on dadaloop82/EverShelf with deduplication: + * if an open issue with the same fingerprint already exists it posts a comment + * instead of opening a duplicate. + * + * Expected JSON body: + * source string 'pwa'|'kiosk'|'php'|'cron'|'scale' + * type string e.g. 'js-error'|'php-crash'|'unhandled-promise'|… + * message string Error message (required) + * stack string? Stack trace + * context object? Arbitrary keyβ†’value extra info + * url string? Page URL where the error occurred + * user_agent string? Navigator UA + * version string? App version + */ +function reportError(): void { + $input = json_decode(file_get_contents('php://input'), true) ?: []; + + $source = preg_replace('/[^a-z0-9_\-]/', '', strtolower($input['source'] ?? 'unknown')); + $type = preg_replace('/[^a-z0-9_\-]/', '', strtolower($input['type'] ?? 'error')); + $message = substr(trim($input['message'] ?? ''), 0, 500); + $stack = substr(trim($input['stack'] ?? ''), 0, 4000); + $pageUrl = substr(trim($input['url'] ?? ''), 0, 300); + $ua = substr(trim($input['user_agent'] ?? $_SERVER['HTTP_USER_AGENT'] ?? ''), 0, 300); + $version = substr(trim($input['version'] ?? ''), 0, 50); + $context = $input['context'] ?? []; + + if (empty($message)) { + echo json_encode(['ok' => false, 'error' => 'message required']); + return; + } + + // ── Write to local log regardless of GitHub availability ────────────── + _appendErrorLog($source, $type, $message, $stack, $pageUrl, $ua, $context); + + // ── Fire GitHub issue (non-blocking: we always return ok to client) ─── + $token = env('GITHUB_ISSUE_TOKEN'); + $repo = env('GITHUB_REPO', 'dadaloop82/EverShelf'); + if (!empty($token) && !empty($repo)) { + _createOrCommentGithubIssue($token, $repo, $source, $type, $message, $stack, $pageUrl, $ua, $version, $context); + } + + echo json_encode(['ok' => true]); +} + +/** + * Append to data/error_reports.log (local safety net, max 500 KB) + */ +function _appendErrorLog(string $source, string $type, string $message, string $stack, string $url, string $ua, array $context): void { + $logFile = __DIR__ . '/../data/error_reports.log'; + // Rotate if > 500 KB + if (file_exists($logFile) && filesize($logFile) > 500000) { + $lines = file($logFile); + $lines = array_slice($lines, -300); + file_put_contents($logFile, implode('', $lines)); + } + $ts = date('Y-m-d H:i:s'); + $ctx = $context ? ' ctx=' . json_encode($context, JSON_UNESCAPED_UNICODE) : ''; + $line = "[$ts] [$source] [$type] $message" . ($url ? " | url=$url" : '') . $ctx . "\n"; + if ($stack) $line .= " STACK: " . str_replace("\n", "\n ", $stack) . "\n"; + file_put_contents($logFile, $line, FILE_APPEND | LOCK_EX); +} + +/** + * Fingerprint = sha1(source:type:first-120-chars-of-message) + * Used to deduplicate open issues. + */ +function _errorFingerprint(string $source, string $type, string $message): string { + return sha1($source . ':' . $type . ':' . substr($message, 0, 120)); +} + +/** + * Create a GitHub issue, or add a comment to an existing open issue with the + * same fingerprint. Uses the REST API v3 directly (no library needed). + */ +function _createOrCommentGithubIssue( + string $token, string $repo, + string $source, string $type, string $message, + string $stack, string $pageUrl, string $ua, + string $version, array $context +): void { + $fp = _errorFingerprint($source, $type, $message); + + // ── 1. Search for an existing open issue with this fingerprint ───────── + $searchQuery = urlencode("repo:$repo is:issue is:open label:auto-report \"fp:$fp\" in:body"); + $searchResult = _githubRequest($token, 'GET', "https://api.github.com/search/issues?q=$searchQuery&per_page=1"); + + $existingIssueNumber = null; + if (isset($searchResult['body']['items']) && count($searchResult['body']['items']) > 0) { + $existingIssueNumber = $searchResult['body']['items'][0]['number'] ?? null; + } + + // ── Build the common details block ───────────────────────────────────── + $ts = date('Y-m-d H:i:s T'); + $ctxMd = ''; + if ($context) { + $ctxMd = "\n**Context:**\n```json\n" . json_encode($context, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) . "\n```\n"; + } + $stackMd = $stack ? "\n**Stack trace:**\n```\n$stack\n```\n" : ''; + $urlMd = $pageUrl ? "\n**URL:** `$pageUrl`" : ''; + $uaMd = $ua ? "\n**User-Agent:** `$ua`" : ''; + $verMd = $version ? "\n**Version:** `$version`" : ''; + + if ($existingIssueNumber) { + // ── 2a. Post a comment to the existing issue ────────────────────── + $body = "### πŸ” Recurrence β€” $ts\n" + . "**Source:** `$source` | **Type:** `$type`\n" + . $urlMd . $uaMd . $verMd . "\n" + . $ctxMd . $stackMd + . "\n---\n_fp:$fp_"; + _githubRequest($token, 'POST', + "https://api.github.com/repos/$repo/issues/$existingIssueNumber/comments", + ['body' => $body] + ); + } else { + // ── 2b. Create a new issue ──────────────────────────────────────── + // Determine labels from source + $labelMap = [ + 'pwa' => 'js-error', + 'kiosk' => 'kiosk-error', + 'php' => 'php-crash', + 'cron' => 'php-crash', + 'scale' => 'scale-error', + ]; + $typeLabel = $labelMap[$source] ?? 'js-error'; + + $shortMsg = strlen($message) > 70 ? substr($message, 0, 70) . '…' : $message; + $title = "[" . strtoupper($source) . "] $shortMsg"; + + $body = "## 🚨 Automatic Error Report\n\n" + . "**Source:** `$source` \n" + . "**Type:** `$type` \n" + . "**Reported at:** $ts \n" + . $urlMd . "\n" + . $uaMd . "\n" + . $verMd . "\n\n" + . "**Error message:**\n> $message\n" + . $stackMd + . $ctxMd + . "\n---\n" + . "\n" + . "_This issue was created automatically by EverShelf's error reporter. fp:`$fp`_"; + + _githubRequest($token, 'POST', + "https://api.github.com/repos/$repo/issues", + [ + 'title' => $title, + 'body' => $body, + 'labels' => ['auto-report', $typeLabel], + ] + ); + } +} + +/** + * Minimal GitHub REST API helper (curl). + * Returns ['http_code' => int, 'body' => array]. + */ +function _githubRequest(string $token, string $method, string $url, array $payload = []): array { + $ch = curl_init($url); + $headers = [ + 'Authorization: token ' . $token, + 'Accept: application/vnd.github+json', + 'X-GitHub-Api-Version: 2022-11-28', + 'User-Agent: EverShelf-ErrorReporter/1.0', + 'Content-Type: application/json', + ]; + curl_setopt_array($ch, [ + CURLOPT_RETURNTRANSFER => true, + CURLOPT_HTTPHEADER => $headers, + CURLOPT_TIMEOUT => 10, + CURLOPT_SSL_VERIFYPEER => true, + ]); + if ($method === 'POST') { + curl_setopt($ch, CURLOPT_POST, true); + curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($payload)); + } + $raw = curl_exec($ch); + $code = (int)curl_getinfo($ch, CURLINFO_HTTP_CODE); + curl_close($ch); + return ['http_code' => $code, 'body' => json_decode($raw ?: '{}', true) ?: []]; +} + +/** + * Called by the PHP exception/shutdown handlers registered at the top of this file. + * Writes to local log + creates a GitHub issue. + */ +function _phpErrorReport(string $message, string $file, int $line, string $trace, string $type): void { + // Prevent infinite loops if this function itself throws + static $running = false; + if ($running) return; + $running = true; + + $source = 'php'; + $errType = 'php-crash'; + $context = [ + 'file' => $file, + 'line' => $line, + 'php' => PHP_VERSION, + 'action' => $_GET['action'] ?? '', + 'method' => $_SERVER['REQUEST_METHOD'] ?? '', + ]; + + _appendErrorLog($source, $errType, "[$type] $message", $trace, '', '', $context); + + $token = env('GITHUB_ISSUE_TOKEN'); + $repo = env('GITHUB_REPO', 'dadaloop82/EverShelf'); + if (!empty($token) && !empty($repo)) { + _createOrCommentGithubIssue( + $token, $repo, $source, $errType, + "[$type] $message", $trace, + '', '', PHP_VERSION, $context + ); + } + + $running = false; +} diff --git a/assets/js/app.js b/assets/js/app.js index 8daeade..bf586a7 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -7,8 +7,11 @@ * @license MIT */ -// ===== REMOTE LOGGING ===== -// Global remote logger: captures all errors, warnings and key operations +// ===== REMOTE LOGGING + ERROR REPORTING ===== +// Two-tier system: +// 1. remoteLog() β€” batched INFO/WARN/ERROR β†’ existing client_log endpoint (debug tail) +// 2. reportError() β€” immediate single POST β†’ report_error endpoint β†’ GitHub Issue + const _remoteLogBuffer = []; let _remoteLogTimer = null; const _origConsoleError = console.error.bind(console); @@ -47,12 +50,54 @@ console.warn = function(...args) { remoteLog('WARN', ...args); }; -// Catch unhandled errors +// ── Error reporter: creates/updates GitHub Issues ──────────────────────────── +// Rate-limit client-side: max 1 report per fingerprint per page session. +const _reportedFingerprints = new Set(); + +function reportError(payload) { + // Build fingerprint to deduplicate within the same page session + const fp = `${payload.source}:${payload.type}:${String(payload.message).slice(0, 120)}`; + if (_reportedFingerprints.has(fp)) return; + _reportedFingerprints.add(fp); + + const body = Object.assign({ + source: 'pwa', + version: document.querySelector('.header-version')?.textContent?.trim() || '', + url: location.href, + user_agent: navigator.userAgent, + }, payload); + + fetch('api/index.php?action=report_error', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify(body), + }).catch(() => {}); // fire-and-forget; never throw from error handler +} + +// ── Global uncaught error handler ──────────────────────────────────────────── window.addEventListener('error', function(e) { - remoteLog('UNCAUGHT', `${e.message} at ${e.filename}:${e.lineno}:${e.colno}`); + const msg = e.message || String(e.error); + // Ignore benign third-party noise + if (/Script error/i.test(msg)) return; + remoteLog('UNCAUGHT', `${msg} at ${e.filename}:${e.lineno}:${e.colno}`); + reportError({ + type: 'uncaught-error', + message: msg, + stack: e.error?.stack || '', + context: { filename: e.filename, lineno: e.lineno, colno: e.colno }, + }); }); + window.addEventListener('unhandledrejection', function(e) { - remoteLog('UNHANDLED_PROMISE', e.reason); + const reason = e.reason; + const msg = reason instanceof Error ? reason.message : String(reason); + const stack = reason instanceof Error ? (reason.stack || '') : ''; + remoteLog('UNHANDLED_PROMISE', msg); + reportError({ + type: 'unhandled-promise', + message: msg, + stack: stack, + }); }); // ===== CONFIGURATION ===== @@ -2068,6 +2113,14 @@ async function api(action, params = {}, method = 'GET', body = null) { const res = await fetch(url, opts); if (!res.ok) { remoteLog('API_ERROR', `${action} HTTP ${res.status}`); + // Report HTTP 5xx as server errors (not 4xx which are usually user errors) + if (res.status >= 500) { + reportError({ + type: 'api-server-error', + message: `API ${action} returned HTTP ${res.status}`, + context: { action, status: res.status }, + }); + } } const data = await res.json(); if (data && data.error) { diff --git a/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/ErrorReporter.kt b/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/ErrorReporter.kt new file mode 100644 index 0000000..faacfb1 --- /dev/null +++ b/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/ErrorReporter.kt @@ -0,0 +1,164 @@ +package it.dadaloop.evershelf.kiosk + +import android.content.Context +import android.os.Build +import android.util.Log +import org.json.JSONObject +import java.io.OutputStreamWriter +import java.net.HttpURLConnection +import java.net.URL +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale +import java.util.concurrent.Executors + +/** + * Centralized error reporter for EverShelf Kiosk. + * + * Sends structured JSON payloads to the EverShelf backend + * (POST /api/?action=report_error) which in turn creates or + * updates a GitHub Issue automatically. + * + * Usage: + * // In Application or Activity onCreate: + * ErrorReporter.init(this, prefs.getString("evershelf_url", "")!!) + * + * // To report a caught exception: + * ErrorReporter.report(e, "myMethod", mapOf("extra" to "data")) + * + * // To report a non-exception event: + * ErrorReporter.reportMessage("webview-crash", "WebView died unexpectedly") + */ +object ErrorReporter { + + private const val TAG = "EverShelfErrorReporter" + private val executor = Executors.newSingleThreadExecutor() + + // Fingerprints already sent in this process to avoid flooding + private val sentFingerprints = mutableSetOf() + + private var serverBaseUrl: String = "" + private var appVersion: String = "" + private var deviceInfo: String = "" + + /** + * Call once (e.g. in KioskActivity.onCreate) before reporting any errors. + * @param context Application or Activity context. + * @param baseUrl The EverShelf server URL, e.g. "http://192.168.1.10:8080" + */ + fun init(context: Context, baseUrl: String) { + serverBaseUrl = baseUrl.trimEnd('/') + try { + val pi = context.packageManager.getPackageInfo(context.packageName, 0) + appVersion = pi.versionName ?: "unknown" + } catch (_: Exception) {} + deviceInfo = "${Build.MANUFACTURER} ${Build.MODEL} (Android ${Build.VERSION.RELEASE})" + + // Install a global UncaughtExceptionHandler so ANY unhandled crash is reported + val previousHandler = Thread.getDefaultUncaughtExceptionHandler() + Thread.setDefaultUncaughtExceptionHandler { thread, throwable -> + try { + reportSync( + type = "uncaught-exception", + message = throwable.message ?: throwable.javaClass.simpleName, + stack = throwable.stackTraceToString(), + context = mapOf("thread" to thread.name) + ) + } catch (_: Exception) {} + // Re-throw to the previous handler so the system crash dialog/restart still works + previousHandler?.uncaughtException(thread, throwable) + } + } + + /** + * Report a caught [Throwable] asynchronously (does not block UI thread). + */ + fun report( + throwable: Throwable, + location: String = "", + extra: Map = emptyMap() + ) { + val ctx = mutableMapOf("device" to deviceInfo) + if (location.isNotEmpty()) ctx["location"] = location + ctx.putAll(extra) + reportAsync( + type = "kiosk-exception", + message = "${throwable.javaClass.simpleName}: ${throwable.message}", + stack = throwable.stackTraceToString(), + context = ctx + ) + } + + /** + * Report a non-exception message (e.g. WebView page error, network failure). + */ + fun reportMessage( + type: String, + message: String, + extra: Map = emptyMap() + ) { + val ctx = mutableMapOf("device" to deviceInfo) + ctx.putAll(extra) + reportAsync(type = type, message = message, stack = "", context = ctx) + } + + // ── Internal ───────────────────────────────────────────────────────────── + + private fun fingerprint(type: String, message: String): String { + val key = "$type:${message.take(120)}" + return key.hashCode().toString(16) + } + + private fun reportAsync(type: String, message: String, stack: String, context: Map) { + val fp = fingerprint(type, message) + synchronized(sentFingerprints) { + if (!sentFingerprints.add(fp)) return // already reported this session + } + executor.execute { doPost(type, message, stack, context) } + } + + /** Synchronous variant used only in the UncaughtExceptionHandler (already off main thread). */ + private fun reportSync(type: String, message: String, stack: String, context: Map) { + val fp = fingerprint(type, message) + synchronized(sentFingerprints) { sentFingerprints.add(fp) } + doPost(type, message, stack, context) + } + + private fun doPost(type: String, message: String, stack: String, context: Map) { + val url = serverBaseUrl.ifEmpty { return } + val endpoint = "$url/api/?action=report_error" + try { + val ctxJson = JSONObject() + context.forEach { (k, v) -> ctxJson.put(k, v) } + + val payload = JSONObject().apply { + put("source", "kiosk") + put("type", type) + put("message", message) + put("stack", stack) + put("context", ctxJson) + put("version", appVersion) + put("user_agent", "EverShelf-Kiosk/$appVersion (Android ${Build.VERSION.RELEASE}; ${Build.MODEL})") + put("url", url) + put("ts", SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US).format(Date())) + } + + val conn = URL(endpoint).openConnection() as HttpURLConnection + conn.requestMethod = "POST" + conn.setRequestProperty("Content-Type", "application/json; charset=utf-8") + conn.setRequestProperty("Accept", "application/json") + conn.doOutput = true + conn.connectTimeout = 8000 + conn.readTimeout = 8000 + + OutputStreamWriter(conn.outputStream, Charsets.UTF_8).use { it.write(payload.toString()) } + val responseCode = conn.responseCode + conn.disconnect() + + Log.d(TAG, "Reported '$type' β†’ HTTP $responseCode") + } catch (e: Exception) { + // Never rethrow from the error reporter itself + Log.w(TAG, "Failed to report error '$type': ${e.message}") + } + } +} diff --git a/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/KioskActivity.kt b/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/KioskActivity.kt index 04d81c6..92a88f1 100644 --- a/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/KioskActivity.kt +++ b/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/KioskActivity.kt @@ -106,6 +106,11 @@ class KioskActivity : AppCompatActivity() { enableKioskLock() requestAllPermissions() + // Initialise centralised error reporter as early as possible so the + // UncaughtExceptionHandler is installed before any background work starts. + val savedUrl = prefs.getString(KEY_URL, "") ?: "" + ErrorReporter.init(this, savedUrl) + // Initialise native TTS engine so the JS bridge works even when // Web Speech API voices are unavailable in the Android WebView. tts = TextToSpeech(this) { status -> @@ -320,6 +325,9 @@ class KioskActivity : AppCompatActivity() { private fun finishWizard() { prefs.edit().putBoolean(KEY_SETUP_COMPLETE, true).apply() wizardContainer.visibility = View.GONE + // Re-init ErrorReporter with the confirmed URL so future errors are reported + val confirmedUrl = prefs.getString(KEY_URL, "") ?: "" + ErrorReporter.init(this, confirmedUrl) launchWebView() } @@ -468,7 +476,15 @@ class KioskActivity : AppCompatActivity() { view: WebView?, request: WebResourceRequest?, error: WebResourceError? ) { + val errorDesc = error?.description?.toString() ?: "unknown" + val errorCode = error?.errorCode ?: -1 + val url = request?.url?.toString() ?: "" if (request?.isForMainFrame == true) { + ErrorReporter.reportMessage( + type = "webview-load-error", + message = "WebView failed to load main frame: $errorDesc (code $errorCode)", + extra = mapOf("url" to url, "errorCode" to errorCode) + ) view?.loadData(errorPageHtml(), "text/html", "UTF-8") } } @@ -509,7 +525,20 @@ class KioskActivity : AppCompatActivity() { } } } - override fun onConsoleMessage(msg: ConsoleMessage?): Boolean = true + override fun onConsoleMessage(msg: ConsoleMessage?): Boolean { + // Forward JS errors and warnings to the error reporter + if (msg != null && msg.messageLevel() == ConsoleMessage.MessageLevel.ERROR) { + ErrorReporter.reportMessage( + type = "webview-js-error", + message = msg.message(), + extra = mapOf( + "source_id" to msg.sourceId(), + "line" to msg.lineNumber() + ) + ) + } + return true + } override fun onShowFileChooser( wv: WebView?, callback: ValueCallback>?, From ea40c8e02b700d3c1803e33f57246e345067e203 Mon Sep 17 00:00:00 2001 From: dadaloop82 Date: Sun, 3 May 2026 17:11:11 +0000 Subject: [PATCH 06/16] =?UTF-8?q?feat:=20centralized=20error=20reporting?= =?UTF-8?q?=20=E2=86=92=20GitHub=20Issues?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - PHP (api/index.php): hardcode GH_ISSUE_TOKEN/GH_REPO constants at top of file (before exception handler runs); fix $fp_ variable interpolation bug; global set_exception_handler + register_shutdown_function; reportError() endpoint (POST ?action=report_error) with rate limiting, local log, dedup via fingerprint search on GitHub Issues API - Kiosk (ErrorReporter.kt): add crash persistence – saves crash payload to SharedPreferences before network POST, clears on success, retries as 'uncaught-exception-survived' on next launch via sendPendingCrash() in init() - Scale Gateway: new ErrorReporter.kt – calls GitHub Issues API directly (no relay needed, token hardcoded, scoped Issues R+W only); crash persistence via SharedPreferences; MainActivity.kt hooked at onCreate, startGatewayServer catch, onError (BLE errors) Tested end-to-end: issues #3-#6 created and closed during QA. --- .env.example | 9 +- api/index.php | 34 +-- .../dadaloop/evershelf/kiosk/ErrorReporter.kt | 80 +++++- .../evershelf/scalegate/ErrorReporter.kt | 237 ++++++++++++++++++ .../evershelf/scalegate/MainActivity.kt | 10 + 5 files changed, 341 insertions(+), 29 deletions(-) create mode 100644 evershelf-scale-gateway/app/src/main/kotlin/it/dadaloop/evershelf/scalegate/ErrorReporter.kt diff --git a/.env.example b/.env.example index cd3455b..dfb5881 100644 --- a/.env.example +++ b/.env.example @@ -21,10 +21,5 @@ TTS_CONTENT_TYPE=application/json TTS_PAYLOAD_KEY=message TTS_ENABLED=false -# GitHub Error Reporting (optional but recommended) -# Creates GitHub Issues automatically on crashes/errors from app, kiosk and server. -# Create a fine-grained PAT at https://github.com/settings/tokens?type=beta -# β†’ Only selected repos: EverShelf -# β†’ Permissions: Issues (Read+Write), Metadata (Read-only) -GITHUB_ISSUE_TOKEN= -GITHUB_REPO=dadaloop82/EverShelf +# GitHub Error Reporting: token is hardcoded in api/index.php (same for all clients). +# No .env entry needed β€” update GH_ISSUE_TOKEN constant in api/index.php to rotate. diff --git a/api/index.php b/api/index.php index f89512b..adc4ef8 100644 --- a/api/index.php +++ b/api/index.php @@ -8,6 +8,13 @@ * @license MIT */ +// ── GitHub error-reporting credentials ─────────────────────────────────────── +// Token is intentionally hardcoded: scoped only to Issues (R+W) on this repo. +// Defined here (at the very top) so they are available to the global exception +// handler registered below, before any other code runs. +define('GH_ISSUE_TOKEN', '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'); +define('GH_REPO', 'dadaloop82/EverShelf'); + // database.php must always be loaded (used both by HTTP router and cron) require_once __DIR__ . '/database.php'; @@ -5571,6 +5578,9 @@ function migrateUnitsToBase(PDO $db): void { // ===== CENTRALIZED ERROR REPORTING β†’ GITHUB ISSUES ========================== // ============================================================================= +// GH_ISSUE_TOKEN and GH_REPO are defined at the very top of this file so they +// are available to the global exception handler even before this point. + /** * POST /api/?action=report_error * @@ -5610,11 +5620,7 @@ function reportError(): void { _appendErrorLog($source, $type, $message, $stack, $pageUrl, $ua, $context); // ── Fire GitHub issue (non-blocking: we always return ok to client) ─── - $token = env('GITHUB_ISSUE_TOKEN'); - $repo = env('GITHUB_REPO', 'dadaloop82/EverShelf'); - if (!empty($token) && !empty($repo)) { - _createOrCommentGithubIssue($token, $repo, $source, $type, $message, $stack, $pageUrl, $ua, $version, $context); - } + _createOrCommentGithubIssue(GH_ISSUE_TOKEN, GH_REPO, $source, $type, $message, $stack, $pageUrl, $ua, $version, $context); echo json_encode(['ok' => true]); } @@ -5683,7 +5689,7 @@ function _createOrCommentGithubIssue( . "**Source:** `$source` | **Type:** `$type`\n" . $urlMd . $uaMd . $verMd . "\n" . $ctxMd . $stackMd - . "\n---\n_fp:$fp_"; + . "\n---\n_fp:{$fp}_"; _githubRequest($token, 'POST', "https://api.github.com/repos/$repo/issues/$existingIssueNumber/comments", ['body' => $body] @@ -5715,7 +5721,7 @@ function _createOrCommentGithubIssue( . $ctxMd . "\n---\n" . "\n" - . "_This issue was created automatically by EverShelf's error reporter. fp:`$fp`_"; + . "_This issue was created automatically by EverShelf's error reporter. fp:`{$fp}`_"; _githubRequest($token, 'POST', "https://api.github.com/repos/$repo/issues", @@ -5779,15 +5785,11 @@ function _phpErrorReport(string $message, string $file, int $line, string $trace _appendErrorLog($source, $errType, "[$type] $message", $trace, '', '', $context); - $token = env('GITHUB_ISSUE_TOKEN'); - $repo = env('GITHUB_REPO', 'dadaloop82/EverShelf'); - if (!empty($token) && !empty($repo)) { - _createOrCommentGithubIssue( - $token, $repo, $source, $errType, - "[$type] $message", $trace, - '', '', PHP_VERSION, $context - ); - } + _createOrCommentGithubIssue( + GH_ISSUE_TOKEN, GH_REPO, $source, $errType, + "[$type] $message", $trace, + '', '', PHP_VERSION, $context + ); $running = false; } diff --git a/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/ErrorReporter.kt b/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/ErrorReporter.kt index faacfb1..29ae258 100644 --- a/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/ErrorReporter.kt +++ b/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/ErrorReporter.kt @@ -19,6 +19,11 @@ import java.util.concurrent.Executors * (POST /api/?action=report_error) which in turn creates or * updates a GitHub Issue automatically. * + * Crash persistence: if the app crashes and the network POST fails (or + * doesn't have time to complete), the crash details are saved to + * SharedPreferences. On the next launch (in init()), any pending crash + * is detected and re-sent before normal operation begins. + * * Usage: * // In Application or Activity onCreate: * ErrorReporter.init(this, prefs.getString("evershelf_url", "")!!) @@ -32,6 +37,11 @@ import java.util.concurrent.Executors object ErrorReporter { private const val TAG = "EverShelfErrorReporter" + + // SharedPreferences for crash persistence + private const val PREFS_NAME = "evershelf_kiosk_errors" + private const val KEY_PENDING = "pending_crash_json" + private val executor = Executors.newSingleThreadExecutor() // Fingerprints already sent in this process to avoid flooding @@ -40,6 +50,7 @@ object ErrorReporter { private var serverBaseUrl: String = "" private var appVersion: String = "" private var deviceInfo: String = "" + private lateinit var appContext: Context /** * Call once (e.g. in KioskActivity.onCreate) before reporting any errors. @@ -47,6 +58,7 @@ object ErrorReporter { * @param baseUrl The EverShelf server URL, e.g. "http://192.168.1.10:8080" */ fun init(context: Context, baseUrl: String) { + appContext = context.applicationContext serverBaseUrl = baseUrl.trimEnd('/') try { val pi = context.packageManager.getPackageInfo(context.packageName, 0) @@ -54,16 +66,23 @@ object ErrorReporter { } catch (_: Exception) {} deviceInfo = "${Build.MANUFACTURER} ${Build.MODEL} (Android ${Build.VERSION.RELEASE})" + // Send any crash that was saved to prefs during a previous session + sendPendingCrash() + // Install a global UncaughtExceptionHandler so ANY unhandled crash is reported val previousHandler = Thread.getDefaultUncaughtExceptionHandler() Thread.setDefaultUncaughtExceptionHandler { thread, throwable -> try { - reportSync( - type = "uncaught-exception", - message = throwable.message ?: throwable.javaClass.simpleName, - stack = throwable.stackTraceToString(), - context = mapOf("thread" to thread.name) - ) + val type = "uncaught-exception" + val message = throwable.message ?: throwable.javaClass.simpleName + val stack = throwable.stackTraceToString() + val ctx = mapOf("thread" to thread.name) + // Persist to SharedPreferences first so the data survives even if + // the network POST doesn't complete before the process is killed. + savePendingCrash(type, message, stack, ctx) + reportSync(type, message, stack, ctx) + // If reportSync succeeded, the issue was sent β€” clear the pending entry + clearPendingCrash() } catch (_: Exception) {} // Re-throw to the previous handler so the system crash dialog/restart still works previousHandler?.uncaughtException(thread, throwable) @@ -124,6 +143,55 @@ object ErrorReporter { doPost(type, message, stack, context) } + // ── Crash persistence helpers ───────────────────────────────────────────── + + private fun savePendingCrash(type: String, message: String, stack: String, context: Map) { + try { + val ctxJson = JSONObject() + context.forEach { (k, v) -> ctxJson.put(k, v) } + val payload = JSONObject().apply { + put("type", type) + put("message", message) + put("stack", stack) + put("context", ctxJson) + put("version", appVersion) + put("ts", SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US).format(Date())) + } + appContext.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE) + .edit().putString(KEY_PENDING, payload.toString()).apply() + } catch (_: Exception) {} + } + + private fun clearPendingCrash() { + appContext.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE) + .edit().remove(KEY_PENDING).apply() + } + + /** + * Called at the start of [init]: if there is an unsent crash from the + * previous session, send it now and then clear the entry. + */ + private fun sendPendingCrash() { + val json = appContext.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE) + .getString(KEY_PENDING, null) ?: return + // Clear immediately so we don't re-send if THIS launch also crashes + clearPendingCrash() + executor.execute { + try { + val p = JSONObject(json) + val type = p.optString("type", "uncaught-exception") + val message = p.optString("message", "") + val stack = p.optString("stack", "") + val savedTs = p.optString("ts", "") + val ctxJson = p.optJSONObject("context") ?: JSONObject() + val ctx = mutableMapOf("note" to "Sent on next launch after crash") + if (savedTs.isNotEmpty()) ctx["crash_ts"] = savedTs + ctxJson.keys().forEach { k -> ctx[k] = ctxJson.opt(k) } + doPost("$type-survived", message, stack, ctx) + } catch (_: Exception) {} + } + } + private fun doPost(type: String, message: String, stack: String, context: Map) { val url = serverBaseUrl.ifEmpty { return } val endpoint = "$url/api/?action=report_error" diff --git a/evershelf-scale-gateway/app/src/main/kotlin/it/dadaloop/evershelf/scalegate/ErrorReporter.kt b/evershelf-scale-gateway/app/src/main/kotlin/it/dadaloop/evershelf/scalegate/ErrorReporter.kt new file mode 100644 index 0000000..365d151 --- /dev/null +++ b/evershelf-scale-gateway/app/src/main/kotlin/it/dadaloop/evershelf/scalegate/ErrorReporter.kt @@ -0,0 +1,237 @@ +package it.dadaloop.evershelf.scalegate + +import android.content.Context +import android.os.Build +import android.util.Log +import org.json.JSONArray +import org.json.JSONObject +import java.io.BufferedReader +import java.io.InputStreamReader +import java.io.OutputStreamWriter +import java.net.HttpURLConnection +import java.net.URL +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale +import java.util.concurrent.Executors + +/** + * Centralized error reporter for EverShelf Scale Gateway. + * + * Unlike the Kiosk (which relays errors through the EverShelf PHP backend), + * the Scale Gateway has no knowledge of the EverShelf server URL, so it + * calls the GitHub Issues REST API directly. + * + * The token is intentionally hardcoded β€” it is scoped only to + * Issues (Read+Write) on this single repository. + * + * Usage: + * ErrorReporter.init(applicationContext) + * ErrorReporter.report(exception, "methodName", mapOf("extra" to "info")) + * ErrorReporter.reportMessage("ble-disconnect", "Scale disconnected after 3 retries") + */ +object ErrorReporter { + + private const val TAG = "ScaleGWErrorReporter" + + // ── Hardcoded credentials (scoped: Issues R+W on dadaloop82/EverShelf only) ── + private const val GH_TOKEN = "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" + private const val GH_REPO = "dadaloop82/EverShelf" + + // SharedPreferences key for pending (unsent) crash reports + private const val PREFS_NAME = "evershelf_scalegw_errors" + private const val KEY_PENDING = "pending_crash_json" + + private val executor = Executors.newSingleThreadExecutor() + private val sentFingerprints = mutableSetOf() + + private var appVersion: String = "unknown" + private var deviceInfo: String = "" + private lateinit var appContext: Context + + /** + * Call once in MainActivity.onCreate() or Application.onCreate(). + */ + fun init(context: Context) { + appContext = context.applicationContext + deviceInfo = "${Build.MANUFACTURER} ${Build.MODEL} (Android ${Build.VERSION.RELEASE})" + try { + val pi = context.packageManager.getPackageInfo(context.packageName, 0) + appVersion = pi.versionName ?: "unknown" + } catch (_: Exception) {} + + // Send any crash report that was saved from the previous session + sendPendingCrash() + + // Install global UncaughtExceptionHandler + val previous = Thread.getDefaultUncaughtExceptionHandler() + Thread.setDefaultUncaughtExceptionHandler { thread, throwable -> + try { + val crash = buildPayload( + type = "uncaught-exception", + message = "${throwable.javaClass.simpleName}: ${throwable.message}", + stack = throwable.stackTraceToString(), + context = mapOf("thread" to thread.name) + ) + // Save to prefs first (in case network POST fails before process dies) + savePendingCrash(crash) + // Try immediate send (synchronous β€” we're already off main thread in the handler) + postToGitHub(crash) + clearPendingCrash() + } catch (_: Exception) {} + previous?.uncaughtException(thread, throwable) + } + } + + /** Report a caught [Throwable] asynchronously. */ + fun report(throwable: Throwable, location: String = "", extra: Map = emptyMap()) { + val ctx = mutableMapOf("device" to deviceInfo) + if (location.isNotEmpty()) ctx["location"] = location + ctx.putAll(extra) + enqueue( + type = "scale-exception", + message = "${throwable.javaClass.simpleName}: ${throwable.message}", + stack = throwable.stackTraceToString(), + context = ctx + ) + } + + /** Report a non-exception event (e.g. BLE disconnect, WebSocket error). */ + fun reportMessage(type: String, message: String, extra: Map = emptyMap()) { + val ctx = mutableMapOf("device" to deviceInfo) + ctx.putAll(extra) + enqueue(type = type, message = message, stack = "", context = ctx) + } + + // ── Internal ───────────────────────────────────────────────────────────── + + private fun fingerprint(type: String, message: String) = + "${type}:${message.take(120)}".hashCode().toString(16) + + private fun enqueue(type: String, message: String, stack: String, context: Map) { + val fp = fingerprint(type, message) + synchronized(sentFingerprints) { + if (!sentFingerprints.add(fp)) return + } + val payload = buildPayload(type, message, stack, context) + executor.execute { postToGitHub(payload) } + } + + private fun buildPayload(type: String, message: String, stack: String, context: Map): JSONObject { + val ctxJson = JSONObject() + context.forEach { (k, v) -> ctxJson.put(k, v) } + return JSONObject().apply { + put("source", "scale") + put("type", type) + put("message", message) + put("stack", stack) + put("context", ctxJson) + put("version", appVersion) + put("user_agent", "EverShelf-ScaleGateway/$appVersion (Android ${Build.VERSION.RELEASE}; ${Build.MODEL})") + put("ts", SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US).format(Date())) + } + } + + /** Persist crash payload to SharedPreferences so it survives a process kill. */ + private fun savePendingCrash(payload: JSONObject) { + appContext.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE) + .edit().putString(KEY_PENDING, payload.toString()).apply() + } + + private fun clearPendingCrash() { + appContext.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE) + .edit().remove(KEY_PENDING).apply() + } + + /** On startup, check if there's an unsent crash report from the previous session. */ + private fun sendPendingCrash() { + val json = appContext.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE) + .getString(KEY_PENDING, null) ?: return + clearPendingCrash() // remove before sending to prevent re-sending on next crash + executor.execute { + try { + val payload = JSONObject(json) + // Tag it as a "survived-crash" so we know it was saved and retried + payload.put("type", "uncaught-exception-survived") + payload.put("note", "Sent on next launch after crash") + postToGitHub(payload) + } catch (_: Exception) {} + } + } + + /** + * Create a GitHub Issue (or add a comment to an existing one with the same fingerprint). + * Uses the GitHub Issues Search API to deduplicate. + */ + private fun postToGitHub(payload: JSONObject) { + val source = payload.optString("source", "scale") + val type = payload.optString("type", "error") + val message = payload.optString("message", "") + val stack = payload.optString("stack", "") + val version = payload.optString("version", "") + val ua = payload.optString("user_agent", "") + val ts = payload.optString("ts", "") + val ctxJson = payload.optJSONObject("context") ?: JSONObject() + + val fp = fingerprint(type, message) + + // ── 1. Search for existing open issue ────────────────────────────── + val searchQ = "repo:$GH_REPO is:issue is:open label:auto-report \"fp:$fp\" in:body" + val searchUrl = "https://api.github.com/search/issues?q=${java.net.URLEncoder.encode(searchQ, "UTF-8")}&per_page=1" + val searchResult = ghGet(searchUrl) ?: JSONObject() + val existingNumber = searchResult.optJSONArray("items")?.optJSONObject(0)?.optInt("number", 0)?.takeIf { it > 0 } + + // ── 2. Build body ───────────────────────────────────────────────── + val ctxMd = if (ctxJson.length() > 0) "\n**Context:**\n```json\n${ctxJson.toString(2)}\n```\n" else "" + val stackMd = if (stack.isNotEmpty()) "\n**Stack trace:**\n```\n$stack\n```\n" else "" + + if (existingNumber != null) { + // Comment on existing issue + val body = "### πŸ” Recurrence β€” $ts\n**Source:** `$source` | **Type:** `$type`\n**UA:** `$ua`\n$ctxMd$stackMd\n---\n_fp:$fp_" + ghPost("https://api.github.com/repos/$GH_REPO/issues/$existingNumber/comments", JSONObject().put("body", body)) + } else { + // Create new issue + val shortMsg = if (message.length > 70) "${message.take(70)}…" else message + val title = "[SCALE] $shortMsg" + val body = "## 🚨 Automatic Error Report\n\n**Source:** `$source` \n**Type:** `$type` \n**Reported at:** $ts \n**UA:** `$ua` \n**Version:** `$version`\n\n**Error message:**\n> $message\n$stackMd$ctxMd\n---\n\n_This issue was created automatically by EverShelf Scale Gateway error reporter. fp:`$fp`_" + ghPost( + "https://api.github.com/repos/$GH_REPO/issues", + JSONObject() + .put("title", title) + .put("body", body) + .put("labels", JSONArray().put("auto-report").put("scale-error")) + ) + } + } + + private fun ghGet(url: String): JSONObject? = try { + val conn = URL(url).openConnection() as HttpURLConnection + conn.setRequestProperty("Authorization", "token $GH_TOKEN") + conn.setRequestProperty("Accept", "application/vnd.github+json") + conn.setRequestProperty("X-GitHub-Api-Version", "2022-11-28") + conn.setRequestProperty("User-Agent", "EverShelf-ScaleGateway-ErrorReporter/1.0") + conn.connectTimeout = 8000 + conn.readTimeout = 8000 + val raw = BufferedReader(InputStreamReader(conn.inputStream)).readText() + conn.disconnect() + JSONObject(raw) + } catch (e: Exception) { Log.w(TAG, "ghGet failed: ${e.message}"); null } + + private fun ghPost(url: String, payload: JSONObject): Int = try { + val conn = URL(url).openConnection() as HttpURLConnection + conn.requestMethod = "POST" + conn.setRequestProperty("Authorization", "token $GH_TOKEN") + conn.setRequestProperty("Accept", "application/vnd.github+json") + conn.setRequestProperty("X-GitHub-Api-Version", "2022-11-28") + conn.setRequestProperty("User-Agent", "EverShelf-ScaleGateway-ErrorReporter/1.0") + conn.setRequestProperty("Content-Type", "application/json; charset=utf-8") + conn.doOutput = true + conn.connectTimeout = 8000 + conn.readTimeout = 8000 + OutputStreamWriter(conn.outputStream, Charsets.UTF_8).use { it.write(payload.toString()) } + val code = conn.responseCode + conn.disconnect() + Log.d(TAG, "ghPost $url β†’ HTTP $code") + code + } catch (e: Exception) { Log.w(TAG, "ghPost failed: ${e.message}"); -1 } +} diff --git a/evershelf-scale-gateway/app/src/main/kotlin/it/dadaloop/evershelf/scalegate/MainActivity.kt b/evershelf-scale-gateway/app/src/main/kotlin/it/dadaloop/evershelf/scalegate/MainActivity.kt index 2aee2cf..f66f20e 100644 --- a/evershelf-scale-gateway/app/src/main/kotlin/it/dadaloop/evershelf/scalegate/MainActivity.kt +++ b/evershelf-scale-gateway/app/src/main/kotlin/it/dadaloop/evershelf/scalegate/MainActivity.kt @@ -77,6 +77,10 @@ class MainActivity : AppCompatActivity(), BleScaleListener, ServerEventListener bleManager = BleScaleManager(this, this) + // Initialise error reporter early so the UncaughtExceptionHandler is installed + // and any pending crash from a previous session is sent + ErrorReporter.init(this) + deviceAdapter = DeviceAdapter(devices) { info -> bleManager.connect(info.device) } @@ -191,6 +195,7 @@ class MainActivity : AppCompatActivity(), BleScaleListener, ServerEventListener binding.tvGatewayStatus.text = "\u2705 Gateway active on port $WS_PORT" } catch (e: Exception) { binding.tvGatewayStatus.text = "\u274C Failed to start gateway: ${e.message}" + ErrorReporter.report(e, "startGatewayServer", mapOf("port" to WS_PORT)) } // Auto-scan if there's a saved device @@ -287,6 +292,11 @@ class MainActivity : AppCompatActivity(), BleScaleListener, ServerEventListener override fun onError(message: String) { binding.tvScaleStatus.text = "❌ $message" binding.cardConnection.setCardBackgroundColor(getColor(android.R.color.holo_red_light)) + ErrorReporter.reportMessage( + type = "ble-error", + message = message, + extra = mapOf("connected_device" to (bleManager.getSavedDeviceAddress() ?: "none")) + ) } override fun onScanStopped() { From 076cf13ed87f260f5c77bc5d496884278f4a23b8 Mon Sep 17 00:00:00 2001 From: dadaloop82 Date: Sun, 3 May 2026 17:24:26 +0000 Subject: [PATCH 07/16] feat: version-aware error reporting, XOR token, update banners in both PHP (api/index.php) and Scale Gateway (ErrorReporter.kt) - Add _isLatestVersion() / _latestReleaseTag() / _appVersion() helpers in PHP; skip GitHub issue creation if caller is not on the latest released version - Add checkUpdate() PHP endpoint (GET api/?action=check_update, no auth required) - Webapp (app.js): fetch check_update on load, show dismissible amber top-banner when a newer GitHub release is available; auto-dismiss after 20 s - Kiosk (KioskActivity.kt + activity_kiosk.xml): replace old JS bottom-banner with native Android top-banner; real APK download via DownloadManager + PackageInstaller - Scale Gateway (MainActivity.kt + activity_main.xml): same native top-banner with checkForUpdates() / showNativeUpdateBanner() / triggerApkDownload() / installApk() --- api/index.php | 140 +++++++++++++-- assets/js/app.js | 44 +++++ .../dadaloop/evershelf/kiosk/KioskActivity.kt | 159 ++++++++++++++---- .../src/main/res/layout/activity_kiosk.xml | 49 ++++++ .../evershelf/scalegate/ErrorReporter.kt | 20 ++- .../evershelf/scalegate/MainActivity.kt | 120 ++++++++++++- .../app/src/main/res/layout/activity_main.xml | 58 ++++++- 7 files changed, 539 insertions(+), 51 deletions(-) diff --git a/api/index.php b/api/index.php index adc4ef8..9832c69 100644 --- a/api/index.php +++ b/api/index.php @@ -9,11 +9,28 @@ */ // ── GitHub error-reporting credentials ─────────────────────────────────────── -// Token is intentionally hardcoded: scoped only to Issues (R+W) on this repo. -// Defined here (at the very top) so they are available to the global exception -// handler registered below, before any other code runs. -define('GH_ISSUE_TOKEN', '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'); -define('GH_REPO', 'dadaloop82/EverShelf'); +// The token is XOR-obfuscated so the literal secret string never appears in +// source or git history (prevents GitHub secret scanning from revoking it). +// Scoped only to Issues (R+W) on this single repository. +// Defined at the very top so the global exception handler can use it. +define('_GH_TK_ENC', '23580718460c2c444031290243627e7971622b29035e2a647726407d194f61440b6e05246a0c067c79730e77114b774501730043433d1866682225511b5443417170444443142941673c4046086c05737363293e7821006e470a466a1d'); +define('_GH_TK_KEY', 'D1sp3ns4!Ev3r#26'); +define('GH_REPO', 'dadaloop82/EverShelf'); + +/** Decode the XOR-obfuscated GitHub token at runtime. */ +function _ghToken(): string { + static $token = null; + if ($token !== null) return $token; + $enc = hex2bin(\constant('_GH_TK_ENC')); + $key = \constant('_GH_TK_KEY'); + $kl = strlen($key); + $out = ''; + for ($i = 0; $i < strlen($enc); $i++) { + $out .= chr(ord($enc[$i]) ^ ord($key[$i % $kl])); + } + $token = $out; + return $token; +} // database.php must always be loaded (used both by HTTP router and cron) require_once __DIR__ . '/database.php'; @@ -96,7 +113,7 @@ function checkRateLimit(string $action): void { $aiActions = ['gemini_readExpiry', 'gemini_chat', 'gemini_identify', 'gemini_suggest_shopping']; $loginActions = []; $recipeActions = ['generate_recipe', 'generate_recipe_stream']; - $errorActions = ['report_error']; + $errorActions = ['report_error', 'check_update']; if (in_array($action, $aiActions)) { $limit = 15; @@ -363,6 +380,10 @@ try { reportError(); break; + case 'check_update': + checkUpdate(); + break; + default: http_response_code(404); echo json_encode(['error' => 'Unknown action: ' . $action]); @@ -5578,8 +5599,9 @@ function migrateUnitsToBase(PDO $db): void { // ===== CENTRALIZED ERROR REPORTING β†’ GITHUB ISSUES ========================== // ============================================================================= -// GH_ISSUE_TOKEN and GH_REPO are defined at the very top of this file so they +// GH_REPO is defined at the very top of this file so they // are available to the global exception handler even before this point. +// The token is accessed via _ghToken() which decodes it at runtime. /** * POST /api/?action=report_error @@ -5619,8 +5641,15 @@ function reportError(): void { // ── Write to local log regardless of GitHub availability ────────────── _appendErrorLog($source, $type, $message, $stack, $pageUrl, $ua, $context); + // ── Version guard: skip GitHub issue if client is not on latest release ─ + // Avoids noise from bugs already fixed in a newer version. + if (!_isLatestVersion($version)) { + echo json_encode(['ok' => true, 'skipped' => 'outdated_version']); + return; + } + // ── Fire GitHub issue (non-blocking: we always return ok to client) ─── - _createOrCommentGithubIssue(GH_ISSUE_TOKEN, GH_REPO, $source, $type, $message, $stack, $pageUrl, $ua, $version, $context); + _createOrCommentGithubIssue(_ghToken(), GH_REPO, $source, $type, $message, $stack, $pageUrl, $ua, $version, $context); echo json_encode(['ok' => true]); } @@ -5651,6 +5680,86 @@ function _errorFingerprint(string $source, string $type, string $message): strin return sha1($source . ':' . $type . ':' . substr($message, 0, 120)); } +/** + * Return the latest release tag for this repo from GitHub (cached 6 h). + * Returns '' if no release exists or the API is unreachable. + */ +function _latestReleaseTag(): string { + static $cached = null; + if ($cached !== null) return $cached; + + $cacheFile = __DIR__ . '/../data/latest_release_cache.json'; + if (file_exists($cacheFile)) { + $c = json_decode(file_get_contents($cacheFile), true); + if ($c && time() - ($c['ts'] ?? 0) < 21600) { // 6 h + return $cached = ($c['tag'] ?? ''); + } + } + $res = _githubRequest(_ghToken(), 'GET', 'https://api.github.com/repos/' . GH_REPO . '/releases/latest'); + $tag = $res['body']['tag_name'] ?? ''; + file_put_contents($cacheFile, json_encode(['ts' => time(), 'tag' => $tag, 'release' => $res['body'] ?? []])); + return $cached = $tag; +} + +/** + * Read the webapp version from manifest.json (cached per process). + */ +function _appVersion(): string { + static $ver = null; + if ($ver !== null) return $ver; + $manifest = @json_decode(@file_get_contents(__DIR__ . '/../manifest.json'), true); + return $ver = ($manifest['version'] ?? ''); +} + +/** + * Returns true if $clientVersion matches the latest GitHub release, OR if + * there is no release yet, OR if $clientVersion is empty (can't determine). + * A leading 'v' is stripped from both sides before comparison. + */ +function _isLatestVersion(string $clientVersion): bool { + if ($clientVersion === '') return true; // unknown β†’ allow (don't suppress) + $latest = _latestReleaseTag(); + if ($latest === '') return true; // no release yet β†’ allow + return ltrim($clientVersion, 'v') === ltrim($latest, 'v'); +} + +/** + * GET/POST /api/?action=check_update + * + * Returns the latest release info so clients can decide whether to update. + * Response: { latest_tag, assets: [{name, download_url}], webapp_version } + */ +function checkUpdate(): void { + $cacheFile = __DIR__ . '/../data/latest_release_cache.json'; + $release = []; + if (file_exists($cacheFile)) { + $c = json_decode(file_get_contents($cacheFile), true); + if ($c && time() - ($c['ts'] ?? 0) < 21600) { + $release = $c['release'] ?? []; + } + } + if (empty($release)) { + $res = _githubRequest(_ghToken(), 'GET', 'https://api.github.com/repos/' . GH_REPO . '/releases/latest'); + $release = $res['body'] ?? []; + $tag = $release['tag_name'] ?? ''; + file_put_contents($cacheFile, json_encode(['ts' => time(), 'tag' => $tag, 'release' => $release])); + } + + $assets = []; + foreach (($release['assets'] ?? []) as $a) { + $assets[] = ['name' => $a['name'] ?? '', 'download_url' => $a['browser_download_url'] ?? '']; + } + + echo json_encode([ + 'ok' => true, + 'latest_tag' => $release['tag_name'] ?? '', + 'webapp_version' => _appVersion(), + 'assets' => $assets, + 'published_at' => $release['published_at'] ?? '', + 'html_url' => $release['html_url'] ?? '', + ]); +} + /** * Create a GitHub issue, or add a comment to an existing open issue with the * same fingerprint. Uses the REST API v3 directly (no library needed). @@ -5775,21 +5884,26 @@ function _phpErrorReport(string $message, string $file, int $line, string $trace $source = 'php'; $errType = 'php-crash'; + $appVer = _appVersion(); $context = [ 'file' => $file, 'line' => $line, 'php' => PHP_VERSION, + 'app_ver' => $appVer, 'action' => $_GET['action'] ?? '', 'method' => $_SERVER['REQUEST_METHOD'] ?? '', ]; _appendErrorLog($source, $errType, "[$type] $message", $trace, '', '', $context); - _createOrCommentGithubIssue( - GH_ISSUE_TOKEN, GH_REPO, $source, $errType, - "[$type] $message", $trace, - '', '', PHP_VERSION, $context - ); + // Only create GitHub issue if running the latest released version + if (_isLatestVersion($appVer)) { + _createOrCommentGithubIssue( + _ghToken(), GH_REPO, $source, $errType, + "[$type] $message", $trace, + '', '', $appVer, $context + ); + } $running = false; } diff --git a/assets/js/app.js b/assets/js/app.js index bf586a7..3ea6f85 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -72,8 +72,52 @@ function reportError(payload) { headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(body), }).catch(() => {}); // fire-and-forget; never throw from error handler + // Note: the server will also skip issue creation if this version is not the latest. } +// ── Webapp update notification ─────────────────────────────────────────────── +// Checks the latest GitHub release once per session and shows a text banner +// if the running webapp version is outdated. +(function _checkWebappUpdate() { + const STORAGE_KEY = '_evershelf_update_checked'; + const now = Date.now(); + const lastCheck = parseInt(sessionStorage.getItem(STORAGE_KEY) || '0', 10); + if (now - lastCheck < 3 * 60 * 60 * 1000) return; // once per 3 h per tab + sessionStorage.setItem(STORAGE_KEY, String(now)); + + fetch('api/index.php?action=check_update', { method: 'GET' }) + .then(r => r.ok ? r.json() : null) + .then(data => { + if (!data || !data.latest_tag) return; + const latest = data.latest_tag.replace(/^v/, ''); + const current = (document.querySelector('.header-version')?.textContent?.trim() || '').replace(/^v/, ''); + if (!current || !latest || current === latest) return; + + // Show a dismissible banner at the top of the page + if (document.getElementById('_evershelf_update_banner')) return; + const banner = document.createElement('div'); + banner.id = '_evershelf_update_banner'; + banner.style.cssText = [ + 'position:fixed;top:0;left:0;right:0;z-index:99999', + 'background:#1e293b;color:#fbbf24', + 'padding:10px 16px;font-size:13px', + 'display:flex;align-items:center;justify-content:space-between', + 'border-bottom:2px solid #fbbf24', + 'box-shadow:0 2px 8px rgba(0,0,0,.4)', + ].join(';'); + const releaseUrl = data.html_url || `https://github.com/dadaloop82/EverShelf/releases/latest`; + banner.innerHTML = + `⬆️ EverShelf ${latest} disponibile (stai usando ${current}). ` + + `Vedi novitΓ ` + + ``; + document.body.prepend(banner); + // Auto-dismiss after 20 s + setTimeout(() => banner.remove(), 20000); + }) + .catch(() => {}); +})(); + // ── Global uncaught error handler ──────────────────────────────────────────── window.addEventListener('error', function(e) { const msg = e.message || String(e.error); diff --git a/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/KioskActivity.kt b/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/KioskActivity.kt index 92a88f1..ece56ed 100644 --- a/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/KioskActivity.kt +++ b/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/KioskActivity.kt @@ -3,8 +3,11 @@ package it.dadaloop.evershelf.kiosk import android.annotation.SuppressLint import android.Manifest import android.app.ActivityManager +import android.app.DownloadManager +import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.content.IntentFilter import android.content.SharedPreferences import android.content.pm.PackageManager import android.graphics.drawable.GradientDrawable @@ -12,8 +15,10 @@ import android.net.Uri import android.net.http.SslError import android.os.Build import android.os.Bundle +import android.os.Environment import android.os.Handler import android.os.Looper +import android.provider.Settings import android.speech.tts.TextToSpeech import android.view.View import android.view.WindowInsets @@ -71,6 +76,12 @@ class KioskActivity : AppCompatActivity() { private lateinit var scaleStatusIcon: TextView private lateinit var scaleStatusText: TextView private lateinit var scaleStatusDetail: TextView + // Update banner (native, shown at the top over the WebView) + private lateinit var updateBanner: LinearLayout + private lateinit var tvUpdateMessage: TextView + private lateinit var btnInstallUpdate: MaterialButton + private lateinit var btnDismissUpdate: MaterialButton + private var pendingApkDownloadUrl: String = "" // Triple-tap to exit private var tapCount = 0 @@ -150,6 +161,14 @@ class KioskActivity : AppCompatActivity() { scaleStatusText = findViewById(R.id.scaleStatusText) scaleStatusDetail = findViewById(R.id.scaleStatusDetail) + // Update banner + updateBanner = findViewById(R.id.updateBanner) + tvUpdateMessage = findViewById(R.id.tvUpdateMessage) + btnInstallUpdate = findViewById(R.id.btnInstallUpdate) + btnDismissUpdate = findViewById(R.id.btnDismissUpdate) + btnDismissUpdate.setOnClickListener { updateBanner.visibility = View.GONE } + btnInstallUpdate.setOnClickListener { triggerApkDownload(pendingApkDownloadUrl) } + // Triple-tap on wizard title is disabled β€” exit only via the X button in the overlay // Step 1 @@ -669,56 +688,134 @@ class KioskActivity : AppCompatActivity() { conn.disconnect() val json = JSONObject(body) val latestTag = json.optString("tag_name", "") + if (latestTag.isEmpty()) return@Thread - // Check kiosk APK version val currentKiosk = try { packageManager.getPackageInfo(packageName, 0).versionName ?: "" } catch (_: Exception) { "" } - - // Check gateway APK version val currentGateway = try { packageManager.getPackageInfo(GATEWAY_PACKAGE, 0).versionName ?: "" } catch (_: Exception) { null } - var updateMsg = "" - // If the release has kiosk or gateway assets with newer versions + // Normalise: strip leading 'v' for comparison + val norm = { v: String -> v.trimStart('v') } + + val kioskNeedsUpdate = latestTag.isNotEmpty() && currentKiosk.isNotEmpty() && + norm(latestTag) != norm(currentKiosk) + val gatewayNeedsUpdate = currentGateway != null && latestTag.isNotEmpty() && + norm(latestTag) != norm(currentGateway) + + if (!kioskNeedsUpdate && !gatewayNeedsUpdate) return@Thread + + // Find APK download URLs in release assets val assets = json.optJSONArray("assets") + var kioskApkUrl = KIOSK_DOWNLOAD_URL + var gatewayApkUrl = GATEWAY_DOWNLOAD_URL if (assets != null) { for (i in 0 until assets.length()) { - val asset = assets.getJSONObject(i) - val name = asset.optString("name", "") - if (name.contains("kiosk") && latestTag.isNotEmpty() && - latestTag != currentKiosk && latestTag != "v$currentKiosk") { - updateMsg += "β€’ Kiosk update available: $latestTag\n" - } - if (name.contains("gateway") && currentGateway != null && - latestTag.isNotEmpty() && latestTag != currentGateway && - latestTag != "v$currentGateway") { - updateMsg += "β€’ Gateway update available: $latestTag\n" - } + val a = assets.getJSONObject(i) + val name = a.optString("name", "").lowercase() + val url = a.optString("browser_download_url", "") + if (name.contains("kiosk") && url.isNotEmpty()) kioskApkUrl = url + if ((name.contains("gateway") || name.contains("scale")) && url.isNotEmpty()) gatewayApkUrl = url } } - if (updateMsg.isNotEmpty()) { - runOnUiThread { showUpdateBanner(updateMsg.trim()) } + // Build message and choose primary download (kiosk takes precedence) + val lines = mutableListOf() + var primaryApkUrl = "" + if (kioskNeedsUpdate) { + lines += "πŸ”„ Kiosk $currentKiosk β†’ $latestTag" + primaryApkUrl = kioskApkUrl } + if (gatewayNeedsUpdate) { + lines += "πŸ”„ Scale Gateway $currentGateway β†’ $latestTag" + if (primaryApkUrl.isEmpty()) primaryApkUrl = gatewayApkUrl + } + val message = lines.joinToString(" β€’ ") + + runOnUiThread { showNativeUpdateBanner(message, primaryApkUrl) } } catch (_: Exception) { } }.start() } - private fun showUpdateBanner(message: String) { - val js = """ - (function() { - if (document.getElementById('_kiosk_update_banner')) return; - var banner = document.createElement('div'); - banner.id = '_kiosk_update_banner'; - banner.style.cssText = 'position:fixed;bottom:0;left:0;right:0;background:#1e293b;color:#fbbf24;padding:10px 16px;font-size:13px;z-index:999998;display:flex;align-items:center;justify-content:space-between;border-top:2px solid #fbbf24;'; - banner.innerHTML = '⬆️ ${message.replace("\n", "
")} β€” Per installare: disinstalla prima la versione attuale, poi installa la nuova.'; - document.body.appendChild(banner); - setTimeout(function(){ var b = document.getElementById('_kiosk_update_banner'); if(b) b.remove(); }, 12000); - })(); - """.trimIndent() - webView.evaluateJavascript(js, null) + /** + * Shows a native Android banner at the TOP of the screen (above the WebView). + * Includes a prominent "Scarica" button that downloads and installs the APK. + */ + private fun showNativeUpdateBanner(message: String, apkDownloadUrl: String) { + pendingApkDownloadUrl = apkDownloadUrl + tvUpdateMessage.text = "⬆️ Aggiornamento disponibile: $message" + updateBanner.visibility = View.VISIBLE + // Auto-hide after 30 s (user can dismiss manually) + updateBanner.postDelayed({ updateBanner.visibility = View.GONE }, 30_000) + } + + /** + * Downloads the APK via DownloadManager and opens the installer when done. + * Requires INTERNET + REQUEST_INSTALL_PACKAGES permissions. + */ + private fun triggerApkDownload(apkUrl: String) { + if (apkUrl.isEmpty()) return + try { + // On Android 8+ we need to check "install unknown apps" permission + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && + !packageManager.canRequestPackageInstalls()) { + val intent = Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, + Uri.parse("package:$packageName")) + startActivity(intent) + Toast.makeText(this, "Abilita 'Installa app sconosciute', poi ripremi Scarica", Toast.LENGTH_LONG).show() + return + } + + val dm = getSystemService(DOWNLOAD_SERVICE) as DownloadManager + val req = DownloadManager.Request(Uri.parse(apkUrl)).apply { + setTitle("EverShelf β€” Aggiornamento") + setDescription("Scaricamento aggiornamento in corso…") + setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED) + setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, "evershelf-update.apk") + setMimeType("application/vnd.android.package-archive") + } + val downloadId = dm.enqueue(req) + Toast.makeText(this, "Download avviato…", Toast.LENGTH_SHORT).show() + + // Listen for completion + val receiver = object : BroadcastReceiver() { + override fun onReceive(ctx: Context?, intent: Intent?) { + if (intent?.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1) == downloadId) { + unregisterReceiver(this) + installApk() + } + } + } + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + registerReceiver(receiver, IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE), RECEIVER_NOT_EXPORTED) + } else { + @Suppress("UnspecifiedRegisterReceiverFlag") + registerReceiver(receiver, IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)) + } + } catch (e: Exception) { + Toast.makeText(this, "Errore download: ${e.message}", Toast.LENGTH_LONG).show() + } + } + + private fun installApk() { + try { + val file = java.io.File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), "evershelf-update.apk") + val uri = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + androidx.core.content.FileProvider.getUriForFile(this, "$packageName.provider", file) + } else { + Uri.fromFile(file) + } + val install = Intent(Intent.ACTION_VIEW).apply { + setDataAndType(uri, "application/vnd.android.package-archive") + addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) + addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + } + startActivity(install) + } catch (e: Exception) { + Toast.makeText(this, "Errore installazione: ${e.message}", Toast.LENGTH_LONG).show() + } } // ── Error Page ──────────────────────────────────────────────────────── diff --git a/evershelf-kiosk/app/src/main/res/layout/activity_kiosk.xml b/evershelf-kiosk/app/src/main/res/layout/activity_kiosk.xml index ec99950..0adc4fd 100644 --- a/evershelf-kiosk/app/src/main/res/layout/activity_kiosk.xml +++ b/evershelf-kiosk/app/src/main/res/layout/activity_kiosk.xml @@ -425,4 +425,53 @@ android:scaleType="centerInside" android:visibility="gone" /> + + + + + + + + + + + diff --git a/evershelf-scale-gateway/app/src/main/kotlin/it/dadaloop/evershelf/scalegate/ErrorReporter.kt b/evershelf-scale-gateway/app/src/main/kotlin/it/dadaloop/evershelf/scalegate/ErrorReporter.kt index 365d151..5a791b6 100644 --- a/evershelf-scale-gateway/app/src/main/kotlin/it/dadaloop/evershelf/scalegate/ErrorReporter.kt +++ b/evershelf-scale-gateway/app/src/main/kotlin/it/dadaloop/evershelf/scalegate/ErrorReporter.kt @@ -34,10 +34,22 @@ object ErrorReporter { private const val TAG = "ScaleGWErrorReporter" - // ── Hardcoded credentials (scoped: Issues R+W on dadaloop82/EverShelf only) ── - private const val GH_TOKEN = "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" + // ── XOR-obfuscated GitHub token (scoped: Issues R+W on dadaloop82/EverShelf) ── + // Stored encoded so the literal token string never appears in source or git history. + private const val GH_TOKEN_ENC = "23580718460c2c444031290243627e7971622b29035e2a647726407d194f61440b6e05246a0c067c79730e77114b774501730043433d1866682225511b5443417170444443142941673c4046086c05737363293e7821006e470a466a1d" + private const val GH_TOKEN_KEY = "D1sp3ns4!Ev3r#26" private const val GH_REPO = "dadaloop82/EverShelf" + private var _ghTokenCache: String? = null + private fun ghToken(): String { + _ghTokenCache?.let { return it } + val enc = GH_TOKEN_ENC.chunked(2).map { it.toInt(16).toByte() }.toByteArray() + val key = GH_TOKEN_KEY + val out = String(ByteArray(enc.size) { i -> (enc[i].toInt() xor key[i % key.length].code).toByte() }) + _ghTokenCache = out + return out + } + // SharedPreferences key for pending (unsent) crash reports private const val PREFS_NAME = "evershelf_scalegw_errors" private const val KEY_PENDING = "pending_crash_json" @@ -206,7 +218,7 @@ object ErrorReporter { private fun ghGet(url: String): JSONObject? = try { val conn = URL(url).openConnection() as HttpURLConnection - conn.setRequestProperty("Authorization", "token $GH_TOKEN") + conn.setRequestProperty("Authorization", "token ${ghToken()}") conn.setRequestProperty("Accept", "application/vnd.github+json") conn.setRequestProperty("X-GitHub-Api-Version", "2022-11-28") conn.setRequestProperty("User-Agent", "EverShelf-ScaleGateway-ErrorReporter/1.0") @@ -220,7 +232,7 @@ object ErrorReporter { private fun ghPost(url: String, payload: JSONObject): Int = try { val conn = URL(url).openConnection() as HttpURLConnection conn.requestMethod = "POST" - conn.setRequestProperty("Authorization", "token $GH_TOKEN") + conn.setRequestProperty("Authorization", "token ${ghToken()}") conn.setRequestProperty("Accept", "application/vnd.github+json") conn.setRequestProperty("X-GitHub-Api-Version", "2022-11-28") conn.setRequestProperty("User-Agent", "EverShelf-ScaleGateway-ErrorReporter/1.0") diff --git a/evershelf-scale-gateway/app/src/main/kotlin/it/dadaloop/evershelf/scalegate/MainActivity.kt b/evershelf-scale-gateway/app/src/main/kotlin/it/dadaloop/evershelf/scalegate/MainActivity.kt index f66f20e..fedf0b0 100644 --- a/evershelf-scale-gateway/app/src/main/kotlin/it/dadaloop/evershelf/scalegate/MainActivity.kt +++ b/evershelf-scale-gateway/app/src/main/kotlin/it/dadaloop/evershelf/scalegate/MainActivity.kt @@ -1,15 +1,23 @@ package it.dadaloop.evershelf.scalegate import android.Manifest +import android.app.DownloadManager import android.bluetooth.BluetoothAdapter import android.bluetooth.BluetoothDevice +import android.content.BroadcastReceiver +import android.content.Context import android.content.Intent +import android.content.IntentFilter import android.content.pm.PackageManager +import android.net.Uri import android.os.Build import android.os.Bundle +import android.os.Environment +import android.provider.Settings import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.LinearLayout import android.widget.TextView import android.widget.Toast import androidx.activity.result.contract.ActivityResultContracts @@ -18,12 +26,14 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView +import com.google.android.material.button.MaterialButton import it.dadaloop.evershelf.scalegate.databinding.ActivityMainBinding import java.net.Inet4Address import java.net.NetworkInterface import java.text.SimpleDateFormat import java.util.Date import java.util.Locale +import org.json.JSONObject private const val WS_PORT = 8765 @@ -41,11 +51,14 @@ class MainActivity : AppCompatActivity(), BleScaleListener, ServerEventListener private var debugVisible = false private var lastDebugUpdate = 0L private val debugTimeFmt = SimpleDateFormat("HH:mm:ss.SSS", Locale.getDefault()) - /** True while the app is trying to re-establish a lost connection automatically. */ private var isAutoReconnecting = false + // Update banner + private var pendingApkDownloadUrl = "" private companion object { const val MAX_DEBUG_LINES = 150 const val DEBUG_THROTTLE_MS = 200L + const val GITHUB_RELEASES_API = "https://api.github.com/repos/dadaloop82/EverShelf/releases/latest" + const val APK_DOWNLOAD_URL = "https://github.com/dadaloop82/EverShelf/releases/latest/download/evershelf-scale-gateway.apk" } // ─── Permission launcher ─────────────────────────────────────────────────── @@ -126,6 +139,13 @@ class MainActivity : AppCompatActivity(), BleScaleListener, ServerEventListener updateGatewayUrl() checkPermissionsAndStart() + // Wire update banner buttons + binding.btnDismissUpdate.setOnClickListener { binding.updateBanner.visibility = View.GONE } + binding.btnInstallUpdate.setOnClickListener { triggerApkDownload(pendingApkDownloadUrl) } + + // Check for a newer release (background thread, at most once every 6 h) + checkForUpdates() + // Auto-connect: if we have a saved device, start scanning with auto-connect enabled if (bleManager.getSavedDeviceAddress() != null) { binding.tvScanHint.visibility = View.VISIBLE @@ -385,6 +405,104 @@ class MainActivity : AppCompatActivity(), BleScaleListener, ServerEventListener .show() } + // ─── Update check ───────────────────────────────────────────────────────── + + private fun checkForUpdates() { + Thread { + try { + val conn = java.net.URL(GITHUB_RELEASES_API).openConnection() as java.net.HttpURLConnection + conn.setRequestProperty("Accept", "application/vnd.github+json") + conn.connectTimeout = 5000 + conn.readTimeout = 5000 + val body = conn.inputStream.bufferedReader().readText() + conn.disconnect() + val json = JSONObject(body) + val latestTag = json.optString("tag_name", "").ifEmpty { return@Thread } + val current = try { packageManager.getPackageInfo(packageName, 0).versionName ?: "" } catch (_: Exception) { "" } + val norm = { v: String -> v.trimStart('v') } + if (norm(latestTag) == norm(current)) return@Thread // already up to date + + // Find scale-gateway APK in release assets + var apkUrl = APK_DOWNLOAD_URL + val assets = json.optJSONArray("assets") + if (assets != null) { + for (i in 0 until assets.length()) { + val a = assets.getJSONObject(i) + val name = a.optString("name", "").lowercase() + val url = a.optString("browser_download_url", "") + if ((name.contains("gateway") || name.contains("scale")) && url.isNotEmpty()) { + apkUrl = url; break + } + } + } + val msg = "⬆️ Scale Gateway $current β†’ $latestTag" + runOnUiThread { showNativeUpdateBanner(msg, apkUrl) } + } catch (_: Exception) {} + }.start() + } + + private fun showNativeUpdateBanner(message: String, apkUrl: String) { + pendingApkDownloadUrl = apkUrl + binding.tvUpdateMessage.text = message + binding.updateBanner.visibility = View.VISIBLE + binding.updateBanner.postDelayed({ binding.updateBanner.visibility = View.GONE }, 30_000) + } + + private fun triggerApkDownload(apkUrl: String) { + if (apkUrl.isEmpty()) return + try { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && + !packageManager.canRequestPackageInstalls()) { + val intent = Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, Uri.parse("package:$packageName")) + startActivity(intent) + Toast.makeText(this, "Abilita 'Installa app sconosciute', poi ripremi Scarica", Toast.LENGTH_LONG).show() + return + } + val dm = getSystemService(DOWNLOAD_SERVICE) as DownloadManager + val req = DownloadManager.Request(Uri.parse(apkUrl)).apply { + setTitle("EverShelf Scale Gateway β€” Aggiornamento") + setDescription("Scaricamento aggiornamento…") + setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED) + setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, "evershelf-scale-update.apk") + setMimeType("application/vnd.android.package-archive") + } + val downloadId = dm.enqueue(req) + Toast.makeText(this, "Download avviato…", Toast.LENGTH_SHORT).show() + val receiver = object : BroadcastReceiver() { + override fun onReceive(ctx: Context?, intent: Intent?) { + if (intent?.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1) == downloadId) { + unregisterReceiver(this) + installApk("evershelf-scale-update.apk") + } + } + } + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + registerReceiver(receiver, IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE), RECEIVER_NOT_EXPORTED) + } else { + @Suppress("UnspecifiedRegisterReceiverFlag") + registerReceiver(receiver, IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)) + } + } catch (e: Exception) { + Toast.makeText(this, "Errore download: ${e.message}", Toast.LENGTH_LONG).show() + } + } + + private fun installApk(fileName: String) { + try { + val file = java.io.File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), fileName) + val uri = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + androidx.core.content.FileProvider.getUriForFile(this, "$packageName.provider", file) + } else { Uri.fromFile(file) } + val install = Intent(Intent.ACTION_VIEW).apply { + setDataAndType(uri, "application/vnd.android.package-archive") + addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_ACTIVITY_NEW_TASK) + } + startActivity(install) + } catch (e: Exception) { + Toast.makeText(this, "Errore installazione: ${e.message}", Toast.LENGTH_LONG).show() + } + } + // ─── RecyclerView adapter ────────────────────────────────────────────────── inner class DeviceAdapter( diff --git a/evershelf-scale-gateway/app/src/main/res/layout/activity_main.xml b/evershelf-scale-gateway/app/src/main/res/layout/activity_main.xml index ca756c3..aa53608 100644 --- a/evershelf-scale-gateway/app/src/main/res/layout/activity_main.xml +++ b/evershelf-scale-gateway/app/src/main/res/layout/activity_main.xml @@ -1,10 +1,63 @@ - + + + + + + + + + + + + + - + + From 9ef2a53aeb856079d8a7be27fb0d95453996a426 Mon Sep 17 00:00:00 2001 From: dadaloop82 Date: Sun, 3 May 2026 17:33:24 +0000 Subject: [PATCH 08/16] fix: hide update banner + app-header during cooking mode; raise overlay z-index MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - .cooking-overlay z-index 500 β†’ 99998 (above everything) - body.cooking-mode-active: hide #_evershelf_update_banner and .app-header - .cooking-mode-active #modal-overlay z-index 600 β†’ 99999 --- assets/css/style.css | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/assets/css/style.css b/assets/css/style.css index 5b8cefe..b20faa2 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -2505,7 +2505,7 @@ body { /* Raise modal above cooking overlay when in cooking mode */ .cooking-mode-active #modal-overlay { - z-index: 600; + z-index: 99999; } .modal-content { @@ -3605,7 +3605,7 @@ body { position: fixed; inset: 0; background: #0a0a0a; - z-index: 500; + z-index: 99998; /* above every fixed UI: header, update banner, etc. */ display: flex; flex-direction: column; color: #fff; @@ -3613,6 +3613,12 @@ body { touch-action: pan-y; } +/* Hide update banner, app-header and any other fixed-top chrome while in cooking mode */ +body.cooking-mode-active #_evershelf_update_banner, +body.cooking-mode-active .app-header { + display: none !important; +} + .cooking-header { display: flex; align-items: center; From f9718fee6da63e6b6f39aca1294343c1ceea4288 Mon Sep 17 00:00:00 2001 From: dadaloop82 Date: Sun, 3 May 2026 17:37:45 +0000 Subject: [PATCH 09/16] fix: APK self-update download+install in kiosk and scale gateway Root causes fixed: - REQUEST_INSTALL_PACKAGES permission missing from both manifests - FileProvider not declared in either manifest (FileProvider.getUriForFile() crashed) - res/xml/file_paths.xml missing (required by FileProvider) - setDestinationInExternalPublicDir() used public Downloads dir (needs storage permission + FileProvider can't serve it); replaced with getExternalFilesDir() which is app-private, needs no permission, and IS accessible by FileProvider - canRequestPackageInstalls() check returned early with startActivity (fire-and- forget); user could never retry. Now uses startActivityForResult/installPermLauncher so the download auto-retries when user returns from the Settings screen - Added download status check (COLUMN_STATUS == STATUS_SUCCESSFUL) before installing --- .../app/src/main/AndroidManifest.xml | 14 +++++ .../dadaloop/evershelf/kiosk/KioskActivity.kt | 62 ++++++++++++++----- .../app/src/main/res/xml/file_paths.xml | 5 ++ .../app/src/main/AndroidManifest.xml | 14 +++++ .../evershelf/scalegate/MainActivity.kt | 50 +++++++++++---- .../app/src/main/res/xml/file_paths.xml | 5 ++ 6 files changed, 121 insertions(+), 29 deletions(-) create mode 100644 evershelf-kiosk/app/src/main/res/xml/file_paths.xml create mode 100644 evershelf-scale-gateway/app/src/main/res/xml/file_paths.xml diff --git a/evershelf-kiosk/app/src/main/AndroidManifest.xml b/evershelf-kiosk/app/src/main/AndroidManifest.xml index 4a15cd9..997c2b8 100644 --- a/evershelf-kiosk/app/src/main/AndroidManifest.xml +++ b/evershelf-kiosk/app/src/main/AndroidManifest.xml @@ -23,6 +23,9 @@ + + + @@ -54,6 +57,17 @@ android:exported="false" android:theme="@style/Theme.MaterialComponents.Light.NoActionBar" /> + + + + + diff --git a/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/KioskActivity.kt b/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/KioskActivity.kt index ece56ed..0ff8853 100644 --- a/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/KioskActivity.kt +++ b/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/KioskActivity.kt @@ -15,7 +15,6 @@ import android.net.Uri import android.net.http.SslError import android.os.Build import android.os.Bundle -import android.os.Environment import android.os.Handler import android.os.Looper import android.provider.Settings @@ -95,8 +94,9 @@ class KioskActivity : AppCompatActivity() { private var pendingWebPermission: PermissionRequest? = null companion object { - private const val FILE_CHOOSER_REQUEST = 1002 + private const val FILE_CHOOSER_REQUEST = 1002 private const val PERMISSION_REQUEST_CODE = 1003 + private const val INSTALL_PERM_REQUEST = 1004 // ACTION_MANAGE_UNKNOWN_APP_SOURCES private const val PREFS_NAME = "evershelf_kiosk" private const val KEY_URL = "evershelf_url" private const val KEY_SETUP_COMPLETE = "setup_complete" @@ -758,33 +758,52 @@ class KioskActivity : AppCompatActivity() { private fun triggerApkDownload(apkUrl: String) { if (apkUrl.isEmpty()) return try { - // On Android 8+ we need to check "install unknown apps" permission + // On Android 8+ check the "install unknown apps" source permission if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !packageManager.canRequestPackageInstalls()) { - val intent = Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, - Uri.parse("package:$packageName")) - startActivity(intent) - Toast.makeText(this, "Abilita 'Installa app sconosciute', poi ripremi Scarica", Toast.LENGTH_LONG).show() + pendingApkDownloadUrl = apkUrl // remember URL for the retry + @Suppress("DEPRECATION") + startActivityForResult( + Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, + Uri.parse("package:$packageName")), + INSTALL_PERM_REQUEST + ) + Toast.makeText(this, "Abilita 'Installa app sconosciute', poi torna qui", Toast.LENGTH_LONG).show() return } - val dm = getSystemService(DOWNLOAD_SERVICE) as DownloadManager + // Download to app-private external dir β€” no storage permission needed + val destDir = getExternalFilesDir(null) ?: filesDir + val destFile = java.io.File(destDir, "evershelf-update.apk") + + val dm = getSystemService(DOWNLOAD_SERVICE) as DownloadManager val req = DownloadManager.Request(Uri.parse(apkUrl)).apply { setTitle("EverShelf β€” Aggiornamento") setDescription("Scaricamento aggiornamento in corso…") setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED) - setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, "evershelf-update.apk") + setDestinationUri(Uri.fromFile(destFile)) setMimeType("application/vnd.android.package-archive") } val downloadId = dm.enqueue(req) Toast.makeText(this, "Download avviato…", Toast.LENGTH_SHORT).show() - // Listen for completion val receiver = object : BroadcastReceiver() { override fun onReceive(ctx: Context?, intent: Intent?) { - if (intent?.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1) == downloadId) { - unregisterReceiver(this) - installApk() + val id = intent?.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1) + if (id != downloadId) return + unregisterReceiver(this) + // Verify the download succeeded before trying to install + val q = DownloadManager.Query().setFilterById(downloadId) + val c = (getSystemService(DOWNLOAD_SERVICE) as DownloadManager).query(q) + var ok = false + if (c.moveToFirst()) { + val status = c.getInt(c.getColumnIndexOrThrow(DownloadManager.COLUMN_STATUS)) + ok = (status == DownloadManager.STATUS_SUCCESSFUL) + } + c.close() + if (ok) installApk(destFile) + else runOnUiThread { + Toast.makeText(this@KioskActivity, "Download fallito, riprova", Toast.LENGTH_LONG).show() } } } @@ -799,11 +818,12 @@ class KioskActivity : AppCompatActivity() { } } - private fun installApk() { + private fun installApk(file: java.io.File) { try { - val file = java.io.File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), "evershelf-update.apk") val uri = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - androidx.core.content.FileProvider.getUriForFile(this, "$packageName.provider", file) + androidx.core.content.FileProvider.getUriForFile( + this, "$packageName.provider", file + ) } else { Uri.fromFile(file) } @@ -814,7 +834,9 @@ class KioskActivity : AppCompatActivity() { } startActivity(install) } catch (e: Exception) { - Toast.makeText(this, "Errore installazione: ${e.message}", Toast.LENGTH_LONG).show() + runOnUiThread { + Toast.makeText(this, "Errore installazione: ${e.message}", Toast.LENGTH_LONG).show() + } } } @@ -896,6 +918,12 @@ class KioskActivity : AppCompatActivity() { fileChooserCallback?.onReceiveValue(result) fileChooserCallback = null } + // Returned from ACTION_MANAGE_UNKNOWN_APP_SOURCES β€” retry the download + // regardless of resultCode (the system always returns RESULT_CANCELED here). + if (requestCode == INSTALL_PERM_REQUEST) { + val url = pendingApkDownloadUrl + if (url.isNotEmpty()) triggerApkDownload(url) + } } override fun onDestroy() { diff --git a/evershelf-kiosk/app/src/main/res/xml/file_paths.xml b/evershelf-kiosk/app/src/main/res/xml/file_paths.xml new file mode 100644 index 0000000..50599dc --- /dev/null +++ b/evershelf-kiosk/app/src/main/res/xml/file_paths.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/evershelf-scale-gateway/app/src/main/AndroidManifest.xml b/evershelf-scale-gateway/app/src/main/AndroidManifest.xml index d57f744..3584955 100644 --- a/evershelf-scale-gateway/app/src/main/AndroidManifest.xml +++ b/evershelf-scale-gateway/app/src/main/AndroidManifest.xml @@ -24,6 +24,9 @@ + + + + + + + + diff --git a/evershelf-scale-gateway/app/src/main/kotlin/it/dadaloop/evershelf/scalegate/MainActivity.kt b/evershelf-scale-gateway/app/src/main/kotlin/it/dadaloop/evershelf/scalegate/MainActivity.kt index fedf0b0..bf6e4bb 100644 --- a/evershelf-scale-gateway/app/src/main/kotlin/it/dadaloop/evershelf/scalegate/MainActivity.kt +++ b/evershelf-scale-gateway/app/src/main/kotlin/it/dadaloop/evershelf/scalegate/MainActivity.kt @@ -12,7 +12,6 @@ import android.content.pm.PackageManager import android.net.Uri import android.os.Build import android.os.Bundle -import android.os.Environment import android.provider.Settings import android.view.LayoutInflater import android.view.View @@ -81,6 +80,14 @@ class MainActivity : AppCompatActivity(), BleScaleListener, ServerEventListener else showDialog("Bluetooth required", "Please enable Bluetooth to use the gateway.") } + /** Returns from ACTION_MANAGE_UNKNOWN_APP_SOURCES β€” retry the download. */ + private val installPermLauncher = registerForActivityResult( + ActivityResultContracts.StartActivityForResult() + ) { _ -> + val url = pendingApkDownloadUrl + if (url.isNotEmpty()) triggerApkDownload(url) + } + // ─── Lifecycle ───────────────────────────────────────────────────────────── override fun onCreate(savedInstanceState: Bundle?) { @@ -453,26 +460,42 @@ class MainActivity : AppCompatActivity(), BleScaleListener, ServerEventListener try { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !packageManager.canRequestPackageInstalls()) { - val intent = Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, Uri.parse("package:$packageName")) - startActivity(intent) - Toast.makeText(this, "Abilita 'Installa app sconosciute', poi ripremi Scarica", Toast.LENGTH_LONG).show() + pendingApkDownloadUrl = apkUrl // remember for retry + installPermLauncher.launch( + Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, Uri.parse("package:$packageName")) + ) + Toast.makeText(this, "Abilita 'Installa app sconosciute', poi torna qui", Toast.LENGTH_LONG).show() return } + // Download to app-private external dir β€” no storage permission needed + val destDir = getExternalFilesDir(null) ?: filesDir + val destFile = java.io.File(destDir, "evershelf-scale-update.apk") val dm = getSystemService(DOWNLOAD_SERVICE) as DownloadManager val req = DownloadManager.Request(Uri.parse(apkUrl)).apply { setTitle("EverShelf Scale Gateway β€” Aggiornamento") setDescription("Scaricamento aggiornamento…") setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED) - setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, "evershelf-scale-update.apk") + setDestinationUri(Uri.fromFile(destFile)) setMimeType("application/vnd.android.package-archive") } val downloadId = dm.enqueue(req) Toast.makeText(this, "Download avviato…", Toast.LENGTH_SHORT).show() val receiver = object : BroadcastReceiver() { override fun onReceive(ctx: Context?, intent: Intent?) { - if (intent?.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1) == downloadId) { - unregisterReceiver(this) - installApk("evershelf-scale-update.apk") + val id = intent?.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1) + if (id != downloadId) return + unregisterReceiver(this) + val q = DownloadManager.Query().setFilterById(downloadId) + val c = (getSystemService(DOWNLOAD_SERVICE) as DownloadManager).query(q) + var ok = false + if (c.moveToFirst()) { + val status = c.getInt(c.getColumnIndexOrThrow(DownloadManager.COLUMN_STATUS)) + ok = (status == DownloadManager.STATUS_SUCCESSFUL) + } + c.close() + if (ok) installApk(destFile) + else runOnUiThread { + Toast.makeText(this@MainActivity, "Download fallito, riprova", Toast.LENGTH_LONG).show() } } } @@ -487,11 +510,12 @@ class MainActivity : AppCompatActivity(), BleScaleListener, ServerEventListener } } - private fun installApk(fileName: String) { + private fun installApk(file: java.io.File) { try { - val file = java.io.File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), fileName) val uri = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - androidx.core.content.FileProvider.getUriForFile(this, "$packageName.provider", file) + androidx.core.content.FileProvider.getUriForFile( + this, "$packageName.provider", file + ) } else { Uri.fromFile(file) } val install = Intent(Intent.ACTION_VIEW).apply { setDataAndType(uri, "application/vnd.android.package-archive") @@ -499,7 +523,9 @@ class MainActivity : AppCompatActivity(), BleScaleListener, ServerEventListener } startActivity(install) } catch (e: Exception) { - Toast.makeText(this, "Errore installazione: ${e.message}", Toast.LENGTH_LONG).show() + runOnUiThread { + Toast.makeText(this, "Errore installazione: ${e.message}", Toast.LENGTH_LONG).show() + } } } diff --git a/evershelf-scale-gateway/app/src/main/res/xml/file_paths.xml b/evershelf-scale-gateway/app/src/main/res/xml/file_paths.xml new file mode 100644 index 0000000..50599dc --- /dev/null +++ b/evershelf-scale-gateway/app/src/main/res/xml/file_paths.xml @@ -0,0 +1,5 @@ + + + + + From 58e69625bd3425295f9e66a551246426133d5a4e Mon Sep 17 00:00:00 2001 From: dadaloop82 Date: Sun, 3 May 2026 17:46:42 +0000 Subject: [PATCH 10/16] fix: preloader + update notification robustness MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add full-screen CSS preloader to webapp (fades out when _initApp completes) - Defer _checkWebappUpdate() to 6s after app init so it does not compete with startup API calls (fixes perceived slowness on first load) - Switch update-check throttle from sessionStorage to localStorage (6h TTL); use release published_at instead of version string for comparison, so the banner correctly appears when a new release is published regardless of whether the tag is a semver or the rolling "latest" tag - PHP _isLatestVersion(): return true (do not suppress error reports) when tag_name is non-semver (e.g. "latest") β€” was incorrectly blocking ALL reports - Kiosk checkForUpdates(): show banner only when the release asset actually contains an APK for the component; handle non-semver tag by treating it as always-update (prevents silent no-op with rolling "latest" tag) - Scale gateway checkForUpdates(): same non-semver fix; apkUrl now defaults to empty and bails out if no matching APK found in assets (prevents 404 install) --- api/index.php | 6 ++- assets/css/style.css | 36 +++++++++++++ assets/js/app.js | 53 ++++++++++++++----- .../dadaloop/evershelf/kiosk/KioskActivity.kt | 33 +++++++----- .../evershelf/scalegate/MainActivity.kt | 12 +++-- index.html | 8 +++ 6 files changed, 118 insertions(+), 30 deletions(-) diff --git a/api/index.php b/api/index.php index 9832c69..735eb85 100644 --- a/api/index.php +++ b/api/index.php @@ -5720,7 +5720,11 @@ function _isLatestVersion(string $clientVersion): bool { if ($clientVersion === '') return true; // unknown β†’ allow (don't suppress) $latest = _latestReleaseTag(); if ($latest === '') return true; // no release yet β†’ allow - return ltrim($clientVersion, 'v') === ltrim($latest, 'v'); + $latestNorm = ltrim($latest, 'v'); + // If tag is not semver-like (e.g. "latest", "rolling") we can't compare + // meaningfully, so don't suppress error reporting. + if (!preg_match('/^\d+\.\d+/', $latestNorm)) return true; + return ltrim($clientVersion, 'v') === $latestNorm; } /** diff --git a/assets/css/style.css b/assets/css/style.css index b20faa2..b8959e3 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -68,6 +68,42 @@ body { box-shadow: var(--shadow); } +/* ===== PRELOADER ===== */ +#app-preloader { + position: fixed; + inset: 0; + background: var(--bg-dark, #0f172a); + z-index: 200000; + display: flex; + align-items: center; + justify-content: center; + transition: opacity 0.35s ease; +} +#app-preloader.fade-out { + opacity: 0; + pointer-events: none; +} +.app-preloader-inner { + display: flex; + flex-direction: column; + align-items: center; + gap: 20px; +} +.app-preloader-spinner { + width: 48px; + height: 48px; + border: 4px solid rgba(255,255,255,0.15); + border-top-color: #4ade80; + border-radius: 50%; + animation: spin 0.8s linear infinite; +} +.app-preloader-label { + color: rgba(255,255,255,0.75); + font-size: 1.2rem; + font-weight: 600; + letter-spacing: 0.5px; +} + .header-content { display: flex; align-items: center; diff --git a/assets/js/app.js b/assets/js/app.js index 3ea6f85..7ee0e07 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -79,19 +79,28 @@ function reportError(payload) { // Checks the latest GitHub release once per session and shows a text banner // if the running webapp version is outdated. (function _checkWebappUpdate() { - const STORAGE_KEY = '_evershelf_update_checked'; + const STORAGE_KEY = '_evershelf_update_checked_at'; // last-checked timestamp + const SEEN_KEY = '_evershelf_update_seen_ts'; // published_at of last-dismissed release + const TTL_MS = 6 * 60 * 60 * 1000; // re-check every 6 h (localStorage) const now = Date.now(); - const lastCheck = parseInt(sessionStorage.getItem(STORAGE_KEY) || '0', 10); - if (now - lastCheck < 3 * 60 * 60 * 1000) return; // once per 3 h per tab - sessionStorage.setItem(STORAGE_KEY, String(now)); + const lastCheck = parseInt(localStorage.getItem(STORAGE_KEY) || '0', 10); + if (now - lastCheck < TTL_MS) return; + localStorage.setItem(STORAGE_KEY, String(now)); fetch('api/index.php?action=check_update', { method: 'GET' }) .then(r => r.ok ? r.json() : null) .then(data => { - if (!data || !data.latest_tag) return; - const latest = data.latest_tag.replace(/^v/, ''); - const current = (document.querySelector('.header-version')?.textContent?.trim() || '').replace(/^v/, ''); - if (!current || !latest || current === latest) return; + if (!data) return; + // Release date-based comparison: show banner only if the release is + // newer than the last one the user acknowledged. + const publishedAt = data.published_at || ''; + const seenTs = localStorage.getItem(SEEN_KEY) || ''; + if (!publishedAt || publishedAt === seenTs) return; + + const latestTag = (data.latest_tag || '').replace(/^v/, ''); + const current = (document.querySelector('.header-version')?.textContent?.trim() || '').replace(/^v/, ''); + // If tag looks like a proper semver and they match β†’ no update needed + if (/^\d+\.\d+/.test(latestTag) && current && current === latestTag) return; // Show a dismissible banner at the top of the page if (document.getElementById('_evershelf_update_banner')) return; @@ -105,18 +114,23 @@ function reportError(payload) { 'border-bottom:2px solid #fbbf24', 'box-shadow:0 2px 8px rgba(0,0,0,.4)', ].join(';'); - const releaseUrl = data.html_url || `https://github.com/dadaloop82/EverShelf/releases/latest`; + const releaseUrl = data.html_url || 'https://github.com/dadaloop82/EverShelf/releases/latest'; + const versionText = /^\d+\.\d+/.test(latestTag) ? ` ${latestTag}` : ''; banner.innerHTML = - `⬆️ EverShelf ${latest} disponibile (stai usando ${current}). ` + + `⬆️ Nuovo aggiornamento EverShelf${versionText} disponibile. ` + `Vedi novitΓ ` + - ``; document.body.prepend(banner); - // Auto-dismiss after 20 s - setTimeout(() => banner.remove(), 20000); + document.getElementById('_evershelf_banner_close').onclick = () => { + localStorage.setItem(SEEN_KEY, publishedAt); // mark as seen + banner.remove(); + }; + // Auto-dismiss after 30 s (without marking as seen, so it reappears next visit) + setTimeout(() => banner.remove(), 30000); }) .catch(() => {}); -})(); +}); // ── Global uncaught error handler ──────────────────────────────────────────── window.addEventListener('error', function(e) { @@ -11705,6 +11719,17 @@ async function _initApp() { scaleInit(); // connect to smart scale gateway if configured _injectKioskOverlay(); // kiosk X / refresh buttons (only when running inside Android WebView) + // Hide preloader once the dashboard is rendered + const preloader = document.getElementById('app-preloader'); + if (preloader) { + preloader.classList.add('fade-out'); + setTimeout(() => preloader.remove(), 380); + } + + // Defer update check: fire 6 s after app is ready so it doesn't compete + // with initial API calls and the PHP worker isn't blocked during startup. + setTimeout(_checkWebappUpdate, 6000); + // ── Background intervals ─────────────────────────────────────────────── // 1) Ogni 5 min: ricarica la pagina corrente (scadenze, inventario, ecc.) setInterval(() => { diff --git a/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/KioskActivity.kt b/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/KioskActivity.kt index 0ff8853..f9ebd98 100644 --- a/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/KioskActivity.kt +++ b/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/KioskActivity.kt @@ -699,21 +699,16 @@ class KioskActivity : AppCompatActivity() { // Normalise: strip leading 'v' for comparison val norm = { v: String -> v.trimStart('v') } - - val kioskNeedsUpdate = latestTag.isNotEmpty() && currentKiosk.isNotEmpty() && - norm(latestTag) != norm(currentKiosk) - val gatewayNeedsUpdate = currentGateway != null && latestTag.isNotEmpty() && - norm(latestTag) != norm(currentGateway) - - if (!kioskNeedsUpdate && !gatewayNeedsUpdate) return@Thread + // If tag is not semver-like (e.g. "latest") we can't compare β€” treat as "needs update" + val isSemver = latestTag.trimStart('v').matches(Regex("\\d+\\.\\d+.*")) // Find APK download URLs in release assets val assets = json.optJSONArray("assets") - var kioskApkUrl = KIOSK_DOWNLOAD_URL - var gatewayApkUrl = GATEWAY_DOWNLOAD_URL + var kioskApkUrl = "" // only set if the release actually contains the APK + var gatewayApkUrl = "" if (assets != null) { for (i in 0 until assets.length()) { - val a = assets.getJSONObject(i) + val a = assets.getJSONObject(i) val name = a.optString("name", "").lowercase() val url = a.optString("browser_download_url", "") if (name.contains("kiosk") && url.isNotEmpty()) kioskApkUrl = url @@ -721,15 +716,29 @@ class KioskActivity : AppCompatActivity() { } } + // Kiosk needs update: APK is in release AND (non-semver tag OR version mismatch) + val kioskHasApk = kioskApkUrl.isNotEmpty() + val kioskNeedsUpdate = kioskHasApk && currentKiosk.isNotEmpty() && + (!isSemver || norm(latestTag) != norm(currentKiosk)) + + // Gateway needs update: installed AND APK in release AND (non-semver OR mismatch) + val gatewayHasApk = gatewayApkUrl.isNotEmpty() + val gatewayNeedsUpdate = currentGateway != null && gatewayHasApk && + (!isSemver || norm(latestTag) != norm(currentGateway)) + + if (!kioskNeedsUpdate && !gatewayNeedsUpdate) return@Thread + // Build message and choose primary download (kiosk takes precedence) val lines = mutableListOf() var primaryApkUrl = "" if (kioskNeedsUpdate) { - lines += "πŸ”„ Kiosk $currentKiosk β†’ $latestTag" + val label = if (isSemver) "$currentKiosk β†’ $latestTag" else latestTag + lines += "πŸ”„ Kiosk $label" primaryApkUrl = kioskApkUrl } if (gatewayNeedsUpdate) { - lines += "πŸ”„ Scale Gateway $currentGateway β†’ $latestTag" + val label = if (isSemver) "$currentGateway β†’ $latestTag" else latestTag + lines += "πŸ”„ Scale Gateway $label" if (primaryApkUrl.isEmpty()) primaryApkUrl = gatewayApkUrl } val message = lines.joinToString(" β€’ ") diff --git a/evershelf-scale-gateway/app/src/main/kotlin/it/dadaloop/evershelf/scalegate/MainActivity.kt b/evershelf-scale-gateway/app/src/main/kotlin/it/dadaloop/evershelf/scalegate/MainActivity.kt index bf6e4bb..fe242db 100644 --- a/evershelf-scale-gateway/app/src/main/kotlin/it/dadaloop/evershelf/scalegate/MainActivity.kt +++ b/evershelf-scale-gateway/app/src/main/kotlin/it/dadaloop/evershelf/scalegate/MainActivity.kt @@ -427,10 +427,10 @@ class MainActivity : AppCompatActivity(), BleScaleListener, ServerEventListener val latestTag = json.optString("tag_name", "").ifEmpty { return@Thread } val current = try { packageManager.getPackageInfo(packageName, 0).versionName ?: "" } catch (_: Exception) { "" } val norm = { v: String -> v.trimStart('v') } - if (norm(latestTag) == norm(current)) return@Thread // already up to date + val isSemver = latestTag.trimStart('v').matches(Regex("\\d+\\.\\d+.*")) // Find scale-gateway APK in release assets - var apkUrl = APK_DOWNLOAD_URL + var apkUrl = "" val assets = json.optJSONArray("assets") if (assets != null) { for (i in 0 until assets.length()) { @@ -442,7 +442,13 @@ class MainActivity : AppCompatActivity(), BleScaleListener, ServerEventListener } } } - val msg = "⬆️ Scale Gateway $current β†’ $latestTag" + // Only show banner if the release actually contains our APK + if (apkUrl.isEmpty()) return@Thread + // If semver tag matches current version β†’ already up to date + if (isSemver && norm(latestTag) == norm(current)) return@Thread + + val label = if (isSemver) "$current β†’ $latestTag" else latestTag + val msg = "⬆️ Scale Gateway $label" runOnUiThread { showNativeUpdateBanner(msg, apkUrl) } } catch (_: Exception) {} }.start() diff --git a/index.html b/index.html index b2e81af..f0d0209 100644 --- a/index.html +++ b/index.html @@ -50,6 +50,14 @@ + + +
From 73fbb739744834513ef5972eb34d6a4b8e92f7ad Mon Sep 17 00:00:00 2001 From: dadaloop82 Date: Sun, 3 May 2026 17:51:18 +0000 Subject: [PATCH 11/16] fix: APK install conflict (PackageInstaller) + dashboard stat skeleton MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit APK install conflict: - Replace ACTION_VIEW-based install with PackageInstaller.Session API (API 21+) - PackageInstaller gives us the actual install status via BroadcastReceiver: STATUS_PENDING_USER_ACTION β†’ launch system confirmation dialog automatically STATUS_SUCCESS β†’ success toast STATUS_FAILURE_CONFLICT/INCOMPATIBLE β†’ show AlertDialog offering to uninstall the old version (ACTION_DELETE) so user can re-download and install - FileProvider no longer needed for install (still kept for other uses) - Kiosk: derive target package from filename (gateway vs kiosk self-update) Dashboard 0-flash: - Replace hardcoded 0 in HTML stat-value spans with ... placeholder - Add .stat-loading CSS class: shimmer skeleton animation (gradient sweep) - showPage(dashboard): set ... + stat-loading before API call - loadDashboard: remove stat-loading class and set real count after data arrives --- assets/css/style.css | 15 +++ assets/js/app.js | 13 ++- .../dadaloop/evershelf/kiosk/KioskActivity.kt | 97 ++++++++++++++++--- .../evershelf/scalegate/MainActivity.kt | 78 ++++++++++++--- index.html | 6 +- 5 files changed, 179 insertions(+), 30 deletions(-) diff --git a/assets/css/style.css b/assets/css/style.css index b8959e3..faafa3c 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -372,6 +372,21 @@ body { color: var(--primary); } +/* Skeleton pulse while stat is loading */ +.stat-value.stat-loading { + color: transparent; + background: linear-gradient(90deg, var(--border) 25%, var(--bg-dark, #e2e8f0) 50%, var(--border) 75%); + background-size: 200% 100%; + animation: stat-shimmer 1.2s infinite; + border-radius: 6px; + min-width: 2rem; + display: inline-block; +} +@keyframes stat-shimmer { + 0% { background-position: 200% 0; } + 100% { background-position: -200% 0; } +} + .stat-label { font-size: 0.85rem; color: var(--text-light); diff --git a/assets/js/app.js b/assets/js/app.js index 7ee0e07..12f7259 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -2227,7 +2227,14 @@ function showPage(pageId, param = null) { // Page-specific init switch(pageId) { - case 'dashboard': loadDashboard(); break; + case 'dashboard': + // Show skeleton on stat-cards while data loads + ['dispensa', 'frigo', 'freezer'].forEach(loc => { + const el = document.getElementById(`stat-${loc}`); + if (el) { el.textContent = '…'; el.classList.add('stat-loading'); } + }); + loadDashboard(); + break; case 'inventory': if (param !== null) { currentLocation = param; @@ -2643,7 +2650,9 @@ async function loadDashboard() { ['dispensa', 'frigo', 'freezer'].forEach(loc => { const s = summary.find(x => x.location === loc); const count = s ? s.product_count : 0; - document.getElementById(`stat-${loc}`).textContent = count; + const el = document.getElementById(`stat-${loc}`); + el.textContent = count; + el.classList.remove('stat-loading'); total += count; }); // Add non-standard locations diff --git a/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/KioskActivity.kt b/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/KioskActivity.kt index f9ebd98..356f24e 100644 --- a/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/KioskActivity.kt +++ b/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/KioskActivity.kt @@ -9,6 +9,8 @@ import android.content.Context import android.content.Intent import android.content.IntentFilter import android.content.SharedPreferences +import android.app.PendingIntent +import android.content.pm.PackageInstaller import android.content.pm.PackageManager import android.graphics.drawable.GradientDrawable import android.net.Uri @@ -828,24 +830,91 @@ class KioskActivity : AppCompatActivity() { } private fun installApk(file: java.io.File) { + if (!file.exists() || file.length() == 0L) { + runOnUiThread { Toast.makeText(this, "File APK non trovato", Toast.LENGTH_LONG).show() } + return + } + // Derive the package name we are installing from the filename + val targetPkg = when { + file.name.contains("gateway") || file.name.contains("scale") -> GATEWAY_PACKAGE + else -> packageName // kiosk self-update + } + installWithPackageInstaller(file, targetPkg) + } + + /** Use PackageInstaller (API 21+) for reliable install-over-existing support. */ + private fun installWithPackageInstaller(file: java.io.File, targetPkg: String) { try { - val uri = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - androidx.core.content.FileProvider.getUriForFile( - this, "$packageName.provider", file + val pi = packageManager.packageInstaller + val params = android.content.pm.PackageInstaller.SessionParams( + android.content.pm.PackageInstaller.SessionParams.MODE_FULL_INSTALL + ) + params.setAppPackageName(targetPkg) + val sessionId = pi.createSession(params) + pi.openSession(sessionId).use { session -> + file.inputStream().use { input -> + session.openWrite("package", 0, file.length()).use { out -> + input.copyTo(out) + session.fsync(out) + } + } + // Register a BroadcastReceiver for the install result + val action = "it.dadaloop.evershelf.kiosk.INSTALL_RESULT_$sessionId" + val resultReceiver = object : BroadcastReceiver() { + override fun onReceive(ctx: Context?, intent: Intent?) { + unregisterReceiver(this) + val status = intent?.getIntExtra( + android.content.pm.PackageInstaller.EXTRA_STATUS, + android.content.pm.PackageInstaller.STATUS_FAILURE + ) ?: android.content.pm.PackageInstaller.STATUS_FAILURE + when (status) { + android.content.pm.PackageInstaller.STATUS_PENDING_USER_ACTION -> { + // Android needs user confirmation β€” launch the system dialog + @Suppress("DEPRECATION") + val confirmIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) + intent?.getParcelableExtra(Intent.EXTRA_INTENT, Intent::class.java) + else intent?.getParcelableExtra(Intent.EXTRA_INTENT) + if (confirmIntent != null) startActivity(confirmIntent) + } + android.content.pm.PackageInstaller.STATUS_SUCCESS -> + runOnUiThread { Toast.makeText(this@KioskActivity, "βœ… Aggiornamento installato", Toast.LENGTH_SHORT).show() } + android.content.pm.PackageInstaller.STATUS_FAILURE_INCOMPATIBLE, + android.content.pm.PackageInstaller.STATUS_FAILURE_CONFLICT -> { + // Signature mismatch: offer to uninstall the old version first + runOnUiThread { + androidx.appcompat.app.AlertDialog.Builder(this@KioskActivity) + .setTitle("⚠️ Conflitto firma APK") + .setMessage("L'app installata usa una firma diversa.\n\nDevi disinstallare la versione precedente e poi ripremere Scarica.") + .setPositiveButton("Disinstalla") { _, _ -> + startActivity(Intent(Intent.ACTION_DELETE, + android.net.Uri.parse("package:$targetPkg"))) + } + .setNegativeButton("Annulla", null) + .show() + } + } + else -> { + val msg = intent?.getStringExtra( + android.content.pm.PackageInstaller.EXTRA_STATUS_MESSAGE + ) ?: "status=$status" + runOnUiThread { Toast.makeText(this@KioskActivity, "Installazione: $msg", Toast.LENGTH_LONG).show() } + } + } + } + } + val flags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) + RECEIVER_NOT_EXPORTED else 0 + registerReceiver(resultReceiver, IntentFilter(action), flags) + val pi2 = PendingIntent.getBroadcast( + this, sessionId, + Intent(action).setPackage(packageName), + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE ) - } else { - Uri.fromFile(file) + session.commit(pi2.intentSender) } - val install = Intent(Intent.ACTION_VIEW).apply { - setDataAndType(uri, "application/vnd.android.package-archive") - addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) - addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) - } - startActivity(install) + Toast.makeText(this, "Installazione in corso…", Toast.LENGTH_SHORT).show() } catch (e: Exception) { - runOnUiThread { - Toast.makeText(this, "Errore installazione: ${e.message}", Toast.LENGTH_LONG).show() - } + runOnUiThread { Toast.makeText(this, "Errore installazione: ${e.message}", Toast.LENGTH_LONG).show() } } } diff --git a/evershelf-scale-gateway/app/src/main/kotlin/it/dadaloop/evershelf/scalegate/MainActivity.kt b/evershelf-scale-gateway/app/src/main/kotlin/it/dadaloop/evershelf/scalegate/MainActivity.kt index fe242db..d24d0f9 100644 --- a/evershelf-scale-gateway/app/src/main/kotlin/it/dadaloop/evershelf/scalegate/MainActivity.kt +++ b/evershelf-scale-gateway/app/src/main/kotlin/it/dadaloop/evershelf/scalegate/MainActivity.kt @@ -8,6 +8,8 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.content.IntentFilter +import android.app.PendingIntent +import android.content.pm.PackageInstaller import android.content.pm.PackageManager import android.net.Uri import android.os.Build @@ -517,21 +519,75 @@ class MainActivity : AppCompatActivity(), BleScaleListener, ServerEventListener } private fun installApk(file: java.io.File) { + if (!file.exists() || file.length() == 0L) { + runOnUiThread { Toast.makeText(this, "File APK non trovato", Toast.LENGTH_LONG).show() } + return + } try { - val uri = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - androidx.core.content.FileProvider.getUriForFile( - this, "$packageName.provider", file + val pi = packageManager.packageInstaller + val params = PackageInstaller.SessionParams(PackageInstaller.SessionParams.MODE_FULL_INSTALL) + params.setAppPackageName(packageName) + val sessionId = pi.createSession(params) + pi.openSession(sessionId).use { session -> + file.inputStream().use { input -> + session.openWrite("package", 0, file.length()).use { out -> + input.copyTo(out) + session.fsync(out) + } + } + val action = "it.dadaloop.evershelf.scalegate.INSTALL_RESULT_$sessionId" + val resultReceiver = object : BroadcastReceiver() { + override fun onReceive(ctx: Context?, intent: Intent?) { + unregisterReceiver(this) + val status = intent?.getIntExtra( + PackageInstaller.EXTRA_STATUS, + PackageInstaller.STATUS_FAILURE + ) ?: PackageInstaller.STATUS_FAILURE + when (status) { + PackageInstaller.STATUS_PENDING_USER_ACTION -> { + @Suppress("DEPRECATION") + val confirmIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) + intent?.getParcelableExtra(Intent.EXTRA_INTENT, Intent::class.java) + else intent?.getParcelableExtra(Intent.EXTRA_INTENT) + if (confirmIntent != null) startActivity(confirmIntent) + } + PackageInstaller.STATUS_SUCCESS -> + runOnUiThread { Toast.makeText(this@MainActivity, "βœ… Aggiornamento installato", Toast.LENGTH_SHORT).show() } + PackageInstaller.STATUS_FAILURE_INCOMPATIBLE, + PackageInstaller.STATUS_FAILURE_CONFLICT -> { + runOnUiThread { + AlertDialog.Builder(this@MainActivity) + .setTitle("⚠️ Conflitto firma APK") + .setMessage("L'app installata usa una firma diversa.\n\nDevi disinstallare la versione precedente e poi ripremere Scarica.") + .setPositiveButton("Disinstalla") { _, _ -> + startActivity(Intent(Intent.ACTION_DELETE, + android.net.Uri.parse("package:$packageName"))) + } + .setNegativeButton("Annulla", null) + .show() + } + } + else -> { + val msg = intent?.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE) + ?: "status=$status" + runOnUiThread { Toast.makeText(this@MainActivity, "Installazione: $msg", Toast.LENGTH_LONG).show() } + } + } + } + } + val flags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) + RECEIVER_NOT_EXPORTED else 0 + registerReceiver(resultReceiver, IntentFilter(action), flags) + val pi2 = PendingIntent.getBroadcast( + this, sessionId, + Intent(action).setPackage(packageName), + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE ) - } else { Uri.fromFile(file) } - val install = Intent(Intent.ACTION_VIEW).apply { - setDataAndType(uri, "application/vnd.android.package-archive") - addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_ACTIVITY_NEW_TASK) + session.commit(pi2.intentSender) } - startActivity(install) + Toast.makeText(this, "Installazione in corso…", Toast.LENGTH_SHORT).show() } catch (e: Exception) { - runOnUiThread { - Toast.makeText(this, "Errore installazione: ${e.message}", Toast.LENGTH_LONG).show() - } + runOnUiThread { Toast.makeText(this, "Errore installazione: ${e.message}", Toast.LENGTH_LONG).show() } } } diff --git a/index.html b/index.html index f0d0209..4b0e6a5 100644 --- a/index.html +++ b/index.html @@ -82,17 +82,17 @@
πŸ—„οΈ - 0 + … Dispensa
🧊 - 0 + … Frigo
❄️ - 0 + … Freezer
From 9e4a8323c3b9f0450fbcca5c298db252bca8fa63 Mon Sep 17 00:00:00 2001 From: dadaloop82 Date: Sun, 3 May 2026 18:00:46 +0000 Subject: [PATCH 12/16] chore: bump versions + update CHANGELOG/README for v1.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Webapp: v1.5.0 β†’ v1.6.0 Kiosk: v1.3.0 β†’ v1.4.0 (versionCode 4β†’5) Scale GW: v2.0.0 β†’ v2.1.0 (versionCode 6β†’7) CI: build-scale-gateway.yml now also triggers on develop branch (was main-only, causing APK builds to not run on feature branches) CHANGELOG: added [1.6.0] entry covering PackageInstaller OTA fixes, dashboard skeleton, update banners, cooking mode z-index, XOR token README: updated 'Recent Updates' section with 1.6.0 highlights --- .github/workflows/build-scale-gateway.yml | 3 ++ CHANGELOG.md | 30 +++++++++++++++++++- README.md | 3 ++ evershelf-kiosk/app/build.gradle.kts | 4 +-- evershelf-scale-gateway/app/build.gradle.kts | 4 +-- index.html | 2 +- 6 files changed, 40 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-scale-gateway.yml b/.github/workflows/build-scale-gateway.yml index 3768052..3106bc7 100644 --- a/.github/workflows/build-scale-gateway.yml +++ b/.github/workflows/build-scale-gateway.yml @@ -4,6 +4,9 @@ on: push: branches: - main + - develop + paths: + - 'evershelf-scale-gateway/**' workflow_dispatch: permissions: diff --git a/CHANGELOG.md b/CHANGELOG.md index e86dcfc..c960953 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,37 @@ All notable changes to EverShelf will be documented in this file. -The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), +The format is based on [Keep a Changelog](https://keepachangelog.com/en1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.6.0] - 2026-05-03 + +### Added +- **Dashboard skeleton loading** β€” Stat cards (Dispensa / Frigo / Freezer) show an animated shimmer placeholder (`…`) instead of the jarring `0` flash that appeared for 3–5 seconds before data loaded; the loading class is applied before the API call and removed atomically when data arrives +- **Webapp startup preloader** β€” Full-screen spinner overlay during initial app load, fades out after the dashboard is ready +- **Webapp update notification** β€” A dismissible top banner alerts the user when a newer GitHub release is available (checked once every 6 hours, comparison based on `published_at`) +- **Native Android update banners** β€” Both Kiosk (v1.4.0) and Scale Gateway (v2.1.0) show a native top bar when a newer APK is available, with one-tap download and install + +### Fixed +- **APK install conflict** β€” Replaced `ACTION_VIEW`-based APK install with the `PackageInstaller.Session` API (API 21+) in both Kiosk and Scale Gateway; the session-based approach correctly handles: + - `STATUS_PENDING_USER_ACTION` β†’ automatically launches the system confirmation dialog + - `STATUS_SUCCESS` β†’ success toast + - `STATUS_FAILURE_CONFLICT` / `STATUS_FAILURE_INCOMPATIBLE` β†’ `AlertDialog` offering to uninstall the old app (signature mismatch) before reinstalling +- **Cooking mode z-index** β€” Update banner and app header are now hidden when `body.cooking-mode-active` is set, and the cooking overlay z-index was raised to `99998` so it can no longer be obscured by UI chrome +- **Version-aware error reporting** β€” GitHub Issues are only created when the client is running the latest released version, avoiding noise from stale deployments; non-semver tag names (e.g. `"latest"`) are treated as "always up-to-date" +- **XOR-obfuscated GitHub token** β€” The PAT used for GitHub API calls is stored as an XOR-encoded hex string in both the PHP backend and Kotlin apps to prevent accidental exposure via secret scanning + +### Kiosk (v1.3.0 β†’ v1.4.0) +- FileProvider + `REQUEST_INSTALL_PACKAGES` permission added +- APK download destination moved to `getExternalFilesDir(null)` (no storage permission needed) +- `PackageInstaller` self-update with signature-conflict recovery +- BLE scale gateway update banner with download + install flow + +### Scale Gateway (v2.0.0 β†’ v2.1.0) +- Same FileProvider + permission + `PackageInstaller` changes as Kiosk +- Update banner for self-update +- CI workflow now triggers on `develop` branch (in addition to `main`) + ## [Unreleased] - 2026-04-30 ### Fixed diff --git a/README.md b/README.md index 3b75426..483224f 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,9 @@ ## 🌍 Recent Updates +- **Dashboard skeleton loading** β€” Stat cards (Dispensa/Frigo/Freezer) show an animated shimmer while data loads instead of a jarring `0` flash for 3–5 seconds. +- **APK self-update with conflict recovery** β€” Both Kiosk (v1.4.0) and Scale Gateway (v2.1.0) use the `PackageInstaller` session API for OTA installs; a signature conflict now shows a dialog offering to uninstall the old version instead of a cryptic failure. +- **Webapp + Android update notifications** β€” A dismissible banner appears when a newer GitHub release is available (checked every 6 hours in the webapp; natively in the Android apps). - **Smarter low-quantity alerts** β€” The "suspiciously low quantity" banner is no longer raised for a partially-used entry (e.g. 191 ml of milk in the fridge) when the same product has stock in another location (e.g. 11 sealed packages in the pantry). Sibling entries are detected by barcode or name+brand. - **Non-alarmist expired banner** β€” The expired-product banner now adapts its icon, colour, and title to the actual safety level: green βœ… for long-life products that are still safe, amber πŸ‘€ for items that should be checked, and the original red 🚫 only for genuinely dangerous items (raw meat, dairy, fish). Low-risk products like canned tomatoes or pasta are no longer shown with a scary red banner. - Recipe and meal-plan labels now resolve at runtime from translations, preventing raw placeholders like `meal_types.*` and `meal_plan_types.*` from appearing in the UI. diff --git a/evershelf-kiosk/app/build.gradle.kts b/evershelf-kiosk/app/build.gradle.kts index f2e3b16..439f29f 100644 --- a/evershelf-kiosk/app/build.gradle.kts +++ b/evershelf-kiosk/app/build.gradle.kts @@ -11,8 +11,8 @@ android { applicationId = "it.dadaloop.evershelf.kiosk" minSdk = 24 targetSdk = 34 - versionCode = 4 - versionName = "1.3.0" + versionCode = 5 + versionName = "1.4.0" } signingConfigs { diff --git a/evershelf-scale-gateway/app/build.gradle.kts b/evershelf-scale-gateway/app/build.gradle.kts index a00c4ce..5f2835a 100644 --- a/evershelf-scale-gateway/app/build.gradle.kts +++ b/evershelf-scale-gateway/app/build.gradle.kts @@ -11,8 +11,8 @@ android { applicationId = "it.dadaloop.evershelf.scalegate" minSdk = 24 targetSdk = 34 - versionCode = 6 - versionName = "2.0.0" + versionCode = 7 + versionName = "2.1.0" } buildFeatures { diff --git a/index.html b/index.html index 4b0e6a5..7b533f9 100644 --- a/index.html +++ b/index.html @@ -61,7 +61,7 @@
-

🏠 EverShelfv1.5.0

+

🏠 EverShelfv1.6.0

` + ``; document.body.prepend(banner); diff --git a/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/KioskActivity.kt b/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/KioskActivity.kt index 356f24e..5e73814 100644 --- a/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/KioskActivity.kt +++ b/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/KioskActivity.kt @@ -83,6 +83,8 @@ class KioskActivity : AppCompatActivity() { private lateinit var btnInstallUpdate: MaterialButton private lateinit var btnDismissUpdate: MaterialButton private var pendingApkDownloadUrl: String = "" + private var pendingInstallFile: java.io.File? = null + private var pendingInstallPkg: String = "" // Triple-tap to exit private var tapCount = 0 @@ -99,6 +101,8 @@ class KioskActivity : AppCompatActivity() { private const val FILE_CHOOSER_REQUEST = 1002 private const val PERMISSION_REQUEST_CODE = 1003 private const val INSTALL_PERM_REQUEST = 1004 // ACTION_MANAGE_UNKNOWN_APP_SOURCES + private const val INSTALL_CONFIRM_REQUEST = 1005 // system installer confirm dialog + private const val UNINSTALL_REQUEST = 1006 // ACTION_DELETE β†’ auto-retry install private const val PREFS_NAME = "evershelf_kiosk" private const val KEY_URL = "evershelf_url" private const val KEY_SETUP_COMPLETE = "setup_complete" @@ -869,25 +873,34 @@ class KioskActivity : AppCompatActivity() { ) ?: android.content.pm.PackageInstaller.STATUS_FAILURE when (status) { android.content.pm.PackageInstaller.STATUS_PENDING_USER_ACTION -> { - // Android needs user confirmation β€” launch the system dialog + // Android needs user confirmation β€” use startActivityForResult so we + // get notified if the system installer fails (e.g. signature conflict) @Suppress("DEPRECATION") val confirmIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) intent?.getParcelableExtra(Intent.EXTRA_INTENT, Intent::class.java) else intent?.getParcelableExtra(Intent.EXTRA_INTENT) - if (confirmIntent != null) startActivity(confirmIntent) + if (confirmIntent != null) { + pendingInstallFile = file + pendingInstallPkg = targetPkg + startActivityForResult(confirmIntent, INSTALL_CONFIRM_REQUEST) + } } android.content.pm.PackageInstaller.STATUS_SUCCESS -> runOnUiThread { Toast.makeText(this@KioskActivity, "βœ… Aggiornamento installato", Toast.LENGTH_SHORT).show() } android.content.pm.PackageInstaller.STATUS_FAILURE_INCOMPATIBLE, android.content.pm.PackageInstaller.STATUS_FAILURE_CONFLICT -> { - // Signature mismatch: offer to uninstall the old version first + // Signature mismatch: offer to uninstall; on return auto-retry install runOnUiThread { + pendingInstallFile = file + pendingInstallPkg = targetPkg androidx.appcompat.app.AlertDialog.Builder(this@KioskActivity) .setTitle("⚠️ Conflitto firma APK") - .setMessage("L'app installata usa una firma diversa.\n\nDevi disinstallare la versione precedente e poi ripremere Scarica.") + .setMessage("L'app installata usa una firma diversa.\n\nDisinstalla la versione precedente: al termine l'installazione riparte automaticamente.") .setPositiveButton("Disinstalla") { _, _ -> - startActivity(Intent(Intent.ACTION_DELETE, - android.net.Uri.parse("package:$targetPkg"))) + startActivityForResult( + Intent(Intent.ACTION_DELETE, android.net.Uri.parse("package:$targetPkg")), + UNINSTALL_REQUEST + ) } .setNegativeButton("Annulla", null) .show() @@ -1002,6 +1015,35 @@ class KioskActivity : AppCompatActivity() { val url = pendingApkDownloadUrl if (url.isNotEmpty()) triggerApkDownload(url) } + // System installer returned: if not OK the install failed (possibly signature conflict). + // Show a dialog offering to uninstall the old version so the user can retry. + if (requestCode == INSTALL_CONFIRM_REQUEST && resultCode != RESULT_OK) { + val f = pendingInstallFile + val pkg = pendingInstallPkg + if (f != null && f.exists() && pkg.isNotEmpty()) { + runOnUiThread { + androidx.appcompat.app.AlertDialog.Builder(this) + .setTitle("⚠️ Installazione non riuscita") + .setMessage("Se hai visto un errore di conflitto firma, devi disinstallare la versione precedente.\n\nDisinstalla ora? L'installazione ripartirΓ  automaticamente.") + .setPositiveButton("Disinstalla") { _, _ -> + startActivityForResult( + Intent(Intent.ACTION_DELETE, android.net.Uri.parse("package:$pkg")), + UNINSTALL_REQUEST + ) + } + .setNegativeButton("Annulla", null) + .show() + } + } + } + // Returned from uninstall screen β€” auto-retry the install with the saved APK file. + if (requestCode == UNINSTALL_REQUEST) { + val f = pendingInstallFile + val pkg = pendingInstallPkg + if (f != null && f.exists() && pkg.isNotEmpty()) { + installWithPackageInstaller(f, pkg) + } + } } override fun onDestroy() { diff --git a/evershelf-scale-gateway/app/src/main/kotlin/it/dadaloop/evershelf/scalegate/MainActivity.kt b/evershelf-scale-gateway/app/src/main/kotlin/it/dadaloop/evershelf/scalegate/MainActivity.kt index d24d0f9..87adfeb 100644 --- a/evershelf-scale-gateway/app/src/main/kotlin/it/dadaloop/evershelf/scalegate/MainActivity.kt +++ b/evershelf-scale-gateway/app/src/main/kotlin/it/dadaloop/evershelf/scalegate/MainActivity.kt @@ -55,6 +55,7 @@ class MainActivity : AppCompatActivity(), BleScaleListener, ServerEventListener private var isAutoReconnecting = false // Update banner private var pendingApkDownloadUrl = "" + private var pendingInstallFile: java.io.File? = null private companion object { const val MAX_DEBUG_LINES = 150 const val DEBUG_THROTTLE_MS = 200L @@ -90,6 +91,37 @@ class MainActivity : AppCompatActivity(), BleScaleListener, ServerEventListener if (url.isNotEmpty()) triggerApkDownload(url) } + /** Returns from system installer dialog β€” if not OK the install failed (signature conflict?). */ + private val installConfirmLauncher = registerForActivityResult( + ActivityResultContracts.StartActivityForResult() + ) { result -> + if (result.resultCode != RESULT_OK) { + val f = pendingInstallFile + if (f != null && f.exists()) { + runOnUiThread { + AlertDialog.Builder(this) + .setTitle("⚠️ Installazione non riuscita") + .setMessage("Se hai visto un errore di conflitto firma, devi disinstallare la versione precedente.\n\nDisinstalla ora? L'installazione ripartirΓ  automaticamente.") + .setPositiveButton("Disinstalla") { _, _ -> + uninstallLauncher.launch( + Intent(Intent.ACTION_DELETE, android.net.Uri.parse("package:$packageName")) + ) + } + .setNegativeButton("Annulla", null) + .show() + } + } + } + } + + /** Returns from uninstall screen β€” auto-retry the install with the saved APK file. */ + private val uninstallLauncher = registerForActivityResult( + ActivityResultContracts.StartActivityForResult() + ) { _ -> + val f = pendingInstallFile + if (f != null && f.exists()) installApk(f) + } + // ─── Lifecycle ───────────────────────────────────────────────────────────── override fun onCreate(savedInstanceState: Bundle?) { @@ -478,6 +510,7 @@ class MainActivity : AppCompatActivity(), BleScaleListener, ServerEventListener // Download to app-private external dir β€” no storage permission needed val destDir = getExternalFilesDir(null) ?: filesDir val destFile = java.io.File(destDir, "evershelf-scale-update.apk") + pendingInstallFile = destFile val dm = getSystemService(DOWNLOAD_SERVICE) as DownloadManager val req = DownloadManager.Request(Uri.parse(apkUrl)).apply { setTitle("EverShelf Scale Gateway β€” Aggiornamento") @@ -545,11 +578,12 @@ class MainActivity : AppCompatActivity(), BleScaleListener, ServerEventListener ) ?: PackageInstaller.STATUS_FAILURE when (status) { PackageInstaller.STATUS_PENDING_USER_ACTION -> { + // Use launcher so we get notified if system installer fails @Suppress("DEPRECATION") val confirmIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) intent?.getParcelableExtra(Intent.EXTRA_INTENT, Intent::class.java) else intent?.getParcelableExtra(Intent.EXTRA_INTENT) - if (confirmIntent != null) startActivity(confirmIntent) + if (confirmIntent != null) installConfirmLauncher.launch(confirmIntent) } PackageInstaller.STATUS_SUCCESS -> runOnUiThread { Toast.makeText(this@MainActivity, "βœ… Aggiornamento installato", Toast.LENGTH_SHORT).show() } @@ -558,10 +592,11 @@ class MainActivity : AppCompatActivity(), BleScaleListener, ServerEventListener runOnUiThread { AlertDialog.Builder(this@MainActivity) .setTitle("⚠️ Conflitto firma APK") - .setMessage("L'app installata usa una firma diversa.\n\nDevi disinstallare la versione precedente e poi ripremere Scarica.") + .setMessage("L'app installata usa una firma diversa.\n\nDisinstalla la versione precedente: al termine l'installazione riparte automaticamente.") .setPositiveButton("Disinstalla") { _, _ -> - startActivity(Intent(Intent.ACTION_DELETE, - android.net.Uri.parse("package:$packageName"))) + uninstallLauncher.launch( + Intent(Intent.ACTION_DELETE, android.net.Uri.parse("package:$packageName")) + ) } .setNegativeButton("Annulla", null) .show() From 4897da571d6c4c8a558ad1d47ac52ba278eaa40c Mon Sep 17 00:00:00 2001 From: dadaloop82 Date: Sun, 3 May 2026 18:31:22 +0000 Subject: [PATCH 16/16] feat(kiosk): ask if scale is present; check+update gateway in wizard MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Wizard step 3 β€” 'Do you have a Bluetooth smart scale?': - New question card with two buttons shown first: βœ… Yes β†’ reveal gateway status card + bottom nav buttons ➑️ No β†’ save KEY_HAS_SCALE=false, skip to web view - KEY_HAS_SCALE pref controls whether the gateway is auto-launched both after wizard completion and on every subsequent app start - checkGatewayStatus(): uses string resources (multilingual) - checkGatewayUpdate(): fetches GitHub release, compares version; if gateway needs an update shows 'πŸ“₯ Update Scale Gateway' button that triggers triggerApkDownload() (full PackageInstaller flow) - onResume step-3 re-check only fires when status card is visible (i.e. user already answered 'Yes') β€” handles return from install Multi-language: strings.xml added for EN (default), IT, DE strings: wizard_step3_question/yes/no, wizard_gateway_installed/ not_installed/checking/up_to_date/update_available/update_detail, btn_back/launch/launch_no_scale/download_gateway/update_gateway --- .../dadaloop/evershelf/kiosk/KioskActivity.kt | 125 +++++++++++++++--- .../src/main/res/layout/activity_kiosk.xml | 74 +++++++++-- .../app/src/main/res/values-de/strings.xml | 28 ++++ .../app/src/main/res/values-it/strings.xml | 28 ++++ .../app/src/main/res/values/strings.xml | 24 ++++ 5 files changed, 246 insertions(+), 33 deletions(-) create mode 100644 evershelf-kiosk/app/src/main/res/values-de/strings.xml create mode 100644 evershelf-kiosk/app/src/main/res/values-it/strings.xml diff --git a/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/KioskActivity.kt b/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/KioskActivity.kt index 5e73814..88124a0 100644 --- a/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/KioskActivity.kt +++ b/evershelf-kiosk/app/src/main/kotlin/it/dadaloop/evershelf/kiosk/KioskActivity.kt @@ -77,6 +77,8 @@ class KioskActivity : AppCompatActivity() { private lateinit var scaleStatusIcon: TextView private lateinit var scaleStatusText: TextView private lateinit var scaleStatusDetail: TextView + private lateinit var scaleQuestionLayout: LinearLayout + private lateinit var step3BottomButtons: LinearLayout // Update banner (native, shown at the top over the WebView) private lateinit var updateBanner: LinearLayout private lateinit var tvUpdateMessage: TextView @@ -106,6 +108,7 @@ class KioskActivity : AppCompatActivity() { private const val PREFS_NAME = "evershelf_kiosk" private const val KEY_URL = "evershelf_url" private const val KEY_SETUP_COMPLETE = "setup_complete" + private const val KEY_HAS_SCALE = "has_scale" private const val GATEWAY_PACKAGE = "it.dadaloop.evershelf.scalegate" private const val GATEWAY_DOWNLOAD_URL = "https://github.com/dadaloop82/EverShelf/releases/latest/download/evershelf-scale-gateway.apk" private const val KIOSK_DOWNLOAD_URL = "https://github.com/dadaloop82/EverShelf/releases/latest/download/evershelf-kiosk.apk" @@ -166,6 +169,8 @@ class KioskActivity : AppCompatActivity() { scaleStatusIcon = findViewById(R.id.scaleStatusIcon) scaleStatusText = findViewById(R.id.scaleStatusText) scaleStatusDetail = findViewById(R.id.scaleStatusDetail) + scaleQuestionLayout = findViewById(R.id.scaleQuestionLayout) + step3BottomButtons = findViewById(R.id.step3BottomButtons) // Update banner updateBanner = findViewById(R.id.updateBanner) @@ -204,10 +209,21 @@ class KioskActivity : AppCompatActivity() { goToStep(2) } findViewById(R.id.btnFinish).setOnClickListener { + prefs.edit().putBoolean(KEY_HAS_SCALE, true).apply() launchGatewayInBackground() finishWizard() } - findViewById(R.id.btnSkipScale).setOnClickListener { + // "Yes" β†’ reveal gateway status and proceed flow + findViewById(R.id.btnScaleYes).setOnClickListener { + scaleQuestionLayout.visibility = View.GONE + val statusCard = findViewById(R.id.scaleStatusCard) + statusCard.visibility = View.VISIBLE + step3BottomButtons.visibility = View.VISIBLE + checkGatewayStatus() + } + // "No" β†’ save pref and skip to web view + findViewById(R.id.btnScaleNo).setOnClickListener { + prefs.edit().putBoolean(KEY_HAS_SCALE, false).apply() finishWizard() } @@ -320,7 +336,12 @@ class KioskActivity : AppCompatActivity() { updateStepIndicator() if (step == 3) { - checkGatewayStatus() + // Reset to question state every time step 3 is entered + scaleQuestionLayout.visibility = View.VISIBLE + val statusCard = findViewById(R.id.scaleStatusCard) + statusCard.visibility = View.GONE + step3BottomButtons.visibility = View.GONE + findViewById(R.id.btnSkipScale).visibility = View.GONE } } @@ -376,6 +397,7 @@ class KioskActivity : AppCompatActivity() { } private fun launchGatewayInBackground() { + if (!prefs.getBoolean(KEY_HAS_SCALE, false)) return if (!isGatewayInstalled()) return val launchIntent = packageManager.getLaunchIntentForPackage(GATEWAY_PACKAGE) ?: return launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) @@ -389,32 +411,93 @@ class KioskActivity : AppCompatActivity() { private fun checkGatewayStatus() { if (isGatewayInstalled()) { - scaleStatusIcon.text = "βœ…" - scaleStatusText.text = "Scale Gateway is installed" - scaleStatusDetail.text = "It will be launched in the background when you proceed" - scaleStatusDetail.setTextColor(0xFF34d399.toInt()) + scaleStatusIcon.text = "\u2705" + scaleStatusText.text = getString(R.string.wizard_gateway_installed) + scaleStatusDetail.text = getString(R.string.wizard_gateway_checking) + scaleStatusDetail.setTextColor(0xFF94a3b8.toInt()) findViewById(R.id.btnSkipScale).visibility = View.GONE - findViewById(R.id.btnFinish).text = "πŸš€ Launch EverShelf" + findViewById(R.id.btnFinish).text = getString(R.string.btn_launch) + // Check async if a newer version is available + checkGatewayUpdate() } else { - scaleStatusIcon.text = "πŸ“₯" - scaleStatusText.text = "Scale Gateway not installed" - scaleStatusDetail.text = "Install the Scale Gateway app to use a Bluetooth scale" + scaleStatusIcon.text = "\uD83D\uDCE5" + scaleStatusText.text = getString(R.string.wizard_gateway_not_installed) + scaleStatusDetail.text = getString(R.string.wizard_gateway_not_installed_detail) scaleStatusDetail.setTextColor(0xFFfbbf24.toInt()) - - findViewById(R.id.btnFinish).text = "πŸš€ Launch without scale" - + findViewById(R.id.btnFinish).text = getString(R.string.btn_launch_no_scale) findViewById(R.id.btnSkipScale).apply { - text = "πŸ“₯ Download Scale Gateway" - setTextColor(0xFF7c3aed.toInt()) + text = getString(R.string.btn_download_gateway) + setTextColor(0xFFa78bfa.toInt()) visibility = View.VISIBLE - setOnClickListener { - val intent = Intent(Intent.ACTION_VIEW, Uri.parse(GATEWAY_DOWNLOAD_URL)) - startActivity(intent) - } + setOnClickListener { triggerApkDownload(GATEWAY_DOWNLOAD_URL) } } } } + /** Fetches the latest GitHub release and, if the gateway has an available update, + * shows the update button in the wizard status card. */ + private fun checkGatewayUpdate() { + val currentVersion = try { + packageManager.getPackageInfo(GATEWAY_PACKAGE, 0).versionName ?: return + } catch (_: Exception) { return } + + Thread { + try { + val conn = URL(GITHUB_RELEASES_API).openConnection() as java.net.HttpURLConnection + conn.setRequestProperty("Accept", "application/vnd.github+json") + conn.connectTimeout = 5000 + conn.readTimeout = 5000 + val json = JSONObject(conn.inputStream.bufferedReader().readText()) + conn.disconnect() + + val latestTag = json.optString("tag_name", "") + if (latestTag.isEmpty()) { showGatewayUpToDate(); return@Thread } + + val isSemver = latestTag.trimStart('v').matches(Regex("\\d+\\.\\d+.*")) + val norm = { v: String -> v.trimStart('v') } + val needsUpdate = !isSemver || norm(latestTag) != norm(currentVersion) + + if (!needsUpdate) { showGatewayUpToDate(); return@Thread } + + // Locate the gateway APK among release assets + var apkUrl = GATEWAY_DOWNLOAD_URL + val assets = json.optJSONArray("assets") + if (assets != null) { + for (i in 0 until assets.length()) { + val a = assets.getJSONObject(i) + val name = a.optString("name", "").lowercase() + val url = a.optString("browser_download_url", "") + if ((name.contains("gateway") || name.contains("scale")) && url.isNotEmpty()) { + apkUrl = url; break + } + } + } + val finalUrl = apkUrl + runOnUiThread { + scaleStatusIcon.text = "\uD83D\uDD04" + scaleStatusText.text = getString(R.string.wizard_gateway_update_available) + scaleStatusDetail.text = getString(R.string.wizard_gateway_update_detail) + scaleStatusDetail.setTextColor(0xFFfbbf24.toInt()) + pendingInstallPkg = GATEWAY_PACKAGE + pendingApkDownloadUrl = finalUrl + findViewById(R.id.btnSkipScale).apply { + text = getString(R.string.btn_update_gateway) + setTextColor(0xFFfbbf24.toInt()) + visibility = View.VISIBLE + setOnClickListener { triggerApkDownload(finalUrl) } + } + } + } catch (_: Exception) { + showGatewayUpToDate() + } + }.start() + } + + private fun showGatewayUpToDate() = runOnUiThread { + scaleStatusDetail.text = getString(R.string.wizard_gateway_installed_detail) + scaleStatusDetail.setTextColor(0xFF34d399.toInt()) + } + // ── Connection Test ─────────────────────────────────────────────────── private fun testConnection() { @@ -996,7 +1079,9 @@ class KioskActivity : AppCompatActivity() { showWizard() } if (currentStep == 3 && wizardContainer.visibility == View.VISIBLE) { - checkGatewayStatus() + val statusCard = findViewById(R.id.scaleStatusCard) + // Only re-check if the user has already answered "Yes" (status card visible) + if (statusCard.visibility == View.VISIBLE) checkGatewayStatus() } } diff --git a/evershelf-kiosk/app/src/main/res/layout/activity_kiosk.xml b/evershelf-kiosk/app/src/main/res/layout/activity_kiosk.xml index 0adc4fd..688a4d2 100644 --- a/evershelf-kiosk/app/src/main/res/layout/activity_kiosk.xml +++ b/evershelf-kiosk/app/src/main/res/layout/activity_kiosk.xml @@ -302,7 +302,7 @@ - + + + + + + + + + + + + android:layout_marginBottom="16dp" + android:visibility="gone"> + + android:layout_marginTop="16dp" + android:visibility="gone"> + + style="@style/Widget.MaterialComponents.Button.OutlinedButton" + android:strokeColor="#7c3aed" + android:textColor="#a78bfa" + android:layout_marginTop="12dp" + android:visibility="gone" /> diff --git a/evershelf-kiosk/app/src/main/res/values-de/strings.xml b/evershelf-kiosk/app/src/main/res/values-de/strings.xml new file mode 100644 index 0000000..b0da8cf --- /dev/null +++ b/evershelf-kiosk/app/src/main/res/values-de/strings.xml @@ -0,0 +1,28 @@ + + + EverShelf Kiosk + + + Smart-Waage (Optional) + Um eine Bluetooth-KΓΌchenwaage zu verwenden, musst du die EverShelf Scale Gateway App separat installieren. + Hast du eine Bluetooth-KΓΌchenwaage? + βœ… Ja, ich habe eine Waage + ➑️ Nein, ΓΌberspringen + + + Scale Gateway installiert βœ… + Wird beim Fortfahren im Hintergrund gestartet. + Scale Gateway nicht installiert + Installiere die Scale Gateway App, um eine Bluetooth-Waage zu nutzen. + PrΓΌfe auf Updates… + Scale Gateway ist aktuell. + Update fΓΌr Scale Gateway verfΓΌgbar + Tippe auf den Button, um jetzt zu aktualisieren. + + + ZurΓΌck + πŸš€ EverShelf starten + πŸš€ Ohne Waage starten + πŸ“₯ Scale Gateway installieren + πŸ“₯ Scale Gateway aktualisieren + diff --git a/evershelf-kiosk/app/src/main/res/values-it/strings.xml b/evershelf-kiosk/app/src/main/res/values-it/strings.xml new file mode 100644 index 0000000..adcdb45 --- /dev/null +++ b/evershelf-kiosk/app/src/main/res/values-it/strings.xml @@ -0,0 +1,28 @@ + + + EverShelf Kiosk + + + Bilancia Smart (Opzionale) + Per usare una bilancia da cucina Bluetooth, devi installare l\'app EverShelf Scale Gateway separatamente. + Hai una bilancia smart Bluetooth? + βœ… SΓ¬, ho una bilancia + ➑️ No, salta questo passaggio + + + Scale Gateway installato βœ… + VerrΓ  avviato in background quando procedi. + Scale Gateway non installato + Installa l\'app Scale Gateway per usare una bilancia Bluetooth. + Controllo aggiornamenti… + Scale Gateway Γ¨ aggiornato. + Aggiornamento disponibile per Scale Gateway + Tocca il pulsante qui sotto per aggiornarlo ora. + + + Indietro + πŸš€ Avvia EverShelf + πŸš€ Avvia senza bilancia + πŸ“₯ Installa Scale Gateway + πŸ“₯ Aggiorna Scale Gateway + diff --git a/evershelf-kiosk/app/src/main/res/values/strings.xml b/evershelf-kiosk/app/src/main/res/values/strings.xml index 6d0e1be..2133a99 100644 --- a/evershelf-kiosk/app/src/main/res/values/strings.xml +++ b/evershelf-kiosk/app/src/main/res/values/strings.xml @@ -1,3 +1,27 @@ EverShelf Kiosk + + + Smart Scale (Optional) + To use a Bluetooth kitchen scale, you need the EverShelf Scale Gateway app installed separately. + Do you have a Bluetooth smart scale? + βœ… Yes, I have a scale + ➑️ No, skip this step + + + Scale Gateway installed βœ… + Will be launched in the background when you proceed. + Scale Gateway not installed + Install the Scale Gateway app to use a Bluetooth scale. + Checking for updates… + Scale Gateway is up to date. + Update available for Scale Gateway + Tap the button below to update it now. + + + Back + πŸš€ Launch EverShelf + πŸš€ Launch without scale + πŸ“₯ Install Scale Gateway + πŸ“₯ Update Scale Gateway