diff --git a/FEATURES.md b/FEATURES.md index 7a6cfb3b..8c12d64b 100644 --- a/FEATURES.md +++ b/FEATURES.md @@ -140,7 +140,7 @@ Location: `src/Trale/miniapp-src/src/`. The test greps the base file name (e.g. | `TimeGreeting.tsx` | Time-of-day greeting. | | `DashboardTopBar.tsx` | Dashboard header with user info. | | `ProBadge.tsx` | Pro subscription indicator. | -| `ProPaywall.tsx` | Stars-XTR paywall modal. Closed without a purchase, it asks «Что смутило?» in the same sheet (`PaywallDeclineQuestion.tsx`) — when the server says the question is due. | +| `ProPaywall.tsx` | Stars-XTR paywall modal. Closed without a purchase, it asks «Что смутило?» in the same sheet (`PaywallDeclineQuestion.tsx`) — when the server says the question is due. Opened by a locked tile, `?paywall=1`, and by `App.tsx` for every way into a paid module (`PRO_MODULE_IDS`) without trial/Pro — one check, `paidGate.ts` `needsPurchase`, where the screen changes: a link from a push or a broadcast (`?moduleId=…[&lessonId=…]`), the «следующий урок» card, «любимый раздел» in the profile, a lesson link from a verb card. The person stays on the screen they were on (a link — on the usual entry screen) with the paywall over it; after the purchase they go on to where they were heading. Results of a finished lesson and free modules are never gated. A broadcast gift still lands in the lesson: the profile is read after the campaign open, and if that open was slower than the launch waits, a gated link waits for it a little longer and reads the profile again (`campaignOpen.ts` `lateCampaignOpen`). `e2e/paid-links.spec.ts`. | | `PaywallDeclineQuestion.tsx` | «Что смутило?»: «Дорого» / «Пока не нужно» / «Непонятно, что я получу» / «Другое» + optional words; can be closed without an answer. | | `TreatShop.tsx` | Treat purchase UI (Dzval / Khorci / Mtsvadi / Churchkhela / Supra). | | `FeedingAnimation.tsx` | Feeding animation for the mascot. | diff --git a/src/Trale/miniapp-src/e2e/paid-links.spec.ts b/src/Trale/miniapp-src/e2e/paid-links.spec.ts new file mode 100644 index 00000000..b457e3f2 --- /dev/null +++ b/src/Trale/miniapp-src/e2e/paid-links.spec.ts @@ -0,0 +1,202 @@ +import { test, expect, type Page } from '@playwright/test' + +// Платный модуль открывают не только плиткой на главной: ссылкой из пуша или рассылки +// (?moduleId=…&lessonId=…), карточкой «следующий урок», «любимым разделом» в профиле. +// Без доступа каждый такой путь должен кончаться экраном покупки, а не уроком (paidGate.ts). + +test.beforeEach(async ({ page }) => { + await page.addInitScript(() => { + ;(window as any).Telegram = { + WebApp: { + initData: 'user=%7B%22id%22%3A123456%7D', + BackButton: { show: () => {}, hide: () => {}, onClick: () => {}, offClick: () => {} }, + MainButton: { show: () => {}, hide: () => {} }, + HapticFeedback: { impactOccurred: () => {}, notificationOccurred: () => {} }, + openTelegramLink: () => {}, + }, + } + try { localStorage.removeItem('bombora_collapsed') } catch {} + }) +}) + +const noAccess = { + authenticated: true, + isPro: false, + isTrialActive: false, + trialDaysLeft: 0, + hasAccess: false, + level: 'intermediate', + vocabularyCount: 0, + progress: { + xp: 200, streak: 0, lastPlayedAtUtc: null, completedLessons: {} as Record, + xpSpent: 0, totalTreatsGiven: 0, lastFedAtUtc: null, lastTreatIndex: null, + }, +} +const onTrial = { ...noAccess, isTrialActive: true, trialDaysLeft: 12, hasAccess: true } +const paid = { ...noAccess, isPro: true, hasAccess: true } + +const lesson = (id: number) => ({ id, title: `Урок ${id}`, short: `Урок ${id}`, theory: { title: `Урок ${id}`, goal: 'g', blocks: [] } }) +const catalog = { + botUsername: 'TraleBot', + miniAppEnabled: true, + modules: [ + { id: 'alphabet-progressive', title: 'Алфавит', emoji: '🔤', description: 'Грузинский алфавит', lessons: [lesson(1)] }, + { id: 'cases', title: 'Падежи', emoji: '🧩', description: 'Падежи грузинского', lessons: [lesson(1), lesson(2)] }, + ], +} + +type Me = typeof noAccess + +async function setupApi(page: Page, me: Me | (() => Me)) { + await page.route('**/api/miniapp/content', (route) => route.fulfill({ json: catalog })) + await page.route('**/api/miniapp/me', (route) => route.fulfill({ json: typeof me === 'function' ? me() : me })) + await page.route('**/api/miniapp/activity-days*', (route) => route.fulfill({ json: { dates: [] } })) + await page.route('**/api/miniapp/plans', (route) => + route.fulfill({ json: { plans: [{ id: 'Month', payloadId: 'Stars_Pro_Month', stars: 100, durationDays: 30, title: '1 месяц', description: '30 дней' }] } }) + ) +} + +const purchaseScreen = (page: Page) => page.getByRole('dialog', { name: 'Про-доступ' }) +/** Экран модуля: список его уроков. */ +const moduleLessons = (page: Page) => page.getByTestId('lesson-btn-1') + +test('no access: a link to a paid module opens the purchase screen, not the module', async ({ page }) => { + await setupApi(page, noAccess) + await page.goto('/?playwright=1&moduleId=cases') + + await expect(purchaseScreen(page)).toBeVisible() + await expect(purchaseScreen(page).getByRole('button', { name: /Купить за 100/ })).toBeVisible() + await expect(moduleLessons(page)).toHaveCount(0) + // Под экраном покупки — обычная главная, а адрес ссылки израсходован: перезагрузка не откроет покупку снова. + await expect(page.getByTestId('module-tile-cases')).toBeAttached() + expect(new URL(page.url()).searchParams.get('moduleId')).toBeNull() + // Снимок — только по просьбе: GATE_SHOTS=<папка>. + if (process.env.GATE_SHOTS) { + await page.waitForTimeout(400) // шторка доезжает + await page.screenshot({ path: `${process.env.GATE_SHOTS}/paid-link-purchase-screen.png` }) + } +}) + +test('no access: a push link straight into a paid lesson opens the purchase screen', async ({ page }) => { + await setupApi(page, noAccess) + await page.goto('/?playwright=1&screen=practice&moduleId=cases&lessonId=1&src=push_return_a') + + await expect(purchaseScreen(page)).toBeVisible() + await expect(page.getByTestId('module-tile-cases')).toBeAttached() +}) + +test('free period: the same link opens the module', async ({ page }) => { + await setupApi(page, onTrial) + await page.goto('/?playwright=1&moduleId=cases') + + await expect(moduleLessons(page)).toBeVisible() + await expect(purchaseScreen(page)).toBeHidden() +}) + +test('subscription: the same link opens the module', async ({ page }) => { + await setupApi(page, paid) + await page.goto('/?playwright=1&moduleId=cases') + + await expect(moduleLessons(page)).toBeVisible() + await expect(purchaseScreen(page)).toBeHidden() +}) + +test('no access: a link to a free module opens the module', async ({ page }) => { + await setupApi(page, noAccess) + await page.goto('/?playwright=1&moduleId=alphabet-progressive') + + await expect(moduleLessons(page)).toBeVisible() + await expect(purchaseScreen(page)).toBeHidden() +}) + +test('no access: the «next lesson» card on the main screen opens the purchase screen', async ({ page }) => { + // Алфавит пройден — следующим уроком главная предлагает платный модуль. + await setupApi(page, { ...noAccess, progress: { ...noAccess.progress, completedLessons: { 'alphabet-progressive': [1] } } }) + await page.goto('/?playwright=1') + + await expect(page.getByTestId('dashboard-suggestion')).toContainText('Падежи') + await page.getByTestId('dashboard-suggestion').click() + + await expect(purchaseScreen(page)).toBeVisible() + await expect(page.getByTestId('dashboard-suggestion')).toBeAttached() // остались на главной +}) + +test('no access: «favourite module» in the profile opens the purchase screen', async ({ page }) => { + // Уроки платного модуля человек проходил, пока доступ был. + await setupApi(page, { ...noAccess, progress: { ...noAccess.progress, completedLessons: { cases: [1] } } }) + await page.route('**/api/miniapp/referral*', (route) => route.fulfill({ json: {} })) + await page.goto('/?playwright=1') + + await page.getByRole('button', { name: /Профиль/ }).last().click() + await page.getByRole('button', { name: /Падежи/ }).click() + + await expect(purchaseScreen(page)).toBeVisible() + await expect(moduleLessons(page)).toHaveCount(0) +}) + +test('closing the purchase screen leaves the person on the main screen with the module locked', async ({ page }) => { + await setupApi(page, noAccess) + await page.route('**/api/miniapp/feedback/**', (route) => route.fulfill({ json: { due: false, show: false } })) + await page.goto('/?playwright=1&moduleId=cases') + + await expect(purchaseScreen(page)).toBeVisible() + await page.mouse.click(195, 40) // тап мимо шторки + await expect(purchaseScreen(page)).toBeHidden() + await expect(page.getByTestId('module-tile-cases').locator('span[aria-label="Про-доступ"]')).toBeVisible() +}) + +test('after the purchase the person lands where the link was heading and can go on to a lesson', async ({ page }) => { + let bought = false + await setupApi(page, () => (bought ? paid : noAccess)) + await page.route('**/api/miniapp/purchase', (route) => { bought = true; return route.fulfill({ json: { ok: true, alreadyPro: true } }) }) + await page.goto('/?playwright=1&moduleId=cases') + + await purchaseScreen(page).getByRole('button', { name: /Купить за 100/ }).click() + + await expect(purchaseScreen(page)).toBeHidden() + await expect(moduleLessons(page)).toBeVisible() + // Дальше — в урок: покупка больше не встаёт на пути. + await moduleLessons(page).click() + await expect(purchaseScreen(page)).toBeHidden() + await expect(page.getByTestId('lesson-btn-1')).toHaveCount(0) +}) + +test.describe('gift from a broadcast', () => { + // Кнопка рассылки открывает ?moduleId=…&c=<кампания>: сервер в ответ на отметку об открытии дарит дни доступа. + const giftLink = '/?playwright=1&moduleId=cases&c=myday-back' + const gift = { ok: true, gift: { days: 7, accessUntilUtc: '2026-11-17T12:00:00Z' } } + + test('the gifted person lands in the module, not on the purchase screen', async ({ page }) => { + let gifted = false + await setupApi(page, () => (gifted ? onTrial : noAccess)) + await page.route('**/api/miniapp/campaign-open', (route) => { gifted = true; return route.fulfill({ json: gift }) }) + await page.goto(giftLink) + + await expect(moduleLessons(page)).toBeVisible() + await expect(purchaseScreen(page)).toBeHidden() + }) + + test('the gift arrives late (slow network): still the module, not the purchase screen', async ({ page }) => { + let gifted = false + await setupApi(page, () => (gifted ? onTrial : noAccess)) + // Дольше, чем запуск ждёт отметку (2,5 с): профиль успевает загрузиться без подарка. + await page.route('**/api/miniapp/campaign-open', async (route) => { + await new Promise((resolve) => setTimeout(resolve, 3200)) + gifted = true + return route.fulfill({ json: gift }) + }) + await page.goto(giftLink) + + await expect(moduleLessons(page)).toBeVisible({ timeout: 10_000 }) + await expect(purchaseScreen(page)).toBeHidden() + }) + + test('a broadcast without a gift: no access means the purchase screen', async ({ page }) => { + await setupApi(page, noAccess) + await page.route('**/api/miniapp/campaign-open', (route) => route.fulfill({ json: { ok: true, gift: null } })) + await page.goto(giftLink) + + await expect(purchaseScreen(page)).toBeVisible() + await expect(moduleLessons(page)).toHaveCount(0) + }) +}) diff --git a/src/Trale/miniapp-src/src/App.tsx b/src/Trale/miniapp-src/src/App.tsx index 04bea8b3..efd7d4aa 100644 --- a/src/Trale/miniapp-src/src/App.tsx +++ b/src/Trale/miniapp-src/src/App.tsx @@ -1,4 +1,4 @@ -import React, { useEffect, useState } from 'react' +import React, { useEffect, useRef, useState } from 'react' import { CatalogDto, ProgressState, Screen } from './types' import { defaultProgress, onProgressPublished, progressFromDto } from './progress' import { onOpenLessonModule } from './verbs/family/nav' @@ -22,6 +22,7 @@ import Onboarding, { UserLevel } from './screens/Onboarding' import Welcome from './screens/Welcome' import Mascot from './components/Mascot' import LoaderLetter from './components/LoaderLetter' +import ProPaywall from './components/ProPaywall' import VerbSheet from './verbs/VerbSheet' import { resolveVerbDeepLink } from './verbs/deepLink' import { closeTopOverlay, useHasOverlay } from './verbs/ui/overlayStack' @@ -40,8 +41,9 @@ import AdminMoreScreen from './screens/AdminMoreScreen' import SurveyBuilderScreen from './screens/SurveyBuilderScreen' import AdminFeedbackScreen from './screens/AdminFeedbackScreen' import { parseVerbsSectionLink } from './verbs/section/link' -import { campaignKeyFromUrl, campaignOpenSettled } from './campaignOpen' +import { campaignKeyFromUrl, campaignOpenSettled, lateCampaignOpen } from './campaignOpen' import { appEvents } from './analytics/appEvents' +import { needsPurchase } from './paidGate' function isInsideTelegram(): boolean { if (new URLSearchParams(window.location.search).get('playwright') === '1') return true @@ -104,7 +106,10 @@ export default function App() { // Прогресс, начисленный не уроком (сессия глагола), приходит сюда — шапка обновляется сразу. useEffect(() => onProgressPublished(dto => setProgress(progressFromDto(dto))), []) // Ссылка «урок о приставках» из карточки глагола и из сессии — они открыты поверх экрана и навигации не знают. - useEffect(() => onOpenLessonModule(moduleId => { setScreen({ kind: 'module', moduleId }); window.scrollTo(0, 0) }), []) + // Через navigate, а не setScreen: модуль платный, и без доступа вместо него откроется экран покупки. + const navigateRef = useRef<(s: Screen) => void>(() => {}) + navigateRef.current = navigate + useEffect(() => onOpenLessonModule(moduleId => navigateRef.current({ kind: 'module', moduleId })), []) const [catalog, setCatalog] = useState(null) const [authenticated, setAuthenticated] = useState(false) const [loadError, setLoadError] = useState(false) @@ -122,6 +127,8 @@ export default function App() { const [onboardingHint, setOnboardingHint] = useState(null) // Ссылка вела в раздел «Глаголы», а человек ещё не выбрал уровень: откроем раздел сразу после выбора. const [afterOnboarding, setAfterOnboarding] = useState(null) + // Платный экран, куда человек шёл без доступа: поверх текущего экрана открыт экран покупки, после оплаты идём сюда. + const [paywallFor, setPaywallFor] = useState(null) useEffect(() => appEvents.screen(screen.kind), [screen.kind]) // Load catalog + progress from backend on mount @@ -151,9 +158,11 @@ export default function App() { loadSeenHints(meData.uiHintsSeen) } const hasLevel = meData?.level === 'beginner' || meData?.level === 'intermediate' + // Доступ — из только что пришедшего профиля, а не из состояния: оно обновится лишь к следующей отрисовке. + const hasAccess = Boolean(meData?.isPro || (meData as any)?.isTrialActive) // ?screen=verb&verbId=… opens a verb card over the dictionary (see verbs/deepLink.ts). const verbLink = hasLevel - ? resolveVerbDeepLink(new URLSearchParams(window.location.search), Boolean(meData?.isPro || (meData as any)?.isTrialActive)) + ? resolveVerbDeepLink(new URLSearchParams(window.location.search), hasAccess) : null // ?screen=verbs (кнопка рассылки, ссылка с меткой) или startapp=verbs_… — раздел «Глаголы» (verbs/section/link.ts). const sectionLink = verbLink ? null : parseVerbsSectionLink( @@ -186,8 +195,28 @@ export default function App() { // A push deep-link wins; otherwise resolveEntryScreen decides — a brand-new // user (level but no XP) gets the welcome lesson, and the dashboard hub is // revealed only once that first XP is earned. See entryFlow.resolveEntryScreen. - setScreen(deepLink ?? resolveEntryScreen({ hasLevel, progress: loadedProgress, catalog: catalogData })) - appEvents.ready(Boolean(meData?.authenticated)) + const entry = resolveEntryScreen({ hasLevel, progress: loadedProgress, catalog: catalogData }) + if (deepLink === null || !needsPurchase(deepLink, hasAccess)) { + setScreen(deepLink ?? entry) + appEvents.ready(Boolean(meData?.authenticated)) + return + } + // Ссылка в платный модуль, а доступа нет (см. paidGate.ts). Доступ мог открыть подарок кампании, если отметка + // об открытии по рассылке опоздала к профилю, — тогда дожидаемся её и спрашиваем профиль ещё раз. + lateCampaignOpen().then((came) => (came ? api.me() : null)).catch(() => null).then((late) => { + if (cancelled) return + if (late?.isPro || (late as any)?.isTrialActive) { + setIsPro(late?.isPro ?? false) + setIsTrialActive((late as any).isTrialActive ?? false) + setTrialDaysLeft((late as any).trialDaysLeft ?? 0) + setScreen(deepLink) + } else { + // Обычный вход, а поверх него экран покупки; после оплаты человек пойдёт туда, куда вела ссылка. + setPaywallFor(deepLink) + setScreen(entry) + } + appEvents.ready(Boolean(meData?.authenticated)) + }) }) .catch(() => { if (cancelled) return @@ -327,7 +356,16 @@ export default function App() { return } + /** Любой переход внутри приложения. В платный модуль без доступа не пускает: остаёмся на месте и открываем экран покупки. */ function navigate(s: Screen) { + if (needsPurchase(s, isPro || isTrialActive)) { + setPaywallFor(s) + return + } + open(s) + } + + function open(s: Screen) { if (s.kind === 'result') { setTodayLessons(incrementTodayLessons()) } @@ -409,206 +447,228 @@ export default function App() { ) - switch (screen.kind) { - case 'welcome': { - // После знакомства — первый урок алфавита (ა там уже знакома); если он пройден — урок, который предложил бы хаб. - const alphabetDone = (progress.completedLessons['alphabet-progressive'] ?? []).includes(1) - const hasAlphabet = catalog.modules.some((m) => m.id === 'alphabet-progressive' && m.lessons.some((l) => l.id === 1)) - const nextRef = hasAlphabet && !alphabetDone - ? { moduleId: 'alphabet-progressive', lessonId: 1 } - : findFirstLesson(catalog, progress.completedLessons) - return ( - { - // The welcome lesson is recorded under its own "welcome" module id, so it - // awards the first XP (flipping the entry gate to the dashboard) without - // touching the real alphabet progression. Recorded the moment the celebration - // shows (or the intro is skipped) — closing the app there no longer loses it. - // Re-fetch me() afterwards: completing welcome unlocks the first onboarding - // hint, but the initial me() (taken before welcome) returned none. - api - .completeLesson({ moduleId: 'welcome', lessonId: 1, correct: 1, total: 1 }) - .then((res) => setProgress(progressFromDto(res.progress))) - .then(() => api.me()) - .then((meData) => setOnboardingHint((meData as any).onboardingHint ?? null)) - .catch(() => {}) - }} - onNext={() => - navigate(nextRef ? { kind: 'lesson-theory', moduleId: nextRef.moduleId, lessonId: nextRef.lessonId } : { kind: 'dashboard' }) - } - onBrowse={() => navigate({ kind: 'dashboard' })} - /> - ) - } - case 'onboarding': - return ( - { - setUserLevel(level) - if (authenticated) { - api.setLevel(level).catch(() => {}) + const renderScreen = () => { + switch (screen.kind) { + case 'welcome': { + // После знакомства — первый урок алфавита (ა там уже знакома); если он пройден — урок, который предложил бы хаб. + const alphabetDone = (progress.completedLessons['alphabet-progressive'] ?? []).includes(1) + const hasAlphabet = catalog.modules.some((m) => m.id === 'alphabet-progressive' && m.lessons.some((l) => l.id === 1)) + const nextRef = hasAlphabet && !alphabetDone + ? { moduleId: 'alphabet-progressive', lessonId: 1 } + : findFirstLesson(catalog, progress.completedLessons) + return ( + { + // The welcome lesson is recorded under its own "welcome" module id, so it + // awards the first XP (flipping the entry gate to the dashboard) without + // touching the real alphabet progression. Recorded the moment the celebration + // shows (or the intro is skipped) — closing the app there no longer loses it. + // Re-fetch me() afterwards: completing welcome unlocks the first onboarding + // hint, but the initial me() (taken before welcome) returned none. + api + .completeLesson({ moduleId: 'welcome', lessonId: 1, correct: 1, total: 1 }) + .then((res) => setProgress(progressFromDto(res.progress))) + .then(() => api.me()) + .then((meData) => setOnboardingHint((meData as any).onboardingHint ?? null)) + .catch(() => {}) + }} + onNext={() => + navigate(nextRef ? { kind: 'lesson-theory', moduleId: nextRef.moduleId, lessonId: nextRef.lessonId } : { kind: 'dashboard' }) } - // Fresh user → welcome lesson (one-letter quick win); the dashboard hub is - // revealed only after that first XP is earned. - navigate(afterOnboarding ?? resolveEntryScreen({ hasLevel: true, progress, catalog })) - setAfterOnboarding(null) - }} - /> - ) - case 'dashboard': - return ( - <> - {proSuccessToast} - navigate({ kind: 'dashboard' })} + /> + ) + } + case 'onboarding': + return ( + { + setUserLevel(level) + if (authenticated) { + api.setLevel(level).catch(() => {}) + } + // Fresh user → welcome lesson (one-letter quick win); the dashboard hub is + // revealed only after that first XP is earned. + navigate(afterOnboarding ?? resolveEntryScreen({ hasLevel: true, progress, catalog })) + setAfterOnboarding(null) + }} + /> + ) + case 'dashboard': + return ( + <> + {proSuccessToast} + api.markOnboardingHintSeen(h).catch(() => {})} + onHintDismiss={() => setOnboardingHint(null)} + onPurchaseSuccess={handleProPurchaseSuccess} + onProgressUpdate={(patch) => setProgress((p) => ({ ...p, ...patch }))} + navigate={navigate} + /> + + ) + case 'module': + return + case 'lesson-theory': + return ( + api.markOnboardingHintSeen(h).catch(() => {})} - onHintDismiss={() => setOnboardingHint(null)} - onPurchaseSuccess={handleProPurchaseSuccess} - onProgressUpdate={(patch) => setProgress((p) => ({ ...p, ...patch }))} navigate={navigate} /> - - ) - case 'module': - return - case 'lesson-theory': - return ( - - ) - case 'practice': - return ( - - ) - case 'result': - return ( - - ) - case 'practice-mistakes': - return ( - - ) - case 'mistakes-result': - return ( - - ) - case 'profile': - return ( - <> - {proSuccessToast} - + ) + case 'result': + return ( + + ) + case 'practice-mistakes': + return ( + + ) + case 'mistakes-result': + return ( + - - ) - case 'feedback': - return navigate(afterFeedback(screen))} /> - case 'survey': - return navigate(entryScreen())} /> - case 'admin': - return admin() - case 'admin-users': - return admin() - case 'admin-user': - return admin() - case 'admin-feedback': - return admin() - case 'admin-survey': - return admin() - case 'admin-broadcasts': - return admin() - case 'admin-broadcast': - return admin() - case 'admin-more': - return admin() - case 'admin-payments': - return admin() - case 'admin-system': - return admin() - case 'verb-review': - return admin() - case 'vocabulary-list': - return ( - <> - - {screen.verb && ( - setScreen({ kind: 'vocabulary-list', filter: screen.filter })} + ) + case 'profile': + return ( + <> + {proSuccessToast} + - )} - - ) - case 'verbs': - return ( - <> - {proSuccessToast} - - - ) - case 'vocabulary-quiz': - return ( - - ) - default: - return setProgress((p) => ({ ...p, ...patch }))} navigate={navigate} /> + + ) + case 'feedback': + return navigate(afterFeedback(screen))} /> + case 'survey': + return navigate(entryScreen())} /> + case 'admin': + return admin() + case 'admin-users': + return admin() + case 'admin-user': + return admin() + case 'admin-feedback': + return admin() + case 'admin-survey': + return admin() + case 'admin-broadcasts': + return admin() + case 'admin-broadcast': + return admin() + case 'admin-more': + return admin() + case 'admin-payments': + return admin() + case 'admin-system': + return admin() + case 'verb-review': + return admin() + case 'vocabulary-list': + return ( + <> + + {screen.verb && ( + setScreen({ kind: 'vocabulary-list', filter: screen.filter })} + /> + )} + + ) + case 'verbs': + return ( + <> + {proSuccessToast} + + + ) + case 'vocabulary-quiz': + return ( + + ) + default: + return setProgress((p) => ({ ...p, ...patch }))} navigate={navigate} /> + } } + + return ( + <> + {renderScreen()} + {paywallFor && ( + setPaywallFor(null)} + onPurchaseSuccess={() => { + // Оплату подтвердил сам экран покупки. Доступ открываем сразу, не дожидаясь профиля: + // иначе следующий же шаг (урок → задания) снова упёрся бы в покупку. + setIsPro(true) + setPaywallFor(null) + handleProPurchaseSuccess() + open(paywallFor) + }} + /> + )} + + ) } diff --git a/src/Trale/miniapp-src/src/campaignOpen.test.ts b/src/Trale/miniapp-src/src/campaignOpen.test.ts index 4d2c191e..476d2ed3 100644 --- a/src/Trale/miniapp-src/src/campaignOpen.test.ts +++ b/src/Trale/miniapp-src/src/campaignOpen.test.ts @@ -1,6 +1,6 @@ import { describe, it, expect, vi, beforeEach } from 'vitest' import { reportCampaignOpen } from './api' -import { campaignKeyFromUrl, campaignOpenSettled, giftUntilText, pluralDays, reportCampaignOpenFromUrl, takeCampaignGift } from './campaignOpen' +import { campaignKeyFromUrl, campaignOpenSettled, giftUntilText, lateCampaignOpen, pluralDays, reportCampaignOpenFromUrl, takeCampaignGift } from './campaignOpen' vi.mock('./api', () => ({ reportCampaignOpen: vi.fn(() => Promise.resolve({ ok: true })) })) const report = vi.mocked(reportCampaignOpen) @@ -73,4 +73,42 @@ describe('campaign open', () => { vi.useRealTimers() } }) + + it('a report that got through in time is not waited for again', async () => { + reportCampaignOpenFromUrl('?moduleId=my-day&lessonId=1&c=myday-back') + await campaignOpenSettled() + await expect(lateCampaignOpen()).resolves.toBe(false) + }) + + it('a slow report: the profile stops waiting, but the gift can still be waited for before the purchase screen', async () => { + vi.useFakeTimers() + try { + let arrive: (r: { ok: boolean }) => void = () => {} + report.mockReturnValueOnce(new Promise((resolve) => { arrive = resolve }) as never) + reportCampaignOpenFromUrl('?moduleId=my-day&lessonId=1&c=myday-back') + await vi.advanceTimersByTimeAsync(2600) + await campaignOpenSettled() // профиль дальше не ждёт + + const late = lateCampaignOpen() + arrive({ ok: true }) + await expect(late).resolves.toBe(true) + await expect(lateCampaignOpen()).resolves.toBe(false) + } finally { + vi.useRealTimers() + } + }) + + it('a report that never arrives does not hold the launch forever', async () => { + vi.useFakeTimers() + try { + report.mockReturnValueOnce(new Promise(() => {}) as never) + reportCampaignOpenFromUrl('?moduleId=my-day&lessonId=1&c=myday-back') + await vi.advanceTimersByTimeAsync(2600) + const late = lateCampaignOpen() + await vi.advanceTimersByTimeAsync(6100) + await expect(late).resolves.toBe(false) + } finally { + vi.useRealTimers() + } + }) }) diff --git a/src/Trale/miniapp-src/src/campaignOpen.ts b/src/Trale/miniapp-src/src/campaignOpen.ts index 59be6bf6..3ac2e5dc 100644 --- a/src/Trale/miniapp-src/src/campaignOpen.ts +++ b/src/Trale/miniapp-src/src/campaignOpen.ts @@ -14,8 +14,12 @@ export function campaignKeyFromUrl(search: string): string | null { const WAIT_MS = 2500 /** Отметка не дошла (сеть моргнула) — пробуем ещё раз: от неё зависит подарок кампании. */ const RETRY_MS = 1500 +/** Сколько ещё ждём опоздавшую отметку, когда без подарка человек упирается в экран покупки. */ +const LATE_WAIT_MS = 6000 let settled: Promise = Promise.resolve() +let finished: Promise = Promise.resolve() +let pending = false let gift: CampaignGiftDto | null = null export function reportCampaignOpenFromUrl(search: string = window.location.search) { @@ -25,7 +29,10 @@ export function reportCampaignOpenFromUrl(search: string = window.location.searc const once = () => reportCampaignOpen(key).then(r => { gift = r.gift ?? null }) // Если не дошло и со второго раза — подарок выдаст следующее открытие той же кнопкой: сервер отдаёт его // при первом дошедшем открытии, пока не вышел срок. + pending = true const report = once().catch(() => new Promise(resolve => setTimeout(resolve, RETRY_MS)).then(once)).catch(() => {}) + .then(() => { pending = false }) + finished = report settled = Promise.race([report, new Promise(resolve => setTimeout(resolve, WAIT_MS))]) } catch {} } @@ -36,6 +43,16 @@ export function reportCampaignOpenFromUrl(search: string = window.location.searc */ export const campaignOpenSettled = () => settled +/** + * Отметка опоздала: профиль уже загружен без неё, и подарка кампании в нём может не быть. + * Ждём её ещё немного — true, если дошла и профиль стоит спросить заново. Нужно там, где без + * подарка человек вместо обещанного урока увидел бы экран покупки. + */ +export function lateCampaignOpen(): Promise { + if (!pending) return Promise.resolve(false) + return Promise.race([finished.then(() => true), new Promise(resolve => setTimeout(() => resolve(false), LATE_WAIT_MS))]) +} + /** Подарок, выданный в этот запуск, — посмотреть, не забирая. */ export const peekCampaignGift = () => gift diff --git a/src/Trale/miniapp-src/src/paidGate.test.ts b/src/Trale/miniapp-src/src/paidGate.test.ts new file mode 100644 index 00000000..e1407120 --- /dev/null +++ b/src/Trale/miniapp-src/src/paidGate.test.ts @@ -0,0 +1,53 @@ +import { describe, it, expect } from 'vitest' +import { needsPurchase } from './paidGate' +import { PRO_MODULE_IDS, Screen } from './types' + +const entryScreens = (moduleId: string): Screen[] => [ + { kind: 'module', moduleId }, + { kind: 'lesson-theory', moduleId, lessonId: 1 }, + { kind: 'practice', moduleId, lessonId: 1 }, + { kind: 'practice-mistakes', moduleId, lessonId: 1, wrongQuestions: [] }, +] + +describe('needsPurchase', () => { + it('closes every way into a paid module for a person without access', () => { + for (const screen of entryScreens('cases')) { + expect(needsPurchase(screen, false), screen.kind).toBe(true) + } + }) + + it('covers every paid module, not just one', () => { + for (const moduleId of PRO_MODULE_IDS) { + expect(needsPurchase({ kind: 'practice', moduleId, lessonId: 1 }, false), moduleId).toBe(true) + } + }) + + it('lets a person with a subscription or a free period through', () => { + for (const screen of entryScreens('my-day')) { + expect(needsPurchase(screen, true), screen.kind).toBe(false) + } + }) + + it('leaves free modules open without access', () => { + for (const moduleId of ['alphabet-progressive', 'verbs-of-movement', 'welcome']) { + for (const screen of entryScreens(moduleId)) { + expect(needsPurchase(screen, false), `${moduleId} ${screen.kind}`).toBe(false) + } + } + }) + + it('still shows the result of a lesson that is already done', () => { + expect(needsPurchase({ kind: 'result', moduleId: 'cases', lessonId: 1, correct: 5, total: 5, xpEarned: 10 }, false)).toBe(false) + expect(needsPurchase({ kind: 'mistakes-result', moduleId: 'cases', lessonId: 1, corrected: 1, total: 1, remainingWrong: [] }, false)).toBe(false) + }) + + it('does not touch screens outside modules', () => { + const screens: Screen[] = [ + { kind: 'dashboard' }, { kind: 'welcome' }, { kind: 'onboarding' }, { kind: 'profile' }, + { kind: 'verbs' }, { kind: 'vocabulary-list' }, { kind: 'feedback' }, { kind: 'admin' }, + ] + for (const screen of screens) { + expect(needsPurchase(screen, false), screen.kind).toBe(false) + } + }) +}) diff --git a/src/Trale/miniapp-src/src/paidGate.ts b/src/Trale/miniapp-src/src/paidGate.ts new file mode 100644 index 00000000..181c07ae --- /dev/null +++ b/src/Trale/miniapp-src/src/paidGate.ts @@ -0,0 +1,14 @@ +import { PRO_MODULE_IDS, Screen } from './types' + +// Платный модуль открывают не только плиткой на главной: ещё ссылкой из пуша или рассылки +// (?moduleId=…&lessonId=…), кнопкой «любимый модуль» в профиле, ссылкой на урок из карточки глагола. +// Замок на плитке всё это не закрывает, поэтому проверка одна — там, где App меняет экран. + +/** Экраны, которыми входят в модуль или урок. Итога урока здесь нет: его показываем тому, кто урок уже прошёл. */ +const ENTRY_KINDS: ReadonlySet = new Set(['module', 'lesson-theory', 'practice', 'practice-mistakes']) + +/** Экран ведёт в платный модуль, а доступа (подписки или бесплатного периода) нет — вместо него экран покупки. */ +export function needsPurchase(screen: Screen, hasAccess: boolean): boolean { + if (hasAccess || !ENTRY_KINDS.has(screen.kind)) return false + return 'moduleId' in screen && PRO_MODULE_IDS.has(screen.moduleId) +}