Compare commits
47 Commits
v1.18.0
...
b5fe61279b
| Author | SHA1 | Date | |
|---|---|---|---|
| b5fe61279b | |||
| e07886ecb1 | |||
| 4a3e12c85a | |||
| 54bc31c619 | |||
| d89438040b | |||
| 363f1632b1 | |||
| f0b7ad47d4 | |||
| 0e11817654 | |||
| d0e473920c | |||
| 0e56e4de9a | |||
| 8d3f862b41 | |||
| 74842dc624 | |||
| 1507ceb793 | |||
| 4b3c9d4fdd | |||
| eef90a152e | |||
| d8d1b06eee | |||
| c16008e67a | |||
| ff55d5de83 | |||
| 7cc2b50d23 | |||
| eb7fa98426 | |||
| 81d5383c42 | |||
| b6af682381 | |||
| ed79c30d2a | |||
| 471fadc6a4 | |||
| 564abdcf88 | |||
| c522e77599 | |||
| 28afcff551 | |||
| c34e2a8dbf | |||
| 25381f70a3 | |||
| 522beec82e | |||
| 3b485883ee | |||
| efeed17abc | |||
| cc34622630 | |||
| f6d256215a | |||
| fe5a3d6d3b | |||
| 7e142d471c | |||
| dbe2c4cb94 | |||
| 8c5b659ddf | |||
| a067a2fd01 | |||
| 8becdb45e4 | |||
| 25b5ed5516 | |||
| de5ab9186c | |||
| 7df078f5ed | |||
| 1d77ee83b3 | |||
| 5a4c460268 | |||
| 807edff327 | |||
| 0f3b4dbcff |
@@ -30,7 +30,7 @@ on it**, and prefer the authoritative docs where they overlap. Add to this file
|
|||||||
|
|
||||||
## Native Android build (Capacitor)
|
## Native Android build (Capacitor)
|
||||||
|
|
||||||
The native Android app (`ANDROID_PLAN.md`) is a Capacitor 8 wrapper of the `ui` SPA, scaffolded under
|
The native Android app is a Capacitor 8 wrapper of the `ui` SPA, scaffolded under
|
||||||
`ui/` (a Node project outside `go.work`). Hard-won bring-up facts — verify against current code:
|
`ui/` (a Node project outside `go.work`). Hard-won bring-up facts — verify against current code:
|
||||||
|
|
||||||
- **Capacitor 8 needs JDK 21, not 17.** `@capacitor/android` compiles at `VERSION_21`; a JDK 17 Gradle
|
- **Capacitor 8 needs JDK 21, not 17.** `@capacitor/android` compiles at `VERSION_21`; a JDK 17 Gradle
|
||||||
@@ -234,9 +234,9 @@ The native Android app (`ANDROID_PLAN.md`) is a Capacitor 8 wrapper of the `ui`
|
|||||||
`--pg1-user=scrabble`.
|
`--pg1-user=scrabble`.
|
||||||
- **Offline mode** — the robot brain, move generator/validator/scorer and DAWG reader are **JS ports**
|
- **Offline mode** — the robot brain, move generator/validator/scorer and DAWG reader are **JS ports**
|
||||||
of the Go engine, bundled client-side and **parity-pinned** by golden tests. Multi-phase; native
|
of the Go engine, bundled client-side and **parity-pinned** by golden tests. Multi-phase; native
|
||||||
offline-first bundles the dictionaries (see `ANDROID_PLAN.md`).
|
offline-first bundles the dictionaries.
|
||||||
- **VK ID web login** — raw OAuth 2.1 against `id.vk.com`, a **separate VK "Web" app** from the Mini
|
- **VK ID web login** — raw OAuth 2.1 against `id.vk.com`, a **separate VK "Web" app** from the Mini
|
||||||
App, server-side confidential code exchange.
|
App, server-side confidential code exchange.
|
||||||
- **Email relay** — Selectel SMTP + confirm / link / unlink / deletion codes + alerts.
|
- **Email relay** — Selectel SMTP + confirm / link / unlink / deletion codes + alerts.
|
||||||
- **Native Android** — see `ANDROID_PLAN.md` (Capacitor bundle model, client-version gate,
|
- **Native Android** — Capacitor bundle model, client-version gate, offline-first, RuStore; the
|
||||||
offline-first, RuStore).
|
design lives in `docs/ARCHITECTURE.md` (§2 gate, §3 identity, §13 native build).
|
||||||
|
|||||||
@@ -3,11 +3,11 @@
|
|||||||
# a PR. It builds the native-flavoured SPA, bundles the offline dictionaries into the APK assets, and
|
# a PR. It builds the native-flavoured SPA, bundles the offline dictionaries into the APK assets, and
|
||||||
# assembles a release APK, uploaded as a run artifact (RuStore upload stays manual for the MVP).
|
# assembles a release APK, uploaded as a run artifact (RuStore upload stays manual for the MVP).
|
||||||
#
|
#
|
||||||
# Signing degrades gracefully: with the ANDROID_KEYSTORE_* secrets present the APK is signed; without
|
# Signing degrades gracefully: with the ANDROID_RUSTORE_* secrets present the APK is signed; without
|
||||||
# them build.gradle produces an UNSIGNED release APK (so a dry run still proves the whole pipeline).
|
# them build.gradle produces an UNSIGNED release APK (so a dry run still proves the whole pipeline).
|
||||||
# The keystore is a publication prerequisite — see deploy/README.md (Android build/release runbook) and
|
# The keystore is a publication prerequisite — see deploy/README.md (Android build/release runbook).
|
||||||
# ANDROID_PLAN.md §E. The toolchain is self-provisioned here (JDK 21 + a cached Android SDK), so the
|
# The toolchain is self-provisioned here (JDK 21 + a cached Android SDK), so the runner host needs
|
||||||
# runner host needs nothing pre-installed.
|
# nothing pre-installed.
|
||||||
name: android-build
|
name: android-build
|
||||||
run-name: "android build ${{ github.sha }}"
|
run-name: "android build ${{ github.sha }}"
|
||||||
|
|
||||||
@@ -144,7 +144,7 @@ jobs:
|
|||||||
- name: Decode the release keystore
|
- name: Decode the release keystore
|
||||||
id: keystore
|
id: keystore
|
||||||
env:
|
env:
|
||||||
ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
|
ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_RUSTORE_KEYSTORE_BASE64 }}
|
||||||
run: |
|
run: |
|
||||||
if [ -n "$ANDROID_KEYSTORE_BASE64" ]; then
|
if [ -n "$ANDROID_KEYSTORE_BASE64" ]; then
|
||||||
printf '%s' "$ANDROID_KEYSTORE_BASE64" | base64 -d > "${GITHUB_WORKSPACE}/release.jks"
|
printf '%s' "$ANDROID_KEYSTORE_BASE64" | base64 -d > "${GITHUB_WORKSPACE}/release.jks"
|
||||||
@@ -152,16 +152,16 @@ jobs:
|
|||||||
echo "keystore decoded -> signed release build"
|
echo "keystore decoded -> signed release build"
|
||||||
else
|
else
|
||||||
echo "file=" >> "$GITHUB_OUTPUT"
|
echo "file=" >> "$GITHUB_OUTPUT"
|
||||||
echo "::warning::ANDROID_KEYSTORE_BASE64 is not set — building an UNSIGNED release APK (not installable/publishable)"
|
echo "::warning::ANDROID_RUSTORE_KEYSTORE_BASE64 secret is not set — building an UNSIGNED release APK (not installable/publishable)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Assemble the release APK
|
- name: Assemble the release APK
|
||||||
working-directory: ui/android
|
working-directory: ui/android
|
||||||
env:
|
env:
|
||||||
ANDROID_KEYSTORE_FILE: ${{ steps.keystore.outputs.file }}
|
ANDROID_KEYSTORE_FILE: ${{ steps.keystore.outputs.file }}
|
||||||
ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
|
ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_RUSTORE_KEYSTORE_PASSWORD }}
|
||||||
ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
|
ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_RUSTORE_KEY_ALIAS }}
|
||||||
ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
|
ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_RUSTORE_KEY_PASSWORD }}
|
||||||
run: ./gradlew assembleRelease -PversionCode=${{ steps.prep.outputs.code }} -PversionName=${{ steps.prep.outputs.name }} --console=plain
|
run: ./gradlew assembleRelease -PversionCode=${{ steps.prep.outputs.code }} -PversionName=${{ steps.prep.outputs.name }} --console=plain
|
||||||
|
|
||||||
- name: Upload the APK artifact
|
- name: Upload the APK artifact
|
||||||
@@ -522,10 +522,21 @@ jobs:
|
|||||||
# (the seller INN, §11) AND that the pricing marker was substituted (proves the fetch +
|
# (the seller INN, §11) AND that the pricing marker was substituted (proves the fetch +
|
||||||
# splice ran), never just the status. Data-independent: an empty catalog still substitutes
|
# splice ran), never just the status. Data-independent: an empty catalog still substitutes
|
||||||
# the marker with nothing, so "pricing_template" must be absent either way.
|
# the marker with nothing, so "pricing_template" must be absent either way.
|
||||||
out="$(docker run --rm --network edge alpine:3.20 wget -q -O - http://scrabble/offer/ 2>&1 || true)"
|
# Full body is needed (the INN is in §11 and the marker check spans the page), so this
|
||||||
if echo "$out" | grep -q "290210610742" && ! echo "$out" | grep -q "pricing_template"; then
|
# cannot be a head-only probe like the legal one. Retry with a timeout instead: the offer is
|
||||||
echo "ok: /offer/ serves the rendered offer with the price list spliced in"
|
# now bilingual (RU + EN, larger), and a single-shot fetch can race the renderer's restart in
|
||||||
else
|
# the same deploy.
|
||||||
|
ok=
|
||||||
|
for i in $(seq 1 20); do
|
||||||
|
out="$(docker run --rm --network edge alpine:3.20 wget -q -T 10 -O - http://scrabble/offer/ 2>&1 || true)"
|
||||||
|
if echo "$out" | grep -q "290210610742" && ! echo "$out" | grep -q "pricing_template"; then
|
||||||
|
echo "ok: /offer/ serves the rendered offer with the price list spliced in"
|
||||||
|
ok=1
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
sleep 3
|
||||||
|
done
|
||||||
|
if [ -z "$ok" ]; then
|
||||||
echo "FAIL: /offer/ did not serve the rendered offer (route fell through, or the price splice failed)"
|
echo "FAIL: /offer/ did not serve the rendered offer (route fell through, or the price splice failed)"
|
||||||
docker logs --tail 50 scrabble-renderer || true
|
docker logs --tail 50 scrabble-renderer || true
|
||||||
docker logs --tail 50 scrabble-backend || true
|
docker logs --tail 50 scrabble-backend || true
|
||||||
@@ -533,6 +544,35 @@ jobs:
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
- name: Probe the /privacy/ and /eula/ legal pages are served
|
||||||
|
run: |
|
||||||
|
set -u
|
||||||
|
# /privacy/ and /eula/ are static legal markdown rendered by the render sidecar. If the
|
||||||
|
# @legal caddy route is missing they fall to the landing shell (also 200, canonical
|
||||||
|
# erudit-game.ru/), so assert the page-specific canonical URL — it uniquely identifies the
|
||||||
|
# rendered legal doc reaching the edge, not the landing catch-all. Read only the <head>
|
||||||
|
# (head -c 4096; the canonical link sits in the first bytes): the check is then
|
||||||
|
# size-independent, so the large EULA page does not exceed the timeout while the monitoring
|
||||||
|
# stack is still booting post-deploy and starving the CPU-capped renderer. Retry like the
|
||||||
|
# landing/gateway/backend probe to ride out that window.
|
||||||
|
for route in privacy eula; do
|
||||||
|
ok=
|
||||||
|
for i in $(seq 1 20); do
|
||||||
|
head_out="$(docker run --rm --network edge alpine:3.20 sh -c "wget -q -T 10 -O - http://scrabble/${route}/ 2>/dev/null | head -c 4096" || true)"
|
||||||
|
if printf '%s' "$head_out" | grep -qF "erudit-game.ru/${route}/"; then
|
||||||
|
echo "ok: /${route}/ serves the rendered legal page"
|
||||||
|
ok=1
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
sleep 3
|
||||||
|
done
|
||||||
|
if [ -z "$ok" ]; then
|
||||||
|
echo "FAIL: /${route}/ did not serve the rendered legal page (@legal route missing?)"
|
||||||
|
docker logs --tail 50 scrabble-renderer || true
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
- name: Probe the /pay/ callback route reaches the gateway
|
- name: Probe the /pay/ callback route reaches the gateway
|
||||||
run: |
|
run: |
|
||||||
set -u
|
set -u
|
||||||
|
|||||||
@@ -62,15 +62,97 @@ client-only (no server change).
|
|||||||
|
|
||||||
Kept current as parts land so a fresh session resumes without re-deriving. Verify against code.
|
Kept current as parts land so a fresh session resumes without re-deriving. Verify against code.
|
||||||
|
|
||||||
|
> ### ▶ RESUME HERE — 2026-07-14 (keystore secrets set; payments landed; gate = RuStore account + merge/tag)
|
||||||
|
>
|
||||||
|
> **Where we are.** The legal-documents track, the release-prep hygiene, the icon rebrand **and the
|
||||||
|
> release keystore** are DONE (the keystore + its Gitea secrets set by the owner — see below). The
|
||||||
|
> RuStore MVP is now gated on **one owner-side item** — the **RuStore developer account** (owner going
|
||||||
|
> ИП; RuStore updated its requirements) — plus the agent's **promote/tag → signed-build** chain. Also
|
||||||
|
> landed on `development` since: the payments **E10 multi-shop split** (#266) + **E11 kill switch**
|
||||||
|
> (#267), both dormant / fail-open (no bearing on the Android build), and the signing-secret rename
|
||||||
|
> `ANDROID_*` → **`ANDROID_RUSTORE_*`** (#268). Do not re-do the finished work or re-ask the locked
|
||||||
|
> decisions.
|
||||||
|
>
|
||||||
|
> **Branches / PRs.** All merged to `development` (contour-green): legal documents (#253); release-prep
|
||||||
|
> hygiene + the re-enabled `android-build` workflow (#254); the payments E10/E11 (#266/#267); the
|
||||||
|
> signing-secret rename (#268). No open Android branch.
|
||||||
|
>
|
||||||
|
> **Done this session.**
|
||||||
|
> - **Legal documents** (satisfies the RuStore *hosted privacy-policy URL* prerequisite): authored
|
||||||
|
> `ui/legal/{privacy,eula,offer}_{ru,en}.md`; served as **bilingual (RU/EN)** standalone pages by the
|
||||||
|
> render sidecar at `/privacy/`, `/eula/`, `/offer/` via the shared `ui/src/lib/offer.ts`
|
||||||
|
> `renderLegalHtml`, with a client-side **language + theme switcher** (🌐 + ☼/☾, no "back", default
|
||||||
|
> Russian + persisted, mirroring the landing). The offer's EN view **transliterates** the Russian
|
||||||
|
> product names and **translates** the price-list section headings + column headers (`PRICE_TR`).
|
||||||
|
> Edge: `@legal` caddy matcher (`/offer/ /privacy/ /eula/`) + CI probes (size-independent head-only
|
||||||
|
> for the legal pages, retry for the offer). Landing footer links: Пользовательское соглашение |
|
||||||
|
> Политика конфиденциальности | Публичная оферта | Обратная связь (→ the Telegram bot). Docs baked
|
||||||
|
> into `docs/ARCHITECTURE.md`, `docs/FUNCTIONAL.md` (+`_ru`), `renderer/README.md`.
|
||||||
|
> **Locked legal decisions — do NOT re-litigate:** seller **INN `290210610742`**; EULA §14 leads
|
||||||
|
> with **RF law + jurisdiction** as residence tiers (France / England&Wales retained as foreign
|
||||||
|
> tiers); the "only the English version is legally binding" clause is **removed**; data collection is
|
||||||
|
> kept but **scoped to voluntary/support provision** (passport/payment/ID only when the user provides
|
||||||
|
> them); «Компания» is not shout-cased; the offer's EN catalog product names are **transliterated**
|
||||||
|
> (owner-chosen), while its headings/columns are translated.
|
||||||
|
> - **Release-prep hygiene (PR #254):** de-anchored `ANDROID_PLAN.md` from all code/docs — **no
|
||||||
|
> reference to this file remains anywhere outside it**; **re-enabled the `android-build` workflow**
|
||||||
|
> (`.gitea/workflows/android-build.yaml.disabled` → `.yaml`; it is `workflow_dispatch`-only + gated
|
||||||
|
> `if master`, so it never auto-runs; the CI host already has the Android SDK at `/opt/android-sdk`);
|
||||||
|
> added [`docs/ICONS.md`](docs/ICONS.md) (the single-master icon/logo format reference).
|
||||||
|
>
|
||||||
|
> **Remaining to release (owner-gated unless the agent is named).**
|
||||||
|
> 1. **Icon rebrand — DONE.** The SVG-tracer export failed, so the icon was designed **collaboratively
|
||||||
|
> from scratch** (wooden «Э» tile + ✻ subscript, Spectral Bold). The construction is fully specified
|
||||||
|
> in fractions of the side in [`docs/ICON_BRANDBOOK.md`](docs/ICON_BRANDBOOK.md), with the reference
|
||||||
|
> generator + pinned font + masters in [`assets/icons/brand/`](assets/icons/brand/). One master →
|
||||||
|
> the whole set sliced by `brand/build-set.mjs` (+ `build-android-res.mjs`): web (favicon light+dark,
|
||||||
|
> apple-touch, PWA any + maskable, og-image reskinned to «Эрудит» / Игра в слова), the Capacitor
|
||||||
|
> layers `ui/assets/{icon,icon-foreground,icon-background}.png`, the Android launcher res (all
|
||||||
|
> densities, **no inset**, **+ monochrome** themed layer), and manual-upload art (`brand/{vk,tg,store}`).
|
||||||
|
> Primary variant **light**; dark where the platform can theme (favicon.svg). The old LiberationSans
|
||||||
|
> generator (`assets/icons/build/`) is removed; targets are mapped in `docs/ICONS.md`.
|
||||||
|
> 2. **Merge PR #254** → `development` (owner approval), then **promote `development` → `master`** and
|
||||||
|
> **tag `vX.Y.Z`** for the release (the version stamps the APK `versionName`/`versionCode` and the
|
||||||
|
> `X-Client-Version` header).
|
||||||
|
> 3. **Release keystore — DONE (owner, 2026-07-14).** `erudit-release.jks` (RSA 4096, alias `erudit`,
|
||||||
|
> PKCS12) generated + backed up off-host; the four Gitea secrets are set under the RuStore-specific
|
||||||
|
> names `ANDROID_RUSTORE_KEYSTORE_BASE64` / `ANDROID_RUSTORE_KEYSTORE_PASSWORD` /
|
||||||
|
> `ANDROID_RUSTORE_KEY_ALIAS` / `ANDROID_RUSTORE_KEY_PASSWORD` (loss ⇒ the app can never be updated —
|
||||||
|
> the cert is pinned at the first RuStore upload). Google Play, later, would use its own
|
||||||
|
> `ANDROID_PLAY_*` upload key (Play App Signing) — a separate key.
|
||||||
|
> 4. **RuStore developer account.** OWNER (verified legal entity or self-employed / самозанятый). Gates
|
||||||
|
> publication, not the build.
|
||||||
|
> 5. **Dispatch the signed build.** AGENT: on `master`, dispatch `android-build` (`confirm=build`) via
|
||||||
|
> `tea`, watch to green, retrieve the signed APK artifact (verify Gitea 1.26 `upload-artifact@v4` at
|
||||||
|
> the dispatch).
|
||||||
|
> 6. **On-device smoke.** OWNER installs the signed APK and runs the airplane-mode first-launch
|
||||||
|
> checklist (`docs/TESTING.md`). The AGENT can pre-run the emulator smoke.
|
||||||
|
> 7. **Store listing.** Reserve `ru.eruditgame.app`, title «Эрудит», RU description, phone screenshots,
|
||||||
|
> icon / feature graphic, age rating, the **privacy-policy URL `https://erudit-game.ru/privacy/`**
|
||||||
|
> (now available), the content declaration.
|
||||||
|
> 8. **Upload to RuStore.** OWNER. After publication, set the `ANDROID_RUSTORE_URL` Gitea variable to
|
||||||
|
> the store deep-link so the update button works on future gated releases (empty until then — the
|
||||||
|
> gate is dormant in the MVP).
|
||||||
|
>
|
||||||
|
> **Next tracks (design in a future session — interview the owner first).**
|
||||||
|
> - **Native notifications (push).** Promote FCM/push from "Out of scope" to a real track: a Capacitor
|
||||||
|
> push plugin, the Android send path (FCM — but **check RuStore's own push service vs FCM on RuStore
|
||||||
|
> devices**, since Google Play Services may be absent), token registration, and reusing the existing
|
||||||
|
> server notification dispatcher. Owner will bring specifics.
|
||||||
|
> - **A test APK for the emulator** (owner asked): the signed APK comes from `android-build` (needs the
|
||||||
|
> promote/tag chain, step 2). A quick **debug** APK is buildable without the release chain if the host
|
||||||
|
> has the Android SDK + JDK 21 (`pnpm build` → `cap sync` → `assembleDebug`).
|
||||||
|
> - Possibly other native polish (owner to flag).
|
||||||
|
|
||||||
- **A. Capacitor scaffolding — ✅ DONE & verified (2026-07-12).** Capacitor 8 native project generated
|
- **A. Capacitor scaffolding — ✅ DONE & verified (2026-07-12).** Capacitor 8 native project generated
|
||||||
under `ui/android/` (tracked), `@capacitor/*` deps + `capacitor.config.ts`, hardware Back in
|
under `ui/android/` (tracked), `@capacitor/*` deps + `capacitor.config.ts`, hardware Back in
|
||||||
`ui/src/lib/native.ts` wired from `App.svelte`. `pnpm build` → `cap sync` → `./gradlew assembleDebug`
|
`ui/src/lib/native.ts` wired from `App.svelte`. `pnpm build` → `cap sync` → `./gradlew assembleDebug`
|
||||||
builds a debug APK that installs and **cold-launches to the Login screen** on the Pixel_10 emulator.
|
builds a debug APK that installs and **cold-launches to the Login screen** on the Pixel_10 emulator.
|
||||||
`svelte-check` 0 errors, `vitest` 584 passed. Build recipe + toolchain gotchas live in
|
`svelte-check` 0 errors, `vitest` 584 passed. Build recipe + toolchain gotchas live in
|
||||||
`.claude/CLAUDE.md` → "Native Android build (Capacitor)".
|
`.claude/CLAUDE.md` → "Native Android build (Capacitor)".
|
||||||
**Launcher icon:** a **temporary** placeholder is in place — `ui/assets/icon.png` (the maskable «Э»
|
**Launcher icon:** the temporary placeholder was **superseded by the icon rebrand** — the launcher
|
||||||
brand mark upscaled 512→1024) → `pnpm android:assets` regenerated the Android launcher/adaptive
|
now uses the two-layer adaptive icon (background + foreground + monochrome) generated from the brand
|
||||||
icons + splashes. Superseded by the icon rebrand below.
|
master; see the RESUME block (item 1), `docs/ICON_BRANDBOOK.md` and `docs/ICONS.md`.
|
||||||
- **B. Native web-build correctness — ✅ DONE & verified (2026-07-12).** New `ui/src/lib/origin.ts`
|
- **B. Native web-build correctness — ✅ DONE & verified (2026-07-12).** New `ui/src/lib/origin.ts`
|
||||||
`gatewayOrigin()`; the two `location.origin` landmines fixed (`game/Game.svelte` export/share URL,
|
`gatewayOrigin()`; the two `location.origin` landmines fixed (`game/Game.svelte` export/share URL,
|
||||||
`screens/Wallet.svelte` site-root) — `transport.ts:32` already resolves via `VITE_GATEWAY_URL`, left
|
`screens/Wallet.svelte` site-root) — `transport.ts:32` already resolves via `VITE_GATEWAY_URL`, left
|
||||||
@@ -181,11 +263,10 @@ Kept current as parts land so a fresh session resumes without re-deriving. Verif
|
|||||||
then O2–O7; the release chain (PR→development→contour→master→tag→dispatch `android-build`) follows. None of
|
then O2–O7; the release chain (PR→development→contour→master→tag→dispatch `android-build`) follows. None of
|
||||||
O1–O7 is started. Branch `feature/android-native`, local/unpushed.
|
O1–O7 is started. Branch `feature/android-native`, local/unpushed.
|
||||||
|
|
||||||
Open logistics (not code): **mandatory icon rebrand (future)** — author ONE vector master and generate
|
Icon rebrand — **DONE** (was "one master → every icon"): a single Spectral «Э» master now drives web
|
||||||
*every* icon from it (web `favicon.svg` / PWA `icon-*` / maskable, Android adaptive, future iOS). Today
|
(favicon light+dark / PWA any + maskable / apple-touch / og), the Capacitor layers and the Android
|
||||||
the formats drift — `favicon.svg` is a rounded bordered tile, `icon-maskable-512.png` a full-bleed
|
adaptive res (no inset, + monochrome), plus VK/TG/store art. Specced in `docs/ICON_BRANDBOOK.md`,
|
||||||
square, visibly different — and the Android launcher icon is only a temporary upscale of the maskable
|
mapped in `docs/ICONS.md`, generated from `assets/icons/brand/`. `~/.claude/bin/gitea-ci-watch.py` is present.
|
||||||
(`capacitor-assets` insets it 16.7% into the adaptive safe zone). `~/.claude/bin/gitea-ci-watch.py` is present.
|
|
||||||
RuStore publication prerequisites gate release only.
|
RuStore publication prerequisites gate release only.
|
||||||
|
|
||||||
---
|
---
|
||||||
@@ -334,8 +415,8 @@ is: scaffold → native-correct → gate → offline-first → CI → docs → r
|
|||||||
```
|
```
|
||||||
Call once from bootstrap. `atNavigationRoot` = current route is `lobby`/`login`
|
Call once from bootstrap. `atNavigationRoot` = current route is `lobby`/`login`
|
||||||
(mirror `routeDepth(...) === 0` from `App.svelte:50-54`, reading `router.svelte.ts`).
|
(mirror `routeDepth(...) === 0` from `App.svelte:50-54`, reading `router.svelte.ts`).
|
||||||
- **Launcher icon (owner asset):** owner supplies a 1024×1024 «Э» icon at `ui/assets/icon.png`
|
- **Launcher icon:** DONE — generated from the brand master into the Capacitor layers
|
||||||
(+ optional `splash.png`); `pnpm android:assets` generates adaptive icons.
|
`ui/assets/{icon,icon-foreground,icon-background}.png` and the Android res; see `docs/ICONS.md`.
|
||||||
|
|
||||||
**Done when:** `npx cap sync android` succeeds against a real `pnpm build`, and (from `ui/android/`)
|
**Done when:** `npx cap sync android` succeeds against a real `pnpm build`, and (from `ui/android/`)
|
||||||
`./gradlew assembleDebug` produces a debug APK that installs and cold-launches to the login screen.
|
`./gradlew assembleDebug` produces a debug APK that installs and cold-launches to the login screen.
|
||||||
@@ -695,6 +776,14 @@ Wire in `ui/android/app/build.gradle` `defaultConfig`:
|
|||||||
|
|
||||||
### G. Release + owner handoff
|
### G. Release + owner handoff
|
||||||
|
|
||||||
|
> **Status 2026-07-13 — see the ▶ RESUME block at the top of §Progress.** Since this chain was
|
||||||
|
> written, a **legal-documents track** was added and merged (PR #253 — the RuStore hosted
|
||||||
|
> privacy-policy URL and the `/privacy/ /eula/ /offer/` pages), and a **release-prep hygiene** patch is
|
||||||
|
> in flight (PR #254, open), and the **icon rebrand is DONE** (brand master → full set; see the RESUME
|
||||||
|
> block). The remaining gates are the **keystore** and the **RuStore account** (owner-side). The steps
|
||||||
|
> below are the original release chain; the resume
|
||||||
|
> block supersedes them with the current, exhaustive state.
|
||||||
|
|
||||||
0. **Land the offline-model redesign — ✅ DONE (O1–O7, 2026-07-13; staged detail below).** Resolved the deferred
|
0. **Land the offline-model redesign — ✅ DONE (O1–O7, 2026-07-13; staged detail below).** Resolved the deferred
|
||||||
native local-game-visibility decision — a native guest now sees / resumes their device-local games once online
|
native local-game-visibility decision — a native guest now sees / resumes their device-local games once online
|
||||||
(the **unified lobby**, O5) — as part of the owner-approved change: the explicit offline toggle is gone, offline
|
(the **unified lobby**, O5) — as part of the owner-approved change: the explicit offline toggle is gone, offline
|
||||||
|
|||||||
@@ -39,10 +39,13 @@ status — without re-deriving decisions.
|
|||||||
| E7 | Admin, reports & catalog | 2 | DONE |
|
| E7 | Admin, reports & catalog | 2 | DONE |
|
||||||
| E8 | Guest limits | — | DONE |
|
| E8 | Guest limits | — | DONE |
|
||||||
| E9 | Tournament fee | future | TODO |
|
| E9 | Tournament fee | future | TODO |
|
||||||
|
| E10 | Multi-shop direct rail + ИП fiscalization | 2+ | DONE |
|
||||||
|
| E11 | Payment availability kill switch + per-account override | 2 | DONE |
|
||||||
|
|
||||||
**Release 1** = full mechanics with no real money, exercised via `admin_grant` (E0→E1→E2→E3).
|
**Release 1** = full mechanics with no real money, exercised via `admin_grant` (E0→E1→E2→E3).
|
||||||
**Release 2** = money (E4→E5→E6→E7). E8 is standalone (game-behaviour change, can run in
|
**Release 2** = money (E4→E5→E6→E7). E8 is standalone (game-behaviour change, can run in
|
||||||
parallel). E9 is future.
|
parallel). E9 is future. E10 splits the `direct` rail into per-channel Robokassa shops + ИП
|
||||||
|
fiscalization (post-launch, backend-first).
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -892,6 +895,123 @@ tournament-entry storage + pricing design.
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
## E10 — Multi-shop direct rail + ИП fiscalization
|
||||||
|
|
||||||
|
**Status:** DONE (merged — the multi-shop PR) · **Release 2+ (post-launch, backend-first)** · depends on: E5 (intake/`Fund`,
|
||||||
|
the `robokassa` adapter, the Result callback), E7 (the per-user report — channel breakdown) ·
|
||||||
|
mechanics: PAYMENTS §9, §12; decisions D41 (rev), D42–D44.
|
||||||
|
|
||||||
|
**Goal.** Split the single Robokassa `direct` rail into **per-channel merchant shops** (web,
|
||||||
|
android; ios later) — separate merchant accounts / withdrawal / accounting and a per-channel
|
||||||
|
breakdown in the E7 report — while keeping **one `direct` wallet** (D42). Land the wallet/identity
|
||||||
|
rules the native apps need (email-only anchor, D43) and revise fiscalization for the owner's move
|
||||||
|
to **ИП / 54-ФЗ** (D41 rev). All **additive / contour-safe** and **money-live** → expand-contract
|
||||||
|
throughout.
|
||||||
|
|
||||||
|
**Locked decisions (owner interview 2026-07-14): D41 (rev), D42, D43, D44.** No wallet-model /
|
||||||
|
spend-wall change; the split is merchant-account routing under one `direct` segment. Route the shop
|
||||||
|
by the **trusted** `X-Platform` subtype, never a client field; unknown → `web`.
|
||||||
|
|
||||||
|
**B1 — Config: one shop → a set of shops.**
|
||||||
|
|
||||||
|
- `robokassa.Config` (single) → a **shops registry** keyed by channel (`web`, `android`; `ios`
|
||||||
|
later), each 4 fields (`MerchantLogin`/`Password1`/`Password2`/`IsTest`). New env
|
||||||
|
`BACKEND_ROBOKASSA_WEB_*`, `BACKEND_ROBOKASSA_ANDROID_*`.
|
||||||
|
- **Expand-contract, no flag-day:** the legacy `BACKEND_ROBOKASSA_*` seeds the `web` shop; add the
|
||||||
|
new vars; retire the legacy set after the prod rollout sets the split vars. `validate()`: a shop
|
||||||
|
with a login must carry both passwords (mirror the current check), per shop.
|
||||||
|
- Config/README + `deploy/.env.example` + the deploy ansible vars.
|
||||||
|
|
||||||
|
**B2 — Route the shop by channel (intake).**
|
||||||
|
|
||||||
|
- `handleWalletOrder` `SourceDirect` branch: pick the shop by `cxt.Subtype` (`web`/`android`;
|
||||||
|
unknown → `web`). Build the payment request from that shop. The subtype rides the trusted
|
||||||
|
gateway-injected `X-Platform` (`<kind>/<subtype>`, `parsePlatformHeader`) — no spoofable client
|
||||||
|
field. **Verify the gateway emits `direct/android` for the native build**; if it sends a bare
|
||||||
|
`direct/`, add the android subtype (small gateway change).
|
||||||
|
- Record the chosen `shop` on the order (feeds B5).
|
||||||
|
|
||||||
|
**B3 — Per-shop Result callbacks.**
|
||||||
|
|
||||||
|
- The callback must select the right `Password2` → each shop gets its own Result URL:
|
||||||
|
**per-shop public edge routes** (mirror the existing single Robokassa Result route, e.g.
|
||||||
|
`…/result/web`, `…/result/android`), each forwarded to the backend and verified with that shop's
|
||||||
|
config, then the same `Fund` (source stays `direct`). Add the routes to the **Caddyfile
|
||||||
|
`@gateway` matcher** (else they fall to the landing catch-all) **+ a CI probe per route**.
|
||||||
|
- Keep the legacy single route alive (shop = `web`) through the expand-contract window until the
|
||||||
|
cabinet Result URLs are cut over.
|
||||||
|
|
||||||
|
**B4 — ИП fiscalization (D41 rev) — RESOLVED (owner 2026-07-14): cabinet-side only.** The owner keeps
|
||||||
|
Robokassa's cabinet auto-fiscalization (a generic чек is acceptable for the ИП); the optional
|
||||||
|
itemized-`Receipt` / `Email` code below is **dropped** — not needed. (Kept for context.)
|
||||||
|
|
||||||
|
- **Owner/cabinet:** enable the 54-ФЗ cloud kassa in the Robokassa ЛКК (kassa + ОФД + СНО).
|
||||||
|
Required for ИП regardless of code.
|
||||||
|
- **Code (optional, itemized чеки):** send a one-line `Receipt` (pack name, qty 1, `sum`, `tax`
|
||||||
|
per СНО, `payment_object`/`payment_method`) + the customer `Email` (the D36 confirmed anchor) in
|
||||||
|
the payment request; extend the signature to `MerchantLogin:OutSum:InvId:Receipt:Password1`
|
||||||
|
(URL-encode `Receipt`). One line fits the current GET redirect; POST-form only as a URL-length
|
||||||
|
fallback. One feature, all shops. **Sequenced last** — the split (B1–B3, B5, B6) needs no
|
||||||
|
fiscalization. Supersedes the E5 §12 shop-side НПД receipt note.
|
||||||
|
|
||||||
|
**B5 — Channel in the report (D44).**
|
||||||
|
|
||||||
|
- Additive `shop` column on the order (default `web` / backfill from `origin`); a per-channel
|
||||||
|
breakdown in the E7 per-user report (D40). Expand-contract migration (nullable/defaulted column),
|
||||||
|
**contour-safe** (a schema touch → note the contour `DROP SCHEMA` step in `PRERELEASE.md`).
|
||||||
|
|
||||||
|
**B6 — Tests + docs.**
|
||||||
|
|
||||||
|
- unit: the `robokassa` shops registry + per-shop `VerifyResult` (right `Password2`);
|
||||||
|
signature-with-`Receipt` (B4); intake shop routing by subtype (web/android/unknown→web).
|
||||||
|
- integration: order→per-shop callback→credit (each route), a duplicate credits once, an expired
|
||||||
|
order still honoured; the `shop` recorded + reported.
|
||||||
|
- docs: `PAYMENTS.md` (+`_ru`) the multi-shop topology + the ИП/54-ФЗ receipt revision;
|
||||||
|
`deploy/README` + `.env.example` the new vars + the per-shop Result routes + probes;
|
||||||
|
`PRERELEASE.md` the `shop` column contour step.
|
||||||
|
|
||||||
|
**Done-criteria.** A `direct/web` order pays through the web shop and `direct/android` through the
|
||||||
|
android shop, each verified with its own `Password2`, both crediting one `direct` wallet exactly
|
||||||
|
once; the E7 report breaks payments down by channel; the split stays contour-safe (the legacy shop
|
||||||
|
still works until the cabinet cutover). B4 (fiscalization) verified when the owner's ИП/ОФД/СНО are
|
||||||
|
live.
|
||||||
|
|
||||||
|
**Notes/risks.** Edge routes fall through if not in the Caddyfile `@gateway` matcher — add a CI
|
||||||
|
probe (field note). The prod rolling deploy skips caddy on config-only changes — force-recreate on a
|
||||||
|
Caddyfile change. Money-live: expand-contract only, image rollback DB-safe. Confirm the gateway
|
||||||
|
emits `direct/android` for the native build before relying on subtype routing.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## E11 — Payment availability kill switch + per-account override
|
||||||
|
|
||||||
|
**Status:** DONE · **Release 2** · depends on: E5 (intake/order), E7 (admin console) · mechanics:
|
||||||
|
PAYMENTS §9; decisions D45, D46.
|
||||||
|
|
||||||
|
**Delivered.** An operator disables purchases live from `/_gm` — a whole rail/channel or one account
|
||||||
|
— and the user sees a localized reason on the next purchase attempt. Motivation (owner): real apps
|
||||||
|
show broken payments with no explanation; this gives ops a live switch + a clear user message.
|
||||||
|
|
||||||
|
- **Rail kill switch** — `payments.rail_status` (per rail `direct:web` / `direct:android` / `vk` /
|
||||||
|
`telegram`): `enabled` + a per-language message, edited on the catalog page. **Fail-open** (no row
|
||||||
|
⇒ enabled, so payments are never accidentally killed). The intake gate — `CanPurchase` in
|
||||||
|
`handleWalletOrder`, before the order — returns `payment_unavailable` + the localized message;
|
||||||
|
orthogonal to the security gates.
|
||||||
|
- **Per-account override** — `payments.account_payment_override` (a row only for non-default; default
|
||||||
|
= no row, cleared by delete): allow / deny / default, edited on the user card. `allow` bypasses
|
||||||
|
**only** the ops rail switch, never the security gates (D46).
|
||||||
|
- **Wire** — the message rides an additive `ExecuteResponse.message` (envelope layer,
|
||||||
|
frozen-contract-safe; the gateway forwards a backend domain-error message via `DomainMessage`); the
|
||||||
|
client reads it into `GatewayError.message` and shows it on a `payment_unavailable` buy attempt.
|
||||||
|
- **Tests** — the pure gate `PurchaseGate` (unit, TDD); the store + gate + override end-to-end
|
||||||
|
(integration, migration `00016`); the client (svelte-check / vitest). **Docs** — PAYMENTS (+`_ru`),
|
||||||
|
decisions D45 / D46.
|
||||||
|
|
||||||
|
**Contour-safe:** additive migration (two new tables, no wipe); the wire add is additive; fail-open,
|
||||||
|
so nothing is disabled until an operator acts.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## Verification & CI (all stages)
|
## Verification & CI (all stages)
|
||||||
|
|
||||||
- Per-stage tests at the layers above; **compliance-gate regression is mandatory** (a
|
- Per-stage tests at the layers above; **compliance-gate regression is mandatory** (a
|
||||||
|
|||||||
@@ -1,41 +1,18 @@
|
|||||||
# Erudit — site icons + Open Graph card
|
# Icons
|
||||||
|
|
||||||
The favicon set and the `og:image` link-preview card for the public landing
|
The whole shipped icon set is sliced from **one master** — see
|
||||||
(`ui/landing.html`) and the SPA shell (`ui/index.html`). Same design language as the
|
[`brand/`](brand/) for the reference generator, the pinned font and the committed
|
||||||
[VK loading-screen logo](../vk/README.md): the wooden Erudit «Э» tile (score `8`),
|
outputs, and [`../../docs/ICON_BRANDBOOK.md`](../../docs/ICON_BRANDBOOK.md) for how the
|
||||||
with the wordmark on the app's dark board green (`ui/src/app.css` tokens).
|
mark is constructed. The per-platform target map (which file goes where) is in
|
||||||
|
[`../../docs/ICONS.md`](../../docs/ICONS.md).
|
||||||
| Output (committed to `ui/public/`) | Purpose |
|
|
||||||
|------|---------|
|
|
||||||
| `favicon.svg` | Vector favicon, transparent; tile + «Э» only (the score is illegible below ~32 px). |
|
|
||||||
| `favicon.ico` | 32×32 PNG-in-ICO fallback (also answers the browsers' blind `/favicon.ico` probe). |
|
|
||||||
| `apple-touch-icon.png` | 180×180 opaque full-bleed tile; iOS masks its own corners. |
|
|
||||||
| `og-image.png` | 1200×630 card: tile + «Эрудит / Скрэббл — игра в слова». Referenced absolutely as `https://erudit-game.ru/og-image.png`. |
|
|
||||||
|
|
||||||
## How it works
|
|
||||||
|
|
||||||
`build/extract.js` extracts the needed glyph outlines (tile glyphs + every wordmark
|
|
||||||
character) from LiberationSans (Arial-metric, the game's font stack) with their
|
|
||||||
advance widths into `build/glyphs.json` (committed). `build/generate.js` composes
|
|
||||||
plain SVG from those outlines — no font is needed at generation time — writes
|
|
||||||
`favicon.svg` and rasterises the PNG/ICO outputs by screenshotting the SVGs with the
|
|
||||||
`ui` package's Playwright chromium (`@playwright/test`); the `.ico` container is
|
|
||||||
assembled in-script (a single PNG entry). Raster bytes therefore depend on the
|
|
||||||
installed chromium version; the SVG sources are deterministic.
|
|
||||||
|
|
||||||
## Regenerate
|
|
||||||
|
|
||||||
Requirements: Node ≥ 18, `ui` installed (`pnpm install`, provides Playwright).
|
|
||||||
`extract.js` additionally needs `opentype.js` (`npm i opentype.js`); **`generate.js`
|
|
||||||
needs no extra packages**.
|
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
cd assets/icons
|
cd brand
|
||||||
|
npm i opentype.js
|
||||||
# 1. (optional) re-extract the glyphs — only if the font or the wordmark changes:
|
node build-set.mjs # web (ui/public) + Capacitor layers (ui/assets) + vk/ tg/ store/
|
||||||
# default font: /usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf
|
node build-android-res.mjs # Android launcher resources (all densities + monochrome)
|
||||||
node build/extract.js [/path/to/font.ttf] # -> build/glyphs.json
|
|
||||||
|
|
||||||
# 2. regenerate everything in ui/public/:
|
|
||||||
node build/generate.js
|
|
||||||
```
|
```
|
||||||
|
|
||||||
|
> The earlier `build/` pipeline (LiberationSans glyph outlines → favicon/apple-touch/OG)
|
||||||
|
> was replaced by `brand/` when the icon was rebranded onto the Spectral «Э» master.
|
||||||
|
> The separate VK loading-screen animation lives in [`../vk/`](../vk/) and is unrelated.
|
||||||
|
|||||||
@@ -0,0 +1,2 @@
|
|||||||
|
node_modules/
|
||||||
|
package-lock.json
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
# Erudit icon — brand master
|
||||||
|
|
||||||
|
The reference construction of the Erudit app icon. The authoritative, human-readable
|
||||||
|
spec lives in [`docs/ICON_BRANDBOOK.md`](../../../docs/ICON_BRANDBOOK.md); this folder
|
||||||
|
holds the machine reproduction of exactly what that document describes.
|
||||||
|
|
||||||
|
| File | What |
|
||||||
|
|------|------|
|
||||||
|
| `build-icon.mjs` | reference generator — every dimension is a fraction of the side, matching the brand book |
|
||||||
|
| `render-png.mjs` | rasterises an icon SVG to PNG via the `ui` package's Playwright chromium |
|
||||||
|
| `Spectral-Bold.ttf` | the «Э» typeface (SIL OFL, `Spectral-OFL.txt`) — pinned so the letter never drifts |
|
||||||
|
| `icon-light.svg` / `.png` | the light master (1024) |
|
||||||
|
| `icon-dark.svg` / `.png` | the dark master (1024) |
|
||||||
|
| `icon-construction.svg` / `.png` | the percent-annotated construction scheme (figure in the brand book) |
|
||||||
|
|
||||||
|
## Regenerate
|
||||||
|
|
||||||
|
```sh
|
||||||
|
cd assets/icons/brand
|
||||||
|
npm i opentype.js # the only extra dep; render uses ui's chromium
|
||||||
|
|
||||||
|
node build-icon.mjs --variant light > icon-light.svg
|
||||||
|
node build-icon.mjs --variant dark > icon-dark.svg
|
||||||
|
node build-icon.mjs --variant light --scheme > icon-construction.svg
|
||||||
|
|
||||||
|
node render-png.mjs icon-light.svg icon-light.png 1024
|
||||||
|
node render-png.mjs icon-dark.svg icon-dark.png 1024
|
||||||
|
node render-png.mjs icon-construction.svg icon-construction.png 2048
|
||||||
|
```
|
||||||
|
|
||||||
|
The SVGs are resolution-free; render at any size. Downstream slicing (favicon / PWA /
|
||||||
|
iOS / Android) is a separate step — see [`docs/ICONS.md`](../../../docs/ICONS.md).
|
||||||
@@ -0,0 +1,93 @@
|
|||||||
|
Copyright 2017 The Spectral Project Authors (https://github.com/productiontype/Spectral)
|
||||||
|
|
||||||
|
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
||||||
|
This license is copied below, and is also available with a FAQ at:
|
||||||
|
https://openfontlicense.org
|
||||||
|
|
||||||
|
|
||||||
|
-----------------------------------------------------------
|
||||||
|
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||||
|
-----------------------------------------------------------
|
||||||
|
|
||||||
|
PREAMBLE
|
||||||
|
The goals of the Open Font License (OFL) are to stimulate worldwide
|
||||||
|
development of collaborative font projects, to support the font creation
|
||||||
|
efforts of academic and linguistic communities, and to provide a free and
|
||||||
|
open framework in which fonts may be shared and improved in partnership
|
||||||
|
with others.
|
||||||
|
|
||||||
|
The OFL allows the licensed fonts to be used, studied, modified and
|
||||||
|
redistributed freely as long as they are not sold by themselves. The
|
||||||
|
fonts, including any derivative works, can be bundled, embedded,
|
||||||
|
redistributed and/or sold with any software provided that any reserved
|
||||||
|
names are not used by derivative works. The fonts and derivatives,
|
||||||
|
however, cannot be released under any other type of license. The
|
||||||
|
requirement for fonts to remain under this license does not apply
|
||||||
|
to any document created using the fonts or their derivatives.
|
||||||
|
|
||||||
|
DEFINITIONS
|
||||||
|
"Font Software" refers to the set of files released by the Copyright
|
||||||
|
Holder(s) under this license and clearly marked as such. This may
|
||||||
|
include source files, build scripts and documentation.
|
||||||
|
|
||||||
|
"Reserved Font Name" refers to any names specified as such after the
|
||||||
|
copyright statement(s).
|
||||||
|
|
||||||
|
"Original Version" refers to the collection of Font Software components as
|
||||||
|
distributed by the Copyright Holder(s).
|
||||||
|
|
||||||
|
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||||
|
or substituting -- in part or in whole -- any of the components of the
|
||||||
|
Original Version, by changing formats or by porting the Font Software to a
|
||||||
|
new environment.
|
||||||
|
|
||||||
|
"Author" refers to any designer, engineer, programmer, technical
|
||||||
|
writer or other person who contributed to the Font Software.
|
||||||
|
|
||||||
|
PERMISSION & CONDITIONS
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining
|
||||||
|
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
||||||
|
redistribute, and sell modified and unmodified copies of the Font
|
||||||
|
Software, subject to the following conditions:
|
||||||
|
|
||||||
|
1) Neither the Font Software nor any of its individual components,
|
||||||
|
in Original or Modified Versions, may be sold by itself.
|
||||||
|
|
||||||
|
2) Original or Modified Versions of the Font Software may be bundled,
|
||||||
|
redistributed and/or sold with any software, provided that each copy
|
||||||
|
contains the above copyright notice and this license. These can be
|
||||||
|
included either as stand-alone text files, human-readable headers or
|
||||||
|
in the appropriate machine-readable metadata fields within text or
|
||||||
|
binary files as long as those fields can be easily viewed by the user.
|
||||||
|
|
||||||
|
3) No Modified Version of the Font Software may use the Reserved Font
|
||||||
|
Name(s) unless explicit written permission is granted by the corresponding
|
||||||
|
Copyright Holder. This restriction only applies to the primary font name as
|
||||||
|
presented to the users.
|
||||||
|
|
||||||
|
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||||
|
Software shall not be used to promote, endorse or advertise any
|
||||||
|
Modified Version, except to acknowledge the contribution(s) of the
|
||||||
|
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||||
|
permission.
|
||||||
|
|
||||||
|
5) The Font Software, modified or unmodified, in part or in whole,
|
||||||
|
must be distributed entirely under this license, and must not be
|
||||||
|
distributed under any other license. The requirement for fonts to
|
||||||
|
remain under this license does not apply to any document created
|
||||||
|
using the Font Software.
|
||||||
|
|
||||||
|
TERMINATION
|
||||||
|
This license becomes null and void if any of the above conditions are
|
||||||
|
not met.
|
||||||
|
|
||||||
|
DISCLAIMER
|
||||||
|
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||||
|
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||||
|
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||||
|
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||||
|
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||||
|
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||||
|
OTHER DEALINGS IN THE FONT SOFTWARE.
|
||||||
|
After Width: | Height: | Size: 19 KiB |
@@ -0,0 +1,53 @@
|
|||||||
|
'use strict';
|
||||||
|
// Generate the Android launcher resources from the committed layers, at every
|
||||||
|
// density, with NO inset (our layers already fill the 108 dp canvas) and a
|
||||||
|
// monochrome (themed) layer. Run build-set.mjs first (it writes the layer PNGs).
|
||||||
|
//
|
||||||
|
// npm i opentype.js # (only build-icon/build-set need it; this reads PNGs)
|
||||||
|
// node build-set.mjs && node build-android-res.mjs
|
||||||
|
//
|
||||||
|
// Writes ui/android/app/src/main/res/mipmap-*/ic_launcher{,_round,_foreground,
|
||||||
|
// _background,_monochrome}.png. The two mipmap-anydpi-v26/*.xml are committed by hand.
|
||||||
|
import { readFileSync, writeFileSync } from 'node:fs';
|
||||||
|
import { fileURLToPath } from 'node:url';
|
||||||
|
import { dirname, join } from 'node:path';
|
||||||
|
|
||||||
|
const DIR = dirname(fileURLToPath(import.meta.url));
|
||||||
|
const ROOT = join(DIR, '..', '..', '..');
|
||||||
|
const RES = join(ROOT, 'ui', 'android', 'app', 'src', 'main', 'res');
|
||||||
|
const uri = p => 'data:image/png;base64,' + readFileSync(p).toString('base64');
|
||||||
|
const BG = uri(join(ROOT, 'ui', 'assets', 'icon-background.png'));
|
||||||
|
const FG = uri(join(ROOT, 'ui', 'assets', 'icon-foreground.png'));
|
||||||
|
const MONO = uri(join(DIR, 'android-monochrome.png'));
|
||||||
|
// The full-bleed master (square tile + master mark) — the legacy SQUARE launcher (API < 26)
|
||||||
|
// uses it so old Android shows a large mark rather than the safe-zone foreground shrunk into
|
||||||
|
// the middle. The round legacy icon keeps the safe-zone composite (a round mask would clip
|
||||||
|
// the master's corner ✻).
|
||||||
|
const MASTER = uri(join(ROOT, 'ui', 'assets', 'icon.png'));
|
||||||
|
|
||||||
|
// density: [adaptive-layer px (108 dp), legacy launcher px (48 dp)]
|
||||||
|
const D = { ldpi: [81, 36], mdpi: [108, 48], hdpi: [162, 72], xhdpi: [216, 96], xxhdpi: [324, 144], xxxhdpi: [432, 192] };
|
||||||
|
|
||||||
|
const pw = await import(join(ROOT, 'ui', 'node_modules', '@playwright', 'test', 'index.js'));
|
||||||
|
const { chromium } = pw.default ?? pw;
|
||||||
|
const browser = await chromium.launch();
|
||||||
|
const page = await browser.newPage({ deviceScaleFactor: 1 });
|
||||||
|
const im = (u, s) => `<img src="${u}" width="${s}" height="${s}" style="display:block">`;
|
||||||
|
async function shot(html, s, transparent) {
|
||||||
|
await page.setViewportSize({ width: s, height: s });
|
||||||
|
await page.setContent(`<!doctype html><meta charset=utf8><style>*{margin:0;padding:0}#r{width:${s}px;height:${s}px}</style><div id=r>${html}</div>`, { waitUntil: 'networkidle' });
|
||||||
|
return page.locator('#r').screenshot({ omitBackground: !!transparent });
|
||||||
|
}
|
||||||
|
for (const [d, [fg, lg]] of Object.entries(D)) {
|
||||||
|
const dir = join(RES, `mipmap-${d}`);
|
||||||
|
writeFileSync(join(dir, 'ic_launcher_background.png'), await shot(im(BG, fg), fg, false));
|
||||||
|
writeFileSync(join(dir, 'ic_launcher_foreground.png'), await shot(im(FG, fg), fg, true));
|
||||||
|
writeFileSync(join(dir, 'ic_launcher_monochrome.png'), await shot(im(MONO, fg), fg, true));
|
||||||
|
// Square launcher: the full-bleed master (large mark). Round launcher: the safe-zone
|
||||||
|
// composite, circle-clipped (the master's corner ✻ would be clipped by the round mask).
|
||||||
|
writeFileSync(join(dir, 'ic_launcher.png'), await shot(im(MASTER, lg), lg, false));
|
||||||
|
const round = `<div style="width:${lg}px;height:${lg}px;border-radius:50%;overflow:hidden;position:relative">${im(BG, lg)}<div style="position:absolute;inset:0">${im(FG, lg)}</div></div>`;
|
||||||
|
writeFileSync(join(dir, 'ic_launcher_round.png'), await shot(round, lg, true));
|
||||||
|
console.log('mipmap-' + d, 'ok');
|
||||||
|
}
|
||||||
|
await browser.close();
|
||||||
@@ -0,0 +1,163 @@
|
|||||||
|
'use strict';
|
||||||
|
// Erudit app-icon — the reference generator. Every dimension below is a FRACTION
|
||||||
|
// of the icon side, so this file reads the same as docs/ICON_BRANDBOOK.md and the
|
||||||
|
// icon reproduces at any resolution. Emits one variant/layer's SVG to stdout.
|
||||||
|
//
|
||||||
|
// node build-icon.mjs --variant light|dark [--layer full|background|foreground] [--scheme] > icon.svg
|
||||||
|
//
|
||||||
|
// Layers (for Android adaptive icons):
|
||||||
|
// full the standalone master (rounded tile + mark) — iOS / PWA / favicon
|
||||||
|
// background wood + grain + light/shadow, full-bleed square (the OS applies the mask)
|
||||||
|
// foreground only «Э» + ✻, transparent, re-placed for the round mask (see FG_* below)
|
||||||
|
//
|
||||||
|
// Deps: opentype.js (npm i opentype.js). Font: ./Spectral-Bold.ttf (OFL, bundled).
|
||||||
|
import { readFileSync } from 'node:fs';
|
||||||
|
import { fileURLToPath } from 'node:url';
|
||||||
|
import { dirname, join } from 'node:path';
|
||||||
|
import opentype from 'opentype.js';
|
||||||
|
|
||||||
|
const DIR = dirname(fileURLToPath(import.meta.url));
|
||||||
|
const args = process.argv.slice(2);
|
||||||
|
const has = f => args.includes('--' + f);
|
||||||
|
const val = (f, d) => { const i = args.indexOf('--' + f); return i >= 0 ? args[i + 1] : d; };
|
||||||
|
|
||||||
|
// ---- the design, in fractions of the side ----
|
||||||
|
const S = 1024; // reference side (the icon is resolution-free)
|
||||||
|
const RADIUS = 0.17; // tile corner radius (full master)
|
||||||
|
const STAR_BULB = 0.22; // spoke-end (and hub) radius, as fraction of star radius
|
||||||
|
const STAR_SPOKES = 6;
|
||||||
|
const GRAIN_COLS = 6, GRAIN_W = 1 / 32, GRAIN_SHIFT = 1 / 16, GRAIN_TILT = 4;
|
||||||
|
const SHEEN = 0.15; // white, transparent bottom-left -> this alpha top-right
|
||||||
|
const SHADE = 0.15; // black, this alpha bottom-left -> transparent top-right
|
||||||
|
|
||||||
|
// The mark, placed for the standalone master (bottom-right biased, full-bleed):
|
||||||
|
const MASTER = { lh: 0.6055, lc: [0.4814, 0.4922], sd: 0.1729, sc: [0.7881, 0.7881] };
|
||||||
|
// The mark, placed for the Android foreground layer (centred-ish inside the 61% safe
|
||||||
|
// zone, nudged right 8% / down 3% for optical balance under the round mask; smaller ✻).
|
||||||
|
// Every value is the earlier placement scaled 0.75 about the icon centre (0.5, 0.5): the
|
||||||
|
// whole mark is 25% smaller, its «Э»↔✻ arrangement unchanged, so the ✻ that used to graze
|
||||||
|
// the round mask now sits well inside the safe zone. Round-mask launchers (adaptive + the
|
||||||
|
// legacy round icon) get more breathing room; the full-bleed master is untouched.
|
||||||
|
const FOREGROUND = { lh: 0.4043, lc: [0.5176, 0.4963], sd: 0.0989, sc: [0.6970, 0.6700] };
|
||||||
|
|
||||||
|
const PALETTE = {
|
||||||
|
light: { wood: '#e6b053', ink: '#5a3a12', grain: '#d8a54e' },
|
||||||
|
dark: { wood: '#4a3316', ink: '#f2d9a0', grain: '#432e14' },
|
||||||
|
};
|
||||||
|
|
||||||
|
// Layers:
|
||||||
|
// full rounded tile + master mark (favicon.svg — browser rounds nothing)
|
||||||
|
// flat square tile + master mark (apple-touch, PWA "any" — OS rounds)
|
||||||
|
// background square tile, no mark (Android adaptive background)
|
||||||
|
// foreground mark only, transparent (Android adaptive foreground)
|
||||||
|
// maskable square tile + foreground mark (PWA maskable — safe-zone aware)
|
||||||
|
// monochrome foreground mark only, flat colour (Android 13+ themed layer)
|
||||||
|
const LAYERS = ['full', 'flat', 'background', 'foreground', 'maskable', 'monochrome'];
|
||||||
|
const variant = val('variant', 'light');
|
||||||
|
const layer = val('layer', 'full');
|
||||||
|
const P = PALETTE[variant];
|
||||||
|
if (!P) { console.error(`unknown --variant ${variant} (light|dark)`); process.exit(1); }
|
||||||
|
if (!LAYERS.includes(layer)) { console.error(`unknown --layer ${layer} (${LAYERS.join('|')})`); process.exit(1); }
|
||||||
|
|
||||||
|
const usesForegroundPlacement = ['foreground', 'maskable', 'monochrome'].includes(layer);
|
||||||
|
const drawBg = ['full', 'flat', 'background', 'maskable'].includes(layer);
|
||||||
|
const drawMark = layer !== 'background';
|
||||||
|
const MARK = usesForegroundPlacement ? FOREGROUND : MASTER;
|
||||||
|
const inkColour = layer === 'monochrome' ? val('mono', '#ffffff') : P.ink;
|
||||||
|
const RX = layer === 'full' ? RADIUS * S : 0; // only the standalone master keeps rounded corners
|
||||||
|
const font = opentype.parse(readFileSync(join(DIR, 'Spectral-Bold.ttf')).buffer);
|
||||||
|
|
||||||
|
// «Э» outline scaled so its ink bounding box is MARK.lh of the side, box centred on MARK.lc.
|
||||||
|
function letterSvg() {
|
||||||
|
const g = font.charToGlyph('Э');
|
||||||
|
const h0 = (() => { const b = g.getPath(0, 0, 1000).getBoundingBox(); return b.y2 - b.y1; })();
|
||||||
|
const scale = (MARK.lh * S) / h0;
|
||||||
|
const p = g.getPath(0, 0, 1000 * scale);
|
||||||
|
const bb = p.getBoundingBox();
|
||||||
|
const w = bb.x2 - bb.x1, h = bb.y2 - bb.y1;
|
||||||
|
const tx = MARK.lc[0] * S - (bb.x1 + w / 2);
|
||||||
|
const ty = MARK.lc[1] * S - (bb.y1 + h / 2);
|
||||||
|
return { svg: `<path transform="translate(${tx.toFixed(2)} ${ty.toFixed(2)})" d="${p.toPathData(2)}" fill="${inkColour}"/>`,
|
||||||
|
box: { x: bb.x1 + tx, y: bb.y1 + ty, w, h } };
|
||||||
|
}
|
||||||
|
|
||||||
|
// Teardrop-spoked asterisk ✻: each spoke tapers to a point at the centre and ends
|
||||||
|
// in a round bulb; a central disc equal to the bulb fuses them.
|
||||||
|
function starPath() {
|
||||||
|
const cx = MARK.sc[0] * S, cy = MARK.sc[1] * S, Rout = MARK.sd * S / 2;
|
||||||
|
const rb = Rout * STAR_BULB, R = Rout - rb;
|
||||||
|
const L = Math.sqrt(R * R - rb * rb), theta = Math.asin(rb / R);
|
||||||
|
const rot = (v, t) => [v[0] * Math.cos(t) - v[1] * Math.sin(t), v[0] * Math.sin(t) + v[1] * Math.cos(t)];
|
||||||
|
let d = '';
|
||||||
|
for (let k = 0; k < STAR_SPOKES; k++) {
|
||||||
|
const a = -Math.PI / 2 + k * 2 * Math.PI / STAR_SPOKES;
|
||||||
|
const u = [Math.cos(a), Math.sin(a)];
|
||||||
|
const d1 = rot(u, theta), d2 = rot(u, -theta);
|
||||||
|
const T1 = [cx + L * d1[0], cy + L * d1[1]], T2 = [cx + L * d2[0], cy + L * d2[1]];
|
||||||
|
d += `M${cx.toFixed(2)} ${cy.toFixed(2)} L${T1[0].toFixed(2)} ${T1[1].toFixed(2)} A${rb.toFixed(2)} ${rb.toFixed(2)} 0 1 0 ${T2[0].toFixed(2)} ${T2[1].toFixed(2)} Z `;
|
||||||
|
}
|
||||||
|
d += `M${cx} ${cy} m${-rb} 0 a${rb} ${rb} 0 1 0 ${2 * rb} 0 a${rb} ${rb} 0 1 0 ${-2 * rb} 0 Z`;
|
||||||
|
return `<path d="${d}" fill="${inkColour}"/>`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function grain() {
|
||||||
|
const colW = S / GRAIN_COLS, sw = GRAIN_W * S, shift = GRAIN_SHIFT * S;
|
||||||
|
const yTop = -0.2 * S, yBot = 1.2 * S, cy = S / 2;
|
||||||
|
let s = '';
|
||||||
|
for (let i = 1; i <= GRAIN_COLS; i++) {
|
||||||
|
const xr = i * colW - shift, x = xr - sw, cx = xr - sw / 2;
|
||||||
|
s += `<rect x="${x.toFixed(2)}" y="${yTop.toFixed(2)}" width="${sw.toFixed(2)}" height="${(yBot - yTop).toFixed(2)}" fill="${P.grain}" transform="rotate(${GRAIN_TILT} ${cx.toFixed(2)} ${cy.toFixed(2)})"/>`;
|
||||||
|
}
|
||||||
|
return `<g clip-path="url(#tile)">${s}</g>`;
|
||||||
|
}
|
||||||
|
|
||||||
|
let body = '';
|
||||||
|
const L = letterSvg();
|
||||||
|
if (drawBg) { // tile + grain + light/shadow (the background)
|
||||||
|
body += `<rect width="${S}" height="${S}" rx="${RX}" fill="${P.wood}"/>`
|
||||||
|
+ `<defs><clipPath id="tile"><rect width="${S}" height="${S}" rx="${RX}"/></clipPath>`
|
||||||
|
+ `<linearGradient id="sheen" gradientUnits="userSpaceOnUse" x1="0" y1="${S}" x2="${S}" y2="0"><stop offset="0" stop-color="#fff" stop-opacity="0"/><stop offset="1" stop-color="#fff" stop-opacity="${SHEEN}"/></linearGradient>`
|
||||||
|
+ `<linearGradient id="shade" gradientUnits="userSpaceOnUse" x1="0" y1="${S}" x2="${S}" y2="0"><stop offset="0" stop-color="#000" stop-opacity="${SHADE}"/><stop offset="1" stop-color="#000" stop-opacity="0"/></linearGradient>`
|
||||||
|
+ `</defs>`
|
||||||
|
+ grain()
|
||||||
|
+ `<rect width="${S}" height="${S}" fill="url(#sheen)" clip-path="url(#tile)"/>`
|
||||||
|
+ `<rect width="${S}" height="${S}" fill="url(#shade)" clip-path="url(#tile)"/>`;
|
||||||
|
}
|
||||||
|
if (drawMark) body += L.svg + starPath(); // the mark
|
||||||
|
if (has('scheme')) body += scheme(L);
|
||||||
|
|
||||||
|
process.stdout.write(`<svg xmlns="http://www.w3.org/2000/svg" width="${S}" height="${S}" viewBox="0 0 ${S} ${S}">${body}</svg>\n`);
|
||||||
|
|
||||||
|
// Percent-based construction overlay for the brand book (full master only).
|
||||||
|
function scheme(L) {
|
||||||
|
const pc = n => (100 * n / S).toFixed(1) + '%';
|
||||||
|
const GC = '#0f172a', BX = '#d81b60', AC = '#0d9488';
|
||||||
|
const halo = 'paint-order="stroke" stroke="#fff" stroke-width="4"';
|
||||||
|
const cx = MARK.sc[0] * S, cy = MARK.sc[1] * S, sd = MARK.sd * S;
|
||||||
|
let g = `<g font-family="'Helvetica Neue',Arial,sans-serif">`;
|
||||||
|
for (let f = 1; f <= 3; f++) {
|
||||||
|
const p = f * S / 4;
|
||||||
|
g += `<line x1="${p}" y1="0" x2="${p}" y2="${S}" stroke="${GC}" stroke-opacity="0.18" stroke-width="1.2"/>`;
|
||||||
|
g += `<line x1="0" y1="${p}" x2="${S}" y2="${p}" stroke="${GC}" stroke-opacity="0.18" stroke-width="1.2"/>`;
|
||||||
|
g += `<text x="${p + 4}" y="20" font-size="17" font-weight="700" fill="${GC}" ${halo}>${f * 25}%</text>`;
|
||||||
|
g += `<text x="4" y="${p - 4}" font-size="17" font-weight="700" fill="${GC}" ${halo}>${f * 25}%</text>`;
|
||||||
|
}
|
||||||
|
g += `<line x1="${0.14 * S}" y1="${0.86 * S}" x2="${0.86 * S}" y2="${0.14 * S}" stroke="${AC}" stroke-width="3" stroke-dasharray="3 8" stroke-linecap="round"/>`;
|
||||||
|
g += `<circle cx="${0.86 * S}" cy="${0.14 * S}" r="6" fill="${AC}"/><circle cx="${0.14 * S}" cy="${0.86 * S}" r="6" fill="${AC}"/>`;
|
||||||
|
g += `<text x="${0.86 * S - 6}" y="${0.14 * S - 12}" text-anchor="end" font-size="18" font-weight="700" fill="${AC}" ${halo}>light: white 0%→15%</text>`;
|
||||||
|
g += `<text x="${0.14 * S + 10}" y="${0.86 * S + 26}" font-size="18" font-weight="700" fill="${AC}" ${halo}>shadow: black 15%→0%</text>`;
|
||||||
|
const { x, y, w, h } = L.box;
|
||||||
|
g += `<rect x="${x.toFixed(1)}" y="${y.toFixed(1)}" width="${w.toFixed(1)}" height="${h.toFixed(1)}" fill="none" stroke="${BX}" stroke-width="2.5"/>`;
|
||||||
|
g += `<line x1="${MARK.lc[0] * S}" y1="${MARK.lc[1] * S - 16}" x2="${MARK.lc[0] * S}" y2="${MARK.lc[1] * S + 16}" stroke="${BX}" stroke-width="2.5"/><line x1="${MARK.lc[0] * S - 16}" y1="${MARK.lc[1] * S}" x2="${MARK.lc[0] * S + 16}" y2="${MARK.lc[1] * S}" stroke="${BX}" stroke-width="2.5"/>`;
|
||||||
|
g += `<text x="${x.toFixed(1)}" y="${(y - 10).toFixed(1)}" font-size="19" font-weight="700" fill="${BX}" ${halo}>«Э» Spectral Bold · box H ${pc(h)} · W ${pc(w)}</text>`;
|
||||||
|
g += `<text x="${x.toFixed(1)}" y="${(y + h + 24).toFixed(1)}" font-size="18" font-weight="700" fill="${BX}" ${halo}>box center ${pc(MARK.lc[0] * S)} / ${pc(MARK.lc[1] * S)}</text>`;
|
||||||
|
g += `<rect x="${cx - sd / 2}" y="${cy - sd / 2}" width="${sd}" height="${sd}" fill="none" stroke="${BX}" stroke-width="2.5"/>`;
|
||||||
|
g += `<line x1="${cx}" y1="${cy - 14}" x2="${cx}" y2="${cy + 14}" stroke="${BX}" stroke-width="2.5"/><line x1="${cx - 14}" y1="${cy}" x2="${cx + 14}" y2="${cy}" stroke="${BX}" stroke-width="2.5"/>`;
|
||||||
|
g += `<text x="${(cx + sd / 2).toFixed(1)}" y="${(cy - sd / 2 - 10).toFixed(1)}" text-anchor="end" font-size="18" font-weight="700" fill="${BX}" ${halo}>✻ Ø ${pc(sd)} · center ${pc(cx)} / ${pc(cy)}</text>`;
|
||||||
|
g += `<text x="${RX + 14}" y="${RX - 6}" font-size="17" font-weight="700" fill="${GC}" ${halo}>corner r = 17%</text>`;
|
||||||
|
g += `<path d="M4 ${RX} A ${RX} ${RX} 0 0 1 ${RX} 4" fill="none" stroke="${GC}" stroke-width="2" stroke-dasharray="5 5"/>`;
|
||||||
|
g += `<rect x="${0.03 * S}" y="${S - 96}" width="${0.94 * S}" height="74" rx="12" fill="#0f172a" fill-opacity="0.82"/>`;
|
||||||
|
g += `<text x="${0.055 * S}" y="${S - 64}" font-size="18" font-weight="600" fill="#fff">Wood grain: 6 equal columns; a vertical stripe on each column's right edge,</text>`;
|
||||||
|
g += `<text x="${0.055 * S}" y="${S - 40}" font-size="18" font-weight="600" fill="#fff">width 1/32 of side; the whole set shifted left 1/16; every stripe tilted 4°.</text>`;
|
||||||
|
return g + `</g>`;
|
||||||
|
}
|
||||||
@@ -0,0 +1,105 @@
|
|||||||
|
'use strict';
|
||||||
|
// Slice the whole shipped icon set from the brand master (build-icon.mjs). Renders
|
||||||
|
// with the ui package's Playwright chromium. See docs/ICONS.md for the target map.
|
||||||
|
//
|
||||||
|
// npm i opentype.js && node build-set.mjs
|
||||||
|
//
|
||||||
|
// Writes: ui/public/* (web), ui/assets/* (Capacitor layers), ./vk/* and ./store/*
|
||||||
|
// (manual-upload art). Wiring (manifest, html, Android res) is done separately.
|
||||||
|
import { execFileSync } from 'node:child_process';
|
||||||
|
import { readFileSync, writeFileSync, mkdirSync } from 'node:fs';
|
||||||
|
import { fileURLToPath } from 'node:url';
|
||||||
|
import { dirname, join } from 'node:path';
|
||||||
|
|
||||||
|
const DIR = dirname(fileURLToPath(import.meta.url));
|
||||||
|
const UI = join(DIR, '..', '..', '..', 'ui');
|
||||||
|
const PUB = join(UI, 'public'), ASSETS = join(UI, 'assets');
|
||||||
|
const VK = join(DIR, 'vk'), STORE = join(DIR, 'store'), TG = join(DIR, 'tg');
|
||||||
|
[VK, STORE, TG].forEach(d => mkdirSync(d, { recursive: true }));
|
||||||
|
|
||||||
|
// one SVG string for a variant+layer from the reference generator
|
||||||
|
const svgFor = (variant, layer) =>
|
||||||
|
execFileSync('node', [join(DIR, 'build-icon.mjs'), '--variant', variant, '--layer', layer], { encoding: 'utf8' });
|
||||||
|
|
||||||
|
const pw = await import(join(UI, 'node_modules', '@playwright', 'test', 'index.js'));
|
||||||
|
const { chromium } = pw.default ?? pw;
|
||||||
|
const browser = await chromium.launch();
|
||||||
|
const page = await browser.newPage();
|
||||||
|
|
||||||
|
async function pngFromSvg(svg, size, transparent) {
|
||||||
|
await page.setViewportSize({ width: size, height: size });
|
||||||
|
await page.setContent(`<!doctype html><meta charset=utf8><style>*{margin:0;padding:0}svg{display:block;width:${size}px;height:${size}px}</style>${svg}`, { waitUntil: 'networkidle' });
|
||||||
|
return page.locator('svg').screenshot({ omitBackground: !!transparent });
|
||||||
|
}
|
||||||
|
async function shootHtml(html, w, h) {
|
||||||
|
await page.setViewportSize({ width: w, height: h });
|
||||||
|
await page.setContent(html, { waitUntil: 'networkidle' });
|
||||||
|
return page.screenshot();
|
||||||
|
}
|
||||||
|
function icoFromPNG(png, sizePx) {
|
||||||
|
const h = Buffer.alloc(22);
|
||||||
|
h.writeUInt16LE(0, 0); h.writeUInt16LE(1, 2); h.writeUInt16LE(1, 4);
|
||||||
|
h.writeUInt8(sizePx, 6); h.writeUInt8(sizePx, 7);
|
||||||
|
h.writeUInt16LE(1, 10); h.writeUInt16LE(32, 12);
|
||||||
|
h.writeUInt32LE(png.length, 14); h.writeUInt32LE(22, 18);
|
||||||
|
return Buffer.concat([h, png]);
|
||||||
|
}
|
||||||
|
const write = (p, buf) => { writeFileSync(p, buf); console.log('wrote', p.replace(join(DIR, '..', '..', '..'), '.'), buf.length, 'b'); };
|
||||||
|
|
||||||
|
// ---- pre-render the SVG sources we need ----
|
||||||
|
const S = {
|
||||||
|
fullLight: svgFor('light', 'full'), fullDark: svgFor('dark', 'full'),
|
||||||
|
flatLight: svgFor('light', 'flat'), flatDark: svgFor('dark', 'flat'),
|
||||||
|
maskLight: svgFor('light', 'maskable'), maskDark: svgFor('dark', 'maskable'),
|
||||||
|
bgLight: svgFor('light', 'background'), fgLight: svgFor('light', 'foreground'),
|
||||||
|
monoLight: svgFor('light', 'monochrome'),
|
||||||
|
};
|
||||||
|
|
||||||
|
// ---- favicon.svg: light + dark in one file, toggled by prefers-color-scheme ----
|
||||||
|
const inner = svg => svg.replace(/^<svg[^>]*>/, '').replace(/<\/svg>\s*$/, '');
|
||||||
|
const faviconSvg =
|
||||||
|
`<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024" viewBox="0 0 1024 1024">`
|
||||||
|
+ `<style>.d{display:none}@media(prefers-color-scheme:dark){.l{display:none}.d{display:inline}}</style>`
|
||||||
|
+ `<g class="l">${inner(S.fullLight)}</g><g class="d">${inner(S.fullDark)}</g></svg>\n`;
|
||||||
|
write(join(PUB, 'favicon.svg'), Buffer.from(faviconSvg));
|
||||||
|
|
||||||
|
// ---- web rasters ----
|
||||||
|
write(join(PUB, 'favicon.ico'), icoFromPNG(await pngFromSvg(S.flatLight, 32, false), 32));
|
||||||
|
write(join(PUB, 'apple-touch-icon.png'), await pngFromSvg(S.flatLight, 180, false));
|
||||||
|
write(join(PUB, 'icon-192.png'), await pngFromSvg(S.flatLight, 192, false));
|
||||||
|
write(join(PUB, 'icon-512.png'), await pngFromSvg(S.flatLight, 512, false));
|
||||||
|
write(join(PUB, 'icon-192-dark.png'), await pngFromSvg(S.flatDark, 192, false));
|
||||||
|
write(join(PUB, 'icon-512-dark.png'), await pngFromSvg(S.flatDark, 512, false));
|
||||||
|
write(join(PUB, 'icon-maskable-512.png'), await pngFromSvg(S.maskLight, 512, false));
|
||||||
|
write(join(PUB, 'icon-maskable-512-dark.png'), await pngFromSvg(S.maskDark, 512, false));
|
||||||
|
|
||||||
|
// ---- Capacitor layers (ui/assets) ----
|
||||||
|
write(join(ASSETS, 'icon.png'), await pngFromSvg(S.flatLight, 1024, false)); // legacy single
|
||||||
|
write(join(ASSETS, 'icon-foreground.png'), await pngFromSvg(S.fgLight, 1024, true)); // adaptive fg
|
||||||
|
write(join(ASSETS, 'icon-background.png'), await pngFromSvg(S.bgLight, 1024, false)); // adaptive bg
|
||||||
|
write(join(DIR, 'android-monochrome.png'), await pngFromSvg(S.monoLight, 1024, true)); // themed layer (wired manually)
|
||||||
|
|
||||||
|
// ---- VK (no rounding — flat light) ----
|
||||||
|
for (const px of [576, 278, 150, 32]) write(join(VK, `vk-${px}.png`), await pngFromSvg(S.flatLight, px, false));
|
||||||
|
|
||||||
|
// ---- Telegram bot: square, no rounding (TG crops the avatar to a circle) ----
|
||||||
|
write(join(TG, 'tg-512.png'), await pngFromSvg(S.flatLight, 512, false)); // bot avatar + Mini App icon
|
||||||
|
|
||||||
|
// ---- store art ----
|
||||||
|
write(join(STORE, 'rustore-512.png'), await pngFromSvg(S.flatLight, 512, false));
|
||||||
|
|
||||||
|
// ---- wordmark banner (board-green bg + master tile + «Эрудит» / Игра в слова) ----
|
||||||
|
const b64 = readFileSync(join(DIR, 'Spectral-Bold.ttf')).toString('base64');
|
||||||
|
const banner = (w, h, tile, t1, t2, gap, pad) => `<!doctype html><meta charset=utf8><style>
|
||||||
|
@font-face{font-family:Spectral;src:url(data:font/ttf;base64,${b64});font-weight:700}
|
||||||
|
*{margin:0;padding:0;box-sizing:border-box}
|
||||||
|
body{width:${w}px;height:${h}px;background:#2a3330;display:flex;align-items:center;gap:${gap}px;padding:0 ${pad}px;font-family:Spectral}
|
||||||
|
.tile{width:${tile}px;height:${tile}px;flex:none}.tile svg{width:${tile}px;height:${tile}px;display:block}
|
||||||
|
.wm{color:#e7ece8;text-align:center}.t1{font-weight:700;font-size:${t1}px;line-height:1.02;letter-spacing:-2px}
|
||||||
|
.t2{font-weight:700;font-size:${t2}px;line-height:1.1;color:#cdd6cf;margin-top:6px}
|
||||||
|
</style><div class=tile>${S.fullLight}</div><div class=wm><div class=t1>«Эрудит»</div><div class=t2>Игра в слова</div></div>`;
|
||||||
|
write(join(PUB, 'og-image.png'), await shootHtml(banner(1200, 630, 300, 150, 74, 64, 96), 1200, 630));
|
||||||
|
write(join(TG, 'tg-demo-640x360.png'), await shootHtml(banner(640, 360, 150, 72, 38, 30, 44), 640, 360));
|
||||||
|
|
||||||
|
await browser.close();
|
||||||
|
console.log('done');
|
||||||
|
After Width: | Height: | Size: 477 KiB |
|
After Width: | Height: | Size: 6.5 KiB |
|
After Width: | Height: | Size: 288 KiB |
@@ -0,0 +1 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024" viewBox="0 0 1024 1024"><rect width="1024" height="1024" rx="0" fill="#4a3316"/><defs><clipPath id="tile"><rect width="1024" height="1024" rx="0"/></clipPath><linearGradient id="sheen" gradientUnits="userSpaceOnUse" x1="0" y1="1024" x2="1024" y2="0"><stop offset="0" stop-color="#fff" stop-opacity="0"/><stop offset="1" stop-color="#fff" stop-opacity="0.15"/></linearGradient><linearGradient id="shade" gradientUnits="userSpaceOnUse" x1="0" y1="1024" x2="1024" y2="0"><stop offset="0" stop-color="#000" stop-opacity="0.15"/><stop offset="1" stop-color="#000" stop-opacity="0"/></linearGradient></defs><g clip-path="url(#tile)"><rect x="74.67" y="-204.80" width="32.00" height="1433.60" fill="#432e14" transform="rotate(4 90.67 512.00)"/><rect x="245.33" y="-204.80" width="32.00" height="1433.60" fill="#432e14" transform="rotate(4 261.33 512.00)"/><rect x="416.00" y="-204.80" width="32.00" height="1433.60" fill="#432e14" transform="rotate(4 432.00 512.00)"/><rect x="586.67" y="-204.80" width="32.00" height="1433.60" fill="#432e14" transform="rotate(4 602.67 512.00)"/><rect x="757.33" y="-204.80" width="32.00" height="1433.60" fill="#432e14" transform="rotate(4 773.33 512.00)"/><rect x="928.00" y="-204.80" width="32.00" height="1433.60" fill="#432e14" transform="rotate(4 944.00 512.00)"/></g><rect width="1024" height="1024" fill="url(#sheen)" clip-path="url(#tile)"/><rect width="1024" height="1024" fill="url(#shade)" clip-path="url(#tile)"/></svg>
|
||||||
|
After Width: | Height: | Size: 1.5 KiB |
|
After Width: | Height: | Size: 24 KiB |
@@ -0,0 +1 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024" viewBox="0 0 1024 1024"><path transform="translate(237.62 774.88)" d="M250.04-34.91Q326.35-34.91 368.57-91.33Q410.78-147.75 410.78-243.55Q410.78-249.23 410.78-254.91L254.10-254.91L208.64-185.91L195.65-185.91L195.65-368.57L208.64-368.57L254.10-299.56L407.53-299.56Q396.98-392.92 351.52-447.72Q306.06-502.52 241.11-502.52Q217.57-502.52 198.90-498.46Q180.22-494.40 162.36-482.22L83.62-354.77L69-354.77L77.93-505.76Q112.84-522.81 154.25-533.37Q195.65-543.92 259.78-543.92Q319.86-543.92 371.41-523.22Q422.96-502.52 460.71-465.58Q498.46-428.64 519.57-378.31Q540.67-327.98 540.67-267.90Q540.67-188.34 504.55-125.83Q468.42-63.32 405.10-27.60Q341.78 8.12 259.78 8.12Q200.52 8.12 150.59-3.25Q100.67-14.61 67.38-34.10L56.02-171.29L69.82-171.29L142.88-63.32Q165.61-50.33 191.59-42.62Q217.57-34.91 250.04-34.91" fill="#f2d9a0"/><path d="M781.00 744.04 L795.25 695.59 A14.85 14.85 0 1 0 766.76 695.59 Z M781.00 744.04 L830.08 732.15 A14.85 14.85 0 1 0 815.84 707.48 Z M781.00 744.04 L815.84 780.60 A14.85 14.85 0 1 0 830.08 755.93 Z M781.00 744.04 L766.76 792.49 A14.85 14.85 0 1 0 795.25 792.49 Z M781.00 744.04 L731.93 755.93 A14.85 14.85 0 1 0 746.17 780.60 Z M781.00 744.04 L746.17 707.48 A14.85 14.85 0 1 0 731.93 732.15 Z M781.0048 744.0384 m-14.845952 0 a14.845952 14.845952 0 1 0 29.691904 0 a14.845952 14.845952 0 1 0 -29.691904 0 Z" fill="#f2d9a0"/></svg>
|
||||||
|
After Width: | Height: | Size: 1.4 KiB |
|
After Width: | Height: | Size: 405 KiB |
@@ -0,0 +1 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024" viewBox="0 0 1024 1024"><rect width="1024" height="1024" rx="174.08" fill="#4a3316"/><defs><clipPath id="tile"><rect width="1024" height="1024" rx="174.08"/></clipPath><linearGradient id="sheen" gradientUnits="userSpaceOnUse" x1="0" y1="1024" x2="1024" y2="0"><stop offset="0" stop-color="#fff" stop-opacity="0"/><stop offset="1" stop-color="#fff" stop-opacity="0.15"/></linearGradient><linearGradient id="shade" gradientUnits="userSpaceOnUse" x1="0" y1="1024" x2="1024" y2="0"><stop offset="0" stop-color="#000" stop-opacity="0.15"/><stop offset="1" stop-color="#000" stop-opacity="0"/></linearGradient></defs><g clip-path="url(#tile)"><rect x="74.67" y="-204.80" width="32.00" height="1433.60" fill="#432e14" transform="rotate(4 90.67 512.00)"/><rect x="245.33" y="-204.80" width="32.00" height="1433.60" fill="#432e14" transform="rotate(4 261.33 512.00)"/><rect x="416.00" y="-204.80" width="32.00" height="1433.60" fill="#432e14" transform="rotate(4 432.00 512.00)"/><rect x="586.67" y="-204.80" width="32.00" height="1433.60" fill="#432e14" transform="rotate(4 602.67 512.00)"/><rect x="757.33" y="-204.80" width="32.00" height="1433.60" fill="#432e14" transform="rotate(4 773.33 512.00)"/><rect x="928.00" y="-204.80" width="32.00" height="1433.60" fill="#432e14" transform="rotate(4 944.00 512.00)"/></g><rect width="1024" height="1024" fill="url(#sheen)" clip-path="url(#tile)"/><rect width="1024" height="1024" fill="url(#shade)" clip-path="url(#tile)"/><path transform="translate(157.86 804.91)" d="M280.84-39.21Q366.55-39.21 413.96-102.58Q461.38-165.95 461.38-273.54Q461.38-279.93 461.38-286.31L285.40-286.31L234.34-208.80L219.75-208.80L219.75-413.96L234.34-413.96L285.40-336.46L457.73-336.46Q445.88-441.32 394.81-502.86Q343.75-564.41 270.81-564.41Q244.37-564.41 223.39-559.85Q202.42-555.29 182.36-541.62L93.92-398.46L77.50-398.46L87.53-568.06Q126.74-587.21 173.24-599.06Q219.75-610.91 291.78-610.91Q359.25-610.91 417.15-587.66Q475.05-564.41 517.45-522.92Q559.85-481.44 583.56-424.90Q607.27-368.37 607.27-300.90Q607.27-211.54 566.69-141.33Q526.12-71.12 454.99-31Q383.87 9.12 291.78 9.12Q225.22 9.12 169.14-3.65Q113.06-16.41 75.68-38.30L62.92-192.39L78.42-192.39L160.48-71.12Q186.01-56.53 215.19-47.87Q244.37-39.21 280.84-39.21" fill="#f2d9a0"/><path d="M807.01 807.01 L825.70 743.46 A19.48 19.48 0 1 0 788.33 743.46 Z M807.01 807.01 L871.40 791.42 A19.48 19.48 0 1 0 852.71 759.05 Z M807.01 807.01 L852.71 854.97 A19.48 19.48 0 1 0 871.40 822.61 Z M807.01 807.01 L788.33 870.57 A19.48 19.48 0 1 0 825.70 870.57 Z M807.01 807.01 L742.63 822.61 A19.48 19.48 0 1 0 761.32 854.97 Z M807.01 807.01 L761.32 759.05 A19.48 19.48 0 1 0 742.63 791.42 Z M807.0144 807.0144 m-19.475456 0 a19.475456 19.475456 0 1 0 38.950912 0 a19.475456 19.475456 0 1 0 -38.950912 0 Z" fill="#f2d9a0"/></svg>
|
||||||
|
After Width: | Height: | Size: 2.8 KiB |
|
After Width: | Height: | Size: 290 KiB |
@@ -0,0 +1 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024" viewBox="0 0 1024 1024"><rect width="1024" height="1024" rx="0" fill="#e6b053"/><defs><clipPath id="tile"><rect width="1024" height="1024" rx="0"/></clipPath><linearGradient id="sheen" gradientUnits="userSpaceOnUse" x1="0" y1="1024" x2="1024" y2="0"><stop offset="0" stop-color="#fff" stop-opacity="0"/><stop offset="1" stop-color="#fff" stop-opacity="0.15"/></linearGradient><linearGradient id="shade" gradientUnits="userSpaceOnUse" x1="0" y1="1024" x2="1024" y2="0"><stop offset="0" stop-color="#000" stop-opacity="0.15"/><stop offset="1" stop-color="#000" stop-opacity="0"/></linearGradient></defs><g clip-path="url(#tile)"><rect x="74.67" y="-204.80" width="32.00" height="1433.60" fill="#d8a54e" transform="rotate(4 90.67 512.00)"/><rect x="245.33" y="-204.80" width="32.00" height="1433.60" fill="#d8a54e" transform="rotate(4 261.33 512.00)"/><rect x="416.00" y="-204.80" width="32.00" height="1433.60" fill="#d8a54e" transform="rotate(4 432.00 512.00)"/><rect x="586.67" y="-204.80" width="32.00" height="1433.60" fill="#d8a54e" transform="rotate(4 602.67 512.00)"/><rect x="757.33" y="-204.80" width="32.00" height="1433.60" fill="#d8a54e" transform="rotate(4 773.33 512.00)"/><rect x="928.00" y="-204.80" width="32.00" height="1433.60" fill="#d8a54e" transform="rotate(4 944.00 512.00)"/></g><rect width="1024" height="1024" fill="url(#sheen)" clip-path="url(#tile)"/><rect width="1024" height="1024" fill="url(#shade)" clip-path="url(#tile)"/></svg>
|
||||||
|
After Width: | Height: | Size: 1.5 KiB |
|
After Width: | Height: | Size: 24 KiB |
@@ -0,0 +1 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024" viewBox="0 0 1024 1024"><path transform="translate(237.62 774.88)" d="M250.04-34.91Q326.35-34.91 368.57-91.33Q410.78-147.75 410.78-243.55Q410.78-249.23 410.78-254.91L254.10-254.91L208.64-185.91L195.65-185.91L195.65-368.57L208.64-368.57L254.10-299.56L407.53-299.56Q396.98-392.92 351.52-447.72Q306.06-502.52 241.11-502.52Q217.57-502.52 198.90-498.46Q180.22-494.40 162.36-482.22L83.62-354.77L69-354.77L77.93-505.76Q112.84-522.81 154.25-533.37Q195.65-543.92 259.78-543.92Q319.86-543.92 371.41-523.22Q422.96-502.52 460.71-465.58Q498.46-428.64 519.57-378.31Q540.67-327.98 540.67-267.90Q540.67-188.34 504.55-125.83Q468.42-63.32 405.10-27.60Q341.78 8.12 259.78 8.12Q200.52 8.12 150.59-3.25Q100.67-14.61 67.38-34.10L56.02-171.29L69.82-171.29L142.88-63.32Q165.61-50.33 191.59-42.62Q217.57-34.91 250.04-34.91" fill="#5a3a12"/><path d="M781.00 744.04 L795.25 695.59 A14.85 14.85 0 1 0 766.76 695.59 Z M781.00 744.04 L830.08 732.15 A14.85 14.85 0 1 0 815.84 707.48 Z M781.00 744.04 L815.84 780.60 A14.85 14.85 0 1 0 830.08 755.93 Z M781.00 744.04 L766.76 792.49 A14.85 14.85 0 1 0 795.25 792.49 Z M781.00 744.04 L731.93 755.93 A14.85 14.85 0 1 0 746.17 780.60 Z M781.00 744.04 L746.17 707.48 A14.85 14.85 0 1 0 731.93 732.15 Z M781.0048 744.0384 m-14.845952 0 a14.845952 14.845952 0 1 0 29.691904 0 a14.845952 14.845952 0 1 0 -29.691904 0 Z" fill="#5a3a12"/></svg>
|
||||||
|
After Width: | Height: | Size: 1.4 KiB |
|
After Width: | Height: | Size: 411 KiB |
@@ -0,0 +1 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024" viewBox="0 0 1024 1024"><rect width="1024" height="1024" rx="174.08" fill="#e6b053"/><defs><clipPath id="tile"><rect width="1024" height="1024" rx="174.08"/></clipPath><linearGradient id="sheen" gradientUnits="userSpaceOnUse" x1="0" y1="1024" x2="1024" y2="0"><stop offset="0" stop-color="#fff" stop-opacity="0"/><stop offset="1" stop-color="#fff" stop-opacity="0.15"/></linearGradient><linearGradient id="shade" gradientUnits="userSpaceOnUse" x1="0" y1="1024" x2="1024" y2="0"><stop offset="0" stop-color="#000" stop-opacity="0.15"/><stop offset="1" stop-color="#000" stop-opacity="0"/></linearGradient></defs><g clip-path="url(#tile)"><rect x="74.67" y="-204.80" width="32.00" height="1433.60" fill="#d8a54e" transform="rotate(4 90.67 512.00)"/><rect x="245.33" y="-204.80" width="32.00" height="1433.60" fill="#d8a54e" transform="rotate(4 261.33 512.00)"/><rect x="416.00" y="-204.80" width="32.00" height="1433.60" fill="#d8a54e" transform="rotate(4 432.00 512.00)"/><rect x="586.67" y="-204.80" width="32.00" height="1433.60" fill="#d8a54e" transform="rotate(4 602.67 512.00)"/><rect x="757.33" y="-204.80" width="32.00" height="1433.60" fill="#d8a54e" transform="rotate(4 773.33 512.00)"/><rect x="928.00" y="-204.80" width="32.00" height="1433.60" fill="#d8a54e" transform="rotate(4 944.00 512.00)"/></g><rect width="1024" height="1024" fill="url(#sheen)" clip-path="url(#tile)"/><rect width="1024" height="1024" fill="url(#shade)" clip-path="url(#tile)"/><path transform="translate(157.86 804.91)" d="M280.84-39.21Q366.55-39.21 413.96-102.58Q461.38-165.95 461.38-273.54Q461.38-279.93 461.38-286.31L285.40-286.31L234.34-208.80L219.75-208.80L219.75-413.96L234.34-413.96L285.40-336.46L457.73-336.46Q445.88-441.32 394.81-502.86Q343.75-564.41 270.81-564.41Q244.37-564.41 223.39-559.85Q202.42-555.29 182.36-541.62L93.92-398.46L77.50-398.46L87.53-568.06Q126.74-587.21 173.24-599.06Q219.75-610.91 291.78-610.91Q359.25-610.91 417.15-587.66Q475.05-564.41 517.45-522.92Q559.85-481.44 583.56-424.90Q607.27-368.37 607.27-300.90Q607.27-211.54 566.69-141.33Q526.12-71.12 454.99-31Q383.87 9.12 291.78 9.12Q225.22 9.12 169.14-3.65Q113.06-16.41 75.68-38.30L62.92-192.39L78.42-192.39L160.48-71.12Q186.01-56.53 215.19-47.87Q244.37-39.21 280.84-39.21" fill="#5a3a12"/><path d="M807.01 807.01 L825.70 743.46 A19.48 19.48 0 1 0 788.33 743.46 Z M807.01 807.01 L871.40 791.42 A19.48 19.48 0 1 0 852.71 759.05 Z M807.01 807.01 L852.71 854.97 A19.48 19.48 0 1 0 871.40 822.61 Z M807.01 807.01 L788.33 870.57 A19.48 19.48 0 1 0 825.70 870.57 Z M807.01 807.01 L742.63 822.61 A19.48 19.48 0 1 0 761.32 854.97 Z M807.01 807.01 L761.32 759.05 A19.48 19.48 0 1 0 742.63 791.42 Z M807.0144 807.0144 m-19.475456 0 a19.475456 19.475456 0 1 0 38.950912 0 a19.475456 19.475456 0 1 0 -38.950912 0 Z" fill="#5a3a12"/></svg>
|
||||||
|
After Width: | Height: | Size: 2.8 KiB |
@@ -0,0 +1,12 @@
|
|||||||
|
{
|
||||||
|
"name": "erudit-icon-brand",
|
||||||
|
"private": true,
|
||||||
|
"type": "module",
|
||||||
|
"description": "Reference generator for the Erudit app-icon set (see docs/ICON_BRANDBOOK.md).",
|
||||||
|
"scripts": {
|
||||||
|
"build": "node build-set.mjs && node build-android-res.mjs"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"opentype.js": "^1.3.4"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
'use strict';
|
||||||
|
// Rasterise an icon SVG to PNG at a given size, using the `ui` package's cached
|
||||||
|
// Playwright chromium (no extra install). Usage:
|
||||||
|
// node render-png.mjs <in.svg> <out.png> [size=1024]
|
||||||
|
import { readFileSync, writeFileSync } from 'node:fs';
|
||||||
|
import { fileURLToPath } from 'node:url';
|
||||||
|
import { dirname, join } from 'node:path';
|
||||||
|
|
||||||
|
const DIR = dirname(fileURLToPath(import.meta.url));
|
||||||
|
const pw = await import(join(DIR, '..', '..', '..', 'ui', 'node_modules', '@playwright', 'test', 'index.js'));
|
||||||
|
const { chromium } = pw.default ?? pw;
|
||||||
|
|
||||||
|
const [, , svgPath, pngPath, size] = process.argv;
|
||||||
|
const S = Number(size) || 1024;
|
||||||
|
const svg = readFileSync(svgPath, 'utf8');
|
||||||
|
const b = await chromium.launch();
|
||||||
|
const pg = await b.newPage({ viewport: { width: S, height: S }, deviceScaleFactor: 1 });
|
||||||
|
await pg.setContent(`<!doctype html><meta charset=utf8><style>*{margin:0;padding:0}</style>${svg}`, { waitUntil: 'networkidle' });
|
||||||
|
writeFileSync(pngPath, await pg.locator('svg').screenshot({ omitBackground: true }));
|
||||||
|
await b.close();
|
||||||
|
console.log('wrote', pngPath, S + 'px');
|
||||||
|
After Width: | Height: | Size: 103 KiB |
|
After Width: | Height: | Size: 103 KiB |
|
After Width: | Height: | Size: 32 KiB |
|
After Width: | Height: | Size: 15 KiB |
|
After Width: | Height: | Size: 38 KiB |
|
After Width: | Height: | Size: 1.6 KiB |
|
After Width: | Height: | Size: 122 KiB |
@@ -1,78 +0,0 @@
|
|||||||
'use strict';
|
|
||||||
// Extract the glyph outlines the site icons and the og-image wordmark need from a
|
|
||||||
// grotesque font (LiberationSans = Arial-metric, matching the game's system-ui/Arial
|
|
||||||
// stack) and emit cubic-bezier contours per character, baseline at y=0, y-down,
|
|
||||||
// plus the advance width so generate.js can lay out words without the font.
|
|
||||||
// Same outline conversion as ../../vk/build/extract.js, generalised to a char set.
|
|
||||||
const opentype = require('opentype.js');
|
|
||||||
const fs = require('fs');
|
|
||||||
|
|
||||||
const FONT = process.argv[2] || '/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf';
|
|
||||||
const b = fs.readFileSync(FONT);
|
|
||||||
const font = opentype.parse(b.buffer.slice(b.byteOffset, b.byteOffset + b.byteLength));
|
|
||||||
const FS = 1000; // em scale
|
|
||||||
|
|
||||||
// The tile glyphs («Э», «8») + every character of the og-image wordmark lines
|
|
||||||
// («Эрудит», «Скрэббл — игра в слова»). The space carries only an advance.
|
|
||||||
const CHARS = [...new Set('Э8рудитСкэббл—игра в слова')];
|
|
||||||
|
|
||||||
function glyphData(ch) {
|
|
||||||
const g = font.charToGlyph(ch);
|
|
||||||
const p = g.getPath(0, 0, FS); // baseline at y=0, y-down
|
|
||||||
const contours = [];
|
|
||||||
let cur = null, prev = null;
|
|
||||||
for (const c of p.commands) {
|
|
||||||
if (c.type === 'M') {
|
|
||||||
if (cur) contours.push(cur);
|
|
||||||
cur = [{ v: [c.x, c.y], i: [c.x, c.y], o: [c.x, c.y] }];
|
|
||||||
prev = { x: c.x, y: c.y };
|
|
||||||
} else if (c.type === 'L') {
|
|
||||||
cur.push({ v: [c.x, c.y], i: [c.x, c.y], o: [c.x, c.y] });
|
|
||||||
prev = { x: c.x, y: c.y };
|
|
||||||
} else if (c.type === 'C') {
|
|
||||||
cur[cur.length - 1].o = [c.x1, c.y1];
|
|
||||||
cur.push({ v: [c.x, c.y], i: [c.x2, c.y2], o: [c.x, c.y] });
|
|
||||||
prev = { x: c.x, y: c.y };
|
|
||||||
} else if (c.type === 'Q') {
|
|
||||||
const c1 = [prev.x + 2 / 3 * (c.x1 - prev.x), prev.y + 2 / 3 * (c.y1 - prev.y)];
|
|
||||||
const c2 = [c.x + 2 / 3 * (c.x1 - c.x), c.y + 2 / 3 * (c.y1 - c.y)];
|
|
||||||
cur[cur.length - 1].o = c1;
|
|
||||||
cur.push({ v: [c.x, c.y], i: c2, o: [c.x, c.y] });
|
|
||||||
prev = { x: c.x, y: c.y };
|
|
||||||
} else if (c.type === 'Z') {
|
|
||||||
if (cur && cur.length > 1) {
|
|
||||||
const last = cur[cur.length - 1], first = cur[0];
|
|
||||||
if (Math.hypot(last.v[0] - first.v[0], last.v[1] - first.v[1]) < 1e-3) {
|
|
||||||
first.i = last.i; // fold the duplicate closing point into the first
|
|
||||||
cur.pop();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (cur) { contours.push(cur); cur = null; }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (cur) contours.push(cur);
|
|
||||||
|
|
||||||
let minx = Infinity, miny = Infinity, maxx = -Infinity, maxy = -Infinity;
|
|
||||||
const out = contours.map(ct => {
|
|
||||||
const v = [], i = [], o = [];
|
|
||||||
ct.forEach(pt => {
|
|
||||||
v.push(pt.v);
|
|
||||||
i.push([pt.i[0] - pt.v[0], pt.i[1] - pt.v[1]]);
|
|
||||||
o.push([pt.o[0] - pt.v[0], pt.o[1] - pt.v[1]]);
|
|
||||||
minx = Math.min(minx, pt.v[0]); maxx = Math.max(maxx, pt.v[0]);
|
|
||||||
miny = Math.min(miny, pt.v[1]); maxy = Math.max(maxy, pt.v[1]);
|
|
||||||
});
|
|
||||||
return { i, o, v, c: true };
|
|
||||||
});
|
|
||||||
const bbox = out.length
|
|
||||||
? { x: minx, y: miny, w: maxx - minx, h: maxy - miny }
|
|
||||||
: { x: 0, y: 0, w: 0, h: 0 }; // the space has no outline
|
|
||||||
return { adv: g.advanceWidth * (FS / font.unitsPerEm), bbox, contours: out };
|
|
||||||
}
|
|
||||||
|
|
||||||
const glyphs = {};
|
|
||||||
for (const ch of CHARS) glyphs[ch] = glyphData(ch);
|
|
||||||
|
|
||||||
const out = __dirname + '/glyphs.json';
|
|
||||||
fs.writeFileSync(out, JSON.stringify({ em: FS, glyphs }));
|
|
||||||
console.log('wrote', out, fs.statSync(out).size, 'bytes;', CHARS.length, 'glyphs:', CHARS.join(''));
|
|
||||||
@@ -1,128 +0,0 @@
|
|||||||
'use strict';
|
|
||||||
// Site icons + the Open Graph card for the public landing, drawn from the same
|
|
||||||
// design as ../../vk (the wooden Erudit tile: face «Э», score «8») and the app's
|
|
||||||
// board palette (ui/src/app.css). Everything is composed as SVG from the committed
|
|
||||||
// glyph outlines (build/extract.js -> glyphs.json), so no font is needed at build
|
|
||||||
// time; the PNG/ICO rasters are screenshots taken with the ui package's Playwright
|
|
||||||
// chromium (@playwright/test re-exports the browser API). Outputs go straight to
|
|
||||||
// ui/public/:
|
|
||||||
// favicon.svg 96 viewBox, transparent, tile + «Э» (the score is illegible small)
|
|
||||||
// favicon.ico 32x32 PNG-in-ICO render of the same
|
|
||||||
// apple-touch-icon.png 180x180 opaque full-bleed tile (iOS masks its own corners)
|
|
||||||
// og-image.png 1200x630 card: tile + wordmark on the board green
|
|
||||||
const fs = require('fs');
|
|
||||||
const path = require('path');
|
|
||||||
|
|
||||||
const G = JSON.parse(fs.readFileSync(path.join(__dirname, 'glyphs.json'), 'utf8'));
|
|
||||||
const UI = path.resolve(__dirname, '../../../ui');
|
|
||||||
const OUT = path.join(UI, 'public');
|
|
||||||
|
|
||||||
// ---- palette (vk loader tile + app.css board tokens) ------------------------
|
|
||||||
const FACE = '#D9B978', BORDER = '#B49559', GLYPH = '#1A1A1A';
|
|
||||||
const BOARD_DARK = '#2a3330', TEXT = '#e7ece8', TEXT_MUTED = '#cdd6cf';
|
|
||||||
|
|
||||||
// ---- glyph outlines -> SVG path data ----------------------------------------
|
|
||||||
const r2 = n => Math.round(n * 100) / 100;
|
|
||||||
// pathD renders one glyph's contours scaled by sc and translated by (tx, ty).
|
|
||||||
function pathD(g, sc, tx, ty) {
|
|
||||||
const pt = (v, d) => `${r2(v[0] * sc + tx + d[0] * sc)} ${r2(v[1] * sc + ty + d[1] * sc)}`;
|
|
||||||
const Z = [0, 0];
|
|
||||||
return g.contours.map(ct => {
|
|
||||||
const n = ct.v.length;
|
|
||||||
let d = `M${pt(ct.v[0], Z)}`;
|
|
||||||
for (let k = 1; k <= n; k++) {
|
|
||||||
const a = k - 1, b = k % n;
|
|
||||||
d += `C${pt(ct.v[a], ct.o[a])} ${pt(ct.v[b], ct.i[b])} ${pt(ct.v[b], Z)}`;
|
|
||||||
}
|
|
||||||
return d + 'Z';
|
|
||||||
}).join('');
|
|
||||||
}
|
|
||||||
// glyphAt centres a glyph's bbox at (cx, cy) with the given pixel cap height, the
|
|
||||||
// same placement rule as the vk loader's glyph(). stroke fattens it slightly.
|
|
||||||
function glyphAt(ch, capPx, cx, cy, stroke, colour) {
|
|
||||||
const g = G.glyphs[ch], sc = capPx / g.bbox.h;
|
|
||||||
const d = pathD(g, sc, cx - (g.bbox.x + g.bbox.w / 2) * sc, cy - (g.bbox.y + g.bbox.h / 2) * sc);
|
|
||||||
return `<path d="${d}" fill="${colour}" stroke="${colour}" stroke-width="${r2(stroke)}"/>`;
|
|
||||||
}
|
|
||||||
// textLine lays out a string on a baseline from the per-glyph advances; capPx sets
|
|
||||||
// the capital height (measured on «Э»). Returns the combined path + the width.
|
|
||||||
function textLine(str, capPx, x, y, colour) {
|
|
||||||
const sc = capPx / G.glyphs['Э'].bbox.h;
|
|
||||||
let d = '', w = 0;
|
|
||||||
for (const ch of str) {
|
|
||||||
const g = G.glyphs[ch];
|
|
||||||
if (g.contours.length) d += pathD(g, sc, x + w, y);
|
|
||||||
w += g.adv * sc;
|
|
||||||
}
|
|
||||||
return { svg: `<path d="${d}" fill="${colour}"/>`, width: w };
|
|
||||||
}
|
|
||||||
// tile draws the rounded wooden tile centred at (cx, cy): size px wide/high, with
|
|
||||||
// the vk loader's corner (6/52) and rim proportions, «Э» and optionally the «8».
|
|
||||||
function tile(cx, cy, size, withScore) {
|
|
||||||
const h = size / 2, rx = size * (6 / 52), rim = size * (1.8 / 52);
|
|
||||||
let s = `<rect x="${r2(cx - h + rim / 2)}" y="${r2(cy - h + rim / 2)}" width="${r2(size - rim)}" height="${r2(size - rim)}" rx="${r2(rx)}" fill="${FACE}" stroke="${BORDER}" stroke-width="${r2(rim)}"/>`;
|
|
||||||
s += glyphAt('Э', size * (32 / 52), cx, cy - size * (1 / 52), size * (1 / 52), GLYPH);
|
|
||||||
if (withScore) s += glyphAt('8', size * (8.5 / 52), cx + size * (19.5 / 52), cy + size * (18.5 / 52), size * (0.5 / 52), GLYPH);
|
|
||||||
return s;
|
|
||||||
}
|
|
||||||
const svg = (w, h, body) => `<svg xmlns="http://www.w3.org/2000/svg" width="${w}" height="${h}" viewBox="0 0 ${w} ${h}">${body}</svg>`;
|
|
||||||
|
|
||||||
// ---- favicon.svg (the committed vector master) -------------------------------
|
|
||||||
const favicon = svg(96, 96, tile(48, 48, 88, false)) + '\n';
|
|
||||||
|
|
||||||
// ---- apple-touch-icon: opaque full bleed, iOS applies its own corner mask ----
|
|
||||||
const appleTouch = svg(180, 180,
|
|
||||||
`<rect width="180" height="180" fill="${FACE}"/>` +
|
|
||||||
`<rect x="8" y="8" width="164" height="164" rx="18" fill="none" stroke="${BORDER}" stroke-width="4"/>` +
|
|
||||||
glyphAt('Э', 100, 90, 88, 3, GLYPH) +
|
|
||||||
glyphAt('8', 26, 146, 142, 1.5, GLYPH));
|
|
||||||
|
|
||||||
// ---- og-image: tile + wordmark, centred as one group on the board green ------
|
|
||||||
function ogImage() {
|
|
||||||
const W = 1200, H = 630, tileSize = 340, gap = 84;
|
|
||||||
const l1 = textLine('Эрудит', 112, 0, 0, TEXT);
|
|
||||||
const l2 = textLine('Скрэббл — игра в слова', 44, 0, 0, TEXT_MUTED);
|
|
||||||
const textW = Math.max(l1.width, l2.width);
|
|
||||||
const left = (W - (tileSize + gap + textW)) / 2;
|
|
||||||
const tx = left + tileSize + gap;
|
|
||||||
// Two baselines around the vertical centre; the tile centre sits between them.
|
|
||||||
const b1 = 295, b2 = 408;
|
|
||||||
const body =
|
|
||||||
`<rect width="${W}" height="${H}" fill="${BOARD_DARK}"/>` +
|
|
||||||
tile(left + tileSize / 2, H / 2, tileSize, true) +
|
|
||||||
textLine('Эрудит', 112, tx, b1, TEXT).svg +
|
|
||||||
textLine('Скрэббл — игра в слова', 44, tx, b2, TEXT_MUTED).svg;
|
|
||||||
console.log(`og-image: text ${Math.round(textW)}px wide, group left ${Math.round(left)}px`);
|
|
||||||
return svg(W, H, body);
|
|
||||||
}
|
|
||||||
|
|
||||||
// ---- rasterisation (Playwright chromium from ui/node_modules) ----------------
|
|
||||||
async function shoot(page, markup, w, h, transparent) {
|
|
||||||
await page.setViewportSize({ width: w, height: h });
|
|
||||||
await page.setContent(`<body style="margin:0">${markup}</body>`);
|
|
||||||
return page.screenshot({ omitBackground: transparent });
|
|
||||||
}
|
|
||||||
// icoFromPNG wraps one PNG as a single-entry .ico (ICONDIR + ICONDIRENTRY + PNG).
|
|
||||||
function icoFromPNG(png, sizePx) {
|
|
||||||
const h = Buffer.alloc(22);
|
|
||||||
h.writeUInt16LE(0, 0); h.writeUInt16LE(1, 2); h.writeUInt16LE(1, 4); // icon, 1 image
|
|
||||||
h.writeUInt8(sizePx, 6); h.writeUInt8(sizePx, 7); // 32x32
|
|
||||||
h.writeUInt16LE(1, 10); h.writeUInt16LE(32, 12); // planes, 32bpp
|
|
||||||
h.writeUInt32LE(png.length, 14); h.writeUInt32LE(22, 18); // size, offset
|
|
||||||
return Buffer.concat([h, png]);
|
|
||||||
}
|
|
||||||
|
|
||||||
(async () => {
|
|
||||||
fs.writeFileSync(path.join(OUT, 'favicon.svg'), favicon);
|
|
||||||
const { chromium } = require(path.join(UI, 'node_modules', '@playwright/test'));
|
|
||||||
const browser = await chromium.launch();
|
|
||||||
const page = await browser.newPage();
|
|
||||||
const fav32 = await shoot(page, svg(32, 32, tile(16, 16, 29.33, false)), 32, 32, true);
|
|
||||||
fs.writeFileSync(path.join(OUT, 'favicon.ico'), icoFromPNG(fav32, 32));
|
|
||||||
fs.writeFileSync(path.join(OUT, 'apple-touch-icon.png'), await shoot(page, appleTouch, 180, 180, false));
|
|
||||||
fs.writeFileSync(path.join(OUT, 'og-image.png'), await shoot(page, ogImage(), 1200, 630, false));
|
|
||||||
await browser.close();
|
|
||||||
for (const f of ['favicon.svg', 'favicon.ico', 'apple-touch-icon.png', 'og-image.png']) {
|
|
||||||
console.log('wrote', path.join(OUT, f), fs.statSync(path.join(OUT, f)).size, 'bytes');
|
|
||||||
}
|
|
||||||
})();
|
|
||||||
@@ -21,7 +21,29 @@
|
|||||||
<div><button type="submit">Add</button></div>
|
<div><button type="submit">Add</button></div>
|
||||||
</form>
|
</form>
|
||||||
</section>
|
</section>
|
||||||
|
<section class="panel"><h2>Rewarded ads (watch for chips)</h2>
|
||||||
|
<p class="note">The chips a player earns per rewarded-video view (VK only), plus the per-day and per-hour caps that bound free chips — <strong>0 payout turns rewarded off</strong>. This is the shared reward config, not a product.</p>
|
||||||
|
<form class="form col" method="post" action="/_gm/catalog/reward">
|
||||||
|
<label>Chips per view <input type="number" name="reward_payout" min="0" value="{{.RewardPayout}}"></label>
|
||||||
|
<label>Daily cap <input type="number" name="reward_daily" min="0" value="{{.RewardDailyCap}}"></label>
|
||||||
|
<label>Hourly cap <input type="number" name="reward_hourly" min="0" value="{{.RewardHourlyCap}}"></label>
|
||||||
|
<div><button type="submit">Save</button></div>
|
||||||
|
</form>
|
||||||
|
</section>
|
||||||
|
<section class="panel"><h2>Payment availability (kill switch)</h2>
|
||||||
|
<p class="note">Turn purchases off on a rail/channel and show the user a localized reason on their next attempt. Unchecked = off; an empty message shows a built-in “temporarily unavailable”. Fail-open: a rail you never touch stays on. A per-user “allow” override (on a user card) bypasses this switch.</p>
|
||||||
|
{{range .Rails}}
|
||||||
|
<form class="form col" method="post" action="/_gm/catalog/rail-status">
|
||||||
|
<input type="hidden" name="rail" value="{{.Rail}}">
|
||||||
|
<label><input type="checkbox" name="enabled" {{if .Enabled}}checked{{end}}> <code>{{.Rail}}</code> — purchases enabled</label>
|
||||||
|
<label>Message RU <input type="text" name="message_ru" maxlength="200" value="{{.MessageRU}}"></label>
|
||||||
|
<label>Message EN <input type="text" name="message_en" maxlength="200" value="{{.MessageEN}}"></label>
|
||||||
|
<div><button type="submit">Save</button></div>
|
||||||
|
</form>
|
||||||
|
{{end}}
|
||||||
|
</section>
|
||||||
<section class="panel"><h2>Products</h2>
|
<section class="panel"><h2>Products</h2>
|
||||||
|
<p class="note">Showing {{if .ShowAll}}<strong>all</strong> products (active + archived) — <a href="/_gm/catalog">active only</a>{{else}}<strong>active</strong> products — <a href="/_gm/catalog?all=1">show all (incl. archived)</a>{{end}}.</p>
|
||||||
<table class="list">
|
<table class="list">
|
||||||
<thead><tr><th>Title</th><th>Status</th><th>Atoms</th><th>Prices</th><th></th></tr></thead>
|
<thead><tr><th>Title</th><th>Status</th><th>Atoms</th><th>Prices</th><th></th></tr></thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
|
|||||||
@@ -72,14 +72,24 @@
|
|||||||
{{if or .Finance.Abuse .Finance.Loss}}<li><b>Refund risk</b> <span class="warn">{{if .Finance.Abuse}}abuse-flagged{{end}}{{if .Finance.Loss}} · loss {{.Finance.Loss}} chips{{end}}</span></li>{{end}}
|
{{if or .Finance.Abuse .Finance.Loss}}<li><b>Refund risk</b> <span class="warn">{{if .Finance.Abuse}}abuse-flagged{{end}}{{if .Finance.Loss}} · loss {{.Finance.Loss}} chips{{end}}</span></li>{{end}}
|
||||||
</ul>
|
</ul>
|
||||||
{{else}}<p class="note">no balances or benefits</p>{{end}}
|
{{else}}<p class="note">no balances or benefits</p>{{end}}
|
||||||
|
<h3>Payment override</h3>
|
||||||
|
<form class="form" method="post" action="/_gm/users/{{.ID}}/purchase-override">
|
||||||
|
<label>Purchases for this account
|
||||||
|
<select name="override">
|
||||||
|
<option value="default" {{if eq .PurchaseOverride "default"}}selected{{end}}>Default (follow the rail switch)</option>
|
||||||
|
<option value="allow" {{if eq .PurchaseOverride "allow"}}selected{{end}}>Always allow (bypasses the rail switch only, not security)</option>
|
||||||
|
<option value="deny" {{if eq .PurchaseOverride "deny"}}selected{{end}}>Always deny</option>
|
||||||
|
</select></label>
|
||||||
|
<div><button type="submit">Save</button></div>
|
||||||
|
</form>
|
||||||
<h3>Ledger</h3>
|
<h3>Ledger</h3>
|
||||||
{{$uid := .ID}}
|
{{$uid := .ID}}
|
||||||
{{if .Finance.Ledger}}
|
{{if .Finance.Ledger}}
|
||||||
<table class="list">
|
<table class="list">
|
||||||
<thead><tr><th>Time</th><th>Kind</th><th>Source</th><th>Origin</th><th>Chips</th><th>Order</th><th>Provider</th><th>Detail</th><th></th></tr></thead>
|
<thead><tr><th>Time</th><th>Kind</th><th>Source</th><th>Origin</th><th>Chips</th><th>Order</th><th>Provider</th><th>Shop</th><th>Detail</th><th></th></tr></thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
{{range .Finance.Ledger}}
|
{{range .Finance.Ledger}}
|
||||||
<tr><td>{{.At}}</td><td>{{.Kind}}</td><td>{{.Source}}</td><td>{{.Origin}}</td><td>{{.ChipsDelta}}</td><td>{{if .Order}}<code>{{.Order}}</code>{{end}}</td><td>{{.Provider}}</td><td>{{if .Snapshot}}<code>{{.Snapshot}}</code>{{end}}</td>
|
<tr><td>{{.At}}</td><td>{{.Kind}}</td><td>{{.Source}}</td><td>{{.Origin}}</td><td>{{.ChipsDelta}}</td><td>{{if .Order}}<code>{{.Order}}</code>{{end}}</td><td>{{.Provider}}</td><td>{{.Shop}}</td><td>{{if .Snapshot}}<code>{{.Snapshot}}</code>{{end}}</td>
|
||||||
<td>{{if and (eq .Kind "fund") .Order}}<form class="form" method="post" action="/_gm/users/{{$uid}}/refund" onsubmit="return confirm('Refund this order in full? Record the money refund on the rail first; this revokes the chips (floored at 0).')"><input type="hidden" name="order_id" value="{{.Order}}"><button type="submit">Refund</button></form>{{end}}</td></tr>
|
<td>{{if and (eq .Kind "fund") .Order}}<form class="form" method="post" action="/_gm/users/{{$uid}}/refund" onsubmit="return confirm('Refund this order in full? Record the money refund on the rail first; this revokes the chips (floored at 0).')"><input type="hidden" name="order_id" value="{{.Order}}"><button type="submit">Refund</button></form>{{end}}</td></tr>
|
||||||
{{end}}
|
{{end}}
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|||||||
@@ -198,6 +198,9 @@ type UserDetailView struct {
|
|||||||
// Finance is the account's payments picture (balances, benefits, refund risk, ledger). Present
|
// Finance is the account's payments picture (balances, benefits, refund risk, ledger). Present
|
||||||
// is false when the payments domain is unwired.
|
// is false when the payments domain is unwired.
|
||||||
Finance FinanceView
|
Finance FinanceView
|
||||||
|
// PurchaseOverride is the account's per-account purchase override ("default"/"allow"/"deny"),
|
||||||
|
// shown in and edited from the user card's payment-override control.
|
||||||
|
PurchaseOverride string
|
||||||
// Grant is the admin-grant panel (origin picker + grantable products). Present is false when the
|
// Grant is the admin-grant panel (origin picker + grantable products). Present is false when the
|
||||||
// payments domain is unwired.
|
// payments domain is unwired.
|
||||||
Grant GrantFormView
|
Grant GrantFormView
|
||||||
@@ -232,8 +235,8 @@ type BenefitRow struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// LedgerRow is one append-only ledger entry: its kind, funding source / benefit origin, signed chip
|
// LedgerRow is one append-only ledger entry: its kind, funding source / benefit origin, signed chip
|
||||||
// delta, the product / order / provider it references (empty when none), the raw snapshot JSON and
|
// delta, the product / order / provider / direct-rail shop it references (empty when none), the raw
|
||||||
// the pre-formatted time.
|
// snapshot JSON and the pre-formatted time.
|
||||||
type LedgerRow struct {
|
type LedgerRow struct {
|
||||||
Kind string
|
Kind string
|
||||||
Source string
|
Source string
|
||||||
@@ -242,6 +245,7 @@ type LedgerRow struct {
|
|||||||
Product string
|
Product string
|
||||||
Order string
|
Order string
|
||||||
Provider string
|
Provider string
|
||||||
|
Shop string
|
||||||
Snapshot string
|
Snapshot string
|
||||||
At string
|
At string
|
||||||
}
|
}
|
||||||
@@ -677,6 +681,27 @@ type FeedbackDetailView struct {
|
|||||||
// CatalogView is the product-catalog list page.
|
// CatalogView is the product-catalog list page.
|
||||||
type CatalogView struct {
|
type CatalogView struct {
|
||||||
Products []ProductRow
|
Products []ProductRow
|
||||||
|
// ShowAll reports whether archived products are listed alongside active ones (the active/all
|
||||||
|
// toggle); it drives the toggle link and the list heading.
|
||||||
|
ShowAll bool
|
||||||
|
// RewardPayout / RewardDailyCap / RewardHourlyCap are the rewarded-video config (chips earned per
|
||||||
|
// view and the per-day / per-hour anti-abuse caps), shown in and edited from the page's
|
||||||
|
// rewarded-ads form. A 0 payout means rewarded is inert.
|
||||||
|
RewardPayout int
|
||||||
|
RewardDailyCap int
|
||||||
|
RewardHourlyCap int
|
||||||
|
// Rails is the per-rail operational kill-switch state (enabled + per-language off-message), shown
|
||||||
|
// in and edited from the page's payment-availability form.
|
||||||
|
Rails []RailStatusRow
|
||||||
|
}
|
||||||
|
|
||||||
|
// RailStatusRow is one payment rail's operational availability in the kill-switch editor: the rail
|
||||||
|
// key, whether purchases are enabled, and the operator's per-language off-message shown to the user.
|
||||||
|
type RailStatusRow struct {
|
||||||
|
Rail string
|
||||||
|
Enabled bool
|
||||||
|
MessageRU string
|
||||||
|
MessageEN string
|
||||||
}
|
}
|
||||||
|
|
||||||
// ProductRow is one product in the catalog list: its composition, prices, the archived flag
|
// ProductRow is one product in the catalog list: its composition, prices, the archived flag
|
||||||
|
|||||||
@@ -65,9 +65,9 @@ type Config struct {
|
|||||||
// RendererURL is the base URL of the internal image-render sidecar (e.g.
|
// RendererURL is the base URL of the internal image-render sidecar (e.g.
|
||||||
// http://renderer:8090). Empty disables the PNG export artifact.
|
// http://renderer:8090). Empty disables the PNG export artifact.
|
||||||
RendererURL string
|
RendererURL string
|
||||||
// Robokassa configures the direct-rail (RUB) payment provider. An empty MerchantLogin
|
// Robokassa configures the direct-rail (RUB) payment provider — one merchant shop per channel
|
||||||
// leaves the direct order and Result-callback endpoints unregistered.
|
// (D42). An empty set leaves the direct order and Result-callback endpoints unregistered.
|
||||||
Robokassa robokassa.Config
|
Robokassa robokassa.Shops
|
||||||
}
|
}
|
||||||
|
|
||||||
// Defaults applied when the corresponding environment variable is unset.
|
// Defaults applied when the corresponding environment variable is unset.
|
||||||
@@ -157,11 +157,19 @@ func Load() (Config, error) {
|
|||||||
AdminTo: os.Getenv("BACKEND_ADMIN_EMAIL"),
|
AdminTo: os.Getenv("BACKEND_ADMIN_EMAIL"),
|
||||||
}
|
}
|
||||||
|
|
||||||
robo := robokassa.Config{
|
// Robokassa direct rail: one merchant shop per channel (D42). The legacy single-shop vars seed
|
||||||
MerchantLogin: os.Getenv("BACKEND_ROBOKASSA_MERCHANT_LOGIN"),
|
// the web channel so existing deploys keep working; the per-channel vars add the rest. A shop
|
||||||
Password1: os.Getenv("BACKEND_ROBOKASSA_PASSWORD1"),
|
// with no MerchantLogin is dropped (the rail stays dormant when none is configured).
|
||||||
Password2: os.Getenv("BACKEND_ROBOKASSA_PASSWORD2"),
|
shops := robokassa.Shops{}
|
||||||
IsTest: os.Getenv("BACKEND_ROBOKASSA_TEST") == "1",
|
web := robokassaShop("BACKEND_ROBOKASSA_WEB")
|
||||||
|
if web.MerchantLogin == "" {
|
||||||
|
web = robokassaShop("BACKEND_ROBOKASSA") // legacy single-shop credentials seed the web channel
|
||||||
|
}
|
||||||
|
if web.MerchantLogin != "" {
|
||||||
|
shops[robokassa.ChannelWeb] = web
|
||||||
|
}
|
||||||
|
if android := robokassaShop("BACKEND_ROBOKASSA_ANDROID"); android.MerchantLogin != "" {
|
||||||
|
shops[robokassa.ChannelAndroid] = android
|
||||||
}
|
}
|
||||||
|
|
||||||
c := Config{
|
c := Config{
|
||||||
@@ -181,7 +189,7 @@ func Load() (Config, error) {
|
|||||||
GuestRetention: guestRetention,
|
GuestRetention: guestRetention,
|
||||||
ExportSignKey: os.Getenv("BACKEND_EXPORT_SIGN_KEY"),
|
ExportSignKey: os.Getenv("BACKEND_EXPORT_SIGN_KEY"),
|
||||||
RendererURL: os.Getenv("BACKEND_RENDERER_URL"),
|
RendererURL: os.Getenv("BACKEND_RENDERER_URL"),
|
||||||
Robokassa: robo,
|
Robokassa: shops,
|
||||||
}
|
}
|
||||||
if err := c.validate(); err != nil {
|
if err := c.validate(); err != nil {
|
||||||
return Config{}, err
|
return Config{}, err
|
||||||
@@ -234,8 +242,10 @@ func (c Config) validate() error {
|
|||||||
return fmt.Errorf("config: BACKEND_PUBLIC_BASE_URL %q must be an absolute URL (scheme://host)", c.PublicBaseURL)
|
return fmt.Errorf("config: BACKEND_PUBLIC_BASE_URL %q must be an absolute URL (scheme://host)", c.PublicBaseURL)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if c.Robokassa.MerchantLogin != "" && (c.Robokassa.Password1 == "" || c.Robokassa.Password2 == "") {
|
for channel, shop := range c.Robokassa {
|
||||||
return fmt.Errorf("config: BACKEND_ROBOKASSA_PASSWORD1 and BACKEND_ROBOKASSA_PASSWORD2 must be set when BACKEND_ROBOKASSA_MERCHANT_LOGIN is")
|
if shop.Password1 == "" || shop.Password2 == "" {
|
||||||
|
return fmt.Errorf("config: robokassa shop %q: password1 and password2 must be set when its merchant login is", channel)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@@ -276,3 +286,15 @@ func envDuration(key string, fallback time.Duration) (time.Duration, error) {
|
|||||||
}
|
}
|
||||||
return d, nil
|
return d, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// robokassaShop reads a Robokassa shop's four credentials from the environment under prefix (e.g.
|
||||||
|
// "BACKEND_ROBOKASSA_WEB" → _MERCHANT_LOGIN / _PASSWORD1 / _PASSWORD2 / _TEST). A missing
|
||||||
|
// MerchantLogin yields a zero Config the caller drops.
|
||||||
|
func robokassaShop(prefix string) robokassa.Config {
|
||||||
|
return robokassa.Config{
|
||||||
|
MerchantLogin: os.Getenv(prefix + "_MERCHANT_LOGIN"),
|
||||||
|
Password1: os.Getenv(prefix + "_PASSWORD1"),
|
||||||
|
Password2: os.Getenv(prefix + "_PASSWORD2"),
|
||||||
|
IsTest: os.Getenv(prefix+"_TEST") == "1",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ import (
|
|||||||
// productByTitle finds a catalog product by its (unique in the test) title.
|
// productByTitle finds a catalog product by its (unique in the test) title.
|
||||||
func productByTitle(t *testing.T, pay *payments.Service, title string) payments.AdminProduct {
|
func productByTitle(t *testing.T, pay *payments.Service, title string) payments.AdminProduct {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
all, err := pay.AdminCatalog(context.Background())
|
all, err := pay.AdminCatalog(context.Background(), true)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("admin catalog: %v", err)
|
t.Fatalf("admin catalog: %v", err)
|
||||||
}
|
}
|
||||||
@@ -57,7 +57,7 @@ func TestConsoleCatalogEditor(t *testing.T) {
|
|||||||
if code, body := consoleDo(h, http.MethodPost, catalog, "title=cat-bad&chips=100&active=true", origin); code != http.StatusOK || !strings.Contains(body, "Invalid product") {
|
if code, body := consoleDo(h, http.MethodPost, catalog, "title=cat-bad&chips=100&active=true", origin); code != http.StatusOK || !strings.Contains(body, "Invalid product") {
|
||||||
t.Fatalf("bad pack = %d, has 'Invalid product' = %v", code, strings.Contains(body, "Invalid product"))
|
t.Fatalf("bad pack = %d, has 'Invalid product' = %v", code, strings.Contains(body, "Invalid product"))
|
||||||
}
|
}
|
||||||
if _, err := pay.AdminCatalog(ctx); err != nil {
|
if _, err := pay.AdminCatalog(ctx, true); err != nil {
|
||||||
t.Fatalf("catalog: %v", err)
|
t.Fatalf("catalog: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -95,3 +95,59 @@ func TestConsoleCatalogEditor(t *testing.T) {
|
|||||||
t.Fatalf("delete transacted = %d, has 'Cannot delete' = %v", code, strings.Contains(body, "Cannot delete"))
|
t.Fatalf("delete transacted = %d, has 'Cannot delete' = %v", code, strings.Contains(body, "Cannot delete"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestConsoleCatalogActiveToggle checks the catalog console lists only active products by default and
|
||||||
|
// includes the archived ones under ?all=1 (the active/all toggle).
|
||||||
|
func TestConsoleCatalogActiveToggle(t *testing.T) {
|
||||||
|
srv, _, _ := bannerServer(t)
|
||||||
|
h := srv.Handler()
|
||||||
|
const origin = "http://admin.test"
|
||||||
|
const catalog = "http://admin.test/_gm/catalog"
|
||||||
|
|
||||||
|
// An active value and an archived one (created without the active flag).
|
||||||
|
if code, _ := consoleDo(h, http.MethodPost, catalog, "title=toggle-active&hints=5&price_chip=50&active=true", origin); code != http.StatusOK {
|
||||||
|
t.Fatal("create active failed")
|
||||||
|
}
|
||||||
|
if code, _ := consoleDo(h, http.MethodPost, catalog, "title=toggle-archived&hints=9&price_chip=90", origin); code != http.StatusOK {
|
||||||
|
t.Fatal("create archived failed")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Default view: active only.
|
||||||
|
if _, body := consoleDo(h, http.MethodGet, catalog, "", ""); !strings.Contains(body, "toggle-active") || strings.Contains(body, "toggle-archived") {
|
||||||
|
t.Errorf("default view: active listed=%v, archived listed=%v (want true/false)",
|
||||||
|
strings.Contains(body, "toggle-active"), strings.Contains(body, "toggle-archived"))
|
||||||
|
}
|
||||||
|
|
||||||
|
// ?all=1: active and archived.
|
||||||
|
if _, body := consoleDo(h, http.MethodGet, catalog+"?all=1", "", ""); !strings.Contains(body, "toggle-active") || !strings.Contains(body, "toggle-archived") {
|
||||||
|
t.Errorf("all view: active listed=%v, archived listed=%v (want true/true)",
|
||||||
|
strings.Contains(body, "toggle-active"), strings.Contains(body, "toggle-archived"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestConsoleRewardConfig checks the rewarded-ads config form on the catalog page: a POST updates the
|
||||||
|
// payout and caps, the page pre-fills the current values, and a negative value is refused.
|
||||||
|
func TestConsoleRewardConfig(t *testing.T) {
|
||||||
|
srv, _, pay := bannerServer(t)
|
||||||
|
h := srv.Handler()
|
||||||
|
const origin = "http://admin.test"
|
||||||
|
const reward = "http://admin.test/_gm/catalog/reward"
|
||||||
|
|
||||||
|
// Set the payout and caps.
|
||||||
|
if code, body := consoleDo(h, http.MethodPost, reward, "reward_payout=7&reward_daily=40&reward_hourly=9", origin); code != http.StatusOK || !strings.Contains(body, "Saved") {
|
||||||
|
t.Fatalf("set reward = %d, has 'Saved' = %v", code, strings.Contains(body, "Saved"))
|
||||||
|
}
|
||||||
|
if payout, daily, hourly, err := pay.RewardConfig(context.Background()); err != nil || payout != 7 || daily != 40 || hourly != 9 {
|
||||||
|
t.Fatalf("reward config = %d/%d/%d (err %v), want 7/40/9", payout, daily, hourly, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// The catalog page renders the form pre-filled with the current payout.
|
||||||
|
if _, body := consoleDo(h, http.MethodGet, "http://admin.test/_gm/catalog", "", ""); !strings.Contains(body, "reward_payout") || !strings.Contains(body, `value="7"`) {
|
||||||
|
t.Error("catalog page did not render the reward form with the current payout")
|
||||||
|
}
|
||||||
|
|
||||||
|
// A negative value is refused (the service validates non-negativity).
|
||||||
|
if code, body := consoleDo(h, http.MethodPost, reward, "reward_payout=-1", origin); code != http.StatusOK || !strings.Contains(body, "non-negative") {
|
||||||
|
t.Errorf("negative payout = %d, has 'non-negative' = %v", code, strings.Contains(body, "non-negative"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,83 @@
|
|||||||
|
//go:build integration
|
||||||
|
|
||||||
|
package inttest
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/google/uuid"
|
||||||
|
|
||||||
|
"scrabble/backend/internal/payments"
|
||||||
|
)
|
||||||
|
|
||||||
|
// TestPaymentAvailabilityKillSwitch exercises the per-rail kill switch + the per-account override
|
||||||
|
// end-to-end against Postgres: fail-open, a disabled rail with a localized message, per-rail
|
||||||
|
// granularity, and the allow/deny/default overrides.
|
||||||
|
func TestPaymentAvailabilityKillSwitch(t *testing.T) {
|
||||||
|
ctx := context.Background()
|
||||||
|
svc := newPaymentsService()
|
||||||
|
acc := uuid.New()
|
||||||
|
|
||||||
|
// Fail-open: an untouched rail is enabled.
|
||||||
|
if ok, _, err := svc.CanPurchase(ctx, acc, payments.RailDirectWeb, "en"); err != nil || !ok {
|
||||||
|
t.Fatalf("fail-open: CanPurchase = %v/%v, want true", ok, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Disable the web rail with a per-language message → blocked with that message, localized.
|
||||||
|
if err := svc.SetRailStatus(ctx, payments.RailDirectWeb, payments.RailAvailability{MessageRU: "Чиним", MessageEN: "Fixing"}); err != nil {
|
||||||
|
t.Fatalf("set rail status: %v", err)
|
||||||
|
}
|
||||||
|
if ok, reason, err := svc.CanPurchase(ctx, acc, payments.RailDirectWeb, "ru"); err != nil || ok || reason != "Чиним" {
|
||||||
|
t.Fatalf("disabled rail (ru): CanPurchase = %v/%q/%v, want false/Чиним", ok, reason, err)
|
||||||
|
}
|
||||||
|
if ok, reason, _ := svc.CanPurchase(ctx, acc, payments.RailDirectWeb, "en"); ok || reason != "Fixing" {
|
||||||
|
t.Fatalf("disabled rail (en): = %v/%q, want false/Fixing", ok, reason)
|
||||||
|
}
|
||||||
|
// Per-rail granularity: another rail stays enabled.
|
||||||
|
if ok, _, _ := svc.CanPurchase(ctx, acc, payments.RailDirectAndroid, "en"); !ok {
|
||||||
|
t.Fatalf("android rail should stay enabled")
|
||||||
|
}
|
||||||
|
|
||||||
|
// A per-account "allow" override bypasses the disabled rail.
|
||||||
|
if err := svc.SetPurchaseOverride(ctx, acc, payments.OverrideAllow); err != nil {
|
||||||
|
t.Fatalf("set override allow: %v", err)
|
||||||
|
}
|
||||||
|
if ok, _, _ := svc.CanPurchase(ctx, acc, payments.RailDirectWeb, "en"); !ok {
|
||||||
|
t.Fatalf("allow override should bypass the disabled rail")
|
||||||
|
}
|
||||||
|
if ov, err := svc.PurchaseOverrideFor(ctx, acc); err != nil || ov != payments.OverrideAllow {
|
||||||
|
t.Fatalf("PurchaseOverrideFor = %v/%v, want allow", ov, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// A "deny" override blocks even an enabled rail.
|
||||||
|
if err := svc.SetPurchaseOverride(ctx, acc, payments.OverrideDeny); err != nil {
|
||||||
|
t.Fatalf("set override deny: %v", err)
|
||||||
|
}
|
||||||
|
if ok, reason, _ := svc.CanPurchase(ctx, acc, payments.RailDirectAndroid, "en"); ok || reason == "" {
|
||||||
|
t.Fatalf("deny override should block the enabled android rail with a reason, got %v/%q", ok, reason)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Clearing the override (default) restores rail-driven behaviour.
|
||||||
|
if err := svc.SetPurchaseOverride(ctx, acc, payments.OverrideDefault); err != nil {
|
||||||
|
t.Fatalf("clear override: %v", err)
|
||||||
|
}
|
||||||
|
if ov, _ := svc.PurchaseOverrideFor(ctx, acc); ov != payments.OverrideDefault {
|
||||||
|
t.Fatalf("after clear, override = %v, want default", ov)
|
||||||
|
}
|
||||||
|
if ok, _, _ := svc.CanPurchase(ctx, acc, payments.RailDirectAndroid, "en"); !ok {
|
||||||
|
t.Fatalf("after clearing override, android rail should be enabled again")
|
||||||
|
}
|
||||||
|
|
||||||
|
// RailStatuses reflects the stored web-rail change and fills the rest fail-open.
|
||||||
|
all, err := svc.RailStatuses(ctx)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("rail statuses: %v", err)
|
||||||
|
}
|
||||||
|
if all[payments.RailDirectWeb].Enabled {
|
||||||
|
t.Fatalf("web rail should read disabled")
|
||||||
|
}
|
||||||
|
if !all[payments.RailVK].Enabled {
|
||||||
|
t.Fatalf("untouched vk rail should read enabled")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,107 @@
|
|||||||
|
package payments
|
||||||
|
|
||||||
|
import "slices"
|
||||||
|
|
||||||
|
// PurchaseOverride is a per-account purchase override that forces purchases allowed or denied for
|
||||||
|
// one account regardless of the operational rail switch, or is absent (OverrideDefault) when the
|
||||||
|
// account follows the rail switch. The zero value is OverrideDefault, so a missing override row maps
|
||||||
|
// to it. OverrideAllow bypasses ONLY the operational rail switch — never the security / compliance
|
||||||
|
// gates (trusted platform, the D36 email anchor, the VK-iOS spend freeze, the min client version),
|
||||||
|
// which CreateOrder enforces separately.
|
||||||
|
type PurchaseOverride int
|
||||||
|
|
||||||
|
const (
|
||||||
|
// OverrideDefault follows the rail switch (no override row for the account).
|
||||||
|
OverrideDefault PurchaseOverride = iota
|
||||||
|
// OverrideAllow always allows the purchase, bypassing only the operational rail switch.
|
||||||
|
OverrideAllow
|
||||||
|
// OverrideDeny always denies the purchase for the account.
|
||||||
|
OverrideDeny
|
||||||
|
)
|
||||||
|
|
||||||
|
// RailAvailability is a payment rail's operational availability: whether purchases are enabled and,
|
||||||
|
// when disabled, the operator's explanation in each language, shown to the user on a purchase
|
||||||
|
// attempt. A rail with no status row is treated as enabled (fail-open — see the store), so the
|
||||||
|
// zero value is never used as a live "enabled" default.
|
||||||
|
type RailAvailability struct {
|
||||||
|
Enabled bool
|
||||||
|
MessageRU string
|
||||||
|
MessageEN string
|
||||||
|
}
|
||||||
|
|
||||||
|
// PurchaseGate decides whether an account may open a purchase order on a rail, from the per-account
|
||||||
|
// override and the rail's operational availability. It is the operational layer only — the caller
|
||||||
|
// still enforces the security gates. On a block it returns a reason localized to lang ("ru", else
|
||||||
|
// English). Fail-open: OverrideDefault on an enabled rail allows.
|
||||||
|
func PurchaseGate(override PurchaseOverride, rail RailAvailability, lang string) (ok bool, reason string) {
|
||||||
|
switch override {
|
||||||
|
case OverrideAllow:
|
||||||
|
return true, "" // bypasses only the ops switch; the security gates still apply upstream
|
||||||
|
case OverrideDeny:
|
||||||
|
return false, defaultUnavailable(lang) // a per-account block — a neutral reason
|
||||||
|
default: // OverrideDefault — follow the rail switch
|
||||||
|
if rail.Enabled {
|
||||||
|
return true, ""
|
||||||
|
}
|
||||||
|
return false, railMessage(rail, lang)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// railMessage returns the operator's rail-off message in lang, falling back to the other language
|
||||||
|
// and then to the built-in default when the operator left both blank.
|
||||||
|
func railMessage(rail RailAvailability, lang string) string {
|
||||||
|
if lang == "ru" {
|
||||||
|
if rail.MessageRU != "" {
|
||||||
|
return rail.MessageRU
|
||||||
|
}
|
||||||
|
if rail.MessageEN != "" {
|
||||||
|
return rail.MessageEN
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if rail.MessageEN != "" {
|
||||||
|
return rail.MessageEN
|
||||||
|
}
|
||||||
|
if rail.MessageRU != "" {
|
||||||
|
return rail.MessageRU
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return defaultUnavailable(lang)
|
||||||
|
}
|
||||||
|
|
||||||
|
// defaultUnavailable is the built-in localized "payments unavailable" reason used when the operator
|
||||||
|
// set no custom message, and for a per-account deny.
|
||||||
|
func defaultUnavailable(lang string) string {
|
||||||
|
if lang == "ru" {
|
||||||
|
return "Оплата временно недоступна. Попробуйте позже."
|
||||||
|
}
|
||||||
|
return "Payments are temporarily unavailable. Please try again later."
|
||||||
|
}
|
||||||
|
|
||||||
|
// Rail keys name the operational payment rails the kill switch and the per-account override key on.
|
||||||
|
// The direct rail is split per channel (D42); vk and telegram are single-rail.
|
||||||
|
const (
|
||||||
|
RailDirectWeb = "direct:web"
|
||||||
|
RailDirectAndroid = "direct:android"
|
||||||
|
RailVK = "vk"
|
||||||
|
RailTelegram = "telegram"
|
||||||
|
)
|
||||||
|
|
||||||
|
// KnownRails is the fixed set of rail keys, for the admin editor and for validation.
|
||||||
|
var KnownRails = []string{RailDirectWeb, RailDirectAndroid, RailVK, RailTelegram}
|
||||||
|
|
||||||
|
// RailKey maps a payment context to its operational rail key: the direct rail by channel subtype
|
||||||
|
// (android, else web), or the store rail's own name (vk / telegram).
|
||||||
|
func RailKey(kind Source, subtype string) string {
|
||||||
|
if kind == SourceDirect {
|
||||||
|
if subtype == "android" {
|
||||||
|
return RailDirectAndroid
|
||||||
|
}
|
||||||
|
return RailDirectWeb
|
||||||
|
}
|
||||||
|
return string(kind)
|
||||||
|
}
|
||||||
|
|
||||||
|
// isKnownRail reports whether rail is one of the fixed rail keys.
|
||||||
|
func isKnownRail(rail string) bool {
|
||||||
|
return slices.Contains(KnownRails, rail)
|
||||||
|
}
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
package payments
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
func TestPurchaseGate(t *testing.T) {
|
||||||
|
on := RailAvailability{Enabled: true}
|
||||||
|
offMsg := RailAvailability{Enabled: false, MessageRU: "Чиним", MessageEN: "Fixing"}
|
||||||
|
offNoMsg := RailAvailability{Enabled: false}
|
||||||
|
|
||||||
|
// OverrideDefault follows the rail switch.
|
||||||
|
if ok, _ := PurchaseGate(OverrideDefault, on, "en"); !ok {
|
||||||
|
t.Error("default + enabled rail should allow")
|
||||||
|
}
|
||||||
|
if ok, r := PurchaseGate(OverrideDefault, offMsg, "ru"); ok || r != "Чиним" {
|
||||||
|
t.Errorf("default + off rail (ru) = %v/%q, want false/Чиним", ok, r)
|
||||||
|
}
|
||||||
|
if ok, r := PurchaseGate(OverrideDefault, offMsg, "en"); ok || r != "Fixing" {
|
||||||
|
t.Errorf("default + off rail (en) = %v/%q, want false/Fixing", ok, r)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Off rail with no custom message → the built-in default, localized (not the English default in ru).
|
||||||
|
if ok, r := PurchaseGate(OverrideDefault, offNoMsg, "ru"); ok || r != defaultUnavailable("ru") {
|
||||||
|
t.Errorf("default + off no-msg (ru) = %v/%q, want false + the ru default", ok, r)
|
||||||
|
}
|
||||||
|
|
||||||
|
// OverrideAllow bypasses the ops switch even when the rail is off.
|
||||||
|
if ok, r := PurchaseGate(OverrideAllow, offMsg, "en"); !ok || r != "" {
|
||||||
|
t.Errorf("allow + off rail = %v/%q, want true/empty (bypasses the ops switch)", ok, r)
|
||||||
|
}
|
||||||
|
|
||||||
|
// OverrideDeny blocks even when the rail is on, with a non-empty reason.
|
||||||
|
if ok, r := PurchaseGate(OverrideDeny, on, "en"); ok || r == "" {
|
||||||
|
t.Errorf("deny + on rail = %v/%q, want false + a reason", ok, r)
|
||||||
|
}
|
||||||
|
|
||||||
|
// The message falls back to the other language when only one is set.
|
||||||
|
if _, r := PurchaseGate(OverrideDefault, RailAvailability{MessageEN: "OnlyEN"}, "ru"); r != "OnlyEN" {
|
||||||
|
t.Errorf("off rail ru with only EN msg = %q, want OnlyEN (fallback)", r)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -38,6 +38,11 @@ const atomChips = "chips"
|
|||||||
// method are omitted (misconfigured or unavailable there). An untrusted context (empty Kind) has
|
// method are omitted (misconfigured or unavailable there). An untrusted context (empty Kind) has
|
||||||
// no method, so only values show; buying is gated server-side regardless.
|
// no method, so only values show; buying is gated server-side regardless.
|
||||||
func projectCatalog(entries []catalogEntry, cxt Context) CatalogView {
|
func projectCatalog(entries []catalogEntry, cxt Context) CatalogView {
|
||||||
|
// Present products in the canonical listing order shared with the offer and the admin console
|
||||||
|
// (packs first by rouble price, then values grouped hints → no-ads → combo and by chip price); the
|
||||||
|
// client renders them as received. Ordered in place — the caller passes a fresh loadCatalog result
|
||||||
|
// it does not reuse.
|
||||||
|
sortCatalogEntries(entries)
|
||||||
var out CatalogView
|
var out CatalogView
|
||||||
for _, e := range entries {
|
for _, e := range entries {
|
||||||
isPack := false
|
isPack := false
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
package payments
|
package payments
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"cmp"
|
|
||||||
"context"
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
@@ -144,10 +143,12 @@ func validateProduct(in ProductInput, sellable bool) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// AdminCatalog lists every product (active and archived) with its composition, prices and whether it
|
// AdminCatalog lists products with their composition, prices and whether each has been transacted,
|
||||||
// has been transacted, for the admin editor. Read uncached, straight from the catalog tables.
|
// for the admin editor. includeInactive adds the archived products to the active ones (the console's
|
||||||
func (s *Service) AdminCatalog(ctx context.Context) ([]AdminProduct, error) {
|
// active/all toggle); with it false only active products are returned. Read uncached, straight from
|
||||||
return s.store.adminCatalog(ctx)
|
// the catalog tables.
|
||||||
|
func (s *Service) AdminCatalog(ctx context.Context, includeInactive bool) ([]AdminProduct, error) {
|
||||||
|
return s.store.adminCatalog(ctx, includeInactive)
|
||||||
}
|
}
|
||||||
|
|
||||||
// SortAdminCatalog orders an admin catalog list in place the same way the public offer lists products
|
// SortAdminCatalog orders an admin catalog list in place the same way the public offer lists products
|
||||||
@@ -157,18 +158,7 @@ func (s *Service) AdminCatalog(ctx context.Context) ([]AdminProduct, error) {
|
|||||||
// products the same as active ones (the admin list shows both).
|
// products the same as active ones (the admin list shows both).
|
||||||
func SortAdminCatalog(products []AdminProduct) {
|
func SortAdminCatalog(products []AdminProduct) {
|
||||||
slices.SortStableFunc(products, func(a, b AdminProduct) int {
|
slices.SortStableFunc(products, func(a, b AdminProduct) int {
|
||||||
if pa, pb := adminIsPack(a), adminIsPack(b); pa != pb {
|
return compareCatalogRank(adminRank(a), adminRank(b))
|
||||||
if pa {
|
|
||||||
return -1 // packs (sales) before values (chip exchange)
|
|
||||||
}
|
|
||||||
return 1
|
|
||||||
} else if pa {
|
|
||||||
return cmp.Compare(adminPriceAmount(a, string(SourceDirect), CurrencyRUB), adminPriceAmount(b, string(SourceDirect), CurrencyRUB))
|
|
||||||
}
|
|
||||||
if d := cmp.Compare(adminValueGroup(a), adminValueGroup(b)); d != 0 {
|
|
||||||
return d
|
|
||||||
}
|
|
||||||
return cmp.Compare(adminPriceAmount(a, "", CurrencyChip), adminPriceAmount(b, "", CurrencyChip))
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,61 @@
|
|||||||
|
package payments
|
||||||
|
|
||||||
|
import (
|
||||||
|
"cmp"
|
||||||
|
"slices"
|
||||||
|
)
|
||||||
|
|
||||||
|
// catalogRank is the canonical listing key for a catalog product: whether it is a chip pack, its
|
||||||
|
// value subgroup (see [valueGroup]; unused for a pack) and the minor-unit amount its section sorts by
|
||||||
|
// (a pack's direct rouble price, a value's chip price; math.MaxInt64 when absent, so a misconfigured
|
||||||
|
// row sorts last rather than leading).
|
||||||
|
type catalogRank struct {
|
||||||
|
pack bool
|
||||||
|
group int
|
||||||
|
amount int64
|
||||||
|
}
|
||||||
|
|
||||||
|
// compareCatalogRank is the single canonical product order, shared by the storefront ([projectCatalog]),
|
||||||
|
// the public offer ([projectOfferPricing]) and the admin catalog ([SortAdminCatalog]): chip packs
|
||||||
|
// first, ascending by rouble price; then chip-priced values grouped hints → no-ads → combo →
|
||||||
|
// tournament and, within a group, ascending by chip price. A pack's group is unused (all packs share
|
||||||
|
// one section). Callers use it through [entryRank] / [adminRank], which build the key from each
|
||||||
|
// product shape, so the subgroup and ordering rules live in exactly one place.
|
||||||
|
func compareCatalogRank(a, b catalogRank) int {
|
||||||
|
if a.pack != b.pack {
|
||||||
|
if a.pack {
|
||||||
|
return -1 // packs (sales) before values (chip exchange)
|
||||||
|
}
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
if !a.pack {
|
||||||
|
if d := cmp.Compare(a.group, b.group); d != 0 {
|
||||||
|
return d
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return cmp.Compare(a.amount, b.amount)
|
||||||
|
}
|
||||||
|
|
||||||
|
// entryRank builds the canonical rank of a storefront / offer catalog entry.
|
||||||
|
func entryRank(e catalogEntry) catalogRank {
|
||||||
|
if isPackEntry(e) {
|
||||||
|
return catalogRank{pack: true, amount: offerSortAmount(e, string(SourceDirect), CurrencyRUB)}
|
||||||
|
}
|
||||||
|
return catalogRank{group: offerValueGroup(e), amount: offerSortAmount(e, "", CurrencyChip)}
|
||||||
|
}
|
||||||
|
|
||||||
|
// adminRank builds the canonical rank of an admin catalog product.
|
||||||
|
func adminRank(p AdminProduct) catalogRank {
|
||||||
|
if adminIsPack(p) {
|
||||||
|
return catalogRank{pack: true, amount: adminPriceAmount(p, string(SourceDirect), CurrencyRUB)}
|
||||||
|
}
|
||||||
|
return catalogRank{group: adminValueGroup(p), amount: adminPriceAmount(p, "", CurrencyChip)}
|
||||||
|
}
|
||||||
|
|
||||||
|
// sortCatalogEntries orders storefront / offer entries in place into the canonical listing order
|
||||||
|
// ([compareCatalogRank]). Stable, so equal-keyed products keep their incoming (creation) order.
|
||||||
|
func sortCatalogEntries(entries []catalogEntry) {
|
||||||
|
slices.SortStableFunc(entries, func(a, b catalogEntry) int {
|
||||||
|
return compareCatalogRank(entryRank(a), entryRank(b))
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -135,6 +135,56 @@ func TestProjectCatalog_Empty(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestProjectCatalog_CanonicalOrder checks the storefront lists products in the shared canonical order
|
||||||
|
// (compareCatalogRank): chip packs first ascending by rouble price, then chip-priced values grouped
|
||||||
|
// hints → no-ads → combo and ascending by chip price — the same order as the offer and the admin
|
||||||
|
// console, regardless of catalog creation order.
|
||||||
|
func TestProjectCatalog_CanonicalOrder(t *testing.T) {
|
||||||
|
pack := func(title string, rub int64) catalogEntry {
|
||||||
|
return catalogEntry{
|
||||||
|
id: uuid.New(),
|
||||||
|
title: title,
|
||||||
|
atoms: []atomQty{{atomType: atomChips, quantity: 1}},
|
||||||
|
prices: []priceRow{{method: "direct", currency: CurrencyRUB, amount: rub}},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
value := func(title string, chips int64, atoms ...string) catalogEntry {
|
||||||
|
e := catalogEntry{id: uuid.New(), title: title, prices: []priceRow{{method: "", currency: CurrencyChip, amount: chips}}}
|
||||||
|
for _, a := range atoms {
|
||||||
|
e.atoms = append(e.atoms, atomQty{atomType: a, quantity: 1})
|
||||||
|
}
|
||||||
|
return e
|
||||||
|
}
|
||||||
|
// Deliberately shuffled on input; the projection must impose the canonical order.
|
||||||
|
entries := []catalogEntry{
|
||||||
|
pack("packDear", 30000),
|
||||||
|
value("bundle", 500, "hints", "noads_days"),
|
||||||
|
pack("packCheap", 10000),
|
||||||
|
value("adsOnly", 150, "noads_days"),
|
||||||
|
value("hintsBig", 200, "hints"),
|
||||||
|
value("hintsSmall", 50, "hints"),
|
||||||
|
}
|
||||||
|
got := projectCatalog(entries, Context{Kind: SourceDirect})
|
||||||
|
want := []string{"packCheap", "packDear", "hintsSmall", "hintsBig", "adsOnly", "bundle"}
|
||||||
|
if len(got.Products) != len(want) {
|
||||||
|
t.Fatalf("projected %d products, want %d", len(got.Products), len(want))
|
||||||
|
}
|
||||||
|
for i, p := range got.Products {
|
||||||
|
if p.Title != want[i] {
|
||||||
|
t.Fatalf("order[%d] = %q, want %q (full: %v)", i, p.Title, want[i], productTitles(got.Products))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// productTitles extracts the projected product titles for a failure message.
|
||||||
|
func productTitles(products []CatalogProduct) []string {
|
||||||
|
out := make([]string, len(products))
|
||||||
|
for i, p := range products {
|
||||||
|
out[i] = p.Title
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
// TestSortAdminCatalog checks the admin list is ordered like the public offer: chip packs first,
|
// TestSortAdminCatalog checks the admin list is ordered like the public offer: chip packs first,
|
||||||
// ascending by rouble price; then values, grouped (hints only -> no-ads only -> no-ads + hints) and
|
// ascending by rouble price; then values, grouped (hints only -> no-ads only -> no-ads + hints) and
|
||||||
// ascending by chip price within a group. Stable and applied to active + archived alike.
|
// ascending by chip price within a group. Stable and applied to active + archived alike.
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
package payments
|
package payments
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"cmp"
|
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"math"
|
"math"
|
||||||
@@ -60,8 +59,13 @@ func (s *Service) buildOfferPricing(ctx context.Context) (string, error) {
|
|||||||
// omitted. Amounts are rendered through [Money] so no floating point ever reaches the page (roubles
|
// omitted. Amounts are rendered through [Money] so no floating point ever reaches the page (roubles
|
||||||
// show kopecks as "200.00", whole-unit rails as integers); a missing rail price shows an em dash.
|
// show kopecks as "200.00", whole-unit rails as integers); a missing rail price shows an em dash.
|
||||||
func projectOfferPricing(entries []catalogEntry) string {
|
func projectOfferPricing(entries []catalogEntry) string {
|
||||||
|
// Order the whole catalog once by the shared canonical rank, then split it into the two offer
|
||||||
|
// tables (packs first, then the chip-exchange values); each keeps that order. Sort a copy so the
|
||||||
|
// caller's slice is left untouched.
|
||||||
|
sorted := slices.Clone(entries)
|
||||||
|
sortCatalogEntries(sorted)
|
||||||
var packs, values []catalogEntry
|
var packs, values []catalogEntry
|
||||||
for _, e := range entries {
|
for _, e := range sorted {
|
||||||
if isPackEntry(e) {
|
if isPackEntry(e) {
|
||||||
packs = append(packs, e)
|
packs = append(packs, e)
|
||||||
} else {
|
} else {
|
||||||
@@ -69,18 +73,6 @@ func projectOfferPricing(entries []catalogEntry) string {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Packs: ascending by the rouble price (the offer's base currency); a pack with no rouble price
|
|
||||||
// sorts last. Values: by group, then ascending chip price. Stable, so the catalog order breaks ties.
|
|
||||||
slices.SortStableFunc(packs, func(a, b catalogEntry) int {
|
|
||||||
return cmp.Compare(offerSortAmount(a, string(SourceDirect), CurrencyRUB), offerSortAmount(b, string(SourceDirect), CurrencyRUB))
|
|
||||||
})
|
|
||||||
slices.SortStableFunc(values, func(a, b catalogEntry) int {
|
|
||||||
if d := cmp.Compare(offerValueGroup(a), offerValueGroup(b)); d != 0 {
|
|
||||||
return d
|
|
||||||
}
|
|
||||||
return cmp.Compare(offerSortAmount(a, "", CurrencyChip), offerSortAmount(b, "", CurrencyChip))
|
|
||||||
})
|
|
||||||
|
|
||||||
var b strings.Builder
|
var b strings.Builder
|
||||||
if len(packs) > 0 {
|
if len(packs) > 0 {
|
||||||
b.WriteString("Приобретение внутриигровой валюты «Фишка»:\n\n")
|
b.WriteString("Приобретение внутриигровой валюты «Фишка»:\n\n")
|
||||||
|
|||||||
@@ -0,0 +1,63 @@
|
|||||||
|
package payments
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/google/uuid"
|
||||||
|
)
|
||||||
|
|
||||||
|
// CanPurchase reports whether an account may open a purchase order on rail, combining the account's
|
||||||
|
// per-account override with the rail's operational switch (PurchaseGate). It is the operational
|
||||||
|
// availability layer only — the caller still enforces the security gates (trusted platform, the D36
|
||||||
|
// email anchor, the VK-iOS spend freeze, the min client version). On a block, reason is localized to
|
||||||
|
// lang for the user; err is only a store failure.
|
||||||
|
func (s *Service) CanPurchase(ctx context.Context, accountID uuid.UUID, rail, lang string) (ok bool, reason string, err error) {
|
||||||
|
ov, err := s.store.purchaseOverride(ctx, accountID)
|
||||||
|
if err != nil {
|
||||||
|
return false, "", err
|
||||||
|
}
|
||||||
|
avail, err := s.store.railAvailability(ctx, rail)
|
||||||
|
if err != nil {
|
||||||
|
return false, "", err
|
||||||
|
}
|
||||||
|
ok, reason = PurchaseGate(ov, avail, lang)
|
||||||
|
return ok, reason, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// RailStatuses returns every known rail's operational status for the admin editor, filling a rail
|
||||||
|
// with no stored row with the fail-open enabled default so the editor always shows one row per rail.
|
||||||
|
func (s *Service) RailStatuses(ctx context.Context) (map[string]RailAvailability, error) {
|
||||||
|
stored, err := s.store.allRailStatus(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
out := make(map[string]RailAvailability, len(KnownRails))
|
||||||
|
for _, rail := range KnownRails {
|
||||||
|
if a, ok := stored[rail]; ok {
|
||||||
|
out[rail] = a
|
||||||
|
} else {
|
||||||
|
out[rail] = RailAvailability{Enabled: true}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetRailStatus upserts a rail's operational status from the admin editor. It rejects an unknown rail
|
||||||
|
// key so a typo cannot create a dead row.
|
||||||
|
func (s *Service) SetRailStatus(ctx context.Context, rail string, a RailAvailability) error {
|
||||||
|
if !isKnownRail(rail) {
|
||||||
|
return fmt.Errorf("payments: unknown rail %q", rail)
|
||||||
|
}
|
||||||
|
return s.store.setRailStatus(ctx, rail, a, s.clock())
|
||||||
|
}
|
||||||
|
|
||||||
|
// PurchaseOverrideFor returns an account's purchase override (OverrideDefault when none is set).
|
||||||
|
func (s *Service) PurchaseOverrideFor(ctx context.Context, accountID uuid.UUID) (PurchaseOverride, error) {
|
||||||
|
return s.store.purchaseOverride(ctx, accountID)
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetPurchaseOverride sets or clears an account's purchase override (OverrideDefault deletes the row).
|
||||||
|
func (s *Service) SetPurchaseOverride(ctx context.Context, accountID uuid.UUID, ov PurchaseOverride) error {
|
||||||
|
return s.store.setPurchaseOverride(ctx, accountID, ov, s.clock())
|
||||||
|
}
|
||||||
@@ -46,6 +46,7 @@ func (s *Service) CreateOrder(ctx context.Context, accountID uuid.UUID, cxt Cont
|
|||||||
amount: pack.price,
|
amount: pack.price,
|
||||||
origin: method,
|
origin: method,
|
||||||
provider: provider,
|
provider: provider,
|
||||||
|
shop: directShop(cxt),
|
||||||
}
|
}
|
||||||
if err := s.store.createOrder(ctx, o, s.clock()); err != nil {
|
if err := s.store.createOrder(ctx, o, s.clock()); err != nil {
|
||||||
return OrderResult{}, err
|
return OrderResult{}, err
|
||||||
@@ -53,6 +54,16 @@ func (s *Service) CreateOrder(ctx context.Context, accountID uuid.UUID, cxt Cont
|
|||||||
return OrderResult{OrderID: orderID, Amount: pack.price, Title: pack.title}, nil
|
return OrderResult{OrderID: orderID, Amount: pack.price, Title: pack.title}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// directShop returns the merchant shop (channel) a direct order is issued through — the trusted
|
||||||
|
// platform subtype for the direct rail ("web"/"android"), or "" for any other rail (the per-shop
|
||||||
|
// split is direct-only; D42/D44). Recorded on the order for the admin per-channel breakdown.
|
||||||
|
func directShop(cxt Context) string {
|
||||||
|
if cxt.Kind == SourceDirect {
|
||||||
|
return cxt.Subtype
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
// OrderItem returns a pending order's human title and the amount it charges, in the order's own
|
// OrderItem returns a pending order's human title and the amount it charges, in the order's own
|
||||||
// currency — the details a provider's item-lookup phase needs (VK's get_item). It reads the order
|
// currency — the details a provider's item-lookup phase needs (VK's get_item). It reads the order
|
||||||
// and the pack title, honouring the pack even if it was later deactivated (mirrors Fund).
|
// and the pack title, honouring the pack even if it was later deactivated (mirrors Fund).
|
||||||
@@ -157,6 +168,22 @@ func (s *Service) RewardPayout(ctx context.Context, cxt Context, present []Sourc
|
|||||||
return payout, err
|
return payout, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// RewardConfig reads the rewarded-video config for the admin editor: the payout (chips per view) and
|
||||||
|
// the per-day and per-hour caps.
|
||||||
|
func (s *Service) RewardConfig(ctx context.Context) (payout, dailyCap, hourlyCap int, err error) {
|
||||||
|
return s.store.rewardConfig(ctx)
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetRewardConfig updates the rewarded-video config (the payout and the two caps). All three must be
|
||||||
|
// non-negative; a 0 payout leaves rewarded inert. It is not a catalog product, so it does not mark the
|
||||||
|
// offer stale.
|
||||||
|
func (s *Service) SetRewardConfig(ctx context.Context, payout, dailyCap, hourlyCap int) error {
|
||||||
|
if payout < 0 || dailyCap < 0 || hourlyCap < 0 {
|
||||||
|
return errors.New("payments: reward payout and caps must be non-negative")
|
||||||
|
}
|
||||||
|
return s.store.setRewardConfig(ctx, payout, dailyCap, hourlyCap)
|
||||||
|
}
|
||||||
|
|
||||||
// CreditReward credits a rewarded-video view's chips to the VK segment, client-attested (VK Mini App
|
// CreditReward credits a rewarded-video view's chips to the VK segment, client-attested (VK Mini App
|
||||||
// ads expose no server verify — the client's watch result is trusted for an honest user; a forger who
|
// ads expose no server verify — the client's watch result is trusted for an honest user; a forger who
|
||||||
// skips the ad and calls the endpoint is bounded by the config daily cap). It is idempotent on the
|
// skips the ad and calls the endpoint is bounded by the config daily cap). It is idempotent on the
|
||||||
|
|||||||
@@ -42,7 +42,8 @@ type RiskInfo struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// LedgerEntry is one append-only ledger row projected for the report. The string ids are empty when
|
// LedgerEntry is one append-only ledger row projected for the report. The string ids are empty when
|
||||||
// the column is NULL; Snapshot is the raw purchase/refund JSON (empty when none).
|
// the column is NULL; Shop is the direct-rail merchant channel the referenced order used (empty for
|
||||||
|
// other rails or order-less rows); Snapshot is the raw purchase/refund JSON (empty when none).
|
||||||
type LedgerEntry struct {
|
type LedgerEntry struct {
|
||||||
Kind string
|
Kind string
|
||||||
Source string
|
Source string
|
||||||
@@ -52,6 +53,7 @@ type LedgerEntry struct {
|
|||||||
OrderID string
|
OrderID string
|
||||||
Provider string
|
Provider string
|
||||||
ProviderPaymentID string
|
ProviderPaymentID string
|
||||||
|
Shop string
|
||||||
Snapshot string
|
Snapshot string
|
||||||
CreatedAt time.Time
|
CreatedAt time.Time
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,96 @@
|
|||||||
|
package payments
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"database/sql"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/google/uuid"
|
||||||
|
)
|
||||||
|
|
||||||
|
// railAvailability reads a rail's operational availability. A missing row is fail-open: enabled with
|
||||||
|
// no message, so payments stay on unless an operator explicitly disabled the rail.
|
||||||
|
func (s *Store) railAvailability(ctx context.Context, rail string) (RailAvailability, error) {
|
||||||
|
var a RailAvailability
|
||||||
|
err := s.db.QueryRowContext(ctx,
|
||||||
|
`SELECT enabled, message_ru, message_en FROM payments.rail_status WHERE rail = $1`, rail).
|
||||||
|
Scan(&a.Enabled, &a.MessageRU, &a.MessageEN)
|
||||||
|
if errors.Is(err, sql.ErrNoRows) {
|
||||||
|
return RailAvailability{Enabled: true}, nil
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return RailAvailability{}, fmt.Errorf("payments: read rail status %q: %w", rail, err)
|
||||||
|
}
|
||||||
|
return a, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// allRailStatus reads every stored rail-status row for the admin editor, keyed by rail. Rails with
|
||||||
|
// no row are absent (the caller fills them with the fail-open enabled default).
|
||||||
|
func (s *Store) allRailStatus(ctx context.Context) (map[string]RailAvailability, error) {
|
||||||
|
rows, err := s.db.QueryContext(ctx,
|
||||||
|
`SELECT rail, enabled, message_ru, message_en FROM payments.rail_status`)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("payments: read rail statuses: %w", err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
out := make(map[string]RailAvailability)
|
||||||
|
for rows.Next() {
|
||||||
|
var rail string
|
||||||
|
var a RailAvailability
|
||||||
|
if err := rows.Scan(&rail, &a.Enabled, &a.MessageRU, &a.MessageEN); err != nil {
|
||||||
|
return nil, fmt.Errorf("payments: scan rail status: %w", err)
|
||||||
|
}
|
||||||
|
out[rail] = a
|
||||||
|
}
|
||||||
|
return out, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
// setRailStatus upserts a rail's operational status (admin).
|
||||||
|
func (s *Store) setRailStatus(ctx context.Context, rail string, a RailAvailability, now time.Time) error {
|
||||||
|
if _, err := s.db.ExecContext(ctx,
|
||||||
|
`INSERT INTO payments.rail_status (rail, enabled, message_ru, message_en, updated_at)
|
||||||
|
VALUES ($1, $2, $3, $4, $5)
|
||||||
|
ON CONFLICT (rail) DO UPDATE SET enabled = $2, message_ru = $3, message_en = $4, updated_at = $5`,
|
||||||
|
rail, a.Enabled, a.MessageRU, a.MessageEN, now); err != nil {
|
||||||
|
return fmt.Errorf("payments: set rail status %q: %w", rail, err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// purchaseOverride reads an account's purchase override; a missing row is OverrideDefault.
|
||||||
|
func (s *Store) purchaseOverride(ctx context.Context, accountID uuid.UUID) (PurchaseOverride, error) {
|
||||||
|
var allow bool
|
||||||
|
err := s.db.QueryRowContext(ctx,
|
||||||
|
`SELECT allow FROM payments.account_payment_override WHERE account_id = $1`, accountID).Scan(&allow)
|
||||||
|
if errors.Is(err, sql.ErrNoRows) {
|
||||||
|
return OverrideDefault, nil
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return OverrideDefault, fmt.Errorf("payments: read purchase override %s: %w", accountID, err)
|
||||||
|
}
|
||||||
|
if allow {
|
||||||
|
return OverrideAllow, nil
|
||||||
|
}
|
||||||
|
return OverrideDeny, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// setPurchaseOverride upserts an account's override, or deletes the row for OverrideDefault (the
|
||||||
|
// default state is the absence of a row).
|
||||||
|
func (s *Store) setPurchaseOverride(ctx context.Context, accountID uuid.UUID, ov PurchaseOverride, now time.Time) error {
|
||||||
|
if ov == OverrideDefault {
|
||||||
|
if _, err := s.db.ExecContext(ctx,
|
||||||
|
`DELETE FROM payments.account_payment_override WHERE account_id = $1`, accountID); err != nil {
|
||||||
|
return fmt.Errorf("payments: clear purchase override %s: %w", accountID, err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if _, err := s.db.ExecContext(ctx,
|
||||||
|
`INSERT INTO payments.account_payment_override (account_id, allow, updated_at) VALUES ($1, $2, $3)
|
||||||
|
ON CONFLICT (account_id) DO UPDATE SET allow = $2, updated_at = $3`,
|
||||||
|
accountID, ov == OverrideAllow, now); err != nil {
|
||||||
|
return fmt.Errorf("payments: set purchase override %s: %w", accountID, err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
@@ -19,11 +19,17 @@ import (
|
|||||||
// row references — it must be archived instead, to keep the append-only ledger resolvable.
|
// row references — it must be archived instead, to keep the append-only ledger resolvable.
|
||||||
var ErrProductTransacted = errors.New("payments: product has transactions; archive instead of delete")
|
var ErrProductTransacted = errors.New("payments: product has transactions; archive instead of delete")
|
||||||
|
|
||||||
// adminCatalog lists every product (active and archived) with its atoms, prices and transacted flag.
|
// adminCatalog lists products with their atoms, prices and transacted flag. includeInactive adds the
|
||||||
func (s *Store) adminCatalog(ctx context.Context) ([]AdminProduct, error) {
|
// archived products to the active ones; with it false only active products are returned.
|
||||||
|
func (s *Store) adminCatalog(ctx context.Context, includeInactive bool) ([]AdminProduct, error) {
|
||||||
|
where := table.Product.Active.IS_TRUE()
|
||||||
|
if includeInactive {
|
||||||
|
where = postgres.Bool(true)
|
||||||
|
}
|
||||||
var prods []model.Product
|
var prods []model.Product
|
||||||
if err := postgres.SELECT(table.Product.AllColumns).
|
if err := postgres.SELECT(table.Product.AllColumns).
|
||||||
FROM(table.Product).
|
FROM(table.Product).
|
||||||
|
WHERE(where).
|
||||||
ORDER_BY(table.Product.CreatedAt.ASC()).
|
ORDER_BY(table.Product.CreatedAt.ASC()).
|
||||||
QueryContext(ctx, s.db, &prods); err != nil {
|
QueryContext(ctx, s.db, &prods); err != nil {
|
||||||
return nil, fmt.Errorf("payments: admin list products: %w", err)
|
return nil, fmt.Errorf("payments: admin list products: %w", err)
|
||||||
|
|||||||
@@ -151,6 +151,7 @@ type newOrder struct {
|
|||||||
amount Money
|
amount Money
|
||||||
origin Source
|
origin Source
|
||||||
provider string
|
provider string
|
||||||
|
shop string
|
||||||
}
|
}
|
||||||
|
|
||||||
// createOrder inserts a pending order.
|
// createOrder inserts a pending order.
|
||||||
@@ -159,12 +160,12 @@ func (s *Store) createOrder(ctx context.Context, o newOrder, now time.Time) erro
|
|||||||
table.Orders.OrderID, table.Orders.AccountID, table.Orders.Platform,
|
table.Orders.OrderID, table.Orders.AccountID, table.Orders.Platform,
|
||||||
table.Orders.ProductID, table.Orders.ExpectedAmount, table.Orders.Currency,
|
table.Orders.ProductID, table.Orders.ExpectedAmount, table.Orders.Currency,
|
||||||
table.Orders.Origin, table.Orders.Status, table.Orders.Provider,
|
table.Orders.Origin, table.Orders.Status, table.Orders.Provider,
|
||||||
table.Orders.CreatedAt, table.Orders.UpdatedAt,
|
table.Orders.CreatedAt, table.Orders.UpdatedAt, table.Orders.Shop,
|
||||||
).VALUES(
|
).VALUES(
|
||||||
o.orderID, o.accountID, o.platform,
|
o.orderID, o.accountID, o.platform,
|
||||||
o.productID, o.amount.Minor(), string(o.amount.Currency()),
|
o.productID, o.amount.Minor(), string(o.amount.Currency()),
|
||||||
string(o.origin), "pending", o.provider,
|
string(o.origin), "pending", o.provider,
|
||||||
now, now,
|
now, now, o.shop,
|
||||||
)
|
)
|
||||||
if _, err := stmt.ExecContext(ctx, s.db); err != nil {
|
if _, err := stmt.ExecContext(ctx, s.db); err != nil {
|
||||||
return fmt.Errorf("payments: create order: %w", err)
|
return fmt.Errorf("payments: create order: %w", err)
|
||||||
@@ -413,6 +414,18 @@ func (s *Store) rewardConfig(ctx context.Context) (payout, dailyCap, hourlyCap i
|
|||||||
return int(cfg.RewardedPayoutChips), int(cfg.RewardDailyCap), int(cfg.RewardHourlyCap), nil
|
return int(cfg.RewardedPayoutChips), int(cfg.RewardDailyCap), int(cfg.RewardHourlyCap), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// setRewardConfig updates the rewarded payout and the per-day and per-hour caps on the singleton
|
||||||
|
// config row (no WHERE — the table holds exactly one row). Non-negativity is validated by the caller
|
||||||
|
// and also enforced by the config CHECK constraints.
|
||||||
|
func (s *Store) setRewardConfig(ctx context.Context, payout, dailyCap, hourlyCap int) error {
|
||||||
|
if _, err := s.db.ExecContext(ctx,
|
||||||
|
`UPDATE payments.config SET rewarded_payout_chips=$1, reward_daily_cap=$2, reward_hourly_cap=$3`,
|
||||||
|
payout, dailyCap, hourlyCap); err != nil {
|
||||||
|
return fmt.Errorf("payments: set reward config: %w", err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// creditReward credits a rewarded-video view's chips to the funded segment, client-attested (VK Mini
|
// creditReward credits a rewarded-video view's chips to the funded segment, client-attested (VK Mini
|
||||||
// App ads expose no server verify). It reads the payout and daily cap from config: a 0 payout
|
// App ads expose no server verify). It reads the payout and daily cap from config: a 0 payout
|
||||||
// (unconfigured) or a reached cap credits nothing. It is idempotent on the client nonce (dedup on the
|
// (unconfigured) or a reached cap credits nothing. It is idempotent on the client nonce (dedup on the
|
||||||
|
|||||||
@@ -74,9 +74,39 @@ func (s *Store) accountStatement(ctx context.Context, accountID uuid.UUID) (Stat
|
|||||||
CreatedAt: r.CreatedAt,
|
CreatedAt: r.CreatedAt,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Annotate direct-rail entries with the merchant shop (channel) their order was issued through
|
||||||
|
// (E10/D44), keyed by the ledger's order id. Non-direct / order-less entries stay "".
|
||||||
|
shops, err := s.orderShops(ctx, accountID)
|
||||||
|
if err != nil {
|
||||||
|
return Statement{}, err
|
||||||
|
}
|
||||||
|
for i := range out.Ledger {
|
||||||
|
out.Ledger[i].Shop = shops[out.Ledger[i].OrderID]
|
||||||
|
}
|
||||||
return out, nil
|
return out, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// orderShops maps an account's order ids (as strings) to the merchant shop (channel) each direct
|
||||||
|
// order was issued through, for annotating the ledger report (E10/D44). Orders with an empty shop
|
||||||
|
// (non-direct or pre-split) are omitted, so a lookup miss yields "".
|
||||||
|
func (s *Store) orderShops(ctx context.Context, accountID uuid.UUID) (map[string]string, error) {
|
||||||
|
var rows []model.Orders
|
||||||
|
if err := postgres.SELECT(table.Orders.OrderID, table.Orders.Shop).
|
||||||
|
FROM(table.Orders).
|
||||||
|
WHERE(table.Orders.AccountID.EQ(postgres.UUID(accountID))).
|
||||||
|
QueryContext(ctx, s.db, &rows); err != nil {
|
||||||
|
return nil, fmt.Errorf("payments: load order shops %s: %w", accountID, err)
|
||||||
|
}
|
||||||
|
m := make(map[string]string, len(rows))
|
||||||
|
for _, r := range rows {
|
||||||
|
if r.Shop != "" {
|
||||||
|
m[r.OrderID.String()] = r.Shop
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return m, nil
|
||||||
|
}
|
||||||
|
|
||||||
// allLedger reads the entire append-only ledger (all accounts, newest first) for the admin export.
|
// allLedger reads the entire append-only ledger (all accounts, newest first) for the admin export.
|
||||||
func (s *Store) allLedger(ctx context.Context) ([]LedgerExportRow, error) {
|
func (s *Store) allLedger(ctx context.Context) ([]LedgerExportRow, error) {
|
||||||
var rows []model.Ledger
|
var rows []model.Ledger
|
||||||
|
|||||||
@@ -25,4 +25,5 @@ type Orders struct {
|
|||||||
ProviderPaymentID *string
|
ProviderPaymentID *string
|
||||||
CreatedAt time.Time
|
CreatedAt time.Time
|
||||||
UpdatedAt time.Time
|
UpdatedAt time.Time
|
||||||
|
Shop string
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ type ordersTable struct {
|
|||||||
ProviderPaymentID postgres.ColumnString
|
ProviderPaymentID postgres.ColumnString
|
||||||
CreatedAt postgres.ColumnTimestampz
|
CreatedAt postgres.ColumnTimestampz
|
||||||
UpdatedAt postgres.ColumnTimestampz
|
UpdatedAt postgres.ColumnTimestampz
|
||||||
|
Shop postgres.ColumnString
|
||||||
|
|
||||||
AllColumns postgres.ColumnList
|
AllColumns postgres.ColumnList
|
||||||
MutableColumns postgres.ColumnList
|
MutableColumns postgres.ColumnList
|
||||||
@@ -82,9 +83,10 @@ func newOrdersTableImpl(schemaName, tableName, alias string) ordersTable {
|
|||||||
ProviderPaymentIDColumn = postgres.StringColumn("provider_payment_id")
|
ProviderPaymentIDColumn = postgres.StringColumn("provider_payment_id")
|
||||||
CreatedAtColumn = postgres.TimestampzColumn("created_at")
|
CreatedAtColumn = postgres.TimestampzColumn("created_at")
|
||||||
UpdatedAtColumn = postgres.TimestampzColumn("updated_at")
|
UpdatedAtColumn = postgres.TimestampzColumn("updated_at")
|
||||||
allColumns = postgres.ColumnList{OrderIDColumn, AccountIDColumn, PlatformColumn, ProductIDColumn, ExpectedAmountColumn, CurrencyColumn, OriginColumn, StatusColumn, ProviderColumn, ProviderPaymentIDColumn, CreatedAtColumn, UpdatedAtColumn}
|
ShopColumn = postgres.StringColumn("shop")
|
||||||
mutableColumns = postgres.ColumnList{AccountIDColumn, PlatformColumn, ProductIDColumn, ExpectedAmountColumn, CurrencyColumn, OriginColumn, StatusColumn, ProviderColumn, ProviderPaymentIDColumn, CreatedAtColumn, UpdatedAtColumn}
|
allColumns = postgres.ColumnList{OrderIDColumn, AccountIDColumn, PlatformColumn, ProductIDColumn, ExpectedAmountColumn, CurrencyColumn, OriginColumn, StatusColumn, ProviderColumn, ProviderPaymentIDColumn, CreatedAtColumn, UpdatedAtColumn, ShopColumn}
|
||||||
defaultColumns = postgres.ColumnList{StatusColumn, CreatedAtColumn, UpdatedAtColumn}
|
mutableColumns = postgres.ColumnList{AccountIDColumn, PlatformColumn, ProductIDColumn, ExpectedAmountColumn, CurrencyColumn, OriginColumn, StatusColumn, ProviderColumn, ProviderPaymentIDColumn, CreatedAtColumn, UpdatedAtColumn, ShopColumn}
|
||||||
|
defaultColumns = postgres.ColumnList{StatusColumn, CreatedAtColumn, UpdatedAtColumn, ShopColumn}
|
||||||
)
|
)
|
||||||
|
|
||||||
return ordersTable{
|
return ordersTable{
|
||||||
@@ -103,6 +105,7 @@ func newOrdersTableImpl(schemaName, tableName, alias string) ordersTable {
|
|||||||
ProviderPaymentID: ProviderPaymentIDColumn,
|
ProviderPaymentID: ProviderPaymentIDColumn,
|
||||||
CreatedAt: CreatedAtColumn,
|
CreatedAt: CreatedAtColumn,
|
||||||
UpdatedAt: UpdatedAtColumn,
|
UpdatedAt: UpdatedAtColumn,
|
||||||
|
Shop: ShopColumn,
|
||||||
|
|
||||||
AllColumns: allColumns,
|
AllColumns: allColumns,
|
||||||
MutableColumns: mutableColumns,
|
MutableColumns: mutableColumns,
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
-- Multi-shop direct rail (E10/D44): record which Robokassa merchant shop (channel) issued a direct
|
||||||
|
-- order — "web" / "android" (ios later) — so the admin financial report can break direct payments
|
||||||
|
-- down by channel. Only the direct rail is per-channel; other rails leave it "". Additive only (a
|
||||||
|
-- defaulted column), applies forward via goose with no data rewrite (no contour wipe); an image
|
||||||
|
-- rollback ignores the column.
|
||||||
|
-- +goose Up
|
||||||
|
|
||||||
|
ALTER TABLE payments.orders
|
||||||
|
ADD COLUMN shop text NOT NULL DEFAULT '';
|
||||||
|
|
||||||
|
-- +goose Down
|
||||||
|
|
||||||
|
ALTER TABLE payments.orders DROP COLUMN shop;
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
-- Payment availability controls (D45/D46): a per-rail operational kill switch with a localized message,
|
||||||
|
-- and a per-account purchase override. Both let an operator disable payments live from the admin —
|
||||||
|
-- a whole rail/channel, or one account — and explain why to the user on a purchase attempt. Additive
|
||||||
|
-- (new tables) — applies forward via goose with no data rewrite (no contour wipe); an image rollback
|
||||||
|
-- ignores both tables. Fail-open by design: a rail with no row is enabled; an account with no row
|
||||||
|
-- follows the rail switch.
|
||||||
|
-- +goose Up
|
||||||
|
|
||||||
|
CREATE TABLE payments.rail_status (
|
||||||
|
rail text PRIMARY KEY,
|
||||||
|
enabled boolean NOT NULL DEFAULT true,
|
||||||
|
message_ru text NOT NULL DEFAULT '',
|
||||||
|
message_en text NOT NULL DEFAULT '',
|
||||||
|
updated_at timestamptz NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE payments.account_payment_override (
|
||||||
|
account_id uuid PRIMARY KEY,
|
||||||
|
allow boolean NOT NULL,
|
||||||
|
updated_at timestamptz NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
|
||||||
|
-- +goose Down
|
||||||
|
|
||||||
|
DROP TABLE payments.account_payment_override;
|
||||||
|
DROP TABLE payments.rail_status;
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
package robokassa
|
||||||
|
|
||||||
|
// Shops is a set of Robokassa merchant shops keyed by channel — the subtype of the trusted
|
||||||
|
// X-Platform signal for the direct rail ("web", "android"; "ios" later). The direct rail routes a
|
||||||
|
// payment to the per-channel shop for separate merchant accounts, accounting and receipts, while
|
||||||
|
// every shop still credits the one direct wallet (docs/PAYMENTS_DECISIONS_ru.md D42). An empty set
|
||||||
|
// leaves the direct order and Result-callback endpoints unregistered.
|
||||||
|
type Shops map[string]Config
|
||||||
|
|
||||||
|
// Channel constants name the direct-rail X-Platform subtypes a shop is keyed by. ChannelWeb is the
|
||||||
|
// default: an unknown or empty channel routes here on the order side, and the legacy single-shop
|
||||||
|
// configuration seeds it.
|
||||||
|
const (
|
||||||
|
ChannelWeb = "web"
|
||||||
|
ChannelAndroid = "android"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Shop returns the shop that issues an order for channel, falling back to the web shop when channel
|
||||||
|
// is unknown, empty or not configured. The fallback is safe: routing only chooses the merchant
|
||||||
|
// account and receipt, never the credited wallet (always direct, D42), so a mis-attributed channel
|
||||||
|
// costs at most accounting accuracy, not money. The second result is false when neither the channel
|
||||||
|
// nor the web shop has a merchant login (the rail is unconfigured).
|
||||||
|
func (s Shops) Shop(channel string) (Config, bool) {
|
||||||
|
if channel != "" {
|
||||||
|
if c, ok := s[channel]; ok && c.MerchantLogin != "" {
|
||||||
|
return c, true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if c, ok := s[ChannelWeb]; ok && c.MerchantLogin != "" {
|
||||||
|
return c, true
|
||||||
|
}
|
||||||
|
return Config{}, false
|
||||||
|
}
|
||||||
|
|
||||||
|
// Verifier returns the shop whose Password2 verifies a Result callback delivered to channel's
|
||||||
|
// dedicated Result route. Unlike Shop it does not fall back to web: each shop's callback is verified
|
||||||
|
// only by that shop's own credentials, so a route with no configured shop reports false (and its
|
||||||
|
// handler answers as unregistered). The second result is false when channel has no merchant login.
|
||||||
|
func (s Shops) Verifier(channel string) (Config, bool) {
|
||||||
|
if c, ok := s[channel]; ok && c.MerchantLogin != "" {
|
||||||
|
return c, true
|
||||||
|
}
|
||||||
|
return Config{}, false
|
||||||
|
}
|
||||||
|
|
||||||
|
// Configured reports whether at least one shop has a merchant login (the direct rail is live).
|
||||||
|
func (s Shops) Configured() bool {
|
||||||
|
for _, c := range s {
|
||||||
|
if c.MerchantLogin != "" {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
@@ -0,0 +1,52 @@
|
|||||||
|
package robokassa
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
func TestShopsShopRouting(t *testing.T) {
|
||||||
|
shops := Shops{
|
||||||
|
ChannelWeb: {MerchantLogin: "webshop", Password1: "w1", Password2: "w2"},
|
||||||
|
ChannelAndroid: {MerchantLogin: "androidshop", Password1: "a1", Password2: "a2"},
|
||||||
|
}
|
||||||
|
// Order side: the exact channel wins.
|
||||||
|
if c, ok := shops.Shop(ChannelAndroid); !ok || c.MerchantLogin != "androidshop" {
|
||||||
|
t.Errorf("Shop(android) = %q/%v, want androidshop/true", c.MerchantLogin, ok)
|
||||||
|
}
|
||||||
|
// Order side: an unknown or empty channel falls back to the web shop (safe — always credits direct).
|
||||||
|
if c, ok := shops.Shop("ios"); !ok || c.MerchantLogin != "webshop" {
|
||||||
|
t.Errorf("Shop(ios) = %q/%v, want webshop/true (web fallback)", c.MerchantLogin, ok)
|
||||||
|
}
|
||||||
|
if c, ok := shops.Shop(""); !ok || c.MerchantLogin != "webshop" {
|
||||||
|
t.Errorf("Shop(empty) = %q/%v, want webshop/true (web fallback)", c.MerchantLogin, ok)
|
||||||
|
}
|
||||||
|
// No web shop and an unknown channel → unconfigured.
|
||||||
|
if _, ok := (Shops{ChannelAndroid: {MerchantLogin: "androidshop", Password1: "a1", Password2: "a2"}}).Shop("ios"); ok {
|
||||||
|
t.Error("Shop(ios) with no web shop returned ok, want false")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestShopsVerifierIsStrict(t *testing.T) {
|
||||||
|
shops := Shops{
|
||||||
|
ChannelWeb: {MerchantLogin: "webshop", Password1: "w1", Password2: "w2"},
|
||||||
|
ChannelAndroid: {MerchantLogin: "androidshop", Password1: "a1", Password2: "a2"},
|
||||||
|
}
|
||||||
|
// Callback side: the exact channel's own credentials, no web fallback (each callback is verified
|
||||||
|
// only by its own shop's Password2).
|
||||||
|
if c, ok := shops.Verifier(ChannelAndroid); !ok || c.MerchantLogin != "androidshop" {
|
||||||
|
t.Errorf("Verifier(android) = %q/%v, want androidshop/true", c.MerchantLogin, ok)
|
||||||
|
}
|
||||||
|
if _, ok := shops.Verifier("ios"); ok {
|
||||||
|
t.Error("Verifier(ios) returned ok, want false (no fallback)")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestShopsConfigured(t *testing.T) {
|
||||||
|
if (Shops{}).Configured() {
|
||||||
|
t.Error("an empty set reported configured")
|
||||||
|
}
|
||||||
|
if (Shops{ChannelWeb: {}}).Configured() {
|
||||||
|
t.Error("a shop with no merchant login reported configured")
|
||||||
|
}
|
||||||
|
if !(Shops{ChannelWeb: {MerchantLogin: "s", Password1: "1", Password2: "2"}}).Configured() {
|
||||||
|
t.Error("a configured shop reported not configured")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -89,7 +89,7 @@ func (s *Server) registerRoutes() {
|
|||||||
// payment over the reverse bot-link; the gateway proxies both onto these gateway-only routes.
|
// payment over the reverse bot-link; the gateway proxies both onto these gateway-only routes.
|
||||||
s.internal.POST("/payments/telegram/precheckout", s.handleTelegramPreCheckout)
|
s.internal.POST("/payments/telegram/precheckout", s.handleTelegramPreCheckout)
|
||||||
s.internal.POST("/payments/telegram/payment", s.handleTelegramPayment)
|
s.internal.POST("/payments/telegram/payment", s.handleTelegramPayment)
|
||||||
if s.robokassa.MerchantLogin != "" {
|
if s.robokassa.Configured() {
|
||||||
s.internal.POST("/payments/robokassa/result", s.handleRobokassaResult)
|
s.internal.POST("/payments/robokassa/result", s.handleRobokassaResult)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,10 +33,12 @@ var priceFields = []struct {
|
|||||||
{"price_chip", "", payments.CurrencyChip},
|
{"price_chip", "", payments.CurrencyChip},
|
||||||
}
|
}
|
||||||
|
|
||||||
// consoleCatalog lists every product (active and archived) with its composition, prices, transacted
|
// consoleCatalog lists the catalog products with their composition, prices, transacted flag, and the
|
||||||
// flag, and the inline create form.
|
// inline create form. It shows active products by default; ?all=1 also lists the archived ones (the
|
||||||
|
// active/all toggle).
|
||||||
func (s *Server) consoleCatalog(c *gin.Context) {
|
func (s *Server) consoleCatalog(c *gin.Context) {
|
||||||
products, err := s.payments.AdminCatalog(c.Request.Context())
|
showAll := c.Query("all") == "1"
|
||||||
|
products, err := s.payments.AdminCatalog(c.Request.Context(), showAll)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
s.consoleError(c, err)
|
s.consoleError(c, err)
|
||||||
return
|
return
|
||||||
@@ -44,13 +46,58 @@ func (s *Server) consoleCatalog(c *gin.Context) {
|
|||||||
// Order the list like the public offer: sales (chip packs) first, then the chip-exchange values,
|
// Order the list like the public offer: sales (chip packs) first, then the chip-exchange values,
|
||||||
// grouped and price-sorted the same way, so the console mirrors what a buyer sees.
|
// grouped and price-sorted the same way, so the console mirrors what a buyer sees.
|
||||||
payments.SortAdminCatalog(products)
|
payments.SortAdminCatalog(products)
|
||||||
var view adminconsole.CatalogView
|
payout, daily, hourly, err := s.payments.RewardConfig(c.Request.Context())
|
||||||
|
if err != nil {
|
||||||
|
s.consoleError(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
rails, err := s.payments.RailStatuses(c.Request.Context())
|
||||||
|
if err != nil {
|
||||||
|
s.consoleError(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
view := adminconsole.CatalogView{ShowAll: showAll, RewardPayout: payout, RewardDailyCap: daily, RewardHourlyCap: hourly}
|
||||||
|
for _, rail := range payments.KnownRails {
|
||||||
|
a := rails[rail]
|
||||||
|
view.Rails = append(view.Rails, adminconsole.RailStatusRow{Rail: rail, Enabled: a.Enabled, MessageRU: a.MessageRU, MessageEN: a.MessageEN})
|
||||||
|
}
|
||||||
for _, p := range products {
|
for _, p := range products {
|
||||||
view.Products = append(view.Products, catalogRow(p))
|
view.Products = append(view.Products, catalogRow(p))
|
||||||
}
|
}
|
||||||
s.renderConsole(c, "catalog", "catalog", "Catalog", view)
|
s.renderConsole(c, "catalog", "catalog", "Catalog", view)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// consoleSetReward updates the rewarded-video config (chips per view plus the per-day and per-hour
|
||||||
|
// caps) from the catalog page's rewarded-ads form. A blank field reads as 0; a negative value is
|
||||||
|
// refused by the service.
|
||||||
|
func (s *Server) consoleSetReward(c *gin.Context) {
|
||||||
|
payout, _ := strconv.Atoi(strings.TrimSpace(c.PostForm("reward_payout")))
|
||||||
|
daily, _ := strconv.Atoi(strings.TrimSpace(c.PostForm("reward_daily")))
|
||||||
|
hourly, _ := strconv.Atoi(strings.TrimSpace(c.PostForm("reward_hourly")))
|
||||||
|
if err := s.payments.SetRewardConfig(c.Request.Context(), payout, daily, hourly); err != nil {
|
||||||
|
s.renderConsoleMessage(c, "Update failed", err.Error(), catalogBack)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
s.renderConsoleMessage(c, "Saved", "the rewarded-ads config was updated", catalogBack)
|
||||||
|
}
|
||||||
|
|
||||||
|
// consoleSetRailStatus toggles a payment rail's operational kill switch and its user-facing
|
||||||
|
// off-message (per language) from the catalog page's payment-availability form. An unchecked box
|
||||||
|
// disables the rail; an unknown rail is refused by the service.
|
||||||
|
func (s *Server) consoleSetRailStatus(c *gin.Context) {
|
||||||
|
rail := strings.TrimSpace(c.PostForm("rail"))
|
||||||
|
a := payments.RailAvailability{
|
||||||
|
Enabled: c.PostForm("enabled") == "on",
|
||||||
|
MessageRU: strings.TrimSpace(c.PostForm("message_ru")),
|
||||||
|
MessageEN: strings.TrimSpace(c.PostForm("message_en")),
|
||||||
|
}
|
||||||
|
if err := s.payments.SetRailStatus(c.Request.Context(), rail, a); err != nil {
|
||||||
|
s.renderConsoleMessage(c, "Update failed", err.Error(), catalogBack)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
s.renderConsoleMessage(c, "Saved", "payment availability was updated", catalogBack)
|
||||||
|
}
|
||||||
|
|
||||||
// catalogRow projects a product into its list row.
|
// catalogRow projects a product into its list row.
|
||||||
func catalogRow(p payments.AdminProduct) adminconsole.ProductRow {
|
func catalogRow(p payments.AdminProduct) adminconsole.ProductRow {
|
||||||
row := adminconsole.ProductRow{ID: p.ID.String(), Title: p.Title, Active: p.Active, Transacted: p.Transacted}
|
row := adminconsole.ProductRow{ID: p.ID.String(), Title: p.Title, Active: p.Active, Transacted: p.Transacted}
|
||||||
@@ -69,7 +116,7 @@ func (s *Server) consoleCatalogDetail(c *gin.Context) {
|
|||||||
if !ok {
|
if !ok {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
products, err := s.payments.AdminCatalog(c.Request.Context())
|
products, err := s.payments.AdminCatalog(c.Request.Context(), true) // include archived: the detail form edits any product
|
||||||
if err != nil {
|
if err != nil {
|
||||||
s.consoleError(c, err)
|
s.consoleError(c, err)
|
||||||
return
|
return
|
||||||
@@ -242,7 +289,7 @@ func (s *Server) consoleGrantProduct(c *gin.Context) {
|
|||||||
// bundles, including archived ones — chips and tournament products are excluded).
|
// bundles, including archived ones — chips and tournament products are excluded).
|
||||||
func (s *Server) grantForm(ctx context.Context) adminconsole.GrantFormView {
|
func (s *Server) grantForm(ctx context.Context) adminconsole.GrantFormView {
|
||||||
fv := adminconsole.GrantFormView{Present: true, Origins: []string{"direct", "vk", "telegram"}}
|
fv := adminconsole.GrantFormView{Present: true, Origins: []string{"direct", "vk", "telegram"}}
|
||||||
products, err := s.payments.AdminCatalog(ctx)
|
products, err := s.payments.AdminCatalog(ctx, true)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fv
|
return fv
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -61,6 +61,7 @@ func (s *Server) registerConsole(router *gin.Engine) {
|
|||||||
gm.POST("/users/:id/grant", s.consoleGrant)
|
gm.POST("/users/:id/grant", s.consoleGrant)
|
||||||
gm.POST("/users/:id/grant-product", s.consoleGrantProduct)
|
gm.POST("/users/:id/grant-product", s.consoleGrantProduct)
|
||||||
gm.POST("/users/:id/refund", s.consoleRefund)
|
gm.POST("/users/:id/refund", s.consoleRefund)
|
||||||
|
gm.POST("/users/:id/purchase-override", s.consoleSetPurchaseOverride)
|
||||||
gm.POST("/users/:id/delete", s.consoleDeleteUser)
|
gm.POST("/users/:id/delete", s.consoleDeleteUser)
|
||||||
gm.GET("/reasons", s.consoleReasons)
|
gm.GET("/reasons", s.consoleReasons)
|
||||||
gm.POST("/reasons", s.consoleCreateReason)
|
gm.POST("/reasons", s.consoleCreateReason)
|
||||||
@@ -112,6 +113,8 @@ func (s *Server) registerConsole(router *gin.Engine) {
|
|||||||
if s.payments != nil {
|
if s.payments != nil {
|
||||||
gm.GET("/catalog", s.consoleCatalog)
|
gm.GET("/catalog", s.consoleCatalog)
|
||||||
gm.POST("/catalog", s.consoleCreateProduct)
|
gm.POST("/catalog", s.consoleCreateProduct)
|
||||||
|
gm.POST("/catalog/reward", s.consoleSetReward)
|
||||||
|
gm.POST("/catalog/rail-status", s.consoleSetRailStatus)
|
||||||
gm.GET("/catalog/:id", s.consoleCatalogDetail)
|
gm.GET("/catalog/:id", s.consoleCatalogDetail)
|
||||||
gm.POST("/catalog/:id", s.consoleUpdateProduct)
|
gm.POST("/catalog/:id", s.consoleUpdateProduct)
|
||||||
gm.POST("/catalog/:id/archive", s.consoleArchiveProduct)
|
gm.POST("/catalog/:id/archive", s.consoleArchiveProduct)
|
||||||
@@ -460,6 +463,9 @@ func (s *Server) consoleUserDetail(c *gin.Context) {
|
|||||||
s.log.Warn("console: account statement failed", zap.String("account", id.String()), zap.Error(err))
|
s.log.Warn("console: account statement failed", zap.String("account", id.String()), zap.Error(err))
|
||||||
}
|
}
|
||||||
view.Grant = s.grantForm(ctx)
|
view.Grant = s.grantForm(ctx)
|
||||||
|
if ov, oerr := s.payments.PurchaseOverrideFor(ctx, id); oerr == nil {
|
||||||
|
view.PurchaseOverride = overrideName(ov)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
s.renderConsole(c, "user_detail", "users", acc.DisplayName, view)
|
s.renderConsole(c, "user_detail", "users", acc.DisplayName, view)
|
||||||
}
|
}
|
||||||
@@ -481,13 +487,54 @@ func financeView(stmt payments.Statement) adminconsole.FinanceView {
|
|||||||
for _, e := range stmt.Ledger {
|
for _, e := range stmt.Ledger {
|
||||||
fv.Ledger = append(fv.Ledger, adminconsole.LedgerRow{
|
fv.Ledger = append(fv.Ledger, adminconsole.LedgerRow{
|
||||||
Kind: e.Kind, Source: e.Source, Origin: e.Origin, ChipsDelta: e.ChipsDelta,
|
Kind: e.Kind, Source: e.Source, Origin: e.Origin, ChipsDelta: e.ChipsDelta,
|
||||||
Product: e.ProductID, Order: e.OrderID, Provider: e.Provider, Snapshot: e.Snapshot,
|
Product: e.ProductID, Order: e.OrderID, Provider: e.Provider, Shop: e.Shop, Snapshot: e.Snapshot,
|
||||||
At: fmtTime(e.CreatedAt),
|
At: fmtTime(e.CreatedAt),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
return fv
|
return fv
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// overrideName renders a purchase override as the form/select value ("default"/"allow"/"deny").
|
||||||
|
func overrideName(ov payments.PurchaseOverride) string {
|
||||||
|
switch ov {
|
||||||
|
case payments.OverrideAllow:
|
||||||
|
return "allow"
|
||||||
|
case payments.OverrideDeny:
|
||||||
|
return "deny"
|
||||||
|
default:
|
||||||
|
return "default"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// consoleSetPurchaseOverride sets or clears an account's per-account purchase override (allow / deny
|
||||||
|
// / default) from the user card. "allow" bypasses only the operational rail switch, never the
|
||||||
|
// security gates; "default" clears the override (deletes the row).
|
||||||
|
func (s *Server) consoleSetPurchaseOverride(c *gin.Context) {
|
||||||
|
id, ok := s.consoleUUID(c, "/_gm/users")
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
back := "/_gm/users/" + id.String()
|
||||||
|
if s.payments == nil {
|
||||||
|
s.renderConsoleMessage(c, "Unavailable", "payments are not configured", back)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var ov payments.PurchaseOverride
|
||||||
|
switch c.PostForm("override") {
|
||||||
|
case "allow":
|
||||||
|
ov = payments.OverrideAllow
|
||||||
|
case "deny":
|
||||||
|
ov = payments.OverrideDeny
|
||||||
|
default:
|
||||||
|
ov = payments.OverrideDefault
|
||||||
|
}
|
||||||
|
if err := s.payments.SetPurchaseOverride(c.Request.Context(), id, ov); err != nil {
|
||||||
|
s.renderConsoleMessage(c, "Update failed", err.Error(), back)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
s.renderConsoleMessage(c, "Saved", "the purchase override was updated", back)
|
||||||
|
}
|
||||||
|
|
||||||
// relationRows maps the social graph entries to the cross-linked, date-formatted rows the
|
// relationRows maps the social graph entries to the cross-linked, date-formatted rows the
|
||||||
// user card renders.
|
// user card renders.
|
||||||
func relationRows(rels []social.AdminRelation) []adminconsole.RelationRow {
|
func relationRows(rels []social.AdminRelation) []adminconsole.RelationRow {
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import (
|
|||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
|
|
||||||
"scrabble/backend/internal/payments"
|
"scrabble/backend/internal/payments"
|
||||||
|
"scrabble/backend/internal/robokassa"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Ledger/order provider tags per rail.
|
// Ledger/order provider tags per rail.
|
||||||
@@ -66,9 +67,25 @@ func (s *Server) handleWalletOrder(c *gin.Context) {
|
|||||||
s.abortErr(c, err)
|
s.abortErr(c, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
// Operational availability gate (D45/D46): the per-rail kill switch + the per-account override,
|
||||||
|
// before any order is opened. Orthogonal to the security gates in the rail branches below — a
|
||||||
|
// per-account "allow" override bypasses only this switch, never those. The reason is localized to
|
||||||
|
// the account's language for the user.
|
||||||
|
lang := ""
|
||||||
|
if acc, aerr := s.accounts.GetByID(ctx, uid); aerr == nil {
|
||||||
|
lang = acc.PreferredLanguage
|
||||||
|
}
|
||||||
|
if ok, reason, aerr := s.payments.CanPurchase(ctx, uid, payments.RailKey(cxt.Kind, cxt.Subtype), lang); aerr != nil {
|
||||||
|
s.abortErr(c, aerr)
|
||||||
|
return
|
||||||
|
} else if !ok {
|
||||||
|
c.AbortWithStatusJSON(http.StatusServiceUnavailable, errorResponse{Error: errorBody{Code: "payment_unavailable", Message: reason}})
|
||||||
|
return
|
||||||
|
}
|
||||||
switch cxt.Kind {
|
switch cxt.Kind {
|
||||||
case payments.SourceDirect:
|
case payments.SourceDirect:
|
||||||
if s.robokassa.MerchantLogin == "" {
|
shop, ok := s.robokassa.Shop(cxt.Subtype)
|
||||||
|
if !ok {
|
||||||
c.AbortWithStatusJSON(http.StatusNotImplemented, errorResponse{Error: errorBody{Code: "rail_unavailable", Message: "this payment method is not available"}})
|
c.AbortWithStatusJSON(http.StatusNotImplemented, errorResponse{Error: errorBody{Code: "rail_unavailable", Message: "this payment method is not available"}})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -89,7 +106,7 @@ func (s *Server) handleWalletOrder(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
c.JSON(http.StatusOK, walletOrderResponse{
|
c.JSON(http.StatusOK, walletOrderResponse{
|
||||||
OrderID: res.OrderID.String(),
|
OrderID: res.OrderID.String(),
|
||||||
RedirectURL: s.robokassa.PaymentURL(res.OrderID, res.Amount.Major(), res.Title),
|
RedirectURL: shop.PaymentURL(res.OrderID, res.Amount.Major(), res.Title),
|
||||||
Rail: providerRobokassa,
|
Rail: providerRobokassa,
|
||||||
})
|
})
|
||||||
case payments.SourceVK:
|
case payments.SourceVK:
|
||||||
@@ -136,7 +153,16 @@ func (s *Server) handleRobokassaResult(c *gin.Context) {
|
|||||||
for k, val := range params {
|
for k, val := range params {
|
||||||
v.Set(k, val)
|
v.Set(k, val)
|
||||||
}
|
}
|
||||||
orderID, outSum, ok := s.robokassa.VerifyResult(v)
|
// The per-shop Result route carries the channel as ?channel=; the legacy bare route defaults to
|
||||||
|
// the web shop. Each channel is verified only by its own shop's Password2 (Verifier is strict).
|
||||||
|
channel := c.DefaultQuery("channel", robokassa.ChannelWeb)
|
||||||
|
shop, ok := s.robokassa.Verifier(channel)
|
||||||
|
if !ok {
|
||||||
|
s.log.Warn("robokassa result: unknown shop channel", zap.String("channel", channel))
|
||||||
|
c.String(http.StatusBadRequest, "bad sign")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
orderID, outSum, ok := shop.VerifyResult(v)
|
||||||
if !ok {
|
if !ok {
|
||||||
s.log.Warn("robokassa result: bad signature")
|
s.log.Warn("robokassa result: bad signature")
|
||||||
c.String(http.StatusBadRequest, "bad sign")
|
c.String(http.StatusBadRequest, "bad sign")
|
||||||
|
|||||||
@@ -115,9 +115,9 @@ type Deps struct {
|
|||||||
// Renderer is the image-render sidecar client for the PNG export artifact. A
|
// Renderer is the image-render sidecar client for the PNG export artifact. A
|
||||||
// nil Renderer makes the PNG download answer 404 (the GCG artifact still works).
|
// nil Renderer makes the PNG download answer 404 (the GCG artifact still works).
|
||||||
Renderer *render.Client
|
Renderer *render.Client
|
||||||
// Robokassa configures the direct-rail (RUB) provider; an empty MerchantLogin leaves the
|
// Robokassa configures the direct-rail (RUB) provider — one merchant shop per channel; an empty
|
||||||
// order and Result-callback endpoints unregistered.
|
// set leaves the order and Result-callback endpoints unregistered.
|
||||||
Robokassa robokassa.Config
|
Robokassa robokassa.Shops
|
||||||
}
|
}
|
||||||
|
|
||||||
// Server owns the gin engine, the underlying HTTP server and the readiness
|
// Server owns the gin engine, the underlying HTTP server and the readiness
|
||||||
@@ -146,7 +146,7 @@ type Server struct {
|
|||||||
ads *ads.Service
|
ads *ads.Service
|
||||||
payments *payments.Service
|
payments *payments.Service
|
||||||
gamelimits *gamelimits.Service
|
gamelimits *gamelimits.Service
|
||||||
robokassa robokassa.Config
|
robokassa robokassa.Shops
|
||||||
notifier notify.Publisher
|
notifier notify.Publisher
|
||||||
console *adminconsole.Renderer
|
console *adminconsole.Renderer
|
||||||
exportKey []byte
|
exportKey []byte
|
||||||
|
|||||||
@@ -56,6 +56,9 @@ func Middleware(logger *zap.Logger) gin.HandlerFunc {
|
|||||||
zap.String("path", route),
|
zap.String("path", route),
|
||||||
zap.Int("status", status),
|
zap.Int("status", status),
|
||||||
zap.Duration("latency", elapsed),
|
zap.Duration("latency", elapsed),
|
||||||
|
// The gateway forwards the real caller as X-Forwarded-For (and Caddy does for /_gm), which
|
||||||
|
// gin resolves here — so the access log carries the client IP, not the gateway's connection.
|
||||||
|
zap.String("client_ip", c.ClientIP()),
|
||||||
}
|
}
|
||||||
fields = append(fields, TraceFieldsFromContext(ctx)...)
|
fields = append(fields, TraceFieldsFromContext(ctx)...)
|
||||||
|
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ GM_BASICAUTH_HASH= # required; `caddy hash-password` bcrypt
|
|||||||
|
|
||||||
# --- UI build args (baked into the gateway image) ---------------------------
|
# --- UI build args (baked into the gateway image) ---------------------------
|
||||||
VITE_TELEGRAM_BOT_ID=
|
VITE_TELEGRAM_BOT_ID=
|
||||||
VITE_TELEGRAM_LINK= # friend-invite Mini App link (full URL, e.g. https://t.me/<bot>/<app>)
|
VITE_TELEGRAM_LINK= # friend-invite Mini App link (full URL, e.g. https://telegram.me/<bot>/<app>)
|
||||||
VITE_TELEGRAM_GAME_CHANNEL_NAME= # landing "Play in Telegram" link, the bot's game channel
|
VITE_TELEGRAM_GAME_CHANNEL_NAME= # landing "Play in Telegram" link, the bot's game channel
|
||||||
VITE_VK_APP_LINK= # landing "Play on VK" link (full URL, https://vk.com/app<id>)
|
VITE_VK_APP_LINK= # landing "Play on VK" link (full URL, https://vk.com/app<id>)
|
||||||
VITE_VK_APP_ID= # VK ID "Web" app id (client_id) for VK web-login linking; also the gateway's GATEWAY_VK_ID_APP_ID
|
VITE_VK_APP_ID= # VK ID "Web" app id (client_id) for VK web-login linking; also the gateway's GATEWAY_VK_ID_APP_ID
|
||||||
@@ -142,6 +142,18 @@ ROBOKASSA_MERCHANT_LOGIN=
|
|||||||
ROBOKASSA_PASSWORD1=
|
ROBOKASSA_PASSWORD1=
|
||||||
ROBOKASSA_PASSWORD2=
|
ROBOKASSA_PASSWORD2=
|
||||||
ROBOKASSA_TEST=
|
ROBOKASSA_TEST=
|
||||||
|
# Multi-shop direct rail (D42): the vars above seed the "web" channel; add per-channel shops here.
|
||||||
|
# ROBOKASSA_WEB_* overrides the web shop; ROBOKASSA_ANDROID_* adds the android (RuStore) shop. Each
|
||||||
|
# credits the one direct wallet; an empty login drops that channel (routing falls back to web). The
|
||||||
|
# Robokassa cabinet points each shop's Result URL at /pay/robokassa/result/web and .../android.
|
||||||
|
ROBOKASSA_WEB_MERCHANT_LOGIN=
|
||||||
|
ROBOKASSA_WEB_PASSWORD1=
|
||||||
|
ROBOKASSA_WEB_PASSWORD2=
|
||||||
|
ROBOKASSA_WEB_TEST=
|
||||||
|
ROBOKASSA_ANDROID_MERCHANT_LOGIN=
|
||||||
|
ROBOKASSA_ANDROID_PASSWORD1=
|
||||||
|
ROBOKASSA_ANDROID_PASSWORD2=
|
||||||
|
ROBOKASSA_ANDROID_TEST=
|
||||||
|
|
||||||
# --- Gateway anti-abuse ------------------------------------------------------
|
# --- Gateway anti-abuse ------------------------------------------------------
|
||||||
# Planted honeytoken bearer value: any request presenting it is flagged — a 24h IP ban
|
# Planted honeytoken bearer value: any request presenting it is flagged — a 24h IP ban
|
||||||
|
|||||||
@@ -79,6 +79,7 @@ compose binds from this directory.
|
|||||||
| `BACKEND_ROBOKASSA_MERCHANT_LOGIN` | secret | Robokassa shop login for the direct RUB rail. Empty leaves the rail off. |
|
| `BACKEND_ROBOKASSA_MERCHANT_LOGIN` | secret | Robokassa shop login for the direct RUB rail. Empty leaves the rail off. |
|
||||||
| `BACKEND_ROBOKASSA_PASSWORD1` / `…_PASSWORD2` | secret | Robokassa pass phrases: Password1 signs the launch request, Password2 signs/verifies the Result callback. Use the shop's **test** pair while `…_ROBOKASSA_TEST=1`, the **live** pair for real money. (Password3 — Robokassa's JWT-invoice API — is unused.) |
|
| `BACKEND_ROBOKASSA_PASSWORD1` / `…_PASSWORD2` | secret | Robokassa pass phrases: Password1 signs the launch request, Password2 signs/verifies the Result callback. Use the shop's **test** pair while `…_ROBOKASSA_TEST=1`, the **live** pair for real money. (Password3 — Robokassa's JWT-invoice API — is unused.) |
|
||||||
| `BACKEND_ROBOKASSA_TEST` | **variable** | `1` runs test payments against the test pass phrases (no real money); empty/`0` is live. A variable, not a secret, so go-live is a flag flip + redeploy, not a secret rotation. |
|
| `BACKEND_ROBOKASSA_TEST` | **variable** | `1` runs test payments against the test pass phrases (no real money); empty/`0` is live. A variable, not a secret, so go-live is a flag flip + redeploy, not a secret rotation. |
|
||||||
|
| `BACKEND_ROBOKASSA_{WEB,ANDROID}_{MERCHANT_LOGIN,PASSWORD1,PASSWORD2,TEST}` | secret / variable | Multi-shop direct rail (D42): per-channel Robokassa shops. The legacy `BACKEND_ROBOKASSA_*` seeds the **web** shop; `…_WEB_*` overrides it, `…_ANDROID_*` adds the **android** (RuStore) shop. Each credits the one `direct` wallet; the cabinet Result URL per shop is `/pay/robokassa/result/{web,android}`. Empty login ⇒ that channel unconfigured (order routing falls back to the web shop). |
|
||||||
|
|
||||||
**Plus the bot token** — `TELEGRAM_BOT_TOKEN` (secret), shared by the validator (HMAC
|
**Plus the bot token** — `TELEGRAM_BOT_TOKEN` (secret), shared by the validator (HMAC
|
||||||
secret) and the bot (Bot API). It defaults to empty in compose, but both **fail at
|
secret) and the bot (Bot API). It defaults to empty in compose, but both **fail at
|
||||||
@@ -107,8 +108,8 @@ without it Docker's resolver handles `otelcol`, `gateway` and `api.telegram.org`
|
|||||||
| `TELEGRAM_TEST_ENV` | _pinned_ | `false` | `true` routes the bot through Telegram's test environment (`.../bot<token>/test/METHOD`). **The CI test contour pins this to `true` in `ci.yaml`** (the contour is the test environment) — it is not a Gitea variable. Set it in `.env` for a local run; prod leaves it `false`. |
|
| `TELEGRAM_TEST_ENV` | _pinned_ | `false` | `true` routes the bot through Telegram's test environment (`.../bot<token>/test/METHOD`). **The CI test contour pins this to `true` in `ci.yaml`** (the contour is the test environment) — it is not a Gitea variable. Set it in `.env` for a local run; prod leaves it `false`. |
|
||||||
| `TELEGRAM_API_BASE_URL` | variable | _(empty)_ | Override the Bot API host (a mock/self-hosted server); empty = `https://api.telegram.org`. |
|
| `TELEGRAM_API_BASE_URL` | variable | _(empty)_ | Override the Bot API host (a mock/self-hosted server); empty = `https://api.telegram.org`. |
|
||||||
| `VITE_TELEGRAM_BOT_ID` | variable | _(empty)_ | UI build-arg: numeric bot id for the web Login Widget. |
|
| `VITE_TELEGRAM_BOT_ID` | variable | _(empty)_ | UI build-arg: numeric bot id for the web Login Widget. |
|
||||||
| `VITE_TELEGRAM_LINK` | variable | _(empty)_ | UI build-arg: friend-invite Mini App link (full URL, `https://t.me/<bot>/<app>` — `<app>` is the Mini App short name from BotFather). |
|
| `VITE_TELEGRAM_LINK` | variable | _(empty)_ | UI build-arg: friend-invite Mini App link (full URL, `https://telegram.me/<bot>/<app>` — `<app>` is the Mini App short name from BotFather). |
|
||||||
| `VITE_TELEGRAM_GAME_CHANNEL_NAME` | variable | _(empty)_ | UI build-arg: the landing "Play in Telegram" link, the bot's game channel (e.g. `https://t.me/Erudit_Game`). |
|
| `VITE_TELEGRAM_GAME_CHANNEL_NAME` | variable | _(empty)_ | UI build-arg: the landing "Play in Telegram" link, the bot's game channel (e.g. `https://telegram.me/Erudit_Game`). |
|
||||||
| `VITE_VK_APP_LINK` | variable (shared) | _(empty)_ | UI build-arg: the landing "Play on VK" link, the VK Mini App (full URL, `https://vk.com/app<id>`). One VK Mini App for all contours. |
|
| `VITE_VK_APP_LINK` | variable (shared) | _(empty)_ | UI build-arg: the landing "Play on VK" link, the VK Mini App (full URL, `https://vk.com/app<id>`). One VK Mini App for all contours. |
|
||||||
| `VITE_VK_APP_ID` | variable (shared) | _(empty)_ | VK ID "Web" app id (`client_id`) for VK web-login linking. Baked into the SPA authorize URL and reused as the gateway's `GATEWAY_VK_ID_APP_ID`. Empty disables the `link.vk.*` ops. One VK ID "Web" app for all contours. |
|
| `VITE_VK_APP_ID` | variable (shared) | _(empty)_ | VK ID "Web" app id (`client_id`) for VK web-login linking. Baked into the SPA authorize URL and reused as the gateway's `GATEWAY_VK_ID_APP_ID`. Empty disables the `link.vk.*` ops. One VK ID "Web" app for all contours. |
|
||||||
| `VITE_VK_ID_REDIRECT_URL` | derived | _(empty)_ | VK ID trusted redirect URL — must match the app's registered redirect exactly. The deploy derives `PUBLIC_BASE_URL + /app/` (used by the SPA and as the gateway's exchange `redirect_uri`); set it only for a local run. |
|
| `VITE_VK_ID_REDIRECT_URL` | derived | _(empty)_ | VK ID trusted redirect URL — must match the app's registered redirect exactly. The deploy derives `PUBLIC_BASE_URL + /app/` (used by the SPA and as the gateway's exchange `redirect_uri`); set it only for a local run. |
|
||||||
@@ -241,7 +242,7 @@ that survives losing the host.
|
|||||||
## Android app build & release (RuStore)
|
## Android app build & release (RuStore)
|
||||||
|
|
||||||
The standalone Android app is built by a **manual** workflow, never automatically, and is separate from the
|
The standalone Android app is built by a **manual** workflow, never automatically, and is separate from the
|
||||||
web/prod rollout — a signed APK uploaded to RuStore by hand. Full plan: [`../ANDROID_PLAN.md`](../ANDROID_PLAN.md).
|
web/prod rollout — a signed APK uploaded to RuStore by hand. The build/release runbook follows.
|
||||||
|
|
||||||
- **Trigger:** `Actions → android-build → Run workflow` from **`master`**, input `confirm=build` (mirrors
|
- **Trigger:** `Actions → android-build → Run workflow` from **`master`**, input `confirm=build` (mirrors
|
||||||
`prod-deploy`). **Tag the release first** (`git tag vX.Y.Z` on `master`) — the workflow refuses anything
|
`prod-deploy`). **Tag the release first** (`git tag vX.Y.Z` on `master`) — the workflow refuses anything
|
||||||
@@ -256,8 +257,8 @@ web/prod rollout — a signed APK uploaded to RuStore by hand. Full plan: [`../A
|
|||||||
the SDK is missing or unreadable.
|
the SDK is missing or unreadable.
|
||||||
- **Release keystore** (create once, **back up off-host** — losing it means the app can never be updated):
|
- **Release keystore** (create once, **back up off-host** — losing it means the app can never be updated):
|
||||||
`keytool -genkeypair -v -keystore erudit-release.jks -alias erudit -keyalg RSA -keysize 4096 -validity 10000`,
|
`keytool -genkeypair -v -keystore erudit-release.jks -alias erudit -keyalg RSA -keysize 4096 -validity 10000`,
|
||||||
then set the Gitea **secrets** `ANDROID_KEYSTORE_BASE64` (`base64 -w0 erudit-release.jks`),
|
then set the Gitea **secrets** `ANDROID_RUSTORE_KEYSTORE_BASE64` (`base64 -w0 erudit-release.jks`),
|
||||||
`ANDROID_KEYSTORE_PASSWORD`, `ANDROID_KEY_ALIAS`, `ANDROID_KEY_PASSWORD`. Set the `ANDROID_RUSTORE_URL`
|
`ANDROID_RUSTORE_KEYSTORE_PASSWORD`, `ANDROID_RUSTORE_KEY_ALIAS`, `ANDROID_RUSTORE_KEY_PASSWORD`. Set the `ANDROID_RUSTORE_URL`
|
||||||
variable to the store listing once published (empty until then — the in-app update button no-ops).
|
variable to the store listing once published (empty until then — the in-app update button no-ops).
|
||||||
- **Wire-break discipline:** the prod deploy that ships an incompatible wire change **also** bumps
|
- **Wire-break discipline:** the prod deploy that ships an incompatible wire change **also** bumps
|
||||||
`GATEWAY_MIN_CLIENT_VERSION` to that release (see Optional variables), so an old installed APK is turned
|
`GATEWAY_MIN_CLIENT_VERSION` to that release (see Optional variables), so an old installed APK is turned
|
||||||
|
|||||||
@@ -150,6 +150,13 @@
|
|||||||
enabled: true
|
enabled: true
|
||||||
state: started
|
state: started
|
||||||
|
|
||||||
|
# Pin every host to UTC so host-level timestamps (journald, file mtimes, cron) line up
|
||||||
|
# across the fleet — some VPS images ship a local zone (the tg host came up on MSK). The
|
||||||
|
# services themselves run in UTC regardless; this is about host-side log correlation.
|
||||||
|
- name: Set the system timezone to UTC
|
||||||
|
community.general.timezone:
|
||||||
|
name: Etc/UTC
|
||||||
|
|
||||||
# --- Swap file (OOM cushion) ---------------------------------------------------
|
# --- Swap file (OOM cushion) ---------------------------------------------------
|
||||||
# The prod main host is tight (1.9 GiB) and the per-container memory caps
|
# The prod main host is tight (1.9 GiB) and the per-container memory caps
|
||||||
# (docker-compose.prod.yml) sum to more than RAM, so a simultaneous spike could hit
|
# (docker-compose.prod.yml) sum to more than RAM, so a simultaneous spike could hit
|
||||||
|
|||||||
@@ -107,12 +107,13 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# The public offer page is rendered by the render sidecar: it splices the live catalog price
|
# The public legal pages are rendered by the render sidecar: the offer (with the live catalog
|
||||||
# list (backend, internal) into the committed ui/legal/offer_ru.md and returns the HTML. Only
|
# price list from the backend spliced into ui/legal/offer_ru.md), the privacy policy and the EULA
|
||||||
# /offer/ is exposed here — the sidecar's /render stays off this allow-list, internal-only. Kept
|
# (both static markdown). Only these paths are exposed here — the sidecar's /render stays off this
|
||||||
# disjoint from the landing/app paths so the catch-all below never shadows it.
|
# allow-list, internal-only. Kept disjoint from the landing/app paths so the catch-all below never
|
||||||
@offer path /offer /offer/*
|
# shadows them.
|
||||||
handle @offer {
|
@legal path /offer /offer/* /privacy /privacy/* /eula /eula/*
|
||||||
|
handle @legal {
|
||||||
reverse_proxy renderer:8090
|
reverse_proxy renderer:8090
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -171,6 +171,18 @@ services:
|
|||||||
BACKEND_ROBOKASSA_PASSWORD1: ${ROBOKASSA_PASSWORD1:-}
|
BACKEND_ROBOKASSA_PASSWORD1: ${ROBOKASSA_PASSWORD1:-}
|
||||||
BACKEND_ROBOKASSA_PASSWORD2: ${ROBOKASSA_PASSWORD2:-}
|
BACKEND_ROBOKASSA_PASSWORD2: ${ROBOKASSA_PASSWORD2:-}
|
||||||
BACKEND_ROBOKASSA_TEST: ${ROBOKASSA_TEST:-}
|
BACKEND_ROBOKASSA_TEST: ${ROBOKASSA_TEST:-}
|
||||||
|
# Per-channel shops for the multi-shop direct rail (D42): the legacy ROBOKASSA_* above seeds
|
||||||
|
# the "web" channel; ROBOKASSA_WEB_* overrides it and ROBOKASSA_ANDROID_* adds the android
|
||||||
|
# shop. Each shop credits the one direct wallet; an empty login drops that channel (order
|
||||||
|
# routing falls back to the web shop). Result URLs: /pay/robokassa/result/{web,android}.
|
||||||
|
BACKEND_ROBOKASSA_WEB_MERCHANT_LOGIN: ${ROBOKASSA_WEB_MERCHANT_LOGIN:-}
|
||||||
|
BACKEND_ROBOKASSA_WEB_PASSWORD1: ${ROBOKASSA_WEB_PASSWORD1:-}
|
||||||
|
BACKEND_ROBOKASSA_WEB_PASSWORD2: ${ROBOKASSA_WEB_PASSWORD2:-}
|
||||||
|
BACKEND_ROBOKASSA_WEB_TEST: ${ROBOKASSA_WEB_TEST:-}
|
||||||
|
BACKEND_ROBOKASSA_ANDROID_MERCHANT_LOGIN: ${ROBOKASSA_ANDROID_MERCHANT_LOGIN:-}
|
||||||
|
BACKEND_ROBOKASSA_ANDROID_PASSWORD1: ${ROBOKASSA_ANDROID_PASSWORD1:-}
|
||||||
|
BACKEND_ROBOKASSA_ANDROID_PASSWORD2: ${ROBOKASSA_ANDROID_PASSWORD2:-}
|
||||||
|
BACKEND_ROBOKASSA_ANDROID_TEST: ${ROBOKASSA_ANDROID_TEST:-}
|
||||||
# The dictionary lives on a named volume seeded from the image on first boot
|
# The dictionary lives on a named volume seeded from the image on first boot
|
||||||
# (the image's /opt/dawg is owned by the nonroot UID, which the fresh volume
|
# (the image's /opt/dawg is owned by the nonroot UID, which the fresh volume
|
||||||
# inherits). The admin console writes new version subdirectories here, and the
|
# inherits). The admin console writes new version subdirectories here, and the
|
||||||
|
|||||||
@@ -107,8 +107,10 @@ dropped). Horizontal scaling is explicit future work.
|
|||||||
the header **"Connecting…"** spinner, chrome stays online); `offlineNoNetwork` (sustained loss — blue
|
the header **"Connecting…"** spinner, chrome stays online); `offlineNoNetwork` (sustained loss — blue
|
||||||
chrome, a local-only lobby, the transport **kill switch**); and `offlineVersionLocked` (the gateway is
|
chrome, a local-only lobby, the transport **kill switch**); and `offlineVersionLocked` (the gateway is
|
||||||
reachable but the build is below the hard minimum — the *update* notice, the client-version gate below). **Offline is
|
reachable but the build is below the hard minimum — the *update* notice, the client-version gate below). **Offline is
|
||||||
implicit** — detected from failed calls, a reachability probe and the OS hint (`navigator` /
|
implicit** — detected from failed calls, a reachability probe, a **live-stream heartbeat watchdog**
|
||||||
`@capacitor/network`), **never a user toggle** — with **hysteresis** so a brief blip lives entirely in
|
(a silence past ~25 s of the gateway's 10 s keep-alive `heartbeat` means a silently-dead stream — e.g.
|
||||||
|
the radio was cut with no stream error; `ui/src/lib/streamwatchdog.ts`, background-aware) and the OS hint
|
||||||
|
(`navigator` / `@capacitor/network`), **never a user toggle** — with **hysteresis** so a brief blip lives entirely in
|
||||||
`connecting` (K consecutive probe failures *or* a debounce window trips `offlineNoNetwork`; the first
|
`connecting` (K consecutive probe failures *or* a debounce window trips `offlineNoNetwork`; the first
|
||||||
probe/call success heals back, with a toast). The transport **auto-retries with capped exponential
|
probe/call success heals back, with a toast). The transport **auto-retries with capped exponential
|
||||||
backoff** — every op on a rate-limit (the gateway rejected it before processing, so it is safe), but
|
backoff** — every op on a rate-limit (the gateway rejected it before processing, so it is safe), but
|
||||||
@@ -116,10 +118,17 @@ dropped). Horizontal scaling is explicit future work.
|
|||||||
one whose response was lost — its button is disabled while offline and re-issued on reconnect). A
|
one whose response was lost — its button is disabled while offline and re-issued on reconnect). A
|
||||||
reachability watcher (a lightweight `profile.get` probe; a session-less native guest reconciles a
|
reachability watcher (a lightweight `profile.get` probe; a session-less native guest reconciles a
|
||||||
server guest instead — that reconcile IS the probe) drives recovery, and the live `Subscribe` stream's
|
server guest instead — that reconcile IS the probe) drives recovery, and the live `Subscribe` stream's
|
||||||
drop/recovery feeds the same machine. **Telegram/VK are exempt** — always online: they are never fed an
|
drop/recovery feeds the same machine. **Telegram/VK are exempt from the offline-*play* model** —
|
||||||
offline signal, and `offlineMode.active` is additionally hard-gated on `offlineCapable()` (false in
|
`offlineMode.active` is hard-gated on `offlineCapable()` (false in those mini-apps), so nothing — not
|
||||||
those mini-apps), so nothing — not even a version lock — puts them in offline mode: no blue chrome, no
|
even a version lock — puts them in offline mode: no blue chrome, no local lobby, no transport kill
|
||||||
local lobby, no transport kill switch and no device-local create paths.
|
switch and no device-local create paths. The machine still tracks reachability there, though: a
|
||||||
|
connection lost **inside an online game** is surfaced on **every platform**, driven off the machine's
|
||||||
|
confirmed-offline state (`netState.offline`, not `offlineMode.active`) — the game screen shows a
|
||||||
|
*connection lost* banner, **freezes** the tray and move controls, and hides the resign, add-friend/block
|
||||||
|
and chat/dictionary controls (a started move stays a draft, re-committed by the player on reconnect), and
|
||||||
|
the word-check tool falls back to the game's pinned on-device dictionary (`ui/src/lib/dict/check.ts`,
|
||||||
|
exact when that dawg is cached, else *unavailable*) with its network-only complaint and external
|
||||||
|
look-up hidden.
|
||||||
**Edge hardening:** every request body on the public listener is capped at
|
**Edge hardening:** every request body on the public listener is capped at
|
||||||
`GATEWAY_MAX_BODY_BYTES` (default 1 MiB — far above any legitimate payload), both at the HTTP
|
`GATEWAY_MAX_BODY_BYTES` (default 1 MiB — far above any legitimate payload), both at the HTTP
|
||||||
layer (`http.MaxBytesReader`) and as the Connect per-message read limit, so an oversized
|
layer (`http.MaxBytesReader`) and as the Connect per-message read limit, so an oversized
|
||||||
@@ -142,7 +151,10 @@ dropped). Horizontal scaling is explicit future work.
|
|||||||
and GCG are unaffected** (they stay decoded concrete characters, §9.1).
|
and GCG are unaffected** (they stay decoded concrete characters, §9.1).
|
||||||
- **gateway ↔ backend (sync)**: plain HTTP REST/JSON. The gateway injects
|
- **gateway ↔ backend (sync)**: plain HTTP REST/JSON. The gateway injects
|
||||||
`X-User-ID` (and the session's trusted `X-Platform`, §3) for authenticated
|
`X-User-ID` (and the session's trusted `X-Platform`, §3) for authenticated
|
||||||
requests; `backend` never re-derives identity or platform from the body. Because every sync call targets the one backend host, the
|
requests, plus the caller's real IP as **`X-Forwarded-For`** on **every** call
|
||||||
|
(carried on the request context), so the backend records the real caller — the
|
||||||
|
account's last-login IP, chat/feedback moderation, the access log — rather than
|
||||||
|
the gateway's own connection address; `backend` never re-derives identity or platform from the body. Because every sync call targets the one backend host, the
|
||||||
gateway's REST client widens its keep-alive pool well past the stdlib default
|
gateway's REST client widens its keep-alive pool well past the stdlib default
|
||||||
of 2 idle connections per host; otherwise the per-request connection churn
|
of 2 idle connections per host; otherwise the per-request connection churn
|
||||||
exhausts ephemeral ports and burns gateway CPU under load (see
|
exhausts ephemeral ports and burns gateway CPU under load (see
|
||||||
@@ -967,10 +979,14 @@ finished journal on each GET. The only degraded platform is a legacy Telegram cl
|
|||||||
predating `downloadFile`, where the GCG falls back to the old clipboard copy and the
|
predating `downloadFile`, where the GCG falls back to the old clipboard copy and the
|
||||||
image option is not offered.
|
image option is not offered.
|
||||||
|
|
||||||
The same sidecar also serves the **public offer page** at `/offer/` — the one edge-exposed
|
The same sidecar also serves the **public legal pages** — the offer at `/offer/`, the privacy
|
||||||
route on it (caddy routes `/offer/` here; its `/render` stays internal). It reuses the shared
|
policy at `/privacy/` and the EULA at `/eula/` — the edge-exposed routes on it (caddy routes them
|
||||||
`ui/src/lib/offer.ts` renderer (again one renderer, no drift) over the owner-edited
|
here; its `/render` stays internal). All three reuse the shared `ui/src/lib/offer.ts`
|
||||||
`ui/legal/offer_ru.md`, baked into the image, splicing in the **live price list** (§4.4): it
|
`renderLegalHtml` (one renderer, no drift) over their owner-edited `ui/legal/*_{ru,en}.md` — each is
|
||||||
|
**bilingual (RU + EN)** with a client-side language + theme switcher (default Russian, persisted;
|
||||||
|
the offer's EN view transliterates the Russian product names) — baked into the image. `/privacy/`
|
||||||
|
and `/eula/` are static; the offer additionally splices in the **live price list** (§4.4) into both
|
||||||
|
languages: it
|
||||||
fetches the two catalog tables as markdown from the backend's internal
|
fetches the two catalog tables as markdown from the backend's internal
|
||||||
`/api/v1/internal/offer/pricing` at the `<#pricing_template#>` marker, then renders the page. The
|
`/api/v1/internal/offer/pricing` at the `<#pricing_template#>` marker, then renders the page. The
|
||||||
backend projects the tables from the active catalog through `payments.Money` (no float reaches the
|
backend projects the tables from the active catalog through `payments.Money` (no float reaches the
|
||||||
@@ -1365,7 +1381,9 @@ Single public origin, path-routed. The Vite build has two entries: a lightweight
|
|||||||
`/app/` (web), `/telegram/` (the Telegram Mini App; on that path without sign-in data
|
`/app/` (web), `/telegram/` (the Telegram Mini App; on that path without sign-in data
|
||||||
— no `initData` — the client renders a compact, shareable launch-diagnostic screen instead
|
— no `initData` — the client renders a compact, shareable launch-diagnostic screen instead
|
||||||
of redirecting away) and `/vk/` (the VK Mini App; the client reads the signed `vk_*` launch
|
of redirecting away) and `/vk/` (the VK Mini App; the client reads the signed `vk_*` launch
|
||||||
parameters from the URL and the gateway verifies them in-process — §12); a stray hit on the
|
parameters from the URL and the gateway verifies them in-process — §12; on that path without a
|
||||||
|
signed launch the client renders the same shareable launch-diagnostic screen rather than starting
|
||||||
|
a throwaway guest); a stray hit on the
|
||||||
gateway's `/` 308-redirects to `/app/`. The **landing** ships in its own static container: the
|
gateway's `/` 308-redirects to `/app/`. The **landing** ships in its own static container: the
|
||||||
`landing` target of `gateway/Dockerfile` (caddy:2-alpine + the same Vite build,
|
`landing` target of `gateway/Dockerfile` (caddy:2-alpine + the same Vite build,
|
||||||
`deploy/landing/Caddyfile`) serves it at `/`, so stray public traffic is absorbed by
|
`deploy/landing/Caddyfile`) serves it at `/`, so stray public traffic is absorbed by
|
||||||
@@ -1446,9 +1464,10 @@ in-process (the distroless image has no `/etc/mime.types`). Hash-named `/assets/
|
|||||||
in-compose **caddy** is the contour's edge: it owns a single `/_gm` Basic-Auth and
|
in-compose **caddy** is the contour's edge: it owns a single `/_gm` Basic-Auth and
|
||||||
routes `/_gm/grafana/*` to **Grafana** (anonymous-admin, so the one shared login gates
|
routes `/_gm/grafana/*` to **Grafana** (anonymous-admin, so the one shared login gates
|
||||||
it with no per-user Grafana accounts) and the rest of `/_gm/*` to the backend-rendered
|
it with no per-user Grafana accounts) and the rest of `/_gm/*` to the backend-rendered
|
||||||
**admin console**; `/app/`, `/telegram/`, `/vk/` and the Connect path go to the gateway; `/offer/`
|
**admin console**; `/app/`, `/telegram/`, `/vk/` and the Connect path go to the gateway; the public
|
||||||
(the public offer, rendered by the `renderer` sidecar with the live catalog price list spliced in)
|
legal pages `/offer/`, `/privacy/` and `/eula/` (rendered by the `renderer` sidecar — the offer with
|
||||||
goes to the render sidecar; and the catch-all — notably the landing at `/` — goes to the landing
|
the live catalog price list spliced in) go to the render sidecar; and the catch-all — notably the
|
||||||
|
landing at `/` — goes to the landing
|
||||||
container. The
|
container. The
|
||||||
**Telegram validator** runs as a separate container with **no public ingress**,
|
**Telegram validator** runs as a separate container with **no public ingress**,
|
||||||
answering only internal gRPC (HMAC, no Telegram egress). The **Telegram bot** holds
|
answering only internal gRPC (HMAC, no Telegram egress). The **Telegram bot** holds
|
||||||
@@ -1480,7 +1499,8 @@ Two contours, two secret/variable prefixes (`TEST_` / `PROD_`):
|
|||||||
forwards the domain to `scrabble:80`, so the in-compose caddy serves plain HTTP
|
forwards the domain to `scrabble:80`, so the in-compose caddy serves plain HTTP
|
||||||
(`CADDY_SITE_ADDRESS=:80`). The in-compose caddy **trusts X-Forwarded-For from
|
(`CADDY_SITE_ADDRESS=:80`). The in-compose caddy **trusts X-Forwarded-For from
|
||||||
private-range upstreams** (`trusted_proxies private_ranges`), so the real client IP —
|
private-range upstreams** (`trusted_proxies private_ranges`), so the real client IP —
|
||||||
used for chat-moderation logging and the gateway's per-IP rate limiting — survives the
|
used for the gateway's per-IP rate limiting and, forwarded on to the backend, the account's
|
||||||
|
last-login IP, chat/feedback moderation and the access log — survives the
|
||||||
host-caddy hop; in prod (no host caddy) public clients are untrusted and Caddy uses the
|
host-caddy hop; in prod (no host caddy) public clients are untrusted and Caddy uses the
|
||||||
real peer, so the single config is correct and spoof-safe in both contours. The
|
real peer, so the single config is correct and spoof-safe in both contours. The
|
||||||
**bot-link mTLS material** (a private CA + gateway/bot leaves, CN=`gateway`) is
|
**bot-link mTLS material** (a private CA + gateway/bot leaves, CN=`gateway`) is
|
||||||
@@ -1536,8 +1556,8 @@ hidden in the MVP (`VITE_PAYMENTS_DISABLED`). The APK is built by a **manual** `
|
|||||||
the dicts, and assembles a **release APK** artifact — signed when the `ANDROID_KEYSTORE_*` secrets are
|
the dicts, and assembles a **release APK** artifact — signed when the `ANDROID_KEYSTORE_*` secrets are
|
||||||
present, unsigned otherwise. `versionCode`/`versionName` are deterministic from the release tag `vMA.MI.PA`
|
present, unsigned otherwise. `versionCode`/`versionName` are deterministic from the release tag `vMA.MI.PA`
|
||||||
(`versionCode = MA*1_000_000 + MI*1_000 + PA`, `versionName = "MA.MI.PA"`). The runner is a host-executor
|
(`versionCode = MA*1_000_000 + MI*1_000 + PA`, `versionName = "MA.MI.PA"`). The runner is a host-executor
|
||||||
with a host-provisioned Android SDK; RuStore upload is manual. Full plan + runbook:
|
with a host-provisioned Android SDK; RuStore upload is manual. Runbook:
|
||||||
[`../ANDROID_PLAN.md`](../ANDROID_PLAN.md), [`../deploy/README.md`](../deploy/README.md).
|
[`../deploy/README.md`](../deploy/README.md).
|
||||||
|
|
||||||
## 14. CI & branches
|
## 14. CI & branches
|
||||||
|
|
||||||
|
|||||||
@@ -30,11 +30,13 @@ render with arbitrary languages, so detection would make the indexed content
|
|||||||
nondeterministic); a saved 🌐 choice still wins. The page carries a static Russian SEO head
|
nondeterministic); a saved 🌐 choice still wins. The page carries a static Russian SEO head
|
||||||
(title/description, the Open Graph card Telegram/VK link previews use, a canonical link
|
(title/description, the Open Graph card Telegram/VK link previews use, a canonical link
|
||||||
pinned to the production origin, JSON-LD, the favicon set and `robots.txt`), while the SPA
|
pinned to the production origin, JSON-LD, the favicon set and `robots.txt`), while the SPA
|
||||||
shell is `noindex` — the landing is the only indexable page. The footer links to the **public
|
shell is `noindex` — the landing is the only indexable page. The footer links to the three **legal
|
||||||
offer** (`/offer/`) and, beside it, **feedback** — the Telegram bot the offer names as the seller's
|
documents** — the **user agreement** (`/eula/`), the **privacy policy** (`/privacy/`) and the
|
||||||
contact. The offer page (the legal document a purchase accepts) is rendered on demand from
|
**public offer** (`/offer/`) — and, beside them, **feedback** (the Telegram bot the documents name as
|
||||||
`ui/legal/offer_ru.md` with its **price list** (§4.4) generated from the live product catalog, so
|
the seller's contact). Each is **bilingual (RU/EN)** with a language + theme switcher and is rendered
|
||||||
the published prices always match what is currently on sale — no redeploy to update them.
|
from its `ui/legal/*_{ru,en}.md` sources by the render sidecar; the offer additionally splices in its
|
||||||
|
**price list** (§4.4) generated from the live product catalog, so the published prices always match
|
||||||
|
what is currently on sale — no redeploy to update them.
|
||||||
|
|
||||||
On the plain web the client is an **installable PWA**: a logged-out player sees an install
|
On the plain web the client is an **installable PWA**: a logged-out player sees an install
|
||||||
call-to-action under the login form (and at the bottom of Settings) that installs the app to the
|
call-to-action under the login form (and at the bottom of Settings) that installs the app to the
|
||||||
@@ -70,7 +72,10 @@ A **VK Mini App** launch works the same way: it authenticates from VK's signed l
|
|||||||
`vk_language` and its display name from the VK profile (read on the client, since VK does not put
|
`vk_language` and its display name from the VK profile (read on the client, since VK does not put
|
||||||
the name in the signed launch). While the theme preference is "auto" the app follows the VK
|
the name in the signed launch). While the theme preference is "auto" the app follows the VK
|
||||||
client's light/dark scheme, and the layout clears the VK mobile home bar. The same quiet-retry
|
client's light/dark scheme, and the layout clears the VK mobile home bar. The same quiet-retry
|
||||||
"couldn't load" screen applies inside VK.
|
"couldn't load" screen applies inside VK. Opening a Mini App link directly in an ordinary browser —
|
||||||
|
the `/vk/` entry with no signed VK launch, or `/telegram/` with no Telegram sign-in data — shows a
|
||||||
|
compact, shareable diagnostic screen instead of proceeding (as a throwaway guest on VK, or by
|
||||||
|
redirecting away on Telegram), so a player who ends up there wrongly can screenshot it for us.
|
||||||
**Email** sign-in (web) mails a branded six-digit confirmation code — localized
|
**Email** sign-in (web) mails a branded six-digit confirmation code — localized
|
||||||
(en/ru), no images — to the address; entering it signs the player in. A new address
|
(en/ru), no images — to the address; entering it signs the player in. A new address
|
||||||
is provisioned on the first request but only becomes a durable account once the code
|
is provisioned on the first request but only becomes a durable account once the code
|
||||||
@@ -224,7 +229,10 @@ brief warm-up shows on the first open otherwise — and falls back to the server
|
|||||||
local dictionary is unavailable. The dictionary check tool is
|
local dictionary is unavailable. The dictionary check tool is
|
||||||
unlimited and offers a complaint on any result; for a word it finds, it also links out to an
|
unlimited and offers a complaint on any result; for a word it finds, it also links out to an
|
||||||
external reference dictionary (gramota.ru for Russian games, scrabblewordfinder.org for
|
external reference dictionary (gramota.ru for Russian games, scrabblewordfinder.org for
|
||||||
English) to look it up. Hints are governed per game —
|
English) to look it up. While offline in an online game the check runs against the game's own
|
||||||
|
dictionary on the device — the same verdict as the server when that dictionary is available,
|
||||||
|
otherwise it reads *unavailable offline* — and the complaint and the external look-up, which both
|
||||||
|
need the network, are hidden. Hints are governed per game —
|
||||||
whether they are allowed and how many each player starts with — and draw on a
|
whether they are allowed and how many each player starts with — and draw on a
|
||||||
personal hint wallet once the per-game allowance is spent. Against the robot
|
personal hint wallet once the per-game allowance is spent. Against the robot
|
||||||
(**vs_ai**) hints are instead **unlimited and wallet-free**, but idle-gated as an
|
(**vs_ai**) hints are instead **unlimited and wallet-free**, but idle-gated as an
|
||||||
@@ -317,6 +325,17 @@ offline on its own, and restoring the network returns it online by itself. There
|
|||||||
switch to remember: a brief drop is ridden out quietly and only a sustained loss turns the chrome
|
switch to remember: a brief drop is ridden out quietly and only a sustained loss turns the chrome
|
||||||
offline, so you are never interrupted for a hiccup.
|
offline, so you are never interrupted for a hiccup.
|
||||||
|
|
||||||
|
**Losing the connection while inside an online game** is surfaced on **every platform, including the
|
||||||
|
Telegram/VK mini-apps** — unlike the offline-play mode above, which is web/native only — because an
|
||||||
|
online game needs the server for every move. A slim *connection lost* banner appears at the top of the
|
||||||
|
board and the play area **freezes**: the rack and the move controls disable, and the resign, the
|
||||||
|
add-friend/block and the chat/dictionary controls are hidden, while a move you had started stays on the
|
||||||
|
board as a draft. Nothing
|
||||||
|
is sent; when the connection returns the banner clears, the controls come back and you commit the move
|
||||||
|
yourself. If you were already in the chat or the dictionary when the drop happened you stay there — chat
|
||||||
|
becomes read-only (send and nudge disable) and the dictionary keeps checking words against the game's
|
||||||
|
on-device dictionary.
|
||||||
|
|
||||||
### Staying up to date
|
### Staying up to date
|
||||||
When a new client version is required, the app does not lock you out. On the **native** app a
|
When a new client version is required, the app does not lock you out. On the **native** app a
|
||||||
too-old build shows a notice with **Update** (opens the store) and **Play offline** (dismiss and keep
|
too-old build shows a notice with **Update** (opens the store) and **Play offline** (dismiss and keep
|
||||||
@@ -537,7 +556,8 @@ at any time (games already lost stay lost).
|
|||||||
|
|
||||||
Where the bot manages a channel's **linked discussion chat**, everyone may write by default and the
|
Where the bot manages a channel's **linked discussion chat**, everyone may write by default and the
|
||||||
bot **mutes** a player who is **not registered** or is **blocked**, un-muting them once they register
|
bot **mutes** a player who is **not registered** or is **blocked**, un-muting them once they register
|
||||||
or are unblocked. So an unregistered newcomer who comments is muted (the promo bot points them at the
|
or are unblocked. It also clears the automatic pin Telegram puts on each channel post that is
|
||||||
|
auto-forwarded into the chat, so only deliberately pinned messages stay pinned. So an unregistered newcomer who comments is muted (the promo bot points them at the
|
||||||
game to register, after which the bot restores their voice), and a registered, unblocked player simply
|
game to register, after which the bot restores their voice), and a registered, unblocked player simply
|
||||||
writes. An operator can also **mute a player in the chat only** — a `chat_muted` role on the user card —
|
writes. An operator can also **mute a player in the chat only** — a `chat_muted` role on the user card —
|
||||||
without a full account block; an account block mutes them in the chat regardless. Muting and unmuting
|
without a full account block; an account block mutes them in the chat regardless. Muting and unmuting
|
||||||
|
|||||||
@@ -32,12 +32,13 @@ top-1 подсказку, безлимитную проверку слова с
|
|||||||
главнее. Страница несёт статическую русскую SEO-«шапку» (title/description, карточка
|
главнее. Страница несёт статическую русскую SEO-«шапку» (title/description, карточка
|
||||||
Open Graph, которую используют превью ссылок в Telegram/VK, канонический адрес
|
Open Graph, которую используют превью ссылок в Telegram/VK, канонический адрес
|
||||||
продакшен-домена, JSON-LD, набор favicon и `robots.txt`), а оболочка SPA помечена
|
продакшен-домена, JSON-LD, набор favicon и `robots.txt`), а оболочка SPA помечена
|
||||||
`noindex` — индексируется только посадочная страница. В подвале — ссылки на **публичную
|
`noindex` — индексируется только посадочная страница. В подвале — ссылки на три **юридических
|
||||||
оферту** (`/offer/`) и рядом на **обратную связь** (тот самый Telegram-бот, который оферта
|
документа** — **пользовательское соглашение** (`/eula/`), **политику конфиденциальности**
|
||||||
указывает как контакт Продавца). Страница оферты (юридический документ, который принимается при
|
(`/privacy/`) и **публичную оферту** (`/offer/`) — и рядом на **обратную связь** (тот самый
|
||||||
покупке) рендерится по запросу из `ui/legal/offer_ru.md`, а её **перечень стоимости** (§4.4)
|
Telegram-бот, который документы указывают как контакт Продавца). Каждый — **двуязычный (RU/EN)** с
|
||||||
формируется из живого каталога товаров, поэтому опубликованные цены всегда совпадают с тем, что
|
переключателем языка и темы, рендерится из исходников `ui/legal/*_{ru,en}.md` сайдкаром-рендерером;
|
||||||
сейчас в продаже — без передеплоя.
|
оферта дополнительно подставляет **перечень стоимости** (§4.4), формируемый из живого каталога
|
||||||
|
товаров, поэтому опубликованные цены всегда совпадают с тем, что сейчас в продаже — без передеплоя.
|
||||||
|
|
||||||
В обычном вебе клиент — **устанавливаемое PWA**: незалогиненный игрок видит призыв к установке
|
В обычном вебе клиент — **устанавливаемое PWA**: незалогиненный игрок видит призыв к установке
|
||||||
под формой входа (и внизу «Настроек»), который в один тап ставит приложение на рабочий стол
|
под формой входа (и внизу «Настроек»), который в один тап ставит приложение на рабочий стол
|
||||||
@@ -76,7 +77,10 @@ launch-параметрам VK (их проверяет gateway), и при пе
|
|||||||
так как VK не кладёт имя в подписанный запуск). Пока тема в режиме «авто», приложение следует
|
так как VK не кладёт имя в подписанный запуск). Пока тема в режиме «авто», приложение следует
|
||||||
светлой/тёмной схеме VK-клиента, а раскладка обходит нижнюю home-bar VK на мобильных. Тот же экран
|
светлой/тёмной схеме VK-клиента, а раскладка обходит нижнюю home-bar VK на мобильных. Тот же экран
|
||||||
тихого повтора «не удалось
|
тихого повтора «не удалось
|
||||||
загрузить» действует и внутри VK.
|
загрузить» действует и внутри VK. Если открыть ссылку на мини-приложение прямо в обычном браузере —
|
||||||
|
вход `/vk/` без подписанного запуска VK или `/telegram/` без данных входа Telegram — показывается
|
||||||
|
компактный экран диагностики, которым можно поделиться, вместо того чтобы продолжить (гостем-однодневкой
|
||||||
|
на VK или редиректом прочь на Telegram), — чтобы игрок, случайно попавший туда, прислал нам скриншот.
|
||||||
**Email**-вход (в вебе) отправляет на адрес брендированный шестизначный код подтверждения —
|
**Email**-вход (в вебе) отправляет на адрес брендированный шестизначный код подтверждения —
|
||||||
локализованный (ru/en), без картинок; после ввода игрок входит. Новый адрес заводится при первом
|
локализованный (ru/en), без картинок; после ввода игрок входит. Новый адрес заводится при первом
|
||||||
запросе, но становится постоянным аккаунтом только после подтверждения кода — так брошенная,
|
запросе, но становится постоянным аккаунтом только после подтверждения кода — так брошенная,
|
||||||
@@ -232,7 +236,9 @@ e-mail) либо ввод фразы. Активные игры форфейтя
|
|||||||
короткий прогрев, — и уходит на сервер, если локальный словарь недоступен. Инструмент проверки слова безлимитный и
|
короткий прогрев, — и уходит на сервер, если локальный словарь недоступен. Инструмент проверки слова безлимитный и
|
||||||
предлагает пожаловаться на любой результат; для найденного слова он также даёт ссылку на
|
предлагает пожаловаться на любой результат; для найденного слова он также даёт ссылку на
|
||||||
внешний справочный словарь (gramota.ru для русских игр, scrabblewordfinder.org для английских),
|
внешний справочный словарь (gramota.ru для русских игр, scrabblewordfinder.org для английских),
|
||||||
чтобы его посмотреть. Подсказки управляются настройками
|
чтобы его посмотреть. В офлайне в онлайн-партии проверка идёт по собственному словарю партии на
|
||||||
|
устройстве — тот же вердикт, что и на сервере, если этот словарь доступен, иначе показывается
|
||||||
|
*недоступно офлайн*, — а жалоба и внешняя ссылка, которым нужна сеть, скрываются. Подсказки управляются настройками
|
||||||
партии — разрешены ли они и сколько их у каждого игрока на старте — и расходуют
|
партии — разрешены ли они и сколько их у каждого игрока на старте — и расходуют
|
||||||
личный кошелёк подсказок после исчерпания внутриигрового лимита. Против робота
|
личный кошелёк подсказок после исчерпания внутриигрового лимита. Против робота
|
||||||
(**vs_ai**) подсказки, наоборот, **безлимитны и без кошелька**, но с idle-гейтом как
|
(**vs_ai**) подсказки, наоборот, **безлимитны и без кошелька**, но с idle-гейтом как
|
||||||
@@ -323,6 +329,16 @@ e-mail) либо ввод фразы. Активные игры форфейтя
|
|||||||
кратковременный сбой пережидается тихо, и только устойчивая потеря переводит интерфейс в офлайн, так что
|
кратковременный сбой пережидается тихо, и только устойчивая потеря переводит интерфейс в офлайн, так что
|
||||||
вас не прерывают из-за короткой икоты.
|
вас не прерывают из-за короткой икоты.
|
||||||
|
|
||||||
|
**Потеря связи внутри онлайн-партии** показывается на **всех платформах, включая мини-приложения
|
||||||
|
Telegram/VK** — в отличие от офлайн-режима игры выше, который только для веба и нативного приложения, —
|
||||||
|
потому что онлайн-партии сервер нужен на каждый ход. Сверху доски появляется тонкий баннер *связь
|
||||||
|
потеряна*, и игровая область **замораживается**: рэк и ходовые кнопки отключаются, а «сдаться»,
|
||||||
|
«в друзья»/«заблокировать» и вход в чат/словарь скрываются; начатый ход остаётся на доске черновиком.
|
||||||
|
Ничего не отправляется;
|
||||||
|
когда связь возвращается, баннер исчезает, кнопки оживают, и ход отправляешь ты сам. Если связь упала,
|
||||||
|
когда ты уже был в чате или словаре, ты там и остаёшься — чат становится «только для чтения» (отправка
|
||||||
|
и nudge отключаются), а словарь продолжает проверять слова по словарю партии на устройстве.
|
||||||
|
|
||||||
### Актуальная версия
|
### Актуальная версия
|
||||||
Когда требуется новая версия клиента, приложение не блокирует вас наглухо. В **нативном** приложении
|
Когда требуется новая версия клиента, приложение не блокирует вас наглухо. В **нативном** приложении
|
||||||
слишком старая сборка показывает уведомление с **Обновить** (открывает магазин) и **Играть офлайн**
|
слишком старая сборка показывает уведомление с **Обновить** (открывает магазин) и **Играть офлайн**
|
||||||
@@ -551,7 +567,9 @@ high-rate флага. С карточки пользователя операт
|
|||||||
|
|
||||||
Там, где бот ведёт **привязанный к каналу чат-обсуждение**, по умолчанию писать может каждый, а бот
|
Там, где бот ведёт **привязанный к каналу чат-обсуждение**, по умолчанию писать может каждый, а бот
|
||||||
**глушит** игрока, который **не зарегистрирован** или **заблокирован**, и снимает мьют, как только тот
|
**глушит** игрока, который **не зарегистрирован** или **заблокирован**, и снимает мьют, как только тот
|
||||||
зарегистрируется или будет разблокирован. То есть незарегистрированного новичка, написавшего в чат,
|
зарегистрируется или будет разблокирован. Ещё бот убирает автоматический пин, который Telegram ставит
|
||||||
|
на каждый пост канала, авто-форварднутый в чат, — закреплёнными остаются только намеренно закреплённые
|
||||||
|
сообщения. То есть незарегистрированного новичка, написавшего в чат,
|
||||||
бот глушит (промо-бот направляет его в игру зарегистрироваться, после чего бот возвращает голос), а
|
бот глушит (промо-бот направляет его в игру зарегистрироваться, после чего бот возвращает голос), а
|
||||||
зарегистрированный незаблокированный игрок просто пишет. Оператор также может **замьютить игрока только
|
зарегистрированный незаблокированный игрок просто пишет. Оператор также может **замьютить игрока только
|
||||||
в чате** — роль `chat_muted` на карточке пользователя — без полной блокировки аккаунта; блокировка
|
в чате** — роль `chat_muted` на карточке пользователя — без полной блокировки аккаунта; блокировка
|
||||||
|
|||||||
@@ -0,0 +1,93 @@
|
|||||||
|
# Icon & logo asset map
|
||||||
|
|
||||||
|
> The whole shipped icon set is sliced from **one master**. This file is the per-platform
|
||||||
|
> **target map** (which file goes where, at what size). How the mark itself is constructed
|
||||||
|
> — proportions, palette, wood grain, the light/shadow gradients, the «Э» + ✻ placement,
|
||||||
|
> all in fractions of the side — is specified in [`ICON_BRANDBOOK.md`](ICON_BRANDBOOK.md).
|
||||||
|
> The reference generator, the pinned Spectral font and the committed masters live in
|
||||||
|
> [`../assets/icons/brand/`](../assets/icons/brand/).
|
||||||
|
|
||||||
|
## The master (one source, six layers)
|
||||||
|
|
||||||
|
`brand/build-icon.mjs` emits any `--variant light|dark` in any `--layer`:
|
||||||
|
|
||||||
|
| Layer | What | Feeds |
|
||||||
|
|---|---|---|
|
||||||
|
| `full` | rounded tile + master mark | `favicon.svg` |
|
||||||
|
| `flat` | square tile + master mark (OS rounds) | apple-touch, PWA "any", VK, TG, store |
|
||||||
|
| `background` | square tile only, full-bleed | Android adaptive background |
|
||||||
|
| `foreground` | mark only, transparent, re-placed for the round mask | Android adaptive foreground |
|
||||||
|
| `maskable` | square tile + foreground-placed mark | PWA `maskable` |
|
||||||
|
| `monochrome` | foreground-placed silhouette, flat colour | Android 13+ themed layer |
|
||||||
|
|
||||||
|
`brand/build-set.mjs` renders every raster below; `brand/build-android-res.mjs` renders
|
||||||
|
the Android launcher resources.
|
||||||
|
|
||||||
|
## Generated targets
|
||||||
|
|
||||||
|
### Web — `ui/public/` (via `brand/build-set.mjs`)
|
||||||
|
|
||||||
|
| File | Size | Note |
|
||||||
|
|---|---|---|
|
||||||
|
| `favicon.svg` | vector | **light + dark in one file** via `prefers-color-scheme` |
|
||||||
|
| `favicon.ico` | 32×32 | PNG-in-ICO; answers the blind `/favicon.ico` probe |
|
||||||
|
| `apple-touch-icon.png` | 180×180 | opaque full-bleed (iOS masks its own corners) |
|
||||||
|
| `icon-192.png` / `icon-512.png` | 192 / 512 | PWA `any`, light |
|
||||||
|
| `icon-192-dark.png` / `icon-512-dark.png` | 192 / 512 | dark variants (generated; see PWA note) |
|
||||||
|
| `icon-maskable-512.png` | 512×512 | PWA `maskable`, light |
|
||||||
|
| `icon-maskable-512-dark.png` | 512×512 | dark variant (generated; see PWA note) |
|
||||||
|
| `og-image.png` | 1200×630 | board-green card: master tile + «Эрудит» / Игра в слова |
|
||||||
|
|
||||||
|
### PWA — `ui/public/manifest.webmanifest`
|
||||||
|
|
||||||
|
Referenced icons are the **light** set (`icon-192`, `icon-512` = `any`;
|
||||||
|
`icon-maskable-512` = `maskable`). The manifest has **no reliable way to pick an icon by
|
||||||
|
colour scheme**, so the dark PNGs are **generated but not referenced** — theming the
|
||||||
|
in-browser tab is handled by `favicon.svg` instead. Wire the dark files in only if a
|
||||||
|
concrete installer target is known to honour them.
|
||||||
|
|
||||||
|
### Android — `ui/android/app/src/main/res/` (via `brand/build-android-res.mjs`)
|
||||||
|
|
||||||
|
Capacitor layer inputs are `ui/assets/{icon,icon-foreground,icon-background}.png`. The
|
||||||
|
resources are **hand-generated from the layers**, not `capacitor-assets` — our layers
|
||||||
|
already fill the 108 dp canvas (foreground inside the 61 % safe zone, background
|
||||||
|
full-bleed), so they must be placed with **no inset**, and we add the **monochrome**
|
||||||
|
themed layer, neither of which `capacitor-assets` does. Per density mdpi→xxxhdpi (+ldpi):
|
||||||
|
|
||||||
|
- `mipmap-*/ic_launcher.png` — legacy square (< API 26): the **full-bleed master** (large
|
||||||
|
mark), so old square launchers do not shrink it into the safe zone
|
||||||
|
- `mipmap-*/ic_launcher_round.png` — legacy round (< API 26): the safe-zone **composite**,
|
||||||
|
circle-clipped (a round mask would clip the master's corner ✻)
|
||||||
|
- `mipmap-*/ic_launcher_foreground.png` + `ic_launcher_background.png` — adaptive layers
|
||||||
|
- `mipmap-*/ic_launcher_monochrome.png` — themed layer
|
||||||
|
- `mipmap-anydpi-v26/ic_launcher.xml` + `ic_launcher_round.xml` — **no `<inset>`**, with
|
||||||
|
`<background>` + `<foreground>` + `<monochrome>` (committed by hand)
|
||||||
|
|
||||||
|
### iOS / iPhone / iPad — FUTURE
|
||||||
|
|
||||||
|
No iOS shell today. When one exists, `flat` (opaque, no alpha, no rounded corners; the OS
|
||||||
|
masks) drives the asset catalog — a single 1024×1024 marketing icon (Xcode derives the
|
||||||
|
rest), plus light/dark/tinted where the catalog supports it.
|
||||||
|
|
||||||
|
### VK / Telegram / store — manual upload (`brand/{vk,tg,store}/`)
|
||||||
|
|
||||||
|
Square, **no rounding** (each platform crops/rounds itself), light `flat`:
|
||||||
|
|
||||||
|
| Folder | Files | Use |
|
||||||
|
|---|---|---|
|
||||||
|
| `vk/` | `vk-576/278/150/32.png` | VK community / app icons |
|
||||||
|
| `tg/` | `tg-512.png` | Telegram bot avatar + Mini App icon (512, square; TG crops circular) |
|
||||||
|
| `tg/` | `tg-demo-640x360.png` | BotFather `/newapp` demo banner (tile + wordmark) |
|
||||||
|
| `store/` | `rustore-512.png` | RuStore app icon |
|
||||||
|
| RuStore | screenshots / feature graphic | per the RuStore listing spec (uploaded by hand) |
|
||||||
|
| Google Play (future) | icon / feature graphic | 512×512 / 1024×500 |
|
||||||
|
| App Store (future) | marketing icon / screenshots | 1024×1024 / per device class |
|
||||||
|
|
||||||
|
## Regenerate
|
||||||
|
|
||||||
|
```sh
|
||||||
|
cd assets/icons/brand
|
||||||
|
npm i # opentype.js (rasterisation reuses the ui package's chromium)
|
||||||
|
node build-set.mjs # web (ui/public) + Capacitor layers (ui/assets) + vk/ tg/ store/ + og
|
||||||
|
node build-android-res.mjs # Android launcher resources (all densities + monochrome)
|
||||||
|
```
|
||||||
@@ -0,0 +1,167 @@
|
|||||||
|
# Erudit app-icon — brand book
|
||||||
|
|
||||||
|
The single source of truth for **how the Erudit icon is constructed**. It is written to
|
||||||
|
be reproducible *from words alone*: a designer with this document and the Spectral font
|
||||||
|
can rebuild the icon exactly, at any size, without pixel-matching anything.
|
||||||
|
|
||||||
|
Two rules make that possible:
|
||||||
|
|
||||||
|
1. **The icon is a square.** Every size and position below is a **fraction of the
|
||||||
|
square's side** (equivalently, a percentage). Nothing is in pixels. Draw the square
|
||||||
|
at whatever resolution you need and scale each value to it.
|
||||||
|
2. **The origin is the top-left corner.** `x` grows right, `y` grows down. So "center
|
||||||
|
`48.1% / 49.2%`" means a point `0.481·side` from the left and `0.492·side` from the top.
|
||||||
|
|
||||||
|
The companion generator in [`../assets/icons/brand/`](../assets/icons/brand/) is the
|
||||||
|
machine version of this exact spec (`build-icon.mjs`, where each constant is the same
|
||||||
|
fraction printed here). The `docs/ICONS.md` map covers the *opposite* concern — which
|
||||||
|
files/sizes we slice this master into for each platform.
|
||||||
|
|
||||||
|
## Anatomy
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
Bottom-to-top the icon is six layers: **tile → wood grain → light sheen → shadow →
|
||||||
|
letter «Э» → star ✻**. The letter and star are always drawn last, at full ink colour;
|
||||||
|
the grain and the two gradients only ever touch the background.
|
||||||
|
|
||||||
|
## Palette
|
||||||
|
|
||||||
|
The icon ships as a **light** and a **dark** variant (a matched pair — the light tile
|
||||||
|
carries dark ink, the dark tile carries light ink). Each variant uses four colours.
|
||||||
|
|
||||||
|
| Role | Light | Dark |
|
||||||
|
|------|-------|------|
|
||||||
|
| **Tile** — the wooden body | `#e6b053` | `#4a3316` |
|
||||||
|
| **Ink** — the «Э» and the ✻ | `#5a3a12` | `#f2d9a0` |
|
||||||
|
| **Grain** — the vertical stripes | `#d8a54e` | `#432e14` |
|
||||||
|
| **Sheen** — diagonal light | white, α 0 → 15 % | white, α 0 → 15 % |
|
||||||
|
| **Shadow** — diagonal dark | black, α 15 → 0 % | black, α 15 → 0 % |
|
||||||
|
|
||||||
|
The grain colour is intentionally close to the tile — a hair darker — so the stripes
|
||||||
|
read as wood texture, not as stripes.
|
||||||
|
|
||||||
|
## 1 — Tile
|
||||||
|
|
||||||
|
A **square with rounded corners**, corner radius **17 %** of the side, filled with the
|
||||||
|
**Tile** colour. This is the whole background; there is no separate outer frame or
|
||||||
|
border. Corners are baked at 17 %; platform masks (iOS/Android) may round further on top.
|
||||||
|
|
||||||
|
## 2 — Wood grain
|
||||||
|
|
||||||
|
Subtle vertical planks over the tile:
|
||||||
|
|
||||||
|
- Divide the width into **6 equal columns** (each `1/6` of the side wide).
|
||||||
|
- On the **right edge of each column**, draw one **vertical stripe**, width **`1/32` of
|
||||||
|
the side** (≈ 3.1 %), running the full height.
|
||||||
|
- Move the **whole set of six stripes left** by **`1/16` of the side** (= two stripe
|
||||||
|
widths).
|
||||||
|
- **Tilt every stripe 4°** (clockwise, about its own centre).
|
||||||
|
- Draw the stripes **past the top and bottom edges** so the tilt leaves no empty corners,
|
||||||
|
then **clip the whole set to the tile** (so the rounded corners stay clean).
|
||||||
|
- Colour: **Grain**.
|
||||||
|
|
||||||
|
## 3 — Light sheen · 4 — Shadow
|
||||||
|
|
||||||
|
Two linear gradients along the **same diagonal**, from the **bottom-left corner to the
|
||||||
|
top-right corner**, each clipped to the tile and sitting **above the grain, below the
|
||||||
|
letter**:
|
||||||
|
|
||||||
|
- **Sheen** — white. Fully transparent at the bottom-left, rising to **15 % opacity** at
|
||||||
|
the top-right. Brightens the top-right.
|
||||||
|
- **Shadow** — black. **15 % opacity** at the bottom-left, fading to transparent at the
|
||||||
|
top-right. Deepens the bottom-left.
|
||||||
|
|
||||||
|
Together they give the tile a lit-from-the-top-right, resting-in-shadow-at-the-bottom-left
|
||||||
|
sense of depth. Both percentages are a tuning knob (`--sheen`, `--shade`).
|
||||||
|
|
||||||
|
## 5 — The letter «Э»
|
||||||
|
|
||||||
|
- Typeface: **Spectral, Bold** (SIL OFL; pinned in the brand folder).
|
||||||
|
- Glyph: the Cyrillic capital **«Э»** (U+042D).
|
||||||
|
- Size: scale the glyph so its **ink bounding box is 60.5 % of the side tall** (its width
|
||||||
|
then follows the font — about 53.2 %).
|
||||||
|
- Position: place the **center of that bounding box** at **48.1 % / 49.2 %** (just up and
|
||||||
|
left of the icon center).
|
||||||
|
- Colour: **Ink**.
|
||||||
|
|
||||||
|
## 6 — The star ✻
|
||||||
|
|
||||||
|
A **six-spoke teardrop asterisk** (the "score" mark that replaces a tile's point number):
|
||||||
|
|
||||||
|
- Each spoke tapers to a **point at the center** and ends in a **round bulb**; a central
|
||||||
|
disc equal to a bulb fuses the six spokes.
|
||||||
|
- Outer diameter: **17.3 % of the side**.
|
||||||
|
- Bulb radius (and the central disc): **22 % of the star's radius**.
|
||||||
|
- Position: center at **78.8 % / 78.8 %** — tucked to the lower-right of the «Э», like a
|
||||||
|
subscript, with a clear gap from the letter.
|
||||||
|
- Colour: **Ink**.
|
||||||
|
|
||||||
|
Spectral has no ✻ glyph, so the star is **drawn geometrically**, not set as type. The exact
|
||||||
|
construction is in `build-icon.mjs` (`starPath`).
|
||||||
|
|
||||||
|
## Composition intent
|
||||||
|
|
||||||
|
The «Э» and the ✻ are treated as **one group**. Its combined bounding box measures
|
||||||
|
about **65.9 % × 68.6 %** of the side, and it is placed so its **bottom-right corner sits
|
||||||
|
at 87.5 % / 87.5 %** of the icon (the lower-right corner of an inner `12.5 % … 87.5 %`
|
||||||
|
safe square). That is what pushes the composition down-and-right and leaves the star room
|
||||||
|
in the corner. When re-deriving positions, this is the anchor to preserve.
|
||||||
|
|
||||||
|
> This bottom-right bias suits a **full-bleed** icon (iOS / PWA / favicon, which show
|
||||||
|
> almost the whole square). Android crops more, so it uses a **separate two-layer build**
|
||||||
|
> — see the next section. The master itself is never moved for Android.
|
||||||
|
|
||||||
|
## Android adaptive icon (two layers)
|
||||||
|
|
||||||
|
Android icons are **108×108 dp** and the OS applies its own mask (circle, squircle,
|
||||||
|
rounded square…). Only the **inner 66 dp = 61 % of the side, centred** is guaranteed
|
||||||
|
visible under every mask; the outer ~1/6 ring is used for the mask and motion effects.
|
||||||
|
So Android is **not** the full-bleed master — it is built as two layers:
|
||||||
|
|
||||||
|
- **Background** — the tile with wood grain and the light/shadow gradients, **full-bleed
|
||||||
|
and square** (no rounded corners; the OS supplies the shape). It fills the whole 108 dp
|
||||||
|
layer, so the sacrificial outer ring is just more wood.
|
||||||
|
- **Foreground** — **only the «Э» + ✻**, transparent, **re-placed** to sit safely inside
|
||||||
|
the mask. The whole mark is the master's optical placement (nudged right 8 % / down 3 %)
|
||||||
|
scaled **0.75 about the icon centre** — **25 % smaller**, its «Э» ↔ ✻ arrangement
|
||||||
|
unchanged — so the ✻ that used to graze the round mask now sits well inside the **61 %
|
||||||
|
safe zone** with margin to spare:
|
||||||
|
- «Э»: box height **40.4 %**, box center **51.8 % / 49.6 %**.
|
||||||
|
- ✻: outer diameter **9.9 %** (smaller than the master's), center **69.7 % / 67.0 %**,
|
||||||
|
tucked closer to the letter.
|
||||||
|
|
||||||
|
Everything else (palette, grain, gradients, star construction) is identical to the master.
|
||||||
|
|
||||||
|
## Variants in use
|
||||||
|
|
||||||
|
The **light** variant is the primary icon (launcher, favicon, apple-touch, PWA). The
|
||||||
|
**dark** variant is shipped in addition wherever the platform can pick by appearance
|
||||||
|
(e.g. an SVG favicon via `prefers-color-scheme`). Where a platform allows only one icon,
|
||||||
|
use **light**.
|
||||||
|
|
||||||
|
## Reproduce
|
||||||
|
|
||||||
|
```sh
|
||||||
|
cd assets/icons/brand
|
||||||
|
npm i opentype.js
|
||||||
|
# full master (iOS / PWA / favicon), either variant:
|
||||||
|
node build-icon.mjs --variant light --layer full > icon-light.svg
|
||||||
|
# Android adaptive layers:
|
||||||
|
node build-icon.mjs --variant light --layer background > icon-light-android-background.svg
|
||||||
|
node build-icon.mjs --variant light --layer foreground > icon-light-android-foreground.svg
|
||||||
|
# the construction figure:
|
||||||
|
node build-icon.mjs --variant light --scheme > icon-construction.svg
|
||||||
|
node render-png.mjs icon-light.svg icon-light.png 1024 # any size
|
||||||
|
```
|
||||||
|
|
||||||
|
`--layer` is `full` (default), `background`, or `foreground`. All outputs are committed
|
||||||
|
alongside the generator in [`../assets/icons/brand/`](../assets/icons/brand/).
|
||||||
|
|
||||||
|
## Masters
|
||||||
|
|
||||||
|
| | Light | Dark |
|
||||||
|
|-|-------|------|
|
||||||
|
| **Full** (iOS / PWA / favicon) |  |  |
|
||||||
|
| **Android background** |  |  |
|
||||||
|
| **Android foreground** |  |  |
|
||||||
@@ -57,6 +57,21 @@ for outside the store's own cash desk. Chips funded inside VK (Votes) may only b
|
|||||||
the VK context; Stars only inside Telegram; Robokassa-funded (`direct`) chips only outside
|
the VK context; Stars only inside Telegram; Robokassa-funded (`direct`) chips only outside
|
||||||
the stores. See §4.
|
the stores. See §4.
|
||||||
|
|
||||||
|
**Multi-shop direct rail (D42).** The `direct` rail routes to one Robokassa **merchant shop per
|
||||||
|
channel** — `web` and `android` (RuStore), `ios` later — chosen by the trusted `X-Platform` subtype;
|
||||||
|
every shop credits the one `direct` wallet (no per-channel wallet). This is merchant-account
|
||||||
|
separation for accounting / receipts only: the order records its `shop` (shown in the admin report),
|
||||||
|
and each shop's Result callback is verified by its own Password2 at `/pay/robokassa/result/<channel>`.
|
||||||
|
Standalone apps (Android/iOS) sign in by email only, so a direct purchase always has the D36 email
|
||||||
|
anchor (D43). Fiscalization (54-ФЗ via the Robokassa cabinet under one ИП) is a single source
|
||||||
|
regardless of the number of shops (D41).
|
||||||
|
|
||||||
|
**Payment availability kill switch (D45/D46).** An operator can disable purchases on a rail/channel
|
||||||
|
(`direct:web` / `direct:android` / `vk` / `telegram`) or for one account, live from `/_gm`, and the
|
||||||
|
user sees a localized reason on their next attempt (`payment_unavailable`, carried on the additive
|
||||||
|
`ExecuteResponse.message`). **Fail-open:** a rail with no status row is enabled. A per-account
|
||||||
|
`allow` override bypasses only this operational switch, never the security gates (D46).
|
||||||
|
|
||||||
## 3. Three operations, kept distinct
|
## 3. Three operations, kept distinct
|
||||||
|
|
||||||
Do not conflate these — they use different keys:
|
Do not conflate these — they use different keys:
|
||||||
|
|||||||
@@ -201,7 +201,9 @@ web+PWA / native Android+iOS через Capacitor). Владелец (самоз
|
|||||||
начисления): Фишки, подсказки, дни-без-рекламы, участие-в-турнире. **Продукт = набор
|
начисления): Фишки, подсказки, дни-без-рекламы, участие-в-турнире. **Продукт = набор
|
||||||
атомов + цена** (по одной ценности или комбо). «Пакет Фишек» — цена **per-метод**
|
атомов + цена** (по одной ценности или комбо). «Пакет Фишек» — цена **per-метод**
|
||||||
(мультивалютная: Голоса/Stars/руб — один продукт, D2). «Ценность за Фишки» — цена в
|
(мультивалютная: Голоса/Stars/руб — один продукт, D2). «Ценность за Фишки» — цена в
|
||||||
Фишках (единая). Курсы покупки Фишек и Фишки за rewarded — тоже в каталоге.
|
Фишках (единая). Курсы покупки Фишек и Фишки за rewarded — тоже в каталоге. (Ставка
|
||||||
|
rewarded + дневной/часовой потолки — строка общего конфига `payments.config`, правится в
|
||||||
|
секции «Rewarded ads» на странице каталога админки; это не продаваемый продукт-атом.)
|
||||||
- **D33. Стекинг «без рекламы»:** `paid_until[origin] += срок` от `max(now, текущий
|
- **D33. Стекинг «без рекламы»:** `paid_until[origin] += срок` от `max(now, текущий
|
||||||
конец)` (остаток не теряется, «плюсуются» как в документе). «Навсегда» — отдельный
|
конец)` (остаток не теряется, «плюсуются» как в документе). «Навсегда» — отдельный
|
||||||
вечный флаг (перекрывает сроки). Бонусы «(+50)» — маркетинговая пометка владельца;
|
вечный флаг (перекрывает сроки). Бонусы «(+50)» — маркетинговая пометка владельца;
|
||||||
@@ -232,11 +234,53 @@ web+PWA / native Android+iOS через Capacitor). Владелец (самоз
|
|||||||
- **D40. Финансовый отчёт per-user в `/_gm`** — балансы сегментов, платежи, траты,
|
- **D40. Финансовый отчёт per-user в `/_gm`** — балансы сегментов, платежи, траты,
|
||||||
гранты, возвраты, полная история — расширение существующей карточки
|
гранты, возвраты, полная история — расширение существующей карточки
|
||||||
(`UserDetailView`, `handlers_admin_console.go:343`). Плюс экспорт журнала (D27).
|
(`UserDetailView`, `handlers_admin_console.go:343`). Плюс экспорт журнала (D27).
|
||||||
- **D41. Налоги/чеки — авто через провайдера.** **Robokassa** (direct) — авточек НПД
|
- **D41. Налоги/чеки — авто через провайдера (ревизия: владелец переходит на ИП).**
|
||||||
(режим самозанятого). **VK** — сам процессит Голоса через налоговую (владельцу делать
|
**Robokassa** (direct) — фискальный чек по **54-ФЗ** через облачную кассу Robokassa
|
||||||
нечего). **TG Stars** — налоговой стороны нет (для РФ-самозанятого невыводимы легально
|
(провайдер как фискальный агент): чек формирует касса, не банк (банковский слип об оплате —
|
||||||
= не доход по НПД; принимаем, чек не формируем). ОРД по VK-рекламе — на стороне VK.
|
отдельный документ, не фискальный чек). Настраивается владельцем в ЛКК Robokassa
|
||||||
*(Не юридическая консультация — точную схему НПД владелец сверяет с налоговой стороной.)*
|
(касса + ОФД + СНО). Код — опционально: слать детализированный `Receipt` + `Email`
|
||||||
|
покупателя (берём подтверждённый email-якорь D36) → чек с точным названием пакета и ставкой
|
||||||
|
по СНО; иначе — обобщённый дефолт-чек из кабинета. `Receipt` входит в подпись
|
||||||
|
(`MerchantLogin:OutSum:InvId:Receipt:Пароль#1`, URL-кодируется), одна позиция влезает в
|
||||||
|
текущий GET-redirect (POST-форма — фолбэк на длину URL). Источник чеков один — ИП/касса,
|
||||||
|
независимо от числа магазинов Robokassa. **VK** — процессит Голоса через налоговую сам.
|
||||||
|
**TG Stars** — вне рублёвого фискального контура (принимаем, чек не формируем). ОРД по
|
||||||
|
VK-рекламе — на стороне VK. *(Не юрконсультация — схему по 54-ФЗ/СНО владелец сверяет с
|
||||||
|
бухгалтером.)*
|
||||||
|
- **D42. Direct-рельс — несколько магазинов Robokassa = маршрутизация merchant-аккаунтов по
|
||||||
|
каналу при едином кошельке.** Кошелёк `direct` остаётся один. Отдельные магазины Robokassa
|
||||||
|
(web, android; ios — позже) различаются только кредами / Return-URL / учётом и **все
|
||||||
|
зачисляют в сегмент `direct`**. Модель кошельков, стенка трат и origin бенефитов не меняются.
|
||||||
|
Магазин выбирается по трастовому сигналу канала (`X-Platform` вида `<kind>/<subtype>`:
|
||||||
|
`direct/web`, `direct/android`), а не по подделываемому клиентскому полю; неизвестный подтип
|
||||||
|
→ магазин `web` (безопасный дефолт). Зачисление от выбора магазина не зависит (всегда
|
||||||
|
`direct`), поэтому ошибка маршрутизации влияет максимум на учёт, не на деньги.
|
||||||
|
- **D43. Standalone-приложения (Android, iOS) — вход только по email; покупка требует
|
||||||
|
email-якорь.** В нативной сборке доступны только guest + email: VK ID-логин (full-page
|
||||||
|
redirect на `id.vk.com`) не возвращается в Capacitor, TG Login Widget в WebView ненадёжен —
|
||||||
|
это уже действующая реальность сборки, не новое ограничение. Direct-покупка требует
|
||||||
|
подтверждённого email-якоря (D36) — он же адрес фискального чека (D41); гость не покупает.
|
||||||
|
Отдельный сегмент `apple` НЕ заводим: iOS-standalone — тот же `direct`-контекст, внешний гейт
|
||||||
|
(Robokassa) фондирует единый `direct`. Сегмент `apple` со стенкой (по образцу vk/tg)
|
||||||
|
понадобился бы только при Apple IAP (StoreKit) — отложено до решения по iOS; и identity-kind
|
||||||
|
`apple→direct`, и отдельный сегмент — аддитивны, без риска, делаются на месте.
|
||||||
|
- **D44. Канал платежа хранится на заказе для раздельного учёта/отчёта.** Заказ получает поле
|
||||||
|
`shop` (web/android/…) — аддитивная колонка. Используется в финансовом отчёте (D40) для
|
||||||
|
разбивки «из какого магазина/канала платёж». На зачисление и на сегмент кошелька не влияет
|
||||||
|
(всегда `direct`, D42).
|
||||||
|
- **D45. Рубильник платежей per-rail + локализованное сообщение.** Оператор выключает покупки на
|
||||||
|
рельсе/канале (`direct:web`/`direct:android`/`vk`/`telegram`) живьём из `/_gm` (таблица
|
||||||
|
`payments.rail_status`, редактируется на странице каталога). **Fail-open:** нет строки → рельс
|
||||||
|
включён (случайно не убить платежи). Выключенный рельс на попытке покупки возвращает
|
||||||
|
`payment_unavailable` + сообщение админа на языке юзера (RU/EN; пусто → встроенное «временно
|
||||||
|
недоступно»). Сообщение едет клиенту через аддитивное `ExecuteResponse.message` (envelope-слой,
|
||||||
|
frozen-contract-safe). Гейт ортогонален security-гейтам.
|
||||||
|
- **D46. Per-user override покупок (allow/deny/default).** На карточке юзера (`/_gm`) —
|
||||||
|
переопределение на аккаунт: `allow` (всегда разрешить), `deny` (всегда запретить), `default` (по
|
||||||
|
рельс-рубильнику). Хранится в `payments.account_payment_override` строкой только для не-default
|
||||||
|
(нет строки = default; снять = удалить строку). **`allow` обходит ТОЛЬКО ops-рубильник, НЕ
|
||||||
|
security-гейты** (D36 email-якорь, VK-iOS-фриз, trusted-платформа, min-client-version) — те
|
||||||
|
проверяются отдельно в CreateOrder.
|
||||||
|
|
||||||
## Заметки к оформлению документов
|
## Заметки к оформлению документов
|
||||||
|
|
||||||
@@ -252,10 +296,17 @@ web+PWA / native Android+iOS через Capacitor). Владелец (самоз
|
|||||||
ведёт к пропускам. Текст — только для фиксации решённого и пояснений. Усилить
|
ведёт к пропускам. Текст — только для фиксации решённого и пояснений. Усилить
|
||||||
feedback-память `prefer-interview-mode` после plan mode.
|
feedback-память `prefer-interview-mode` после plan mode.
|
||||||
|
|
||||||
## Все развилки закрыты (D1-D41)
|
## Все развилки закрыты (D1-D46)
|
||||||
|
|
||||||
Интервью завершено. Дальше — оформление документов и реализация по релизам.
|
Интервью завершено. Дальше — оформление документов и реализация по релизам.
|
||||||
|
|
||||||
|
**Дополнение 2026-07-14 (интервью с владельцем).** D41 ревизована (владелец переходит на
|
||||||
|
ИП: 54-ФЗ через облачную кассу Robokassa вместо авточека НПД); добавлены D42-D44 — сплит
|
||||||
|
`direct`-рельса Robokassa на магазины по каналу (web/android; ios позже) при едином кошельке
|
||||||
|
`direct` и входе email-only в standalone-приложениях (этап E10 в `PLAN.md`). Плюс D45-D46 —
|
||||||
|
рубильник платежей per-rail + локализованное сообщение + per-user override (этап E11). Фискализация
|
||||||
|
(B4) — кабинетная на стороне Robokassa, itemized-код не делаем (решение владельца).
|
||||||
|
|
||||||
## План внедрения (черновик PLAN.md — «слоями»)
|
## План внедрения (черновик PLAN.md — «слоями»)
|
||||||
|
|
||||||
Владелец выбрал слоёную стратегию: сначала вся механика без реальных денег (обкатка
|
Владелец выбрал слоёную стратегию: сначала вся механика без реальных денег (обкатка
|
||||||
|
|||||||
@@ -57,6 +57,21 @@
|
|||||||
в контексте VK; Stars — только внутри Telegram; Фишки от Robokassa (`direct`) — только вне
|
в контексте VK; Stars — только внутри Telegram; Фишки от Robokassa (`direct`) — только вне
|
||||||
сторов. См. §4.
|
сторов. См. §4.
|
||||||
|
|
||||||
|
**Мультимагазинный direct-рельс (D42).** Рельс `direct` маршрутизирует в отдельный магазин
|
||||||
|
Robokassa **на канал** — `web` и `android` (RuStore), позже `ios` — по трастовому подтипу
|
||||||
|
`X-Platform`; каждый магазин зачисляет в единый кошелёк `direct` (отдельных кошельков на канал нет).
|
||||||
|
Это разделение merchant-аккаунтов только для учёта / чеков: заказ хранит свой `shop` (виден в
|
||||||
|
админ-отчёте), а Result-колбэк каждого магазина проверяется своим Password2 по
|
||||||
|
`/pay/robokassa/result/<channel>`. В standalone-приложениях (Android/iOS) вход только по email, поэтому
|
||||||
|
у direct-покупки всегда есть email-якорь D36 (D43). Фискализация (54-ФЗ через кабинет Robokassa под
|
||||||
|
одним ИП) — один источник независимо от числа магазинов (D41).
|
||||||
|
|
||||||
|
**Рубильник платежей (D45/D46).** Оператор выключает покупки на рельсе/канале (`direct:web` /
|
||||||
|
`direct:android` / `vk` / `telegram`) или для одного аккаунта, живьём из `/_gm`, и юзер на следующей
|
||||||
|
попытке видит локализованную причину (`payment_unavailable`, едет на аддитивном
|
||||||
|
`ExecuteResponse.message`). **Fail-open:** рельс без строки статуса — включён. Per-account `allow`
|
||||||
|
обходит только этот ops-рубильник, не security-гейты (D46).
|
||||||
|
|
||||||
## 3. Три операции, которые нельзя путать
|
## 3. Три операции, которые нельзя путать
|
||||||
|
|
||||||
Не смешивать — у них разные ключи:
|
Не смешивать — у них разные ключи:
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ tests or touching CI.
|
|||||||
in the **offline guest lobby** (not `/login`), plays a local vs_ai move from the **bundled** dawg tier
|
in the **offline guest lobby** (not `/login`), plays a local vs_ai move from the **bundled** dawg tier
|
||||||
(`playwright.config.ts` bundles the dicts into `dist-e2e/dict/`), starts a hotseat game, and drives
|
(`playwright.config.ts` bundles the dicts into `dist-e2e/dict/`), starts a hotseat game, and drives
|
||||||
`window.__native.reconcile()` to prove online lights up — the device-local game stays listed in the
|
`window.__native.reconcile()` to prove online lights up — the device-local game stays listed in the
|
||||||
**unified lobby** (closing G-step-0) — and Profile hides the Telegram/VK link buttons.
|
**unified lobby** — and Profile hides the Telegram/VK link buttons.
|
||||||
The **version-gate** spec (`e2e/update.spec.ts`) drives the `__update` hook to prove both tiers — the
|
The **version-gate** spec (`e2e/update.spec.ts`) drives the `__update` hook to prove both tiers — the
|
||||||
hard *Update / Play offline* notice (and that "Play offline" drops into the offline lobby) and the soft
|
hard *Update / Play offline* notice (and that "Play offline" drops into the offline lobby) and the soft
|
||||||
dismissable *update available* nudge in the lobby; `retry.test.ts` covers the `FailedPrecondition →
|
dismissable *update available* nudge in the lobby; `retry.test.ts` covers the `FailedPrecondition →
|
||||||
|
|||||||
@@ -121,7 +121,8 @@ web code exchange via `internal/vkid`, and both forward the trusted `external_id
|
|||||||
Rate-limit defaults (built-in): public 30/min·IP (burst 10), authenticated
|
Rate-limit defaults (built-in): public 30/min·IP (burst 10), authenticated
|
||||||
300/min·user (burst 80, sized for multi-device play), admin
|
300/min·user (burst 80, sized for multi-device play), admin
|
||||||
60/min·IP (burst 20, guarding the `/_gm` mount ahead of its Basic-Auth),
|
60/min·IP (burst 20, guarding the `/_gm` mount ahead of its Basic-Auth),
|
||||||
email-code 5/10 min·IP (burst 2).
|
email-code 5/10 min·IP (burst 4, covering request + a mistyped code + the
|
||||||
|
correct one; defence-in-depth over the backend's per-code 5-attempt/15-min cap).
|
||||||
|
|
||||||
Every rejection increments `gateway_rate_limited_total{class}`
|
Every rejection increments `gateway_rate_limited_total{class}`
|
||||||
(`user`/`public`/`email`/`admin`) and logs one Debug line; a reporter drains the
|
(`user`/`public`/`email`/`admin`) and logs one Debug line; a reporter drains the
|
||||||
|
|||||||
@@ -498,10 +498,15 @@ type robokassaResultResp struct {
|
|||||||
|
|
||||||
// RobokassaResult forwards a Robokassa Result callback's parameters to the backend intake (the
|
// RobokassaResult forwards a Robokassa Result callback's parameters to the backend intake (the
|
||||||
// single writer, which verifies the signature and credits) and returns the body to echo to
|
// single writer, which verifies the signature and credits) and returns the body to echo to
|
||||||
// Robokassa ("OK<InvId>"). params carries the provider's raw form fields.
|
// Robokassa ("OK<InvId>"). params carries the provider's raw form fields; channel selects the
|
||||||
func (c *Client) RobokassaResult(ctx context.Context, params map[string]string) (string, error) {
|
// per-shop signature verifier (empty → the web shop).
|
||||||
|
func (c *Client) RobokassaResult(ctx context.Context, channel string, params map[string]string) (string, error) {
|
||||||
var out robokassaResultResp
|
var out robokassaResultResp
|
||||||
err := c.do(ctx, http.MethodPost, "/api/v1/internal/payments/robokassa/result", "", "", params, &out)
|
path := "/api/v1/internal/payments/robokassa/result"
|
||||||
|
if channel != "" {
|
||||||
|
path += "?channel=" + url.QueryEscape(channel)
|
||||||
|
}
|
||||||
|
err := c.do(ctx, http.MethodPost, path, "", "", params, &out)
|
||||||
return out.Response, err
|
return out.Response, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -139,6 +139,26 @@ func platformFromContext(ctx context.Context) string {
|
|||||||
return p
|
return p
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// clientIPCtxKey types the request-context slot the originating client IP rides in.
|
||||||
|
type clientIPCtxKey struct{}
|
||||||
|
|
||||||
|
// WithClientIP returns a copy of ctx carrying the originating client IP that do injects as
|
||||||
|
// X-Forwarded-For on every downstream backend request — so the backend records the real caller
|
||||||
|
// (the account's last-login IP, chat/feedback moderation, the access log) rather than the gateway's
|
||||||
|
// own connection. An empty IP leaves ctx unchanged, so no header is sent.
|
||||||
|
func WithClientIP(ctx context.Context, ip string) context.Context {
|
||||||
|
if ip == "" {
|
||||||
|
return ctx
|
||||||
|
}
|
||||||
|
return context.WithValue(ctx, clientIPCtxKey{}, ip)
|
||||||
|
}
|
||||||
|
|
||||||
|
// clientIPFromContext returns the client IP stored by WithClientIP, or an empty string when none.
|
||||||
|
func clientIPFromContext(ctx context.Context) string {
|
||||||
|
ip, _ := ctx.Value(clientIPCtxKey{}).(string)
|
||||||
|
return ip
|
||||||
|
}
|
||||||
|
|
||||||
// do performs one REST call. userID, when non-empty, is forwarded as X-User-ID;
|
// do performs one REST call. userID, when non-empty, is forwarded as X-User-ID;
|
||||||
// clientIP, when non-empty, as X-Forwarded-For (for chat moderation); the trusted
|
// clientIP, when non-empty, as X-Forwarded-For (for chat moderation); the trusted
|
||||||
// platform carried on ctx (see WithPlatform), when present, as X-Platform. A non-2xx
|
// platform carried on ctx (see WithPlatform), when present, as X-Platform. A non-2xx
|
||||||
@@ -160,6 +180,13 @@ func (c *Client) do(ctx context.Context, method, path, userID, clientIP string,
|
|||||||
if userID != "" {
|
if userID != "" {
|
||||||
req.Header.Set("X-User-ID", userID)
|
req.Header.Set("X-User-ID", userID)
|
||||||
}
|
}
|
||||||
|
// The client IP rides X-Forwarded-For so the backend records the real caller. It comes from the
|
||||||
|
// explicit param (chat/feedback) or, for every other call, the request context (WithClientIP, set
|
||||||
|
// once per request in the Connect edge) — so the backend never falls back to the gateway's own
|
||||||
|
// connection address.
|
||||||
|
if clientIP == "" {
|
||||||
|
clientIP = clientIPFromContext(ctx)
|
||||||
|
}
|
||||||
if clientIP != "" {
|
if clientIP != "" {
|
||||||
req.Header.Set("X-Forwarded-For", clientIP)
|
req.Header.Set("X-Forwarded-For", clientIP)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -122,3 +122,44 @@ func TestXPlatformInjection(t *testing.T) {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestXForwardedForInjection verifies the client IP carried on the context (WithClientIP) rides every
|
||||||
|
// backend call as X-Forwarded-For — not just chat/feedback, which pass it explicitly — so the backend
|
||||||
|
// records the real caller (e.g. the account's last-login IP on the profile fetch) rather than the
|
||||||
|
// gateway's own connection. Absent when no client IP is set.
|
||||||
|
func TestXForwardedForInjection(t *testing.T) {
|
||||||
|
var gotXFF string
|
||||||
|
var hadHeader bool
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
gotXFF = r.Header.Get("X-Forwarded-For")
|
||||||
|
_, hadHeader = r.Header["X-Forwarded-For"]
|
||||||
|
_, _ = w.Write([]byte(`{}`))
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
c, err := backendclient.New(srv.URL, "localhost:9090", 2*time.Second)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("backendclient: %v", err)
|
||||||
|
}
|
||||||
|
defer func() { _ = c.Close() }()
|
||||||
|
|
||||||
|
t.Run("client IP on ctx rides a non-chat call", func(t *testing.T) {
|
||||||
|
ctx := backendclient.WithClientIP(context.Background(), "203.0.113.7")
|
||||||
|
if _, err := c.Profile(ctx, "user-1"); err != nil {
|
||||||
|
t.Fatalf("Profile: %v", err)
|
||||||
|
}
|
||||||
|
if gotXFF != "203.0.113.7" {
|
||||||
|
t.Fatalf("X-Forwarded-For = %q, want 203.0.113.7", gotXFF)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("no client IP omits the header", func(t *testing.T) {
|
||||||
|
hadHeader = true
|
||||||
|
if _, err := c.Profile(context.Background(), "user-1"); err != nil {
|
||||||
|
t.Fatalf("Profile: %v", err)
|
||||||
|
}
|
||||||
|
if hadHeader {
|
||||||
|
t.Fatal("X-Forwarded-For must be absent when no client IP is set")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|||||||
@@ -165,7 +165,12 @@ func DefaultRateLimit() RateLimitConfig {
|
|||||||
// because multi-device play tripped the old 120/40.
|
// because multi-device play tripped the old 120/40.
|
||||||
UserPerMinute: 300, UserBurst: 80,
|
UserPerMinute: 300, UserBurst: 80,
|
||||||
AdminPerMinute: 60, AdminBurst: 20,
|
AdminPerMinute: 60, AdminBurst: 20,
|
||||||
EmailPer10Min: 5, EmailBurst: 2,
|
// Email-code path (per IP), defence-in-depth over the backend's own per-code guards
|
||||||
|
// (a 5-attempt cap + 15-min TTL + per-recipient send throttle). Burst 4 so the honest flow
|
||||||
|
// — request a code, mistype once or twice, then enter the right one — is not throttled
|
||||||
|
// mid-login: a request + wrong-code + right-code sequence exhausted the old burst of 2 and
|
||||||
|
// tripped the limit on the correct code, which the client mis-read as going offline.
|
||||||
|
EmailPer10Min: 5, EmailBurst: 4,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,47 @@
|
|||||||
|
package connectsrv
|
||||||
|
|
||||||
|
import "net/http"
|
||||||
|
|
||||||
|
// nativeWebViewOrigins are the browser Origins of the packaged native apps. Capacitor serves the
|
||||||
|
// bundled SPA from a localhost scheme, so its Connect calls to the gateway are cross-origin; the web
|
||||||
|
// app is same-origin and needs no entry. Requests carry Authorization, so the allowlist reflects the
|
||||||
|
// exact origin rather than "*".
|
||||||
|
var nativeWebViewOrigins = map[string]bool{
|
||||||
|
"https://localhost": true, // Capacitor Android (default https scheme)
|
||||||
|
"http://localhost": true, // Capacitor with the http scheme
|
||||||
|
"capacitor://localhost": true, // Capacitor iOS default scheme
|
||||||
|
}
|
||||||
|
|
||||||
|
// withNativeCORS answers the CORS preflight and adds the CORS response headers for the packaged
|
||||||
|
// native apps' cross-origin calls to the Connect edge. Without it the WebView blocks every RPC on the
|
||||||
|
// preflight (the gateway otherwise returns 405 with no Access-Control-Allow-Origin), so a native
|
||||||
|
// build can never reach the gateway and stays stuck offline. Same-origin (web) and any non-native
|
||||||
|
// origin are untouched.
|
||||||
|
func withNativeCORS(next http.Handler) http.Handler {
|
||||||
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
origin := r.Header.Get("Origin")
|
||||||
|
if nativeWebViewOrigins[origin] {
|
||||||
|
h := w.Header()
|
||||||
|
h.Set("Access-Control-Allow-Origin", origin)
|
||||||
|
h.Add("Vary", "Origin")
|
||||||
|
h.Set("Access-Control-Allow-Credentials", "true")
|
||||||
|
// The client interceptor reads the soft-tier update signal off the response.
|
||||||
|
h.Set("Access-Control-Expose-Headers", "X-Update-Recommended")
|
||||||
|
if r.Method == http.MethodOptions {
|
||||||
|
h.Set("Access-Control-Allow-Methods", "GET, POST, OPTIONS")
|
||||||
|
// Reflect the requested headers (the origin is already allowlisted): the Connect client
|
||||||
|
// sends Connect-Protocol-Version / Connect-Timeout-Ms plus X-Client-Version and
|
||||||
|
// Authorization, and the exact set varies by call.
|
||||||
|
if reqHeaders := r.Header.Get("Access-Control-Request-Headers"); reqHeaders != "" {
|
||||||
|
h.Set("Access-Control-Allow-Headers", reqHeaders)
|
||||||
|
} else {
|
||||||
|
h.Set("Access-Control-Allow-Headers", "Content-Type, Connect-Protocol-Version, X-Client-Version, Authorization")
|
||||||
|
}
|
||||||
|
h.Set("Access-Control-Max-Age", "86400")
|
||||||
|
w.WriteHeader(http.StatusNoContent)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
next.ServeHTTP(w, r)
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
package connectsrv
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestWithNativeCORS(t *testing.T) {
|
||||||
|
next := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) })
|
||||||
|
h := withNativeCORS(next)
|
||||||
|
|
||||||
|
// Native-origin preflight → 204 with the CORS headers, reflecting the requested headers, without
|
||||||
|
// reaching the inner handler.
|
||||||
|
req := httptest.NewRequest(http.MethodOptions, "/scrabble.edge.v1.Gateway/Execute", nil)
|
||||||
|
req.Header.Set("Origin", "https://localhost")
|
||||||
|
req.Header.Set("Access-Control-Request-Method", "POST")
|
||||||
|
req.Header.Set("Access-Control-Request-Headers", "content-type,connect-protocol-version,x-client-version")
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
h.ServeHTTP(rec, req)
|
||||||
|
if rec.Code != http.StatusNoContent {
|
||||||
|
t.Fatalf("preflight status = %d, want 204", rec.Code)
|
||||||
|
}
|
||||||
|
if got := rec.Header().Get("Access-Control-Allow-Origin"); got != "https://localhost" {
|
||||||
|
t.Errorf("Allow-Origin = %q, want https://localhost", got)
|
||||||
|
}
|
||||||
|
if got := rec.Header().Get("Access-Control-Allow-Headers"); got != "content-type,connect-protocol-version,x-client-version" {
|
||||||
|
t.Errorf("Allow-Headers = %q, want the reflected set", got)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Native-origin POST → the CORS headers are set and the inner handler runs.
|
||||||
|
req = httptest.NewRequest(http.MethodPost, "/scrabble.edge.v1.Gateway/Execute", nil)
|
||||||
|
req.Header.Set("Origin", "capacitor://localhost")
|
||||||
|
rec = httptest.NewRecorder()
|
||||||
|
h.ServeHTTP(rec, req)
|
||||||
|
if rec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("POST status = %d, want 200 (passed through)", rec.Code)
|
||||||
|
}
|
||||||
|
if got := rec.Header().Get("Access-Control-Allow-Origin"); got != "capacitor://localhost" {
|
||||||
|
t.Errorf("POST Allow-Origin = %q, want capacitor://localhost", got)
|
||||||
|
}
|
||||||
|
|
||||||
|
// A non-native origin gets no CORS headers and still passes through (web is same-origin anyway).
|
||||||
|
req = httptest.NewRequest(http.MethodPost, "/scrabble.edge.v1.Gateway/Execute", nil)
|
||||||
|
req.Header.Set("Origin", "https://evil.example")
|
||||||
|
rec = httptest.NewRecorder()
|
||||||
|
h.ServeHTTP(rec, req)
|
||||||
|
if rec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("non-native POST status = %d, want 200", rec.Code)
|
||||||
|
}
|
||||||
|
if got := rec.Header().Get("Access-Control-Allow-Origin"); got != "" {
|
||||||
|
t.Errorf("non-native Allow-Origin = %q, want empty", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package connectsrv
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
func TestRobokassaChannel(t *testing.T) {
|
||||||
|
cases := map[string]string{
|
||||||
|
"/pay/robokassa/result": "", // legacy bare path → the backend defaults to the web shop
|
||||||
|
"/pay/robokassa/result/": "", // trailing slash, no channel → the web default
|
||||||
|
"/pay/robokassa/result/web": "web",
|
||||||
|
"/pay/robokassa/result/android": "android",
|
||||||
|
}
|
||||||
|
for path, want := range cases {
|
||||||
|
if got := robokassaChannel(path); got != want {
|
||||||
|
t.Errorf("robokassaChannel(%q) = %q, want %q", path, got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -274,8 +274,11 @@ func (s *Server) HTTPHandler() http.Handler {
|
|||||||
mux.Handle("/dict/", s.dictBytesHandler())
|
mux.Handle("/dict/", s.dictBytesHandler())
|
||||||
mux.Handle("/dl/", s.exportDownloadHandler())
|
mux.Handle("/dl/", s.exportDownloadHandler())
|
||||||
// Direct-rail (Robokassa) return + callback routes: the server Result callback (the single
|
// Direct-rail (Robokassa) return + callback routes: the server Result callback (the single
|
||||||
// crediting signal, proxied to the backend intake) and the browser Success/Fail redirects.
|
// crediting signal, proxied to the backend intake) and the browser Success/Fail redirects. The
|
||||||
|
// per-shop callback rides a channel suffix (/pay/robokassa/result/<channel>); the bare path is
|
||||||
|
// the legacy web shop. Caddy's /pay/* matcher already forwards both, so no Caddyfile change.
|
||||||
mux.Handle("/pay/robokassa/result", s.robokassaResultHandler())
|
mux.Handle("/pay/robokassa/result", s.robokassaResultHandler())
|
||||||
|
mux.Handle("/pay/robokassa/result/", s.robokassaResultHandler())
|
||||||
mux.Handle("/pay/vk/callback", s.vkCallbackHandler())
|
mux.Handle("/pay/vk/callback", s.vkCallbackHandler())
|
||||||
mux.Handle("/pay/robokassa/success", s.robokassaReturnHandler("Оплата принята."))
|
mux.Handle("/pay/robokassa/success", s.robokassaReturnHandler("Оплата принята."))
|
||||||
mux.Handle("/pay/robokassa/fail", s.robokassaReturnHandler("Оплата не завершена."))
|
mux.Handle("/pay/robokassa/fail", s.robokassaReturnHandler("Оплата не завершена."))
|
||||||
@@ -299,7 +302,7 @@ func (s *Server) HTTPHandler() http.Handler {
|
|||||||
// honeypot hit is turned away before the body cap and the mux. Every request
|
// honeypot hit is turned away before the body cap and the mux. Every request
|
||||||
// body on the public listener is then capped (the admin proxy POSTs included);
|
// body on the public listener is then capped (the admin proxy POSTs included);
|
||||||
// the h2c server carries explicit stream/idle sizing.
|
// the h2c server carries explicit stream/idle sizing.
|
||||||
return h2c.NewHandler(s.abuseGuard(maxBodyHandler(s.maxBodyBytes, mux)), &http2.Server{
|
return h2c.NewHandler(s.abuseGuard(withNativeCORS(maxBodyHandler(s.maxBodyBytes, mux))), &http2.Server{
|
||||||
MaxConcurrentStreams: h2cMaxConcurrentStreams,
|
MaxConcurrentStreams: h2cMaxConcurrentStreams,
|
||||||
IdleTimeout: h2cIdleTimeout,
|
IdleTimeout: h2cIdleTimeout,
|
||||||
})
|
})
|
||||||
@@ -418,6 +421,10 @@ func (s *Server) Execute(ctx context.Context, req *connect.Request[edgev1.Execut
|
|||||||
return nil, connect.NewError(connect.CodeNotFound, errUnknownMessageType(msgType))
|
return nil, connect.NewError(connect.CodeNotFound, errUnknownMessageType(msgType))
|
||||||
}
|
}
|
||||||
clientIP := peerIP(req.Peer().Addr, req.Header())
|
clientIP := peerIP(req.Peer().Addr, req.Header())
|
||||||
|
// Carry the client IP on the context so the backend client injects it as X-Forwarded-For on every
|
||||||
|
// downstream REST call for this request — the account's last-login IP, chat/feedback moderation and
|
||||||
|
// the backend access log, not only the chat/feedback calls that pass it explicitly.
|
||||||
|
ctx = backendclient.WithClientIP(ctx, clientIP)
|
||||||
|
|
||||||
tr := transcode.Request{Payload: req.Msg.GetPayload(), ClientIP: clientIP}
|
tr := transcode.Request{Payload: req.Msg.GetPayload(), ClientIP: clientIP}
|
||||||
if op.Auth {
|
if op.Auth {
|
||||||
@@ -465,6 +472,7 @@ func (s *Server) Execute(ctx context.Context, req *connect.Request[edgev1.Execut
|
|||||||
return connect.NewResponse(&edgev1.ExecuteResponse{
|
return connect.NewResponse(&edgev1.ExecuteResponse{
|
||||||
RequestId: req.Msg.GetRequestId(),
|
RequestId: req.Msg.GetRequestId(),
|
||||||
ResultCode: code,
|
ResultCode: code,
|
||||||
|
Message: transcode.DomainMessage(err),
|
||||||
}), nil
|
}), nil
|
||||||
}
|
}
|
||||||
s.log.Error("execute failed", zap.String("message_type", msgType), zap.Error(err))
|
s.log.Error("execute failed", zap.String("message_type", msgType), zap.Error(err))
|
||||||
@@ -633,6 +641,21 @@ func (s *Server) exportDownloadHandler() http.Handler {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// robokassaResultPrefix is the channel-suffixed Result path; the segment after it names the
|
||||||
|
// per-shop channel (matches the direct-rail X-Platform subtype: "web", "android").
|
||||||
|
const robokassaResultPrefix = "/pay/robokassa/result/"
|
||||||
|
|
||||||
|
// robokassaChannel extracts the shop channel from a Result callback path: the segment after
|
||||||
|
// robokassaResultPrefix, or "" for the legacy bare /pay/robokassa/result (the backend then defaults
|
||||||
|
// to the web shop). The backend selects the per-shop signature verifier from it.
|
||||||
|
func robokassaChannel(path string) string {
|
||||||
|
rest := strings.TrimPrefix(path, robokassaResultPrefix)
|
||||||
|
if rest == path {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return rest
|
||||||
|
}
|
||||||
|
|
||||||
// robokassaResultHandler proxies the Robokassa Result callback to the backend intake (the single
|
// robokassaResultHandler proxies the Robokassa Result callback to the backend intake (the single
|
||||||
// writer). It rate-limits per IP, forwards the provider's form parameters, and echoes the backend's
|
// writer). It rate-limits per IP, forwards the provider's form parameters, and echoes the backend's
|
||||||
// "OK<InvId>" to Robokassa on success; any error tells Robokassa the notification was not accepted,
|
// "OK<InvId>" to Robokassa on success; any error tells Robokassa the notification was not accepted,
|
||||||
@@ -657,7 +680,7 @@ func (s *Server) robokassaResultHandler() http.Handler {
|
|||||||
for k := range r.Form {
|
for k := range r.Form {
|
||||||
params[k] = r.Form.Get(k)
|
params[k] = r.Form.Get(k)
|
||||||
}
|
}
|
||||||
resp, err := s.backend.RobokassaResult(r.Context(), params)
|
resp, err := s.backend.RobokassaResult(r.Context(), robokassaChannel(r.URL.Path), params)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
s.log.Warn("robokassa result proxy failed", zap.Error(err))
|
s.log.Warn("robokassa result proxy failed", zap.Error(err))
|
||||||
http.Error(w, "not accepted", http.StatusBadGateway)
|
http.Error(w, "not accepted", http.StatusBadGateway)
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"scrabble/gateway/internal/config"
|
||||||
"scrabble/gateway/internal/ratelimit"
|
"scrabble/gateway/internal/ratelimit"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -44,3 +45,20 @@ func TestPerWindow(t *testing.T) {
|
|||||||
t.Fatalf("per-window burst = %v, want [true true false]", got)
|
t.Fatalf("per-window burst = %v, want [true true false]", got)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestEmailBurstAllowsHonestLoginFlow guards the default email-code burst against being
|
||||||
|
// tightened back below the honest login sequence: requesting a code, submitting one wrong
|
||||||
|
// code, then the correct one are three immediate email-class events from one IP, and all
|
||||||
|
// must pass. A burst of 2 denied the correct-code login, which the client mis-read as going
|
||||||
|
// offline and could not recover from on the session-less login screen. This is defence in
|
||||||
|
// depth over the backend's own per-code attempt cap and code TTL.
|
||||||
|
func TestEmailBurstAllowsHonestLoginFlow(t *testing.T) {
|
||||||
|
rl := config.DefaultRateLimit()
|
||||||
|
p := ratelimit.Per(rl.EmailPer10Min, 10*time.Minute, rl.EmailBurst)
|
||||||
|
l := ratelimit.New()
|
||||||
|
for i, want := range []bool{true, true, true} { // request code, wrong code, right code
|
||||||
|
if got := l.Allow("email:198.51.100.7", p); got != want {
|
||||||
|
t.Fatalf("honest email event %d allowed = %v, want %v", i+1, got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -189,6 +189,17 @@ func (r *Registry) Lookup(messageType string) (Op, bool) {
|
|||||||
return op, ok
|
return op, ok
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DomainMessage returns the human-readable, already-localized reason a backend domain error carries
|
||||||
|
// for the user (e.g. an operator's payment-unavailable explanation), or "" when it carries none. It
|
||||||
|
// rides the Execute envelope's message field alongside the result code.
|
||||||
|
func DomainMessage(err error) string {
|
||||||
|
var apiErr *backendclient.APIError
|
||||||
|
if errors.As(err, &apiErr) {
|
||||||
|
return apiErr.Message
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
// DomainCode maps an error to a stable result code to surface in the Execute
|
// DomainCode maps an error to a stable result code to surface in the Execute
|
||||||
// envelope, reporting false for an unexpected error the caller should treat as a
|
// envelope, reporting false for an unexpected error the caller should treat as a
|
||||||
// transport-level internal failure.
|
// transport-level internal failure.
|
||||||
|
|||||||
@@ -94,10 +94,14 @@ func (x *ExecuteRequest) GetRequestId() string {
|
|||||||
// ExecuteResponse is the unary reply. result_code is "ok" on success or a stable
|
// ExecuteResponse is the unary reply. result_code is "ok" on success or a stable
|
||||||
// error code; payload is the FlatBuffers-encoded response body (empty on error).
|
// error code; payload is the FlatBuffers-encoded response body (empty on error).
|
||||||
type ExecuteResponse struct {
|
type ExecuteResponse struct {
|
||||||
state protoimpl.MessageState `protogen:"open.v1"`
|
state protoimpl.MessageState `protogen:"open.v1"`
|
||||||
RequestId string `protobuf:"bytes,1,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"`
|
RequestId string `protobuf:"bytes,1,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"`
|
||||||
ResultCode string `protobuf:"bytes,2,opt,name=result_code,json=resultCode,proto3" json:"result_code,omitempty"`
|
ResultCode string `protobuf:"bytes,2,opt,name=result_code,json=resultCode,proto3" json:"result_code,omitempty"`
|
||||||
Payload []byte `protobuf:"bytes,3,opt,name=payload,proto3" json:"payload,omitempty"`
|
Payload []byte `protobuf:"bytes,3,opt,name=payload,proto3" json:"payload,omitempty"`
|
||||||
|
// message is an optional, already-localized human-readable reason a domain outcome may carry for
|
||||||
|
// the user (e.g. a payment-unavailable explanation set by an operator). Additive and
|
||||||
|
// frozen-contract-safe; empty for the common case where result_code alone suffices.
|
||||||
|
Message string `protobuf:"bytes,4,opt,name=message,proto3" json:"message,omitempty"`
|
||||||
unknownFields protoimpl.UnknownFields
|
unknownFields protoimpl.UnknownFields
|
||||||
sizeCache protoimpl.SizeCache
|
sizeCache protoimpl.SizeCache
|
||||||
}
|
}
|
||||||
@@ -153,6 +157,13 @@ func (x *ExecuteResponse) GetPayload() []byte {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (x *ExecuteResponse) GetMessage() string {
|
||||||
|
if x != nil {
|
||||||
|
return x.Message
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
// SubscribeRequest opens the live stream. It is empty: the session is taken from
|
// SubscribeRequest opens the live stream. It is empty: the session is taken from
|
||||||
// the Authorization header.
|
// the Authorization header.
|
||||||
type SubscribeRequest struct {
|
type SubscribeRequest struct {
|
||||||
@@ -262,13 +273,14 @@ const file_edge_v1_edge_proto_rawDesc = "" +
|
|||||||
"\fmessage_type\x18\x01 \x01(\tR\vmessageType\x12\x18\n" +
|
"\fmessage_type\x18\x01 \x01(\tR\vmessageType\x12\x18\n" +
|
||||||
"\apayload\x18\x02 \x01(\fR\apayload\x12\x1d\n" +
|
"\apayload\x18\x02 \x01(\fR\apayload\x12\x1d\n" +
|
||||||
"\n" +
|
"\n" +
|
||||||
"request_id\x18\x03 \x01(\tR\trequestId\"k\n" +
|
"request_id\x18\x03 \x01(\tR\trequestId\"\x85\x01\n" +
|
||||||
"\x0fExecuteResponse\x12\x1d\n" +
|
"\x0fExecuteResponse\x12\x1d\n" +
|
||||||
"\n" +
|
"\n" +
|
||||||
"request_id\x18\x01 \x01(\tR\trequestId\x12\x1f\n" +
|
"request_id\x18\x01 \x01(\tR\trequestId\x12\x1f\n" +
|
||||||
"\vresult_code\x18\x02 \x01(\tR\n" +
|
"\vresult_code\x18\x02 \x01(\tR\n" +
|
||||||
"resultCode\x12\x18\n" +
|
"resultCode\x12\x18\n" +
|
||||||
"\apayload\x18\x03 \x01(\fR\apayload\"\x12\n" +
|
"\apayload\x18\x03 \x01(\fR\apayload\x12\x18\n" +
|
||||||
|
"\amessage\x18\x04 \x01(\tR\amessage\"\x12\n" +
|
||||||
"\x10SubscribeRequest\"P\n" +
|
"\x10SubscribeRequest\"P\n" +
|
||||||
"\x05Event\x12\x12\n" +
|
"\x05Event\x12\x12\n" +
|
||||||
"\x04kind\x18\x01 \x01(\tR\x04kind\x12\x18\n" +
|
"\x04kind\x18\x01 \x01(\tR\x04kind\x12\x18\n" +
|
||||||
|
|||||||
@@ -35,6 +35,10 @@ message ExecuteResponse {
|
|||||||
string request_id = 1;
|
string request_id = 1;
|
||||||
string result_code = 2;
|
string result_code = 2;
|
||||||
bytes payload = 3;
|
bytes payload = 3;
|
||||||
|
// message is an optional, already-localized human-readable reason a domain outcome may carry for
|
||||||
|
// the user (e.g. a payment-unavailable explanation set by an operator). Additive and
|
||||||
|
// frozen-contract-safe; empty for the common case where result_code alone suffices.
|
||||||
|
string message = 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
// SubscribeRequest opens the live stream. It is empty: the session is taken from
|
// SubscribeRequest opens the live stream. It is empty: the session is taken from
|
||||||
|
|||||||
@@ -70,7 +70,12 @@ Telegram identity to an account from a browser. Both map a rejection to gRPC
|
|||||||
the bot applies it — but only to a member currently in the chat (it probes one user with
|
the bot applies it — but only to a member currently in the chat (it probes one user with
|
||||||
`getChatMember`, since bots cannot list members). The bot must be an **administrator** there
|
`getChatMember`, since bots cannot list members). The bot must be an **administrator** there
|
||||||
with the **"Ban users"** right (the Bot API `can_restrict_members`), and it subscribes to
|
with the **"Ban users"** right (the Bot API `can_restrict_members`), and it subscribes to
|
||||||
`chat_member` updates, which Telegram delivers only to a chat admin.
|
`chat_member` updates, which Telegram delivers only to a chat admin. The bot also **removes
|
||||||
|
the automatic pin** Telegram places on every channel post auto-forwarded into this linked
|
||||||
|
chat (the `Message.is_automatic_forward` marker): it unpins only that one message
|
||||||
|
(`unpinChatMessage` by id), so a pin set by a human admin — or by the bot for another
|
||||||
|
message — is never touched. This needs the **pin-messages** right (`can_pin_messages`) in
|
||||||
|
addition to "Ban users"; a startup self-check warns when it is missing.
|
||||||
- **Support relay (optional).** When `TELEGRAM_SUPPORT_CHAT_ID` names a private **forum
|
- **Support relay (optional).** When `TELEGRAM_SUPPORT_CHAT_ID` names a private **forum
|
||||||
supergroup**, the bot runs a direct support channel for users who message it. A user's first
|
supergroup**, the bot runs a direct support channel for users who message it. A user's first
|
||||||
non-`/start` message opens a dedicated **forum topic** whose first message is an info card (the
|
non-`/start` message opens a dedicated **forum topic** whose first message is an info card (the
|
||||||
|
|||||||