wineater-bot 4.9.8 → 4.11.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wineater-bot",
-  "version": "4.9.8",
+  "version": "4.11.0",
   "description": "",
   "main": "dist/wineater-chatbot.mjs",
   "module": "src/index.js",

package/src/App.svelte

@@ -2,7 +2,7 @@
 	import { setCookie, setUniqueUserCookie, trackWidgetEvent } from './services/analytics/analytics';
 	import Tracker from '@openreplay/tracker';
 	import type { RecommendedWine, Wine, WineId } from './services/api/api';
-	import { wineaterApi } from './services/api/api';
+	import { wineaterApi, apiVersion } from './services/api/api';
 	import { onMount } from 'svelte';
 	import { WIDGET_EVENTS } from './services/analytics/constants';
 	import Header from './components/Header.svelte';
@@ -10,6 +10,7 @@
 	import Search from './components/Search.svelte';
 	import Loader from './components/Loader.svelte';
 	import WineTile from './components/WineTile.svelte';
+	import Action from './components/ui/Action.svelte';
 	import { appStore } from './services/store/app-store.svelte';
 	import { getTranslation, translateTexts } from './services/i18n/i18n';
 	import { generateInlineStyle } from './services/ui-config/utils';
@@ -30,6 +31,7 @@
 
 	let initialized = $state(false);
 	let isLoading = $state(false);
+	let isLoadingMore = $state(false);
 	let results = $state<RecommendedWine[] | Wine[]>([]);
 	let selectedWineId = $state<WineId>(null);
 	let searchQuery = $state('');
@@ -37,6 +39,11 @@
 	let isAnimating = $state(false);
 	let hoveredWineId = $state(null);
 	let translatedPopups = $state([]);
+	// Последний реально выполненный поиск (с добавленным ';') — searchQuery
+	// может измениться в поле ввода до следующего сабмита, а "ещё вариантов"
+	// должен повторять именно тот запрос, что дал текущие results.
+	let lastSearchedQuery = $state('');
+	let hasMore = $state(false);
 	let appLanguage = $derived(appStore.getAppLanguage());
 	let storeLanguage = $derived(appStore.getStoreLanguage());
 	let apiKey = $derived(appStore.getApiKey());
@@ -130,8 +137,10 @@
 			// шаг 2: очистить список и сбросить флаг
 			results = [];
 			isAnimating = false;
+			hasMore = false;
 
 			query = searchQuery.trim() + ';';
+			lastSearchedQuery = query;
 			try {
 				trackWidgetEvent(WIDGET_EVENTS.SEARCH_PERFORMED, storeId, { query });
 			} catch (error) {
@@ -148,6 +157,10 @@
 				trackWidgetEvent(WIDGET_EVENTS.NO_RESULTS_FOUND, storeId, { query });
 			} else {
 				results = searchResults;
+				// Пагинация доступна только для search/v2 — у instant/legacy-путей нет
+				// "more"-эндпоинта. Неполная выдача (< 4) означает, что кандидаты и так
+				// кончились: кнопка в этом случае только мигнула бы впустую.
+				hasMore = apiVersion === '2' && searchResults.length >= 4;
 				trackWidgetEvent(WIDGET_EVENTS.SEARCH_RESULTS_DISPLAYED, storeId, {
 					results_count: searchResults.length,
 					results: searchResults,
@@ -167,6 +180,64 @@
 		}
 	}
 
+	async function handleShowMore() {
+		if (isLoadingMore || !hasMore) return;
+		try {
+			isLoadingMore = true;
+			const excludeIds = results.map((w) => w.id);
+			const { recommendations, hasMore: more } = await wineaterApi.getMoreWineRecommendations(
+				lastSearchedQuery,
+				excludeIds
+			);
+			trackWidgetEvent(WIDGET_EVENTS.SHOW_MORE_CLICKED, storeId, {
+				query: lastSearchedQuery,
+				results_count: recommendations.length
+			});
+			results = [...results, ...recommendations];
+			hasMore = more;
+		} catch (error) {
+			console.error('[wineater] show more error:', error);
+			hasMore = false;
+		} finally {
+			isLoadingMore = false;
+		}
+	}
+
+	async function handleSimilarClick(wine: Wine | RecommendedWine) {
+		try {
+			isLoading = true;
+			clearError();
+			trackWidgetEvent(WIDGET_EVENTS.SIMILAR_WINES_CLICKED, storeId, {
+				wine_id: wine.id,
+				wine_title: wine.title
+			});
+
+			await animateClearAll(220);
+			results = [];
+			isAnimating = false;
+			hasMore = false;
+			selectedWineId = null;
+
+			const similarWines = await wineaterApi.getSimilarWines(wine.id);
+			searchQuery = wine.title;
+			lastSearchedQuery = '';
+
+			if (!similarWines || similarWines.length === 0) {
+				results = [];
+				translatedPopups = [];
+				errorMessage = getTranslation({ key: 'noResultsMessage', lang: appLanguage });
+			} else {
+				results = similarWines;
+			}
+		} catch (error) {
+			results = [];
+			console.error('[wineater] similar wines error:', error);
+			setSearchError();
+		} finally {
+			isLoading = false;
+		}
+	}
+
 	$effect(async () => {
 		// whenever results change, recompute translatedPopups asynchronously
 		if (!results || results.length === 0) {
@@ -325,12 +396,20 @@
 							onBuyClick={handleBuyBtnClick}
 							onBuyLinkClick={handleBuyLinkClick}
 							onPopupClose={closePopup}
+							onSimilarClick={handleSimilarClick}
 							{onTileEnter}
 							{onTileLeave}
 							{onTileClick}
 						/>
 					{/each}
 				</div>
+				{#if hasMore}
+					<div class="wr-App-showMore">
+						<Action handleClick={handleShowMore} variant="outlined">
+							{getTranslation({ key: 'showMore', lang: appLanguage })}
+						</Action>
+					</div>
+				{/if}
 			{/if}
 		</div>
 
@@ -402,6 +481,12 @@
 		margin-bottom: 0;
 	}
 
+	.wr-App-showMore {
+		display: flex;
+		justify-content: center;
+		padding: 16px 0 24px;
+	}
+
 	/* ===================== 12) Error Message ===================== */
 	.wr-App-error {
 		text-align: center;

package/src/components/WineTile.svelte

@@ -19,6 +19,7 @@
 		onBuyClick,
 		onBuyLinkClick,
 		onPopupClose,
+		onSimilarClick,
 		isAnimating,
 		translatedPopup
 	}: {
@@ -32,6 +33,7 @@
 		onBuyClick: (wine: Wine | RecommendedWine, index: number) => void;
 		onBuyLinkClick: (wine: Wine | RecommendedWine, index: number) => void;
 		onPopupClose: () => void;
+		onSimilarClick?: (wine: Wine | RecommendedWine) => void;
 		isAnimating: boolean;
 		translatedPopup: Partial<RecommendedWine> | null;
 	} = $props();
@@ -101,6 +103,12 @@
 			</div>
 		{/if}
 
+		{#if wine.byTheGlass}
+			<div class="wr-WineTile-glass">
+				{getTranslation({ key: 'byTheGlass', lang })}{wine.glassPrice ? ` — ${formatPrice(wine.glassPrice)}` : ''}
+			</div>
+		{/if}
+
 		<h3 class="wr-WineTile-title">{wine.producer ? wine.producer : ''} {wine.title}</h3>
 	</header>
 
@@ -132,6 +140,15 @@
 					{getTranslation({ key: 'moreInfo', lang })}
 				</Action>
 			{/if}
+			{#if onSimilarClick}
+				<Action
+					handleClick={() => onSimilarClick(wine)}
+					variant="text"
+					className="wr-WineTile-action wr-WineTile-action--similar js-WineTileAction"
+				>
+					{getTranslation({ key: 'similarWines', lang })}
+				</Action>
+			{/if}
 		</div>
 	</footer>
 
@@ -255,8 +272,26 @@
 		color: #333;
 	}
 
+	.wr-WineTile-glass {
+		font-size: 12px;
+		font-weight: 500;
+		color: var(--wr-brand-color, #7b2beb);
+		margin-bottom: 8px;
+	}
+
 	.wr-WineTile-actions {
 		margin: 16px auto 0;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		gap: 8px;
+	}
+
+	.wr-WineTile-action--similar {
+		font-size: 13px;
+		color: var(--wr-brand-color, #7b2beb);
+		text-decoration: underline;
+		padding: 0;
 	}
 
 	/* Hover popup inside tile */

package/src/services/analytics/constants.ts

@@ -9,6 +9,8 @@ export const WIDGET_EVENTS = {
     WINE_DETAILS_VIEWED: 'wine_details_viewed',
     WINE_DETAILS_CLOSED: 'wine_details_closed',
     BUY_BUTTON_CLICKED: 'buy_button_clicked',
+    SHOW_MORE_CLICKED: 'show_more_clicked',
+    SIMILAR_WINES_CLICKED: 'similar_wines_clicked',
     FILTER_APPLIED: 'filter_applied',
     LANGUAGE_CHANGED: 'language_changed',
     ERROR_OCCURRED: 'error_occurred',

package/src/services/api/api.ts

@@ -1,4 +1,4 @@
-import { deserializeInstantRecommendation, deserializeRecommendedWine } from "./deserialize";
+import { deserializeInstantRecommendation, deserializeRecommendedWine, deserializeMoreRecommendations } from "./deserialize";
 
 export type WineId = string;
 export type WinePrice = number;
@@ -25,6 +25,8 @@ export type Wine = {
     itemId: string | null;
     isPromote: boolean | null;
     stock: number | null;
+    byTheGlass: boolean;
+    glassPrice: number | null;
 };
 
 export type RecommendedWine = Omit<Wine, "shortDescription" | "producer" | "pairingRecommendation" | "itemId"> & {
@@ -96,6 +98,52 @@ class WineaterApi {
         }
     }
 
+    async getMoreWineRecommendations(text: string, excludeIds: string[]): Promise<{ recommendations: RecommendedWine[]; hasMore: boolean }> {
+        try {
+            const response = await fetch(`${this.#baseUrl}dish/recommendations/search/v2/more`, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                    'Authorization': `Bearer ${this.#token}`
+                },
+                body: JSON.stringify({ text, exclude_ids: excludeIds })
+            });
+
+            const data = await response.json();
+
+            if (!response.ok) {
+                throw new Error(`API call failed with status ${response.status}: ${data.message || 'No additional error information'}`);
+            }
+
+            return deserializeMoreRecommendations(data);
+        } catch (error) {
+            throw new Error(`Error in getMoreWineRecommendations: ${error.message}`);
+        }
+    }
+
+    async getSimilarWines(id: WineId): Promise<RecommendedWine[]> {
+        try {
+            const response = await fetch(`${this.#baseUrl}dish/recommendations/similar`, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                    'Authorization': `Bearer ${this.#token}`
+                },
+                body: JSON.stringify({ id })
+            });
+
+            const data = await response.json();
+
+            if (!response.ok) {
+                throw new Error(`API call failed with status ${response.status}: ${data.message || 'No additional error information'}`);
+            }
+
+            return data.filter(Boolean).map(deserializeRecommendedWine);
+        } catch (error) {
+            throw new Error(`Error in getSimilarWines: ${error.message}`);
+        }
+    }
+
     // TODO: define store type
     async getStoreConfig(): Promise<any> {
         try {
@@ -117,5 +165,5 @@ class WineaterApi {
 
 const DEMO_TOKEN = 'HeUw6IXuhvz6tRuXdPEGEbj3SGQ3Q2YtEc1Z8jd41Kg9LtyPb4Epu0to31SYIadG';
 const token = window?.wineaterData?.CLIENT_TOKEN || DEMO_TOKEN;
-const apiVersion = String(window?.wineaterData?.apiVersion || '1');
+export const apiVersion = String(window?.wineaterData?.apiVersion || '1');
 export const wineaterApi = new WineaterApi(token, apiVersion)

package/src/services/api/deserialize.ts

@@ -23,6 +23,8 @@ type RawInstantRecommendation = {
     item_id?: string;
     is_promote?: boolean;
     stock?: string;
+    by_the_glass?: boolean;
+    glass_price?: string | number;
 }
 
 export function deserializeInstantRecommendation(raw: RawInstantRecommendation): Wine {
@@ -49,6 +51,8 @@ export function deserializeInstantRecommendation(raw: RawInstantRecommendation):
         itemId: raw.item_id || null,
         isPromote: raw.is_promote ? Boolean(raw.is_promote) : null,
         stock: raw.stock ? Number(raw.stock) : null,
+        byTheGlass: Boolean(raw.by_the_glass),
+        glassPrice: raw.glass_price != null ? Number(raw.glass_price) : null,
     }
 }
 
@@ -74,6 +78,8 @@ type RawRecommendedWine = {
     distance: string;
     reason: string;
     type: string;
+    by_the_glass?: boolean;
+    glass_price?: string | number;
 }
 export function deserializeRecommendedWine(raw: RawRecommendedWine): RecommendedWine {
     return {
@@ -98,5 +104,17 @@ export function deserializeRecommendedWine(raw: RawRecommendedWine): Recommended
         distance: Number(raw.distance),
         reason: String(raw.reason),
         type: String(raw.type),
+        byTheGlass: Boolean(raw.by_the_glass),
+        glassPrice: raw.glass_price != null ? Number(raw.glass_price) : null,
     }
+}
+
+export function deserializeMoreRecommendations(raw: {
+    has_more: boolean;
+    recommendations: RawRecommendedWine[];
+}): { recommendations: RecommendedWine[]; hasMore: boolean } {
+    return {
+        recommendations: (raw.recommendations || []).filter(Boolean).map(deserializeRecommendedWine),
+        hasMore: Boolean(raw.has_more),
+    };
 }

package/src/services/i18n/translations.json

@@ -17,6 +17,9 @@
         "type": "Type",
         "reason": "Suggestion",
         "moreInfo": "Plus d'infos",
+        "showMore": "Plus de vins",
+        "similarWines": "Vins similaires",
+        "byTheGlass": "Au verre",
         "winePairingIntro": "Pour ce vin, voici quelques suggestions de plats :",
         "askForDinner": "Que voulez-vous manger ce soir?",
         "clearChatButton": "Effacer le chat",
@@ -80,6 +83,9 @@
         "type": "Tipo",
         "reason": "Sugerencia",
         "moreInfo": "Más info",
+        "showMore": "Ver más",
+        "similarWines": "Vinos similares",
+        "byTheGlass": "Por copa",
         "winePairingIntro": "Para este vino, aquí tienes algunas sugerencias de platos:",
         "askForDinner": "¿Qué te gustaría cenar?",
         "clearChatButton": "Limpiar el chat",
@@ -143,6 +149,9 @@
         "type": "Type",
         "reason": "Suggestion",
         "moreInfo": "More info",
+        "showMore": "Show more",
+        "similarWines": "Similar wines",
+        "byTheGlass": "By the glass",
         "winePairingIntro": "For this wine, here are some suggested dishes:",
         "askForDinner": "What would you like to have for dinner?",
         "clearChatButton": "Clear Chat",
@@ -206,6 +215,9 @@
         "type": "Tip",
         "reason": "Preporuka",
         "moreInfo": "Više informacija",
+        "showMore": "Prikaži još",
+        "similarWines": "Slična vina",
+        "byTheGlass": "Na čašu",
         "winePairingIntro": "Za ovo vino, preporučuju se sledeća jela:",
         "askForDinner": "Šta biste želeli za večeru?",
         "clearChatButton": "Obriši razgovor",
@@ -269,6 +281,9 @@
         "type": "Typ",
         "reason": "Anregung",
         "moreInfo": "Mehr Info",
+        "showMore": "Mehr anzeigen",
+        "similarWines": "Ähnliche Weine",
+        "byTheGlass": "Glasweise",
         "winePairingIntro": "Für diesen Wein gibt es folgende Essensvorschläge:",
         "askForDinner": "Was möchten Sie zum Abendessen essen?",
         "clearChatButton": "Chat löschen",
@@ -331,6 +346,9 @@
         "type": "Тип",
         "reason": "Рекомендація",
         "moreInfo": "Докладніше",
+        "showMore": "Показати ще",
+        "similarWines": "Схожі вина",
+        "byTheGlass": "На келих",
         "winePairingIntro": "До цього вина підходять такі страви:",
         "askForDinner": "Що ви хочете на вечерю?",
         "clearChatButton": "Очистити чат",
@@ -394,6 +412,9 @@
         "type": "Тип",
         "reason": "Рекомендация",
         "moreInfo": "Подробнее",
+        "showMore": "Ещё варианты",
+        "similarWines": "Похожие вина",
+        "byTheGlass": "По бокалам",
         "winePairingIntro": "К этому вину подходят следующие блюда:",
         "askForDinner": "Что бы вы хотели на ужин?",
         "clearChatButton": "Очистить чат",
@@ -457,6 +478,9 @@
         "type": "Түрі",
         "reason": "Ұсыныс",
         "moreInfo": "Толығырақ",
+        "showMore": "Тағы көрсету",
+        "similarWines": "Ұқсас шараптар",
+        "byTheGlass": "Бокалмен",
         "winePairingIntro": "Бұл шарапқа келесі тағамдар сәйкес келеді:",
         "askForDinner": "Кешкі асқа не қалайсыз?",
         "clearChatButton": "Чатты тазалау",
@@ -520,6 +544,9 @@
         "type": "Tipo",
         "reason": "Sugestão",
         "moreInfo": "Mais informações",
+        "showMore": "Mostrar mais",
+        "similarWines": "Vinhos semelhantes",
+        "byTheGlass": "Por taça",
         "winePairingIntro": "Para este vinho, aqui estão algumas sugestões de pratos:",
         "askForDinner": "O que você gostaria de jantar?",
         "clearChatButton": "Limpar chat",