Compare commits
16 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 57ff2d03f8 | |||
| 3a85f64726 | |||
| 00bb66ba0f | |||
| a2c79c149a | |||
| 061366da5a | |||
| d19609f87d | |||
| 51147a1429 | |||
| a9d0986e74 | |||
| d61ba68e9b | |||
| 6db9178449 | |||
| ac383880b7 | |||
| 16349f5ad9 | |||
| 101a3f118c | |||
| 400b6ac2a5 | |||
| fb7490f1df | |||
| c1805e5b7c |
@@ -12,7 +12,6 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
"log"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
"strings"
|
|
||||||
"syscall"
|
"syscall"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@@ -216,11 +215,9 @@ func run(ctx context.Context, cfg config.Config, logger *zap.Logger) error {
|
|||||||
// Operator alert emails on new feedback / word complaints, coalesced into one digest
|
// Operator alert emails on new feedback / word complaints, coalesced into one digest
|
||||||
// per interval. Inert unless a distinct admin sender and recipient are configured.
|
// per interval. Inert unless a distinct admin sender and recipient are configured.
|
||||||
if cfg.SMTP.AdminFrom != "" && cfg.SMTP.AdminTo != "" {
|
if cfg.SMTP.AdminFrom != "" && cfg.SMTP.AdminTo != "" {
|
||||||
consoleURL := ""
|
// The alert digest carries no admin-console link on purpose — an admin URL must not
|
||||||
if cfg.PublicBaseURL != "" {
|
// travel in an email (a mail provider could cache or index it); see adminalert.New.
|
||||||
consoleURL = strings.TrimRight(cfg.PublicBaseURL, "/") + "/_gm"
|
alerts := adminalert.New(mailer, feedbackSvc, games, cfg.SMTP.AdminFrom, cfg.SMTP.AdminTo, logger)
|
||||||
}
|
|
||||||
alerts := adminalert.New(mailer, feedbackSvc, games, cfg.SMTP.AdminFrom, cfg.SMTP.AdminTo, consoleURL, logger)
|
|
||||||
go alerts.Run(ctx, adminAlertInterval)
|
go alerts.Run(ctx, adminAlertInterval)
|
||||||
logger.Info("admin alert worker started", zap.Duration("interval", adminAlertInterval))
|
logger.Info("admin alert worker started", zap.Duration("interval", adminAlertInterval))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -105,9 +105,10 @@ func (s *EmailService) allowSend(email string) bool {
|
|||||||
|
|
||||||
// issueCode generates a fresh confirm-code and one-tap deeplink token for (accountID,
|
// issueCode generates a fresh confirm-code and one-tap deeplink token for (accountID,
|
||||||
// email), replaces any prior pending confirmation, and mails the branded code in
|
// email), replaces any prior pending confirmation, and mails the branded code in
|
||||||
// locale; purpose selects the email wording and what verifying does. Only the SHA-256
|
// locale; purpose selects the email wording and what verifying does. omitLink drops the
|
||||||
// hashes of the code and token are stored.
|
// one-tap deeplink from the email (account deletion, or a login requested from an installed
|
||||||
func (s *EmailService) issueCode(ctx context.Context, accountID uuid.UUID, email, purpose, locale string) error {
|
// PWA). Only the SHA-256 hashes of the code and token are stored.
|
||||||
|
func (s *EmailService) issueCode(ctx context.Context, accountID uuid.UUID, email, purpose, locale string, omitLink bool) error {
|
||||||
code, codeHash, err := generateCode()
|
code, codeHash, err := generateCode()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -119,11 +120,12 @@ func (s *EmailService) issueCode(ctx context.Context, accountID uuid.UUID, email
|
|||||||
if err := s.store.replacePendingConfirmation(ctx, accountID, email, codeHash, tokenHash, purpose, s.now().Add(emailCodeTTL)); err != nil {
|
if err := s.store.replacePendingConfirmation(ctx, accountID, email, codeHash, tokenHash, purpose, s.now().Add(emailCodeTTL)); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
// Account deletion is never a one-tap link (a prefetch or a stray click must not delete
|
// Omit the one-tap deeplink when asked: for a login from an installed PWA (the link would
|
||||||
// an account): the delete code is entered in the app only, so the email omits the
|
// open in a separate browser whose minted session cannot reach the PWA), or for account
|
||||||
// deeplink and ConfirmByToken refuses a delete token.
|
// deletion (a prefetch or stray click must not delete an account — the delete code is entered
|
||||||
|
// in the app only, and ConfirmByToken refuses a delete token).
|
||||||
deeplink := s.confirmURL(token, locale)
|
deeplink := s.confirmURL(token, locale)
|
||||||
if purpose == purposeDelete {
|
if purpose == purposeDelete || omitLink {
|
||||||
deeplink = ""
|
deeplink = ""
|
||||||
}
|
}
|
||||||
msg, err := renderConfirmationEmail(purpose, code, deeplink, s.baseURL, locale)
|
msg, err := renderConfirmationEmail(purpose, code, deeplink, s.baseURL, locale)
|
||||||
@@ -175,7 +177,7 @@ func (s *EmailService) RequestCode(ctx context.Context, accountID uuid.UUID, ema
|
|||||||
}
|
}
|
||||||
return ErrEmailTaken
|
return ErrEmailTaken
|
||||||
}
|
}
|
||||||
return s.issueCode(ctx, accountID, addr, purposeLink, s.accountLocale(ctx, accountID))
|
return s.issueCode(ctx, accountID, addr, purposeLink, s.accountLocale(ctx, accountID), false)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ConfirmCode verifies code for accountID and email. On success it attaches a
|
// ConfirmCode verifies code for accountID and email. On success it attaches a
|
||||||
@@ -221,8 +223,11 @@ func (s *EmailService) ConfirmCode(ctx context.Context, accountID uuid.UUID, ema
|
|||||||
// the ordinary returning-user login. The code is mailed to the address, so only its
|
// the ordinary returning-user login. The code is mailed to the address, so only its
|
||||||
// real owner can complete the login. On first contact browserTZ (the client's
|
// real owner can complete the login. On first contact browserTZ (the client's
|
||||||
// detected "±HH:MM" UTC offset) seeds the new account's time zone and language its UI
|
// detected "±HH:MM" UTC offset) seeds the new account's time zone and language its UI
|
||||||
// language. It returns the target account id for the subsequent LoginWithCode.
|
// language. When pwa is set (the request came from an installed PWA) the login email omits the
|
||||||
func (s *EmailService) RequestLoginCode(ctx context.Context, email, browserTZ, language string) (uuid.UUID, error) {
|
// one-tap confirm link — it would open in a separate browser, out of the PWA's reach — so the
|
||||||
|
// code is entered in the same window. It returns the target account id for the subsequent
|
||||||
|
// LoginWithCode.
|
||||||
|
func (s *EmailService) RequestLoginCode(ctx context.Context, email, browserTZ, language string, pwa bool) (uuid.UUID, error) {
|
||||||
addr, err := normalizeEmail(email)
|
addr, err := normalizeEmail(email)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return uuid.UUID{}, err
|
return uuid.UUID{}, err
|
||||||
@@ -234,7 +239,7 @@ func (s *EmailService) RequestLoginCode(ctx context.Context, email, browserTZ, l
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return uuid.UUID{}, err
|
return uuid.UUID{}, err
|
||||||
}
|
}
|
||||||
if err := s.issueCode(ctx, acc.ID, addr, purposeLogin, language); err != nil {
|
if err := s.issueCode(ctx, acc.ID, addr, purposeLogin, language, pwa); err != nil {
|
||||||
return uuid.UUID{}, err
|
return uuid.UUID{}, err
|
||||||
}
|
}
|
||||||
return acc.ID, nil
|
return acc.ID, nil
|
||||||
|
|||||||
@@ -92,7 +92,7 @@ func (s *EmailService) RequestLinkCode(ctx context.Context, accountID uuid.UUID,
|
|||||||
if !s.allowSend(addr) {
|
if !s.allowSend(addr) {
|
||||||
return ErrTooManyRequests
|
return ErrTooManyRequests
|
||||||
}
|
}
|
||||||
return s.issueCode(ctx, accountID, addr, purposeLink, s.accountLocale(ctx, accountID))
|
return s.issueCode(ctx, accountID, addr, purposeLink, s.accountLocale(ctx, accountID), false)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ConfirmLink verifies code for (accountID, email) and reports the address's
|
// ConfirmLink verifies code for (accountID, email) and reports the address's
|
||||||
@@ -140,7 +140,7 @@ func (s *EmailService) RequestChangeCode(ctx context.Context, accountID uuid.UUI
|
|||||||
if !s.allowSend(addr) {
|
if !s.allowSend(addr) {
|
||||||
return ErrTooManyRequests
|
return ErrTooManyRequests
|
||||||
}
|
}
|
||||||
return s.issueCode(ctx, accountID, addr, purposeChange, s.accountLocale(ctx, accountID))
|
return s.issueCode(ctx, accountID, addr, purposeChange, s.accountLocale(ctx, accountID), false)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ConfirmChange verifies code for (accountID, newEmail) and atomically replaces the
|
// ConfirmChange verifies code for (accountID, newEmail) and atomically replaces the
|
||||||
@@ -199,7 +199,7 @@ func (s *EmailService) RequestDeleteCode(ctx context.Context, accountID uuid.UUI
|
|||||||
if !s.allowSend(addr) {
|
if !s.allowSend(addr) {
|
||||||
return ErrTooManyRequests
|
return ErrTooManyRequests
|
||||||
}
|
}
|
||||||
return s.issueCode(ctx, accountID, addr, purposeDelete, s.accountLocale(ctx, accountID))
|
return s.issueCode(ctx, accountID, addr, purposeDelete, s.accountLocale(ctx, accountID), false)
|
||||||
}
|
}
|
||||||
|
|
||||||
// VerifyDeleteCode verifies the account-deletion code against the account's own email and
|
// VerifyDeleteCode verifies the account-deletion code against the account's own email and
|
||||||
|
|||||||
@@ -33,21 +33,21 @@ type Notifier struct {
|
|||||||
complaints ComplaintCounter
|
complaints ComplaintCounter
|
||||||
from string
|
from string
|
||||||
to string
|
to string
|
||||||
consoleURL string
|
|
||||||
clock func() time.Time
|
clock func() time.Time
|
||||||
log *zap.Logger
|
log *zap.Logger
|
||||||
last time.Time
|
last time.Time
|
||||||
}
|
}
|
||||||
|
|
||||||
// New constructs a Notifier. from and to are the alert sender and recipient(s); consoleURL,
|
// New constructs a Notifier. from and to are the alert sender and recipient(s); log may be
|
||||||
// when non-empty, is the admin-console link included in the email. log may be nil. The
|
// nil. The watermark starts at "now", so only items arriving after start-up are reported. The
|
||||||
// watermark starts at "now", so only items arriving after start-up are reported.
|
// digest deliberately carries no admin-console link — an admin URL must never travel in an
|
||||||
func New(mailer account.Mailer, fb FeedbackCounter, cp ComplaintCounter, from, to, consoleURL string, log *zap.Logger) *Notifier {
|
// email, where a mail provider could cache or index it.
|
||||||
|
func New(mailer account.Mailer, fb FeedbackCounter, cp ComplaintCounter, from, to string, log *zap.Logger) *Notifier {
|
||||||
if log == nil {
|
if log == nil {
|
||||||
log = zap.NewNop()
|
log = zap.NewNop()
|
||||||
}
|
}
|
||||||
return &Notifier{
|
return &Notifier{
|
||||||
mailer: mailer, feedback: fb, complaints: cp, from: from, to: to, consoleURL: consoleURL,
|
mailer: mailer, feedback: fb, complaints: cp, from: from, to: to,
|
||||||
clock: func() time.Time { return time.Now().UTC() }, log: log, last: time.Now().UTC(),
|
clock: func() time.Time { return time.Now().UTC() }, log: log, last: time.Now().UTC(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -103,10 +103,9 @@ func (n *Notifier) digest(fb, cp int) account.Message {
|
|||||||
parts = append(parts, fmt.Sprintf("%d new word complaint(s)", cp))
|
parts = append(parts, fmt.Sprintf("%d new word complaint(s)", cp))
|
||||||
}
|
}
|
||||||
summary := strings.Join(parts, ", ")
|
summary := strings.Join(parts, ", ")
|
||||||
|
// No admin-console link in the body: an admin URL must never travel in an email (a mail
|
||||||
|
// provider could cache or index it). The operator opens the console directly.
|
||||||
text := summary + "."
|
text := summary + "."
|
||||||
if n.consoleURL != "" {
|
|
||||||
text += "\n\nOpen the admin console: " + n.consoleURL
|
|
||||||
}
|
|
||||||
return account.Message{
|
return account.Message{
|
||||||
From: n.from,
|
From: n.from,
|
||||||
To: n.to,
|
To: n.to,
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ func (m *recordingMailer) Send(_ context.Context, msg account.Message) error {
|
|||||||
|
|
||||||
func TestNotifierSkipsWhenNothingNew(t *testing.T) {
|
func TestNotifierSkipsWhenNothingNew(t *testing.T) {
|
||||||
mailer := &recordingMailer{}
|
mailer := &recordingMailer{}
|
||||||
n := New(mailer, fbCounter{0}, cpCounter{0}, "alerts@erudit-game.ru", "op@x.ru", "", nil)
|
n := New(mailer, fbCounter{0}, cpCounter{0}, "alerts@erudit-game.ru", "op@x.ru", nil)
|
||||||
n.tick(context.Background())
|
n.tick(context.Background())
|
||||||
if len(mailer.sent) != 0 {
|
if len(mailer.sent) != 0 {
|
||||||
t.Fatalf("sent %d emails, want 0 when nothing is new", len(mailer.sent))
|
t.Fatalf("sent %d emails, want 0 when nothing is new", len(mailer.sent))
|
||||||
@@ -37,7 +37,7 @@ func TestNotifierSkipsWhenNothingNew(t *testing.T) {
|
|||||||
|
|
||||||
func TestNotifierDigestsNewItems(t *testing.T) {
|
func TestNotifierDigestsNewItems(t *testing.T) {
|
||||||
mailer := &recordingMailer{}
|
mailer := &recordingMailer{}
|
||||||
n := New(mailer, fbCounter{2}, cpCounter{1}, "alerts@erudit-game.ru", "op@x.ru, two@x.ru", "https://erudit-game.ru/_gm", nil)
|
n := New(mailer, fbCounter{2}, cpCounter{1}, "alerts@erudit-game.ru", "op@x.ru, two@x.ru", nil)
|
||||||
n.tick(context.Background())
|
n.tick(context.Background())
|
||||||
if len(mailer.sent) != 1 {
|
if len(mailer.sent) != 1 {
|
||||||
t.Fatalf("sent %d emails, want 1 digest", len(mailer.sent))
|
t.Fatalf("sent %d emails, want 1 digest", len(mailer.sent))
|
||||||
@@ -49,7 +49,9 @@ func TestNotifierDigestsNewItems(t *testing.T) {
|
|||||||
if !strings.Contains(msg.Subject, "2 new feedback") || !strings.Contains(msg.Subject, "1 new word complaint") {
|
if !strings.Contains(msg.Subject, "2 new feedback") || !strings.Contains(msg.Subject, "1 new word complaint") {
|
||||||
t.Errorf("digest subject = %q, want the feedback + complaint counts", msg.Subject)
|
t.Errorf("digest subject = %q, want the feedback + complaint counts", msg.Subject)
|
||||||
}
|
}
|
||||||
if !strings.Contains(msg.Text, "/_gm") {
|
// The digest must never carry an admin-console link — an admin URL in an email is a leak
|
||||||
t.Errorf("digest body = %q, want the console link", msg.Text)
|
// (mail providers cache/index it).
|
||||||
|
if strings.Contains(msg.Text, "/_gm") || strings.Contains(strings.ToLower(msg.Text), "admin console") {
|
||||||
|
t.Errorf("digest body = %q, must not carry an admin-console link", msg.Text)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -193,3 +193,24 @@ code { background: var(--bg); padding: 0.05rem 0.3rem; border-radius: 4px; }
|
|||||||
.replay-log { margin: 0.4rem 0 0; padding-left: 1.4rem; max-height: 14rem; overflow: auto; font-size: 0.85rem; }
|
.replay-log { margin: 0.4rem 0 0; padding-left: 1.4rem; max-height: 14rem; overflow: auto; font-size: 0.85rem; }
|
||||||
.replay-log li { color: var(--ink-dim); padding: 0.1rem 0; }
|
.replay-log li { color: var(--ink-dim); padding: 0.1rem 0; }
|
||||||
.replay-log li.cur { color: var(--ink); font-weight: 600; }
|
.replay-log li.cur { color: var(--ink); font-weight: 600; }
|
||||||
|
|
||||||
|
/* Banner colour override editor + live preview (banner_detail). The override
|
||||||
|
fieldsets group the enable toggle with the native colour swatches; the preview
|
||||||
|
renders a sample strip on both themes from those inputs (see the inline script). */
|
||||||
|
.ovr { border: 1px solid var(--line); border-radius: 6px; padding: 0.3rem 0.8rem 0.7rem; margin: 0.2rem 0; }
|
||||||
|
.ovr legend { padding: 0 0.3rem; font-size: 0.85rem; color: var(--ink); }
|
||||||
|
.ovr legend label { flex-direction: row; align-items: center; gap: 0.4rem; color: var(--ink); }
|
||||||
|
.ovr .note { margin: 0.2rem 0 0.4rem; }
|
||||||
|
.ovr .swatches { display: flex; flex-wrap: wrap; gap: 1rem; }
|
||||||
|
.ovr .swatches label { flex-direction: column; gap: 0.25rem; align-items: flex-start; }
|
||||||
|
.ovr input[type=color] { width: 3rem; height: 1.8rem; padding: 0; border: 1px solid var(--line); border-radius: 4px; background: var(--bg); cursor: pointer; }
|
||||||
|
.ovr input[type=color]:disabled { opacity: 0.4; cursor: default; }
|
||||||
|
.ovr .hex { font-size: 0.72rem; color: var(--ink-dim); font-variant-numeric: tabular-nums; }
|
||||||
|
.banner-preview { display: flex; flex-wrap: wrap; gap: 0.8rem; margin: 0.7rem 0 0.2rem; }
|
||||||
|
.banner-preview .bp { flex: 1 1 18rem; }
|
||||||
|
.banner-preview .bp-label { display: block; font-size: 0.75rem; color: var(--ink-dim); margin-bottom: 0.25rem; }
|
||||||
|
.ad-frame { padding: 0.7rem; border-radius: 6px; border: 1px solid var(--line); }
|
||||||
|
.ad-frame.light { background: #f4f6f9; }
|
||||||
|
.ad-frame.dark { background: #0f1420; }
|
||||||
|
.ad-sample { padding: 0.35rem 0.7rem; font-size: 0.85rem; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
|
||||||
|
.ad-sample .ad-link { text-decoration: underline; }
|
||||||
|
|||||||
@@ -11,10 +11,72 @@
|
|||||||
<label>Starts (UTC) <input type="datetime-local" name="starts_at" value="{{.StartsAt}}"></label>
|
<label>Starts (UTC) <input type="datetime-local" name="starts_at" value="{{.StartsAt}}"></label>
|
||||||
<label>Ends (UTC) <input type="datetime-local" name="ends_at" value="{{.EndsAt}}"></label>
|
<label>Ends (UTC) <input type="datetime-local" name="ends_at" value="{{.EndsAt}}"></label>
|
||||||
<label><input type="checkbox" name="enabled"{{if .Enabled}} checked{{end}}> Enabled</label>
|
<label><input type="checkbox" name="enabled"{{if .Enabled}} checked{{end}}> Enabled</label>
|
||||||
|
<fieldset class="ovr">
|
||||||
|
<legend><label><input type="checkbox" name="urgent"{{if .Urgent}} checked{{end}}> Urgent</label></legend>
|
||||||
|
<p class="note">Shows to <em>everyone</em>, always — bypassing paid accounts, hint wallets and the no-banner role. While any urgent campaign is live it is the only thing the strip shows (other campaigns and the default are suppressed). For system alerts.</p>
|
||||||
|
</fieldset>
|
||||||
|
<fieldset class="ovr" data-ovr-group>
|
||||||
|
<legend><label><input type="checkbox" name="override_all_on" data-ovr="all"{{if .OverrideAllOn}} checked{{end}}> Colour override — all themes</label></legend>
|
||||||
|
<div class="swatches">
|
||||||
|
<label>Background <input type="color" name="override_bg" value="{{.AllBg}}" data-ovr-color{{if not .OverrideAllOn}} disabled{{end}}><span class="hex"></span></label>
|
||||||
|
<label>Text <input type="color" name="override_fg" value="{{.AllFg}}" data-ovr-color{{if not .OverrideAllOn}} disabled{{end}}><span class="hex"></span></label>
|
||||||
|
<label>Link <input type="color" name="override_link" value="{{.AllLink}}" data-ovr-color{{if not .OverrideAllOn}} disabled{{end}}><span class="hex"></span></label>
|
||||||
|
</div>
|
||||||
|
</fieldset>
|
||||||
|
<fieldset class="ovr" data-ovr-group>
|
||||||
|
<legend><label><input type="checkbox" name="override_dark_on" data-ovr="dark"{{if .OverrideDarkOn}} checked{{end}}> Colour override — dark theme only</label></legend>
|
||||||
|
<div class="swatches">
|
||||||
|
<label>Background <input type="color" name="override_bg_dark" value="{{.DarkBg}}" data-ovr-color{{if not .OverrideDarkOn}} disabled{{end}}><span class="hex"></span></label>
|
||||||
|
<label>Text <input type="color" name="override_fg_dark" value="{{.DarkFg}}" data-ovr-color{{if not .OverrideDarkOn}} disabled{{end}}><span class="hex"></span></label>
|
||||||
|
<label>Link <input type="color" name="override_link_dark" value="{{.DarkLink}}" data-ovr-color{{if not .OverrideDarkOn}} disabled{{end}}><span class="hex"></span></label>
|
||||||
|
</div>
|
||||||
|
</fieldset>
|
||||||
{{end}}
|
{{end}}
|
||||||
<div><button type="submit">Save</button></div>
|
<div><button type="submit">Save</button></div>
|
||||||
</form>
|
</form>
|
||||||
{{if not .IsDefault}}
|
{{if not .IsDefault}}
|
||||||
|
<div class="banner-preview">
|
||||||
|
<div class="bp"><span class="bp-label">Light theme</span><div class="ad-frame light"><div class="ad-sample" id="prev-light"><span>Sample banner text — <span class="ad-link">a link</span></span></div></div></div>
|
||||||
|
<div class="bp"><span class="bp-label">Dark theme</span><div class="ad-frame dark"><div class="ad-sample" id="prev-dark"><span>Sample banner text — <span class="ad-link">a link</span></span></div></div></div>
|
||||||
|
</div>
|
||||||
|
<p class="note">Live preview of the strip on both themes. An empty override falls back to the neutral theme colours; the top/bottom border is derived from the background.</p>
|
||||||
|
<script>
|
||||||
|
(function(){
|
||||||
|
// Neutral fallbacks — mirror ui/src/app.css (--ad-bg / --text-muted / --accent).
|
||||||
|
var TOK={light:{bg:'#e3e7ee',fg:'#6b7280',link:'#2f6df6'},dark:{bg:'#272f3c',fg:'#9aa3b2',link:'#5b8cff'}};
|
||||||
|
function byName(n){return document.querySelector('[name="'+n+'"]');}
|
||||||
|
var allOn=byName('override_all_on'), darkOn=byName('override_dark_on');
|
||||||
|
if(!allOn||!darkOn){return;}
|
||||||
|
var f={ab:byName('override_bg'),af:byName('override_fg'),al:byName('override_link'),db:byName('override_bg_dark'),df:byName('override_fg_dark'),dl:byName('override_link_dark')};
|
||||||
|
var lightEl=document.getElementById('prev-light'), darkEl=document.getElementById('prev-dark');
|
||||||
|
function hexToRgb(h){h=h.replace('#','');return [parseInt(h.slice(0,2),16),parseInt(h.slice(2,4),16),parseInt(h.slice(4,6),16)];}
|
||||||
|
function pad(x){x=Math.max(0,Math.min(255,Math.round(x))).toString(16);return x.length<2?'0'+x:x;}
|
||||||
|
function rgbToHex(r){return '#'+pad(r[0])+pad(r[1])+pad(r[2]);}
|
||||||
|
function mix(a,b,t){return [a[0]+(b[0]-a[0])*t,a[1]+(b[1]-a[1])*t,a[2]+(b[2]-a[2])*t];}
|
||||||
|
function lum(r){return (0.2126*r[0]+0.7152*r[1]+0.0722*r[2])/255;}
|
||||||
|
// Derived border: nudge the background 14% toward black on a light bg, toward white on a dark bg.
|
||||||
|
function border(bg){var r=hexToRgb(bg);return rgbToHex(mix(r, lum(r)>0.5?[0,0,0]:[255,255,255], 0.14));}
|
||||||
|
function paint(el,c){
|
||||||
|
el.style.background=c.bg; el.style.color=c.fg;
|
||||||
|
el.style.borderTop='1px solid '+border(c.bg); el.style.borderBottom='1px solid '+border(c.bg);
|
||||||
|
var a=el.querySelector('.ad-link'); if(a){a.style.color=c.link;}
|
||||||
|
}
|
||||||
|
function resolve(){
|
||||||
|
var light=allOn.checked?{bg:f.ab.value,fg:f.af.value,link:f.al.value}:TOK.light;
|
||||||
|
var dark=darkOn.checked?{bg:f.db.value,fg:f.df.value,link:f.dl.value}
|
||||||
|
:(allOn.checked?{bg:f.ab.value,fg:f.af.value,link:f.al.value}:TOK.dark);
|
||||||
|
paint(lightEl,light); paint(darkEl,dark);
|
||||||
|
document.querySelectorAll('.ovr .swatches label').forEach(function(lab){
|
||||||
|
var inp=lab.querySelector('input[type=color]'), hx=lab.querySelector('.hex');
|
||||||
|
if(inp&&hx){hx.textContent=inp.value;}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
function toggleGroup(chk){chk.closest('fieldset').querySelectorAll('[data-ovr-color]').forEach(function(inp){inp.disabled=!chk.checked;});}
|
||||||
|
[allOn,darkOn].forEach(function(chk){chk.addEventListener('change',function(){toggleGroup(chk);resolve();});});
|
||||||
|
Object.keys(f).forEach(function(k){f[k].addEventListener('input',resolve);});
|
||||||
|
resolve();
|
||||||
|
})();
|
||||||
|
</script>
|
||||||
<form class="form" method="post" action="/_gm/banners/{{.ID}}/delete" onsubmit="return confirm('Delete this campaign and its messages?')">
|
<form class="form" method="post" action="/_gm/banners/{{.ID}}/delete" onsubmit="return confirm('Delete this campaign and its messages?')">
|
||||||
<button type="submit" class="danger">Delete campaign</button>
|
<button type="submit" class="danger">Delete campaign</button>
|
||||||
</form>
|
</form>
|
||||||
|
|||||||
@@ -498,15 +498,30 @@ type BannerCampaignRow struct {
|
|||||||
|
|
||||||
// BannerDetailView is the campaign detail/edit page. StartsAt/EndsAt are the
|
// BannerDetailView is the campaign detail/edit page. StartsAt/EndsAt are the
|
||||||
// "YYYY-MM-DDTHH:MM" (UTC) values for the datetime-local inputs, empty when open.
|
// "YYYY-MM-DDTHH:MM" (UTC) values for the datetime-local inputs, empty when open.
|
||||||
|
//
|
||||||
|
// The colour-override and urgent fields drive the non-default campaign's editor:
|
||||||
|
// OverrideAllOn/OverrideDarkOn report whether each colour set is active, and the
|
||||||
|
// six *Bg/*Fg/*Link values seed the native colour inputs — the stored override
|
||||||
|
// when a set is on, otherwise the neutral theme token so the picker starts from a
|
||||||
|
// sensible colour and the live preview shows the real fallback.
|
||||||
type BannerDetailView struct {
|
type BannerDetailView struct {
|
||||||
ID string
|
ID string
|
||||||
Name string
|
Name string
|
||||||
Weight int
|
Weight int
|
||||||
IsDefault bool
|
IsDefault bool
|
||||||
Enabled bool
|
Enabled bool
|
||||||
StartsAt string
|
StartsAt string
|
||||||
EndsAt string
|
EndsAt string
|
||||||
Messages []BannerMessageRow
|
Urgent bool
|
||||||
|
OverrideAllOn bool
|
||||||
|
AllBg string
|
||||||
|
AllFg string
|
||||||
|
AllLink string
|
||||||
|
OverrideDarkOn bool
|
||||||
|
DarkBg string
|
||||||
|
DarkFg string
|
||||||
|
DarkLink string
|
||||||
|
Messages []BannerMessageRow
|
||||||
}
|
}
|
||||||
|
|
||||||
// BannerMessageRow is one bilingual message of a campaign. First/Last drive the
|
// BannerMessageRow is one bilingual message of a campaign. First/Last drive the
|
||||||
|
|||||||
+77
-13
@@ -30,6 +30,15 @@ var ErrDefaultImmutable = errors.New("ads: the default campaign cannot be modifi
|
|||||||
// window or message body).
|
// window or message body).
|
||||||
var ErrValidation = errors.New("ads: validation")
|
var ErrValidation = errors.New("ads: validation")
|
||||||
|
|
||||||
|
// ColorSet is an optional per-campaign colour override for the banner strip:
|
||||||
|
// background, foreground (text) and link, each a "#rrggbb" hex string. The three
|
||||||
|
// are set together or the whole set is absent (a nil *ColorSet).
|
||||||
|
type ColorSet struct {
|
||||||
|
Bg string
|
||||||
|
Fg string
|
||||||
|
Link string
|
||||||
|
}
|
||||||
|
|
||||||
// Campaign is one advertising placement order with its messages.
|
// Campaign is one advertising placement order with its messages.
|
||||||
type Campaign struct {
|
type Campaign struct {
|
||||||
ID uuid.UUID // uuid.Nil on create
|
ID uuid.UUID // uuid.Nil on create
|
||||||
@@ -40,6 +49,16 @@ type Campaign struct {
|
|||||||
StartsAt *time.Time // nil = open-ended start; always nil for the default
|
StartsAt *time.Time // nil = open-ended start; always nil for the default
|
||||||
EndsAt *time.Time // nil = open-ended end; always nil for the default
|
EndsAt *time.Time // nil = open-ended end; always nil for the default
|
||||||
Messages []Message
|
Messages []Message
|
||||||
|
// OverrideAll paints the strip on every theme; OverrideDark, when set, further
|
||||||
|
// overrides the dark theme (the client resolves dark ← dark ?? all ?? token,
|
||||||
|
// light ← all ?? token). Both are nil for the default campaign and for a
|
||||||
|
// campaign that keeps the neutral theme tokens. Non-default only.
|
||||||
|
OverrideAll *ColorSet
|
||||||
|
OverrideDark *ColorSet
|
||||||
|
// Urgent forces the banner on every viewer (bypassing eligibility) and, while
|
||||||
|
// any urgent campaign is active, suppresses every non-urgent campaign and the
|
||||||
|
// default remainder. Non-default only; always false for the default campaign.
|
||||||
|
Urgent bool
|
||||||
CreatedAt time.Time
|
CreatedAt time.Time
|
||||||
UpdatedAt time.Time
|
UpdatedAt time.Time
|
||||||
}
|
}
|
||||||
@@ -70,10 +89,15 @@ type Timings struct {
|
|||||||
|
|
||||||
// ActiveCampaign is one campaign in the resolved rotation feed sent to a client:
|
// ActiveCampaign is one campaign in the resolved rotation feed sent to a client:
|
||||||
// its GCD-reduced show weight and its messages, already resolved to the viewer's
|
// its GCD-reduced show weight and its messages, already resolved to the viewer's
|
||||||
// language and in display (round-robin) order.
|
// language and in display (round-robin) order, plus the optional colour overrides
|
||||||
|
// the client applies to the strip (nil = the neutral theme tokens). Urgency is not
|
||||||
|
// carried here: it is resolved server-side into the set's membership and the
|
||||||
|
// eligibility bypass, so the client only ever renders what it is sent.
|
||||||
type ActiveCampaign struct {
|
type ActiveCampaign struct {
|
||||||
Weight int
|
Weight int
|
||||||
Messages []string
|
Messages []string
|
||||||
|
OverrideAll *ColorSet
|
||||||
|
OverrideDark *ColorSet
|
||||||
}
|
}
|
||||||
|
|
||||||
// Eligible reports whether an account should be shown the advertising banner: a
|
// Eligible reports whether an account should be shown the advertising banner: a
|
||||||
@@ -85,14 +109,20 @@ func Eligible(paidAccount bool, hintBalance int, hasNoBanner bool) bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// computeActiveSet builds the resolved rotation feed from the enabled campaigns
|
// computeActiveSet builds the resolved rotation feed from the enabled campaigns
|
||||||
// at time now, in language lang. Campaigns outside their validity window, and
|
// at time now, in language lang, and reports whether the feed is an urgent one.
|
||||||
// campaigns with no messages, are dropped. The default campaign's effective
|
// Campaigns outside their validity window, and campaigns with no messages, are
|
||||||
// weight is the remainder up to 100% — max(0, 100 - sum of active timed
|
// dropped.
|
||||||
// weights) — so it fills unsold inventory and is dropped entirely when timed
|
//
|
||||||
// campaigns already reach 100%. Weights are then reduced by their GCD so the
|
// While any active campaign is urgent, the feed is the urgent campaigns alone —
|
||||||
// fair rotation cycle stays short. The input is expected to be the enabled
|
// every non-urgent timed campaign and the default remainder are suppressed for
|
||||||
// campaigns (ActiveCampaigns); disabled ones must already be excluded.
|
// the duration (and the caller shows the feed to every viewer, bypassing
|
||||||
func computeActiveSet(campaigns []Campaign, now time.Time, lang string) []ActiveCampaign {
|
// eligibility). Otherwise the default campaign's effective weight is the
|
||||||
|
// remainder up to 100% — max(0, 100 - sum of active timed weights) — so it fills
|
||||||
|
// unsold inventory and is dropped entirely when timed campaigns already reach
|
||||||
|
// 100%. Weights are then reduced by their GCD so the fair rotation cycle stays
|
||||||
|
// short. The input is expected to be the enabled campaigns (ActiveCampaigns);
|
||||||
|
// disabled ones must already be excluded.
|
||||||
|
func computeActiveSet(campaigns []Campaign, now time.Time, lang string) ([]ActiveCampaign, bool) {
|
||||||
var timed []Campaign
|
var timed []Campaign
|
||||||
var def *Campaign
|
var def *Campaign
|
||||||
for i := range campaigns {
|
for i := range campaigns {
|
||||||
@@ -108,20 +138,54 @@ func computeActiveSet(campaigns []Campaign, now time.Time, lang string) []Active
|
|||||||
timed = append(timed, c)
|
timed = append(timed, c)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if urgent := filterUrgent(timed); len(urgent) > 0 {
|
||||||
|
out := make([]ActiveCampaign, 0, len(urgent))
|
||||||
|
for _, c := range urgent {
|
||||||
|
out = append(out, activeFrom(c, lang))
|
||||||
|
}
|
||||||
|
reduceByGCD(out)
|
||||||
|
return out, true
|
||||||
|
}
|
||||||
sumTimed := 0
|
sumTimed := 0
|
||||||
for _, c := range timed {
|
for _, c := range timed {
|
||||||
sumTimed += c.Weight
|
sumTimed += c.Weight
|
||||||
}
|
}
|
||||||
out := make([]ActiveCampaign, 0, len(timed)+1)
|
out := make([]ActiveCampaign, 0, len(timed)+1)
|
||||||
for _, c := range timed {
|
for _, c := range timed {
|
||||||
out = append(out, ActiveCampaign{Weight: c.Weight, Messages: resolveBodies(c.Messages, lang)})
|
out = append(out, activeFrom(c, lang))
|
||||||
}
|
}
|
||||||
if def != nil {
|
if def != nil {
|
||||||
if dw := 100 - sumTimed; dw > 0 {
|
if dw := 100 - sumTimed; dw > 0 {
|
||||||
out = append(out, ActiveCampaign{Weight: dw, Messages: resolveBodies(def.Messages, lang)})
|
a := activeFrom(*def, lang)
|
||||||
|
a.Weight = dw // the default's stored weight is nominal; it fills the remainder
|
||||||
|
out = append(out, a)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
reduceByGCD(out)
|
reduceByGCD(out)
|
||||||
|
return out, false
|
||||||
|
}
|
||||||
|
|
||||||
|
// activeFrom projects a campaign to its rotation-feed entry: its show weight, its
|
||||||
|
// language-resolved messages and its colour overrides (carried through by
|
||||||
|
// reference, they are read-only).
|
||||||
|
func activeFrom(c Campaign, lang string) ActiveCampaign {
|
||||||
|
return ActiveCampaign{
|
||||||
|
Weight: c.Weight,
|
||||||
|
Messages: resolveBodies(c.Messages, lang),
|
||||||
|
OverrideAll: c.OverrideAll,
|
||||||
|
OverrideDark: c.OverrideDark,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// filterUrgent returns the urgent campaigns among cs, preserving order. It is the
|
||||||
|
// preempt selector: a non-empty result makes the whole feed urgent.
|
||||||
|
func filterUrgent(cs []Campaign) []Campaign {
|
||||||
|
var out []Campaign
|
||||||
|
for _, c := range cs {
|
||||||
|
if c.Urgent {
|
||||||
|
out = append(out, c)
|
||||||
|
}
|
||||||
|
}
|
||||||
return out
|
return out
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -46,12 +46,19 @@ func TestComputeActiveSet(t *testing.T) {
|
|||||||
timed := func(name string, weight int, starts, ends *time.Time, msgs []Message) Campaign {
|
timed := func(name string, weight int, starts, ends *time.Time, msgs []Message) Campaign {
|
||||||
return Campaign{Name: name, Weight: weight, Enabled: true, StartsAt: starts, EndsAt: ends, Messages: msgs}
|
return Campaign{Name: name, Weight: weight, Enabled: true, StartsAt: starts, EndsAt: ends, Messages: msgs}
|
||||||
}
|
}
|
||||||
|
urgent := func(name string, weight int, msgs []Message) Campaign {
|
||||||
|
c := timed(name, weight, nil, nil, msgs)
|
||||||
|
c.Urgent = true
|
||||||
|
return c
|
||||||
|
}
|
||||||
|
red := &ColorSet{Bg: "#aa0000", Fg: "#ffffff", Link: "#ffdd00"}
|
||||||
|
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
name string
|
name string
|
||||||
campaigns []Campaign
|
campaigns []Campaign
|
||||||
lang string
|
lang string
|
||||||
want []ActiveCampaign
|
want []ActiveCampaign
|
||||||
|
wantUrgent bool
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
name: "default only reduces to weight 1",
|
name: "default only reduces to weight 1",
|
||||||
@@ -152,22 +159,71 @@ func TestComputeActiveSet(t *testing.T) {
|
|||||||
lang: "en",
|
lang: "en",
|
||||||
want: []ActiveCampaign{{Weight: 1, Messages: []string{"one-en", "two-en"}}},
|
want: []ActiveCampaign{{Weight: 1, Messages: []string{"one-en", "two-en"}}},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "urgent preempts default and normal timed",
|
||||||
|
campaigns: []Campaign{
|
||||||
|
def(msg("house")),
|
||||||
|
timed("promo", 40, nil, nil, msg("promo")),
|
||||||
|
urgent("alert", 50, msg("alert")),
|
||||||
|
},
|
||||||
|
lang: "en",
|
||||||
|
// only the urgent campaign survives; a lone weight reduces to 1.
|
||||||
|
want: []ActiveCampaign{{Weight: 1, Messages: []string{"alert-en"}}},
|
||||||
|
wantUrgent: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "multiple urgent share the feed by gcd",
|
||||||
|
campaigns: []Campaign{
|
||||||
|
def(msg("house")),
|
||||||
|
urgent("a", 60, msg("a")),
|
||||||
|
urgent("b", 40, msg("b")),
|
||||||
|
},
|
||||||
|
lang: "en",
|
||||||
|
// default and any non-urgent dropped; gcd(60,40)=20 -> 3 and 2.
|
||||||
|
want: []ActiveCampaign{
|
||||||
|
{Weight: 3, Messages: []string{"a-en"}},
|
||||||
|
{Weight: 2, Messages: []string{"b-en"}},
|
||||||
|
},
|
||||||
|
wantUrgent: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "out-of-window urgent does not preempt",
|
||||||
|
campaigns: []Campaign{
|
||||||
|
def(msg("house")),
|
||||||
|
func() Campaign { c := urgent("future", 50, msg("future")); c.StartsAt = &future; return c }(),
|
||||||
|
},
|
||||||
|
lang: "en",
|
||||||
|
// the urgent campaign is not yet live, so the normal default feed stands.
|
||||||
|
want: []ActiveCampaign{{Weight: 1, Messages: []string{"house-en"}}},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "colour overrides ride the active campaign",
|
||||||
|
campaigns: []Campaign{
|
||||||
|
def(msg("house")),
|
||||||
|
func() Campaign { c := timed("promo", 100, nil, nil, msg("promo")); c.OverrideAll = red; return c }(),
|
||||||
|
},
|
||||||
|
lang: "en",
|
||||||
|
want: []ActiveCampaign{{Weight: 1, Messages: []string{"promo-en"}, OverrideAll: red}},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
got := computeActiveSet(tt.campaigns, now, tt.lang)
|
got, gotUrgent := computeActiveSet(tt.campaigns, now, tt.lang)
|
||||||
if !reflect.DeepEqual(got, tt.want) {
|
if !reflect.DeepEqual(got, tt.want) {
|
||||||
t.Errorf("computeActiveSet() =\n %#v\nwant\n %#v", got, tt.want)
|
t.Errorf("computeActiveSet() =\n %#v\nwant\n %#v", got, tt.want)
|
||||||
}
|
}
|
||||||
|
if gotUrgent != tt.wantUrgent {
|
||||||
|
t.Errorf("computeActiveSet() urgent = %v, want %v", gotUrgent, tt.wantUrgent)
|
||||||
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestComputeActiveSetEmpty(t *testing.T) {
|
func TestComputeActiveSetEmpty(t *testing.T) {
|
||||||
// No campaigns at all yields an empty (non-nil-or-nil) feed without panicking.
|
// No campaigns at all yields an empty (non-nil-or-nil) feed without panicking.
|
||||||
if got := computeActiveSet(nil, time.Now(), "en"); len(got) != 0 {
|
if got, urgent := computeActiveSet(nil, time.Now(), "en"); len(got) != 0 || urgent {
|
||||||
t.Errorf("computeActiveSet(nil) = %#v, want empty", got)
|
t.Errorf("computeActiveSet(nil) = %#v urgent=%v, want empty non-urgent", got, urgent)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package ads
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"regexp"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@@ -40,17 +41,20 @@ func NewService(store *Store) *Service { return &Service{store: store} }
|
|||||||
// ActiveSet returns the resolved rotation feed for a viewer in language lang
|
// ActiveSet returns the resolved rotation feed for a viewer in language lang
|
||||||
// (en/ru) together with the global display timings: the currently-active
|
// (en/ru) together with the global display timings: the currently-active
|
||||||
// campaigns, each with its GCD-reduced show weight and its messages resolved to
|
// campaigns, each with its GCD-reduced show weight and its messages resolved to
|
||||||
// lang, ready for the client's weighted round-robin.
|
// lang, ready for the client's weighted round-robin. The bool result reports
|
||||||
func (s *Service) ActiveSet(ctx context.Context, lang string) ([]ActiveCampaign, Timings, error) {
|
// whether the feed is urgent — an urgent feed is shown to every viewer
|
||||||
|
// regardless of eligibility (the caller skips the eligibility gate for it).
|
||||||
|
func (s *Service) ActiveSet(ctx context.Context, lang string) ([]ActiveCampaign, Timings, bool, error) {
|
||||||
campaigns, err := s.store.ActiveCampaigns(ctx)
|
campaigns, err := s.store.ActiveCampaigns(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, Timings{}, err
|
return nil, Timings{}, false, err
|
||||||
}
|
}
|
||||||
timings, err := s.store.Settings(ctx)
|
timings, err := s.store.Settings(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, Timings{}, err
|
return nil, Timings{}, false, err
|
||||||
}
|
}
|
||||||
return computeActiveSet(campaigns, time.Now().UTC(), lang), timings, nil
|
set, urgent := computeActiveSet(campaigns, time.Now().UTC(), lang)
|
||||||
|
return set, timings, urgent, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// ListCampaigns returns every campaign with its messages, for the admin console.
|
// ListCampaigns returns every campaign with its messages, for the admin console.
|
||||||
@@ -76,8 +80,13 @@ func (s *Service) CreateCampaign(ctx context.Context, c Campaign) (uuid.UUID, er
|
|||||||
if err := validWindow(c.StartsAt, c.EndsAt); err != nil {
|
if err := validWindow(c.StartsAt, c.EndsAt); err != nil {
|
||||||
return uuid.Nil, err
|
return uuid.Nil, err
|
||||||
}
|
}
|
||||||
|
all, dark, err := validOverrides(c.OverrideAll, c.OverrideDark)
|
||||||
|
if err != nil {
|
||||||
|
return uuid.Nil, err
|
||||||
|
}
|
||||||
return s.store.CreateCampaign(ctx, Campaign{
|
return s.store.CreateCampaign(ctx, Campaign{
|
||||||
Name: name, Weight: c.Weight, Enabled: c.Enabled, StartsAt: c.StartsAt, EndsAt: c.EndsAt,
|
Name: name, Weight: c.Weight, Enabled: c.Enabled, StartsAt: c.StartsAt, EndsAt: c.EndsAt,
|
||||||
|
OverrideAll: all, OverrideDark: dark, Urgent: c.Urgent,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -99,6 +108,7 @@ func (s *Service) UpdateCampaign(ctx context.Context, c Campaign) error {
|
|||||||
upd.Enabled = true
|
upd.Enabled = true
|
||||||
upd.StartsAt = nil
|
upd.StartsAt = nil
|
||||||
upd.EndsAt = nil
|
upd.EndsAt = nil
|
||||||
|
// The default (house) campaign stays plain: no colour overrides, never urgent.
|
||||||
} else {
|
} else {
|
||||||
if err := validWeight(c.Weight); err != nil {
|
if err := validWeight(c.Weight); err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -106,10 +116,17 @@ func (s *Service) UpdateCampaign(ctx context.Context, c Campaign) error {
|
|||||||
if err := validWindow(c.StartsAt, c.EndsAt); err != nil {
|
if err := validWindow(c.StartsAt, c.EndsAt); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
all, dark, err := validOverrides(c.OverrideAll, c.OverrideDark)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
upd.Weight = c.Weight
|
upd.Weight = c.Weight
|
||||||
upd.Enabled = c.Enabled
|
upd.Enabled = c.Enabled
|
||||||
upd.StartsAt = c.StartsAt
|
upd.StartsAt = c.StartsAt
|
||||||
upd.EndsAt = c.EndsAt
|
upd.EndsAt = c.EndsAt
|
||||||
|
upd.OverrideAll = all
|
||||||
|
upd.OverrideDark = dark
|
||||||
|
upd.Urgent = c.Urgent
|
||||||
}
|
}
|
||||||
return s.store.UpdateCampaign(ctx, upd)
|
return s.store.UpdateCampaign(ctx, upd)
|
||||||
}
|
}
|
||||||
@@ -254,6 +271,46 @@ func validWindow(starts, ends *time.Time) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// hexColor matches a "#rrggbb" colour — the format the console's native colour
|
||||||
|
// input emits and the wire carries.
|
||||||
|
var hexColor = regexp.MustCompile(`^#[0-9a-fA-F]{6}$`)
|
||||||
|
|
||||||
|
// validOverrides validates the two optional colour sets together and returns
|
||||||
|
// their normalised copies (nil when a set is absent), so a caller can store them
|
||||||
|
// directly.
|
||||||
|
func validOverrides(all, dark *ColorSet) (*ColorSet, *ColorSet, error) {
|
||||||
|
va, err := validColorSet(all)
|
||||||
|
if err != nil {
|
||||||
|
return nil, nil, err
|
||||||
|
}
|
||||||
|
vd, err := validColorSet(dark)
|
||||||
|
if err != nil {
|
||||||
|
return nil, nil, err
|
||||||
|
}
|
||||||
|
return va, vd, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// validColorSet validates one optional colour override: a nil set passes (no
|
||||||
|
// override); otherwise all three colours must be present and "#rrggbb". It
|
||||||
|
// returns a trimmed, lower-cased copy.
|
||||||
|
func validColorSet(cs *ColorSet) (*ColorSet, error) {
|
||||||
|
if cs == nil {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
bg := strings.TrimSpace(cs.Bg)
|
||||||
|
fg := strings.TrimSpace(cs.Fg)
|
||||||
|
link := strings.TrimSpace(cs.Link)
|
||||||
|
if bg == "" || fg == "" || link == "" {
|
||||||
|
return nil, fmt.Errorf("%w: a colour override needs all of background, text and link", ErrValidation)
|
||||||
|
}
|
||||||
|
for _, h := range []string{bg, fg, link} {
|
||||||
|
if !hexColor.MatchString(h) {
|
||||||
|
return nil, fmt.Errorf("%w: colours must be #rrggbb hex", ErrValidation)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return &ColorSet{Bg: strings.ToLower(bg), Fg: strings.ToLower(fg), Link: strings.ToLower(link)}, nil
|
||||||
|
}
|
||||||
|
|
||||||
// validBodies trims and bounds both mandatory language bodies of a message.
|
// validBodies trims and bounds both mandatory language bodies of a message.
|
||||||
func validBodies(bodyEn, bodyRu string) (string, string, error) {
|
func validBodies(bodyEn, bodyRu string) (string, string, error) {
|
||||||
en := strings.TrimSpace(bodyEn)
|
en := strings.TrimSpace(bodyEn)
|
||||||
|
|||||||
@@ -90,15 +90,23 @@ func (s *Store) Campaign(ctx context.Context, id uuid.UUID) (Campaign, error) {
|
|||||||
func (s *Store) CreateCampaign(ctx context.Context, c Campaign) (uuid.UUID, error) {
|
func (s *Store) CreateCampaign(ctx context.Context, c Campaign) (uuid.UUID, error) {
|
||||||
id := uuid.New()
|
id := uuid.New()
|
||||||
now := time.Now().UTC()
|
now := time.Now().UTC()
|
||||||
|
abg, afg, alink := colorCols(c.OverrideAll)
|
||||||
|
dbg, dfg, dlink := colorCols(c.OverrideDark)
|
||||||
stmt := table.AdCampaigns.INSERT(
|
stmt := table.AdCampaigns.INSERT(
|
||||||
table.AdCampaigns.CampaignID, table.AdCampaigns.Name, table.AdCampaigns.Weight,
|
table.AdCampaigns.CampaignID, table.AdCampaigns.Name, table.AdCampaigns.Weight,
|
||||||
table.AdCampaigns.IsDefault, table.AdCampaigns.Enabled,
|
table.AdCampaigns.IsDefault, table.AdCampaigns.Enabled,
|
||||||
table.AdCampaigns.StartsAt, table.AdCampaigns.EndsAt,
|
table.AdCampaigns.StartsAt, table.AdCampaigns.EndsAt,
|
||||||
|
table.AdCampaigns.OverrideBg, table.AdCampaigns.OverrideFg, table.AdCampaigns.OverrideLink,
|
||||||
|
table.AdCampaigns.OverrideBgDark, table.AdCampaigns.OverrideFgDark, table.AdCampaigns.OverrideLinkDark,
|
||||||
|
table.AdCampaigns.Urgent,
|
||||||
table.AdCampaigns.CreatedAt, table.AdCampaigns.UpdatedAt,
|
table.AdCampaigns.CreatedAt, table.AdCampaigns.UpdatedAt,
|
||||||
).VALUES(
|
).VALUES(
|
||||||
postgres.UUID(id), postgres.String(c.Name), postgres.Int(int64(c.Weight)),
|
postgres.UUID(id), postgres.String(c.Name), postgres.Int(int64(c.Weight)),
|
||||||
postgres.Bool(false), postgres.Bool(c.Enabled),
|
postgres.Bool(false), postgres.Bool(c.Enabled),
|
||||||
tsOrNull(c.StartsAt), tsOrNull(c.EndsAt),
|
tsOrNull(c.StartsAt), tsOrNull(c.EndsAt),
|
||||||
|
abg, afg, alink,
|
||||||
|
dbg, dfg, dlink,
|
||||||
|
postgres.Bool(c.Urgent),
|
||||||
postgres.TimestampzT(now), postgres.TimestampzT(now),
|
postgres.TimestampzT(now), postgres.TimestampzT(now),
|
||||||
)
|
)
|
||||||
if _, err := stmt.ExecContext(ctx, s.db); err != nil {
|
if _, err := stmt.ExecContext(ctx, s.db); err != nil {
|
||||||
@@ -111,12 +119,20 @@ func (s *Store) CreateCampaign(ctx context.Context, c Campaign) (uuid.UUID, erro
|
|||||||
// window. The default flag is never touched here. Returns ErrNotFound when no
|
// window. The default flag is never touched here. Returns ErrNotFound when no
|
||||||
// campaign matches.
|
// campaign matches.
|
||||||
func (s *Store) UpdateCampaign(ctx context.Context, c Campaign) error {
|
func (s *Store) UpdateCampaign(ctx context.Context, c Campaign) error {
|
||||||
|
abg, afg, alink := colorCols(c.OverrideAll)
|
||||||
|
dbg, dfg, dlink := colorCols(c.OverrideDark)
|
||||||
stmt := table.AdCampaigns.UPDATE(
|
stmt := table.AdCampaigns.UPDATE(
|
||||||
table.AdCampaigns.Name, table.AdCampaigns.Weight, table.AdCampaigns.Enabled,
|
table.AdCampaigns.Name, table.AdCampaigns.Weight, table.AdCampaigns.Enabled,
|
||||||
table.AdCampaigns.StartsAt, table.AdCampaigns.EndsAt, table.AdCampaigns.UpdatedAt,
|
table.AdCampaigns.StartsAt, table.AdCampaigns.EndsAt,
|
||||||
|
table.AdCampaigns.OverrideBg, table.AdCampaigns.OverrideFg, table.AdCampaigns.OverrideLink,
|
||||||
|
table.AdCampaigns.OverrideBgDark, table.AdCampaigns.OverrideFgDark, table.AdCampaigns.OverrideLinkDark,
|
||||||
|
table.AdCampaigns.Urgent, table.AdCampaigns.UpdatedAt,
|
||||||
).SET(
|
).SET(
|
||||||
postgres.String(c.Name), postgres.Int(int64(c.Weight)), postgres.Bool(c.Enabled),
|
postgres.String(c.Name), postgres.Int(int64(c.Weight)), postgres.Bool(c.Enabled),
|
||||||
tsOrNull(c.StartsAt), tsOrNull(c.EndsAt), postgres.TimestampzT(time.Now().UTC()),
|
tsOrNull(c.StartsAt), tsOrNull(c.EndsAt),
|
||||||
|
abg, afg, alink,
|
||||||
|
dbg, dfg, dlink,
|
||||||
|
postgres.Bool(c.Urgent), postgres.TimestampzT(time.Now().UTC()),
|
||||||
).WHERE(table.AdCampaigns.CampaignID.EQ(postgres.UUID(c.ID)))
|
).WHERE(table.AdCampaigns.CampaignID.EQ(postgres.UUID(c.ID)))
|
||||||
return execOne(ctx, s.db, stmt, "update campaign")
|
return execOne(ctx, s.db, stmt, "update campaign")
|
||||||
}
|
}
|
||||||
@@ -257,18 +273,40 @@ func execOne(ctx context.Context, db qrm.Executable, stmt postgres.Statement, wh
|
|||||||
|
|
||||||
func modelToCampaign(r model.AdCampaigns) Campaign {
|
func modelToCampaign(r model.AdCampaigns) Campaign {
|
||||||
return Campaign{
|
return Campaign{
|
||||||
ID: r.CampaignID,
|
ID: r.CampaignID,
|
||||||
Name: r.Name,
|
Name: r.Name,
|
||||||
Weight: int(r.Weight),
|
Weight: int(r.Weight),
|
||||||
IsDefault: r.IsDefault,
|
IsDefault: r.IsDefault,
|
||||||
Enabled: r.Enabled,
|
Enabled: r.Enabled,
|
||||||
StartsAt: r.StartsAt,
|
StartsAt: r.StartsAt,
|
||||||
EndsAt: r.EndsAt,
|
EndsAt: r.EndsAt,
|
||||||
CreatedAt: r.CreatedAt,
|
OverrideAll: colorSetFrom(r.OverrideBg, r.OverrideFg, r.OverrideLink),
|
||||||
UpdatedAt: r.UpdatedAt,
|
OverrideDark: colorSetFrom(r.OverrideBgDark, r.OverrideFgDark, r.OverrideLinkDark),
|
||||||
|
Urgent: r.Urgent,
|
||||||
|
CreatedAt: r.CreatedAt,
|
||||||
|
UpdatedAt: r.UpdatedAt,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// colorSetFrom rebuilds an optional ColorSet from three nullable colour columns.
|
||||||
|
// The all-or-nothing CHECK keeps the trio consistent, so a nil in any one means
|
||||||
|
// the set is absent.
|
||||||
|
func colorSetFrom(bg, fg, link *string) *ColorSet {
|
||||||
|
if bg == nil || fg == nil || link == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return &ColorSet{Bg: *bg, Fg: *fg, Link: *link}
|
||||||
|
}
|
||||||
|
|
||||||
|
// colorCols renders a *ColorSet as its three column value-expressions in
|
||||||
|
// bg, fg, link order — NULL for each when the set is absent.
|
||||||
|
func colorCols(cs *ColorSet) (bg, fg, link postgres.Expression) {
|
||||||
|
if cs == nil {
|
||||||
|
return postgres.NULL, postgres.NULL, postgres.NULL
|
||||||
|
}
|
||||||
|
return postgres.String(cs.Bg), postgres.String(cs.Fg), postgres.String(cs.Link)
|
||||||
|
}
|
||||||
|
|
||||||
func modelToMessage(r model.AdMessages) Message {
|
func modelToMessage(r model.AdMessages) Message {
|
||||||
return Message{
|
return Message{
|
||||||
ID: r.MessageID,
|
ID: r.MessageID,
|
||||||
|
|||||||
@@ -192,8 +192,9 @@ func TestBannerMessageOwnership(t *testing.T) {
|
|||||||
type profileBanner struct {
|
type profileBanner struct {
|
||||||
Banner *struct {
|
Banner *struct {
|
||||||
Campaigns []struct {
|
Campaigns []struct {
|
||||||
Weight int `json:"weight"`
|
Weight int `json:"weight"`
|
||||||
Messages []string `json:"messages"`
|
Messages []string `json:"messages"`
|
||||||
|
OverrideBg string `json:"override_bg"`
|
||||||
} `json:"campaigns"`
|
} `json:"campaigns"`
|
||||||
Timings struct {
|
Timings struct {
|
||||||
HoldMs int `json:"hold_ms"`
|
HoldMs int `json:"hold_ms"`
|
||||||
@@ -274,3 +275,142 @@ func TestBannerSurvivesProfileUpdate(t *testing.T) {
|
|||||||
t.Fatalf("profile update dropped the banner block: %v", p.Banner)
|
t.Fatalf("profile update dropped the banner block: %v", p.Banner)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestBannerConsoleColorsAndUrgent drives the colour-override + urgent editor over
|
||||||
|
// HTTP against real Postgres: an incomplete or malformed colour set is refused, a
|
||||||
|
// full two-set override + urgent round-trips through the store (exercising the new
|
||||||
|
// columns and CHECK constraints), clearing the sets removes the override, and the
|
||||||
|
// default campaign stays plain (colours + urgent are ignored for it).
|
||||||
|
func TestBannerConsoleColorsAndUrgent(t *testing.T) {
|
||||||
|
ctx := context.Background()
|
||||||
|
srv, adsSvc := bannerServer(t)
|
||||||
|
h := srv.Handler()
|
||||||
|
base := "http://admin.test/_gm"
|
||||||
|
const origin = "http://admin.test"
|
||||||
|
|
||||||
|
name := "Brand-" + uuid.NewString()[:8]
|
||||||
|
if code, body := consoleDo(h, http.MethodPost, base+"/banners", "name="+name+"&weight=20&enabled=on", origin); code != http.StatusOK || !strings.Contains(body, "Created") {
|
||||||
|
t.Fatalf("create = %d, has Created=%v", code, strings.Contains(body, "Created"))
|
||||||
|
}
|
||||||
|
id := findCampaign(t, adsSvc, name)
|
||||||
|
t.Cleanup(func() { _ = adsSvc.DeleteCampaign(ctx, id) })
|
||||||
|
detail := base + "/banners/" + id.String()
|
||||||
|
|
||||||
|
// A partial colour set (a missing colour) is refused by validation.
|
||||||
|
partial := "name=" + name + "&weight=20&enabled=on&override_all_on=on&override_bg=%23aa0000&override_fg=&override_link=%23ffdd00"
|
||||||
|
if code, b := consoleDo(h, http.MethodPost, detail, partial, origin); code != http.StatusOK || !strings.Contains(b, "Not saved") {
|
||||||
|
t.Fatalf("partial colour = %d, has 'Not saved'=%v", code, strings.Contains(b, "Not saved"))
|
||||||
|
}
|
||||||
|
// A malformed hex is refused.
|
||||||
|
badHex := "name=" + name + "&weight=20&enabled=on&override_all_on=on&override_bg=red&override_fg=%23ffffff&override_link=%23ffdd00"
|
||||||
|
if code, b := consoleDo(h, http.MethodPost, detail, badHex, origin); code != http.StatusOK || !strings.Contains(b, "Not saved") {
|
||||||
|
t.Fatalf("bad hex = %d, has 'Not saved'=%v", code, strings.Contains(b, "Not saved"))
|
||||||
|
}
|
||||||
|
// Both colour sets + urgent persist and round-trip through the store.
|
||||||
|
full := "name=" + name + "&weight=20&enabled=on&urgent=on" +
|
||||||
|
"&override_all_on=on&override_bg=%23aa0000&override_fg=%23ffffff&override_link=%23ffdd00" +
|
||||||
|
"&override_dark_on=on&override_bg_dark=%23330000&override_fg_dark=%23eeeeee&override_link_dark=%23ffcc00"
|
||||||
|
if code, b := consoleDo(h, http.MethodPost, detail, full, origin); code != http.StatusOK || !strings.Contains(b, "Saved") {
|
||||||
|
t.Fatalf("full save = %d, has Saved=%v", code, strings.Contains(b, "Saved"))
|
||||||
|
}
|
||||||
|
cm, err := adsSvc.Campaign(ctx, id)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("read campaign: %v", err)
|
||||||
|
}
|
||||||
|
if cm.OverrideAll == nil || cm.OverrideAll.Bg != "#aa0000" || cm.OverrideAll.Fg != "#ffffff" || cm.OverrideAll.Link != "#ffdd00" {
|
||||||
|
t.Fatalf("override all = %+v", cm.OverrideAll)
|
||||||
|
}
|
||||||
|
if cm.OverrideDark == nil || cm.OverrideDark.Bg != "#330000" || cm.OverrideDark.Fg != "#eeeeee" || cm.OverrideDark.Link != "#ffcc00" {
|
||||||
|
t.Fatalf("override dark = %+v", cm.OverrideDark)
|
||||||
|
}
|
||||||
|
if !cm.Urgent {
|
||||||
|
t.Fatal("urgent not persisted")
|
||||||
|
}
|
||||||
|
// Clearing the sets (both checkboxes off, urgent off) removes the override.
|
||||||
|
if code, _ := consoleDo(h, http.MethodPost, detail, "name="+name+"&weight=20&enabled=on", origin); code != http.StatusOK {
|
||||||
|
t.Fatalf("clear = %d", code)
|
||||||
|
}
|
||||||
|
if cm, _ := adsSvc.Campaign(ctx, id); cm.OverrideAll != nil || cm.OverrideDark != nil || cm.Urgent {
|
||||||
|
t.Fatalf("override not cleared: all=%v dark=%v urgent=%v", cm.OverrideAll, cm.OverrideDark, cm.Urgent)
|
||||||
|
}
|
||||||
|
|
||||||
|
// The default campaign stays plain: submitted colours + urgent are ignored for it.
|
||||||
|
def := defaultCampaign(t, adsSvc)
|
||||||
|
defForm := "name=Default+%28house%29&urgent=on&override_all_on=on&override_bg=%23aa0000&override_fg=%23ffffff&override_link=%23ffdd00"
|
||||||
|
if code, _ := consoleDo(h, http.MethodPost, base+"/banners/"+def.ID.String(), defForm, origin); code != http.StatusOK {
|
||||||
|
t.Fatalf("update default = %d", code)
|
||||||
|
}
|
||||||
|
if again := defaultCampaign(t, adsSvc); again.OverrideAll != nil || again.OverrideDark != nil || again.Urgent {
|
||||||
|
t.Fatalf("default not plain: all=%v dark=%v urgent=%v", again.OverrideAll, again.OverrideDark, again.Urgent)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestBannerUrgentBypassesEligibility checks the urgent flag at the profile level:
|
||||||
|
// an urgent campaign preempts the feed (only it shows, with its colours) and reaches
|
||||||
|
// every viewer — including the no_banner role and a non-empty hint wallet that
|
||||||
|
// otherwise suppress the banner.
|
||||||
|
func TestBannerUrgentBypassesEligibility(t *testing.T) {
|
||||||
|
ctx := context.Background()
|
||||||
|
srv, adsSvc := bannerServer(t)
|
||||||
|
accounts := account.NewStore(testDB)
|
||||||
|
id := provisionAccount(t)
|
||||||
|
|
||||||
|
urgentID, err := adsSvc.CreateCampaign(ctx, ads.Campaign{
|
||||||
|
Name: "Alert-" + uuid.NewString()[:8], Weight: 10, Enabled: true, Urgent: true,
|
||||||
|
OverrideAll: &ads.ColorSet{Bg: "#aa0000", Fg: "#ffffff", Link: "#ffdd00"},
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("create urgent: %v", err)
|
||||||
|
}
|
||||||
|
t.Cleanup(func() { _ = adsSvc.DeleteCampaign(ctx, urgentID) })
|
||||||
|
if _, err := adsSvc.AddMessage(ctx, urgentID, "System maintenance tonight", "Ночью тех.работы"); err != nil {
|
||||||
|
t.Fatalf("add urgent message: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
get := func() profileBanner {
|
||||||
|
t.Helper()
|
||||||
|
rec := userGet(t, srv, "/api/v1/user/profile", id)
|
||||||
|
if rec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("profile = %d", rec.Code)
|
||||||
|
}
|
||||||
|
var p profileBanner
|
||||||
|
if err := json.Unmarshal(rec.Body.Bytes(), &p); err != nil {
|
||||||
|
t.Fatalf("decode: %v", err)
|
||||||
|
}
|
||||||
|
return p
|
||||||
|
}
|
||||||
|
assertUrgentOnly := func(what string, p profileBanner) {
|
||||||
|
t.Helper()
|
||||||
|
if p.Banner == nil {
|
||||||
|
t.Fatalf("%s: no banner", what)
|
||||||
|
}
|
||||||
|
if len(p.Banner.Campaigns) != 1 {
|
||||||
|
t.Fatalf("%s: %d campaigns, want only the urgent one (default preempted)", what, len(p.Banner.Campaigns))
|
||||||
|
}
|
||||||
|
c := p.Banner.Campaigns[0]
|
||||||
|
if len(c.Messages) != 1 || c.Messages[0] != "System maintenance tonight" {
|
||||||
|
t.Fatalf("%s: messages = %v, want only the urgent one", what, c.Messages)
|
||||||
|
}
|
||||||
|
if c.OverrideBg != "#aa0000" {
|
||||||
|
t.Fatalf("%s: override_bg = %q, want #aa0000", what, c.OverrideBg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A normal viewer sees only the urgent campaign (the default is preempted).
|
||||||
|
assertUrgentOnly("eligible", get())
|
||||||
|
|
||||||
|
// The no_banner role no longer suppresses it — urgent reaches everyone.
|
||||||
|
if err := accounts.GrantRole(ctx, id, account.RoleNoBanner); err != nil {
|
||||||
|
t.Fatalf("grant role: %v", err)
|
||||||
|
}
|
||||||
|
assertUrgentOnly("no_banner", get())
|
||||||
|
if err := accounts.RevokeRole(ctx, id, account.RoleNoBanner); err != nil {
|
||||||
|
t.Fatalf("revoke role: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// A non-empty hint wallet no longer suppresses it either.
|
||||||
|
if _, err := accounts.GrantHints(ctx, id, 5); err != nil {
|
||||||
|
t.Fatalf("grant hints: %v", err)
|
||||||
|
}
|
||||||
|
assertUrgentOnly("hints", get())
|
||||||
|
}
|
||||||
|
|||||||
@@ -206,7 +206,7 @@ func TestEmailLoginFlow(t *testing.T) {
|
|||||||
svc := account.NewEmailService(account.NewStore(testDB), mailer, "https://erudit-game.ru")
|
svc := account.NewEmailService(account.NewStore(testDB), mailer, "https://erudit-game.ru")
|
||||||
email := "login-" + uuid.NewString() + "@example.com"
|
email := "login-" + uuid.NewString() + "@example.com"
|
||||||
|
|
||||||
accountID, err := svc.RequestLoginCode(ctx, email, "+02:00", "en")
|
accountID, err := svc.RequestLoginCode(ctx, email, "+02:00", "en", false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("request login code: %v", err)
|
t.Fatalf("request login code: %v", err)
|
||||||
}
|
}
|
||||||
@@ -233,7 +233,7 @@ func TestEmailLoginFlow(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// A second login for the same email is the returning user: same account.
|
// A second login for the same email is the returning user: same account.
|
||||||
if _, err := svc.RequestLoginCode(ctx, email, "", "ru"); err != nil {
|
if _, err := svc.RequestLoginCode(ctx, email, "", "ru", false); err != nil {
|
||||||
t.Fatalf("second request: %v", err)
|
t.Fatalf("second request: %v", err)
|
||||||
}
|
}
|
||||||
acc2, err := svc.LoginWithCode(ctx, email, sixDigit.FindString(mailer.lastBody))
|
acc2, err := svc.LoginWithCode(ctx, email, sixDigit.FindString(mailer.lastBody))
|
||||||
@@ -255,7 +255,7 @@ func TestEmailLoginProvisionsGuestUntilConfirmed(t *testing.T) {
|
|||||||
svc := account.NewEmailService(store, mailer, "https://erudit-game.ru")
|
svc := account.NewEmailService(store, mailer, "https://erudit-game.ru")
|
||||||
email := "squat-" + uuid.NewString() + "@example.com"
|
email := "squat-" + uuid.NewString() + "@example.com"
|
||||||
|
|
||||||
id, err := svc.RequestLoginCode(ctx, email, "", "en")
|
id, err := svc.RequestLoginCode(ctx, email, "", "en", false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("request login code: %v", err)
|
t.Fatalf("request login code: %v", err)
|
||||||
}
|
}
|
||||||
@@ -279,6 +279,34 @@ func TestEmailLoginProvisionsGuestUntilConfirmed(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestEmailLoginPWAOmitsLink: a login requested from an installed PWA (pwa=true) mails only the
|
||||||
|
// code — no one-tap confirm link, which would otherwise open in a separate browser out of the
|
||||||
|
// PWA's reach. A non-PWA request keeps the link.
|
||||||
|
func TestEmailLoginPWAOmitsLink(t *testing.T) {
|
||||||
|
ctx := context.Background()
|
||||||
|
mailer := &capturingMailer{}
|
||||||
|
svc := account.NewEmailService(account.NewStore(testDB), mailer, "https://erudit-game.ru")
|
||||||
|
|
||||||
|
pwaEmail := "pwa-login-" + uuid.NewString() + "@example.com"
|
||||||
|
if _, err := svc.RequestLoginCode(ctx, pwaEmail, "", "en", true); err != nil {
|
||||||
|
t.Fatalf("pwa request login: %v", err)
|
||||||
|
}
|
||||||
|
if sixDigit.FindString(mailer.lastBody) == "" {
|
||||||
|
t.Errorf("pwa login mail must still carry the code, body %q", mailer.lastBody)
|
||||||
|
}
|
||||||
|
if confirmToken.MatchString(mailer.lastBody) {
|
||||||
|
t.Errorf("pwa login mail must omit the one-tap confirm link, body %q", mailer.lastBody)
|
||||||
|
}
|
||||||
|
|
||||||
|
webEmail := "web-login-" + uuid.NewString() + "@example.com"
|
||||||
|
if _, err := svc.RequestLoginCode(ctx, webEmail, "", "en", false); err != nil {
|
||||||
|
t.Fatalf("web request login: %v", err)
|
||||||
|
}
|
||||||
|
if !confirmToken.MatchString(mailer.lastBody) {
|
||||||
|
t.Errorf("non-pwa login mail must keep the one-tap confirm link, body %q", mailer.lastBody)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// confirmToken extracts the one-tap deeplink token from the /app/#/confirm/<token> link
|
// confirmToken extracts the one-tap deeplink token from the /app/#/confirm/<token> link
|
||||||
// the branded email carries.
|
// the branded email carries.
|
||||||
var confirmToken = regexp.MustCompile(`/confirm/([A-Za-z0-9_-]+)`)
|
var confirmToken = regexp.MustCompile(`/confirm/([A-Za-z0-9_-]+)`)
|
||||||
@@ -301,7 +329,7 @@ func TestConfirmByTokenLogin(t *testing.T) {
|
|||||||
svc := account.NewEmailService(store, mailer, "https://erudit-game.ru")
|
svc := account.NewEmailService(store, mailer, "https://erudit-game.ru")
|
||||||
email := "tok-login-" + uuid.NewString() + "@example.com"
|
email := "tok-login-" + uuid.NewString() + "@example.com"
|
||||||
|
|
||||||
id, err := svc.RequestLoginCode(ctx, email, "", "en")
|
id, err := svc.RequestLoginCode(ctx, email, "", "en", false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("request login: %v", err)
|
t.Fatalf("request login: %v", err)
|
||||||
}
|
}
|
||||||
@@ -382,7 +410,7 @@ func TestEmailAccountSeedsDisplayName(t *testing.T) {
|
|||||||
svc := account.NewEmailService(store, &capturingMailer{}, "https://erudit-game.ru")
|
svc := account.NewEmailService(store, &capturingMailer{}, "https://erudit-game.ru")
|
||||||
local := "kaya-" + uuid.NewString()[:8]
|
local := "kaya-" + uuid.NewString()[:8]
|
||||||
|
|
||||||
id, err := svc.RequestLoginCode(ctx, local+"@example.com", "", "en")
|
id, err := svc.RequestLoginCode(ctx, local+"@example.com", "", "en", false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("request login: %v", err)
|
t.Fatalf("request login: %v", err)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,13 +13,20 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type AdCampaigns struct {
|
type AdCampaigns struct {
|
||||||
CampaignID uuid.UUID `sql:"primary_key"`
|
CampaignID uuid.UUID `sql:"primary_key"`
|
||||||
Name string
|
Name string
|
||||||
Weight int32
|
Weight int32
|
||||||
IsDefault bool
|
IsDefault bool
|
||||||
Enabled bool
|
Enabled bool
|
||||||
StartsAt *time.Time
|
StartsAt *time.Time
|
||||||
EndsAt *time.Time
|
EndsAt *time.Time
|
||||||
CreatedAt time.Time
|
CreatedAt time.Time
|
||||||
UpdatedAt time.Time
|
UpdatedAt time.Time
|
||||||
|
OverrideBg *string
|
||||||
|
OverrideFg *string
|
||||||
|
OverrideLink *string
|
||||||
|
OverrideBgDark *string
|
||||||
|
OverrideFgDark *string
|
||||||
|
OverrideLinkDark *string
|
||||||
|
Urgent bool
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,15 +17,22 @@ type adCampaignsTable struct {
|
|||||||
postgres.Table
|
postgres.Table
|
||||||
|
|
||||||
// Columns
|
// Columns
|
||||||
CampaignID postgres.ColumnString
|
CampaignID postgres.ColumnString
|
||||||
Name postgres.ColumnString
|
Name postgres.ColumnString
|
||||||
Weight postgres.ColumnInteger
|
Weight postgres.ColumnInteger
|
||||||
IsDefault postgres.ColumnBool
|
IsDefault postgres.ColumnBool
|
||||||
Enabled postgres.ColumnBool
|
Enabled postgres.ColumnBool
|
||||||
StartsAt postgres.ColumnTimestampz
|
StartsAt postgres.ColumnTimestampz
|
||||||
EndsAt postgres.ColumnTimestampz
|
EndsAt postgres.ColumnTimestampz
|
||||||
CreatedAt postgres.ColumnTimestampz
|
CreatedAt postgres.ColumnTimestampz
|
||||||
UpdatedAt postgres.ColumnTimestampz
|
UpdatedAt postgres.ColumnTimestampz
|
||||||
|
OverrideBg postgres.ColumnString
|
||||||
|
OverrideFg postgres.ColumnString
|
||||||
|
OverrideLink postgres.ColumnString
|
||||||
|
OverrideBgDark postgres.ColumnString
|
||||||
|
OverrideFgDark postgres.ColumnString
|
||||||
|
OverrideLinkDark postgres.ColumnString
|
||||||
|
Urgent postgres.ColumnBool
|
||||||
|
|
||||||
AllColumns postgres.ColumnList
|
AllColumns postgres.ColumnList
|
||||||
MutableColumns postgres.ColumnList
|
MutableColumns postgres.ColumnList
|
||||||
@@ -67,33 +74,47 @@ func newAdCampaignsTable(schemaName, tableName, alias string) *AdCampaignsTable
|
|||||||
|
|
||||||
func newAdCampaignsTableImpl(schemaName, tableName, alias string) adCampaignsTable {
|
func newAdCampaignsTableImpl(schemaName, tableName, alias string) adCampaignsTable {
|
||||||
var (
|
var (
|
||||||
CampaignIDColumn = postgres.StringColumn("campaign_id")
|
CampaignIDColumn = postgres.StringColumn("campaign_id")
|
||||||
NameColumn = postgres.StringColumn("name")
|
NameColumn = postgres.StringColumn("name")
|
||||||
WeightColumn = postgres.IntegerColumn("weight")
|
WeightColumn = postgres.IntegerColumn("weight")
|
||||||
IsDefaultColumn = postgres.BoolColumn("is_default")
|
IsDefaultColumn = postgres.BoolColumn("is_default")
|
||||||
EnabledColumn = postgres.BoolColumn("enabled")
|
EnabledColumn = postgres.BoolColumn("enabled")
|
||||||
StartsAtColumn = postgres.TimestampzColumn("starts_at")
|
StartsAtColumn = postgres.TimestampzColumn("starts_at")
|
||||||
EndsAtColumn = postgres.TimestampzColumn("ends_at")
|
EndsAtColumn = postgres.TimestampzColumn("ends_at")
|
||||||
CreatedAtColumn = postgres.TimestampzColumn("created_at")
|
CreatedAtColumn = postgres.TimestampzColumn("created_at")
|
||||||
UpdatedAtColumn = postgres.TimestampzColumn("updated_at")
|
UpdatedAtColumn = postgres.TimestampzColumn("updated_at")
|
||||||
allColumns = postgres.ColumnList{CampaignIDColumn, NameColumn, WeightColumn, IsDefaultColumn, EnabledColumn, StartsAtColumn, EndsAtColumn, CreatedAtColumn, UpdatedAtColumn}
|
OverrideBgColumn = postgres.StringColumn("override_bg")
|
||||||
mutableColumns = postgres.ColumnList{NameColumn, WeightColumn, IsDefaultColumn, EnabledColumn, StartsAtColumn, EndsAtColumn, CreatedAtColumn, UpdatedAtColumn}
|
OverrideFgColumn = postgres.StringColumn("override_fg")
|
||||||
defaultColumns = postgres.ColumnList{IsDefaultColumn, EnabledColumn, CreatedAtColumn, UpdatedAtColumn}
|
OverrideLinkColumn = postgres.StringColumn("override_link")
|
||||||
|
OverrideBgDarkColumn = postgres.StringColumn("override_bg_dark")
|
||||||
|
OverrideFgDarkColumn = postgres.StringColumn("override_fg_dark")
|
||||||
|
OverrideLinkDarkColumn = postgres.StringColumn("override_link_dark")
|
||||||
|
UrgentColumn = postgres.BoolColumn("urgent")
|
||||||
|
allColumns = postgres.ColumnList{CampaignIDColumn, NameColumn, WeightColumn, IsDefaultColumn, EnabledColumn, StartsAtColumn, EndsAtColumn, CreatedAtColumn, UpdatedAtColumn, OverrideBgColumn, OverrideFgColumn, OverrideLinkColumn, OverrideBgDarkColumn, OverrideFgDarkColumn, OverrideLinkDarkColumn, UrgentColumn}
|
||||||
|
mutableColumns = postgres.ColumnList{NameColumn, WeightColumn, IsDefaultColumn, EnabledColumn, StartsAtColumn, EndsAtColumn, CreatedAtColumn, UpdatedAtColumn, OverrideBgColumn, OverrideFgColumn, OverrideLinkColumn, OverrideBgDarkColumn, OverrideFgDarkColumn, OverrideLinkDarkColumn, UrgentColumn}
|
||||||
|
defaultColumns = postgres.ColumnList{IsDefaultColumn, EnabledColumn, CreatedAtColumn, UpdatedAtColumn, UrgentColumn}
|
||||||
)
|
)
|
||||||
|
|
||||||
return adCampaignsTable{
|
return adCampaignsTable{
|
||||||
Table: postgres.NewTable(schemaName, tableName, alias, allColumns...),
|
Table: postgres.NewTable(schemaName, tableName, alias, allColumns...),
|
||||||
|
|
||||||
//Columns
|
//Columns
|
||||||
CampaignID: CampaignIDColumn,
|
CampaignID: CampaignIDColumn,
|
||||||
Name: NameColumn,
|
Name: NameColumn,
|
||||||
Weight: WeightColumn,
|
Weight: WeightColumn,
|
||||||
IsDefault: IsDefaultColumn,
|
IsDefault: IsDefaultColumn,
|
||||||
Enabled: EnabledColumn,
|
Enabled: EnabledColumn,
|
||||||
StartsAt: StartsAtColumn,
|
StartsAt: StartsAtColumn,
|
||||||
EndsAt: EndsAtColumn,
|
EndsAt: EndsAtColumn,
|
||||||
CreatedAt: CreatedAtColumn,
|
CreatedAt: CreatedAtColumn,
|
||||||
UpdatedAt: UpdatedAtColumn,
|
UpdatedAt: UpdatedAtColumn,
|
||||||
|
OverrideBg: OverrideBgColumn,
|
||||||
|
OverrideFg: OverrideFgColumn,
|
||||||
|
OverrideLink: OverrideLinkColumn,
|
||||||
|
OverrideBgDark: OverrideBgDarkColumn,
|
||||||
|
OverrideFgDark: OverrideFgDarkColumn,
|
||||||
|
OverrideLinkDark: OverrideLinkDarkColumn,
|
||||||
|
Urgent: UrgentColumn,
|
||||||
|
|
||||||
AllColumns: allColumns,
|
AllColumns: allColumns,
|
||||||
MutableColumns: mutableColumns,
|
MutableColumns: mutableColumns,
|
||||||
|
|||||||
@@ -0,0 +1,60 @@
|
|||||||
|
-- Per-campaign banner colour overrides and the urgent (always-show) flag.
|
||||||
|
--
|
||||||
|
-- ad_campaigns gains two optional colour sets and an urgent flag, all for
|
||||||
|
-- non-default campaigns only:
|
||||||
|
-- override_bg/fg/link — paints the strip on every theme
|
||||||
|
-- override_bg/fg/link_dark — further overrides the dark theme
|
||||||
|
-- urgent — force the banner on every viewer (bypassing
|
||||||
|
-- eligibility) and suppress all non-urgent
|
||||||
|
-- campaigns while any urgent one is active
|
||||||
|
--
|
||||||
|
-- Each colour set is all-or-nothing (bg+fg+link together, or absent) and every
|
||||||
|
-- colour is a "#rrggbb" hex string. The default (house) campaign stays plain: no
|
||||||
|
-- colours, never urgent.
|
||||||
|
--
|
||||||
|
-- Expand-contract: additive (nullable columns plus one NOT NULL boolean with a
|
||||||
|
-- default), so a backend image rollback stays DB-safe — older code ignores them.
|
||||||
|
-- The ad_campaigns table shape changes, so its generated go-jet model is
|
||||||
|
-- regenerated (by hand here, to keep the diff to this one table).
|
||||||
|
|
||||||
|
-- +goose Up
|
||||||
|
ALTER TABLE backend.ad_campaigns
|
||||||
|
ADD COLUMN override_bg text,
|
||||||
|
ADD COLUMN override_fg text,
|
||||||
|
ADD COLUMN override_link text,
|
||||||
|
ADD COLUMN override_bg_dark text,
|
||||||
|
ADD COLUMN override_fg_dark text,
|
||||||
|
ADD COLUMN override_link_dark text,
|
||||||
|
ADD COLUMN urgent boolean DEFAULT false NOT NULL,
|
||||||
|
ADD CONSTRAINT ad_campaigns_override_all_chk CHECK (
|
||||||
|
(override_bg IS NULL AND override_fg IS NULL AND override_link IS NULL)
|
||||||
|
OR (override_bg IS NOT NULL AND override_fg IS NOT NULL AND override_link IS NOT NULL)
|
||||||
|
),
|
||||||
|
ADD CONSTRAINT ad_campaigns_override_dark_chk CHECK (
|
||||||
|
(override_bg_dark IS NULL AND override_fg_dark IS NULL AND override_link_dark IS NULL)
|
||||||
|
OR (override_bg_dark IS NOT NULL AND override_fg_dark IS NOT NULL AND override_link_dark IS NOT NULL)
|
||||||
|
),
|
||||||
|
ADD CONSTRAINT ad_campaigns_override_hex_chk CHECK (
|
||||||
|
(override_bg IS NULL OR override_bg ~ '^#[0-9a-fA-F]{6}$')
|
||||||
|
AND (override_fg IS NULL OR override_fg ~ '^#[0-9a-fA-F]{6}$')
|
||||||
|
AND (override_link IS NULL OR override_link ~ '^#[0-9a-fA-F]{6}$')
|
||||||
|
AND (override_bg_dark IS NULL OR override_bg_dark ~ '^#[0-9a-fA-F]{6}$')
|
||||||
|
AND (override_fg_dark IS NULL OR override_fg_dark ~ '^#[0-9a-fA-F]{6}$')
|
||||||
|
AND (override_link_dark IS NULL OR override_link_dark ~ '^#[0-9a-fA-F]{6}$')
|
||||||
|
),
|
||||||
|
ADD CONSTRAINT ad_campaigns_default_plain_chk CHECK (
|
||||||
|
(NOT is_default)
|
||||||
|
OR (override_bg IS NULL AND override_fg IS NULL AND override_link IS NULL
|
||||||
|
AND override_bg_dark IS NULL AND override_fg_dark IS NULL AND override_link_dark IS NULL
|
||||||
|
AND NOT urgent)
|
||||||
|
);
|
||||||
|
|
||||||
|
-- +goose Down
|
||||||
|
ALTER TABLE backend.ad_campaigns
|
||||||
|
DROP COLUMN override_bg,
|
||||||
|
DROP COLUMN override_fg,
|
||||||
|
DROP COLUMN override_link,
|
||||||
|
DROP COLUMN override_bg_dark,
|
||||||
|
DROP COLUMN override_fg_dark,
|
||||||
|
DROP COLUMN override_link_dark,
|
||||||
|
DROP COLUMN urgent;
|
||||||
@@ -22,10 +22,20 @@ type bannerDTO struct {
|
|||||||
|
|
||||||
// bannerCampaignDTO is one campaign in the rotation feed: its GCD-reduced show
|
// bannerCampaignDTO is one campaign in the rotation feed: its GCD-reduced show
|
||||||
// weight (for the client's smooth weighted round-robin) and its messages, in
|
// weight (for the client's smooth weighted round-robin) and its messages, in
|
||||||
// display order, already resolved to one language.
|
// display order, already resolved to one language. The override_* colours are
|
||||||
|
// present only for a campaign that carries a colour override: override_bg/fg/link
|
||||||
|
// paint every theme, and the *_dark trio further overrides the dark theme (the
|
||||||
|
// client resolves the cascade). They are absent for a plain campaign, which keeps
|
||||||
|
// the neutral theme tokens.
|
||||||
type bannerCampaignDTO struct {
|
type bannerCampaignDTO struct {
|
||||||
Weight int `json:"weight"`
|
Weight int `json:"weight"`
|
||||||
Messages []string `json:"messages"`
|
Messages []string `json:"messages"`
|
||||||
|
OverrideBg string `json:"override_bg,omitempty"`
|
||||||
|
OverrideFg string `json:"override_fg,omitempty"`
|
||||||
|
OverrideLink string `json:"override_link,omitempty"`
|
||||||
|
OverrideBgDark string `json:"override_bg_dark,omitempty"`
|
||||||
|
OverrideFgDark string `json:"override_fg_dark,omitempty"`
|
||||||
|
OverrideLinkDark string `json:"override_link_dark,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// bannerTimingsDTO mirrors ads.Timings on the wire.
|
// bannerTimingsDTO mirrors ads.Timings on the wire.
|
||||||
@@ -83,22 +93,27 @@ func (s *Server) bannerFor(ctx context.Context, acc account.Account) *bannerDTO
|
|||||||
if s.ads == nil {
|
if s.ads == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
hasNoBanner, err := s.accounts.HasRole(ctx, acc.ID, account.RoleNoBanner)
|
set, timings, urgent, err := s.ads.ActiveSet(ctx, bannerLang(acc))
|
||||||
if err != nil {
|
|
||||||
s.log.Warn("banner: role check failed", zap.String("account", acc.ID.String()), zap.Error(err))
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
if !ads.Eligible(acc.PaidAccount, acc.HintBalance, hasNoBanner) {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
set, timings, err := s.ads.ActiveSet(ctx, bannerLang(acc))
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
s.log.Warn("banner: active set failed", zap.String("account", acc.ID.String()), zap.Error(err))
|
s.log.Warn("banner: active set failed", zap.String("account", acc.ID.String()), zap.Error(err))
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
// An urgent campaign is shown to every viewer; otherwise the normal eligibility
|
||||||
|
// gate applies (a paid account, a non-empty hint wallet or the no_banner role
|
||||||
|
// hides the banner).
|
||||||
|
if !urgent {
|
||||||
|
hasNoBanner, err := s.accounts.HasRole(ctx, acc.ID, account.RoleNoBanner)
|
||||||
|
if err != nil {
|
||||||
|
s.log.Warn("banner: role check failed", zap.String("account", acc.ID.String()), zap.Error(err))
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if !ads.Eligible(acc.PaidAccount, acc.HintBalance, hasNoBanner) {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
campaigns := make([]bannerCampaignDTO, 0, len(set))
|
campaigns := make([]bannerCampaignDTO, 0, len(set))
|
||||||
for _, c := range set {
|
for _, c := range set {
|
||||||
campaigns = append(campaigns, bannerCampaignDTO{Weight: c.Weight, Messages: c.Messages})
|
campaigns = append(campaigns, bannerCampaignFromActive(c))
|
||||||
}
|
}
|
||||||
return &bannerDTO{
|
return &bannerDTO{
|
||||||
Campaigns: campaigns,
|
Campaigns: campaigns,
|
||||||
@@ -113,6 +128,20 @@ func (s *Server) bannerFor(ctx context.Context, acc account.Account) *bannerDTO
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// bannerCampaignFromActive flattens a resolved campaign into its wire DTO,
|
||||||
|
// projecting each optional colour set into its three "#rrggbb" fields (empty when
|
||||||
|
// the set is absent, so JSON omitempty drops them).
|
||||||
|
func bannerCampaignFromActive(c ads.ActiveCampaign) bannerCampaignDTO {
|
||||||
|
d := bannerCampaignDTO{Weight: c.Weight, Messages: c.Messages}
|
||||||
|
if c.OverrideAll != nil {
|
||||||
|
d.OverrideBg, d.OverrideFg, d.OverrideLink = c.OverrideAll.Bg, c.OverrideAll.Fg, c.OverrideAll.Link
|
||||||
|
}
|
||||||
|
if c.OverrideDark != nil {
|
||||||
|
d.OverrideBgDark, d.OverrideFgDark, d.OverrideLinkDark = c.OverrideDark.Bg, c.OverrideDark.Fg, c.OverrideDark.Link
|
||||||
|
}
|
||||||
|
return d
|
||||||
|
}
|
||||||
|
|
||||||
// bannerLang resolves the message language for a viewer: their interface language
|
// bannerLang resolves the message language for a viewer: their interface language
|
||||||
// (Russian, or English by default).
|
// (Russian, or English by default).
|
||||||
func bannerLang(acc account.Account) string {
|
func bannerLang(acc account.Account) string {
|
||||||
|
|||||||
@@ -19,6 +19,15 @@ const bannersBack = "/_gm/banners"
|
|||||||
// bound; the operator's entry is interpreted as UTC.
|
// bound; the operator's entry is interpreted as UTC.
|
||||||
const localTimeLayout = "2006-01-02T15:04"
|
const localTimeLayout = "2006-01-02T15:04"
|
||||||
|
|
||||||
|
// Neutral banner theme tokens, mirrored from ui/src/app.css (--ad-bg,
|
||||||
|
// --text-muted, --accent for the light and dark themes). They seed the console's
|
||||||
|
// colour pickers and the preview fallback when a campaign has no override, so the
|
||||||
|
// operator always edits against the real neutral colours.
|
||||||
|
const (
|
||||||
|
tokenLightBg, tokenLightFg, tokenLightLink = "#e3e7ee", "#6b7280", "#2f6df6"
|
||||||
|
tokenDarkBg, tokenDarkFg, tokenDarkLink = "#272f3c", "#9aa3b2", "#5b8cff"
|
||||||
|
)
|
||||||
|
|
||||||
// consoleBanners lists the advertising campaigns (default first), each with its
|
// consoleBanners lists the advertising campaigns (default first), each with its
|
||||||
// weight, validity window, enabled flag, message count and live-now status.
|
// weight, validity window, enabled flag, message count and live-now status.
|
||||||
func (s *Server) consoleBanners(c *gin.Context) {
|
func (s *Server) consoleBanners(c *gin.Context) {
|
||||||
@@ -56,14 +65,19 @@ func (s *Server) consoleBannerDetail(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
view := adminconsole.BannerDetailView{
|
view := adminconsole.BannerDetailView{
|
||||||
ID: cm.ID.String(),
|
ID: cm.ID.String(),
|
||||||
Name: cm.Name,
|
Name: cm.Name,
|
||||||
Weight: cm.Weight,
|
Weight: cm.Weight,
|
||||||
IsDefault: cm.IsDefault,
|
IsDefault: cm.IsDefault,
|
||||||
Enabled: cm.Enabled,
|
Enabled: cm.Enabled,
|
||||||
StartsAt: localInput(cm.StartsAt),
|
StartsAt: localInput(cm.StartsAt),
|
||||||
EndsAt: localInput(cm.EndsAt),
|
EndsAt: localInput(cm.EndsAt),
|
||||||
|
Urgent: cm.Urgent,
|
||||||
|
OverrideAllOn: cm.OverrideAll != nil,
|
||||||
|
OverrideDarkOn: cm.OverrideDark != nil,
|
||||||
}
|
}
|
||||||
|
view.AllBg, view.AllFg, view.AllLink = seedColors(cm.OverrideAll, tokenLightBg, tokenLightFg, tokenLightLink)
|
||||||
|
view.DarkBg, view.DarkFg, view.DarkLink = seedColors(cm.OverrideDark, tokenDarkBg, tokenDarkFg, tokenDarkLink)
|
||||||
for i, m := range cm.Messages {
|
for i, m := range cm.Messages {
|
||||||
view.Messages = append(view.Messages, adminconsole.BannerMessageRow{
|
view.Messages = append(view.Messages, adminconsole.BannerMessageRow{
|
||||||
ID: m.ID.String(),
|
ID: m.ID.String(),
|
||||||
@@ -111,12 +125,15 @@ func (s *Server) consoleUpdateBanner(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
err = s.ads.UpdateCampaign(c.Request.Context(), ads.Campaign{
|
err = s.ads.UpdateCampaign(c.Request.Context(), ads.Campaign{
|
||||||
ID: id,
|
ID: id,
|
||||||
Name: trimForm(c, "name"),
|
Name: trimForm(c, "name"),
|
||||||
Weight: atoiForm(c, "weight"),
|
Weight: atoiForm(c, "weight"),
|
||||||
Enabled: c.PostForm("enabled") != "",
|
Enabled: c.PostForm("enabled") != "",
|
||||||
StartsAt: starts,
|
StartsAt: starts,
|
||||||
EndsAt: ends,
|
EndsAt: ends,
|
||||||
|
Urgent: c.PostForm("urgent") != "",
|
||||||
|
OverrideAll: colorSetForm(c, "override_all_on", "override_bg", "override_fg", "override_link"),
|
||||||
|
OverrideDark: colorSetForm(c, "override_dark_on", "override_bg_dark", "override_fg_dark", "override_link_dark"),
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
s.bannerError(c, err, back)
|
s.bannerError(c, err, back)
|
||||||
@@ -321,3 +338,29 @@ func atoiForm(c *gin.Context, name string) int {
|
|||||||
n, _ := strconv.Atoi(trimForm(c, name))
|
n, _ := strconv.Atoi(trimForm(c, name))
|
||||||
return n
|
return n
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// seedColors returns the three colour-input seed values for a campaign's optional
|
||||||
|
// override: the stored colours when the set is present, otherwise the given
|
||||||
|
// neutral theme tokens (so the native picker starts sensibly and the preview
|
||||||
|
// shows the real fallback).
|
||||||
|
func seedColors(cs *ads.ColorSet, tokenBg, tokenFg, tokenLink string) (bg, fg, link string) {
|
||||||
|
if cs == nil {
|
||||||
|
return tokenBg, tokenFg, tokenLink
|
||||||
|
}
|
||||||
|
return cs.Bg, cs.Fg, cs.Link
|
||||||
|
}
|
||||||
|
|
||||||
|
// colorSetForm reads an optional colour override from the form: the on flag gates
|
||||||
|
// it (an unchecked set is absent, nil), otherwise the three posted colours are
|
||||||
|
// returned for the ads service to validate. The colour inputs are disabled in the
|
||||||
|
// browser while the set is off, so they are not posted then.
|
||||||
|
func colorSetForm(c *gin.Context, on, bg, fg, link string) *ads.ColorSet {
|
||||||
|
if c.PostForm(on) == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return &ads.ColorSet{
|
||||||
|
Bg: trimForm(c, bg),
|
||||||
|
Fg: trimForm(c, fg),
|
||||||
|
Link: trimForm(c, link),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -174,6 +174,10 @@ type emailRequest struct {
|
|||||||
Email string `json:"email"`
|
Email string `json:"email"`
|
||||||
BrowserTZ string `json:"browser_tz"`
|
BrowserTZ string `json:"browser_tz"`
|
||||||
Language string `json:"language"`
|
Language string `json:"language"`
|
||||||
|
// Pwa marks a request from an installed PWA (standalone display mode): the login email then
|
||||||
|
// omits the one-tap confirm link so the code is typed in the same window (the link would open
|
||||||
|
// in a separate browser whose session cannot reach the PWA). See EmailService.RequestLoginCode.
|
||||||
|
Pwa bool `json:"pwa"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// handleEmailRequest issues a login confirm-code to the email. It always reports
|
// handleEmailRequest issues a login confirm-code to the email. It always reports
|
||||||
@@ -185,7 +189,7 @@ func (s *Server) handleEmailRequest(c *gin.Context) {
|
|||||||
abortBadRequest(c, "email is required")
|
abortBadRequest(c, "email is required")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if _, err := s.emails.RequestLoginCode(c.Request.Context(), req.Email, req.BrowserTZ, req.Language); err != nil {
|
if _, err := s.emails.RequestLoginCode(c.Request.Context(), req.Email, req.BrowserTZ, req.Language, req.Pwa); err != nil {
|
||||||
s.abortErr(c, err)
|
s.abortErr(c, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
+31
-5
@@ -244,7 +244,9 @@ arrive from a platform rather than completing a mandatory registration).
|
|||||||
256-bit token stored only as its SHA-256, 12-hour TTL): a login mints a session in the
|
256-bit token stored only as its SHA-256, 12-hour TTL): a login mints a session in the
|
||||||
browser that opens it (magic-link), a link confirms the identity and emits a `notify`
|
browser that opens it (magic-link), a link confirms the identity and emits a `notify`
|
||||||
profile-refresh to the in-app session, a change switches the account's email in place,
|
profile-refresh to the in-app session, a change switches the account's email in place,
|
||||||
and a would-be merge is deferred to the interactive flow. The confirm runs on load; the token rides the URL fragment (never
|
and a would-be merge is deferred to the interactive flow. A login requested from an installed **PWA** omits the deeplink
|
||||||
|
entirely — its email carries the code only, typed in the same window, since the link would open
|
||||||
|
in a separate browser whose minted session cannot reach the PWA. The confirm runs on load; the token rides the URL fragment (never
|
||||||
sent to the server), so a plain link prefetch cannot reach it, and the manual
|
sent to the server), so a plain link prefetch cannot reach it, and the manual
|
||||||
six-digit code is the fallback if an aggressive scanner runs the page. An
|
six-digit code is the fallback if an aggressive scanner runs the page. An
|
||||||
**email-login** account is created flagged `is_guest` and stays reapable until the
|
**email-login** account is created flagged `is_guest` and stays reapable until the
|
||||||
@@ -980,10 +982,25 @@ edge-pause, scroll speed, and the fade-out → gap → fade-in transition) are o
|
|||||||
eligibility inputs (grants hints, grants/revokes `no_banner`; a future payment flow sets
|
eligibility inputs (grants hints, grants/revokes `no_banner`; a future payment flow sets
|
||||||
`paid_account`), the backend emits a `notify` **`banner`** sub-kind (a payload-free re-poll signal),
|
`paid_account`), the backend emits a `notify` **`banner`** sub-kind (a payload-free re-poll signal),
|
||||||
and the open client re-fetches `profile.get` to show or hide the banner in place. Operator *content*
|
and the open client re-fetches `profile.get` to show or hide the banner in place. Operator *content*
|
||||||
edits take effect on the next `profile.get` (open/reconnect/foreground), not mid-session. The same
|
edits take effect on the next `profile.get` (open/reconnect/foreground), not mid-session. A
|
||||||
|
non-default campaign may also carry an optional **colour override** (background, text, link) in two
|
||||||
|
sets — one for every theme, one for the dark theme only — plus an **urgent** flag. The colours ride
|
||||||
|
the same block (six optional strings appended to each `BannerCampaign` on the wire — trailing,
|
||||||
|
backward-compatible); the client resolves the cascade (dark ← dark ?? all, light ← all) and derives
|
||||||
|
the strip's border from the background in JS (no CSS `color-mix`, for the old-WebView floor).
|
||||||
|
**Urgent is resolved entirely server-side, with no wire field**: while any enabled, in-window urgent
|
||||||
|
campaign exists, `computeActiveSet` returns *only* the urgent campaigns (preempting the timed set and
|
||||||
|
the default remainder) and `bannerFor` **skips the eligibility gate** for that feed, so an urgent
|
||||||
|
notice reaches every viewer — paid, hint-holding or `no_banner` included. There is no instant
|
||||||
|
broadcast on an urgent toggle (the notify path is per-user); an urgent campaign appears on each
|
||||||
|
viewer's next `profile.get`. The default campaign stays plain (no colours, never urgent), enforced by
|
||||||
|
both the service and a DB CHECK. The same
|
||||||
mechanism carries a **`profile`** sub-kind — a payload-free re-fetch signal emitted when a viewer's
|
mechanism carries a **`profile`** sub-kind — a payload-free re-fetch signal emitted when a viewer's
|
||||||
own account changed out of band (an email confirmed through the one-tap deeplink opened in another
|
own account changed out of band (an email confirmed through the one-tap deeplink opened in another
|
||||||
browser), so an open in-app session reflects it at once.
|
browser), so an open in-app session reflects it at once. The live stream is single-shot with no
|
||||||
|
replay, so a **backgrounded Mini App** — suspended while the user is in their mail app tapping the
|
||||||
|
link — misses the event; while an add-email confirmation is pending the client therefore also
|
||||||
|
**polls `profile.get`** (and on foreground regain) as a fallback until the address lands.
|
||||||
|
|
||||||
> A single `app.load` bootstrap aggregator (collapsing `profile.get` + lobby + badge fetches into
|
> A single `app.load` bootstrap aggregator (collapsing `profile.get` + lobby + badge fetches into
|
||||||
> one round-trip) was **considered and deferred**: client↔gateway is HTTP/2 (h2c), so the bootstrap
|
> one round-trip) was **considered and deferred**: client↔gateway is HTTP/2 (h2c), so the bootstrap
|
||||||
@@ -1026,7 +1043,9 @@ browser), so an open in-app session reflects it at once.
|
|||||||
(`internal/adminalert`, started from `main`) emails the operator (`ADMIN_EMAIL`, from a
|
(`internal/adminalert`, started from `main`) emails the operator (`ADMIN_EMAIL`, from a
|
||||||
distinct `SMTP_RELAY_ADMIN_FROM`) when new player feedback or word complaints arrive,
|
distinct `SMTP_RELAY_ADMIN_FROM`) when new player feedback or word complaints arrive,
|
||||||
**coalescing** a burst into one digest per interval; both recipients may be several
|
**coalescing** a burst into one digest per interval; both recipients may be several
|
||||||
comma-separated addresses. Both paths are inert unless configured.
|
comma-separated addresses. The digest carries **no admin-console link** — an admin URL must
|
||||||
|
never travel in an email, where a mail provider could cache or index it; the operator opens the
|
||||||
|
console directly. Both paths are inert unless configured.
|
||||||
- Per-request server-side timing via gin middleware from day one (the access log
|
- Per-request server-side timing via gin middleware from day one (the access log
|
||||||
carries method, route, status, latency and the active trace id). A
|
carries method, route, status, latency and the active trace id). A
|
||||||
client-measured RTT piggybacked on the next request is a later enhancement.
|
client-measured RTT piggybacked on the next request is a later enhancement.
|
||||||
@@ -1218,7 +1237,14 @@ origin, so the test contour canonicalises to production instead of being indexed
|
|||||||
separate site; the SPA shell is `noindex`, and the landing always boots in Russian (no
|
separate site; the SPA shell is `noindex`, and the landing always boots in Russian (no
|
||||||
browser-language detection — crawlers render with arbitrary languages). The favicon set,
|
browser-language detection — crawlers render with arbitrary languages). The favicon set,
|
||||||
`og-image.png` and `robots.txt` ship unhashed from `ui/public/` (generated by
|
`og-image.png` and `robots.txt` ship unhashed from `ui/public/` (generated by
|
||||||
`assets/icons/`, same tile design as the VK loader). Hash-named `/assets/*` are served
|
`assets/icons/`, same tile design as the VK loader). On the web (`/app/`) the SPA is an installable **PWA**:
|
||||||
|
`manifest.webmanifest` and an install-only **service worker** (`sw.js`) ship unhashed from
|
||||||
|
`ui/public/`, and the client registers the worker **web-only** — never inside a Mini App or the
|
||||||
|
mock build. The worker intercepts only top-level navigations (network-first with a cached-shell
|
||||||
|
fallback), leaving `/assets/*` and the Connect stream untouched; it exists to satisfy Chromium's
|
||||||
|
installability requirement (a registered SW, needed for install on Android) and is the single
|
||||||
|
growth point for a future opt-in offline mode. The gateway registers the `.webmanifest` MIME type
|
||||||
|
in-process (the distroless image has no `/etc/mime.types`). Hash-named `/assets/*` are served
|
||||||
`immutable` (a relaunch is a cache hit, not a re-download); the HTML shells are
|
`immutable` (a relaunch is a cache hit, not a re-download); the HTML shells are
|
||||||
`no-cache` so a new deploy is picked up — both containers apply the same caching. An
|
`no-cache` so a new deploy is picked up — both containers apply the same caching. An
|
||||||
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
|
||||||
|
|||||||
+28
-7
@@ -21,7 +21,8 @@ Settings also pick the board's bonus-label style (beginner / classic / none). A
|
|||||||
costs nothing when the rack has no legal move. The word-check accepts only the
|
costs nothing when the rack has no legal move. The word-check accepts only the
|
||||||
variant's alphabet, remembers answers within the session and rate-limits repeats.
|
variant's alphabet, remembers answers within the session and rate-limits repeats.
|
||||||
A public **landing page** at the site root introduces the game, switches language and
|
A public **landing page** at the site root introduces the game, switches language and
|
||||||
theme, and links to the Telegram game channel and the VK Mini App; the game itself runs at
|
theme, and links to the Telegram game channel, the VK Mini App and the **web version**
|
||||||
|
(`/app/`) — each under a caption (Telegram / VK / Веб-версия); the game itself runs at
|
||||||
`/app/` (web), `/telegram/` (the Telegram Mini App) and `/vk/` (the VK Mini App). The landing's theme is ephemeral
|
`/app/` (web), `/telegram/` (the Telegram Mini App) and `/vk/` (the VK Mini App). The landing's theme is ephemeral
|
||||||
(it follows the system scheme, not the saved preference); its language choice is saved. The
|
(it follows the system scheme, not the saved preference); its language choice is saved. The
|
||||||
landing always opens in **Russian** — the browser language is never auto-detected (crawlers
|
landing always opens in **Russian** — the browser language is never auto-detected (crawlers
|
||||||
@@ -31,6 +32,11 @@ nondeterministic); a saved 🌐 choice still wins. The page carries a static Rus
|
|||||||
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.
|
shell is `noindex` — the landing is the only indexable page.
|
||||||
|
|
||||||
|
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
|
||||||
|
home screen / desktop in one tap where the browser supports it (Chromium), or shows manual
|
||||||
|
Add-to-Home-Screen steps on iOS Safari; it is hidden once installed and inside the Mini Apps.
|
||||||
|
|
||||||
### First-run onboarding
|
### First-run onboarding
|
||||||
The first time a player opens the app it walks them through the interface with a light
|
The first time a player opens the app it walks them through the interface with a light
|
||||||
**coachmark overlay**: a dimmed layer draws one hint bubble at a time, each pointing — with a
|
**coachmark overlay**: a dimmed layer draws one hint bubble at a time, each pointing — with a
|
||||||
@@ -70,7 +76,9 @@ per address), so a mistyped address or an impatient tap cannot flood an inbox. T
|
|||||||
also carries a **one-tap link** that confirms the address — or signs the player straight
|
also carries a **one-tap link** that confirms the address — or signs the player straight
|
||||||
in — in a single tap; opening it in another browser reflects in the app at once, and a
|
in — in a single tap; opening it in another browser reflects in the app at once, and a
|
||||||
mail scanner that merely fetches the link cannot reach it — the token rides the URL
|
mail scanner that merely fetches the link cannot reach it — the token rides the URL
|
||||||
fragment, which is never sent to the server.
|
fragment, which is never sent to the server. A sign-in requested from an **installed PWA** omits
|
||||||
|
this link: the email carries only the code, entered in the same window, since the link would open
|
||||||
|
in a separate browser the app cannot reach.
|
||||||
Telegram runs a **single bot**: every player uses
|
Telegram runs a **single bot**: every player uses
|
||||||
the same bot, and all of its chat and out-of-app notifications are written in the
|
the same bot, and all of its chat and out-of-app notifications are written in the
|
||||||
player's own **interface language** (en/ru). A separate optional **promo bot** can run alongside the
|
player's own **interface language** (en/ru). A separate optional **promo bot** can run alongside the
|
||||||
@@ -109,7 +117,9 @@ two accounts share a game still in progress.
|
|||||||
|
|
||||||
The profile lists the account's **sign-in methods**. On the web a player can add
|
The profile lists the account's **sign-in methods**. On the web a player can add
|
||||||
Telegram (a login-widget popup) or VK (VK ID web login — a redirect to VK's sign-in and
|
Telegram (a login-widget popup) or VK (VK ID web login — a redirect to VK's sign-in and
|
||||||
back); inside a Mini App the host platform is already linked. Linking a provider that
|
back); inside a Mini App the host platform is already linked, and its own sign-in-method
|
||||||
|
row is hidden — the platform the player is currently signed in through cannot be unlinked
|
||||||
|
from there, only the other provider's row is shown. Linking a provider that
|
||||||
already belongs to another account offers the same irreversible **merge** as email
|
already belongs to another account offers the same irreversible **merge** as email
|
||||||
linking. A linked provider can be **unlinked** — except the last
|
linking. A linked provider can be **unlinked** — except the last
|
||||||
remaining sign-in method, which is refused so the account stays reachable. **Email is
|
remaining sign-in method, which is refused so the account stays reachable. **Email is
|
||||||
@@ -483,8 +493,19 @@ through**, regardless of their interface language. The client rotates the eligib
|
|||||||
**fairly** — every campaign gets its weighted share each cycle, evenly spread rather than at random —
|
**fairly** — every campaign gets its weighted share each cycle, evenly spread rather than at random —
|
||||||
and a campaign with several messages shows them in turn.
|
and a campaign with several messages shows them in turn.
|
||||||
|
|
||||||
|
A non-default campaign can carry its own **colours** — background, text and link — so a sponsored or
|
||||||
|
operational message stands out from the neutral strip. Colours come in two sets: one that applies on
|
||||||
|
**every theme**, and an optional second that overrides the **dark theme** only, so a campaign reads
|
||||||
|
well on both; the strip's border is derived from the background automatically. A campaign can also be
|
||||||
|
marked **urgent**: an urgent campaign is shown to **everyone** — even paid players, hint holders and
|
||||||
|
`no_banner` users — and, while it is live, it is the **only** thing the strip shows (ordinary
|
||||||
|
campaigns and the house default step aside). Urgent is for genuine system notices (maintenance,
|
||||||
|
outages), not advertising.
|
||||||
|
|
||||||
Operators manage all of this in the admin console at **`/_gm/banners`**: create, edit, enable/disable
|
Operators manage all of this in the admin console at **`/_gm/banners`**: create, edit, enable/disable
|
||||||
and schedule campaigns, write each campaign's bilingual messages (reorder or remove them), and set
|
and schedule campaigns, write each campaign's bilingual messages (reorder or remove them), pick a
|
||||||
the global display **timings** (how long a message holds, the scroll of an over-long message, and the
|
non-default campaign's optional override colours (a native colour picker with a live light-and-dark
|
||||||
fade-out → gap → fade-in transition between messages). The default campaign cannot be deleted and
|
preview of the strip) and mark it urgent, and set the global display **timings** (how long a message
|
||||||
keeps at least one message.
|
holds, the scroll of an over-long message, and the fade-out → gap → fade-in transition between
|
||||||
|
messages). The default campaign cannot be deleted, keeps at least one message, and stays plain (no
|
||||||
|
colours, never urgent).
|
||||||
|
|||||||
+27
-6
@@ -22,7 +22,8 @@ top-1 подсказку, безлимитную проверку слова с
|
|||||||
Проверка слова принимает только алфавит варианта, запоминает ответы в рамках сессии
|
Проверка слова принимает только алфавит варианта, запоминает ответы в рамках сессии
|
||||||
и ограничивает частоту повторов.
|
и ограничивает частоту повторов.
|
||||||
Публичная **посадочная страница** в корне сайта представляет игру, переключает язык и
|
Публичная **посадочная страница** в корне сайта представляет игру, переключает язык и
|
||||||
тему и ведёт в Telegram-канал игры и в VK Mini App; сама игра живёт по адресам
|
тему и ведёт в Telegram-канал игры, в VK Mini App и в **веб-версию** (`/app/`) — каждая под
|
||||||
|
подписью (Telegram / VK / Веб-версия); сама игра живёт по адресам
|
||||||
`/app/` (веб), `/telegram/` (Telegram Mini App) и `/vk/` (VK Mini App). Тема на странице эфемерна (берётся из
|
`/app/` (веб), `/telegram/` (Telegram Mini App) и `/vk/` (VK Mini App). Тема на странице эфемерна (берётся из
|
||||||
системной настройки, а не из сохранённой), выбор языка сохраняется. Страница всегда
|
системной настройки, а не из сохранённой), выбор языка сохраняется. Страница всегда
|
||||||
открывается на **русском** — язык браузера не определяется автоматически (роботы
|
открывается на **русском** — язык браузера не определяется автоматически (роботы
|
||||||
@@ -33,6 +34,11 @@ Open Graph, которую используют превью ссылок в Tel
|
|||||||
продакшен-домена, JSON-LD, набор favicon и `robots.txt`), а оболочка SPA помечена
|
продакшен-домена, JSON-LD, набор favicon и `robots.txt`), а оболочка SPA помечена
|
||||||
`noindex` — индексируется только посадочная страница.
|
`noindex` — индексируется только посадочная страница.
|
||||||
|
|
||||||
|
В обычном вебе клиент — **устанавливаемое PWA**: незалогиненный игрок видит призыв к установке
|
||||||
|
под формой входа (и внизу «Настроек»), который в один тап ставит приложение на рабочий стол
|
||||||
|
(домашний экран) там, где браузер это умеет (Chromium), либо показывает ручные шаги
|
||||||
|
«На экран „Домой“» в Safari на iOS; он скрыт после установки и внутри Mini App.
|
||||||
|
|
||||||
### Первый запуск: онбординг
|
### Первый запуск: онбординг
|
||||||
При первом открытии приложения игрока один раз проводят по интерфейсу лёгким
|
При первом открытии приложения игрока один раз проводят по интерфейсу лёгким
|
||||||
**coachmark-оверлеем**: затемнённый слой показывает по одной подсказке-«облачку» за раз, каждое
|
**coachmark-оверлеем**: затемнённый слой показывает по одной подсказке-«облачку» за раз, каждое
|
||||||
@@ -74,7 +80,9 @@ launch-параметрам VK (их проверяет gateway), и при пе
|
|||||||
не завалили почтовый ящик. В письме также есть **ссылка одного нажатия**, которая подтверждает
|
не завалили почтовый ящик. В письме также есть **ссылка одного нажатия**, которая подтверждает
|
||||||
адрес — или сразу выполняет вход — в один тап; открытие её в другом браузере тут же отражается в
|
адрес — или сразу выполняет вход — в один тап; открытие её в другом браузере тут же отражается в
|
||||||
приложении, а почтовый сканер, который просто загружает ссылку, до токена не дотянется —
|
приложении, а почтовый сканер, который просто загружает ссылку, до токена не дотянется —
|
||||||
он едет в URL-фрагменте, который не уходит на сервер.
|
он едет в URL-фрагменте, который не уходит на сервер. Вход, запрошенный из **установленного
|
||||||
|
PWA**, эту ссылку не содержит: в письме только код, который вводится в том же окне (ссылка
|
||||||
|
открылась бы в отдельном браузере, недоступном приложению).
|
||||||
Telegram держит **единого бота**: все игроки пользуются одним
|
Telegram держит **единого бота**: все игроки пользуются одним
|
||||||
и тем же ботом, а весь его чат и внеприложенческие уведомления пишутся на **языке
|
и тем же ботом, а весь его чат и внеприложенческие уведомления пишутся на **языке
|
||||||
интерфейса** самого игрока (en/ru). Рядом с основным может работать отдельный опциональный
|
интерфейса** самого игрока (en/ru). Рядом с основным может работать отдельный опциональный
|
||||||
@@ -113,7 +121,9 @@ Telegram держит **единого бота**: все игроки поль
|
|||||||
|
|
||||||
В профиле перечислены **способы входа** аккаунта. В вебе игрок может добавить
|
В профиле перечислены **способы входа** аккаунта. В вебе игрок может добавить
|
||||||
Telegram (попап логин-виджета) или VK (веб-вход VK ID — редирект на страницу входа VK и
|
Telegram (попап логин-виджета) или VK (веб-вход VK ID — редирект на страницу входа VK и
|
||||||
обратно); внутри Mini App платформа-хозяин уже привязана. Привязка провайдера, уже
|
обратно); внутри Mini App платформа-хозяин уже привязана, и её собственная плашка способа
|
||||||
|
входа скрыта — платформу, через которую игрок сейчас вошёл, отсюда отвязать нельзя,
|
||||||
|
показывается только плашка другого провайдера. Привязка провайдера, уже
|
||||||
принадлежащего другому аккаунту, предлагает то же необратимое **слияние**, что и привязка
|
принадлежащего другому аккаунту, предлагает то же необратимое **слияние**, что и привязка
|
||||||
email. Привязанного провайдера можно **отвязать** — кроме последнего
|
email. Привязанного провайдера можно **отвязать** — кроме последнего
|
||||||
оставшегося способа входа: он не отвязывается, чтобы аккаунт оставался достижимым.
|
оставшегося способа входа: он не отвязывается, чтобы аккаунт оставался достижимым.
|
||||||
@@ -494,8 +504,19 @@ high-rate флага. С карточки пользователя операт
|
|||||||
**честно** — каждая получает свою долю по весу за цикл, равномерно размазанную, а не случайно — а
|
**честно** — каждая получает свою долю по весу за цикл, равномерно размазанную, а не случайно — а
|
||||||
кампания с несколькими сообщениями показывает их по очереди.
|
кампания с несколькими сообщениями показывает их по очереди.
|
||||||
|
|
||||||
|
Недефолтная кампания может нести собственные **цвета** — фон, текст и ссылку — чтобы рекламное или
|
||||||
|
служебное сообщение выделялось на фоне нейтральной ленты. Цвета задаются двумя наборами: один
|
||||||
|
применяется на **любой теме**, а необязательный второй переопределяет только **тёмную тему**, чтобы
|
||||||
|
кампания хорошо читалась на обеих; рамка ленты выводится из фона автоматически. Кампанию можно также
|
||||||
|
пометить как **срочную (urgent)**: срочная кампания показывается **всем** — даже платным игрокам,
|
||||||
|
владельцам подсказок и пользователям с ролью `no_banner` — и, пока она активна, лента показывает
|
||||||
|
**только её** (обычные кампании и домашняя дефолтная уступают место). Срочность — для настоящих
|
||||||
|
системных уведомлений (тех.работы, сбои), а не для рекламы.
|
||||||
|
|
||||||
Всем этим оператор управляет в админ-консоли по адресу **`/_gm/banners`**: создаёт, редактирует,
|
Всем этим оператор управляет в админ-консоли по адресу **`/_gm/banners`**: создаёт, редактирует,
|
||||||
включает/выключает и планирует кампании, пишет двуязычные сообщения кампании (переставляет и удаляет
|
включает/выключает и планирует кампании, пишет двуязычные сообщения кампании (переставляет и удаляет
|
||||||
их) и задаёт общие **тайминги** показа (сколько держится сообщение, прокрутка слишком длинного, и
|
их), выбирает необязательные цвета недефолтной кампании (нативный color-picker с живым превью ленты
|
||||||
переход fade-out → пауза → fade-in между сообщениями). Дефолтную кампанию нельзя удалить, и в ней
|
на светлой и тёмной темах) и помечает её срочной, а также задаёт общие **тайминги** показа (сколько
|
||||||
всегда остаётся хотя бы одно сообщение.
|
держится сообщение, прокрутка слишком длинного, и переход fade-out → пауза → fade-in между
|
||||||
|
сообщениями). Дефолтную кампанию нельзя удалить, в ней всегда остаётся хотя бы одно сообщение, и она
|
||||||
|
остаётся простой (без цветов, никогда не срочная).
|
||||||
|
|||||||
@@ -315,6 +315,19 @@ left. A **viewport size change** (e.g. a portrait↔landscape rotation) re-measu
|
|||||||
operator-set (`/_gm/banner-settings`). Under **reduce-motion** the fades collapse to an instant swap
|
operator-set (`/_gm/banner-settings`). Under **reduce-motion** the fades collapse to an instant swap
|
||||||
and a long message does not scroll.
|
and a long message does not scroll.
|
||||||
|
|
||||||
|
**Per-campaign colours.** A campaign may override the strip's colours (background, text, link). The
|
||||||
|
engine carries the current message's campaign colours to the host, and `AdBanner` resolves them for
|
||||||
|
the **rendered theme** (`lib/bannerColors`: dark ← dark-set ?? all-set, light ← all-set) and applies
|
||||||
|
them as inline CSS variables scoped to `.ad` (`--ad-bg`, `--text-muted`, `--accent`, and a derived
|
||||||
|
`--ad-border`) — so an override never leaks past the strip, and a campaign with no override keeps the
|
||||||
|
neutral tokens. The border is computed from the background in JS (a luminance-aware nudge toward
|
||||||
|
black/white — no CSS `color-mix`, which the old Android WebView floor lacks), matching the admin
|
||||||
|
console's live preview. The resolution re-runs when the theme flips (a `[data-theme]` /
|
||||||
|
`prefers-color-scheme` observer), so switching light↔dark repaints an overridden strip at once. An
|
||||||
|
**urgent** campaign has no client-specific styling — it simply arrives (with its colours) as the only
|
||||||
|
campaign in the feed; the preempt-and-show-everyone behaviour is entirely server-side (ARCHITECTURE
|
||||||
|
§10).
|
||||||
|
|
||||||
## Result / status iconography (`lib/result.ts`)
|
## Result / status iconography (`lib/result.ts`)
|
||||||
|
|
||||||
Lobby rows show two lines (opponents, then result + score) with a large place-based emoji
|
Lobby rows show two lines (opponents, then result + score) with a large place-based emoji
|
||||||
|
|||||||
@@ -8,6 +8,9 @@ backend over REST/JSON, and bridges the backend's gRPC push stream to each
|
|||||||
client's in-app live channel. It **embeds the static UI build** (`go:embed`, baked
|
client's in-app live channel. It **embeds the static UI build** (`go:embed`, baked
|
||||||
in by the gateway image's node stage) and serves a **landing page** at `/` and the game
|
in by the gateway image's node stage) and serves a **landing page** at `/` and the game
|
||||||
**SPA** at `/app/` (web), `/telegram/` (the Telegram Mini App) and `/vk/` (the VK Mini App) — the single-origin model.
|
**SPA** at `/app/` (web), `/telegram/` (the Telegram Mini App) and `/vk/` (the VK Mini App) — the single-origin model.
|
||||||
|
The web SPA is an installable **PWA**: it serves `manifest.webmanifest` (with the `.webmanifest`
|
||||||
|
MIME type registered in-process — the distroless image has no `/etc/mime.types`) and the
|
||||||
|
install-only `sw.js`, both shipped unhashed from `ui/public/`.
|
||||||
Hash-named `/assets/*` are served `immutable`; the HTML shells are `no-cache`. It can also serve the
|
Hash-named `/assets/*` are served `immutable`; the HTML shells are `no-cache`. It can also serve the
|
||||||
backend's admin console at `/_gm` behind HTTP Basic-Auth for a local non-caddy run;
|
backend's admin console at `/_gm` behind HTTP Basic-Auth for a local non-caddy run;
|
||||||
in the deployed contour the front caddy owns `/_gm` (see
|
in the deployed contour the front caddy owns `/_gm` (see
|
||||||
|
|||||||
@@ -53,9 +53,18 @@ type BannerResp struct {
|
|||||||
|
|
||||||
// BannerCampaignResp is one campaign in the rotation feed: a GCD-reduced show
|
// BannerCampaignResp is one campaign in the rotation feed: a GCD-reduced show
|
||||||
// weight and its messages, in display order, already resolved to one language.
|
// weight and its messages, in display order, already resolved to one language.
|
||||||
|
// The override_* colours are the optional per-campaign palette (empty when the
|
||||||
|
// campaign keeps the neutral theme tokens); they ride through to the client
|
||||||
|
// verbatim, mirroring the backend DTO.
|
||||||
type BannerCampaignResp struct {
|
type BannerCampaignResp struct {
|
||||||
Weight int `json:"weight"`
|
Weight int `json:"weight"`
|
||||||
Messages []string `json:"messages"`
|
Messages []string `json:"messages"`
|
||||||
|
OverrideBg string `json:"override_bg,omitempty"`
|
||||||
|
OverrideFg string `json:"override_fg,omitempty"`
|
||||||
|
OverrideLink string `json:"override_link,omitempty"`
|
||||||
|
OverrideBgDark string `json:"override_bg_dark,omitempty"`
|
||||||
|
OverrideFgDark string `json:"override_fg_dark,omitempty"`
|
||||||
|
OverrideLinkDark string `json:"override_link_dark,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// BannerTimingsResp mirrors the backend's global display timings.
|
// BannerTimingsResp mirrors the backend's global display timings.
|
||||||
@@ -280,10 +289,11 @@ func (c *Client) GuestAuth(ctx context.Context, browserTz string) (SessionResp,
|
|||||||
|
|
||||||
// EmailRequest asks the backend to mail a login code, provisioning the account on
|
// EmailRequest asks the backend to mail a login code, provisioning the account on
|
||||||
// first contact; browserTz (the client's detected "±HH:MM" UTC offset) seeds the new
|
// first contact; browserTz (the client's detected "±HH:MM" UTC offset) seeds the new
|
||||||
// account's time zone, since the email account is created here, not at login.
|
// account's time zone, since the email account is created here, not at login. pwa marks a
|
||||||
func (c *Client) EmailRequest(ctx context.Context, email, browserTz, language string) error {
|
// request from an installed PWA, so the backend omits the one-tap confirm link from the email.
|
||||||
|
func (c *Client) EmailRequest(ctx context.Context, email, browserTz, language string, pwa bool) error {
|
||||||
return c.do(ctx, http.MethodPost, "/api/v1/internal/sessions/email/request", "", "",
|
return c.do(ctx, http.MethodPost, "/api/v1/internal/sessions/email/request", "", "",
|
||||||
map[string]string{"email": email, "browser_tz": browserTz, "language": language}, nil)
|
map[string]any{"email": email, "browser_tz": browserTz, "language": language, "pwa": pwa}, nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
// EmailLogin verifies a login code and mints a session.
|
// EmailLogin verifies a login code and mints a session.
|
||||||
|
|||||||
@@ -46,7 +46,13 @@ func newServerMetrics(meter metric.Meter) *serverMetrics {
|
|||||||
}
|
}
|
||||||
h, err := meter.Float64Histogram("edge_request_duration",
|
h, err := meter.Float64Histogram("edge_request_duration",
|
||||||
metric.WithUnit("s"),
|
metric.WithUnit("s"),
|
||||||
metric.WithDescription("Seconds to serve one Connect Execute call, by message type and result."))
|
metric.WithDescription("Seconds to serve one Connect Execute call, by message type and result."),
|
||||||
|
// Explicit second-scale buckets. The durations are recorded in seconds, so the SDK's
|
||||||
|
// default millisecond-calibrated boundaries (first boundary 5) would bin every sub-5s
|
||||||
|
// request into one bucket — making histogram_quantile(0.99) interpolate to ~4.95s
|
||||||
|
// regardless of the real latency, which flapped the >1s edge-latency alert. These
|
||||||
|
// boundaries straddle the 1s SLO so the p99 reflects real (mostly sub-second) latency.
|
||||||
|
metric.WithExplicitBucketBoundaries(0.005, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1, 2.5, 5, 10))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
h, _ = noop.NewMeterProvider().Meter(meterName).Float64Histogram("edge_request_duration")
|
h, _ = noop.NewMeterProvider().Meter(meterName).Float64Histogram("edge_request_duration")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ func TestEdgeMetric(t *testing.T) {
|
|||||||
|
|
||||||
type key struct{ messageType, result string }
|
type key struct{ messageType, result string }
|
||||||
counts := map[key]uint64{}
|
counts := map[key]uint64{}
|
||||||
|
var bounds []float64
|
||||||
for _, sm := range rm.ScopeMetrics {
|
for _, sm := range rm.ScopeMetrics {
|
||||||
for _, md := range sm.Metrics {
|
for _, md := range sm.Metrics {
|
||||||
if md.Name != "edge_request_duration" {
|
if md.Name != "edge_request_duration" {
|
||||||
@@ -42,6 +43,7 @@ func TestEdgeMetric(t *testing.T) {
|
|||||||
mt, _ := dp.Attributes.Value(attribute.Key("message_type"))
|
mt, _ := dp.Attributes.Value(attribute.Key("message_type"))
|
||||||
res, _ := dp.Attributes.Value(attribute.Key("result"))
|
res, _ := dp.Attributes.Value(attribute.Key("result"))
|
||||||
counts[key{mt.AsString(), res.AsString()}] += dp.Count
|
counts[key{mt.AsString(), res.AsString()}] += dp.Count
|
||||||
|
bounds = dp.Bounds
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -51,6 +53,19 @@ func TestEdgeMetric(t *testing.T) {
|
|||||||
if got := counts[key{"auth.guest", "domain"}]; got != 1 {
|
if got := counts[key{"auth.guest", "domain"}]; got != 1 {
|
||||||
t.Errorf("edge auth.guest/domain = %d, want 1", got)
|
t.Errorf("edge auth.guest/domain = %d, want 1", got)
|
||||||
}
|
}
|
||||||
|
// The buckets must be second-scaled. The default (millisecond-calibrated) boundaries have no
|
||||||
|
// boundary between 0 and 5, so every sub-5s request bins into one bucket and p99 interpolates
|
||||||
|
// to ~4.95s, flapping the >1s alert. Require at least one sub-second boundary.
|
||||||
|
subSecond := false
|
||||||
|
for _, b := range bounds {
|
||||||
|
if b > 0 && b < 1 {
|
||||||
|
subSecond = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !subSecond {
|
||||||
|
t.Errorf("edge_request_duration bounds = %v, want sub-second boundaries (seconds-scaled)", bounds)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TestRateLimitedMetric records limiter rejections through a manual reader and
|
// TestRateLimitedMetric records limiter rejections through a manual reader and
|
||||||
|
|||||||
@@ -118,6 +118,23 @@ func encodeProfile(p backendclient.ProfileResp) []byte {
|
|||||||
return b.FinishedBytes()
|
return b.FinishedBytes()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// optString creates a FlatBuffers string for a non-empty value, or 0 to omit the
|
||||||
|
// optional field (the client then reads it as absent).
|
||||||
|
func optString(b *flatbuffers.Builder, s string) flatbuffers.UOffsetT {
|
||||||
|
if s == "" {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
return b.CreateString(s)
|
||||||
|
}
|
||||||
|
|
||||||
|
// addOptString adds an optional string slot only when it was created (a 0 offset
|
||||||
|
// leaves the field absent). add is the generated BannerCampaignAdd* setter.
|
||||||
|
func addOptString(b *flatbuffers.Builder, add func(*flatbuffers.Builder, flatbuffers.UOffsetT), off flatbuffers.UOffsetT) {
|
||||||
|
if off != 0 {
|
||||||
|
add(b, off)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// encodeBanner builds a BannerInfo table from the resolved banner block and
|
// encodeBanner builds a BannerInfo table from the resolved banner block and
|
||||||
// returns its offset. It is bottom-up: each campaign's messages vector and table
|
// returns its offset. It is bottom-up: each campaign's messages vector and table
|
||||||
// are built first, then the campaigns vector, then the BannerInfo table. The
|
// are built first, then the campaigns vector, then the BannerInfo table. The
|
||||||
@@ -134,9 +151,23 @@ func encodeBanner(b *flatbuffers.Builder, banner backendclient.BannerResp) flatb
|
|||||||
b.PrependUOffsetT(msgOffsets[j])
|
b.PrependUOffsetT(msgOffsets[j])
|
||||||
}
|
}
|
||||||
msgs := b.EndVector(len(msgOffsets))
|
msgs := b.EndVector(len(msgOffsets))
|
||||||
|
// The optional colour strings must be created before the table starts; an
|
||||||
|
// empty colour is omitted (offset 0), so the client reads it as absent.
|
||||||
|
obg := optString(b, c.OverrideBg)
|
||||||
|
ofg := optString(b, c.OverrideFg)
|
||||||
|
olink := optString(b, c.OverrideLink)
|
||||||
|
obgD := optString(b, c.OverrideBgDark)
|
||||||
|
ofgD := optString(b, c.OverrideFgDark)
|
||||||
|
olinkD := optString(b, c.OverrideLinkDark)
|
||||||
fb.BannerCampaignStart(b)
|
fb.BannerCampaignStart(b)
|
||||||
fb.BannerCampaignAddWeight(b, int32(c.Weight))
|
fb.BannerCampaignAddWeight(b, int32(c.Weight))
|
||||||
fb.BannerCampaignAddMessages(b, msgs)
|
fb.BannerCampaignAddMessages(b, msgs)
|
||||||
|
addOptString(b, fb.BannerCampaignAddOverrideBg, obg)
|
||||||
|
addOptString(b, fb.BannerCampaignAddOverrideFg, ofg)
|
||||||
|
addOptString(b, fb.BannerCampaignAddOverrideLink, olink)
|
||||||
|
addOptString(b, fb.BannerCampaignAddOverrideBgDark, obgD)
|
||||||
|
addOptString(b, fb.BannerCampaignAddOverrideFgDark, ofgD)
|
||||||
|
addOptString(b, fb.BannerCampaignAddOverrideLinkDark, olinkD)
|
||||||
campOffsets[i] = fb.BannerCampaignEnd(b)
|
campOffsets[i] = fb.BannerCampaignEnd(b)
|
||||||
}
|
}
|
||||||
fb.BannerInfoStartCampaignsVector(b, len(campOffsets))
|
fb.BannerInfoStartCampaignsVector(b, len(campOffsets))
|
||||||
|
|||||||
@@ -253,7 +253,7 @@ func authGuestHandler(backend *backendclient.Client) Handler {
|
|||||||
func authEmailRequestHandler(backend *backendclient.Client) Handler {
|
func authEmailRequestHandler(backend *backendclient.Client) Handler {
|
||||||
return func(ctx context.Context, req Request) ([]byte, error) {
|
return func(ctx context.Context, req Request) ([]byte, error) {
|
||||||
in := fb.GetRootAsEmailRequestRequest(req.Payload, 0)
|
in := fb.GetRootAsEmailRequestRequest(req.Payload, 0)
|
||||||
if err := backend.EmailRequest(ctx, string(in.Email()), string(in.BrowserTz()), string(in.Language())); err != nil {
|
if err := backend.EmailRequest(ctx, string(in.Email()), string(in.BrowserTz()), string(in.Language()), in.Pwa()); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return encodeAck(true), nil
|
return encodeAck(true), nil
|
||||||
|
|||||||
@@ -61,6 +61,54 @@ func TestProfileGetEncodesBanner(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestProfileGetEncodesBannerColors verifies the gateway carries a campaign's
|
||||||
|
// optional colour overrides into the FlatBuffers payload, and leaves an absent
|
||||||
|
// colour (or an absent set) empty so the client falls back to the theme tokens.
|
||||||
|
func TestProfileGetEncodesBannerColors(t *testing.T) {
|
||||||
|
backend, cleanup := fakeBackend(t, func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
_, _ = w.Write([]byte(`{"user_id":"u-1","display_name":"Kaya","preferred_language":"en",` +
|
||||||
|
`"banner":{"campaigns":[` +
|
||||||
|
`{"weight":1,"messages":["promo-en"],` +
|
||||||
|
`"override_bg":"#aa0000","override_fg":"#ffffff","override_link":"#ffdd00",` +
|
||||||
|
`"override_bg_dark":"#330000","override_fg_dark":"#eeeeee","override_link_dark":"#ffcc00"},` +
|
||||||
|
`{"weight":1,"messages":["plain-en"]}],` +
|
||||||
|
`"timings":{"hold_ms":60000,"edge_pause_ms":5000,"scroll_px_per_sec":40,` +
|
||||||
|
`"fade_out_ms":1000,"gap_ms":250,"fade_in_ms":1000}}}`))
|
||||||
|
})
|
||||||
|
defer cleanup()
|
||||||
|
|
||||||
|
reg := transcode.NewRegistry(backend, nil)
|
||||||
|
op, _ := reg.Lookup(transcode.MsgProfileGet)
|
||||||
|
payload, err := op.Handler(context.Background(), transcode.Request{UserID: "u-1"})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("handler: %v", err)
|
||||||
|
}
|
||||||
|
banner := fb.GetRootAsProfile(payload, 0).Banner(nil)
|
||||||
|
if banner == nil {
|
||||||
|
t.Fatal("profile carries no banner block")
|
||||||
|
}
|
||||||
|
var c fb.BannerCampaign
|
||||||
|
banner.Campaigns(&c, 0)
|
||||||
|
if got := string(c.OverrideBg()); got != "#aa0000" {
|
||||||
|
t.Errorf("override_bg = %q, want #aa0000", got)
|
||||||
|
}
|
||||||
|
if got := string(c.OverrideLink()); got != "#ffdd00" {
|
||||||
|
t.Errorf("override_link = %q, want #ffdd00", got)
|
||||||
|
}
|
||||||
|
if got := string(c.OverrideBgDark()); got != "#330000" {
|
||||||
|
t.Errorf("override_bg_dark = %q, want #330000", got)
|
||||||
|
}
|
||||||
|
if got := string(c.OverrideLinkDark()); got != "#ffcc00" {
|
||||||
|
t.Errorf("override_link_dark = %q, want #ffcc00", got)
|
||||||
|
}
|
||||||
|
// The second campaign has no override: every colour field must be absent (nil).
|
||||||
|
banner.Campaigns(&c, 1)
|
||||||
|
if c.OverrideBg() != nil || c.OverrideFg() != nil || c.OverrideLink() != nil ||
|
||||||
|
c.OverrideBgDark() != nil || c.OverrideFgDark() != nil || c.OverrideLinkDark() != nil {
|
||||||
|
t.Error("plain campaign unexpectedly carries a colour override")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// TestProfileGetNoBanner verifies an ineligible viewer's profile carries no
|
// TestProfileGetNoBanner verifies an ineligible viewer's profile carries no
|
||||||
// banner block (the backend omits it).
|
// banner block (the backend omits it).
|
||||||
func TestProfileGetNoBanner(t *testing.T) {
|
func TestProfileGetNoBanner(t *testing.T) {
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ package webui
|
|||||||
import (
|
import (
|
||||||
"embed"
|
"embed"
|
||||||
"io/fs"
|
"io/fs"
|
||||||
|
"mime"
|
||||||
"net/http"
|
"net/http"
|
||||||
"path"
|
"path"
|
||||||
"strings"
|
"strings"
|
||||||
@@ -35,13 +36,25 @@ func distFS() fs.FS {
|
|||||||
return sub
|
return sub
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handler serves the embedded UI. An existing file is served directly (hash-named assets get
|
// init registers the MIME type for .webmanifest, which Go's built-in table lacks and the
|
||||||
// an immutable cache); every other path falls back to indexName (the SPA shell) so a
|
// distroless runtime image has no /etc/mime.types to supply. Without it the PWA Web App Manifest
|
||||||
// client-side deep link still loads. When stripPrefix is non-empty it is removed from the
|
// served under /app/ would be content-sniffed to text/plain, which some browsers reject.
|
||||||
// request path before lookup, so the same build serves under a sub-path (e.g. "/app/" or
|
func init() {
|
||||||
// "/telegram/").
|
_ = mime.AddExtensionType(".webmanifest", "application/manifest+json")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handler serves the compile-time embedded UI build over the public edge — the game SPA under
|
||||||
|
// /app/, /telegram/ and /vk/. It delegates to handlerFor over the embedded dist/.
|
||||||
func Handler(stripPrefix, indexName string) http.Handler {
|
func Handler(stripPrefix, indexName string) http.Handler {
|
||||||
content := distFS()
|
return handlerFor(distFS(), stripPrefix, indexName)
|
||||||
|
}
|
||||||
|
|
||||||
|
// handlerFor serves content as the UI: an existing file is served directly (hash-named assets get
|
||||||
|
// an immutable cache); every other path falls back to indexName (the SPA shell) so a client-side
|
||||||
|
// deep link still loads. When stripPrefix is non-empty it is removed from the request path before
|
||||||
|
// lookup, so the same build serves under a sub-path (e.g. "/app/" or "/telegram/"). Split from
|
||||||
|
// Handler so it can be exercised over an in-memory fs.FS in tests.
|
||||||
|
func handlerFor(content fs.FS, stripPrefix, indexName string) http.Handler {
|
||||||
files := http.FileServer(http.FS(content))
|
files := http.FileServer(http.FS(content))
|
||||||
h := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
h := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
name := strings.TrimPrefix(path.Clean("/"+r.URL.Path), "/")
|
name := strings.TrimPrefix(path.Clean("/"+r.URL.Path), "/")
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import (
|
|||||||
"net/http/httptest"
|
"net/http/httptest"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
"testing/fstest"
|
||||||
)
|
)
|
||||||
|
|
||||||
// get drives the handler with a GET for the given path and returns the response.
|
// get drives the handler with a GET for the given path and returns the response.
|
||||||
@@ -55,3 +56,56 @@ func TestAppMountServesShellStripsPrefixAndCachesAssets(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// testFS mirrors what Vite emits into dist/: the SPA shell, the PWA manifest + service worker at
|
||||||
|
// the root (copied from ui/public), and a hash-named asset. The compile-time embedded dist/ holds
|
||||||
|
// only a placeholder shell, so the manifest/sw.js serving is exercised over this in-memory FS.
|
||||||
|
func testFS() fstest.MapFS {
|
||||||
|
return fstest.MapFS{
|
||||||
|
"index.html": {Data: []byte("<!doctype html><title>shell</title>")},
|
||||||
|
"manifest.webmanifest": {Data: []byte(`{"name":"Эрудит"}`)},
|
||||||
|
"sw.js": {Data: []byte("self.addEventListener('fetch', () => {});")},
|
||||||
|
"assets/app-abc123.js": {Data: []byte("export const x = 1;")},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestHandlerServesManifestWithManifestType: the PWA manifest is served with the manifest MIME
|
||||||
|
// type (registered in init, since the distroless image has no /etc/mime.types), not sniffed to
|
||||||
|
// text/plain, which some browsers reject.
|
||||||
|
func TestHandlerServesManifestWithManifestType(t *testing.T) {
|
||||||
|
h := handlerFor(testFS(), "/app/", "index.html")
|
||||||
|
resp := get(t, h, "/app/manifest.webmanifest")
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
t.Fatalf("status = %d, want 200", resp.StatusCode)
|
||||||
|
}
|
||||||
|
if ct := resp.Header.Get("Content-Type"); !strings.HasPrefix(ct, "application/manifest+json") {
|
||||||
|
t.Errorf("Content-Type = %q, want application/manifest+json", ct)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestHandlerServesServiceWorkerAsJavaScript: sw.js is served as JavaScript from the root, so its
|
||||||
|
// registration (scope /app/) succeeds.
|
||||||
|
func TestHandlerServesServiceWorkerAsJavaScript(t *testing.T) {
|
||||||
|
h := handlerFor(testFS(), "/app/", "index.html")
|
||||||
|
resp := get(t, h, "/app/sw.js")
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
t.Fatalf("status = %d, want 200", resp.StatusCode)
|
||||||
|
}
|
||||||
|
if ct := resp.Header.Get("Content-Type"); !strings.HasPrefix(ct, "text/javascript") {
|
||||||
|
t.Errorf("Content-Type = %q, want text/javascript", ct)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestHandlerFallsBackToShellForUnknownManifestPath guards the trap: a manifest/sw path NOT emitted
|
||||||
|
// into dist/ falls back to the SPA shell as text/html, on which SW registration would fail. The two
|
||||||
|
// tests above pin that the real files are served instead of the shell.
|
||||||
|
func TestHandlerFallsBackToShellForUnknownManifestPath(t *testing.T) {
|
||||||
|
h := handlerFor(testFS(), "/app/", "index.html")
|
||||||
|
resp := get(t, h, "/app/not-emitted.webmanifest")
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
t.Fatalf("status = %d, want 200", resp.StatusCode)
|
||||||
|
}
|
||||||
|
if ct := resp.Header.Get("Content-Type"); !strings.HasPrefix(ct, "text/html") {
|
||||||
|
t.Errorf("Content-Type = %q, want text/html (SPA shell fallback)", ct)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
+16
-1
@@ -138,6 +138,11 @@ table EmailRequestRequest {
|
|||||||
email:string;
|
email:string;
|
||||||
browser_tz:string;
|
browser_tz:string;
|
||||||
language:string;
|
language:string;
|
||||||
|
// Set when the request originates from an installed PWA (standalone display mode): the
|
||||||
|
// backend then omits the one-tap confirm link from the login email so the code is typed in
|
||||||
|
// the same window, avoiding a link that opens in a separate browser (a different storage
|
||||||
|
// context) where the minted session could not reach the PWA.
|
||||||
|
pwa:bool;
|
||||||
}
|
}
|
||||||
|
|
||||||
// EmailLoginRequest logs in to the account owning email (provisioned at the
|
// EmailLoginRequest logs in to the account owning email (provisioned at the
|
||||||
@@ -180,10 +185,20 @@ table Ack {
|
|||||||
// BannerCampaign is one campaign in the rotation feed: a GCD-reduced show weight
|
// BannerCampaign is one campaign in the rotation feed: a GCD-reduced show weight
|
||||||
// (the client runs a smooth weighted round-robin over campaigns by this weight)
|
// (the client runs a smooth weighted round-robin over campaigns by this weight)
|
||||||
// and its messages in display order, each already resolved to the viewer's bot
|
// and its messages in display order, each already resolved to the viewer's bot
|
||||||
// language (the stored en/ru pair is picked server-side).
|
// language (the stored en/ru pair is picked server-side). The override_* colours
|
||||||
|
// are an optional per-campaign palette: override_bg/fg/link paint the strip on
|
||||||
|
// every theme, and the *_dark trio further overrides the dark theme (the client
|
||||||
|
// resolves dark ← dark ?? all ?? token, light ← all ?? token). Empty means the
|
||||||
|
// campaign keeps the neutral theme tokens (all added trailing — backward-compatible).
|
||||||
table BannerCampaign {
|
table BannerCampaign {
|
||||||
weight:int;
|
weight:int;
|
||||||
messages:[string];
|
messages:[string];
|
||||||
|
override_bg:string;
|
||||||
|
override_fg:string;
|
||||||
|
override_link:string;
|
||||||
|
override_bg_dark:string;
|
||||||
|
override_fg_dark:string;
|
||||||
|
override_link_dark:string;
|
||||||
}
|
}
|
||||||
|
|
||||||
// BannerInfo is the advertising-banner block of an eligible viewer's profile: the
|
// BannerInfo is the advertising-banner block of an eligible viewer's profile: the
|
||||||
|
|||||||
@@ -70,8 +70,56 @@ func (rcv *BannerCampaign) MessagesLength() int {
|
|||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (rcv *BannerCampaign) OverrideBg() []byte {
|
||||||
|
o := flatbuffers.UOffsetT(rcv._tab.Offset(8))
|
||||||
|
if o != 0 {
|
||||||
|
return rcv._tab.ByteVector(o + rcv._tab.Pos)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (rcv *BannerCampaign) OverrideFg() []byte {
|
||||||
|
o := flatbuffers.UOffsetT(rcv._tab.Offset(10))
|
||||||
|
if o != 0 {
|
||||||
|
return rcv._tab.ByteVector(o + rcv._tab.Pos)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (rcv *BannerCampaign) OverrideLink() []byte {
|
||||||
|
o := flatbuffers.UOffsetT(rcv._tab.Offset(12))
|
||||||
|
if o != 0 {
|
||||||
|
return rcv._tab.ByteVector(o + rcv._tab.Pos)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (rcv *BannerCampaign) OverrideBgDark() []byte {
|
||||||
|
o := flatbuffers.UOffsetT(rcv._tab.Offset(14))
|
||||||
|
if o != 0 {
|
||||||
|
return rcv._tab.ByteVector(o + rcv._tab.Pos)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (rcv *BannerCampaign) OverrideFgDark() []byte {
|
||||||
|
o := flatbuffers.UOffsetT(rcv._tab.Offset(16))
|
||||||
|
if o != 0 {
|
||||||
|
return rcv._tab.ByteVector(o + rcv._tab.Pos)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (rcv *BannerCampaign) OverrideLinkDark() []byte {
|
||||||
|
o := flatbuffers.UOffsetT(rcv._tab.Offset(18))
|
||||||
|
if o != 0 {
|
||||||
|
return rcv._tab.ByteVector(o + rcv._tab.Pos)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
func BannerCampaignStart(builder *flatbuffers.Builder) {
|
func BannerCampaignStart(builder *flatbuffers.Builder) {
|
||||||
builder.StartObject(2)
|
builder.StartObject(8)
|
||||||
}
|
}
|
||||||
func BannerCampaignAddWeight(builder *flatbuffers.Builder, weight int32) {
|
func BannerCampaignAddWeight(builder *flatbuffers.Builder, weight int32) {
|
||||||
builder.PrependInt32Slot(0, weight, 0)
|
builder.PrependInt32Slot(0, weight, 0)
|
||||||
@@ -82,6 +130,24 @@ func BannerCampaignAddMessages(builder *flatbuffers.Builder, messages flatbuffer
|
|||||||
func BannerCampaignStartMessagesVector(builder *flatbuffers.Builder, numElems int) flatbuffers.UOffsetT {
|
func BannerCampaignStartMessagesVector(builder *flatbuffers.Builder, numElems int) flatbuffers.UOffsetT {
|
||||||
return builder.StartVector(4, numElems, 4)
|
return builder.StartVector(4, numElems, 4)
|
||||||
}
|
}
|
||||||
|
func BannerCampaignAddOverrideBg(builder *flatbuffers.Builder, overrideBg flatbuffers.UOffsetT) {
|
||||||
|
builder.PrependUOffsetTSlot(2, flatbuffers.UOffsetT(overrideBg), 0)
|
||||||
|
}
|
||||||
|
func BannerCampaignAddOverrideFg(builder *flatbuffers.Builder, overrideFg flatbuffers.UOffsetT) {
|
||||||
|
builder.PrependUOffsetTSlot(3, flatbuffers.UOffsetT(overrideFg), 0)
|
||||||
|
}
|
||||||
|
func BannerCampaignAddOverrideLink(builder *flatbuffers.Builder, overrideLink flatbuffers.UOffsetT) {
|
||||||
|
builder.PrependUOffsetTSlot(4, flatbuffers.UOffsetT(overrideLink), 0)
|
||||||
|
}
|
||||||
|
func BannerCampaignAddOverrideBgDark(builder *flatbuffers.Builder, overrideBgDark flatbuffers.UOffsetT) {
|
||||||
|
builder.PrependUOffsetTSlot(5, flatbuffers.UOffsetT(overrideBgDark), 0)
|
||||||
|
}
|
||||||
|
func BannerCampaignAddOverrideFgDark(builder *flatbuffers.Builder, overrideFgDark flatbuffers.UOffsetT) {
|
||||||
|
builder.PrependUOffsetTSlot(6, flatbuffers.UOffsetT(overrideFgDark), 0)
|
||||||
|
}
|
||||||
|
func BannerCampaignAddOverrideLinkDark(builder *flatbuffers.Builder, overrideLinkDark flatbuffers.UOffsetT) {
|
||||||
|
builder.PrependUOffsetTSlot(7, flatbuffers.UOffsetT(overrideLinkDark), 0)
|
||||||
|
}
|
||||||
func BannerCampaignEnd(builder *flatbuffers.Builder) flatbuffers.UOffsetT {
|
func BannerCampaignEnd(builder *flatbuffers.Builder) flatbuffers.UOffsetT {
|
||||||
return builder.EndObject()
|
return builder.EndObject()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -65,8 +65,20 @@ func (rcv *EmailRequestRequest) Language() []byte {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (rcv *EmailRequestRequest) Pwa() bool {
|
||||||
|
o := flatbuffers.UOffsetT(rcv._tab.Offset(10))
|
||||||
|
if o != 0 {
|
||||||
|
return rcv._tab.GetBool(o + rcv._tab.Pos)
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
func (rcv *EmailRequestRequest) MutatePwa(n bool) bool {
|
||||||
|
return rcv._tab.MutateBoolSlot(10, n)
|
||||||
|
}
|
||||||
|
|
||||||
func EmailRequestRequestStart(builder *flatbuffers.Builder) {
|
func EmailRequestRequestStart(builder *flatbuffers.Builder) {
|
||||||
builder.StartObject(3)
|
builder.StartObject(4)
|
||||||
}
|
}
|
||||||
func EmailRequestRequestAddEmail(builder *flatbuffers.Builder, email flatbuffers.UOffsetT) {
|
func EmailRequestRequestAddEmail(builder *flatbuffers.Builder, email flatbuffers.UOffsetT) {
|
||||||
builder.PrependUOffsetTSlot(0, flatbuffers.UOffsetT(email), 0)
|
builder.PrependUOffsetTSlot(0, flatbuffers.UOffsetT(email), 0)
|
||||||
@@ -77,6 +89,9 @@ func EmailRequestRequestAddBrowserTz(builder *flatbuffers.Builder, browserTz fla
|
|||||||
func EmailRequestRequestAddLanguage(builder *flatbuffers.Builder, language flatbuffers.UOffsetT) {
|
func EmailRequestRequestAddLanguage(builder *flatbuffers.Builder, language flatbuffers.UOffsetT) {
|
||||||
builder.PrependUOffsetTSlot(2, flatbuffers.UOffsetT(language), 0)
|
builder.PrependUOffsetTSlot(2, flatbuffers.UOffsetT(language), 0)
|
||||||
}
|
}
|
||||||
|
func EmailRequestRequestAddPwa(builder *flatbuffers.Builder, pwa bool) {
|
||||||
|
builder.PrependBoolSlot(3, pwa, false)
|
||||||
|
}
|
||||||
func EmailRequestRequestEnd(builder *flatbuffers.Builder) flatbuffers.UOffsetT {
|
func EmailRequestRequestEnd(builder *flatbuffers.Builder) flatbuffers.UOffsetT {
|
||||||
return builder.EndObject()
|
return builder.EndObject()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,59 @@
|
|||||||
|
import { expect, test } from './fixtures';
|
||||||
|
|
||||||
|
// The install CTA (components/InstallApp.svelte) is platform-adaptive: a one-tap button where the
|
||||||
|
// browser offers a beforeinstallprompt (Chromium), a manual instructions modal on iOS Safari, and
|
||||||
|
// nothing elsewhere / once installed / inside a Mini App. The native OS install dialog is
|
||||||
|
// browser-level and not drivable from Playwright, so these assert the CTA's presence and branch.
|
||||||
|
|
||||||
|
const IPHONE_SAFARI =
|
||||||
|
'Mozilla/5.0 (iPhone; CPU iPhone OS 17_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.0 Mobile/15E148 Safari/604.1';
|
||||||
|
|
||||||
|
test('web: a captured install prompt shows the one-tap CTA and clicking it prompts', async ({ page }) => {
|
||||||
|
await page.goto('/');
|
||||||
|
// The web login screen is shown (an ordinary browser tab, not a Mini App).
|
||||||
|
await expect(page.getByRole('button', { name: /guest/i })).toBeVisible();
|
||||||
|
|
||||||
|
// Hidden until the browser offers installation (Playwright never fires beforeinstallprompt).
|
||||||
|
await expect(page.getByRole('button', { name: /Install the app/i })).toHaveCount(0);
|
||||||
|
|
||||||
|
// Simulate Chromium offering the install: dispatch a beforeinstallprompt the app can capture.
|
||||||
|
await page.evaluate(() => {
|
||||||
|
const e = new Event('beforeinstallprompt') as Event & {
|
||||||
|
prompt?: () => Promise<void>;
|
||||||
|
userChoice?: Promise<unknown>;
|
||||||
|
};
|
||||||
|
(window as unknown as { __promptCalled: boolean }).__promptCalled = false;
|
||||||
|
e.prompt = () => {
|
||||||
|
(window as unknown as { __promptCalled: boolean }).__promptCalled = true;
|
||||||
|
return Promise.resolve();
|
||||||
|
};
|
||||||
|
e.userChoice = Promise.resolve({ outcome: 'accepted', platform: '' });
|
||||||
|
window.dispatchEvent(e);
|
||||||
|
});
|
||||||
|
|
||||||
|
const cta = page.getByRole('button', { name: /Install the app/i });
|
||||||
|
await expect(cta).toBeVisible();
|
||||||
|
await cta.click();
|
||||||
|
// Clicking calls the captured prompt (the native dialog itself is not observable here).
|
||||||
|
await expect
|
||||||
|
.poll(() => page.evaluate(() => (window as unknown as { __promptCalled: boolean }).__promptCalled))
|
||||||
|
.toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
test.describe('iOS Safari', () => {
|
||||||
|
test.use({ userAgent: IPHONE_SAFARI });
|
||||||
|
|
||||||
|
test('shows manual Add-to-Home-Screen instructions (no programmatic install)', async ({ page }) => {
|
||||||
|
await page.goto('/');
|
||||||
|
await expect(page.getByRole('button', { name: /guest/i })).toBeVisible();
|
||||||
|
|
||||||
|
// On iOS Safari the CTA shows at once (no beforeinstallprompt is ever fired there).
|
||||||
|
const cta = page.getByRole('button', { name: /Install the app/i });
|
||||||
|
await expect(cta).toBeVisible();
|
||||||
|
await cta.click();
|
||||||
|
|
||||||
|
// It opens the app's own instructions modal (not a native / Telegram popup).
|
||||||
|
await expect(page.getByRole('heading', { name: 'Add to Home Screen' })).toBeVisible();
|
||||||
|
await expect(page.getByText(/Tap the Share button/)).toBeVisible();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -46,3 +46,15 @@ test('the landing is a normal scrolling document (the SPA document-pin does not
|
|||||||
expect(state.shell).toBe(false);
|
expect(state.shell).toBe(false);
|
||||||
expect(state.bodyPosition).not.toBe('fixed');
|
expect(state.bodyPosition).not.toBe('fixed');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// The web-version entry (/app/) is always present, alongside the build-var-gated Telegram/VK ones
|
||||||
|
// (absent here, since e2e sets no VITE_* vars), each with a caption.
|
||||||
|
test('the landing shows a web-version entry linking /app/, with a caption', async ({ page }) => {
|
||||||
|
await page.goto('/landing.html');
|
||||||
|
await expect(page.getByText(/Играй в «Эрудита»/)).toBeVisible(); // Russian by default
|
||||||
|
|
||||||
|
const web = page.getByRole('link', { name: 'Играть в браузере' });
|
||||||
|
await expect(web).toBeVisible();
|
||||||
|
expect(await web.getAttribute('href')).toContain('/app/');
|
||||||
|
await expect(page.getByText('Веб-версия')).toBeVisible();
|
||||||
|
});
|
||||||
|
|||||||
@@ -327,6 +327,36 @@ test('change email: a free address replaces the current one', async ({ page }) =
|
|||||||
await expect(page.getByText('you@example.com')).toHaveCount(0);
|
await expect(page.getByText('you@example.com')).toHaveCount(0);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// The add-email confirmation can complete out of band: the recipient taps the one-tap link in the
|
||||||
|
// email, which confirms in another browser/session. A backgrounded Mini App misses the live
|
||||||
|
// 'profile' event (the stream is single-shot, no replay), so the open code form falls back to
|
||||||
|
// polling the profile until the address lands. The mock attaches the email WITHOUT emitting an
|
||||||
|
// event, so only the poll can surface it.
|
||||||
|
test('add email: an out-of-band confirmation surfaces on the open form via polling', async ({ page }) => {
|
||||||
|
await loginLobby(page);
|
||||||
|
await openProfile(page);
|
||||||
|
|
||||||
|
// Drop the seeded email so the sign-in section offers the add-email flow.
|
||||||
|
await page.evaluate(() => (window as unknown as { __mock: { clearEmail(): void } }).__mock.clearEmail());
|
||||||
|
const emailInput = page.locator('.accounts input[type="email"]');
|
||||||
|
await expect(emailInput).toBeVisible();
|
||||||
|
|
||||||
|
await emailInput.fill('linked@example.com');
|
||||||
|
await page.getByRole('button', { name: 'Send code' }).click();
|
||||||
|
await expect(page.locator('.accounts .codein')).toBeVisible();
|
||||||
|
|
||||||
|
// Confirmed elsewhere via the one-tap link, with no live event delivered: only the poll surfaces it.
|
||||||
|
await page.evaluate(() =>
|
||||||
|
(
|
||||||
|
window as unknown as { __mock: { confirmEmailOutOfBand(email: string): void } }
|
||||||
|
).__mock.confirmEmailOutOfBand('linked@example.com'),
|
||||||
|
);
|
||||||
|
|
||||||
|
// The confirmed address surfaces as the email row, and the code form is gone.
|
||||||
|
await expect(page.locator('.acctrow').filter({ hasText: 'linked@example.com' })).toBeVisible({ timeout: 10000 });
|
||||||
|
await expect(page.locator('.accounts .codein')).toHaveCount(0);
|
||||||
|
});
|
||||||
|
|
||||||
test('link then unlink Telegram from the sign-in methods', async ({ page }) => {
|
test('link then unlink Telegram from the sign-in methods', async ({ page }) => {
|
||||||
await loginLobby(page);
|
await loginLobby(page);
|
||||||
await openProfile(page);
|
await openProfile(page);
|
||||||
|
|||||||
@@ -256,6 +256,18 @@
|
|||||||
<link rel="icon" href="favicon.ico" sizes="32x32" />
|
<link rel="icon" href="favicon.ico" sizes="32x32" />
|
||||||
<link rel="icon" type="image/svg+xml" href="favicon.svg" />
|
<link rel="icon" type="image/svg+xml" href="favicon.svg" />
|
||||||
<link rel="apple-touch-icon" href="apple-touch-icon.png" />
|
<link rel="apple-touch-icon" href="apple-touch-icon.png" />
|
||||||
|
<!-- PWA installability (web /app/ only): the manifest + a service worker (registered from
|
||||||
|
lib/pwa, web-only) let the app be added to the home screen / desktop. The relative href
|
||||||
|
resolves per serving path; these tags are inert inside the Telegram/VK Mini App webviews,
|
||||||
|
which manage their own chrome. theme-color mirrors the light/dark --bg tokens (app.css). -->
|
||||||
|
<link rel="manifest" href="manifest.webmanifest" />
|
||||||
|
<meta name="theme-color" content="#f3f4f6" media="(prefers-color-scheme: light)" />
|
||||||
|
<meta name="theme-color" content="#0f1115" media="(prefers-color-scheme: dark)" />
|
||||||
|
<meta name="mobile-web-app-capable" content="yes" />
|
||||||
|
<meta name="apple-mobile-web-app-capable" content="yes" />
|
||||||
|
<meta name="apple-mobile-web-app-status-bar-style" content="default" />
|
||||||
|
<meta name="apple-mobile-web-app-title" content="Эрудит" />
|
||||||
|
<meta name="application-name" content="Эрудит" />
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="app"></div>
|
<div id="app"></div>
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 2.9 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 7.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 5.6 KiB |
@@ -0,0 +1,17 @@
|
|||||||
|
{
|
||||||
|
"name": "Эрудит (Скрэббл)",
|
||||||
|
"short_name": "Эрудит",
|
||||||
|
"description": "Игра в слова «Эрудит» (Скрэббл): играйте с друзьями, случайным соперником или ИИ-роботом.",
|
||||||
|
"lang": "ru",
|
||||||
|
"dir": "ltr",
|
||||||
|
"start_url": ".",
|
||||||
|
"scope": ".",
|
||||||
|
"display": "standalone",
|
||||||
|
"background_color": "#f3f4f6",
|
||||||
|
"theme_color": "#f3f4f6",
|
||||||
|
"icons": [
|
||||||
|
{ "src": "icon-192.png", "sizes": "192x192", "type": "image/png", "purpose": "any" },
|
||||||
|
{ "src": "icon-512.png", "sizes": "512x512", "type": "image/png", "purpose": "any" },
|
||||||
|
{ "src": "icon-maskable-512.png", "sizes": "512x512", "type": "image/png", "purpose": "maskable" }
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
// Install-only service worker.
|
||||||
|
//
|
||||||
|
// Its sole job today is to satisfy Chromium's PWA installability requirement (a registered
|
||||||
|
// service worker with a fetch handler) so the web app can be installed to the home screen /
|
||||||
|
// desktop — notably on Android, where the manifest alone is not enough. It deliberately does
|
||||||
|
// NOT cache assets or the Connect-RPC stream: only top-level navigations are handled,
|
||||||
|
// network-first with a cached-shell fallback, so the live app, its immutable hashed assets and
|
||||||
|
// the live event stream are never served stale.
|
||||||
|
//
|
||||||
|
// This is the single designated growth point for the planned offline mode (a Settings toggle,
|
||||||
|
// default online — see docs/ARCHITECTURE.md). Extend the fetch router here; keep the same
|
||||||
|
// /app/ scope; gate any real caching behind the toggle and coordinate updates with the boot
|
||||||
|
// version guard.
|
||||||
|
const SHELL = 'scrabble-shell-v1'; // bump only when the SW strategy itself changes.
|
||||||
|
|
||||||
|
self.addEventListener('install', () => {
|
||||||
|
// No cached content to migrate carefully, so activate the new worker immediately.
|
||||||
|
self.skipWaiting();
|
||||||
|
});
|
||||||
|
|
||||||
|
self.addEventListener('activate', (event) => {
|
||||||
|
event.waitUntil(
|
||||||
|
(async () => {
|
||||||
|
const keys = await caches.keys();
|
||||||
|
await Promise.all(keys.filter((k) => k !== SHELL).map((k) => caches.delete(k)));
|
||||||
|
await self.clients.claim();
|
||||||
|
})(),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
self.addEventListener('fetch', (event) => {
|
||||||
|
const req = event.request;
|
||||||
|
// Only top-level navigations are handled. Hashed assets and the Connect-RPC requests are
|
||||||
|
// left untouched (no respondWith -> the browser performs its default fetch), so the worker
|
||||||
|
// can never break the live stream or serve a stale immutable asset.
|
||||||
|
if (req.mode !== 'navigate') return;
|
||||||
|
event.respondWith(
|
||||||
|
(async () => {
|
||||||
|
try {
|
||||||
|
const res = await fetch(req);
|
||||||
|
const cache = await caches.open(SHELL);
|
||||||
|
// One shell entry regardless of the deep-link path: the hash router resolves the route
|
||||||
|
// client-side, so any offline navigation can be served the same cached shell.
|
||||||
|
cache.put('shell', res.clone());
|
||||||
|
return res;
|
||||||
|
} catch {
|
||||||
|
const cache = await caches.open(SHELL);
|
||||||
|
const cached = await cache.match('shell');
|
||||||
|
return cached ?? Response.error();
|
||||||
|
}
|
||||||
|
})(),
|
||||||
|
);
|
||||||
|
});
|
||||||
@@ -19,10 +19,11 @@ import { join } from 'node:path';
|
|||||||
|
|
||||||
const DIST = 'dist';
|
const DIST = 'dist';
|
||||||
|
|
||||||
// Per-chunk gzip budgets in KB. The app entry was raised to 110 when the local
|
// Per-chunk gzip budgets in KB. The app entry was raised to 110 for the local move-preview
|
||||||
// move-preview wiring landed (the heavy dict subsystem stays in lazy chunks; this
|
// wiring, then to 112 for the PWA install feature (the install CTA + the pwa detection /
|
||||||
// covers the small in-entry game/debug wiring it needs).
|
// service-worker registration live in the app entry; the heavy dict subsystem stays in lazy
|
||||||
const BUDGET = { app: 110, shared: 30, landing: 5 };
|
// chunks). Its scoped CSS lands in the CSS chunk, not this JS budget.
|
||||||
|
const BUDGET = { app: 112, shared: 30, landing: 5 };
|
||||||
|
|
||||||
// gzipped returns the gzipped byte size of a built asset, or 0 when the reference is not a
|
// gzipped returns the gzipped byte size of a built asset, or 0 when the reference is not a
|
||||||
// local file (e.g. the Telegram SDK loaded from a CDN) or is missing.
|
// local file (e.g. the Telegram SDK loaded from a CDN) or is missing.
|
||||||
|
|||||||
+31
-16
@@ -80,20 +80,26 @@
|
|||||||
<section class="hero">
|
<section class="hero">
|
||||||
<h1>{about.title}</h1>
|
<h1>{about.title}</h1>
|
||||||
<p class="tagline">{t('landing.tagline')}</p>
|
<p class="tagline">{t('landing.tagline')}</p>
|
||||||
{#if tgLink || vkLink}
|
<!-- Platform entries: Telegram/VK are gated by their build vars; the web version (/app/) is
|
||||||
<div class="entries">
|
always available. A caption under each clarifies what it opens. -->
|
||||||
{#if tgLink}
|
<div class="entries">
|
||||||
<a class="entry" href={tgLink} target="_blank" rel="noopener noreferrer" aria-label={t('landing.playTelegram')}>
|
{#if tgLink}
|
||||||
<img src="telegram-logo.svg" alt="" width="64" height="64" />
|
<a class="entry" href={tgLink} target="_blank" rel="noopener noreferrer" aria-label={t('landing.playTelegram')}>
|
||||||
</a>
|
<img src="telegram-logo.svg" alt="" width="64" height="64" />
|
||||||
{/if}
|
<span class="caption">{t('landing.captionTelegram')}</span>
|
||||||
{#if vkLink}
|
</a>
|
||||||
<a class="entry" href={vkLink} target="_blank" rel="noopener noreferrer" aria-label={t('landing.playVK')}>
|
{/if}
|
||||||
<img src="vk-logo.svg" alt="" width="64" height="64" />
|
{#if vkLink}
|
||||||
</a>
|
<a class="entry" href={vkLink} target="_blank" rel="noopener noreferrer" aria-label={t('landing.playVK')}>
|
||||||
{/if}
|
<img src="vk-logo.svg" alt="" width="64" height="64" />
|
||||||
</div>
|
<span class="caption">{t('landing.captionVK')}</span>
|
||||||
{/if}
|
</a>
|
||||||
|
{/if}
|
||||||
|
<a class="entry" href="/app/" aria-label={t('landing.playWeb')}>
|
||||||
|
<img src="favicon.svg" alt="" width="64" height="64" />
|
||||||
|
<span class="caption">{t('landing.captionWeb')}</span>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section class="info">
|
<section class="info">
|
||||||
@@ -207,8 +213,8 @@
|
|||||||
color: var(--text-muted);
|
color: var(--text-muted);
|
||||||
font-size: 1.05rem;
|
font-size: 1.05rem;
|
||||||
}
|
}
|
||||||
/* The platform entries are just the bigger logos in a row (no button chrome, no captions);
|
/* The platform entries are the bigger logos in a row, each with a short caption below; the
|
||||||
each link keeps an aria-label for assistive tech. */
|
link keeps an aria-label for assistive tech. */
|
||||||
.entries {
|
.entries {
|
||||||
align-self: center;
|
align-self: center;
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -217,6 +223,11 @@
|
|||||||
}
|
}
|
||||||
.entry {
|
.entry {
|
||||||
display: inline-flex;
|
display: inline-flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
text-decoration: none;
|
||||||
|
color: var(--text);
|
||||||
}
|
}
|
||||||
.entry img {
|
.entry img {
|
||||||
display: block;
|
display: block;
|
||||||
@@ -225,6 +236,10 @@
|
|||||||
.entry:hover img {
|
.entry:hover img {
|
||||||
transform: scale(1.06);
|
transform: scale(1.06);
|
||||||
}
|
}
|
||||||
|
.caption {
|
||||||
|
font-size: 0.9rem;
|
||||||
|
color: var(--text-muted);
|
||||||
|
}
|
||||||
.info {
|
.info {
|
||||||
background: var(--surface-2);
|
background: var(--surface-2);
|
||||||
border-radius: var(--radius-sm);
|
border-radius: var(--radius-sm);
|
||||||
|
|||||||
@@ -3,12 +3,14 @@
|
|||||||
import {
|
import {
|
||||||
attachBannerHost,
|
attachBannerHost,
|
||||||
bannerCurrent,
|
bannerCurrent,
|
||||||
|
bannerCurrentColors,
|
||||||
configureBanner,
|
configureBanner,
|
||||||
detachBannerHost,
|
detachBannerHost,
|
||||||
remeasureBanner,
|
remeasureBanner,
|
||||||
} from '../lib/bannerEngine';
|
} from '../lib/bannerEngine';
|
||||||
import { defaultBannerTimings, linkify, type BannerHost } from '../lib/banner';
|
import { defaultBannerTimings, linkify, type BannerHost } from '../lib/banner';
|
||||||
import type { BannerCampaign, BannerTimings } from '../lib/model';
|
import { resolveBannerColors, type ThemeMode } from '../lib/bannerColors';
|
||||||
|
import type { BannerCampaign, BannerColors, BannerTimings } from '../lib/model';
|
||||||
import { onExternalLinkClick } from '../lib/links';
|
import { onExternalLinkClick } from '../lib/links';
|
||||||
|
|
||||||
let {
|
let {
|
||||||
@@ -21,12 +23,33 @@
|
|||||||
// current message and is visible at once (no fade — see inFade), so a screen change does not
|
// current message and is visible at once (no fade — see inFade), so a screen change does not
|
||||||
// replay the fade. Empty on the very first mount (engine not yet started).
|
// replay the fade. Empty on the very first mount (engine not yet started).
|
||||||
let current = $state(bannerCurrent());
|
let current = $state(bannerCurrent());
|
||||||
|
let currentColors = $state<BannerColors>(bannerCurrentColors());
|
||||||
let visible = $state(bannerCurrent() !== '');
|
let visible = $state(bannerCurrent() !== '');
|
||||||
let tx = $state(0);
|
let tx = $state(0);
|
||||||
let txDur = $state(0);
|
let txDur = $state(0);
|
||||||
let track = $state<HTMLElement>();
|
let track = $state<HTMLElement>();
|
||||||
let viewport = $state<HTMLElement>();
|
let viewport = $state<HTMLElement>();
|
||||||
|
|
||||||
|
// The rendered theme (light/dark), tracked so a campaign's colour override resolves against the
|
||||||
|
// theme actually on screen and re-resolves live when the operator/OS flips it. It follows the
|
||||||
|
// [data-theme] attribute (theme.ts), or the OS preference when unset ('auto').
|
||||||
|
let themeMode = $state<ThemeMode>(resolveThemeMode());
|
||||||
|
function resolveThemeMode(): ThemeMode {
|
||||||
|
if (typeof document === 'undefined') return 'light';
|
||||||
|
const attr = document.documentElement.getAttribute('data-theme');
|
||||||
|
if (attr === 'dark' || attr === 'light') return attr;
|
||||||
|
return window.matchMedia?.('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
|
||||||
|
}
|
||||||
|
|
||||||
|
// The strip's colours for the current campaign + theme (null = the neutral tokens). Applied as
|
||||||
|
// inline CSS variables scoped to .ad, so an override never leaks to the rest of the page.
|
||||||
|
const adColors = $derived(resolveBannerColors(currentColors, themeMode));
|
||||||
|
const adStyle = $derived(
|
||||||
|
adColors
|
||||||
|
? `--ad-bg:${adColors.bg};--text-muted:${adColors.fg};--accent:${adColors.link};--ad-border:${adColors.border}`
|
||||||
|
: '',
|
||||||
|
);
|
||||||
|
|
||||||
// The first appearance after mounting onto an already-running cycle is instant; every later
|
// The first appearance after mounting onto an already-running cycle is instant; every later
|
||||||
// message change fades. (Consumed by the first in:fade.)
|
// message change fades. (Consumed by the first in:fade.)
|
||||||
let instantOnce = bannerCurrent() !== '';
|
let instantOnce = bannerCurrent() !== '';
|
||||||
@@ -50,8 +73,9 @@
|
|||||||
// The DOM host the engine drives. The fade lives on the {#if} layer (transition:fade), the scroll
|
// The DOM host the engine drives. The fade lives on the {#if} layer (transition:fade), the scroll
|
||||||
// on the inner track's transform, so a long message's scroll never blocks its fade in/out.
|
// on the inner track's transform, so a long message's scroll never blocks its fade in/out.
|
||||||
const host: BannerHost = {
|
const host: BannerHost = {
|
||||||
show(md) {
|
show(md, colors) {
|
||||||
current = md;
|
current = md;
|
||||||
|
currentColors = colors;
|
||||||
tx = 0;
|
tx = 0;
|
||||||
txDur = 0;
|
txDur = 0;
|
||||||
visible = true;
|
visible = true;
|
||||||
@@ -93,6 +117,20 @@
|
|||||||
$effect(() => {
|
$effect(() => {
|
||||||
configureBanner(campaigns, eff);
|
configureBanner(campaigns, eff);
|
||||||
});
|
});
|
||||||
|
// Track the rendered theme so a colour override re-resolves when the theme flips: watch the
|
||||||
|
// [data-theme] attribute (Settings toggle / Telegram) and, for 'auto', the OS colour scheme.
|
||||||
|
$effect(() => {
|
||||||
|
const update = () => (themeMode = resolveThemeMode());
|
||||||
|
update();
|
||||||
|
const obs = new MutationObserver(update);
|
||||||
|
obs.observe(document.documentElement, { attributes: true, attributeFilter: ['data-theme'] });
|
||||||
|
const mq = window.matchMedia?.('(prefers-color-scheme: dark)');
|
||||||
|
mq?.addEventListener('change', update);
|
||||||
|
return () => {
|
||||||
|
obs.disconnect();
|
||||||
|
mq?.removeEventListener('change', update);
|
||||||
|
};
|
||||||
|
});
|
||||||
// Re-measure on a viewport size change (e.g. a portrait↔landscape rotation): a message that fit
|
// Re-measure on a viewport size change (e.g. a portrait↔landscape rotation): a message that fit
|
||||||
// may now overflow, or vice versa, so the scroll must be re-evaluated. Debounced.
|
// may now overflow, or vice versa, so the scroll must be re-evaluated. Debounced.
|
||||||
$effect(() => {
|
$effect(() => {
|
||||||
@@ -116,7 +154,7 @@
|
|||||||
confirmation, the VK away-redirect keeps the Android WebView on the game. -->
|
confirmation, the VK away-redirect keeps the Android WebView on the game. -->
|
||||||
<!-- svelte-ignore a11y_no_static_element_interactions -->
|
<!-- svelte-ignore a11y_no_static_element_interactions -->
|
||||||
<!-- svelte-ignore a11y_click_events_have_key_events -->
|
<!-- svelte-ignore a11y_click_events_have_key_events -->
|
||||||
<div class="ad" bind:this={viewport} onclick={onExternalLinkClick}>
|
<div class="ad" bind:this={viewport} style={adStyle} onclick={onExternalLinkClick}>
|
||||||
<!-- An always-present, invisible spacer reserves exactly one line of height, so the strip never
|
<!-- An always-present, invisible spacer reserves exactly one line of height, so the strip never
|
||||||
collapses while the message layer is absent during the fade gap (the message is overlaid
|
collapses while the message layer is absent during the fade gap (the message is overlaid
|
||||||
absolutely, so its presence/absence does not change the strip height). -->
|
absolutely, so its presence/absence does not change the strip height). -->
|
||||||
@@ -145,8 +183,8 @@
|
|||||||
font-size: 0.85rem;
|
font-size: 0.85rem;
|
||||||
line-height: 1.2;
|
line-height: 1.2;
|
||||||
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.18);
|
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.18);
|
||||||
border-top: 1px solid var(--border);
|
border-top: 1px solid var(--ad-border, var(--border));
|
||||||
border-bottom: 1px solid var(--border);
|
border-bottom: 1px solid var(--ad-border, var(--border));
|
||||||
user-select: none;
|
user-select: none;
|
||||||
}
|
}
|
||||||
/* Reserves one line of height inside the padding so .ad keeps a constant height even during the
|
/* Reserves one line of height inside the padding so .ad keeps a constant height even during the
|
||||||
|
|||||||
@@ -0,0 +1,85 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { t } from '../lib/i18n/index.svelte';
|
||||||
|
import { installMode, promptInstall } from '../lib/pwa.svelte';
|
||||||
|
import Modal from './Modal.svelte';
|
||||||
|
|
||||||
|
// Platform-adaptive: 'oneTap' fires the native Chromium install dialog; 'iosInstructions' opens
|
||||||
|
// the manual Share -> Add-to-Home-Screen guide (iOS Safari has no programmatic install); 'hidden'
|
||||||
|
// renders nothing (already installed, inside a Telegram/VK Mini App, or an unsupported browser).
|
||||||
|
const mode = $derived(installMode());
|
||||||
|
let showIos = $state(false);
|
||||||
|
|
||||||
|
function onClick(): void {
|
||||||
|
// promptInstall must run synchronously from this gesture — the deferred prompt is gated on it.
|
||||||
|
if (mode === 'oneTap') void promptInstall();
|
||||||
|
else if (mode === 'iosInstructions') showIos = true;
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
{#if mode !== 'hidden'}
|
||||||
|
<button type="button" class="install" onclick={onClick}>
|
||||||
|
<img src="favicon.svg" alt="" width="40" height="40" />
|
||||||
|
<span class="text">
|
||||||
|
<span class="title">{t('install.title')}</span>
|
||||||
|
<span class="subtitle">{t('install.subtitle')}</span>
|
||||||
|
</span>
|
||||||
|
</button>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
{#if showIos}
|
||||||
|
<Modal title={t('install.iosTitle')} onclose={() => (showIos = false)}>
|
||||||
|
<ol class="steps">
|
||||||
|
<li>{t('install.iosStep1')}</li>
|
||||||
|
<li>{t('install.iosStep2')}</li>
|
||||||
|
<li>{t('install.iosStep3')}</li>
|
||||||
|
</ol>
|
||||||
|
<button type="button" class="ok" onclick={() => (showIos = false)}>{t('common.ok')}</button>
|
||||||
|
</Modal>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
<style>
|
||||||
|
.install {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 12px;
|
||||||
|
width: 100%;
|
||||||
|
text-align: left;
|
||||||
|
padding: 12px;
|
||||||
|
border: 1px solid var(--border);
|
||||||
|
border-radius: var(--radius-sm);
|
||||||
|
background: var(--surface);
|
||||||
|
color: var(--text);
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
.install img {
|
||||||
|
flex: none;
|
||||||
|
border-radius: 8px;
|
||||||
|
}
|
||||||
|
.text {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 2px;
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
.title {
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
.subtitle {
|
||||||
|
font-size: 0.85rem;
|
||||||
|
color: var(--text-muted);
|
||||||
|
line-height: 1.35;
|
||||||
|
}
|
||||||
|
.steps {
|
||||||
|
margin: 0 0 16px;
|
||||||
|
padding-left: 1.25rem;
|
||||||
|
line-height: 1.6;
|
||||||
|
}
|
||||||
|
.ok {
|
||||||
|
width: 100%;
|
||||||
|
padding: 10px 12px;
|
||||||
|
border: 1px solid var(--accent);
|
||||||
|
background: var(--accent);
|
||||||
|
color: var(--accent-text);
|
||||||
|
border-radius: var(--radius-sm);
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -3,8 +3,9 @@
|
|||||||
import { app, dismissToast } from '../lib/app.svelte';
|
import { app, dismissToast } from '../lib/app.svelte';
|
||||||
|
|
||||||
const dur = $derived(app.reduceMotion ? 0 : 260);
|
const dur = $derived(app.reduceMotion ? 0 : 260);
|
||||||
// An info bubble owns its whole 2s life through a CSS rise-and-fade animation, so it takes
|
// An info bubble owns its whole 3s life through a CSS animation — appear, a ~1s hold at rest,
|
||||||
// no Svelte enter/leave transition; an error keeps the fly-in / fade-out dwell behaviour.
|
// then rise-and-fade — so it takes no Svelte enter/leave transition; an error keeps the fly-in /
|
||||||
|
// fade-out dwell behaviour.
|
||||||
const isInfo = $derived(app.toast?.kind !== 'error');
|
const isInfo = $derived(app.toast?.kind !== 'error');
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@@ -50,17 +51,19 @@
|
|||||||
border-color: var(--danger);
|
border-color: var(--danger);
|
||||||
color: var(--danger);
|
color: var(--danger);
|
||||||
}
|
}
|
||||||
/* An info bubble fades in, then drifts up by roughly the tab-bar height while fading out,
|
/* An info bubble fades in, holds for ~1s at rest, then drifts up by roughly the tab-bar height
|
||||||
all within 2s; the X centring is preserved across the rise. */
|
while fading out, all within 3s; the X centring is preserved across the rise. The 8%/41%
|
||||||
|
stops are the appear (~240ms) and the end of the ~1s hold. */
|
||||||
.toast.rise {
|
.toast.rise {
|
||||||
animation: toast-rise 2s ease-out forwards;
|
animation: toast-rise 3s ease-out forwards;
|
||||||
}
|
}
|
||||||
@keyframes toast-rise {
|
@keyframes toast-rise {
|
||||||
0% {
|
0% {
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
transform: translateX(-50%) translateY(8px);
|
transform: translateX(-50%) translateY(8px);
|
||||||
}
|
}
|
||||||
12% {
|
8%,
|
||||||
|
41% {
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
transform: translateX(-50%) translateY(0);
|
transform: translateX(-50%) translateY(0);
|
||||||
}
|
}
|
||||||
@@ -69,16 +72,16 @@
|
|||||||
transform: translateX(-50%) translateY(-56px);
|
transform: translateX(-50%) translateY(-56px);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* Reduced motion: the same 2s life, fade only — no upward travel. */
|
/* Reduced motion: the same 3s life (appear, ~1s hold, fade), fade only — no upward travel. */
|
||||||
.toast.rise-reduced {
|
.toast.rise-reduced {
|
||||||
animation: toast-rise-reduced 2s ease-out forwards;
|
animation: toast-rise-reduced 3s ease-out forwards;
|
||||||
}
|
}
|
||||||
@keyframes toast-rise-reduced {
|
@keyframes toast-rise-reduced {
|
||||||
0% {
|
0% {
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
}
|
}
|
||||||
12%,
|
8%,
|
||||||
70% {
|
41% {
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
}
|
}
|
||||||
100% {
|
100% {
|
||||||
|
|||||||
@@ -37,8 +37,50 @@ messagesLength():number {
|
|||||||
return offset ? this.bb!.__vector_len(this.bb_pos + offset) : 0;
|
return offset ? this.bb!.__vector_len(this.bb_pos + offset) : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
overrideBg():string|null
|
||||||
|
overrideBg(optionalEncoding:flatbuffers.Encoding):string|Uint8Array|null
|
||||||
|
overrideBg(optionalEncoding?:any):string|Uint8Array|null {
|
||||||
|
const offset = this.bb!.__offset(this.bb_pos, 8);
|
||||||
|
return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
overrideFg():string|null
|
||||||
|
overrideFg(optionalEncoding:flatbuffers.Encoding):string|Uint8Array|null
|
||||||
|
overrideFg(optionalEncoding?:any):string|Uint8Array|null {
|
||||||
|
const offset = this.bb!.__offset(this.bb_pos, 10);
|
||||||
|
return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
overrideLink():string|null
|
||||||
|
overrideLink(optionalEncoding:flatbuffers.Encoding):string|Uint8Array|null
|
||||||
|
overrideLink(optionalEncoding?:any):string|Uint8Array|null {
|
||||||
|
const offset = this.bb!.__offset(this.bb_pos, 12);
|
||||||
|
return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
overrideBgDark():string|null
|
||||||
|
overrideBgDark(optionalEncoding:flatbuffers.Encoding):string|Uint8Array|null
|
||||||
|
overrideBgDark(optionalEncoding?:any):string|Uint8Array|null {
|
||||||
|
const offset = this.bb!.__offset(this.bb_pos, 14);
|
||||||
|
return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
overrideFgDark():string|null
|
||||||
|
overrideFgDark(optionalEncoding:flatbuffers.Encoding):string|Uint8Array|null
|
||||||
|
overrideFgDark(optionalEncoding?:any):string|Uint8Array|null {
|
||||||
|
const offset = this.bb!.__offset(this.bb_pos, 16);
|
||||||
|
return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
overrideLinkDark():string|null
|
||||||
|
overrideLinkDark(optionalEncoding:flatbuffers.Encoding):string|Uint8Array|null
|
||||||
|
overrideLinkDark(optionalEncoding?:any):string|Uint8Array|null {
|
||||||
|
const offset = this.bb!.__offset(this.bb_pos, 18);
|
||||||
|
return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null;
|
||||||
|
}
|
||||||
|
|
||||||
static startBannerCampaign(builder:flatbuffers.Builder) {
|
static startBannerCampaign(builder:flatbuffers.Builder) {
|
||||||
builder.startObject(2);
|
builder.startObject(8);
|
||||||
}
|
}
|
||||||
|
|
||||||
static addWeight(builder:flatbuffers.Builder, weight:number) {
|
static addWeight(builder:flatbuffers.Builder, weight:number) {
|
||||||
@@ -61,15 +103,45 @@ static startMessagesVector(builder:flatbuffers.Builder, numElems:number) {
|
|||||||
builder.startVector(4, numElems, 4);
|
builder.startVector(4, numElems, 4);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static addOverrideBg(builder:flatbuffers.Builder, overrideBgOffset:flatbuffers.Offset) {
|
||||||
|
builder.addFieldOffset(2, overrideBgOffset, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
static addOverrideFg(builder:flatbuffers.Builder, overrideFgOffset:flatbuffers.Offset) {
|
||||||
|
builder.addFieldOffset(3, overrideFgOffset, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
static addOverrideLink(builder:flatbuffers.Builder, overrideLinkOffset:flatbuffers.Offset) {
|
||||||
|
builder.addFieldOffset(4, overrideLinkOffset, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
static addOverrideBgDark(builder:flatbuffers.Builder, overrideBgDarkOffset:flatbuffers.Offset) {
|
||||||
|
builder.addFieldOffset(5, overrideBgDarkOffset, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
static addOverrideFgDark(builder:flatbuffers.Builder, overrideFgDarkOffset:flatbuffers.Offset) {
|
||||||
|
builder.addFieldOffset(6, overrideFgDarkOffset, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
static addOverrideLinkDark(builder:flatbuffers.Builder, overrideLinkDarkOffset:flatbuffers.Offset) {
|
||||||
|
builder.addFieldOffset(7, overrideLinkDarkOffset, 0);
|
||||||
|
}
|
||||||
|
|
||||||
static endBannerCampaign(builder:flatbuffers.Builder):flatbuffers.Offset {
|
static endBannerCampaign(builder:flatbuffers.Builder):flatbuffers.Offset {
|
||||||
const offset = builder.endObject();
|
const offset = builder.endObject();
|
||||||
return offset;
|
return offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
static createBannerCampaign(builder:flatbuffers.Builder, weight:number, messagesOffset:flatbuffers.Offset):flatbuffers.Offset {
|
static createBannerCampaign(builder:flatbuffers.Builder, weight:number, messagesOffset:flatbuffers.Offset, overrideBgOffset:flatbuffers.Offset, overrideFgOffset:flatbuffers.Offset, overrideLinkOffset:flatbuffers.Offset, overrideBgDarkOffset:flatbuffers.Offset, overrideFgDarkOffset:flatbuffers.Offset, overrideLinkDarkOffset:flatbuffers.Offset):flatbuffers.Offset {
|
||||||
BannerCampaign.startBannerCampaign(builder);
|
BannerCampaign.startBannerCampaign(builder);
|
||||||
BannerCampaign.addWeight(builder, weight);
|
BannerCampaign.addWeight(builder, weight);
|
||||||
BannerCampaign.addMessages(builder, messagesOffset);
|
BannerCampaign.addMessages(builder, messagesOffset);
|
||||||
|
BannerCampaign.addOverrideBg(builder, overrideBgOffset);
|
||||||
|
BannerCampaign.addOverrideFg(builder, overrideFgOffset);
|
||||||
|
BannerCampaign.addOverrideLink(builder, overrideLinkOffset);
|
||||||
|
BannerCampaign.addOverrideBgDark(builder, overrideBgDarkOffset);
|
||||||
|
BannerCampaign.addOverrideFgDark(builder, overrideFgDarkOffset);
|
||||||
|
BannerCampaign.addOverrideLinkDark(builder, overrideLinkDarkOffset);
|
||||||
return BannerCampaign.endBannerCampaign(builder);
|
return BannerCampaign.endBannerCampaign(builder);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,8 +41,13 @@ language(optionalEncoding?:any):string|Uint8Array|null {
|
|||||||
return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null;
|
return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pwa():boolean {
|
||||||
|
const offset = this.bb!.__offset(this.bb_pos, 10);
|
||||||
|
return offset ? !!this.bb!.readInt8(this.bb_pos + offset) : false;
|
||||||
|
}
|
||||||
|
|
||||||
static startEmailRequestRequest(builder:flatbuffers.Builder) {
|
static startEmailRequestRequest(builder:flatbuffers.Builder) {
|
||||||
builder.startObject(3);
|
builder.startObject(4);
|
||||||
}
|
}
|
||||||
|
|
||||||
static addEmail(builder:flatbuffers.Builder, emailOffset:flatbuffers.Offset) {
|
static addEmail(builder:flatbuffers.Builder, emailOffset:flatbuffers.Offset) {
|
||||||
@@ -57,16 +62,21 @@ static addLanguage(builder:flatbuffers.Builder, languageOffset:flatbuffers.Offse
|
|||||||
builder.addFieldOffset(2, languageOffset, 0);
|
builder.addFieldOffset(2, languageOffset, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static addPwa(builder:flatbuffers.Builder, pwa:boolean) {
|
||||||
|
builder.addFieldInt8(3, +pwa, +false);
|
||||||
|
}
|
||||||
|
|
||||||
static endEmailRequestRequest(builder:flatbuffers.Builder):flatbuffers.Offset {
|
static endEmailRequestRequest(builder:flatbuffers.Builder):flatbuffers.Offset {
|
||||||
const offset = builder.endObject();
|
const offset = builder.endObject();
|
||||||
return offset;
|
return offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
static createEmailRequestRequest(builder:flatbuffers.Builder, emailOffset:flatbuffers.Offset, browserTzOffset:flatbuffers.Offset, languageOffset:flatbuffers.Offset):flatbuffers.Offset {
|
static createEmailRequestRequest(builder:flatbuffers.Builder, emailOffset:flatbuffers.Offset, browserTzOffset:flatbuffers.Offset, languageOffset:flatbuffers.Offset, pwa:boolean):flatbuffers.Offset {
|
||||||
EmailRequestRequest.startEmailRequestRequest(builder);
|
EmailRequestRequest.startEmailRequestRequest(builder);
|
||||||
EmailRequestRequest.addEmail(builder, emailOffset);
|
EmailRequestRequest.addEmail(builder, emailOffset);
|
||||||
EmailRequestRequest.addBrowserTz(builder, browserTzOffset);
|
EmailRequestRequest.addBrowserTz(builder, browserTzOffset);
|
||||||
EmailRequestRequest.addLanguage(builder, languageOffset);
|
EmailRequestRequest.addLanguage(builder, languageOffset);
|
||||||
|
EmailRequestRequest.addPwa(builder, pwa);
|
||||||
return EmailRequestRequest.endEmailRequestRequest(builder);
|
return EmailRequestRequest.endEmailRequestRequest(builder);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,6 +35,8 @@ import {
|
|||||||
} from './telegram';
|
} from './telegram';
|
||||||
import { onVKPath, insideVK, vkInit, vkClose, vkDisableSwipeBack, vkLaunchParams, vkUserName, vkStartParam, vkOnScheme, vkOnInsets, vkSetViewSettings, appearanceForBg } from './vk';
|
import { onVKPath, insideVK, vkInit, vkClose, vkDisableSwipeBack, vkLaunchParams, vkUserName, vkStartParam, vkOnScheme, vkOnInsets, vkSetViewSettings, appearanceForBg } from './vk';
|
||||||
import { pendingVKLink, type VKLinkCallback } from './vkid';
|
import { pendingVKLink, type VKLinkCallback } from './vkid';
|
||||||
|
import { isStandalone } from './pwa';
|
||||||
|
import { registerServiceWorker } from './pwa.svelte';
|
||||||
import { haptic } from './haptics';
|
import { haptic } from './haptics';
|
||||||
import { CLOUD_PREFS_KEY, decodeClientPrefs, encodeClientPrefs } from './cloudprefs';
|
import { CLOUD_PREFS_KEY, decodeClientPrefs, encodeClientPrefs } from './cloudprefs';
|
||||||
import { parseStartParam } from './deeplink';
|
import { parseStartParam } from './deeplink';
|
||||||
@@ -214,9 +216,9 @@ function goForeground(): void {
|
|||||||
export function showToast(text: string, kind: Toast['kind'] = 'info'): void {
|
export function showToast(text: string, kind: Toast['kind'] = 'info'): void {
|
||||||
app.toast = { kind, text, seq: ++toastSeq };
|
app.toast = { kind, text, seq: ++toastSeq };
|
||||||
if (toastTimer) clearTimeout(toastTimer);
|
if (toastTimer) clearTimeout(toastTimer);
|
||||||
// An info bubble lives exactly as long as its rise-and-fade animation (2s); an error
|
// An info bubble lives exactly as long as its appear + ~1s hold + rise-and-fade animation (3s);
|
||||||
// dwells longer (4s) so it is not missed.
|
// an error dwells longer (4s) so it is not missed.
|
||||||
toastTimer = setTimeout(() => (app.toast = null), kind === 'error' ? 4000 : 2000);
|
toastTimer = setTimeout(() => (app.toast = null), kind === 'error' ? 4000 : 3000);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** dismissToast hides the current toast at once — a tap on the bubble dismisses it. */
|
/** dismissToast hides the current toast at once — a tap on the bubble dismisses it. */
|
||||||
@@ -783,6 +785,11 @@ export async function bootstrap(): Promise<void> {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// On the plain web (both Mini-App branches returned above) register the install-only service
|
||||||
|
// worker so the app is installable — Chromium needs a registered SW, notably on Android. Web-only
|
||||||
|
// and skipped in the mock build; see lib/pwa.svelte.
|
||||||
|
registerServiceWorker();
|
||||||
|
|
||||||
const saved = await loadSession();
|
const saved = await loadSession();
|
||||||
// A VK ID web-link callback (?code&device_id&state) rides the URL after the redirect back
|
// A VK ID web-link callback (?code&device_id&state) rides the URL after the redirect back
|
||||||
// from VK; capture and clear it here (it needs the restored session to link against).
|
// from VK; capture and clear it here (it needs the restored session to link against).
|
||||||
@@ -974,7 +981,7 @@ export async function loginGuest(): Promise<void> {
|
|||||||
|
|
||||||
export async function requestEmailCode(email: string): Promise<boolean> {
|
export async function requestEmailCode(email: string): Promise<boolean> {
|
||||||
try {
|
try {
|
||||||
await gateway.authEmailRequest(email, app.locale);
|
await gateway.authEmailRequest(email, app.locale, isStandalone());
|
||||||
return true;
|
return true;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
handleError(err);
|
handleError(err);
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ describe('createScheduler', () => {
|
|||||||
{ weight: 7, messages: ['b'] },
|
{ weight: 7, messages: ['b'] },
|
||||||
]);
|
]);
|
||||||
expect(sched.total).toBe(2);
|
expect(sched.total).toBe(2);
|
||||||
const cycle = Array.from({ length: 10 }, () => sched.next());
|
const cycle = Array.from({ length: 10 }, () => sched.next().md);
|
||||||
const a = cycle.filter((m) => m === 'a').length;
|
const a = cycle.filter((m) => m === 'a').length;
|
||||||
const b = cycle.filter((m) => m === 'b').length;
|
const b = cycle.filter((m) => m === 'b').length;
|
||||||
expect(a).toBe(3);
|
expect(a).toBe(3);
|
||||||
@@ -42,7 +42,7 @@ describe('createScheduler', () => {
|
|||||||
it('round-robins messages within a campaign', () => {
|
it('round-robins messages within a campaign', () => {
|
||||||
const sched = createScheduler([{ weight: 1, messages: ['m0', 'm1', 'm2'] }]);
|
const sched = createScheduler([{ weight: 1, messages: ['m0', 'm1', 'm2'] }]);
|
||||||
expect(sched.total).toBe(3);
|
expect(sched.total).toBe(3);
|
||||||
expect([sched.next(), sched.next(), sched.next(), sched.next()]).toEqual(['m0', 'm1', 'm2', 'm0']);
|
expect([sched.next().md, sched.next().md, sched.next().md, sched.next().md]).toEqual(['m0', 'm1', 'm2', 'm0']);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('drops empty and non-positive-weight campaigns', () => {
|
it('drops empty and non-positive-weight campaigns', () => {
|
||||||
@@ -52,13 +52,27 @@ describe('createScheduler', () => {
|
|||||||
{ weight: 2, messages: ['keep'] },
|
{ weight: 2, messages: ['keep'] },
|
||||||
]);
|
]);
|
||||||
expect(sched.total).toBe(1);
|
expect(sched.total).toBe(1);
|
||||||
expect(sched.next()).toBe('keep');
|
expect(sched.next().md).toBe('keep');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('is empty for no campaigns', () => {
|
it('is empty for no campaigns', () => {
|
||||||
const sched = createScheduler([]);
|
const sched = createScheduler([]);
|
||||||
expect(sched.total).toBe(0);
|
expect(sched.total).toBe(0);
|
||||||
expect(sched.next()).toBe('');
|
expect(sched.next().md).toBe('');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('carries each campaign colour override with its message', () => {
|
||||||
|
const red = { bg: '#aa0000', fg: '#ffffff', link: '#ffdd00' };
|
||||||
|
const darkRed = { bg: '#330000', fg: '#eeeeee', link: '#ffcc00' };
|
||||||
|
const sched = createScheduler([
|
||||||
|
{ weight: 1, messages: ['plain'] },
|
||||||
|
{ weight: 1, messages: ['branded'], overrideAll: red, overrideDark: darkRed },
|
||||||
|
]);
|
||||||
|
const two = [sched.next(), sched.next()];
|
||||||
|
const branded = two.find((it) => it.md === 'branded');
|
||||||
|
const plain = two.find((it) => it.md === 'plain');
|
||||||
|
expect(branded?.colors).toEqual({ all: red, dark: darkRed });
|
||||||
|
expect(plain?.colors).toEqual({ all: null, dark: null });
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
+21
-12
@@ -4,7 +4,7 @@
|
|||||||
// unit-testable with fake timers. The campaigns + timings come from the profile's
|
// unit-testable with fake timers. The campaigns + timings come from the profile's
|
||||||
// banner block (see lib/model, ARCHITECTURE §10); the host is AdBanner.svelte.
|
// banner block (see lib/model, ARCHITECTURE §10); the host is AdBanner.svelte.
|
||||||
|
|
||||||
import type { BannerCampaign, BannerTimings } from './model';
|
import type { BannerCampaign, BannerColors, BannerTimings } from './model';
|
||||||
|
|
||||||
/** Fallback display timings, matching the seeded ad_settings defaults. */
|
/** Fallback display timings, matching the seeded ad_settings defaults. */
|
||||||
export const defaultBannerTimings: BannerTimings = {
|
export const defaultBannerTimings: BannerTimings = {
|
||||||
@@ -16,9 +16,15 @@ export const defaultBannerTimings: BannerTimings = {
|
|||||||
fadeInMs: 1_000,
|
fadeInMs: 1_000,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/** BannerItem is one scheduled message plus its campaign's colour override (for the strip). */
|
||||||
|
export interface BannerItem {
|
||||||
|
md: string;
|
||||||
|
colors: BannerColors;
|
||||||
|
}
|
||||||
|
|
||||||
/** Scheduler yields the next message to show, fairly across weighted campaigns. */
|
/** Scheduler yields the next message to show, fairly across weighted campaigns. */
|
||||||
export interface Scheduler {
|
export interface Scheduler {
|
||||||
next(): string;
|
next(): BannerItem;
|
||||||
/** Total messages across all (non-empty, positive-weight) campaigns. */
|
/** Total messages across all (non-empty, positive-weight) campaigns. */
|
||||||
readonly total: number;
|
readonly total: number;
|
||||||
}
|
}
|
||||||
@@ -33,15 +39,17 @@ export interface Scheduler {
|
|||||||
*/
|
*/
|
||||||
export function createScheduler(campaigns: BannerCampaign[]): Scheduler {
|
export function createScheduler(campaigns: BannerCampaign[]): Scheduler {
|
||||||
const cs = campaigns.filter((c) => c.weight > 0 && c.messages.length > 0);
|
const cs = campaigns.filter((c) => c.weight > 0 && c.messages.length > 0);
|
||||||
|
const colors: BannerColors[] = cs.map((c) => ({ all: c.overrideAll ?? null, dark: c.overrideDark ?? null }));
|
||||||
const current = cs.map(() => 0); // SWRR running weights
|
const current = cs.map(() => 0); // SWRR running weights
|
||||||
const cursor = cs.map(() => 0); // per-campaign round-robin position
|
const cursor = cs.map(() => 0); // per-campaign round-robin position
|
||||||
const totalWeight = cs.reduce((sum, c) => sum + c.weight, 0);
|
const totalWeight = cs.reduce((sum, c) => sum + c.weight, 0);
|
||||||
const total = cs.reduce((sum, c) => sum + c.messages.length, 0);
|
const total = cs.reduce((sum, c) => sum + c.messages.length, 0);
|
||||||
|
const empty: BannerColors = { all: null, dark: null };
|
||||||
|
|
||||||
return {
|
return {
|
||||||
total,
|
total,
|
||||||
next(): string {
|
next(): BannerItem {
|
||||||
if (cs.length === 0) return '';
|
if (cs.length === 0) return { md: '', colors: empty };
|
||||||
let best = 0;
|
let best = 0;
|
||||||
for (let i = 0; i < cs.length; i++) {
|
for (let i = 0; i < cs.length; i++) {
|
||||||
current[i] += cs[i].weight;
|
current[i] += cs[i].weight;
|
||||||
@@ -51,15 +59,16 @@ export function createScheduler(campaigns: BannerCampaign[]): Scheduler {
|
|||||||
const c = cs[best];
|
const c = cs[best];
|
||||||
const md = c.messages[cursor[best] % c.messages.length];
|
const md = c.messages[cursor[best] % c.messages.length];
|
||||||
cursor[best]++;
|
cursor[best]++;
|
||||||
return md;
|
return { md, colors: colors[best] };
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
/** The host the rotator drives; AdBanner.svelte supplies the DOM measurements and effects. */
|
/** The host the rotator drives; AdBanner.svelte supplies the DOM measurements and effects. */
|
||||||
export interface BannerHost {
|
export interface BannerHost {
|
||||||
/** Render md and fade it in (over fadeInMs), with the scroll reset to the start. */
|
/** Render md and fade it in (over fadeInMs), with the scroll reset to the start. colors is the
|
||||||
show(md: string): void;
|
* source campaign's colour override, applied to the strip (its neutral tokens when unset). */
|
||||||
|
show(md: string, colors: BannerColors): void;
|
||||||
/** Reset the scroll to the start without re-fading (to loop a long message). */
|
/** Reset the scroll to the start without re-fading (to loop a long message). */
|
||||||
resetScroll(): void;
|
resetScroll(): void;
|
||||||
/** Fade the current message out over durationMs. */
|
/** Fade the current message out over durationMs. */
|
||||||
@@ -98,7 +107,7 @@ export function createBannerRotator(
|
|||||||
const sched = createScheduler(campaigns);
|
const sched = createScheduler(campaigns);
|
||||||
let running = false;
|
let running = false;
|
||||||
let cycleStart = 0;
|
let cycleStart = 0;
|
||||||
let lastShown = ''; // the message currently presented, for restart() (re-measure)
|
let lastShown: BannerItem | null = null; // the item currently presented, for restart() (re-measure)
|
||||||
const timers: ReturnType<typeof setTimeout>[] = [];
|
const timers: ReturnType<typeof setTimeout>[] = [];
|
||||||
|
|
||||||
const at = (ms: number, fn: () => void) => {
|
const at = (ms: number, fn: () => void) => {
|
||||||
@@ -109,11 +118,11 @@ export function createBannerRotator(
|
|||||||
timers.length = 0;
|
timers.length = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
function present(md: string) {
|
function present(item: BannerItem) {
|
||||||
if (!running) return;
|
if (!running) return;
|
||||||
clear();
|
clear();
|
||||||
lastShown = md;
|
lastShown = item;
|
||||||
host.show(md);
|
host.show(item.md, item.colors);
|
||||||
at(config.fadeInMs, measure);
|
at(config.fadeInMs, measure);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -143,7 +152,7 @@ export function createBannerRotator(
|
|||||||
// the same fade as a message change, not a hard jump.
|
// the same fade as a message change, not a hard jump.
|
||||||
host.hide(config.fadeOutMs);
|
host.hide(config.fadeOutMs);
|
||||||
at(config.fadeOutMs + config.gapMs, () => {
|
at(config.fadeOutMs + config.gapMs, () => {
|
||||||
host.show(lastShown);
|
if (lastShown) host.show(lastShown.md, lastShown.colors);
|
||||||
at(config.fadeInMs, () => scrollCycle(over));
|
at(config.fadeInMs, () => scrollCycle(over));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,48 @@
|
|||||||
|
import { describe, expect, it } from 'vitest';
|
||||||
|
import { derivedBorder, resolveBannerColors } from './bannerColors';
|
||||||
|
import type { BannerColors } from './model';
|
||||||
|
|
||||||
|
const red = { bg: '#aa0000', fg: '#ffffff', link: '#ffdd00' };
|
||||||
|
const darkRed = { bg: '#330000', fg: '#eeeeee', link: '#ffcc00' };
|
||||||
|
|
||||||
|
describe('resolveBannerColors', () => {
|
||||||
|
it('returns null when the campaign has no override (neutral tokens)', () => {
|
||||||
|
const none: BannerColors = { all: null, dark: null };
|
||||||
|
expect(resolveBannerColors(none, 'light')).toBeNull();
|
||||||
|
expect(resolveBannerColors(none, 'dark')).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('applies the all-themes set on both themes when no dark override', () => {
|
||||||
|
const c: BannerColors = { all: red, dark: null };
|
||||||
|
expect(resolveBannerColors(c, 'light')).toMatchObject({ bg: red.bg, fg: red.fg, link: red.link });
|
||||||
|
expect(resolveBannerColors(c, 'dark')).toMatchObject({ bg: red.bg, fg: red.fg, link: red.link });
|
||||||
|
});
|
||||||
|
|
||||||
|
it('prefers the dark override on the dark theme, and the all set on light', () => {
|
||||||
|
const c: BannerColors = { all: red, dark: darkRed };
|
||||||
|
expect(resolveBannerColors(c, 'light')).toMatchObject({ bg: red.bg });
|
||||||
|
expect(resolveBannerColors(c, 'dark')).toMatchObject({ bg: darkRed.bg });
|
||||||
|
});
|
||||||
|
|
||||||
|
it('supports a dark-only override (light keeps the neutral tokens)', () => {
|
||||||
|
const c: BannerColors = { all: null, dark: darkRed };
|
||||||
|
expect(resolveBannerColors(c, 'light')).toBeNull();
|
||||||
|
expect(resolveBannerColors(c, 'dark')).toMatchObject({ bg: darkRed.bg });
|
||||||
|
});
|
||||||
|
|
||||||
|
it('derives the border from the resolved background', () => {
|
||||||
|
const c: BannerColors = { all: red, dark: null };
|
||||||
|
expect(resolveBannerColors(c, 'light')?.border).toBe(derivedBorder(red.bg));
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('derivedBorder', () => {
|
||||||
|
it('darkens a light background and lightens a dark one', () => {
|
||||||
|
expect(derivedBorder('#ffffff')).toBe('#dbdbdb');
|
||||||
|
expect(derivedBorder('#000000')).toBe('#242424');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('returns a malformed colour unchanged', () => {
|
||||||
|
expect(derivedBorder('nope')).toBe('nope');
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,69 @@
|
|||||||
|
// Banner colour resolution. A campaign may carry two optional colour sets (see
|
||||||
|
// lib/model BannerColors): one for every theme and one that further overrides the
|
||||||
|
// dark theme. resolveBannerColors collapses them to the colours the strip paints on
|
||||||
|
// the currently-rendered theme, or null when the campaign keeps the neutral
|
||||||
|
// --ad-bg / --text-muted / --accent tokens. Pure and DOM-free, so it is unit-tested
|
||||||
|
// directly; AdBanner.svelte applies the result as inline CSS variables.
|
||||||
|
|
||||||
|
import type { BannerColors } from './model';
|
||||||
|
|
||||||
|
export type ThemeMode = 'light' | 'dark';
|
||||||
|
|
||||||
|
/** ResolvedBannerColors is the strip's colours for one theme, border already derived. */
|
||||||
|
export interface ResolvedBannerColors {
|
||||||
|
bg: string;
|
||||||
|
fg: string;
|
||||||
|
link: string;
|
||||||
|
border: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* resolveBannerColors picks the colour set for the rendered theme — dark ← dark ?? all,
|
||||||
|
* light ← all — and returns null when there is no override for that theme (the strip then
|
||||||
|
* keeps the neutral tokens). The border is derived from the background so it stays subtle
|
||||||
|
* on any colour.
|
||||||
|
*/
|
||||||
|
export function resolveBannerColors(colors: BannerColors, mode: ThemeMode): ResolvedBannerColors | null {
|
||||||
|
const set = mode === 'dark' ? (colors.dark ?? colors.all) : colors.all;
|
||||||
|
if (!set) return null;
|
||||||
|
return { bg: set.bg, fg: set.fg, link: set.link, border: derivedBorder(set.bg) };
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* derivedBorder nudges the background 14% toward black on a light background and toward
|
||||||
|
* white on a dark one — a subtle edge that suits any override colour. It is computed in
|
||||||
|
* JS (no CSS color-mix) so it works on the old Android WebView floor (Chrome 67), and
|
||||||
|
* mirrors the admin console preview (banner_detail.gohtml). A malformed colour is
|
||||||
|
* returned unchanged.
|
||||||
|
*/
|
||||||
|
export function derivedBorder(bgHex: string): string {
|
||||||
|
const rgb = hexToRgb(bgHex);
|
||||||
|
if (!rgb) return bgHex;
|
||||||
|
const target: RGB = luminance(rgb) > 0.5 ? [0, 0, 0] : [255, 255, 255];
|
||||||
|
return rgbToHex(mix(rgb, target, 0.14));
|
||||||
|
}
|
||||||
|
|
||||||
|
type RGB = [number, number, number];
|
||||||
|
|
||||||
|
function hexToRgb(h: string): RGB | null {
|
||||||
|
const m = /^#([0-9a-fA-F]{6})$/.exec(h.trim());
|
||||||
|
if (!m) return null;
|
||||||
|
const n = m[1];
|
||||||
|
return [parseInt(n.slice(0, 2), 16), parseInt(n.slice(2, 4), 16), parseInt(n.slice(4, 6), 16)];
|
||||||
|
}
|
||||||
|
|
||||||
|
function mix(a: RGB, b: RGB, t: number): RGB {
|
||||||
|
return [a[0] + (b[0] - a[0]) * t, a[1] + (b[1] - a[1]) * t, a[2] + (b[2] - a[2]) * t];
|
||||||
|
}
|
||||||
|
|
||||||
|
function luminance(r: RGB): number {
|
||||||
|
return (0.2126 * r[0] + 0.7152 * r[1] + 0.0722 * r[2]) / 255;
|
||||||
|
}
|
||||||
|
|
||||||
|
function pad(x: number): string {
|
||||||
|
return Math.max(0, Math.min(255, Math.round(x))).toString(16).padStart(2, '0');
|
||||||
|
}
|
||||||
|
|
||||||
|
function rgbToHex(r: RGB): string {
|
||||||
|
return '#' + pad(r[0]) + pad(r[1]) + pad(r[2]);
|
||||||
|
}
|
||||||
@@ -4,11 +4,14 @@
|
|||||||
// independent of route transitions (the cycle is not restarted on navigation).
|
// independent of route transitions (the cycle is not restarted on navigation).
|
||||||
|
|
||||||
import { createBannerRotator, type BannerHost, type Rotator } from './banner';
|
import { createBannerRotator, type BannerHost, type Rotator } from './banner';
|
||||||
import type { BannerCampaign, BannerTimings } from './model';
|
import type { BannerCampaign, BannerColors, BannerTimings } from './model';
|
||||||
|
|
||||||
|
const noColors: BannerColors = { all: null, dark: null };
|
||||||
|
|
||||||
let rotator: Rotator | null = null;
|
let rotator: Rotator | null = null;
|
||||||
let mounted: BannerHost | null = null;
|
let mounted: BannerHost | null = null;
|
||||||
let current = '';
|
let current = '';
|
||||||
|
let currentColors: BannerColors = noColors;
|
||||||
let key = '';
|
let key = '';
|
||||||
// The in-flight horizontal scroll of the current message, so a view mounted by navigation can
|
// The in-flight horizontal scroll of the current message, so a view mounted by navigation can
|
||||||
// resume it from the same offset instead of restarting at the left. Null when not scrolling.
|
// resume it from the same offset instead of restarting at the left. Null when not scrolling.
|
||||||
@@ -17,10 +20,11 @@ let activeScroll: { toPx: number; dur: number; start: number } | null = null;
|
|||||||
// proxy is the rotator's host: it records the current message + scroll (so a freshly-mounted view
|
// proxy is the rotator's host: it records the current message + scroll (so a freshly-mounted view
|
||||||
// can resume them) and forwards every effect to the currently-attached DOM host, if any.
|
// can resume them) and forwards every effect to the currently-attached DOM host, if any.
|
||||||
const proxy: BannerHost = {
|
const proxy: BannerHost = {
|
||||||
show(md) {
|
show(md, colors) {
|
||||||
current = md;
|
current = md;
|
||||||
|
currentColors = colors;
|
||||||
activeScroll = null;
|
activeScroll = null;
|
||||||
mounted?.show(md);
|
mounted?.show(md, colors);
|
||||||
},
|
},
|
||||||
resetScroll() {
|
resetScroll() {
|
||||||
activeScroll = null;
|
activeScroll = null;
|
||||||
@@ -58,6 +62,7 @@ export function configureBanner(campaigns: BannerCampaign[], timings: BannerTimi
|
|||||||
key = k;
|
key = k;
|
||||||
rotator?.stop();
|
rotator?.stop();
|
||||||
current = '';
|
current = '';
|
||||||
|
currentColors = noColors;
|
||||||
rotator = createBannerRotator(campaigns, proxy, timings);
|
rotator = createBannerRotator(campaigns, proxy, timings);
|
||||||
rotator.start();
|
rotator.start();
|
||||||
}
|
}
|
||||||
@@ -71,6 +76,15 @@ export function bannerCurrent(): string {
|
|||||||
return current;
|
return current;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* bannerCurrentColors returns the colour override of the campaign whose message is currently
|
||||||
|
* displayed (neutral tokens — both sets null — before the first message). A freshly-mounted view
|
||||||
|
* reads it alongside bannerCurrent so the strip paints the right colours immediately on mount.
|
||||||
|
*/
|
||||||
|
export function bannerCurrentColors(): BannerColors {
|
||||||
|
return currentColors;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* attachBannerHost connects a freshly-mounted view as the DOM host. It does NOT re-show the
|
* attachBannerHost connects a freshly-mounted view as the DOM host. It does NOT re-show the
|
||||||
* current message (the view renders it itself from bannerCurrent on mount): re-showing here would
|
* current message (the view renders it itself from bannerCurrent on mount): re-showing here would
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ export interface GatewayClient {
|
|||||||
* cosmetic seed for a brand-new account). */
|
* cosmetic seed for a brand-new account). */
|
||||||
authVK(params: string, displayName: string): Promise<Session>;
|
authVK(params: string, displayName: string): Promise<Session>;
|
||||||
authGuest(locale?: string): Promise<Session>;
|
authGuest(locale?: string): Promise<Session>;
|
||||||
authEmailRequest(email: string, language: string): Promise<void>;
|
authEmailRequest(email: string, language: string, pwa: boolean): Promise<void>;
|
||||||
authEmailLogin(email: string, code: string): Promise<Session>;
|
authEmailLogin(email: string, code: string): Promise<Session>;
|
||||||
/** Confirm a one-tap email deeplink token: a login returns a session to adopt; a
|
/** Confirm a one-tap email deeplink token: a login returns a session to adopt; a
|
||||||
* link returns a status ('confirmed' | 'merge_required'). */
|
* link returns a status ('confirmed' | 'merge_required'). */
|
||||||
|
|||||||
@@ -122,10 +122,11 @@ describe('codec', () => {
|
|||||||
expect(guest.browserTz()).toBe('-05:30');
|
expect(guest.browserTz()).toBe('-05:30');
|
||||||
|
|
||||||
const email = fb.EmailRequestRequest.getRootAsEmailRequestRequest(
|
const email = fb.EmailRequestRequest.getRootAsEmailRequestRequest(
|
||||||
new ByteBuffer(encodeEmailRequest('a@example.com', '+00:00', 'en')),
|
new ByteBuffer(encodeEmailRequest('a@example.com', '+00:00', 'en', true)),
|
||||||
);
|
);
|
||||||
expect(email.email()).toBe('a@example.com');
|
expect(email.email()).toBe('a@example.com');
|
||||||
expect(email.browserTz()).toBe('+00:00');
|
expect(email.browserTz()).toBe('+00:00');
|
||||||
|
expect(email.pwa()).toBe(true);
|
||||||
expect(email.language()).toBe('en');
|
expect(email.language()).toBe('en');
|
||||||
|
|
||||||
const confirm = fb.EmailConfirmLinkRequest.getRootAsEmailConfirmLinkRequest(
|
const confirm = fb.EmailConfirmLinkRequest.getRootAsEmailConfirmLinkRequest(
|
||||||
@@ -647,7 +648,10 @@ describe('codec', () => {
|
|||||||
const uid = b.createString('u-1');
|
const uid = b.createString('u-1');
|
||||||
const m0 = b.createString('promo-en');
|
const m0 = b.createString('promo-en');
|
||||||
const msgs = fb.BannerCampaign.createMessagesVector(b, [m0]);
|
const msgs = fb.BannerCampaign.createMessagesVector(b, [m0]);
|
||||||
const camp = fb.BannerCampaign.createBannerCampaign(b, 3, msgs);
|
fb.BannerCampaign.startBannerCampaign(b);
|
||||||
|
fb.BannerCampaign.addWeight(b, 3);
|
||||||
|
fb.BannerCampaign.addMessages(b, msgs);
|
||||||
|
const camp = fb.BannerCampaign.endBannerCampaign(b);
|
||||||
const camps = fb.BannerInfo.createCampaignsVector(b, [camp]);
|
const camps = fb.BannerInfo.createCampaignsVector(b, [camp]);
|
||||||
const banner = fb.BannerInfo.createBannerInfo(b, camps, 60000, 5000, 40, 1000, 250, 1000);
|
const banner = fb.BannerInfo.createBannerInfo(b, camps, 60000, 5000, 40, 1000, 250, 1000);
|
||||||
fb.Profile.startProfile(b);
|
fb.Profile.startProfile(b);
|
||||||
@@ -656,7 +660,8 @@ describe('codec', () => {
|
|||||||
b.finish(fb.Profile.endProfile(b));
|
b.finish(fb.Profile.endProfile(b));
|
||||||
|
|
||||||
const p = decodeProfile(b.asUint8Array());
|
const p = decodeProfile(b.asUint8Array());
|
||||||
expect(p.banner?.campaigns).toEqual([{ weight: 3, messages: ['promo-en'] }]);
|
// A plain campaign carries no override (both sets null → the neutral theme tokens).
|
||||||
|
expect(p.banner?.campaigns).toEqual([{ weight: 3, messages: ['promo-en'], overrideAll: null, overrideDark: null }]);
|
||||||
expect(p.banner?.timings).toEqual({
|
expect(p.banner?.timings).toEqual({
|
||||||
holdMs: 60000,
|
holdMs: 60000,
|
||||||
edgePauseMs: 5000,
|
edgePauseMs: 5000,
|
||||||
@@ -667,6 +672,26 @@ describe('codec', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('decodes a campaign colour override (both sets)', () => {
|
||||||
|
const b = new Builder(256);
|
||||||
|
const uid = b.createString('u-1');
|
||||||
|
const m0 = b.createString('branded');
|
||||||
|
const msgs = fb.BannerCampaign.createMessagesVector(b, [m0]);
|
||||||
|
const s = (v: string) => b.createString(v);
|
||||||
|
const [obg, ofg, ol, obgd, ofgd, old] = ['#aa0000', '#ffffff', '#ffdd00', '#330000', '#eeeeee', '#ffcc00'].map(s);
|
||||||
|
const camp = fb.BannerCampaign.createBannerCampaign(b, 1, msgs, obg, ofg, ol, obgd, ofgd, old);
|
||||||
|
const camps = fb.BannerInfo.createCampaignsVector(b, [camp]);
|
||||||
|
const banner = fb.BannerInfo.createBannerInfo(b, camps, 60000, 5000, 40, 1000, 250, 1000);
|
||||||
|
fb.Profile.startProfile(b);
|
||||||
|
fb.Profile.addUserId(b, uid);
|
||||||
|
fb.Profile.addBanner(b, banner);
|
||||||
|
b.finish(fb.Profile.endProfile(b));
|
||||||
|
|
||||||
|
const p = decodeProfile(b.asUint8Array());
|
||||||
|
expect(p.banner?.campaigns[0].overrideAll).toEqual({ bg: '#aa0000', fg: '#ffffff', link: '#ffdd00' });
|
||||||
|
expect(p.banner?.campaigns[0].overrideDark).toEqual({ bg: '#330000', fg: '#eeeeee', link: '#ffcc00' });
|
||||||
|
});
|
||||||
|
|
||||||
it('leaves the profile banner undefined when absent', () => {
|
it('leaves the profile banner undefined when absent', () => {
|
||||||
const b = new Builder(64);
|
const b = new Builder(64);
|
||||||
const uid = b.createString('u-1');
|
const uid = b.createString('u-1');
|
||||||
|
|||||||
+20
-2
@@ -19,6 +19,7 @@ import type {
|
|||||||
BestMoveTile,
|
BestMoveTile,
|
||||||
BlockStatus,
|
BlockStatus,
|
||||||
ChatMessage,
|
ChatMessage,
|
||||||
|
ColorTriple,
|
||||||
EvalResult,
|
EvalResult,
|
||||||
FeedbackState,
|
FeedbackState,
|
||||||
FriendCode,
|
FriendCode,
|
||||||
@@ -213,7 +214,12 @@ export function encodeGuestLogin(locale: string, browserTz: string): Uint8Array
|
|||||||
return finish(b, fb.GuestLoginRequest.endGuestLoginRequest(b));
|
return finish(b, fb.GuestLoginRequest.endGuestLoginRequest(b));
|
||||||
}
|
}
|
||||||
|
|
||||||
export function encodeEmailRequest(email: string, browserTz: string, language: string): Uint8Array {
|
export function encodeEmailRequest(
|
||||||
|
email: string,
|
||||||
|
browserTz: string,
|
||||||
|
language: string,
|
||||||
|
pwa: boolean,
|
||||||
|
): Uint8Array {
|
||||||
const b = new Builder(128);
|
const b = new Builder(128);
|
||||||
const e = b.createString(email);
|
const e = b.createString(email);
|
||||||
const tz = b.createString(browserTz);
|
const tz = b.createString(browserTz);
|
||||||
@@ -222,6 +228,7 @@ export function encodeEmailRequest(email: string, browserTz: string, language: s
|
|||||||
fb.EmailRequestRequest.addEmail(b, e);
|
fb.EmailRequestRequest.addEmail(b, e);
|
||||||
fb.EmailRequestRequest.addBrowserTz(b, tz);
|
fb.EmailRequestRequest.addBrowserTz(b, tz);
|
||||||
fb.EmailRequestRequest.addLanguage(b, l);
|
fb.EmailRequestRequest.addLanguage(b, l);
|
||||||
|
fb.EmailRequestRequest.addPwa(b, pwa);
|
||||||
return finish(b, fb.EmailRequestRequest.endEmailRequestRequest(b));
|
return finish(b, fb.EmailRequestRequest.endEmailRequestRequest(b));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -368,6 +375,12 @@ function decodeVariantPreferences(p: fb.Profile): Variant[] {
|
|||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// bannerTriple builds a colour override from the three wire fields, or null when the
|
||||||
|
// set is absent (any field empty/missing) — the strip then keeps the neutral tokens.
|
||||||
|
function bannerTriple(bg: string | null, fg: string | null, link: string | null): ColorTriple | null {
|
||||||
|
return bg && fg && link ? { bg, fg, link } : null;
|
||||||
|
}
|
||||||
|
|
||||||
// decodeBanner projects the optional advertising-banner block of a Profile, or
|
// decodeBanner projects the optional advertising-banner block of a Profile, or
|
||||||
// undefined when the viewer is not eligible (the field is absent).
|
// undefined when the viewer is not eligible (the field is absent).
|
||||||
function decodeBanner(p: fb.Profile): Banner | undefined {
|
function decodeBanner(p: fb.Profile): Banner | undefined {
|
||||||
@@ -379,7 +392,12 @@ function decodeBanner(p: fb.Profile): Banner | undefined {
|
|||||||
if (!c) continue;
|
if (!c) continue;
|
||||||
const messages: string[] = [];
|
const messages: string[] = [];
|
||||||
for (let j = 0; j < c.messagesLength(); j++) messages.push(c.messages(j));
|
for (let j = 0; j < c.messagesLength(); j++) messages.push(c.messages(j));
|
||||||
campaigns.push({ weight: c.weight(), messages });
|
campaigns.push({
|
||||||
|
weight: c.weight(),
|
||||||
|
messages,
|
||||||
|
overrideAll: bannerTriple(c.overrideBg(), c.overrideFg(), c.overrideLink()),
|
||||||
|
overrideDark: bannerTriple(c.overrideBgDark(), c.overrideFgDark(), c.overrideLinkDark()),
|
||||||
|
});
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
campaigns,
|
campaigns,
|
||||||
|
|||||||
@@ -39,6 +39,8 @@ if (isMock && typeof window !== 'undefined') {
|
|||||||
joinOpponentSilently(): void;
|
joinOpponentSilently(): void;
|
||||||
adminReply(): void;
|
adminReply(): void;
|
||||||
setGameLimit(v: boolean): void;
|
setGameLimit(v: boolean): void;
|
||||||
|
clearEmail(): void;
|
||||||
|
confirmEmailOutOfBand(email: string): void;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
).__mock = {
|
).__mock = {
|
||||||
@@ -46,5 +48,7 @@ if (isMock && typeof window !== 'undefined') {
|
|||||||
joinOpponentSilently: () => (gateway as MockGateway).joinPendingOpponentSilently(),
|
joinOpponentSilently: () => (gateway as MockGateway).joinPendingOpponentSilently(),
|
||||||
adminReply: () => (gateway as MockGateway).mockAdminReply(),
|
adminReply: () => (gateway as MockGateway).mockAdminReply(),
|
||||||
setGameLimit: (v: boolean) => (gateway as MockGateway).setGameLimit(v),
|
setGameLimit: (v: boolean) => (gateway as MockGateway).setGameLimit(v),
|
||||||
|
clearEmail: () => (gateway as MockGateway).mockClearEmail(),
|
||||||
|
confirmEmailOutOfBand: (email: string) => (gateway as MockGateway).mockConfirmEmailOutOfBand(email),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -234,6 +234,17 @@ export const en = {
|
|||||||
'landing.tagline': 'Play Scrabble with friends, random opponent or an AI.',
|
'landing.tagline': 'Play Scrabble with friends, random opponent or an AI.',
|
||||||
'landing.playTelegram': 'Play in Telegram',
|
'landing.playTelegram': 'Play in Telegram',
|
||||||
'landing.playVK': 'Play on VK',
|
'landing.playVK': 'Play on VK',
|
||||||
|
'landing.playWeb': 'Play in your browser',
|
||||||
|
'landing.captionTelegram': 'Telegram',
|
||||||
|
'landing.captionVK': 'VK',
|
||||||
|
'landing.captionWeb': 'Web',
|
||||||
|
|
||||||
|
'install.title': 'Install the app',
|
||||||
|
'install.subtitle': 'Put the app icon on your desktop (home screen) to open the game in one tap.',
|
||||||
|
'install.iosTitle': 'Add to Home Screen',
|
||||||
|
'install.iosStep1': 'Tap the Share button in the browser toolbar.',
|
||||||
|
'install.iosStep2': 'Choose “Add to Home Screen”.',
|
||||||
|
'install.iosStep3': 'Tap “Add”.',
|
||||||
|
|
||||||
'lang.en': 'English',
|
'lang.en': 'English',
|
||||||
'lang.ru': 'Русский',
|
'lang.ru': 'Русский',
|
||||||
|
|||||||
@@ -234,6 +234,17 @@ export const ru: Record<MessageKey, string> = {
|
|||||||
'landing.tagline': 'Играй в «Эрудита» с друзьями, случайным соперником или ИИ-роботом.',
|
'landing.tagline': 'Играй в «Эрудита» с друзьями, случайным соперником или ИИ-роботом.',
|
||||||
'landing.playTelegram': 'Играть в Telegram',
|
'landing.playTelegram': 'Играть в Telegram',
|
||||||
'landing.playVK': 'Играть во ВКонтакте',
|
'landing.playVK': 'Играть во ВКонтакте',
|
||||||
|
'landing.playWeb': 'Играть в браузере',
|
||||||
|
'landing.captionTelegram': 'Telegram',
|
||||||
|
'landing.captionVK': 'VK',
|
||||||
|
'landing.captionWeb': 'Веб-версия',
|
||||||
|
|
||||||
|
'install.title': 'Установить приложение',
|
||||||
|
'install.subtitle': 'Поместите иконку приложения на рабочий стол (домашний экран), чтобы открывать игру одним нажатием.',
|
||||||
|
'install.iosTitle': 'На экран «Домой»',
|
||||||
|
'install.iosStep1': 'Нажмите кнопку «Поделиться» на панели браузера.',
|
||||||
|
'install.iosStep2': 'Выберите «На экран „Домой“».',
|
||||||
|
'install.iosStep3': 'Нажмите «Добавить».',
|
||||||
|
|
||||||
'lang.en': 'English',
|
'lang.en': 'English',
|
||||||
'lang.ru': 'Русский',
|
'lang.ru': 'Русский',
|
||||||
|
|||||||
@@ -150,7 +150,7 @@ export class MockGateway implements GatewayClient {
|
|||||||
async authGuest(): Promise<Session> {
|
async authGuest(): Promise<Session> {
|
||||||
return { ...SESSION };
|
return { ...SESSION };
|
||||||
}
|
}
|
||||||
async authEmailRequest(_email: string, _language: string): Promise<void> {}
|
async authEmailRequest(_email: string, _language: string, _pwa: boolean): Promise<void> {}
|
||||||
async confirmEmailLink(_token: string): Promise<ConfirmLinkResult> {
|
async confirmEmailLink(_token: string): Promise<ConfirmLinkResult> {
|
||||||
return { purpose: 'link', status: 'confirmed', session: null };
|
return { purpose: 'link', status: 'confirmed', session: null };
|
||||||
}
|
}
|
||||||
@@ -659,6 +659,17 @@ export class MockGateway implements GatewayClient {
|
|||||||
this.profile.email = email;
|
this.profile.email = email;
|
||||||
return emptyLinked();
|
return emptyLinked();
|
||||||
}
|
}
|
||||||
|
// e2e hooks (window.__mock, see lib/gateway.ts): mockClearEmail drops the seeded email so the
|
||||||
|
// sign-in section offers the add-email flow; mockConfirmEmailOutOfBand attaches the address
|
||||||
|
// WITHOUT a live event — standing in for the one-tap confirm link opened in another browser,
|
||||||
|
// so the open code form must reflect it by polling the profile, not by a push.
|
||||||
|
mockClearEmail(): void {
|
||||||
|
this.profile.email = '';
|
||||||
|
this.emit({ kind: 'notify', sub: 'profile' });
|
||||||
|
}
|
||||||
|
mockConfirmEmailOutOfBand(email: string): void {
|
||||||
|
this.profile.email = email;
|
||||||
|
}
|
||||||
async linkEmailMerge(email: string, _code: string): Promise<LinkResult> {
|
async linkEmailMerge(email: string, _code: string): Promise<LinkResult> {
|
||||||
this.profile.isGuest = false;
|
this.profile.isGuest = false;
|
||||||
this.profile.email = email;
|
this.profile.email = email;
|
||||||
|
|||||||
@@ -169,12 +169,33 @@ export interface Banner {
|
|||||||
timings: BannerTimings;
|
timings: BannerTimings;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** ColorTriple is a banner colour override's three "#rrggbb" colours. */
|
||||||
|
export interface ColorTriple {
|
||||||
|
bg: string;
|
||||||
|
fg: string;
|
||||||
|
link: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* BannerColors is a campaign's optional palette: `all` overrides every theme, `dark`
|
||||||
|
* further overrides the dark theme (either may be null — the neutral tokens then apply).
|
||||||
|
* resolveBannerColors (lib/bannerColors) collapses it to the rendered theme's colours.
|
||||||
|
*/
|
||||||
|
export interface BannerColors {
|
||||||
|
all: ColorTriple | null;
|
||||||
|
dark: ColorTriple | null;
|
||||||
|
}
|
||||||
|
|
||||||
/** BannerCampaign is one campaign in the rotation feed. */
|
/** BannerCampaign is one campaign in the rotation feed. */
|
||||||
export interface BannerCampaign {
|
export interface BannerCampaign {
|
||||||
/** GCD-reduced show weight for the client's smooth weighted round-robin. */
|
/** GCD-reduced show weight for the client's smooth weighted round-robin. */
|
||||||
weight: number;
|
weight: number;
|
||||||
/** Messages in display order, already resolved to the viewer's bot language. */
|
/** Messages in display order, already resolved to the viewer's bot language. */
|
||||||
messages: string[];
|
messages: string[];
|
||||||
|
/** Colour override for every theme; null (or absent) keeps the neutral tokens. */
|
||||||
|
overrideAll?: ColorTriple | null;
|
||||||
|
/** Colour override for the dark theme only; null (or absent) falls back to overrideAll/tokens. */
|
||||||
|
overrideDark?: ColorTriple | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** BannerTimings are the global banner display timings (ms, except scrollPxPerSec). */
|
/** BannerTimings are the global banner display timings (ms, except scrollPxPerSec). */
|
||||||
|
|||||||
@@ -0,0 +1,88 @@
|
|||||||
|
// Reactive PWA install runtime: captures the Chromium install prompt, tracks the installed
|
||||||
|
// state, and registers the install-only service worker. The pure platform branching lives in
|
||||||
|
// pwa.ts. Structured after the other reactive lib modules (app.svelte.ts, router.svelte.ts).
|
||||||
|
|
||||||
|
import { isIosSafari, isStandalone, resolveInstallMode, type InstallMode } from './pwa';
|
||||||
|
import { insideTelegram } from './telegram';
|
||||||
|
import { insideVK } from './vk';
|
||||||
|
|
||||||
|
/** inMiniApp reports whether the app runs inside a Telegram or VK Mini App webview, where a web
|
||||||
|
* install makes no sense (the platform manages its own launcher). Kept here, out of the pure
|
||||||
|
* pwa.ts, so that module stays free of app imports for the node unit tests. */
|
||||||
|
function inMiniApp(): boolean {
|
||||||
|
return insideTelegram() || insideVK();
|
||||||
|
}
|
||||||
|
|
||||||
|
// beforeinstallprompt is a Chromium-only event, absent from the DOM lib types.
|
||||||
|
interface BeforeInstallPromptEvent extends Event {
|
||||||
|
readonly userChoice: Promise<{ outcome: 'accepted' | 'dismissed'; platform: string }>;
|
||||||
|
prompt(): Promise<void>;
|
||||||
|
}
|
||||||
|
declare global {
|
||||||
|
interface WindowEventMap {
|
||||||
|
beforeinstallprompt: BeforeInstallPromptEvent;
|
||||||
|
appinstalled: Event;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Not named `state` (a Svelte-check hazard: `$state` would then read as a store subscription).
|
||||||
|
const install = $state<{ deferred: BeforeInstallPromptEvent | null; installed: boolean }>({
|
||||||
|
deferred: null,
|
||||||
|
installed: isStandalone(),
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* installMode is the reactive install-CTA mode for the current platform and any captured prompt.
|
||||||
|
* Read inside a component's markup / $derived so the CTA updates when a Chromium prompt arrives
|
||||||
|
* (beforeinstallprompt fires shortly after load) or the app is installed.
|
||||||
|
*/
|
||||||
|
export function installMode(): InstallMode {
|
||||||
|
return resolveInstallMode({
|
||||||
|
deferredAvailable: install.deferred !== null,
|
||||||
|
standalone: install.installed,
|
||||||
|
iosSafari: isIosSafari(),
|
||||||
|
inMiniApp: inMiniApp(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* initInstallListeners wires the Chromium install prompt and the installed event. Harmless on
|
||||||
|
* any platform — the events fire only in an installable browser — so it may run unconditionally
|
||||||
|
* at startup, early enough to catch a prompt that fires before the CTA mounts.
|
||||||
|
*/
|
||||||
|
export function initInstallListeners(): void {
|
||||||
|
if (typeof window === 'undefined') return;
|
||||||
|
window.addEventListener('beforeinstallprompt', (e) => {
|
||||||
|
// Suppress Chromium's mini-infobar; the app presents its own CTA instead.
|
||||||
|
e.preventDefault();
|
||||||
|
install.deferred = e;
|
||||||
|
});
|
||||||
|
window.addEventListener('appinstalled', () => {
|
||||||
|
install.deferred = null;
|
||||||
|
install.installed = true;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* promptInstall shows the native Chromium install dialog. It MUST be called directly from a user
|
||||||
|
* gesture (the deferred prompt is gesture-gated — no await before it). A deferred prompt is
|
||||||
|
* single-use, so it is cleared here; a no-op when nothing was captured.
|
||||||
|
*/
|
||||||
|
export async function promptInstall(): Promise<void> {
|
||||||
|
const deferred = install.deferred;
|
||||||
|
if (!deferred) return;
|
||||||
|
install.deferred = null;
|
||||||
|
await deferred.prompt();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* registerServiceWorker registers the install-only worker (ui/public/sw.js). Web-only: skipped in
|
||||||
|
* the mock build (a real worker would perturb the Playwright run) and inside a Telegram/VK Mini
|
||||||
|
* App. Best-effort — a failed registration only means the app is not installable.
|
||||||
|
*/
|
||||||
|
export function registerServiceWorker(): void {
|
||||||
|
if (typeof navigator === 'undefined' || !('serviceWorker' in navigator)) return;
|
||||||
|
if (import.meta.env.MODE === 'mock') return;
|
||||||
|
if (inMiniApp()) return;
|
||||||
|
void navigator.serviceWorker.register('sw.js').catch(() => {});
|
||||||
|
}
|
||||||
@@ -0,0 +1,96 @@
|
|||||||
|
import { afterEach, describe, expect, it, vi } from 'vitest';
|
||||||
|
import { isIosSafari, isStandalone, resolveInstallMode } from './pwa';
|
||||||
|
|
||||||
|
describe('resolveInstallMode', () => {
|
||||||
|
const base = { deferredAvailable: false, standalone: false, iosSafari: false, inMiniApp: false };
|
||||||
|
|
||||||
|
it('hides inside a Mini App even with a captured prompt', () => {
|
||||||
|
expect(resolveInstallMode({ ...base, inMiniApp: true, deferredAvailable: true })).toBe('hidden');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('hides once the app is installed (standalone)', () => {
|
||||||
|
expect(resolveInstallMode({ ...base, standalone: true, deferredAvailable: true })).toBe('hidden');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('offers one-tap when a Chromium prompt was captured', () => {
|
||||||
|
expect(resolveInstallMode({ ...base, deferredAvailable: true })).toBe('oneTap');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('offers iOS instructions on iOS Safari without a prompt', () => {
|
||||||
|
expect(resolveInstallMode({ ...base, iosSafari: true })).toBe('iosInstructions');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('prefers one-tap over iOS instructions when both apply', () => {
|
||||||
|
expect(resolveInstallMode({ ...base, deferredAvailable: true, iosSafari: true })).toBe('oneTap');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('hides on an unsupported browser (no prompt, not iOS)', () => {
|
||||||
|
expect(resolveInstallMode(base)).toBe('hidden');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('isStandalone', () => {
|
||||||
|
afterEach(() => vi.unstubAllGlobals());
|
||||||
|
|
||||||
|
it('is true when the display-mode media query matches', () => {
|
||||||
|
vi.stubGlobal('window', {
|
||||||
|
matchMedia: (q: string) => ({ matches: q.includes('standalone') }),
|
||||||
|
navigator: {},
|
||||||
|
});
|
||||||
|
expect(isStandalone()).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('is true for the iOS navigator.standalone flag', () => {
|
||||||
|
vi.stubGlobal('window', {
|
||||||
|
matchMedia: () => ({ matches: false }),
|
||||||
|
navigator: { standalone: true },
|
||||||
|
});
|
||||||
|
expect(isStandalone()).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('is false in an ordinary browser tab', () => {
|
||||||
|
vi.stubGlobal('window', {
|
||||||
|
matchMedia: () => ({ matches: false }),
|
||||||
|
navigator: { standalone: false },
|
||||||
|
});
|
||||||
|
expect(isStandalone()).toBe(false);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('isIosSafari', () => {
|
||||||
|
afterEach(() => vi.unstubAllGlobals());
|
||||||
|
|
||||||
|
const IPHONE_SAFARI =
|
||||||
|
'Mozilla/5.0 (iPhone; CPU iPhone OS 17_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.0 Mobile/15E148 Safari/604.1';
|
||||||
|
const IPHONE_CHROME =
|
||||||
|
'Mozilla/5.0 (iPhone; CPU iPhone OS 17_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/120.0 Mobile/15E148 Safari/604.1';
|
||||||
|
const ANDROID_CHROME =
|
||||||
|
'Mozilla/5.0 (Linux; Android 13) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0 Mobile Safari/537.36';
|
||||||
|
const IPAD_SAFARI =
|
||||||
|
'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.0 Safari/605.1.15';
|
||||||
|
|
||||||
|
it('is true for Safari on iPhone', () => {
|
||||||
|
vi.stubGlobal('navigator', { userAgent: IPHONE_SAFARI, maxTouchPoints: 5 });
|
||||||
|
expect(isIosSafari()).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('is true for Safari on iPadOS (Mac UA + touch points)', () => {
|
||||||
|
vi.stubGlobal('navigator', { userAgent: IPAD_SAFARI, maxTouchPoints: 5 });
|
||||||
|
expect(isIosSafari()).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('is false for a desktop Mac (no touch points)', () => {
|
||||||
|
vi.stubGlobal('navigator', { userAgent: IPAD_SAFARI, maxTouchPoints: 0 });
|
||||||
|
expect(isIosSafari()).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('is false for Chrome on iOS (CriOS)', () => {
|
||||||
|
vi.stubGlobal('navigator', { userAgent: IPHONE_CHROME, maxTouchPoints: 5 });
|
||||||
|
expect(isIosSafari()).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('is false for Android Chrome', () => {
|
||||||
|
vi.stubGlobal('navigator', { userAgent: ANDROID_CHROME, maxTouchPoints: 5 });
|
||||||
|
expect(isIosSafari()).toBe(false);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,57 @@
|
|||||||
|
// Pure PWA install helpers, kept out of the Svelte layer (and free of app imports) so the
|
||||||
|
// platform branching is unit-testable in the node test env. The reactive runtime (the captured
|
||||||
|
// install prompt, the Mini-App gate, the service-worker registration) lives in pwa.svelte.ts.
|
||||||
|
|
||||||
|
/** InstallMode is how the install call-to-action resolves for the current platform. */
|
||||||
|
export type InstallMode = 'oneTap' | 'iosInstructions' | 'hidden';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* isStandalone reports whether the app is already running as an installed PWA — launched from
|
||||||
|
* the home screen / desktop rather than a browser tab. Both the standard display-mode media
|
||||||
|
* query and the iOS-only navigator.standalone flag are checked. Returns false with no window
|
||||||
|
* (e.g. under the unit tests).
|
||||||
|
*/
|
||||||
|
export function isStandalone(): boolean {
|
||||||
|
if (typeof window === 'undefined') return false;
|
||||||
|
const displayMode = window.matchMedia?.('(display-mode: standalone)').matches ?? false;
|
||||||
|
const iosStandalone =
|
||||||
|
(window.navigator as Navigator & { standalone?: boolean }).standalone === true;
|
||||||
|
return displayMode || iosStandalone;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* isIosSafari reports whether the app runs in Safari on iOS / iPadOS — the only browser there
|
||||||
|
* that can add a site to the home screen, and one with no programmatic install (it never fires
|
||||||
|
* beforeinstallprompt). In-app webviews (Telegram, VK) and the iOS Chrome/Firefox/Edge wrappers
|
||||||
|
* are excluded, as is desktop Safari. Used to switch the CTA to manual Share -> Add-to-Home-Screen
|
||||||
|
* instructions.
|
||||||
|
*/
|
||||||
|
export function isIosSafari(): boolean {
|
||||||
|
if (typeof navigator === 'undefined') return false;
|
||||||
|
const ua = navigator.userAgent;
|
||||||
|
// iPadOS 13+ reports a Mac UA but exposes touch points — catch that as iOS too.
|
||||||
|
const isIos =
|
||||||
|
/iPhone|iPod|iPad/.test(ua) || (/Macintosh/.test(ua) && (navigator.maxTouchPoints ?? 0) > 1);
|
||||||
|
if (!isIos) return false;
|
||||||
|
// Safari only: the iOS Chrome (CriOS), Firefox (FxiOS), Edge (EdgiOS), Opera (OPiOS) and the
|
||||||
|
// Google-app (GSA) wrappers all carry "Safari" but cannot add to the home screen from our CTA.
|
||||||
|
return /Safari/.test(ua) && !/CriOS|FxiOS|EdgiOS|OPiOS|GSA/.test(ua);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* resolveInstallMode chooses how the install CTA should behave from the platform facts:
|
||||||
|
* `deferredAvailable` — a beforeinstallprompt event was captured (Chromium one-tap); `standalone`
|
||||||
|
* — already installed; `iosSafari` — manual instructions apply; `inMiniApp` — running inside a
|
||||||
|
* Telegram/VK Mini App. The CTA is offered only on the plain web and never once installed.
|
||||||
|
*/
|
||||||
|
export function resolveInstallMode(facts: {
|
||||||
|
deferredAvailable: boolean;
|
||||||
|
standalone: boolean;
|
||||||
|
iosSafari: boolean;
|
||||||
|
inMiniApp: boolean;
|
||||||
|
}): InstallMode {
|
||||||
|
if (facts.inMiniApp || facts.standalone) return 'hidden';
|
||||||
|
if (facts.deferredAvailable) return 'oneTap';
|
||||||
|
if (facts.iosSafari) return 'iosInstructions';
|
||||||
|
return 'hidden';
|
||||||
|
}
|
||||||
@@ -118,8 +118,8 @@ export function createTransport(baseUrl: string): GatewayClient {
|
|||||||
async authGuest(locale) {
|
async authGuest(locale) {
|
||||||
return codec.decodeSession(await exec('auth.guest', codec.encodeGuestLogin(locale ?? '', browserOffset())));
|
return codec.decodeSession(await exec('auth.guest', codec.encodeGuestLogin(locale ?? '', browserOffset())));
|
||||||
},
|
},
|
||||||
async authEmailRequest(email, language) {
|
async authEmailRequest(email, language, pwa) {
|
||||||
await exec('auth.email.request', codec.encodeEmailRequest(email, browserOffset(), language));
|
await exec('auth.email.request', codec.encodeEmailRequest(email, browserOffset(), language, pwa));
|
||||||
},
|
},
|
||||||
async confirmEmailLink(token) {
|
async confirmEmailLink(token) {
|
||||||
return codec.decodeConfirmLinkResult(await exec('auth.email.confirm_link', codec.encodeEmailConfirmLink(token)));
|
return codec.decodeConfirmLinkResult(await exec('auth.email.confirm_link', codec.encodeEmailConfirmLink(token)));
|
||||||
|
|||||||
@@ -1,10 +1,15 @@
|
|||||||
import { mount } from 'svelte';
|
import { mount } from 'svelte';
|
||||||
import './app.css';
|
import './app.css';
|
||||||
import App from './App.svelte';
|
import App from './App.svelte';
|
||||||
|
import { initInstallListeners } from './lib/pwa.svelte';
|
||||||
|
|
||||||
// Pin the document for the game SPA (see app.css `html.app-shell`) so iOS/WKWebView — notably
|
// Pin the document for the game SPA (see app.css `html.app-shell`) so iOS/WKWebView — notably
|
||||||
// the Telegram Mini App — cannot rubber-band the whole page on a vertical drag. The standalone
|
// the Telegram Mini App — cannot rubber-band the whole page on a vertical drag. The standalone
|
||||||
// landing page (landing.ts) is a normal scrolling document and deliberately omits this class.
|
// landing page (landing.ts) is a normal scrolling document and deliberately omits this class.
|
||||||
document.documentElement.classList.add('app-shell');
|
document.documentElement.classList.add('app-shell');
|
||||||
|
|
||||||
|
// Capture the PWA install prompt as early as possible — before the install CTA mounts. Harmless
|
||||||
|
// where it never fires (Firefox, Safari, the Telegram/VK Mini App webviews).
|
||||||
|
initInstallListeners();
|
||||||
|
|
||||||
export default mount(App, { target: document.getElementById('app')! });
|
export default mount(App, { target: document.getElementById('app')! });
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { loginEmail, loginGuest, requestEmailCode } from '../lib/app.svelte';
|
import { loginEmail, loginGuest, requestEmailCode } from '../lib/app.svelte';
|
||||||
import { t } from '../lib/i18n/index.svelte';
|
import { t } from '../lib/i18n/index.svelte';
|
||||||
|
import InstallApp from '../components/InstallApp.svelte';
|
||||||
|
|
||||||
let email = $state('');
|
let email = $state('');
|
||||||
let code = $state('');
|
let code = $state('');
|
||||||
@@ -55,6 +56,9 @@
|
|||||||
</button>
|
</button>
|
||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
|
<!-- Web-only install call-to-action, under the login card. Renders nothing unless the app is
|
||||||
|
installable here (see components/InstallApp.svelte / lib/pwa). -->
|
||||||
|
<div class="promo"><InstallApp /></div>
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
@@ -62,8 +66,15 @@
|
|||||||
height: 100%;
|
height: 100%;
|
||||||
display: grid;
|
display: grid;
|
||||||
place-items: center;
|
place-items: center;
|
||||||
|
/* Centre the card + install promo as a group, with a gap between them. */
|
||||||
|
align-content: center;
|
||||||
|
gap: 16px;
|
||||||
padding: 16px;
|
padding: 16px;
|
||||||
}
|
}
|
||||||
|
/* Match the card width so the install CTA lines up under it. */
|
||||||
|
.promo {
|
||||||
|
width: min(94vw, 360px);
|
||||||
|
}
|
||||||
.card {
|
.card {
|
||||||
width: min(94vw, 360px);
|
width: min(94vw, 360px);
|
||||||
background: var(--surface);
|
background: var(--surface);
|
||||||
|
|||||||
@@ -7,13 +7,15 @@
|
|||||||
confirmDeleteAccount,
|
confirmDeleteAccount,
|
||||||
handleError,
|
handleError,
|
||||||
logout,
|
logout,
|
||||||
|
refreshProfile,
|
||||||
requestDeleteAccount,
|
requestDeleteAccount,
|
||||||
showToast,
|
showToast,
|
||||||
} from '../lib/app.svelte';
|
} from '../lib/app.svelte';
|
||||||
import { GatewayError } from '../lib/client';
|
import { GatewayError } from '../lib/client';
|
||||||
import { connection } from '../lib/connection.svelte';
|
import { connection } from '../lib/connection.svelte';
|
||||||
import { gateway } from '../lib/gateway';
|
import { gateway } from '../lib/gateway';
|
||||||
import { loginWidgetAvailable, requestTelegramLogin } from '../lib/telegram';
|
import { insideTelegram, loginWidgetAvailable, requestTelegramLogin } from '../lib/telegram';
|
||||||
|
import { insideVK } from '../lib/vk';
|
||||||
import { startVKLink, vkWebLinkAvailable } from '../lib/vkid';
|
import { startVKLink, vkWebLinkAvailable } from '../lib/vkid';
|
||||||
import { t } from '../lib/i18n/index.svelte';
|
import { t } from '../lib/i18n/index.svelte';
|
||||||
import {
|
import {
|
||||||
@@ -58,6 +60,11 @@
|
|||||||
let deletePhrase = $state('');
|
let deletePhrase = $state('');
|
||||||
const telegramLinkable = loginWidgetAvailable();
|
const telegramLinkable = loginWidgetAvailable();
|
||||||
const vkLinkable = vkWebLinkAvailable();
|
const vkLinkable = vkWebLinkAvailable();
|
||||||
|
// Inside a host Mini App the current platform's own identity must not be managed from the
|
||||||
|
// profile — unlinking the very platform you are signed in through is meaningless — so that
|
||||||
|
// provider's linked-account row is hidden here (the web / native builds still show both).
|
||||||
|
const hostTelegram = insideTelegram();
|
||||||
|
const hostVK = insideVK();
|
||||||
|
|
||||||
function defaultTz(): string {
|
function defaultTz(): string {
|
||||||
const b = browserOffset();
|
const b = browserOffset();
|
||||||
@@ -106,6 +113,27 @@
|
|||||||
);
|
);
|
||||||
const canUnlink = $derived(linkedCount >= 2);
|
const canUnlink = $derived(linkedCount >= 2);
|
||||||
|
|
||||||
|
// While an add-email confirmation is pending, the address may be confirmed out of band — the
|
||||||
|
// one-tap link in the email confirms in another browser/session. A backgrounded Mini App drops
|
||||||
|
// the single-shot live stream and misses the 'profile' event (there is no replay), so poll the
|
||||||
|
// profile as a fallback until the address lands; the live push still updates it instantly while
|
||||||
|
// the app stays foregrounded. Scoped to the add-email wait (a code sent, no email yet).
|
||||||
|
const awaitingEmailConfirm = $derived(emailSent && !app.profile?.email);
|
||||||
|
$effect(() => {
|
||||||
|
if (!awaitingEmailConfirm) return;
|
||||||
|
const poll = (): void => void refreshProfile();
|
||||||
|
const id = setInterval(poll, 4000);
|
||||||
|
// Re-check the moment the Mini App returns to the foreground, where the missed event landed.
|
||||||
|
const onVisible = (): void => {
|
||||||
|
if (document.visibilityState === 'visible') poll();
|
||||||
|
};
|
||||||
|
document.addEventListener('visibilitychange', onVisible);
|
||||||
|
return () => {
|
||||||
|
clearInterval(id);
|
||||||
|
document.removeEventListener('visibilitychange', onVisible);
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
// toggleVariant flips a variant in the preference set, refusing to remove the last one —
|
// toggleVariant flips a variant in the preference set, refusing to remove the last one —
|
||||||
// the player must allow themselves at least one variant.
|
// the player must allow themselves at least one variant.
|
||||||
function toggleVariant(id: Variant) {
|
function toggleVariant(id: Variant) {
|
||||||
@@ -392,8 +420,10 @@
|
|||||||
<!-- Sign-in methods: bind/change an email and link/unlink providers. A returning email
|
<!-- Sign-in methods: bind/change an email and link/unlink providers. A returning email
|
||||||
(add) triggers the merge dialog below. On the web an account can add Telegram via the
|
(add) triggers the merge dialog below. On the web an account can add Telegram via the
|
||||||
login widget or VK via VK ID web login (a full-page redirect); inside a Mini App the
|
login widget or VK via VK ID web login (a full-page redirect); inside a Mini App the
|
||||||
host provider is already linked. Email is never unlinked — it is changed. Unlink is
|
host provider is already linked, so its own row is hidden — the platform you are signed
|
||||||
offered only when another identity remains (the backend also refuses the last one). -->
|
in through cannot be unlinked from here (the other provider's row still shows). Email is
|
||||||
|
never unlinked — it is changed. Unlink is offered only when another identity remains
|
||||||
|
(the backend also refuses the last one). -->
|
||||||
<section class="accounts">
|
<section class="accounts">
|
||||||
<h3>{t('profile.accountsTitle')}</h3>
|
<h3>{t('profile.accountsTitle')}</h3>
|
||||||
|
|
||||||
@@ -440,7 +470,7 @@
|
|||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
{#if p.telegramLinked}
|
{#if p.telegramLinked && !hostTelegram}
|
||||||
<div class="acctrow">
|
<div class="acctrow">
|
||||||
<span class="prov"><img src="telegram-logo.svg" alt="" width="18" height="18" />Telegram</span>
|
<span class="prov"><img src="telegram-logo.svg" alt="" width="18" height="18" />Telegram</span>
|
||||||
{#if canUnlink}
|
{#if canUnlink}
|
||||||
@@ -453,7 +483,7 @@
|
|||||||
</button>
|
</button>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
{#if p.vkLinked}
|
{#if p.vkLinked && !hostVK}
|
||||||
<div class="acctrow">
|
<div class="acctrow">
|
||||||
<span class="prov"><img src="vk-logo.svg" alt="" width="18" height="18" />VK</span>
|
<span class="prov"><img src="vk-logo.svg" alt="" width="18" height="18" />VK</span>
|
||||||
{#if canUnlink}
|
{#if canUnlink}
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
import type { ThemePref } from '../lib/theme';
|
import type { ThemePref } from '../lib/theme';
|
||||||
import type { BoardLabelMode } from '../lib/boardlabels';
|
import type { BoardLabelMode } from '../lib/boardlabels';
|
||||||
import { insideTelegram } from '../lib/telegram';
|
import { insideTelegram } from '../lib/telegram';
|
||||||
|
import InstallApp from '../components/InstallApp.svelte';
|
||||||
|
|
||||||
const themes: ThemePref[] = ['auto', 'light', 'dark'];
|
const themes: ThemePref[] = ['auto', 'light', 'dark'];
|
||||||
const themeLabel: Record<ThemePref, MessageKey> = {
|
const themeLabel: Record<ThemePref, MessageKey> = {
|
||||||
@@ -73,6 +74,10 @@
|
|||||||
/>
|
/>
|
||||||
</label>
|
</label>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
<!-- Web-only install call-to-action at the bottom of Settings (renders nothing unless the app
|
||||||
|
is installable here — see components/InstallApp.svelte / lib/pwa). -->
|
||||||
|
<InstallApp />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
|
|||||||
Reference in New Issue
Block a user