diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..08d5934d --- /dev/null +++ b/.dockerignore @@ -0,0 +1,42 @@ +.git +.github +.codex-tmp +.gocache +.tdesktop-e2e +.vscode +.idea + +# Local builds, caches, and runtime state. +bin +dist +logs +tmp +coverage.* +*.exe +*.test +*.out +**/node_modules +**/__pycache__ +**/*.pyc + +# Deployment credentials stay out of the build context. The explicitly +# published test RSA fixture below is the only private-key exception. +.env +.env.* +**/.env +**/.env.* +codex.local +secrets +**/secrets +*.pem +*.key + +# Runtime data is excluded except for the tracked language-pack seed. +data/* +!data/langpack/ +!data/langpack/** + +# Deployment-local state and overrides. +deploy/docker/.env +deploy/docker/backups +deploy/docker/overrides diff --git a/.env.example b/.env.example index b6729d15..84a2921a 100644 --- a/.env.example +++ b/.env.example @@ -317,7 +317,7 @@ TELESRV_MTPROTO_RPC_MAX_INFLIGHT=32 TELESRV_MTPROTO_RPC_QUEUE_SIZE=64 TELESRV_MTPROTO_RPC_TIMEOUT=30s TELESRV_MTPROTO_RPC_GLOBAL_WORKERS=256 -TELESRV_MTPROTO_RPC_GLOBAL_MAX_TASKS=8192 +TELESRV_MTPROTO_RPC_GLOBAL_MAX_TASKS=32768 TELESRV_MTPROTO_RPC_GLOBAL_MAX_BYTES=536870912 # Metadata-only rpc_result receipt budgets: global >= auth >= session. ACK deletes immediately; # 331s is only the no-ACK horizon. Payloads live solely in the logical-session outbound budget. @@ -474,6 +474,10 @@ TELESRV_VERIFICATION_BOT_RATE_WINDOW=1m # rows. Interval must be positive; batch must be 1..500. TELESRV_VERIFICATION_NOTIFY_INTERVAL=15s TELESRV_VERIFICATION_NOTIFY_BATCH=50 +TELESRV_BROADCAST_WORKER_INTERVAL=3s +TELESRV_BROADCAST_WORKER_LEASE=30s +TELESRV_BROADCAST_MATERIALIZE_BATCH=200 +TELESRV_BROADCAST_DELIVERY_BATCH=50 # Applications one applicant may keep open at once; 0 disables the cap, maximum # is 50. TELESRV_VERIFICATION_MAX_ACTIVE_PER_USER=3 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..ef2c0c1e --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,130 @@ +name: Build and Release + +on: + workflow_dispatch: + push: + tags: + - 'v*' + +permissions: + contents: read + +concurrency: + group: build-${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: false + +jobs: + ci: + name: CI + uses: ./.github/workflows/ci.yml + + build: + name: Build ${{ matrix.goos }}/${{ matrix.goarch }} + runs-on: ubuntu-24.04 + timeout-minutes: 30 + + strategy: + fail-fast: false + matrix: + include: + - goos: linux + goarch: amd64 + - goos: linux + goarch: arm64 + - goos: windows + goarch: amd64 + - goos: windows + goarch: arm64 + + steps: + - name: Checkout + uses: actions/checkout@v7 + + - name: Set up Go + uses: actions/setup-go@v7 + with: + go-version-file: go.mod + cache-dependency-path: go.sum + + - name: Set up Node + uses: actions/setup-node@v6 + with: + node-version: '22' + cache: npm + cache-dependency-path: cmd/telesrv-admin/web/package-lock.json + + - name: Build admin web assets + working-directory: cmd/telesrv-admin/web + run: | + npm ci + npm run build + + - name: Download Go modules + run: go mod download + + - name: Build binaries + env: + CGO_ENABLED: '0' + GOOS: ${{ matrix.goos }} + GOARCH: ${{ matrix.goarch }} + run: | + mkdir -p dist + + suffix="" + if [ "${GOOS}" = "windows" ]; then + suffix=".exe" + fi + + go build \ + -trimpath \ + -ldflags="-s -w" \ + -o "dist/gramsrv-${GOOS}-${GOARCH}${suffix}" \ + ./cmd/telesrv + + go build \ + -trimpath \ + -ldflags="-s -w" \ + -o "dist/gramsrv-admin-${GOOS}-${GOARCH}${suffix}" \ + ./cmd/telesrv-admin + + - name: Upload build artifact + uses: actions/upload-artifact@v4 + with: + name: gramsrv-${{ matrix.goos }}-${{ matrix.goarch }} + path: dist/* + if-no-files-found: error + retention-days: 7 + + release: + name: Publish GitHub Release + needs: + - ci + - build + if: startsWith(github.ref, 'refs/tags/v') + runs-on: ubuntu-24.04 + timeout-minutes: 15 + + permissions: + contents: write + + steps: + - name: Download build artifacts + uses: actions/download-artifact@v4 + with: + pattern: gramsrv-* + path: dist + merge-multiple: true + + - name: Generate combined checksums + working-directory: dist + run: | + sha256sum gramsrv-* > SHA256SUMS + + - name: Publish GitHub Release + env: + GH_TOKEN: ${{ github.token }} + run: | + gh release create "${{ github.ref_name }}" \ + dist/* \ + --title "${{ github.ref_name }}" \ + --generate-notes diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..235c2dbb --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,180 @@ +name: CI + +on: + push: + branches: + - main + pull_request: + workflow_dispatch: + workflow_call: + +permissions: + contents: read + +concurrency: + group: ci-${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + go-test: + name: Go tests + runs-on: ubuntu-24.04 + timeout-minutes: 45 + + steps: + - name: Checkout + uses: actions/checkout@v7 + + - name: Set up Go + uses: actions/setup-go@v7 + with: + go-version-file: go.mod + cache-dependency-path: go.sum + + - name: Download Go modules + run: go mod download + + - name: Test + run: go test ./... -count=1 + + admin-web: + name: Admin web build + runs-on: ubuntu-24.04 + timeout-minutes: 15 + + steps: + - name: Checkout + uses: actions/checkout@v7 + + - name: Set up Node + uses: actions/setup-node@v6 + with: + node-version: '22' + cache: npm + cache-dependency-path: cmd/telesrv-admin/web/package-lock.json + + - name: Install dependencies + working-directory: cmd/telesrv-admin/web + run: npm ci + + - name: Build + working-directory: cmd/telesrv-admin/web + run: npm run build + + grammystore: + name: Grammy store bot + runs-on: ubuntu-24.04 + timeout-minutes: 15 + + steps: + - name: Checkout + uses: actions/checkout@v7 + + - name: Set up Node + uses: actions/setup-node@v6 + with: + node-version: '22' + cache: npm + cache-dependency-path: cmd/bots/grammystore/package-lock.json + + - name: Install dependencies + working-directory: cmd/bots/grammystore + run: npm ci + + - name: Check syntax + working-directory: cmd/bots/grammystore + run: npm run check + + - name: Test + working-directory: cmd/bots/grammystore + run: npm test + + docker-smoke: + name: Docker main topology smoke + runs-on: ubuntu-24.04 + timeout-minutes: 30 + + steps: + - name: Checkout + uses: actions/checkout@v7 + + - name: Generate isolated environment + run: ./scripts/new-docker-env.sh --advertise-ip 127.0.0.1 + + - name: Validate deployment inputs + run: | + docker compose version + sh -n scripts/new-docker-env.sh + bash -n scripts/start-docker.sh + sh -n deploy/docker/docker-entrypoint.sh + compose=(docker compose -p telesrv-main-ci --project-directory deploy/docker --env-file deploy/docker/.env -f deploy/docker/compose.yaml) + bridge=("${compose[@]}" -f deploy/docker/compose.bridge-network.yaml) + "${compose[@]}" config --quiet + "${compose[@]}" config --format json | python3 -c 'import json,sys; s=json.load(sys.stdin)["services"]; assert s["server"].get("network_mode") == "host"; assert s["admin"].get("network_mode") == "host"; assert len(s["server"].get("ports", [])) == 0; assert len(s["admin"].get("ports", [])) == 0; assert str(s["server"]["environment"]["TELESRV_TURN_RELAY_MAX_PORT"]) == "12999"' + "${bridge[@]}" config --quiet + "${bridge[@]}" config --format json | python3 -c 'import json,sys; c=json.load(sys.stdin); s=c["services"]; assert s["server"].get("network_mode") != "host"; assert s["admin"].get("network_mode") != "host"; assert len(s["server"].get("ports", [])) == 69; assert len(s["admin"].get("ports", [])) == 1; assert "admin_host_access" in s["admin"]["networks"]; assert not c["networks"]["admin_host_access"].get("internal", False); assert str(s["server"]["environment"]["TELESRV_TURN_RELAY_MAX_PORT"]) == "12563"' + + - name: Validate PowerShell launchers + shell: pwsh + run: | + $tokens = $null + $errors = $null + [void][System.Management.Automation.Language.Parser]::ParseFile("scripts/new-docker-env.ps1", [ref]$tokens, [ref]$errors) + if ($errors.Count -gt 0) { $errors | ForEach-Object { Write-Error $_ }; exit 1 } + $tokens = $null + $errors = $null + [void][System.Management.Automation.Language.Parser]::ParseFile("scripts/start-docker.ps1", [ref]$tokens, [ref]$errors) + if ($errors.Count -gt 0) { $errors | ForEach-Object { Write-Error $_ }; exit 1 } + + - name: Build application images + run: | + compose=(docker compose -p telesrv-main-ci --project-directory deploy/docker --env-file deploy/docker/.env -f deploy/docker/compose.yaml) + "${compose[@]}" build --pull server admin + + - name: Start and wait for readiness + run: docker compose -p telesrv-main-ci --project-directory deploy/docker --env-file deploy/docker/.env -f deploy/docker/compose.yaml up -d --no-build --wait --wait-timeout 600 + + - name: Verify runtime and media listeners + run: | + compose=(docker compose -p telesrv-main-ci --project-directory deploy/docker --env-file deploy/docker/.env -f deploy/docker/compose.yaml) + for service in server admin; do + container_id="$("${compose[@]}" ps --quiet "$service")" + test -n "$container_id" + test "$(docker inspect --format '{{.Config.User}}' "$container_id")" = "10001:10001" + test "$(docker inspect --format '{{.HostConfig.ReadonlyRootfs}}' "$container_id")" = "true" + test "$(docker inspect --format '{{json .HostConfig.CapDrop}}' "$container_id")" = '["ALL"]' + test "$(docker inspect --format '{{.HostConfig.PidsLimit}}' "$container_id")" = "1024" + test "$(docker inspect --format '{{json .HostConfig.SecurityOpt}}' "$container_id")" = '["no-new-privileges:true"]' + test "$(docker inspect --format '{{.HostConfig.NetworkMode}}' "$container_id")" = "host" + done + curl --fail --silent --show-error http://127.0.0.1:2401/healthz | grep -qx ok + curl --fail --silent --show-error http://127.0.0.1:2600/ >/dev/null + timeout 5 bash -c 'exec 3<>/dev/tcp/127.0.0.1/2400' + python3 - <<'PY' + import os + import socket + import struct + + transaction_id = os.urandom(12) + request = struct.pack("!HHI12s", 0x0001, 0, 0x2112A442, transaction_id) + with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as client: + client.settimeout(5) + client.sendto(request, ("127.0.0.1", 12400)) + response, _ = client.recvfrom(2048) + message_type, _, cookie = struct.unpack("!HHI", response[:8]) + assert message_type == 0x0101, hex(message_type) + assert cookie == 0x2112A442, hex(cookie) + assert response[8:20] == transaction_id + PY + server_logs="$("${compose[@]}" logs --no-color server)" + case "$server_logs" in *"sfu listening"*) ;; *) echo "Embedded SFU did not become ready" >&2; exit 1 ;; esac + case "$server_logs" in *"turn listening"*) ;; *) echo "Embedded TURN did not become ready" >&2; exit 1 ;; esac + case "$server_logs" in *"live stream rtmp ingest listening"*) ;; *) echo "RTMP listener did not become ready" >&2; exit 1 ;; esac + + - name: Show logs on failure + if: failure() + run: docker compose -p telesrv-main-ci --project-directory deploy/docker --env-file deploy/docker/.env -f deploy/docker/compose.yaml logs --no-color --tail 200 + + - name: Remove isolated stack + if: always() + run: docker compose -p telesrv-main-ci --project-directory deploy/docker --env-file deploy/docker/.env -f deploy/docker/compose.yaml down --volumes --remove-orphans diff --git a/.github/workflows/container-images.yml b/.github/workflows/container-images.yml new file mode 100644 index 00000000..748c97b3 --- /dev/null +++ b/.github/workflows/container-images.yml @@ -0,0 +1,76 @@ +name: Publish main container images (manual) + +on: + workflow_dispatch: + +permissions: + contents: read + packages: write + +concurrency: + group: containers-main-${{ github.ref }} + cancel-in-progress: true + +jobs: + publish: + name: Publish ${{ matrix.role }} + if: github.ref == 'refs/heads/main' + runs-on: ubuntu-24.04 + timeout-minutes: 45 + strategy: + fail-fast: false + matrix: + include: + - role: server + target: server-test + - role: admin + target: admin + + steps: + - name: Checkout + uses: actions/checkout@v7 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + + - name: Log in to GHCR + uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Generate image metadata + id: meta + uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 + with: + images: ghcr.io/${{ github.repository }}/${{ matrix.role }} + tags: | + type=raw,value=main + type=sha,prefix=sha- + + - name: Set build date + id: build + shell: bash + run: echo "date=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> "$GITHUB_OUTPUT" + + - name: Build and publish + uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4 + with: + context: . + file: Dockerfile + target: ${{ matrix.target }} + platforms: linux/amd64,linux/arm64 + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + build-args: | + VCS_REF=${{ github.sha }} + VCS_BRANCH=${{ github.ref_name }} + VCS_TREE_STATE=clean + BUILD_DATE=${{ steps.build.outputs.date }} + cache-from: type=gha,scope=main-${{ matrix.role }} + cache-to: type=gha,mode=max,scope=main-${{ matrix.role }} diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..62012f90 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,91 @@ +# syntax=docker/dockerfile:1.7 + +ARG GO_IMAGE=golang:1.25-alpine@sha256:1ae0735f00daffa3aaf1363a5184c0d2dc55c78e3db4ec70241cdac97bf84b59 +ARG ALPINE_IMAGE=alpine:3.22@sha256:14358309a308569c32bdc37e2e0e9694be33a9d99e68afb0f5ff33cc1f695dce + +FROM --platform=$BUILDPLATFORM ${GO_IMAGE} AS build-base + +ARG TARGETOS +ARG TARGETARCH + +RUN apk add --no-cache ca-certificates git +WORKDIR /src + +COPY go.mod go.sum ./ +RUN --mount=type=cache,target=/go/pkg/mod go mod download + +COPY cmd/ ./cmd/ +COPY deploy/ ./deploy/ +COPY internal/ ./internal/ + +ENV CGO_ENABLED=0 + +FROM build-base AS build-server +ARG VCS_REF=unknown +ARG VCS_BRANCH=unknown +ARG VCS_TREE_STATE=unknown +ARG BUILD_DATE=unknown +RUN --mount=type=cache,target=/go/pkg/mod \ + --mount=type=cache,target=/root/.cache/go-build \ + GOOS=${TARGETOS} GOARCH=${TARGETARCH} \ + go build -trimpath \ + -ldflags="-s -w -X main.gitCommit=${VCS_REF} -X main.gitBranch=${VCS_BRANCH} -X main.gitTreeState=${VCS_TREE_STATE} -X main.buildTime=${BUILD_DATE}" \ + -o /out/telesrv ./cmd/telesrv + +FROM build-base AS build-admin +RUN apk add --no-cache nodejs npm +WORKDIR /src/cmd/telesrv-admin/web +RUN --mount=type=cache,target=/root/.npm npm ci && npm run build +WORKDIR /src +RUN --mount=type=cache,target=/go/pkg/mod \ + --mount=type=cache,target=/root/.cache/go-build \ + GOOS=${TARGETOS} GOARCH=${TARGETARCH} \ + go build -trimpath -ldflags="-s -w" -o /out/telesrv-admin ./cmd/telesrv-admin + +FROM ${ALPINE_IMAGE} AS runtime-base + +ARG VCS_REF=unknown +ARG BUILD_DATE=unknown + +LABEL org.opencontainers.image.title="gramsrv" \ + org.opencontainers.image.description="Telegram-like MTProto server" \ + org.opencontainers.image.source="https://github.com/iamxvbaba/gramsrv" \ + org.opencontainers.image.revision="${VCS_REF}" \ + org.opencontainers.image.created="${BUILD_DATE}" + +RUN apk add --no-cache ca-certificates tzdata \ + && addgroup -S -g 10001 telesrv \ + && adduser -S -D -H -u 10001 -G telesrv telesrv \ + && install -d -o telesrv -g telesrv -m 0750 /app /var/lib/telesrv + +COPY --chmod=0555 deploy/docker/docker-entrypoint.sh /usr/local/bin/telesrv-container-entrypoint + +WORKDIR /app +USER 10001:10001 +ENTRYPOINT ["/usr/local/bin/telesrv-container-entrypoint"] + +FROM runtime-base AS server +USER root +RUN apk add --no-cache ffmpeg openssl \ + && install -d -o telesrv -g telesrv -m 0750 \ + /var/lib/telesrv/blobs \ + /var/lib/telesrv/blob-staging \ + /var/lib/telesrv/maptiles \ + /var/lib/telesrv/livestream +COPY --from=build-server /out/telesrv /usr/local/bin/telesrv +COPY --chown=telesrv:telesrv data/langpack/ /usr/share/telesrv/langpack/ +USER 10001:10001 +EXPOSE 2398 2400 2401 2599 12399/udp 12400/udp +CMD ["telesrv"] + +FROM server AS server-test +USER root +RUN install -d -o telesrv -g telesrv -m 0755 /usr/share/telesrv/keys +COPY --chown=telesrv:telesrv --chmod=0444 deploy/docker/assets/test-server-rsa.pub /usr/share/telesrv/keys/test-server-rsa.pub +COPY --chown=telesrv:telesrv --chmod=0444 deploy/docker/assets/test-server-rsa.pem.b64 /usr/share/telesrv/keys/test-server-rsa.pem.b64 +USER 10001:10001 + +FROM runtime-base AS admin +COPY --from=build-admin /out/telesrv-admin /usr/local/bin/telesrv-admin +EXPOSE 2600 +CMD ["telesrv-admin"] diff --git a/cmd/telesrv-admin/main.go b/cmd/telesrv-admin/main.go index 6332bb38..00057bb3 100644 --- a/cmd/telesrv-admin/main.go +++ b/cmd/telesrv-admin/main.go @@ -64,7 +64,7 @@ func run() error { } defer pool.Close() - hs := hoststats.NewPoller(cfg.BlobDir) + hs := hoststats.NewPoller(cfg.DiskStatsPath) go hs.Run(ctx, hostStatsPollInterval) srv, err := newServer(cfg, newReadStore(pool), hs) @@ -97,10 +97,10 @@ type uiConfig struct { Password string Token string SessionKey []byte - // BlobDir is the local blob-storage root, reused only to pick which - // filesystem the dashboard's disk-free reading statfs's -- irrelevant when - // TELESRV_BLOB_BACKEND=s3, where disk space isn't the storage constraint. - BlobDir string + // DiskStatsPath points the dashboard host-disk sampler at the local path + // that matters for the selected blob backend: permanent localfs storage or + // the S3 upload spool. + DiskStatsPath string // Permissions is the right set a panel session is issued with, from // TELESRV_ADMIN_UI_PERMISSIONS. The shipped default is the single wildcard // entry, so introducing the permission model never locks an operator out of a @@ -163,14 +163,21 @@ func loadConfig() (uiConfig, error) { Password: appCfg.AdminUIPassword, Token: appCfg.AdminUIToken, SessionKey: sum[:], + DiskStatsPath: dashboardDiskPath(appCfg), Permissions: appCfg.AdminUIPermissions, HideThirdPartyVerification: appCfg.HideThirdPartyVerification, - BlobDir: appCfg.BlobDir, IdentityDir: appCfg.IdentityDir, RepoRoot: repoRoot, }, nil } +func dashboardDiskPath(cfg config.Config) string { + if strings.EqualFold(strings.TrimSpace(cfg.BlobBackendKind), "s3") && strings.TrimSpace(cfg.BlobStagingDir) != "" { + return cfg.BlobStagingDir + } + return cfg.BlobDir +} + func adminAPIURL(addr string) string { addr = strings.TrimSpace(addr) if addr == "" { diff --git a/cmd/telesrv-admin/security.go b/cmd/telesrv-admin/security.go index 9282ad1f..7fdd504d 100644 --- a/cmd/telesrv-admin/security.go +++ b/cmd/telesrv-admin/security.go @@ -36,6 +36,8 @@ import ( // TELESRV_ADMIN_UI_PERMISSIONS and the ones the admin API enforces. const ( permissionAll = "*" + permissionPremiumManage = "premium.manage" + permissionBotTokenRead = "bots.token.read" permissionVerificationReview = "verification.review" permissionVerificationRevoke = "verification.revoke" // Third-party bot verification. Deliberately not implied by the official diff --git a/cmd/telesrv-admin/server.go b/cmd/telesrv-admin/server.go index 8589422e..953e2205 100644 --- a/cmd/telesrv-admin/server.go +++ b/cmd/telesrv-admin/server.go @@ -110,7 +110,7 @@ func (s *server) routes() http.Handler { mux.Handle("POST /api/actions/create-bot", s.requireAuthAPI(http.HandlerFunc(s.handleCreateBotAPI))) mux.Handle("POST /api/actions/create-broadcast", s.requireAuthAPI(http.HandlerFunc(s.handleCreateBroadcastAPI))) mux.Handle("POST /api/actions/delete-bot", s.requireAuthAPI(http.HandlerFunc(s.handleDeleteBotAPI))) - mux.Handle("POST /api/actions/export-bot-token", s.requireAuthAPI(http.HandlerFunc(s.handleExportBotTokenAPI))) + mux.Handle("POST /api/actions/export-bot-token", s.requireAuthAPI(s.requirePermission(permissionBotTokenRead, http.HandlerFunc(s.handleExportBotTokenAPI)))) mux.Handle("POST /api/actions/set-channel-verified", s.requireAuthAPI(http.HandlerFunc(s.handleSetChannelVerifiedAPI))) mux.Handle("POST /api/actions/revoke-sessions", s.requireAuthAPI(http.HandlerFunc(s.handleRevokeSessionsAPI))) mux.Handle("POST /api/actions/delete-messages", s.requireAuthAPI(http.HandlerFunc(s.handleDeleteMessagesAPI))) diff --git a/cmd/telesrv-admin/session_test.go b/cmd/telesrv-admin/session_test.go index 1ab68c69..872eebb7 100644 --- a/cmd/telesrv-admin/session_test.go +++ b/cmd/telesrv-admin/session_test.go @@ -144,6 +144,53 @@ func TestModerationReadAPIDisablesBrowserCaching(t *testing.T) { } } +func TestAuthorizationRowJSONPreservesInt64AsDecimalStrings(t *testing.T) { + const maxInt64 = int64(9223372036854775807) + raw, err := json.Marshal(AuthorizationRow{AuthKeyID: maxInt64, Hash: maxInt64}) + if err != nil { + t.Fatalf("marshal authorization row: %v", err) + } + var got map[string]any + if err := json.Unmarshal(raw, &got); err != nil { + t.Fatalf("unmarshal authorization row: %v", err) + } + for _, field := range []string{"AuthKeyID", "Hash"} { + if got[field] != "9223372036854775807" { + t.Fatalf("authorization %s = %#v, want exact decimal string", field, got[field]) + } + } +} + +func TestRevokeSessionsBFFForwardsExactAuthorizationHash(t *testing.T) { + const authorizationHash = int64(2361577175213625973) + var got admin.RevokeSessionsRequest + upstream := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + if r.URL.Path != "/v1/accounts/revoke-sessions" || r.Header.Get("Authorization") != "Bearer secret" { + t.Fatalf("upstream request path=%q authorization=%q", r.URL.Path, r.Header.Get("Authorization")) + } + if err := json.NewDecoder(r.Body).Decode(&got); err != nil { + t.Fatal(err) + } + _ = json.NewEncoder(w).Encode(admin.CommandResult{CommandID: got.CommandID, Status: "completed", DryRun: got.DryRun}) + })) + defer upstream.Close() + + srv := &server{cfg: uiConfig{AdminAPIURL: upstream.URL, AdminAPIToken: "secret"}} + req := httptest.NewRequest(http.MethodPost, "/api/actions/revoke-sessions", strings.NewReader(`{ + "reason":"precision regression","confirm":false,"user_id":1001, + "hash":"2361577175213625973" + }`)) + req = req.WithContext(context.WithValue(req.Context(), actorKey{}, "operator")) + rec := httptest.NewRecorder() + srv.handleRevokeSessionsAPI(rec, req) + if rec.Code != http.StatusOK { + t.Fatalf("status=%d body=%s", rec.Code, rec.Body.String()) + } + if got.Hash != authorizationHash || got.Actor != "operator" || !got.DryRun { + t.Fatalf("forwarded revoke request = %+v", got) + } +} + func TestMintCollectibleUsernameBFFForwardsActorAndTolerantScalars(t *testing.T) { const maxInt64 = int64(9223372036854775807) var got admin.MintCollectibleUsernameRequest diff --git a/cmd/telesrv-admin/web/dist/assets/index-hA2EpjuH.css b/cmd/telesrv-admin/web/dist/assets/index-0MvM-hpw.css similarity index 91% rename from cmd/telesrv-admin/web/dist/assets/index-hA2EpjuH.css rename to cmd/telesrv-admin/web/dist/assets/index-0MvM-hpw.css index d1a9712a..f13c9d40 100644 --- a/cmd/telesrv-admin/web/dist/assets/index-hA2EpjuH.css +++ b/cmd/telesrv-admin/web/dist/assets/index-0MvM-hpw.css @@ -1 +1 @@ -@font-face{font-family:Plus Jakarta Sans;font-style:normal;font-weight:400;font-display:swap;src:url(/fonts/plus-jakarta-sans-400.woff2)format("woff2")}@font-face{font-family:Plus Jakarta Sans;font-style:normal;font-weight:500;font-display:swap;src:url(/fonts/plus-jakarta-sans-500.woff2)format("woff2")}@font-face{font-family:Plus Jakarta Sans;font-style:normal;font-weight:600;font-display:swap;src:url(/fonts/plus-jakarta-sans-600.woff2)format("woff2")}@font-face{font-family:Plus Jakarta Sans;font-style:normal;font-weight:700;font-display:swap;src:url(/fonts/plus-jakarta-sans-700.woff2)format("woff2")}@font-face{font-family:Plus Jakarta Sans;font-style:normal;font-weight:800;font-display:swap;src:url(/fonts/plus-jakarta-sans-800.woff2)format("woff2")}:root{--lightningcss-light:initial;--lightningcss-dark: ;color-scheme:light;--bg:#f7f9fc;--bg-accent:#eef1f5;--panel:#fff;--panel-subtle:#f7f9fc;--panel-strong:#f1f5f9;--surface-soft:#f2f7fd;--overlay:#18222f6b;--topbar-bg:#fffffff0;--line:#e2e8f0;--line-strong:#cbd5e1;--heading:#101828;--text:#0f1720;--text-soft:#344054;--muted:#64748b;--muted-2:#94a3b8;--brand:#2563eb;--brand-strong:#1d4ed8;--brand-2:#38bdf8;--grad:linear-gradient(135deg, #38bdf8 0%, #2563eb 55%, #1e40af 100%);--brand-tint:#eaf2fd;--brand-tint-border:#c7dcf9;--brand-tint-text:#1e3a8a;--good:#167447;--good-tint:#eaf6ef;--good-border:#c1e1cf;--warn:#a15c07;--warn-tint:#fcf4e4;--warn-border:#e7d09e;--danger:#b42318;--danger-tint:#fcefec;--danger-border:#eecac3;--danger-text:#8f2f27;--purple:#6a4fa3;--purple-tint:#f4effb;--purple-border:#dcd0f0;--purple-text:#5a4590;--input-bg:#fff;--btn-bg:#fff;--btn-text:#29323d;--btn-hover:#f4f7fa;--switch-track:#c8d0d6;--code-bg:#1b2733;--code-text:#d6e3ef;--code-border:#2b3a49;--sidebar:#08080e;--sidebar-soft:#12121a;--sidebar-line:#222228;--sidebar-row:#17171f;--sidebar-text:#c6d0dc;--sidebar-muted:#8fa0b4;--sidebar-faint:#8492a6;--sidebar-heading:#fff;--focus:#2563eb29;--shadow:0 28px 70px -36px #05050859;--shadow-sm:0 2px 10px #1827380d;--shadow-brand:0 8px 22px #2563eb38;--hero-glow:#2563eb24;--hero-grid:#0505080a;--radius-xs:8px;--radius-sm:9px;--radius:11px;--radius-lg:14px}[data-theme=dark]{--lightningcss-light: ;--lightningcss-dark:initial;color-scheme:dark;--bg:#0f141a;--bg-accent:#131a22;--panel:#171f28;--panel-subtle:#1c2530;--panel-strong:#212c38;--surface-soft:#1a232d;--overlay:#05080c9e;--topbar-bg:#151c24db;--line:#29333f;--line-strong:#38434f;--heading:#eef3f8;--text:#d5dde6;--text-soft:#c2ccd6;--muted:#98a4b1;--muted-2:#6d7885;--brand:#5b9dff;--brand-strong:#7db4ff;--brand-2:#7cd1fb;--brand-tint:#142a4a;--brand-tint-border:#24466e;--brand-tint-text:#9dc3f5;--good:#47c281;--good-tint:#12301f;--good-border:#245639;--warn:#e0aa4d;--warn-tint:#322810;--warn-border:#574413;--danger:#e6695c;--danger-tint:#35201d;--danger-border:#5c332d;--danger-text:#f0a49b;--purple:#ac90e2;--purple-tint:#221b31;--purple-border:#3d3357;--purple-text:#c9b6ef;--input-bg:#131a22;--btn-bg:#1e2731;--btn-text:#dbe2ea;--btn-hover:#26313d;--switch-track:#3a454f;--code-bg:#0c1218;--code-text:#cdd9e5;--code-border:#232f3b;--sidebar:#10151b;--sidebar-soft:#1c242f;--sidebar-line:#262f3a;--sidebar-row:#161d25;--sidebar-text:#cbd4de;--sidebar-muted:#7c8794;--sidebar-faint:#6f7b88;--sidebar-heading:#f0f4f8;--focus:#5b9dff3d;--shadow:0 16px 40px #00000075;--shadow-sm:0 2px 12px #00000061;--shadow-brand:0 8px 22px #5b9dff42;--hero-glow:#5b9dff40;--hero-grid:#ffffff0a}*{box-sizing:border-box}html,body,#root{min-height:100%}body{color:var(--text);background:var(--bg);-webkit-font-smoothing:antialiased;text-rendering:optimizelegibility;margin:0;font:13px/1.45 Plus Jakarta Sans,ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,sans-serif;transition:background-color .2s,color .2s}button,input,select,textarea{font:inherit}a{color:inherit;text-decoration:none}.shell{grid-template-columns:232px minmax(0,1fr);min-height:100vh;display:grid}.sidebar{height:100vh;color:var(--sidebar-text);background:var(--sidebar);border-right:1px solid var(--sidebar-line);flex-direction:column;gap:16px;padding:18px 12px;display:flex;position:sticky;top:0;overflow-y:auto}.brand{align-items:center;gap:10px;min-height:42px;padding:0 4px;display:flex}.brand.compact{justify-content:center}.brand-mark{place-items:center;width:34px;height:34px;display:grid}.brand-mark img{object-fit:contain;width:100%;height:100%;display:block}.brand strong{font-size:14px;line-height:1.1;display:block}.brand small{color:var(--sidebar-muted);margin-top:3px;font-size:11px;display:block}.sidebar-label{color:var(--sidebar-faint);text-transform:uppercase;letter-spacing:.04em;padding:0 8px;font-size:11px;font-weight:700}.sidebar-build{text-transform:none;opacity:.7;font-family:SFMono-Regular,Consolas,Liberation Mono,monospace;font-weight:500}.nav-list,.nav-section{gap:4px;display:grid}.nav-section-toggle{width:100%;min-height:38px;color:var(--sidebar-muted);border-radius:var(--radius-sm);cursor:pointer;text-align:left;background:0 0;border:1px solid #0000;grid-template-columns:18px minmax(0,1fr) 16px;align-items:center;gap:9px;padding:0 10px;font-size:12px;font-weight:800;transition:color .14s,background-color .14s,border-color .14s;display:grid}.nav-section-toggle:hover,.nav-section.active .nav-section-toggle{color:var(--sidebar-heading);background:var(--sidebar-soft);border-color:#34404d}.nav-section-chevron{color:var(--sidebar-muted);justify-self:end;transition:transform .14s}.nav-section.open .nav-section-chevron{transform:rotate(180deg)}.nav-children{gap:4px;padding:2px 0 2px 18px;display:grid}.nav-item{min-height:38px;color:var(--sidebar-text);border-radius:var(--radius-sm);border:1px solid #0000;grid-template-columns:18px minmax(0,1fr);align-items:center;gap:9px;padding:0 10px;transition:color .14s,background-color .14s,border-color .14s;display:grid}.nav-dot{background:var(--sidebar-faint);border-radius:999px;justify-self:center;width:6px;height:6px}.nav-item:hover,.nav-item.active{color:var(--sidebar-heading);background:var(--sidebar-soft);border-color:#34404d}.nav-item.active .nav-dot{background:var(--brand)}.sidebar-status{gap:7px;margin-top:auto;display:grid}.runtime-row{min-height:32px;color:var(--sidebar-text);background:var(--sidebar-row);border-radius:var(--radius-sm);border:1px solid #27313c;grid-template-columns:18px minmax(0,1fr) auto;align-items:center;gap:7px;padding:0 8px;display:grid}.runtime-row strong{color:var(--sidebar-heading);font-size:11px}.workspace{min-width:0}.topbar{z-index:20;background:var(--topbar-bg);border-bottom:1px solid var(--line);-webkit-backdrop-filter:blur(12px);backdrop-filter:blur(12px);justify-content:space-between;align-items:center;gap:18px;min-height:66px;padding:12px 24px;display:flex;position:sticky;top:0}.topbar h1{color:var(--heading);margin:2px 0 0;font-size:20px;line-height:1.2}.topbar-actions,.page-actions,.section-action,.entity-badges,.row-actions,.modal-actions{flex-wrap:wrap;align-items:center;gap:8px;display:flex}.theme-toggle{width:34px;height:34px;color:var(--muted);background:var(--panel-subtle);border:1px solid var(--line);cursor:pointer;border-radius:999px;place-items:center;transition:color .16s,background-color .16s,border-color .16s;display:inline-grid}.theme-toggle:hover{color:var(--brand);border-color:var(--brand-tint-border);background:var(--brand-tint)}.theme-toggle:focus-visible{outline:2px solid var(--brand);outline-offset:2px}.actor-pill{min-height:30px;color:var(--text-soft);background:var(--panel-subtle);border:1px solid var(--line);border-radius:999px;align-items:center;padding:0 10px;display:inline-flex}.content{gap:16px;padding:18px 24px 30px;display:grid}.eyebrow{color:var(--muted);text-transform:uppercase;letter-spacing:.04em;font-size:11px;font-weight:800}.dashboard-layout,.stacked-sections{gap:14px;display:grid}.dashboard-section{gap:10px;display:grid}.dashboard-section-title{color:var(--heading);text-transform:uppercase;letter-spacing:.04em;align-items:baseline;gap:8px;font-size:13px;font-weight:800;display:flex}.dashboard-section-title span{color:var(--muted);text-transform:none;letter-spacing:normal;font-size:11px;font-weight:600}.dashboard-grid{grid-template-columns:repeat(auto-fill,minmax(190px,1fr));gap:10px;display:grid}.stat-tile{text-align:left;background:var(--panel);border:1px solid var(--line);border-radius:var(--radius);min-width:0;box-shadow:var(--shadow-sm);gap:8px;padding:14px;display:grid}button.stat-tile{cursor:pointer;font:inherit;color:inherit}a.stat-tile.clickable,button.stat-tile.clickable{transition:border-color .16s,box-shadow .16s,transform .16s}.stat-tile.clickable:hover{border-color:var(--brand-tint-border);box-shadow:var(--shadow);transform:translateY(-1px)}.stat-tile-head{justify-content:space-between;align-items:center;gap:8px;display:flex}.stat-tile-icon{width:30px;height:30px;color:var(--brand);background:var(--brand-tint);border:1px solid var(--brand-tint-border);border-radius:var(--radius-sm);flex:none;place-items:center;display:grid}.stat-tile.warn .stat-tile-icon{color:var(--warn);background:var(--warn-tint);border-color:var(--warn-border)}.stat-tile.danger .stat-tile-icon{color:var(--danger);background:var(--danger-tint);border-color:var(--danger-border)}.stat-tile.good .stat-tile-icon{color:var(--good);background:var(--good-tint);border-color:var(--good-border)}.stat-tile-open{color:var(--muted)}.stat-tile-value{color:var(--heading);font-size:24px;font-weight:800;line-height:1.1}.stat-tile.warn .stat-tile-value{color:var(--warn)}.stat-tile.danger .stat-tile-value{color:var(--danger)}.stat-tile-label{color:var(--text-soft);font-size:12px;font-weight:700}.stat-tile-sub{color:var(--muted);font-size:11px}.stat-tile-bar{background:var(--panel-subtle);border:1px solid var(--line);border-radius:999px;width:100%;height:5px;overflow:hidden}.stat-tile-bar>span{background:var(--brand-2);height:100%;display:block}.stat-tile.warn .stat-tile-bar>span{background:var(--warn)}.stat-tile.danger .stat-tile-bar>span{background:var(--danger)}.overview-band,.page-frame{background:var(--panel);border:1px solid var(--line);border-radius:var(--radius);min-width:0;box-shadow:var(--shadow-sm)}.overview-band{grid-template-columns:minmax(220px,1fr) minmax(420px,.9fr);align-items:center;gap:16px;padding:16px;display:grid}.overview-band h2,.page-title-row h2,.section-head h2,.modal h2{color:var(--heading);margin:0;font-size:18px;line-height:1.25}.overview-metrics,.metric-row{grid-template-columns:repeat(4,minmax(120px,1fr));gap:8px;display:grid}.overview-metrics{grid-template-columns:repeat(3,minmax(120px,1fr))}.status-item,.metric,.summary-item{background:var(--panel-subtle);border:1px solid var(--line);border-radius:var(--radius-sm);min-width:0;padding:10px}.status-item span,.metric span,.summary-item span{color:var(--muted);margin-bottom:6px;font-size:11px;display:block}.status-item strong,.metric strong,.summary-item strong{overflow-wrap:anywhere;color:var(--text);font-weight:800;display:block}.status-item.good,.metric.good{border-color:var(--good-border)}.status-item.warn,.metric.warn{border-color:var(--warn-border)}.metric.danger{border-color:var(--danger-border)}.command-grid{grid-template-columns:repeat(3,minmax(220px,1fr));gap:12px;display:grid}.launcher{background:var(--panel);border:1px solid var(--line);border-radius:var(--radius);min-height:94px;box-shadow:var(--shadow-sm);grid-template-columns:38px minmax(0,1fr) 18px;align-items:center;gap:12px;padding:14px;transition:border-color .16s,box-shadow .16s,transform .16s;display:grid}.launcher:hover{border-color:var(--brand-tint-border);box-shadow:var(--shadow);transform:translateY(-1px)}.launcher-icon{width:38px;height:38px;color:var(--brand);background:var(--brand-tint);border:1px solid var(--brand-tint-border);border-radius:var(--radius-sm);place-items:center;display:grid}.launcher-copy{gap:4px;display:grid}.launcher-copy strong{color:var(--heading);font-size:15px}.launcher-copy span{color:var(--muted)}.work-strip{grid-template-columns:repeat(4,minmax(160px,1fr));gap:8px;display:grid}.strip-item{min-height:38px;color:var(--text-soft);background:var(--panel);border:1px solid var(--line);border-radius:var(--radius-sm);align-items:center;gap:8px;padding:0 10px;display:flex}.page-frame{gap:14px;padding:14px;display:grid}.page-title-row{border-bottom:1px solid var(--line);justify-content:space-between;align-items:flex-start;gap:14px;padding-bottom:12px;display:flex}.query-panel{background:var(--panel-subtle);border:1px solid var(--line);border-radius:var(--radius-sm);padding:10px}.toolbar{flex-wrap:wrap;align-items:center;gap:8px;display:flex}.message-query input{width:150px}.message-selector-grid{grid-template-columns:repeat(2,minmax(280px,1fr));gap:10px;margin-bottom:10px;display:grid}.message-selector-grid.single{grid-template-columns:minmax(320px,620px)}.entity-picker{background:var(--panel);border:1px solid var(--line);border-radius:var(--radius-sm);gap:8px;min-width:0;padding:10px;display:grid}.picker-head{min-height:24px;color:var(--text-soft);justify-content:space-between;align-items:center;gap:8px;font-weight:800;display:flex}.selected-entity{min-height:40px;color:var(--brand-tint-text);background:var(--brand-tint);border:1px solid var(--brand-tint-border);border-radius:var(--radius-sm);grid-template-columns:18px minmax(0,1fr) auto;align-items:center;gap:8px;padding:7px 9px;display:grid}.selected-entity strong,.selected-entity span{text-overflow:ellipsis;white-space:nowrap;overflow:hidden}.selected-entity div{gap:2px;min-width:0;display:grid}.selected-entity div span{color:var(--brand-tint-text);opacity:.85;font-size:11px}.picker-search{background:var(--panel-subtle);border:1px solid var(--line-strong);border-radius:var(--radius-sm);grid-template-columns:18px minmax(0,1fr) auto;align-items:center;gap:7px;height:34px;padding:0 6px 0 9px;display:grid}.picker-search input{width:100%;height:30px;box-shadow:none;background:0 0;border:0;padding:0}.picker-results{border:1px solid var(--line);border-radius:var(--radius-sm);max-height:236px;display:grid;overflow:auto}.picker-row{min-height:36px;color:var(--text);background:var(--panel);border:0;border-bottom:1px solid var(--line);cursor:pointer;text-align:left;grid-template-columns:96px minmax(120px,1fr) minmax(120px,1fr) auto;align-items:center;gap:8px;padding:6px 8px;display:grid}.picker-row:last-child{border-bottom:0}.picker-row:hover,.picker-row.selected{background:var(--surface-soft)}.picker-row strong,.picker-row span{text-overflow:ellipsis;white-space:nowrap;min-width:0;overflow:hidden}.picker-empty,.picker-error{color:var(--muted);text-align:center;padding:9px}.picker-chip-list{flex-wrap:wrap;gap:6px;display:flex}.picker-chip{color:var(--brand-tint-text);background:var(--brand-tint);border:1px solid var(--brand-tint-border);border-radius:999px;align-items:center;gap:6px;padding:5px 8px;font-size:11px;font-weight:700;display:inline-flex}.picker-chip button{color:inherit;cursor:pointer;opacity:.75;background:0 0;border:0;align-items:center;padding:0;display:inline-flex}.picker-chip button:hover{opacity:1}.emoji-picker-row{grid-template-columns:36px minmax(140px,1fr) minmax(100px,1fr)}.emoji-picker-glyph{text-align:center;font-size:22px;line-height:1}.emoji-picker-anim{width:28px;height:28px}.emoji-picker-anim canvas{width:100%!important;height:100%!important}.picker-error{color:var(--danger);background:var(--danger-tint);border:1px solid var(--danger-border);border-radius:var(--radius-sm)}input,select,textarea{color:var(--text);background:var(--input-bg);border:1px solid var(--line-strong);border-radius:var(--radius-sm);outline:none;transition:border-color .14s,box-shadow .14s}input::placeholder,textarea::placeholder{color:var(--muted-2)}input,select{width:190px;height:34px;padding:0 10px}select{min-width:220px;height:34px;font:inherit;appearance:none;cursor:pointer;background-image:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='0 0 24 24' fill='none' stroke='%239aa4b2' stroke-width='2.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpolyline points='6 9 12 15 18 9'/%3E%3C/svg%3E");background-position:right 10px center;background-repeat:no-repeat;padding:0 30px 0 10px;font-weight:600}select:disabled{color:var(--muted-2);cursor:not-allowed}textarea{resize:vertical;width:100%;padding:9px 10px}input:focus,select:focus,textarea:focus{border-color:var(--brand);box-shadow:0 0 0 3px var(--focus)}.small-input{width:88px}.sort-order-editor{align-items:center;gap:6px;display:flex}.sort-order-editor .small-input{width:64px;height:32px}.sort-order-editor .title-input{width:160px}.field-inline{color:var(--muted);align-items:center;gap:6px;display:inline-flex}.field-inline span{font-size:11px;font-weight:700}.searchbox{width:min(380px,100%);height:34px;color:var(--text);background:var(--input-bg);border:1px solid var(--line-strong);border-radius:var(--radius-sm);align-items:center;gap:8px;padding:0 10px;display:inline-flex}.searchbox input{width:100%;height:30px;box-shadow:none;border:0;padding:0}.btn{min-height:34px;color:var(--btn-text);background:var(--btn-bg);border:1px solid var(--line-strong);border-radius:var(--radius-sm);cursor:pointer;white-space:nowrap;justify-content:center;align-items:center;gap:6px;padding:0 12px;transition:background-color .14s,border-color .14s,color .14s,box-shadow .14s;display:inline-flex}.btn:hover:not(:disabled){background:var(--btn-hover)}.btn:disabled{color:var(--muted-2);cursor:not-allowed}.btn.primary{color:#fff;background:var(--brand);border-color:var(--brand)}.btn.primary:hover:not(:disabled){background:var(--brand-strong);border-color:var(--brand-strong)}.btn.ghost{background:var(--panel-subtle)}.btn.danger{color:var(--danger);background:var(--danger-tint);border-color:var(--danger-border)}.btn.danger:hover:not(:disabled){background:var(--danger-tint);border-color:var(--danger)}.btn.warn{color:var(--warn);background:var(--warn-tint);border-color:var(--warn-border)}.btn.warn:hover:not(:disabled){background:var(--warn-tint);border-color:var(--warn)}.btn:disabled,.btn.primary:disabled,.btn.warn:disabled,.btn.danger:disabled{color:var(--muted-2);background:var(--panel-strong);border-color:var(--line);cursor:not-allowed}.btn.full{width:100%}.icon-text{gap:7px}.compact-btn{min-height:28px;padding:0 8px;font-size:12px}.row-link,.link-button{color:var(--brand-2);cursor:pointer;background:0 0;border:0;align-items:center;gap:4px;padding:0;display:inline-flex}.avatar-link{cursor:pointer;background:0 0;border:0;border-radius:999px;padding:0;line-height:0;display:block}.avatar-link:hover,.avatar-link:focus-visible{outline:2px solid var(--focus);outline-offset:2px}.table-wrap{background:var(--panel);border:1px solid var(--line);border-radius:var(--radius);width:100%;overflow-x:auto}.data-table{border-collapse:collapse;width:100%;font-size:12.5px}.data-table th,.data-table td{border-bottom:1px solid var(--line);text-align:left;vertical-align:middle;white-space:nowrap;height:38px;padding:7px 9px}.data-table th{z-index:0;color:var(--muted);background:var(--panel-strong);font-weight:800;position:sticky;top:0}.data-table tbody tr:hover{background:var(--panel-subtle)}.data-table tr:last-child td{border-bottom:0}.mono{font-family:SFMono-Regular,Consolas,Liberation Mono,monospace}.truncate{text-overflow:ellipsis;max-width:380px;overflow:hidden}.badge{min-height:22px;color:var(--muted);background:var(--panel-strong);border:1px solid var(--line-strong);white-space:nowrap;border-radius:999px;align-items:center;padding:1px 8px;display:inline-flex}.badge.good{color:var(--good);background:var(--good-tint);border-color:var(--good-border)}.badge.danger{color:var(--danger);background:var(--danger-tint);border-color:var(--danger-border)}.badge.warn{color:var(--warn);background:var(--warn-tint);border-color:var(--warn-border)}.empty-cell{color:var(--muted);text-align:center}.bot-create-fields{grid-template-columns:repeat(3,minmax(0,1fr));gap:12px;display:grid}.bot-create-fields .duration-field input{width:100%}.bot-create-actions{border-top:1px solid var(--line);justify-content:space-between;align-items:center;gap:14px;margin-top:14px;padding-top:14px;display:flex}.bot-create-note{color:var(--muted);font-size:12px;line-height:1.4}@media (width<=760px){.bot-create-fields{grid-template-columns:1fr}.bot-create-actions{flex-direction:column;align-items:stretch}}.split-layout{grid-template-columns:minmax(0,1fr) 330px;align-items:start;gap:14px;display:grid}.split-main,.split-side{min-width:0}.entity-head{background:var(--panel-subtle);border:1px solid var(--line);border-radius:var(--radius);justify-content:space-between;align-items:flex-start;gap:14px;padding:14px;display:flex}.entity-head-main{align-items:center;gap:14px;min-width:0;display:flex}.entity-head-main .avatar-photo-img,.entity-head-main .avatar-fallback{flex-shrink:0}.avatar-edit-slot{flex-shrink:0;position:relative}.avatar-edit-btn{width:24px;height:24px;color:var(--brand);background:var(--panel);border:1px solid var(--line-strong);border-radius:999px;padding:0;position:absolute;bottom:-4px;right:-4px;box-shadow:0 1px 3px #0003}.avatar-edit-btn:hover{background:var(--brand-tint);border-color:var(--brand)}.entity-title{color:var(--heading);font-size:20px;font-weight:800;line-height:1.25}.entity-subtitle{color:var(--muted);margin-top:4px}.summary-grid{grid-template-columns:repeat(4,minmax(150px,1fr));gap:8px;display:grid}.about-text{color:var(--text-soft);background:var(--panel-subtle);border:1px solid var(--line);border-radius:var(--radius);margin:0;padding:10px}.action-groups{grid-template-columns:repeat(3,minmax(0,1fr));gap:14px;display:grid}.action-groups>.section-block{flex-direction:column;display:flex}.action-groups>.section-block>.section-head{flex-shrink:0}.action-groups>.section-block>.card-body{flex-direction:column;flex:1;justify-content:center;gap:10px;display:flex}.section-block,.action-dock,.surface{background:var(--panel);border:1px solid var(--line);border-radius:var(--radius);min-width:0;box-shadow:var(--shadow-sm);padding:12px}.section-head{justify-content:space-between;align-items:flex-start;gap:12px;margin-bottom:10px;display:flex}.section-head p{color:var(--muted);margin:5px 0 0}.action-dock{gap:10px;display:grid;position:sticky;top:82px}.dock-title{color:var(--text-soft);border-bottom:1px solid var(--line);padding-bottom:4px;font-weight:800}.action-dock>.btn,.action-dock .action-stack .btn{justify-content:center;width:100%}.duration-field{gap:4px;display:grid}.duration-field span{color:var(--muted);font-size:11px;font-weight:800}.duration-field input,.duration-field select{width:100%}.action-stack{gap:10px;display:grid}.action-stack .btn,.action-dock>.btn{min-height:42px}.danger-zone{border-top:1px solid var(--line);flex-wrap:wrap;gap:8px;margin-top:10px;padding-top:10px;display:flex}.dock-title+.danger-zone{border-top:0;margin-top:0;padding-top:0}.authorization-block{gap:10px;display:grid}.authorization-table{table-layout:fixed;min-width:720px}.authorization-table th,.authorization-table td{height:46px}.device-text{text-overflow:ellipsis;max-width:260px;overflow:hidden}.device-actions-head{width:250px}.device-actions-cell{width:250px;min-width:250px}.device-actions{white-space:normal;grid-template-columns:repeat(2,minmax(110px,1fr));gap:6px;min-width:226px;display:grid}.device-actions .btn{justify-content:center;width:100%}.operation-row{grid-template-columns:repeat(2,minmax(280px,1fr));gap:10px;display:grid}.operation-box{background:var(--panel-subtle);border:1px solid var(--line);border-radius:var(--radius);flex-wrap:wrap;align-items:center;gap:8px;padding:10px;display:flex}.operation-title{width:100%;color:var(--heading);align-items:center;gap:6px;font-weight:800;display:flex}.checkline{color:var(--muted);align-items:center;gap:6px;display:inline-flex}.checkline input{width:auto;height:auto}.alert{color:var(--danger-text);background:var(--danger-tint);border:1px solid var(--danger-border);border-radius:var(--radius);align-items:flex-start;gap:8px;padding:9px 10px;display:flex}.json-block{max-height:520px;color:var(--code-text);background:var(--code-bg);border:1px solid var(--code-border);border-radius:var(--radius);margin:0;padding:12px;font-size:12px;overflow:auto}.raw-grid{grid-template-columns:repeat(2,minmax(0,1fr));gap:10px;display:grid}.loading-line{min-height:80px;color:var(--muted);place-items:center;display:grid}.empty-panel{min-height:92px;color:var(--muted);background:var(--panel-subtle);border:1px solid var(--line);border-radius:var(--radius);place-items:center;display:grid}.gift-metrics .metric{background:var(--panel-subtle);min-height:68px;padding:12px}.gift-metrics .metric strong{font-size:17px}.gift-file-icon{color:var(--brand);background:var(--brand-tint);border:1px solid var(--brand-tint-border);flex:none;place-items:center;display:grid}.gift-format-chips{flex-wrap:wrap;flex:none;justify-content:flex-end;gap:6px;display:flex}.gift-format-chips span{color:var(--brand-tint-text);background:var(--brand-tint);border:1px solid var(--brand-tint-border);letter-spacing:.02em;border-radius:999px;padding:4px 8px;font-size:10px;font-weight:800}.gift-list-summary{color:var(--muted);margin-left:auto;font-size:11px;font-weight:700}.gift-import-modal{width:min(860px,100%)}.gift-bulk-import-modal{width:min(480px,100%)}.gift-bulk-import-modal .command-body{gap:14px;padding:16px 18px;display:grid}.gift-import-modal-body{gap:14px}.gift-source-tabs{gap:8px;display:flex}.give-gift-summary{background:var(--panel-subtle);border:1px solid var(--line-strong);color:var(--text-soft);border-radius:12px;align-items:center;gap:11px;padding:11px 13px;display:flex}.give-gift-summary>svg{color:var(--brand);flex:none}.give-gift-summary strong{color:var(--text);font-size:13px;display:block}.give-gift-summary .mono{color:var(--muted);font-size:11px}.give-gift-tabs{background:var(--panel-subtle);border:1px solid var(--line-strong);border-radius:12px;gap:4px;width:100%;padding:4px;display:flex}.give-gift-tabs .btn{min-height:36px;box-shadow:none;color:var(--text-soft);background:0 0;border:1px solid #0000;border-radius:9px;flex:1 1 0;justify-content:center;transition:color .15s,background .15s,border-color .15s,box-shadow .15s}.give-gift-tabs .btn:not(.primary):hover{color:var(--brand);background:var(--brand-tint)}.give-gift-tabs .btn.primary{color:#fff;background:var(--brand);border-color:var(--brand);box-shadow:var(--shadow-brand)}.give-gift-upgrade-note{background:var(--brand-tint);border:1px solid var(--brand-tint-border);color:var(--text-soft);border-radius:10px;margin:0;padding:9px 12px;font-size:11px;font-weight:650;line-height:1.45}.give-gift-attrs{grid-template-columns:repeat(3,minmax(0,1fr));align-items:end}.give-gift-attrs select,.give-gift-attrs input{width:100%;min-width:0;height:38px;color:var(--text);background-color:var(--input-bg);border:1px solid var(--line);border-radius:var(--radius-sm);font:inherit;appearance:none;cursor:pointer;padding:0 32px 0 10px;font-size:12px;font-weight:600}.give-gift-attrs input{cursor:text;text-overflow:ellipsis;padding-right:10px}.give-gift-attrs select{background-image:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='0 0 24 24' fill='none' stroke='%239aa4b2' stroke-width='2.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpolyline points='6 9 12 15 18 9'/%3E%3C/svg%3E");background-position:right 11px center;background-repeat:no-repeat}.give-gift-attrs select:focus,.give-gift-attrs input:focus{border-color:var(--brand);box-shadow:0 0 0 3px var(--focus);outline:none}.give-gift-layout{grid-template-columns:minmax(220px,280px) minmax(0,1fr);align-items:start;gap:16px;display:grid}.give-gift-picker{align-content:start;gap:10px;display:grid}.give-gift-picker-head{align-items:center;gap:12px;display:flex}.give-gift-picker-head .searchbox{flex:auto}.give-gift-picker-list{background:var(--panel-subtle);border:1px solid var(--line);border-radius:var(--radius-lg);gap:8px;max-height:640px;padding:8px;display:grid;overflow-y:auto}.give-gift-option{text-align:left;min-width:0;color:var(--text);background:var(--panel);border:1px solid var(--line);border-radius:var(--radius);cursor:pointer;box-shadow:var(--shadow-sm);grid-template-columns:46px minmax(0,1fr) auto;align-items:center;gap:11px;padding:9px 11px;transition:border-color .15s,box-shadow .15s,transform .15s;display:grid}.give-gift-option:hover{border-color:var(--brand-tint-border);box-shadow:var(--shadow);transform:translateY(-1px)}.give-gift-option.selected{border-color:var(--brand);box-shadow:0 0 0 2px var(--focus), var(--shadow)}.give-gift-thumb{place-items:center;width:46px;height:46px;display:grid}.give-gift-thumb canvas{width:100%!important;height:100%!important}.give-gift-option-info{gap:3px;min-width:0;display:grid}.give-gift-option-info strong{text-overflow:ellipsis;white-space:nowrap;font-size:12px;overflow:hidden}.give-gift-option-info .mono{color:var(--muted);font-size:10px}.give-gift-option-price{white-space:nowrap;justify-self:end}.give-gift-panel{background:var(--panel);border:1px solid var(--line-strong);border-radius:var(--radius-lg);gap:12px;min-width:0;padding:16px;display:grid}.give-gift-form{gap:12px;min-width:0;display:grid}.give-gift-form-actions{flex-wrap:wrap;justify-content:flex-end;gap:10px;padding-top:4px;display:flex}.give-gift-empty-panel{color:var(--muted);text-align:center;place-items:center;gap:10px;padding:48px 20px;display:grid}.give-gift-empty-panel svg{color:var(--brand);opacity:.8}.official-gift-picker{gap:12px;min-width:0;display:grid}.official-gift-bulk-import{flex-wrap:wrap;align-items:center;gap:10px;display:flex}.gift-bulk-import-progress{align-items:center;gap:8px;min-width:180px;display:flex}.gift-bulk-import-progress-bar{background:#e3e8ef;border-radius:999px;flex:auto;width:120px;height:6px;overflow:hidden}.gift-bulk-import-progress-bar>div{background:var(--brand);border-radius:999px;height:100%;transition:width .2s}.gift-bulk-import-progress span{color:var(--muted);white-space:nowrap;font-size:11px;font-weight:700}.official-gift-tools{align-items:center;gap:12px;display:flex}.official-gift-tools .searchbox{width:100%}.official-gift-tools>span{color:var(--muted);flex:none;font-size:11px;font-weight:750}.official-gift-categories{flex-wrap:wrap;gap:7px;display:flex}.official-gift-categories button{min-height:32px;color:var(--text-soft);background:var(--panel-subtle);border:1px solid var(--line-strong);font:inherit;cursor:pointer;border-radius:999px;align-items:center;gap:7px;padding:5px 10px;font-size:11px;font-weight:800;transition:color .15s,background .15s,border-color .15s,box-shadow .15s;display:inline-flex}.official-gift-categories button:hover{color:var(--brand);border-color:var(--brand-tint-border)}.official-gift-categories button.active{color:#fff;background:var(--brand);border-color:var(--brand);box-shadow:var(--shadow-brand)}.official-gift-categories button span{min-width:20px;height:20px;color:inherit;background:#7d8c9b38;border-radius:999px;place-items:center;padding:0 5px;font-size:10px;display:grid}.official-gift-categories button.active span{color:var(--brand);background:#ffffffd9}.official-gift-list{border:1px solid var(--line);border-radius:var(--radius-lg);background:var(--panel-subtle);scrollbar-gutter:stable;grid-template-columns:repeat(2,minmax(0,1fr));gap:8px;min-height:126px;max-height:314px;padding:8px;display:grid;overflow:auto}.official-gift-option{text-align:left;min-width:0;color:var(--text);background:var(--panel);border:1px solid var(--line);border-radius:var(--radius);cursor:pointer;box-shadow:var(--shadow-sm);gap:8px;padding:11px 12px;transition:border-color .15s,box-shadow .15s,transform .15s;display:grid}.official-gift-option:hover{border-color:var(--brand-tint-border);box-shadow:var(--shadow);transform:translateY(-1px)}.official-gift-option.selected{border-color:var(--brand);box-shadow:0 0 0 2px var(--focus), var(--shadow)}.official-gift-option-head{grid-template-columns:minmax(0,1fr) auto;align-items:baseline;gap:8px;display:grid}.official-gift-option-head strong{text-overflow:ellipsis;white-space:nowrap;font-size:12px;overflow:hidden}.official-gift-option-head .mono{color:var(--muted);font-size:9px}.official-gift-option-meta{color:var(--muted);flex-wrap:wrap;gap:10px;font-size:10px;font-weight:700;display:flex}.official-gift-capabilities{flex-wrap:wrap;gap:5px;display:flex}.official-gift-capabilities>span{letter-spacing:.01em;border:1px solid #0000;border-radius:999px;padding:3px 7px;font-size:9px;font-weight:850}.official-gift-capabilities>span.yes{color:var(--good);background:var(--good-tint);border-color:var(--good-border)}.official-gift-capabilities>span.craft{color:var(--purple);background:var(--purple-tint);border-color:var(--purple-border)}.official-gift-capabilities>span.no{color:var(--muted);background:var(--panel-strong);border-color:var(--line-strong)}.official-gift-empty{min-height:108px;color:var(--muted);text-align:center;grid-column:1/-1;place-items:center;padding:20px;font-size:12px;display:grid}.official-gift-selected{border:1px solid var(--line);border-radius:var(--radius-lg);background:var(--surface-soft);grid-template-columns:108px minmax(0,1fr);align-items:center;gap:14px;padding:12px;display:grid}.official-gift-selected .gift-animation-shell{border-radius:12px;width:96px;height:96px;min-height:96px;overflow:hidden}.official-gift-selected .gift-animation{width:96px;height:96px}.official-gift-selected>div:last-child{gap:5px;min-width:0;display:grid}.official-gift-selected small{color:var(--muted)}.gift-import-note{color:var(--muted);justify-content:space-between;align-items:center;gap:12px;line-height:1.45;display:flex}.gift-file-picker{min-height:78px;color:var(--text);background:var(--panel);border:1px dashed var(--line-strong);border-radius:var(--radius);cursor:pointer;grid-template-columns:42px minmax(0,1fr) auto;align-items:center;gap:12px;padding:12px 14px;transition:border-color .16s,background .16s,box-shadow .16s;display:grid;position:relative}.gift-file-picker:hover,.gift-file-picker.has-file{background:var(--brand-tint);border-color:var(--brand);box-shadow:0 0 0 2px var(--focus)}.gift-file-picker.compact{grid-template-columns:minmax(0,1fr);min-height:44px;padding:8px 12px}.gift-file-picker input{opacity:0;pointer-events:none;width:1px;height:1px;position:absolute}.gift-file-icon{border-radius:var(--radius-sm);width:40px;height:40px}.gift-file-copy{gap:2px;min-width:0;display:grid}.gift-field-label{color:var(--muted);text-transform:uppercase;letter-spacing:.04em;font-size:10px;font-weight:800}.gift-file-copy strong{color:var(--heading);text-overflow:ellipsis;white-space:nowrap;font-size:13px;overflow:hidden}.gift-file-copy small{color:var(--muted);font-size:11px;font-weight:500}.gift-file-action{color:var(--brand);background:var(--brand-tint);border:1px solid var(--brand-tint-border);border-radius:var(--radius-sm);padding:7px 10px;font-size:11px;font-weight:800}.gif-catalog-preview{background:var(--panel-subtle);border:1px solid var(--line);border-radius:var(--radius-sm);place-items:center;max-height:220px;display:grid;overflow:hidden}.gif-catalog-preview img,.gif-catalog-preview video{object-fit:contain;max-width:100%;max-height:220px}.gift-fields-grid{grid-template-columns:minmax(200px,1.5fr) repeat(3,minmax(120px,1fr));gap:10px;display:grid}.gift-fields-grid label,.gift-reason-field{color:var(--muted);gap:6px;font-size:11px;font-weight:700;display:grid}.gift-fields-grid input,.gift-reason-field input{width:100%;min-width:0;height:38px;color:var(--text);background:var(--input-bg);border:1px solid var(--line);border-radius:var(--radius-sm);padding:0 10px}.gift-fields-grid input:focus,.gift-reason-field input:focus{border-color:var(--brand);box-shadow:0 0 0 3px var(--focus);outline:none}.gift-switch{color:var(--text-soft);cursor:pointer;align-items:center;gap:9px;font-size:12px;font-weight:700;display:inline-flex}.gift-switch input{opacity:0;width:1px;height:1px;position:absolute}.gift-switch-track{background:var(--switch-track);border-radius:999px;align-items:center;width:34px;height:19px;padding:2px;transition:background .16s;display:flex}.gift-switch-track span{background:#fff;border-radius:50%;width:15px;height:15px;transition:transform .16s;box-shadow:0 1px 3px #10182838}.gift-switch input:checked+.gift-switch-track{background:var(--brand)}.gift-switch input:checked+.gift-switch-track span{transform:translate(15px)}.gift-switch input:focus-visible+.gift-switch-track{outline:3px solid var(--focus);outline-offset:2px}.gift-validation{color:var(--code-text);background:var(--code-bg);border:1px solid var(--code-border);border-radius:var(--radius-sm);overflow:hidden}.gift-validation-head{color:var(--code-text);background:#ffffff09;border-bottom:1px solid #ffffff17;align-items:center;gap:9px;padding:10px 12px;display:flex}.gift-validation-head div{gap:2px;display:grid}.gift-validation-head span{color:var(--brand);font-size:10px}.gift-validation pre{max-height:180px;color:var(--code-text);margin:0;padding:11px 12px;font-size:11px;overflow:auto}.sticker-preview-modal{width:min(760px,100%)}.sticker-doc-grid{grid-template-columns:repeat(auto-fill,minmax(84px,1fr));gap:8px;max-height:420px;padding:2px;display:grid;overflow:auto}.sticker-doc-cell{aspect-ratio:1;background:var(--panel-strong);border:1px solid var(--line);border-radius:10px;place-items:center;display:grid;position:relative;overflow:hidden}.sticker-doc-canvas{width:100%;height:100%}.sticker-doc-canvas canvas{width:100%!important;height:100%!important}.sticker-doc-image{object-fit:contain;width:100%;height:100%}.sticker-doc-cell.list-thumb{flex:0 0 40px;width:40px}.sticker-list-thumb-empty{background:var(--panel-strong);border:1px solid var(--line);width:40px;height:40px;color:var(--muted);border-radius:9px;place-items:center;display:grid}.gif-catalog-thumb{object-fit:cover;background:var(--panel-strong);border:1px solid var(--line);border-radius:9px;width:40px;height:40px}.sticker-doc-grid-cell{gap:4px;display:grid}.sticker-doc-grid-cell .btn{justify-content:center;width:100%}.sticker-add-form{background:var(--panel-strong);border:1px solid var(--line);border-radius:10px;flex-wrap:wrap;align-items:center;gap:8px;margin-bottom:14px;padding:10px;display:flex}.sticker-add-form .gift-file-picker.compact{flex:220px;min-width:180px}.sticker-add-form .small-input{flex:0 140px}.sticker-add-form-error{color:var(--danger);flex-basis:100%;font-size:12px}.sticker-doc-error{color:var(--danger);text-align:center;place-items:center;padding:4px;font-size:9px;display:grid;position:absolute;inset:0}.gift-animation-shell{background:var(--surface-soft);place-items:center;min-height:210px;display:grid;position:relative}.gift-animation{width:200px;height:200px}.gift-animation canvas{width:100%!important;height:100%!important}.gift-play{width:30px;height:30px;color:var(--text);background:var(--panel);border:1px solid var(--line);border-radius:50%;place-items:center;display:grid;position:absolute;bottom:8px;right:8px}.gift-table-wrap{background:var(--panel)}.gift-table{min-width:1080px}.gift-table th:nth-child(2){width:74px}.gift-table td{vertical-align:middle}.gift-select-col{text-align:center;width:34px}.gift-select-col input{width:15px;height:15px}.avatar-col{width:44px}.muted-cell{color:var(--muted)}.avatar-photo-img,.avatar-fallback{object-fit:cover;border-radius:50%;display:block}.avatar-fallback{color:#fff;letter-spacing:-.02em;place-items:center;font-weight:800;display:grid}.gift-bulk-toolbar{background:var(--panel-strong);border:1px solid var(--line);border-radius:9px;align-items:center;gap:10px;margin-bottom:10px;padding:9px 12px;display:flex}.gift-bulk-count{color:var(--text);white-space:nowrap;font-size:12px;font-weight:700}.gift-bulk-reason{flex:1;min-width:160px}.gift-bulk-reason input{height:34px}.gift-bulk-error{color:var(--danger);font-size:11px;font-weight:700}.gift-page-size{color:var(--muted);white-space:nowrap;align-items:center;gap:6px;font-size:11px;font-weight:700;display:inline-flex}.gift-page-size select{height:30px;color:var(--text);background:var(--input-bg);border:1px solid var(--line);border-radius:var(--radius-sm);font:inherit;padding:0 8px;font-weight:700}.gift-pager{flex-wrap:wrap;justify-content:space-between;align-items:center;gap:12px;margin-top:10px;display:flex}.gift-pager-range{color:var(--muted);font-size:11px;font-weight:700}.gift-pager-controls{align-items:center;gap:10px;display:flex}.gift-pager-page{color:var(--text);white-space:nowrap;font-size:12px;font-weight:700}.gift-animation-shell.compact{border:1px solid var(--line);border-radius:var(--radius-sm);width:56px;min-height:56px;overflow:hidden}.gift-animation-shell.compact .gift-animation{width:54px;height:54px}.gift-animation-shell.compact .gift-play{width:20px;height:20px;bottom:3px;right:3px}.gift-row-disabled{opacity:.68}.gift-table-title,.gift-sort-order,.gift-source-size,.gift-convert-price{display:block}.gift-table-title{text-overflow:ellipsis;white-space:nowrap;max-width:220px;overflow:hidden}.gift-sort-order,.gift-source-size,.gift-convert-price{color:var(--muted);margin-top:3px;font-size:10px}.gift-table-price{color:var(--warn)}.gift-table-actions{align-items:center;gap:6px;display:flex}.collectible-button{color:var(--purple);background:var(--purple-tint);border-color:var(--purple-border)}.collectible-button:hover{background:var(--purple-tint);border-color:var(--purple)}.collectible-modal{width:min(1180px,100%);max-height:min(92vh,980px)}.collectible-modal .modal-head p{color:var(--muted);margin:4px 0 0;font-size:11px}.collectible-modal-body{background:var(--bg);gap:16px;padding:16px 18px 22px;overflow:auto}.collectible-loading{min-height:90px;color:var(--muted);justify-content:center;align-items:center;gap:8px;display:flex}.collectible-empty{color:var(--purple-text);background:var(--purple-tint);border:1px dashed var(--purple-border);border-radius:var(--radius);align-items:center;gap:12px;padding:16px;display:flex}.collectible-empty div,.collectible-definition-head>div:first-child,.collectible-section-head>div:first-child{gap:3px;display:grid}.collectible-empty span,.collectible-definition-head span,.collectible-section-head span{color:var(--muted);font-size:10px;font-weight:500}.collectible-active{background:var(--panel);border:1px solid var(--purple-border);border-radius:var(--radius);box-shadow:var(--shadow-sm);overflow:hidden}.collectible-active-head{background:var(--purple-tint);border-bottom:1px solid var(--purple-border);justify-content:space-between;align-items:center;gap:12px;padding:12px 14px;display:flex}.collectible-active-head>div{color:var(--purple-text);align-items:center;gap:9px;display:flex}.collectible-active-head>div>div{gap:2px;display:grid}.collectible-active-head span{color:var(--muted);font-size:10px}.collectible-active-grid{background:var(--line);grid-template-columns:repeat(auto-fill,minmax(145px,1fr));gap:1px;display:grid}.collectible-active-grid article{background:var(--panel);align-items:center;gap:9px;min-width:0;padding:9px 11px;display:flex}.collectible-active-grid article>div:last-child{gap:2px;min-width:0;display:grid}.collectible-active-grid article strong{text-overflow:ellipsis;white-space:nowrap;font-size:11px;overflow:hidden}.collectible-active-grid article span{color:var(--muted);font-size:9px}.collectible-definition{background:var(--panel);border:1px solid var(--line);border-radius:var(--radius);box-shadow:var(--shadow-sm);overflow:hidden}.collectible-definition-head{background:var(--panel-subtle);border-bottom:1px solid var(--line);justify-content:space-between;align-items:center;gap:12px;padding:14px 16px;display:flex}.collectible-main-fields{background:var(--panel-subtle);border-bottom:1px solid var(--line);padding:14px 16px}.collectible-section{border-bottom:1px solid var(--line);padding:14px 16px}.collectible-section:last-child{border-bottom:0}.collectible-section-head{justify-content:space-between;align-items:center;gap:12px;margin-bottom:10px;display:flex}.collectible-section-tools{align-items:center;gap:7px;display:flex}.collectible-rows{gap:7px;display:grid}.collectible-row{background:var(--panel-subtle);border:1px solid var(--line);border-radius:var(--radius-sm);align-items:end;gap:7px;padding:9px 9px 9px 36px;display:grid;position:relative}.collectible-row:hover{background:var(--panel);border-color:var(--line-strong);box-shadow:var(--shadow-sm)}.collectible-row.animated{grid-template-columns:minmax(120px,1.2fr) 90px 78px minmax(160px,1.4fr) 48px 30px}.collectible-row.backdrop{grid-template-columns:minmax(110px,1.2fr) 70px 80px 70px repeat(4,52px) 48px 30px}.collectible-row-index{width:27px;color:var(--purple-text);background:var(--purple-tint);border-right:1px solid var(--purple-border);border-radius:var(--radius-xs) 0 0 var(--radius-xs);place-items:center;font-size:10px;font-weight:800;display:grid;position:absolute;top:0;bottom:0;left:0}.collectible-row label{gap:4px;min-width:0;display:grid}.collectible-row label>span{color:var(--muted);text-transform:uppercase;letter-spacing:.025em;font-size:9px;font-weight:800}.collectible-row input:not([type=file]){width:100%;min-width:0;height:32px;color:var(--text);background:var(--input-bg);border:1px solid var(--line-strong);border-radius:var(--radius-sm);font:inherit;padding:0 8px;font-size:11px}.collectible-row input:focus{border-color:var(--purple);box-shadow:0 0 0 3px var(--purple-tint);outline:none}.collectible-file input{opacity:0;pointer-events:none;width:1px;height:1px;position:absolute}.collectible-file em{min-width:0;height:32px;color:var(--purple-text);background:var(--purple-tint);border:1px dashed var(--purple-border);border-radius:var(--radius-sm);text-overflow:ellipsis;white-space:nowrap;cursor:pointer;align-items:center;gap:5px;padding:0 8px;font-size:10px;font-style:normal;font-weight:700;display:flex;overflow:hidden}.collectible-inline-preview{width:42px;height:42px;color:var(--purple);background:var(--purple-tint);border:1px solid var(--purple-border);border-radius:var(--radius-sm);place-items:center;display:grid;overflow:hidden}.collectible-animation{width:100%;height:100%;overflow:hidden}.collectible-animation.compact{background:var(--purple-tint);border:1px solid var(--purple-border);border-radius:var(--radius-sm);flex:0 0 42px;place-items:center;width:42px;height:42px;display:grid}.collectible-animation canvas{width:100%!important;height:100%!important}.collectible-animation.failed{color:var(--danger);background:var(--danger-tint)}.collectible-animation.loading{color:var(--purple-text)}.collectible-file-error{color:var(--danger);grid-column:1/-1;font-size:10px}.collectible-color input{cursor:pointer;height:32px!important;padding:3px!important}.collectible-backdrop-preview{border-radius:var(--radius-sm);border:1px solid #2a1f472e;flex:0 0 42px;place-items:center;width:42px;height:42px;font-size:11px;font-weight:900;display:grid;box-shadow:inset 0 0 0 1px #fff3}.collectible-row .icon-btn{align-self:center}.collectible-row .icon-btn:disabled{opacity:.28}@media (width<=900px){.gift-fields-grid{grid-template-columns:repeat(2,minmax(0,1fr))}.give-gift-layout{grid-template-columns:1fr}.give-gift-picker-list{max-height:320px}.collectible-row.animated,.collectible-row.backdrop{grid-template-columns:repeat(2,minmax(0,1fr))}.collectible-inline-preview,.collectible-backdrop-preview,.collectible-row .icon-btn{place-self:center start}}@media (width<=620px){.gift-import-note{flex-direction:column;align-items:flex-start}.gift-format-chips{justify-content:flex-start}.gift-file-picker{grid-template-columns:40px minmax(0,1fr)}.gift-file-action{display:none}.gift-fields-grid{grid-template-columns:1fr}.gift-list-summary{width:100%;margin-left:0}.official-gift-tools{flex-direction:column;align-items:stretch}.official-gift-list{grid-template-columns:1fr;max-height:340px}.official-gift-selected{grid-template-columns:82px minmax(0,1fr)}.official-gift-selected .gift-animation-shell{width:72px;height:72px}.collectible-modal-body{padding:10px}.collectible-definition-head,.collectible-section-head{flex-direction:column;align-items:flex-start}.collectible-row.animated,.collectible-row.backdrop{grid-template-columns:1fr}.collectible-active-grid{grid-template-columns:1fr 1fr}}.attr-block{background:var(--panel-subtle);border:1px solid var(--line);border-radius:var(--radius-sm);gap:8px;padding:10px;display:grid}.attr-block+.attr-block{margin-top:10px}.attr-block .duration-field input,.duration-field select{width:100%}.attr-block .btn{justify-content:center;width:100%}.emoji-grid{grid-template-columns:repeat(auto-fill,minmax(150px,1fr));gap:10px;display:grid}.emoji-card{background:var(--panel);border:1px solid var(--line);border-radius:var(--radius);box-shadow:var(--shadow-sm);gap:8px;padding:12px;display:grid}.emoji-preview{background:var(--surface-soft);border:1px solid var(--line);border-radius:var(--radius-sm);place-items:center;height:88px;display:grid}.emoji-anim{width:80px;height:80px}.emoji-anim canvas{width:100%!important;height:100%!important}.emoji-glyph{font-size:46px;line-height:1}.emoji-meta{gap:4px;min-width:0;display:grid}.emoji-alt{font-size:18px;line-height:1.2}.emoji-id{width:100%;min-width:0;color:var(--text);background:var(--panel-subtle);border:1px solid var(--line);border-radius:var(--radius-sm);cursor:pointer;justify-content:space-between;align-items:center;gap:6px;padding:4px 8px;font-size:11px;display:flex}.emoji-id .mono{text-overflow:ellipsis;white-space:nowrap;flex:auto;min-width:0;overflow:hidden}.emoji-id svg{flex:none}.emoji-id:hover{border-color:var(--brand-tint-border);color:var(--brand)}.emoji-sub{color:var(--muted);text-overflow:ellipsis;white-space:nowrap;font-size:11px;overflow:hidden}.username-branch{margin:2px 0 0;padding:0;list-style:none}.username-branch li{color:var(--text-soft);padding-left:14px;font-size:12px;line-height:1.7;position:relative}.username-branch li:before{border-left:1px solid var(--line-strong,var(--line));border-bottom:1px solid var(--line-strong,var(--line));content:"";width:6px;height:11px;position:absolute;top:0;left:3px}.username-branch li.inactive{color:var(--muted)}.username-branch li.inactive span{text-decoration:line-through}.username-branch li em{text-transform:uppercase;letter-spacing:.04em;margin-left:6px;font-size:10px;font-style:normal;font-weight:800}.card-body{flex-direction:column;gap:12px;display:flex}.server-identity-fields{flex:auto;gap:8px;min-width:0;display:grid}.identity-card{width:100%}.identity-layout{align-items:flex-start;gap:24px;display:flex}.identity-layout .server-identity-fields{flex:auto;gap:12px}.identity-layout .form-field textarea{resize:vertical;min-height:92px}.identity-save-row .btn{justify-content:center;width:100%;min-height:40px}.server-icon-fallback{color:var(--muted);background:var(--panel-subtle);border:1px dashed var(--line-strong)}.env-groups{gap:8px;display:grid}.env-group{background:var(--panel);border:1px solid var(--line);border-radius:var(--radius);overflow:hidden}.env-group-toggle{background:var(--panel-subtle);cursor:pointer;text-align:left;border:none;justify-content:space-between;align-items:center;gap:10px;width:100%;padding:11px 14px;transition:background-color .14s;display:flex}.env-group-toggle:hover{background:var(--brand-tint)}.env-group-toggle-text{align-items:baseline;gap:8px;min-width:0;display:flex}.env-group-toggle-title{color:var(--heading);font-size:13px;font-weight:800}.env-group-toggle-count{color:var(--muted);flex-shrink:0;font-size:11px;font-weight:700}.env-group-chevron{color:var(--muted);flex-shrink:0;transition:transform .14s}.env-group.open .env-group-chevron{transform:rotate(180deg)}.env-group-body{border-top:1px solid var(--line);gap:12px;padding:14px;display:grid}.env-group-desc{color:var(--muted);margin:0;font-size:12px}.env-field .env-field-desc{color:var(--muted);text-transform:none;letter-spacing:normal;font-size:11px;font-weight:500}.env-save-row{margin-top:12px}.restart-overlay{width:min(440px,100%)}.restart-overlay-body{text-align:center;justify-items:center;gap:12px;padding:28px 20px;display:grid}.restart-overlay-body p{color:var(--text-soft);margin:0;font-weight:700}.restart-overlay-actions{justify-content:center}.tab-bar{background:var(--surface-soft);border:1px solid var(--line);border-radius:var(--radius);gap:4px;width:fit-content;margin-bottom:18px;padding:4px;display:flex}.tab-btn{appearance:none;color:var(--text-soft);border-radius:var(--radius-sm);cursor:pointer;background:0 0;border:none;padding:7px 16px;font-size:13px;font-weight:600;transition:background .15s,color .15s}.tab-btn:hover{color:var(--text)}.tab-btn.active{background:var(--panel);color:var(--text);box-shadow:0 1px 2px #00000014}.service-grid{grid-template-columns:repeat(auto-fill,minmax(220px,1fr));gap:10px;display:grid}.service-card{border:1px solid var(--line);border-radius:var(--radius);background:var(--panel);align-items:center;gap:10px;padding:12px 14px;display:flex}.service-card-icon{border-radius:var(--radius-sm);background:var(--surface-soft);width:34px;height:34px;color:var(--text-soft);flex:none;justify-content:center;align-items:center;display:flex}.service-card-body{flex:1;min-width:0}.service-card-name{color:var(--text);text-transform:capitalize;font-size:13px;font-weight:700}.service-card-detail{color:var(--muted);margin-top:1px;font-family:SFMono-Regular,Consolas,Liberation Mono,monospace;font-size:11.5px}.service-card-status{text-transform:capitalize;border-radius:999px;flex:none;align-items:center;gap:5px;padding:4px 9px;font-size:12px;font-weight:700;display:flex}.service-card.tone-good .service-card-icon{color:var(--good)}.service-card.tone-good .service-card-status{color:var(--good);background:var(--good-tint);border:1px solid var(--good-border)}.service-card.tone-warn .service-card-icon{color:var(--warn)}.service-card.tone-warn .service-card-status{color:var(--warn);background:var(--warn-tint);border:1px solid var(--warn-border)}.service-card.tone-danger .service-card-icon{color:var(--danger)}.service-card.tone-danger .service-card-status{color:var(--danger);background:var(--danger-tint);border:1px solid var(--danger-border)}.service-card.tone-idle .service-card-status{color:var(--muted);background:var(--surface-soft);border:1px solid var(--line)}.services-header-actions{align-items:center;gap:8px;display:flex}.modal-backdrop{z-index:10000;background:var(--overlay);-webkit-backdrop-filter:blur(2px);backdrop-filter:blur(2px);place-items:center;padding:24px;display:grid;position:fixed;inset:0}.modal{background:var(--panel);border:1px solid var(--line);border-radius:var(--radius-lg);width:min(760px,100%);max-height:min(820px,100vh - 48px);box-shadow:var(--shadow);padding:0;overflow:hidden}.command-modal{flex-direction:column;display:flex}.command-modal>.modal-head,.command-modal>.modal-actions{flex:none}.modal-head{border-bottom:1px solid var(--line);justify-content:space-between;align-items:flex-start;gap:12px;padding:16px 18px 12px;display:flex}.icon-btn{width:30px;height:30px;color:var(--text-soft);background:var(--panel-subtle);border:1px solid var(--line);border-radius:var(--radius-sm);cursor:pointer;place-items:center;transition:background-color .14s,border-color .14s,color .14s;display:grid}.icon-btn:hover{background:var(--btn-hover);border-color:var(--line-strong)}.command-steps{grid-template-columns:repeat(3,minmax(0,1fr));gap:8px;display:grid}.command-body{grid-auto-rows:max-content;gap:12px;min-height:0;padding:14px 18px;display:grid;overflow:auto}.mint-field-group{background:var(--panel-subtle);border:1px solid var(--line);border-radius:var(--radius);gap:8px;padding:12px;display:grid}.mint-field-group-label{color:var(--text-soft);text-transform:uppercase;letter-spacing:.04em;font-size:12px;font-weight:800}.command-step{min-height:38px;color:var(--muted);background:var(--panel-subtle);border:1px solid var(--line);border-radius:var(--radius-sm);align-items:center;gap:8px;padding:0 10px;display:flex}.command-step span{background:var(--panel);border:1px solid var(--line);border-radius:999px;place-items:center;width:20px;height:20px;font-size:11px;font-weight:800;display:grid}.command-step.active{color:var(--brand);border-color:var(--brand-tint-border)}.command-step.done{color:var(--good);border-color:var(--good-border)}.form-field{gap:6px;display:grid}.form-field span,.form-stack span{color:var(--text-soft);font-weight:800}.form-field input:disabled,.form-field textarea:disabled{opacity:.6;cursor:not-allowed}.command-preview{gap:8px;display:grid}.command-preview .json-block{max-height:150px}.preview-head,.result-title{color:var(--text-soft);align-items:center;gap:7px;font-weight:800;display:flex}.result-box{background:var(--panel-subtle);border:1px solid var(--line);border-radius:var(--radius);gap:8px;padding:10px;display:grid}.result-line{grid-template-columns:92px minmax(0,1fr);gap:8px;display:grid}.result-line span{color:var(--muted)}.result-line strong{overflow-wrap:anywhere}.result-message{color:var(--text-soft)}.secret-reveal{background:var(--warn-tint);border:1px solid var(--warn-border);border-radius:var(--radius);gap:6px;padding:10px;display:grid}.secret-reveal-label{color:var(--warn);font-size:12px;font-weight:800}.secret-reveal-row{align-items:center;gap:10px;display:flex}.secret-reveal-value{color:var(--text-soft);letter-spacing:.12em;background:var(--panel);border:1px solid var(--line);border-radius:var(--radius-sm);text-overflow:ellipsis;white-space:nowrap;flex:auto;padding:6px 10px;font-size:13px;overflow:hidden}.modal-actions{background:var(--panel);border-top:1px solid var(--line);justify-content:flex-end;padding:12px 18px}.login-page{background:var(--bg);background-image:radial-gradient(900px 480px at 50% -8%, var(--hero-glow) 0%, #0000 70%), linear-gradient(var(--hero-grid) 1px, transparent 1px), linear-gradient(90deg, var(--hero-grid) 1px, transparent 1px);background-size:auto,44px 44px,44px 44px;place-items:center;min-height:100vh;padding:24px;display:grid;position:relative;overflow:hidden}.login-page .bg-orbs{z-index:0;pointer-events:none;position:absolute;inset:-60px}.login-page .bg-orb{filter:blur(100px);pointer-events:none;border-radius:50%;position:absolute}.login-page .bg-orb--1{background:color-mix(in srgb, var(--brand-2) 40%, transparent);width:700px;height:700px;animation:20s ease-in-out infinite loginOrbFloat1;top:-15%;left:-10%}.login-page .bg-orb--2{background:color-mix(in srgb, var(--brand) 38%, transparent);width:600px;height:600px;animation:24s ease-in-out infinite loginOrbFloat2;top:25%;right:-15%}.login-page .bg-orb--3{background:color-mix(in srgb, var(--brand-2) 30%, transparent);width:500px;height:500px;animation:28s ease-in-out infinite loginOrbFloat3;bottom:-15%;left:30%}@keyframes loginOrbFloat1{0%,to{transform:translate(0)scale(1)}33%{transform:translate(60px,-40px)scale(1.08)}66%{transform:translate(-30px,30px)scale(.92)}}@keyframes loginOrbFloat2{0%,to{transform:translate(0)scale(1)}33%{transform:translate(-50px,-35px)scale(.93)}66%{transform:translate(45px,25px)scale(1.07)}}@keyframes loginOrbFloat3{0%,to{transform:translate(0)scale(1)}33%{transform:translate(40px,45px)scale(1.06)}66%{transform:translate(-55px,-25px)scale(.94)}}@media (width<=720px){.login-page .bg-orb{filter:blur(60px)}.login-page .bg-orb--1{width:350px;height:350px}.login-page .bg-orb--2{width:300px;height:300px}.login-page .bg-orb--3{width:250px;height:250px}}@media (prefers-reduced-motion:reduce){.login-page .bg-orb{animation:none}}.login-page .login-panel{z-index:1;position:relative}.login-panel{background:var(--panel);border:1px solid var(--line);border-radius:var(--radius-lg);width:min(420px,100%);box-shadow:var(--shadow);gap:18px;padding:22px;display:grid}.login-head{justify-content:space-between;align-items:center;gap:12px;display:flex}.login-head-actions{flex-wrap:wrap;justify-content:flex-end;align-items:center;gap:8px;display:flex}.login-chip{min-height:24px;color:var(--brand);background:var(--brand-tint);border:1px solid var(--brand-tint-border);border-radius:999px;align-items:center;padding:0 8px;font-size:12px;display:inline-flex}.login-copy h1{color:var(--heading);margin:0;font-size:22px}.login-copy p{color:var(--muted);margin:8px 0 0}.form-stack{gap:12px;display:grid}.form-stack label{gap:6px;display:grid}.form-stack input{width:100%}.boot-screen{background:var(--bg);align-content:center;place-items:center;gap:18px;min-height:100vh;display:grid}.loader-bar{background:var(--line-strong);border-radius:999px;width:180px;height:4px;overflow:hidden}.loader-bar:before{content:"";background:var(--brand);width:42%;height:100%;animation:1s ease-in-out infinite load;display:block}.spin{animation:.8s linear infinite spin}@keyframes load{0%{transform:translate(-120%)}to{transform:translate(260%)}}@keyframes spin{to{transform:rotate(360deg)}}@media (width<=1120px){.shell{grid-template-columns:1fr}.sidebar{height:auto;position:static}.nav-list{grid-template-columns:repeat(4,minmax(0,1fr))}.sidebar-status{display:none}.overview-band,.split-layout,.operation-row,.raw-grid,.message-selector-grid,.message-selector-grid.single{grid-template-columns:1fr}.action-dock{position:static}.action-groups{grid-template-columns:repeat(2,minmax(0,1fr))}}@media (width<=760px){.content,.topbar{padding-left:14px;padding-right:14px}.command-grid,.work-strip,.overview-metrics,.metric-row,.summary-grid,.command-steps,.action-groups{grid-template-columns:1fr}.sidebar{gap:12px;padding:14px}.nav-list{grid-template-columns:repeat(2,minmax(0,1fr))}.topbar,.page-title-row,.entity-head{flex-direction:column;align-items:flex-start}input,.searchbox{width:100%}.toolbar{align-items:stretch}.picker-row,.selected-entity{grid-template-columns:1fr}} +@font-face{font-family:Plus Jakarta Sans;font-style:normal;font-weight:400;font-display:swap;src:url(/fonts/plus-jakarta-sans-400.woff2)format("woff2")}@font-face{font-family:Plus Jakarta Sans;font-style:normal;font-weight:500;font-display:swap;src:url(/fonts/plus-jakarta-sans-500.woff2)format("woff2")}@font-face{font-family:Plus Jakarta Sans;font-style:normal;font-weight:600;font-display:swap;src:url(/fonts/plus-jakarta-sans-600.woff2)format("woff2")}@font-face{font-family:Plus Jakarta Sans;font-style:normal;font-weight:700;font-display:swap;src:url(/fonts/plus-jakarta-sans-700.woff2)format("woff2")}@font-face{font-family:Plus Jakarta Sans;font-style:normal;font-weight:800;font-display:swap;src:url(/fonts/plus-jakarta-sans-800.woff2)format("woff2")}:root{--lightningcss-light:initial;--lightningcss-dark: ;color-scheme:light;--bg:#f7f9fc;--bg-accent:#eef1f5;--panel:#fff;--panel-subtle:#f7f9fc;--panel-strong:#f1f5f9;--surface-soft:#f2f7fd;--overlay:#18222f6b;--topbar-bg:#fffffff0;--line:#e2e8f0;--line-strong:#cbd5e1;--heading:#101828;--text:#0f1720;--text-soft:#344054;--muted:#64748b;--muted-2:#94a3b8;--brand:#2563eb;--brand-strong:#1d4ed8;--brand-2:#38bdf8;--grad:linear-gradient(135deg, #38bdf8 0%, #2563eb 55%, #1e40af 100%);--brand-tint:#eaf2fd;--brand-tint-border:#c7dcf9;--brand-tint-text:#1e3a8a;--good:#167447;--good-tint:#eaf6ef;--good-border:#c1e1cf;--warn:#a15c07;--warn-tint:#fcf4e4;--warn-border:#e7d09e;--danger:#b42318;--danger-tint:#fcefec;--danger-border:#eecac3;--danger-text:#8f2f27;--purple:#6a4fa3;--purple-tint:#f4effb;--purple-border:#dcd0f0;--purple-text:#5a4590;--input-bg:#fff;--btn-bg:#fff;--btn-text:#29323d;--btn-hover:#f4f7fa;--switch-track:#c8d0d6;--code-bg:#1b2733;--code-text:#d6e3ef;--code-border:#2b3a49;--sidebar:#08080e;--sidebar-soft:#12121a;--sidebar-line:#222228;--sidebar-row:#17171f;--sidebar-text:#c6d0dc;--sidebar-muted:#8fa0b4;--sidebar-faint:#8492a6;--sidebar-heading:#fff;--focus:#2563eb29;--shadow:0 28px 70px -36px #05050859;--shadow-sm:0 2px 10px #1827380d;--shadow-brand:0 8px 22px #2563eb38;--hero-glow:#2563eb24;--hero-grid:#0505080a;--radius-xs:8px;--radius-sm:9px;--radius:11px;--radius-lg:14px}[data-theme=dark]{--lightningcss-light: ;--lightningcss-dark:initial;color-scheme:dark;--bg:#0f141a;--bg-accent:#131a22;--panel:#171f28;--panel-subtle:#1c2530;--panel-strong:#212c38;--surface-soft:#1a232d;--overlay:#05080c9e;--topbar-bg:#151c24db;--line:#29333f;--line-strong:#38434f;--heading:#eef3f8;--text:#d5dde6;--text-soft:#c2ccd6;--muted:#98a4b1;--muted-2:#6d7885;--brand:#5b9dff;--brand-strong:#7db4ff;--brand-2:#7cd1fb;--brand-tint:#142a4a;--brand-tint-border:#24466e;--brand-tint-text:#9dc3f5;--good:#47c281;--good-tint:#12301f;--good-border:#245639;--warn:#e0aa4d;--warn-tint:#322810;--warn-border:#574413;--danger:#e6695c;--danger-tint:#35201d;--danger-border:#5c332d;--danger-text:#f0a49b;--purple:#ac90e2;--purple-tint:#221b31;--purple-border:#3d3357;--purple-text:#c9b6ef;--input-bg:#131a22;--btn-bg:#1e2731;--btn-text:#dbe2ea;--btn-hover:#26313d;--switch-track:#3a454f;--code-bg:#0c1218;--code-text:#cdd9e5;--code-border:#232f3b;--sidebar:#10151b;--sidebar-soft:#1c242f;--sidebar-line:#262f3a;--sidebar-row:#161d25;--sidebar-text:#cbd4de;--sidebar-muted:#7c8794;--sidebar-faint:#6f7b88;--sidebar-heading:#f0f4f8;--focus:#5b9dff3d;--shadow:0 16px 40px #00000075;--shadow-sm:0 2px 12px #00000061;--shadow-brand:0 8px 22px #5b9dff42;--hero-glow:#5b9dff40;--hero-grid:#ffffff0a}*{box-sizing:border-box}html,body,#root{min-height:100%}body{color:var(--text);background:var(--bg);-webkit-font-smoothing:antialiased;text-rendering:optimizelegibility;margin:0;font:13px/1.45 Plus Jakarta Sans,ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,sans-serif;transition:background-color .2s,color .2s}button,input,select,textarea{font:inherit}a{color:inherit;text-decoration:none}.shell{grid-template-columns:232px minmax(0,1fr);min-height:100vh;display:grid}.sidebar{height:100vh;color:var(--sidebar-text);background:var(--sidebar);border-right:1px solid var(--sidebar-line);flex-direction:column;gap:16px;padding:18px 12px;display:flex;position:sticky;top:0;overflow-y:auto}.brand{align-items:center;gap:10px;min-height:42px;padding:0 4px;display:flex}.brand.compact{justify-content:center}.brand-mark{place-items:center;width:34px;height:34px;display:grid}.brand-mark img{object-fit:contain;width:100%;height:100%;display:block}.brand strong{font-size:14px;line-height:1.1;display:block}.brand small{color:var(--sidebar-muted);margin-top:3px;font-size:11px;display:block}.sidebar-label{color:var(--sidebar-faint);text-transform:uppercase;letter-spacing:.04em;padding:0 8px;font-size:11px;font-weight:700}.sidebar-build{text-transform:none;opacity:.7;font-family:SFMono-Regular,Consolas,Liberation Mono,monospace;font-weight:500}.nav-list,.nav-section{gap:4px;display:grid}.nav-section-toggle{width:100%;min-height:38px;color:var(--sidebar-muted);border-radius:var(--radius-sm);cursor:pointer;text-align:left;background:0 0;border:1px solid #0000;grid-template-columns:18px minmax(0,1fr) 16px;align-items:center;gap:9px;padding:0 10px;font-size:12px;font-weight:800;transition:color .14s,background-color .14s,border-color .14s;display:grid}.nav-section-toggle:hover,.nav-section.active .nav-section-toggle{color:var(--sidebar-heading);background:var(--sidebar-soft);border-color:#34404d}.nav-section-chevron{color:var(--sidebar-muted);justify-self:end;transition:transform .14s}.nav-section.open .nav-section-chevron{transform:rotate(180deg)}.nav-children{gap:4px;padding:2px 0 2px 18px;display:grid}.nav-item{min-height:38px;color:var(--sidebar-text);border-radius:var(--radius-sm);border:1px solid #0000;grid-template-columns:18px minmax(0,1fr);align-items:center;gap:9px;padding:0 10px;transition:color .14s,background-color .14s,border-color .14s;display:grid}.nav-dot{background:var(--sidebar-faint);border-radius:999px;justify-self:center;width:6px;height:6px}.nav-item:hover,.nav-item.active{color:var(--sidebar-heading);background:var(--sidebar-soft);border-color:#34404d}.nav-item.active .nav-dot{background:var(--brand)}.sidebar-status{gap:7px;margin-top:auto;display:grid}.runtime-row{min-height:32px;color:var(--sidebar-text);background:var(--sidebar-row);border-radius:var(--radius-sm);border:1px solid #27313c;grid-template-columns:18px minmax(0,1fr) auto;align-items:center;gap:7px;padding:0 8px;display:grid}.runtime-row strong{color:var(--sidebar-heading);font-size:11px}.workspace{min-width:0}.topbar{z-index:20;background:var(--topbar-bg);border-bottom:1px solid var(--line);-webkit-backdrop-filter:blur(12px);backdrop-filter:blur(12px);justify-content:space-between;align-items:center;gap:18px;min-height:66px;padding:12px 24px;display:flex;position:sticky;top:0}.topbar h1{color:var(--heading);margin:2px 0 0;font-size:20px;line-height:1.2}.topbar-actions,.page-actions,.section-action,.entity-badges,.row-actions,.modal-actions{flex-wrap:wrap;align-items:center;gap:8px;display:flex}.theme-toggle{width:34px;height:34px;color:var(--muted);background:var(--panel-subtle);border:1px solid var(--line);cursor:pointer;border-radius:999px;place-items:center;transition:color .16s,background-color .16s,border-color .16s;display:inline-grid}.theme-toggle:hover{color:var(--brand);border-color:var(--brand-tint-border);background:var(--brand-tint)}.theme-toggle:focus-visible{outline:2px solid var(--brand);outline-offset:2px}.actor-pill{min-height:30px;color:var(--text-soft);background:var(--panel-subtle);border:1px solid var(--line);border-radius:999px;align-items:center;padding:0 10px;display:inline-flex}.content{gap:16px;padding:18px 24px 30px;display:grid}.eyebrow{color:var(--muted);text-transform:uppercase;letter-spacing:.04em;font-size:11px;font-weight:800}.dashboard-layout,.stacked-sections{gap:14px;display:grid}.dashboard-section{gap:10px;display:grid}.dashboard-section-title{color:var(--heading);text-transform:uppercase;letter-spacing:.04em;align-items:baseline;gap:8px;font-size:13px;font-weight:800;display:flex}.dashboard-section-title span{color:var(--muted);text-transform:none;letter-spacing:normal;font-size:11px;font-weight:600}.dashboard-grid{grid-template-columns:repeat(auto-fill,minmax(190px,1fr));gap:10px;display:grid}.stat-tile{text-align:left;background:var(--panel);border:1px solid var(--line);border-radius:var(--radius);min-width:0;box-shadow:var(--shadow-sm);gap:8px;padding:14px;display:grid}button.stat-tile{cursor:pointer;font:inherit;color:inherit}a.stat-tile.clickable,button.stat-tile.clickable{transition:border-color .16s,box-shadow .16s,transform .16s}.stat-tile.clickable:hover{border-color:var(--brand-tint-border);box-shadow:var(--shadow);transform:translateY(-1px)}.stat-tile-head{justify-content:space-between;align-items:center;gap:8px;display:flex}.stat-tile-icon{width:30px;height:30px;color:var(--brand);background:var(--brand-tint);border:1px solid var(--brand-tint-border);border-radius:var(--radius-sm);flex:none;place-items:center;display:grid}.stat-tile.warn .stat-tile-icon{color:var(--warn);background:var(--warn-tint);border-color:var(--warn-border)}.stat-tile.danger .stat-tile-icon{color:var(--danger);background:var(--danger-tint);border-color:var(--danger-border)}.stat-tile.good .stat-tile-icon{color:var(--good);background:var(--good-tint);border-color:var(--good-border)}.stat-tile-open{color:var(--muted)}.stat-tile-value{color:var(--heading);font-size:24px;font-weight:800;line-height:1.1}.stat-tile.warn .stat-tile-value{color:var(--warn)}.stat-tile.danger .stat-tile-value{color:var(--danger)}.stat-tile-label{color:var(--text-soft);font-size:12px;font-weight:700}.stat-tile-sub{color:var(--muted);font-size:11px}.stat-tile-bar{background:var(--panel-subtle);border:1px solid var(--line);border-radius:999px;width:100%;height:5px;overflow:hidden}.stat-tile-bar>span{background:var(--brand-2);height:100%;display:block}.stat-tile.warn .stat-tile-bar>span{background:var(--warn)}.stat-tile.danger .stat-tile-bar>span{background:var(--danger)}.overview-band,.page-frame{background:var(--panel);border:1px solid var(--line);border-radius:var(--radius);min-width:0;box-shadow:var(--shadow-sm)}.overview-band{grid-template-columns:minmax(220px,1fr) minmax(420px,.9fr);align-items:center;gap:16px;padding:16px;display:grid}.overview-band h2,.page-title-row h2,.section-head h2,.modal h2{color:var(--heading);margin:0;font-size:18px;line-height:1.25}.overview-metrics,.metric-row{grid-template-columns:repeat(4,minmax(120px,1fr));gap:8px;display:grid}.overview-metrics{grid-template-columns:repeat(3,minmax(120px,1fr))}.status-item,.metric,.summary-item{background:var(--panel-subtle);border:1px solid var(--line);border-radius:var(--radius-sm);min-width:0;padding:10px}.status-item span,.metric span,.summary-item span{color:var(--muted);margin-bottom:6px;font-size:11px;display:block}.status-item strong,.metric strong,.summary-item strong{overflow-wrap:anywhere;color:var(--text);font-weight:800;display:block}.status-item.good,.metric.good{border-color:var(--good-border)}.status-item.warn,.metric.warn{border-color:var(--warn-border)}.metric.danger{border-color:var(--danger-border)}.command-grid{grid-template-columns:repeat(3,minmax(220px,1fr));gap:12px;display:grid}.launcher{background:var(--panel);border:1px solid var(--line);border-radius:var(--radius);min-height:94px;box-shadow:var(--shadow-sm);grid-template-columns:38px minmax(0,1fr) 18px;align-items:center;gap:12px;padding:14px;transition:border-color .16s,box-shadow .16s,transform .16s;display:grid}.launcher:hover{border-color:var(--brand-tint-border);box-shadow:var(--shadow);transform:translateY(-1px)}.launcher-icon{width:38px;height:38px;color:var(--brand);background:var(--brand-tint);border:1px solid var(--brand-tint-border);border-radius:var(--radius-sm);place-items:center;display:grid}.launcher-copy{gap:4px;display:grid}.launcher-copy strong{color:var(--heading);font-size:15px}.launcher-copy span{color:var(--muted)}.work-strip{grid-template-columns:repeat(4,minmax(160px,1fr));gap:8px;display:grid}.strip-item{min-height:38px;color:var(--text-soft);background:var(--panel);border:1px solid var(--line);border-radius:var(--radius-sm);align-items:center;gap:8px;padding:0 10px;display:flex}.page-frame{gap:14px;padding:14px;display:grid}.page-title-row{border-bottom:1px solid var(--line);justify-content:space-between;align-items:flex-start;gap:14px;padding-bottom:12px;display:flex}.query-panel{background:var(--panel-subtle);border:1px solid var(--line);border-radius:var(--radius-sm);padding:10px}.toolbar{flex-wrap:wrap;align-items:center;gap:8px;display:flex}.message-query input{width:150px}.message-selector-grid{grid-template-columns:repeat(2,minmax(280px,1fr));gap:10px;margin-bottom:10px;display:grid}.message-selector-grid.single{grid-template-columns:minmax(320px,620px)}.entity-picker{background:var(--panel);border:1px solid var(--line);border-radius:var(--radius-sm);gap:8px;min-width:0;padding:10px;display:grid}.picker-head{min-height:24px;color:var(--text-soft);justify-content:space-between;align-items:center;gap:8px;font-weight:800;display:flex}.selected-entity{min-height:40px;color:var(--brand-tint-text);background:var(--brand-tint);border:1px solid var(--brand-tint-border);border-radius:var(--radius-sm);grid-template-columns:18px minmax(0,1fr) auto;align-items:center;gap:8px;padding:7px 9px;display:grid}.selected-entity strong,.selected-entity span{text-overflow:ellipsis;white-space:nowrap;overflow:hidden}.selected-entity div{gap:2px;min-width:0;display:grid}.selected-entity div span{color:var(--brand-tint-text);opacity:.85;font-size:11px}.picker-search{background:var(--panel-subtle);border:1px solid var(--line-strong);border-radius:var(--radius-sm);grid-template-columns:18px minmax(0,1fr) auto;align-items:center;gap:7px;height:34px;padding:0 6px 0 9px;display:grid}.picker-search input{width:100%;height:30px;box-shadow:none;background:0 0;border:0;padding:0}.picker-results{border:1px solid var(--line);border-radius:var(--radius-sm);max-height:236px;display:grid;overflow:auto}.picker-row{min-height:36px;color:var(--text);background:var(--panel);border:0;border-bottom:1px solid var(--line);cursor:pointer;text-align:left;grid-template-columns:96px minmax(120px,1fr) minmax(120px,1fr) auto;align-items:center;gap:8px;padding:6px 8px;display:grid}.picker-row:last-child{border-bottom:0}.picker-row:hover,.picker-row.selected{background:var(--surface-soft)}.picker-row strong,.picker-row span{text-overflow:ellipsis;white-space:nowrap;min-width:0;overflow:hidden}.picker-empty,.picker-error{color:var(--muted);text-align:center;padding:9px}.picker-chip-list{flex-wrap:wrap;gap:6px;display:flex}.picker-chip{color:var(--brand-tint-text);background:var(--brand-tint);border:1px solid var(--brand-tint-border);border-radius:999px;align-items:center;gap:6px;padding:5px 8px;font-size:11px;font-weight:700;display:inline-flex}.picker-chip button{color:inherit;cursor:pointer;opacity:.75;background:0 0;border:0;align-items:center;padding:0;display:inline-flex}.picker-chip button:hover{opacity:1}.emoji-picker-row{grid-template-columns:36px minmax(140px,1fr) minmax(100px,1fr)}.emoji-picker-glyph{text-align:center;font-size:22px;line-height:1}.emoji-picker-anim{width:28px;height:28px}.emoji-picker-anim canvas{width:100%!important;height:100%!important}.picker-error{color:var(--danger);background:var(--danger-tint);border:1px solid var(--danger-border);border-radius:var(--radius-sm)}input,select,textarea{color:var(--text);background:var(--input-bg);border:1px solid var(--line-strong);border-radius:var(--radius-sm);outline:none;transition:border-color .14s,box-shadow .14s}input::placeholder,textarea::placeholder{color:var(--muted-2)}input,select{width:190px;height:34px;padding:0 10px}select{min-width:220px;height:34px;font:inherit;appearance:none;cursor:pointer;background-image:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='0 0 24 24' fill='none' stroke='%239aa4b2' stroke-width='2.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpolyline points='6 9 12 15 18 9'/%3E%3C/svg%3E");background-position:right 10px center;background-repeat:no-repeat;padding:0 30px 0 10px;font-weight:600}select:disabled{color:var(--muted-2);cursor:not-allowed}textarea{resize:vertical;width:100%;padding:9px 10px}input:focus,select:focus,textarea:focus{border-color:var(--brand);box-shadow:0 0 0 3px var(--focus)}.small-input{width:88px}.sort-order-editor{align-items:center;gap:6px;display:flex}.sort-order-editor .small-input{width:64px;height:32px}.sort-order-editor .title-input{width:160px}.field-inline{color:var(--muted);align-items:center;gap:6px;display:inline-flex}.field-inline span{font-size:11px;font-weight:700}.searchbox{width:min(380px,100%);height:34px;color:var(--text);background:var(--input-bg);border:1px solid var(--line-strong);border-radius:var(--radius-sm);align-items:center;gap:8px;padding:0 10px;display:inline-flex}.searchbox input{width:100%;height:30px;box-shadow:none;border:0;padding:0}.btn{min-height:34px;color:var(--btn-text);background:var(--btn-bg);border:1px solid var(--line-strong);border-radius:var(--radius-sm);cursor:pointer;white-space:nowrap;justify-content:center;align-items:center;gap:6px;padding:0 12px;transition:background-color .14s,border-color .14s,color .14s,box-shadow .14s;display:inline-flex}.btn:hover:not(:disabled){background:var(--btn-hover)}.btn:disabled{color:var(--muted-2);cursor:not-allowed}.btn.primary{color:#fff;background:var(--brand);border-color:var(--brand)}.btn.primary:hover:not(:disabled){background:var(--brand-strong);border-color:var(--brand-strong)}.btn.ghost{background:var(--panel-subtle)}.btn.danger{color:var(--danger);background:var(--danger-tint);border-color:var(--danger-border)}.btn.danger:hover:not(:disabled){background:var(--danger-tint);border-color:var(--danger)}.btn.warn{color:var(--warn);background:var(--warn-tint);border-color:var(--warn-border)}.btn.warn:hover:not(:disabled){background:var(--warn-tint);border-color:var(--warn)}.btn:disabled,.btn.primary:disabled,.btn.warn:disabled,.btn.danger:disabled{color:var(--muted-2);background:var(--panel-strong);border-color:var(--line);cursor:not-allowed}.btn.full{width:100%}.icon-text{gap:7px}.compact-btn{min-height:28px;padding:0 8px;font-size:12px}.row-link,.link-button{color:var(--brand-2);cursor:pointer;background:0 0;border:0;align-items:center;gap:4px;padding:0;display:inline-flex}.avatar-link{cursor:pointer;background:0 0;border:0;border-radius:999px;padding:0;line-height:0;display:block}.avatar-link:hover,.avatar-link:focus-visible{outline:2px solid var(--focus);outline-offset:2px}.table-wrap{background:var(--panel);border:1px solid var(--line);border-radius:var(--radius);width:100%;overflow-x:auto}.data-table{border-collapse:collapse;width:100%;font-size:12.5px}.data-table th,.data-table td{border-bottom:1px solid var(--line);text-align:left;vertical-align:middle;white-space:nowrap;height:38px;padding:7px 9px}.data-table th{z-index:0;color:var(--muted);background:var(--panel-strong);font-weight:800;position:sticky;top:0}.data-table tbody tr:hover{background:var(--panel-subtle)}.data-table tr:last-child td{border-bottom:0}.mono{font-family:SFMono-Regular,Consolas,Liberation Mono,monospace}.truncate{text-overflow:ellipsis;max-width:380px;overflow:hidden}.badge{min-height:22px;color:var(--muted);background:var(--panel-strong);border:1px solid var(--line-strong);white-space:nowrap;border-radius:999px;align-items:center;padding:1px 8px;display:inline-flex}.badge.good{color:var(--good);background:var(--good-tint);border-color:var(--good-border)}.badge.danger{color:var(--danger);background:var(--danger-tint);border-color:var(--danger-border)}.badge.warn{color:var(--warn);background:var(--warn-tint);border-color:var(--warn-border)}.empty-cell{color:var(--muted);text-align:center}.bot-create-fields{grid-template-columns:repeat(3,minmax(0,1fr));gap:12px;display:grid}.bot-create-fields .duration-field input{width:100%}.bot-create-actions{border-top:1px solid var(--line);justify-content:space-between;align-items:center;gap:14px;margin-top:14px;padding-top:14px;display:flex}.bot-create-note{color:var(--muted);font-size:12px;line-height:1.4}@media (width<=760px){.bot-create-fields{grid-template-columns:1fr}.bot-create-actions{flex-direction:column;align-items:stretch}}.split-layout{grid-template-columns:minmax(0,1fr) 330px;align-items:start;gap:14px;display:grid}.split-main,.split-side{min-width:0}.entity-head{background:var(--panel-subtle);border:1px solid var(--line);border-radius:var(--radius);justify-content:space-between;align-items:flex-start;gap:14px;padding:14px;display:flex}.entity-head-main{align-items:center;gap:14px;min-width:0;display:flex}.entity-head-main .avatar-photo-img,.entity-head-main .avatar-fallback{flex-shrink:0}.avatar-edit-slot{flex-shrink:0;position:relative}.avatar-edit-btn{width:24px;height:24px;color:var(--brand);background:var(--panel);border:1px solid var(--line-strong);border-radius:999px;padding:0;position:absolute;bottom:-4px;right:-4px;box-shadow:0 1px 3px #0003}.avatar-edit-btn:hover{background:var(--brand-tint);border-color:var(--brand)}.entity-title{color:var(--heading);font-size:20px;font-weight:800;line-height:1.25}.entity-subtitle{color:var(--muted);margin-top:4px}.summary-grid{grid-template-columns:repeat(4,minmax(150px,1fr));gap:8px;display:grid}.about-text{color:var(--text-soft);background:var(--panel-subtle);border:1px solid var(--line);border-radius:var(--radius);margin:0;padding:10px}.action-groups{grid-template-columns:repeat(3,minmax(0,1fr));gap:14px;display:grid}.action-groups>.section-block{flex-direction:column;display:flex}.action-groups>.section-block>.section-head{flex-shrink:0}.action-groups>.section-block>.card-body{flex-direction:column;flex:1;justify-content:center;gap:10px;display:flex}.section-block,.action-dock,.surface{background:var(--panel);border:1px solid var(--line);border-radius:var(--radius);min-width:0;box-shadow:var(--shadow-sm);padding:12px}.section-head{justify-content:space-between;align-items:flex-start;gap:12px;margin-bottom:10px;display:flex}.section-head p{color:var(--muted);margin:5px 0 0}.action-dock{gap:10px;display:grid;position:sticky;top:82px}.dock-title{color:var(--text-soft);border-bottom:1px solid var(--line);padding-bottom:4px;font-weight:800}.action-dock>.btn,.action-dock .action-stack .btn{justify-content:center;width:100%}.duration-field{gap:4px;display:grid}.duration-field span{color:var(--muted);font-size:11px;font-weight:800}.duration-field input,.duration-field select{width:100%}.action-stack{gap:10px;display:grid}.action-stack .btn,.action-dock>.btn{min-height:42px}.danger-zone{border-top:1px solid var(--line);flex-wrap:wrap;gap:8px;margin-top:10px;padding-top:10px;display:flex}.dock-title+.danger-zone{border-top:0;margin-top:0;padding-top:0}.authorization-block{gap:10px;display:grid}.authorization-table{table-layout:fixed;min-width:720px}.authorization-table th,.authorization-table td{height:46px}.device-text{text-overflow:ellipsis;max-width:260px;overflow:hidden}.device-actions-head{width:250px}.device-actions-cell{width:250px;min-width:250px}.device-actions{white-space:normal;grid-template-columns:repeat(2,minmax(110px,1fr));gap:6px;min-width:226px;display:grid}.device-actions .btn{justify-content:center;width:100%}.operation-row{grid-template-columns:repeat(2,minmax(280px,1fr));gap:10px;display:grid}.operation-box{background:var(--panel-subtle);border:1px solid var(--line);border-radius:var(--radius);flex-wrap:wrap;align-items:center;gap:8px;padding:10px;display:flex}.operation-title{width:100%;color:var(--heading);align-items:center;gap:6px;font-weight:800;display:flex}.checkline{color:var(--muted);align-items:center;gap:6px;display:inline-flex}.checkline input{width:auto;height:auto}.alert{color:var(--danger-text);background:var(--danger-tint);border:1px solid var(--danger-border);border-radius:var(--radius);align-items:flex-start;gap:8px;padding:9px 10px;display:flex}.json-block{max-height:520px;color:var(--code-text);background:var(--code-bg);border:1px solid var(--code-border);border-radius:var(--radius);margin:0;padding:12px;font-size:12px;overflow:auto}.raw-grid{grid-template-columns:repeat(2,minmax(0,1fr));gap:10px;display:grid}.loading-line{min-height:80px;color:var(--muted);place-items:center;display:grid}.empty-panel{min-height:92px;color:var(--muted);background:var(--panel-subtle);border:1px solid var(--line);border-radius:var(--radius);place-items:center;display:grid}.gift-metrics .metric{background:var(--panel-subtle);min-height:68px;padding:12px}.gift-metrics .metric strong{font-size:17px}.gift-file-icon{color:var(--brand);background:var(--brand-tint);border:1px solid var(--brand-tint-border);flex:none;place-items:center;display:grid}.gift-format-chips{flex-wrap:wrap;flex:none;justify-content:flex-end;gap:6px;display:flex}.gift-format-chips span{color:var(--brand-tint-text);background:var(--brand-tint);border:1px solid var(--brand-tint-border);letter-spacing:.02em;border-radius:999px;padding:4px 8px;font-size:10px;font-weight:800}.gift-list-summary{color:var(--muted);margin-left:auto;font-size:11px;font-weight:700}.gift-import-modal{width:min(860px,100%)}.gift-bulk-import-modal{width:min(480px,100%)}.gift-bulk-import-modal .command-body{gap:14px;padding:16px 18px;display:grid}.gift-import-modal-body{gap:14px}.gift-source-tabs{gap:8px;display:flex}.give-gift-summary{background:var(--panel-subtle);border:1px solid var(--line-strong);color:var(--text-soft);border-radius:12px;align-items:center;gap:11px;padding:11px 13px;display:flex}.give-gift-summary>svg{color:var(--brand);flex:none}.give-gift-summary strong{color:var(--text);font-size:13px;display:block}.give-gift-summary .mono{color:var(--muted);font-size:11px}.give-gift-tabs{background:var(--panel-subtle);border:1px solid var(--line-strong);border-radius:12px;gap:4px;width:100%;padding:4px;display:flex}.give-gift-tabs .btn{min-height:36px;box-shadow:none;color:var(--text-soft);background:0 0;border:1px solid #0000;border-radius:9px;flex:1 1 0;justify-content:center;transition:color .15s,background .15s,border-color .15s,box-shadow .15s}.give-gift-tabs .btn:not(.primary):hover{color:var(--brand);background:var(--brand-tint)}.give-gift-tabs .btn.primary{color:#fff;background:var(--brand);border-color:var(--brand);box-shadow:var(--shadow-brand)}.give-gift-upgrade-note{background:var(--brand-tint);border:1px solid var(--brand-tint-border);color:var(--text-soft);border-radius:10px;margin:0;padding:9px 12px;font-size:11px;font-weight:650;line-height:1.45}.give-gift-attrs{grid-template-columns:repeat(3,minmax(0,1fr));align-items:end}.give-gift-attrs select,.give-gift-attrs input{width:100%;min-width:0;height:38px;color:var(--text);background-color:var(--input-bg);border:1px solid var(--line);border-radius:var(--radius-sm);font:inherit;appearance:none;cursor:pointer;padding:0 32px 0 10px;font-size:12px;font-weight:600}.give-gift-attrs input{cursor:text;text-overflow:ellipsis;padding-right:10px}.give-gift-attrs select{background-image:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='0 0 24 24' fill='none' stroke='%239aa4b2' stroke-width='2.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpolyline points='6 9 12 15 18 9'/%3E%3C/svg%3E");background-position:right 11px center;background-repeat:no-repeat}.give-gift-attrs select:focus,.give-gift-attrs input:focus{border-color:var(--brand);box-shadow:0 0 0 3px var(--focus);outline:none}.give-gift-layout{grid-template-columns:minmax(220px,280px) minmax(0,1fr);align-items:start;gap:16px;display:grid}.give-gift-picker{align-content:start;gap:10px;display:grid}.give-gift-picker-head{align-items:center;gap:12px;display:flex}.give-gift-picker-head .searchbox{flex:auto}.give-gift-picker-list{background:var(--panel-subtle);border:1px solid var(--line);border-radius:var(--radius-lg);gap:8px;max-height:640px;padding:8px;display:grid;overflow-y:auto}.give-gift-option{text-align:left;min-width:0;color:var(--text);background:var(--panel);border:1px solid var(--line);border-radius:var(--radius);cursor:pointer;box-shadow:var(--shadow-sm);grid-template-columns:46px minmax(0,1fr) auto;align-items:center;gap:11px;padding:9px 11px;transition:border-color .15s,box-shadow .15s,transform .15s;display:grid}.give-gift-option:hover{border-color:var(--brand-tint-border);box-shadow:var(--shadow);transform:translateY(-1px)}.give-gift-option.selected{border-color:var(--brand);box-shadow:0 0 0 2px var(--focus), var(--shadow)}.give-gift-thumb{place-items:center;width:46px;height:46px;display:grid}.give-gift-thumb canvas{width:100%!important;height:100%!important}.give-gift-option-info{gap:3px;min-width:0;display:grid}.give-gift-option-info strong{text-overflow:ellipsis;white-space:nowrap;font-size:12px;overflow:hidden}.give-gift-option-info .mono{color:var(--muted);font-size:10px}.give-gift-option-price{white-space:nowrap;justify-self:end}.give-gift-panel{background:var(--panel);border:1px solid var(--line-strong);border-radius:var(--radius-lg);gap:12px;min-width:0;padding:16px;display:grid}.give-gift-form{gap:12px;min-width:0;display:grid}.give-gift-form-actions{flex-wrap:wrap;justify-content:flex-end;gap:10px;padding-top:4px;display:flex}.give-gift-empty-panel{color:var(--muted);text-align:center;place-items:center;gap:10px;padding:48px 20px;display:grid}.give-gift-empty-panel svg{color:var(--brand);opacity:.8}.official-gift-picker{gap:12px;min-width:0;display:grid}.official-gift-bulk-import{flex-wrap:wrap;align-items:center;gap:10px;display:flex}.gift-bulk-import-progress{align-items:center;gap:8px;min-width:180px;display:flex}.gift-bulk-import-progress-bar{background:#e3e8ef;border-radius:999px;flex:auto;width:120px;height:6px;overflow:hidden}.gift-bulk-import-progress-bar>div{background:var(--brand);border-radius:999px;height:100%;transition:width .2s}.gift-bulk-import-progress span{color:var(--muted);white-space:nowrap;font-size:11px;font-weight:700}.official-gift-tools{align-items:center;gap:12px;display:flex}.official-gift-tools .searchbox{width:100%}.official-gift-tools>span{color:var(--muted);flex:none;font-size:11px;font-weight:750}.official-gift-categories{flex-wrap:wrap;gap:7px;display:flex}.official-gift-categories button{min-height:32px;color:var(--text-soft);background:var(--panel-subtle);border:1px solid var(--line-strong);font:inherit;cursor:pointer;border-radius:999px;align-items:center;gap:7px;padding:5px 10px;font-size:11px;font-weight:800;transition:color .15s,background .15s,border-color .15s,box-shadow .15s;display:inline-flex}.official-gift-categories button:hover{color:var(--brand);border-color:var(--brand-tint-border)}.official-gift-categories button.active{color:#fff;background:var(--brand);border-color:var(--brand);box-shadow:var(--shadow-brand)}.official-gift-categories button span{min-width:20px;height:20px;color:inherit;background:#7d8c9b38;border-radius:999px;place-items:center;padding:0 5px;font-size:10px;display:grid}.official-gift-categories button.active span{color:var(--brand);background:#ffffffd9}.official-gift-list{border:1px solid var(--line);border-radius:var(--radius-lg);background:var(--panel-subtle);scrollbar-gutter:stable;grid-template-columns:repeat(2,minmax(0,1fr));gap:8px;min-height:126px;max-height:314px;padding:8px;display:grid;overflow:auto}.official-gift-option{text-align:left;min-width:0;color:var(--text);background:var(--panel);border:1px solid var(--line);border-radius:var(--radius);cursor:pointer;box-shadow:var(--shadow-sm);gap:8px;padding:11px 12px;transition:border-color .15s,box-shadow .15s,transform .15s;display:grid}.official-gift-option:hover{border-color:var(--brand-tint-border);box-shadow:var(--shadow);transform:translateY(-1px)}.official-gift-option.selected{border-color:var(--brand);box-shadow:0 0 0 2px var(--focus), var(--shadow)}.official-gift-option-head{grid-template-columns:minmax(0,1fr) auto;align-items:baseline;gap:8px;display:grid}.official-gift-option-head strong{text-overflow:ellipsis;white-space:nowrap;font-size:12px;overflow:hidden}.official-gift-option-head .mono{color:var(--muted);font-size:9px}.official-gift-option-meta{color:var(--muted);flex-wrap:wrap;gap:10px;font-size:10px;font-weight:700;display:flex}.official-gift-capabilities{flex-wrap:wrap;gap:5px;display:flex}.official-gift-capabilities>span{letter-spacing:.01em;border:1px solid #0000;border-radius:999px;padding:3px 7px;font-size:9px;font-weight:850}.official-gift-capabilities>span.yes{color:var(--good);background:var(--good-tint);border-color:var(--good-border)}.official-gift-capabilities>span.craft{color:var(--purple);background:var(--purple-tint);border-color:var(--purple-border)}.official-gift-capabilities>span.no{color:var(--muted);background:var(--panel-strong);border-color:var(--line-strong)}.official-gift-empty{min-height:108px;color:var(--muted);text-align:center;grid-column:1/-1;place-items:center;padding:20px;font-size:12px;display:grid}.official-gift-selected{border:1px solid var(--line);border-radius:var(--radius-lg);background:var(--surface-soft);grid-template-columns:108px minmax(0,1fr);align-items:center;gap:14px;padding:12px;display:grid}.official-gift-selected .gift-animation-shell{border-radius:12px;width:96px;height:96px;min-height:96px;overflow:hidden}.official-gift-selected .gift-animation{width:96px;height:96px}.official-gift-selected>div:last-child{gap:5px;min-width:0;display:grid}.official-gift-selected small{color:var(--muted)}.gift-import-note{color:var(--muted);justify-content:space-between;align-items:center;gap:12px;line-height:1.45;display:flex}.gift-file-picker{min-height:78px;color:var(--text);background:var(--panel);border:1px dashed var(--line-strong);border-radius:var(--radius);cursor:pointer;grid-template-columns:42px minmax(0,1fr) auto;align-items:center;gap:12px;padding:12px 14px;transition:border-color .16s,background .16s,box-shadow .16s;display:grid;position:relative}.gift-file-picker:hover,.gift-file-picker.has-file{background:var(--brand-tint);border-color:var(--brand);box-shadow:0 0 0 2px var(--focus)}.gift-file-picker.compact{grid-template-columns:minmax(0,1fr);min-height:44px;padding:8px 12px}.gift-file-picker input{opacity:0;pointer-events:none;width:1px;height:1px;position:absolute}.gift-file-icon{border-radius:var(--radius-sm);width:40px;height:40px}.gift-file-copy{gap:2px;min-width:0;display:grid}.gift-field-label{color:var(--muted);text-transform:uppercase;letter-spacing:.04em;font-size:10px;font-weight:800}.gift-file-copy strong{color:var(--heading);text-overflow:ellipsis;white-space:nowrap;font-size:13px;overflow:hidden}.gift-file-copy small{color:var(--muted);font-size:11px;font-weight:500}.gift-file-action{color:var(--brand);background:var(--brand-tint);border:1px solid var(--brand-tint-border);border-radius:var(--radius-sm);padding:7px 10px;font-size:11px;font-weight:800}.gif-catalog-preview{background:var(--panel-subtle);border:1px solid var(--line);border-radius:var(--radius-sm);place-items:center;max-height:220px;display:grid;overflow:hidden}.gif-catalog-preview img,.gif-catalog-preview video{object-fit:contain;max-width:100%;max-height:220px}.gift-fields-grid{grid-template-columns:minmax(200px,1.5fr) repeat(3,minmax(120px,1fr));gap:10px;display:grid}.gift-fields-grid label,.gift-reason-field{color:var(--muted);gap:6px;font-size:11px;font-weight:700;display:grid}.gift-fields-grid input,.gift-reason-field input{width:100%;min-width:0;height:38px;color:var(--text);background:var(--input-bg);border:1px solid var(--line);border-radius:var(--radius-sm);padding:0 10px}.gift-fields-grid input:focus,.gift-reason-field input:focus{border-color:var(--brand);box-shadow:0 0 0 3px var(--focus);outline:none}.gift-switch{color:var(--text-soft);cursor:pointer;align-items:center;gap:9px;font-size:12px;font-weight:700;display:inline-flex}.gift-switch input{opacity:0;width:1px;height:1px;position:absolute}.gift-switch-track{background:var(--switch-track);border-radius:999px;align-items:center;width:34px;height:19px;padding:2px;transition:background .16s;display:flex}.gift-switch-track span{background:#fff;border-radius:50%;width:15px;height:15px;transition:transform .16s;box-shadow:0 1px 3px #10182838}.gift-switch input:checked+.gift-switch-track{background:var(--brand)}.gift-switch input:checked+.gift-switch-track span{transform:translate(15px)}.gift-switch input:focus-visible+.gift-switch-track{outline:3px solid var(--focus);outline-offset:2px}.gift-validation{color:var(--code-text);background:var(--code-bg);border:1px solid var(--code-border);border-radius:var(--radius-sm);overflow:hidden}.gift-validation-head{color:var(--code-text);background:#ffffff09;border-bottom:1px solid #ffffff17;align-items:center;gap:9px;padding:10px 12px;display:flex}.gift-validation-head div{gap:2px;display:grid}.gift-validation-head span{color:var(--brand);font-size:10px}.gift-validation pre{max-height:180px;color:var(--code-text);margin:0;padding:11px 12px;font-size:11px;overflow:auto}.sticker-preview-modal{width:min(760px,100%)}.sticker-doc-grid{grid-template-columns:repeat(auto-fill,minmax(84px,1fr));gap:8px;max-height:420px;padding:2px;display:grid;overflow:auto}.sticker-doc-cell{aspect-ratio:1;background:var(--panel-strong);border:1px solid var(--line);border-radius:10px;place-items:center;display:grid;position:relative;overflow:hidden}.sticker-doc-canvas{width:100%;height:100%}.sticker-doc-canvas canvas{width:100%!important;height:100%!important}.sticker-doc-image{object-fit:contain;width:100%;height:100%}.sticker-doc-cell.list-thumb{flex:0 0 40px;width:40px}.sticker-list-thumb-empty{background:var(--panel-strong);border:1px solid var(--line);width:40px;height:40px;color:var(--muted);border-radius:9px;place-items:center;display:grid}.gif-catalog-thumb{object-fit:cover;background:var(--panel-strong);border:1px solid var(--line);border-radius:9px;width:40px;height:40px}.sticker-doc-grid-cell{gap:4px;display:grid}.sticker-doc-grid-cell .btn{justify-content:center;width:100%}.sticker-add-form{background:var(--panel-strong);border:1px solid var(--line);border-radius:10px;flex-wrap:wrap;align-items:center;gap:8px;margin-bottom:14px;padding:10px;display:flex}.sticker-add-form .gift-file-picker.compact{flex:220px;min-width:180px}.sticker-add-form .small-input{flex:0 140px}.sticker-add-form-error{color:var(--danger);flex-basis:100%;font-size:12px}.sticker-doc-error{color:var(--danger);text-align:center;place-items:center;padding:4px;font-size:9px;display:grid;position:absolute;inset:0}.gift-animation-shell{background:var(--surface-soft);place-items:center;min-height:210px;display:grid;position:relative}.gift-animation{width:200px;height:200px}.gift-animation canvas{width:100%!important;height:100%!important}.gift-play{width:30px;height:30px;color:var(--text);background:var(--panel);border:1px solid var(--line);border-radius:50%;place-items:center;display:grid;position:absolute;bottom:8px;right:8px}.gift-table-wrap{background:var(--panel)}.gift-table{min-width:1080px}.gift-table th:nth-child(2){width:74px}.gift-table td{vertical-align:middle}.gift-select-col{text-align:center;width:34px}.gift-select-col input{width:15px;height:15px}.avatar-col{width:44px}.muted-cell{color:var(--muted)}.avatar-photo-img,.avatar-fallback{object-fit:cover;border-radius:50%;display:block}.avatar-fallback{color:#fff;letter-spacing:-.02em;place-items:center;font-weight:800;display:grid}.gift-bulk-toolbar{background:var(--panel-strong);border:1px solid var(--line);border-radius:9px;align-items:center;gap:10px;margin-bottom:10px;padding:9px 12px;display:flex}.gift-bulk-count{color:var(--text);white-space:nowrap;font-size:12px;font-weight:700}.gift-bulk-reason{flex:1;min-width:160px}.gift-bulk-reason input{height:34px}.gift-bulk-error{color:var(--danger);font-size:11px;font-weight:700}.gift-page-size{color:var(--muted);white-space:nowrap;align-items:center;gap:6px;font-size:11px;font-weight:700;display:inline-flex}.gift-page-size select{height:30px;color:var(--text);background:var(--input-bg);border:1px solid var(--line);border-radius:var(--radius-sm);font:inherit;padding:0 8px;font-weight:700}.gift-pager{flex-wrap:wrap;justify-content:space-between;align-items:center;gap:12px;margin-top:10px;display:flex}.gift-pager-range{color:var(--muted);font-size:11px;font-weight:700}.gift-pager-controls{align-items:center;gap:10px;display:flex}.gift-pager-page{color:var(--text);white-space:nowrap;font-size:12px;font-weight:700}.gift-animation-shell.compact{border:1px solid var(--line);border-radius:var(--radius-sm);width:56px;min-height:56px;overflow:hidden}.gift-animation-shell.compact .gift-animation{width:54px;height:54px}.gift-animation-shell.compact .gift-play{width:20px;height:20px;bottom:3px;right:3px}.gift-row-disabled{opacity:.68}.gift-table-title,.gift-sort-order,.gift-source-size,.gift-convert-price{display:block}.gift-table-title{text-overflow:ellipsis;white-space:nowrap;max-width:220px;overflow:hidden}.gift-sort-order,.gift-source-size,.gift-convert-price{color:var(--muted);margin-top:3px;font-size:10px}.gift-table-price{color:var(--warn)}.gift-table-actions{align-items:center;gap:6px;display:flex}.collectible-button{color:var(--purple);background:var(--purple-tint);border-color:var(--purple-border)}.collectible-button:hover{background:var(--purple-tint);border-color:var(--purple)}.collectible-modal{width:min(1180px,100%);max-height:min(92vh,980px)}.collectible-modal .modal-head p{color:var(--muted);margin:4px 0 0;font-size:11px}.collectible-modal-body{background:var(--bg);gap:16px;padding:16px 18px 22px;overflow:auto}.collectible-loading{min-height:90px;color:var(--muted);justify-content:center;align-items:center;gap:8px;display:flex}.collectible-empty{color:var(--purple-text);background:var(--purple-tint);border:1px dashed var(--purple-border);border-radius:var(--radius);align-items:center;gap:12px;padding:16px;display:flex}.collectible-empty div,.collectible-definition-head>div:first-child,.collectible-section-head>div:first-child{gap:3px;display:grid}.collectible-empty span,.collectible-definition-head span,.collectible-section-head span{color:var(--muted);font-size:10px;font-weight:500}.collectible-active{background:var(--panel);border:1px solid var(--purple-border);border-radius:var(--radius);box-shadow:var(--shadow-sm);overflow:hidden}.collectible-active-head{background:var(--purple-tint);border-bottom:1px solid var(--purple-border);justify-content:space-between;align-items:center;gap:12px;padding:12px 14px;display:flex}.collectible-active-head>div{color:var(--purple-text);align-items:center;gap:9px;display:flex}.collectible-active-head>div>div{gap:2px;display:grid}.collectible-active-head span{color:var(--muted);font-size:10px}.collectible-active-grid{background:var(--line);grid-template-columns:repeat(auto-fill,minmax(145px,1fr));gap:1px;display:grid}.collectible-active-grid article{background:var(--panel);align-items:center;gap:9px;min-width:0;padding:9px 11px;display:flex}.collectible-active-grid article>div:last-child{gap:2px;min-width:0;display:grid}.collectible-active-grid article strong{text-overflow:ellipsis;white-space:nowrap;font-size:11px;overflow:hidden}.collectible-active-grid article span{color:var(--muted);font-size:9px}.collectible-definition{background:var(--panel);border:1px solid var(--line);border-radius:var(--radius);box-shadow:var(--shadow-sm);overflow:hidden}.collectible-definition-head{background:var(--panel-subtle);border-bottom:1px solid var(--line);justify-content:space-between;align-items:center;gap:12px;padding:14px 16px;display:flex}.collectible-main-fields{background:var(--panel-subtle);border-bottom:1px solid var(--line);padding:14px 16px}.collectible-section{border-bottom:1px solid var(--line);padding:14px 16px}.collectible-section:last-child{border-bottom:0}.collectible-section-head{justify-content:space-between;align-items:center;gap:12px;margin-bottom:10px;display:flex}.collectible-section-tools{align-items:center;gap:7px;display:flex}.collectible-rows{gap:7px;display:grid}.collectible-row{background:var(--panel-subtle);border:1px solid var(--line);border-radius:var(--radius-sm);align-items:end;gap:7px;padding:9px 9px 9px 36px;display:grid;position:relative}.collectible-row:hover{background:var(--panel);border-color:var(--line-strong);box-shadow:var(--shadow-sm)}.collectible-row.animated{grid-template-columns:minmax(120px,1.2fr) 90px 78px minmax(160px,1.4fr) 48px 30px}.collectible-row.backdrop{grid-template-columns:minmax(110px,1.2fr) 70px 80px 70px repeat(4,52px) 48px 30px}.collectible-row-index{width:27px;color:var(--purple-text);background:var(--purple-tint);border-right:1px solid var(--purple-border);border-radius:var(--radius-xs) 0 0 var(--radius-xs);place-items:center;font-size:10px;font-weight:800;display:grid;position:absolute;top:0;bottom:0;left:0}.collectible-row label{gap:4px;min-width:0;display:grid}.collectible-row label>span{color:var(--muted);text-transform:uppercase;letter-spacing:.025em;font-size:9px;font-weight:800}.collectible-row input:not([type=file]){width:100%;min-width:0;height:32px;color:var(--text);background:var(--input-bg);border:1px solid var(--line-strong);border-radius:var(--radius-sm);font:inherit;padding:0 8px;font-size:11px}.collectible-row input:focus{border-color:var(--purple);box-shadow:0 0 0 3px var(--purple-tint);outline:none}.collectible-file input{opacity:0;pointer-events:none;width:1px;height:1px;position:absolute}.collectible-file em{min-width:0;height:32px;color:var(--purple-text);background:var(--purple-tint);border:1px dashed var(--purple-border);border-radius:var(--radius-sm);text-overflow:ellipsis;white-space:nowrap;cursor:pointer;align-items:center;gap:5px;padding:0 8px;font-size:10px;font-style:normal;font-weight:700;display:flex;overflow:hidden}.collectible-inline-preview{width:42px;height:42px;color:var(--purple);background:var(--purple-tint);border:1px solid var(--purple-border);border-radius:var(--radius-sm);place-items:center;display:grid;overflow:hidden}.collectible-animation{width:100%;height:100%;overflow:hidden}.collectible-animation.compact{background:var(--purple-tint);border:1px solid var(--purple-border);border-radius:var(--radius-sm);flex:0 0 42px;place-items:center;width:42px;height:42px;display:grid}.collectible-animation canvas{width:100%!important;height:100%!important}.collectible-animation.failed{color:var(--danger);background:var(--danger-tint)}.collectible-animation.loading{color:var(--purple-text)}.collectible-file-error{color:var(--danger);grid-column:1/-1;font-size:10px}.collectible-color input{cursor:pointer;height:32px!important;padding:3px!important}.collectible-backdrop-preview{border-radius:var(--radius-sm);border:1px solid #2a1f472e;flex:0 0 42px;place-items:center;width:42px;height:42px;font-size:11px;font-weight:900;display:grid;box-shadow:inset 0 0 0 1px #fff3}.collectible-row .icon-btn{align-self:center}.collectible-row .icon-btn:disabled{opacity:.28}@media (width<=900px){.gift-fields-grid{grid-template-columns:repeat(2,minmax(0,1fr))}.give-gift-layout{grid-template-columns:1fr}.give-gift-picker-list{max-height:320px}.collectible-row.animated,.collectible-row.backdrop{grid-template-columns:repeat(2,minmax(0,1fr))}.collectible-inline-preview,.collectible-backdrop-preview,.collectible-row .icon-btn{place-self:center start}}@media (width<=620px){.gift-import-note{flex-direction:column;align-items:flex-start}.gift-format-chips{justify-content:flex-start}.gift-file-picker{grid-template-columns:40px minmax(0,1fr)}.gift-file-action{display:none}.gift-fields-grid{grid-template-columns:1fr}.gift-list-summary{width:100%;margin-left:0}.official-gift-tools{flex-direction:column;align-items:stretch}.official-gift-list{grid-template-columns:1fr;max-height:340px}.official-gift-selected{grid-template-columns:82px minmax(0,1fr)}.official-gift-selected .gift-animation-shell{width:72px;height:72px}.collectible-modal-body{padding:10px}.collectible-definition-head,.collectible-section-head{flex-direction:column;align-items:flex-start}.collectible-row.animated,.collectible-row.backdrop{grid-template-columns:1fr}.collectible-active-grid{grid-template-columns:1fr 1fr}}.attr-block{background:var(--panel-subtle);border:1px solid var(--line);border-radius:var(--radius-sm);gap:8px;padding:10px;display:grid}.attr-block+.attr-block{margin-top:10px}.attr-block .duration-field input,.duration-field select{width:100%}.attr-block .btn{justify-content:center;width:100%}.emoji-grid{grid-template-columns:repeat(auto-fill,minmax(150px,1fr));gap:10px;display:grid}.emoji-card{background:var(--panel);border:1px solid var(--line);border-radius:var(--radius);box-shadow:var(--shadow-sm);gap:8px;padding:12px;display:grid}.emoji-preview{background:var(--surface-soft);border:1px solid var(--line);border-radius:var(--radius-sm);place-items:center;height:88px;display:grid}.emoji-anim{width:80px;height:80px}.emoji-anim canvas{width:100%!important;height:100%!important}.emoji-glyph{font-size:46px;line-height:1}.emoji-meta{gap:4px;min-width:0;display:grid}.emoji-alt{font-size:18px;line-height:1.2}.emoji-id{width:100%;min-width:0;color:var(--text);background:var(--panel-subtle);border:1px solid var(--line);border-radius:var(--radius-sm);cursor:pointer;justify-content:space-between;align-items:center;gap:6px;padding:4px 8px;font-size:11px;display:flex}.emoji-id .mono{text-overflow:ellipsis;white-space:nowrap;flex:auto;min-width:0;overflow:hidden}.emoji-id svg{flex:none}.emoji-id:hover{border-color:var(--brand-tint-border);color:var(--brand)}.emoji-sub{color:var(--muted);text-overflow:ellipsis;white-space:nowrap;font-size:11px;overflow:hidden}.username-branch{margin:2px 0 0;padding:0;list-style:none}.username-branch li{color:var(--text-soft);padding-left:14px;font-size:12px;line-height:1.7;position:relative}.username-branch li:before{border-left:1px solid var(--line-strong,var(--line));border-bottom:1px solid var(--line-strong,var(--line));content:"";width:6px;height:11px;position:absolute;top:0;left:3px}.username-branch li.inactive{color:var(--muted)}.username-branch li.inactive span{text-decoration:line-through}.username-branch li em{text-transform:uppercase;letter-spacing:.04em;margin-left:6px;font-size:10px;font-style:normal;font-weight:800}.card-body{flex-direction:column;gap:12px;display:flex}.server-identity-fields{flex:auto;gap:8px;min-width:0;display:grid}.identity-card{width:100%}.identity-layout{align-items:flex-start;gap:24px;display:flex}.identity-layout .server-identity-fields{flex:auto;gap:12px}.identity-layout .form-field textarea{resize:vertical;min-height:92px}.identity-save-row .btn{justify-content:center;width:100%;min-height:40px}.server-icon-fallback{color:var(--muted);background:var(--panel-subtle);border:1px dashed var(--line-strong)}.env-groups{gap:8px;display:grid}.env-group{background:var(--panel);border:1px solid var(--line);border-radius:var(--radius);overflow:hidden}.env-group-toggle{background:var(--panel-subtle);cursor:pointer;text-align:left;border:none;justify-content:space-between;align-items:center;gap:10px;width:100%;padding:11px 14px;transition:background-color .14s;display:flex}.env-group-toggle:hover{background:var(--brand-tint)}.env-group-toggle-text{align-items:baseline;gap:8px;min-width:0;display:flex}.env-group-toggle-title{color:var(--heading);font-size:13px;font-weight:800}.env-group-toggle-count{color:var(--muted);flex-shrink:0;font-size:11px;font-weight:700}.env-group-chevron{color:var(--muted);flex-shrink:0;transition:transform .14s}.env-group.open .env-group-chevron{transform:rotate(180deg)}.env-group-body{border-top:1px solid var(--line);gap:12px;padding:14px;display:grid}.env-group-desc{color:var(--muted);margin:0;font-size:12px}.env-field .env-field-desc{color:var(--muted);text-transform:none;letter-spacing:normal;font-size:11px;font-weight:500}.env-save-row{margin-top:12px}.restart-overlay{width:min(440px,100%)}.restart-overlay-body{text-align:center;justify-items:center;gap:12px;padding:28px 20px;display:grid}.restart-overlay-body p{color:var(--text-soft);margin:0;font-weight:700}.restart-overlay-actions{justify-content:center}.tab-bar{background:var(--surface-soft);border:1px solid var(--line);border-radius:var(--radius);gap:4px;width:fit-content;margin-bottom:18px;padding:4px;display:flex}.tab-btn{appearance:none;color:var(--text-soft);border-radius:var(--radius-sm);cursor:pointer;background:0 0;border:none;padding:7px 16px;font-size:13px;font-weight:600;transition:background .15s,color .15s}.tab-btn:hover{color:var(--text)}.tab-btn.active{background:var(--panel);color:var(--text);box-shadow:0 1px 2px #00000014}.service-grid{grid-template-columns:repeat(auto-fill,minmax(220px,1fr));gap:10px;display:grid}.service-card{border:1px solid var(--line);border-radius:var(--radius);background:var(--panel);align-items:center;gap:10px;padding:12px 14px;display:flex}.service-card-icon{border-radius:var(--radius-sm);background:var(--surface-soft);width:34px;height:34px;color:var(--text-soft);flex:none;justify-content:center;align-items:center;display:flex}.service-card-body{flex:1;min-width:0}.service-card-name{color:var(--text);text-transform:capitalize;font-size:13px;font-weight:700}.service-card-detail{color:var(--muted);margin-top:1px;font-family:SFMono-Regular,Consolas,Liberation Mono,monospace;font-size:11.5px}.service-card-status{text-transform:capitalize;border-radius:999px;flex:none;align-items:center;gap:5px;padding:4px 9px;font-size:12px;font-weight:700;display:flex}.service-card.tone-good .service-card-icon{color:var(--good)}.service-card.tone-good .service-card-status{color:var(--good);background:var(--good-tint);border:1px solid var(--good-border)}.service-card.tone-warn .service-card-icon{color:var(--warn)}.service-card.tone-warn .service-card-status{color:var(--warn);background:var(--warn-tint);border:1px solid var(--warn-border)}.service-card.tone-danger .service-card-icon{color:var(--danger)}.service-card.tone-danger .service-card-status{color:var(--danger);background:var(--danger-tint);border:1px solid var(--danger-border)}.service-card.tone-idle .service-card-status{color:var(--muted);background:var(--surface-soft);border:1px solid var(--line)}.services-header-actions{align-items:center;gap:8px;display:flex}.modal-backdrop{z-index:10000;background:var(--overlay);-webkit-backdrop-filter:blur(2px);backdrop-filter:blur(2px);place-items:center;padding:24px;display:grid;position:fixed;inset:0}.modal{background:var(--panel);border:1px solid var(--line);border-radius:var(--radius-lg);width:min(760px,100%);max-height:min(820px,100vh - 48px);box-shadow:var(--shadow);padding:0;overflow:hidden}.command-modal{flex-direction:column;display:flex}.command-modal>.modal-head,.command-modal>.modal-actions{flex:none}.modal-head{border-bottom:1px solid var(--line);justify-content:space-between;align-items:flex-start;gap:12px;padding:16px 18px 12px;display:flex}.icon-btn{width:30px;height:30px;color:var(--text-soft);background:var(--panel-subtle);border:1px solid var(--line);border-radius:var(--radius-sm);cursor:pointer;place-items:center;transition:background-color .14s,border-color .14s,color .14s;display:grid}.icon-btn:hover{background:var(--btn-hover);border-color:var(--line-strong)}.command-steps{grid-template-columns:repeat(3,minmax(0,1fr));gap:8px;display:grid}.command-body{grid-auto-rows:max-content;gap:12px;min-height:0;padding:14px 18px;display:grid;overflow:auto}.mint-field-group{background:var(--panel-subtle);border:1px solid var(--line);border-radius:var(--radius);gap:8px;padding:12px;display:grid}.mint-field-group-label{color:var(--text-soft);text-transform:uppercase;letter-spacing:.04em;font-size:12px;font-weight:800}.command-step{min-height:38px;color:var(--muted);background:var(--panel-subtle);border:1px solid var(--line);border-radius:var(--radius-sm);align-items:center;gap:8px;padding:0 10px;display:flex}.command-step span{background:var(--panel);border:1px solid var(--line);border-radius:999px;place-items:center;width:20px;height:20px;font-size:11px;font-weight:800;display:grid}.command-step.active{color:var(--brand);border-color:var(--brand-tint-border)}.command-step.done{color:var(--good);border-color:var(--good-border)}.form-field{gap:6px;display:grid}.form-field span,.form-stack span{color:var(--text-soft);font-weight:800}.form-field input:disabled,.form-field textarea:disabled{opacity:.6;cursor:not-allowed}.command-preview{gap:8px;display:grid}.command-preview .json-block{max-height:150px}.preview-head,.result-title{color:var(--text-soft);align-items:center;gap:7px;font-weight:800;display:flex}.result-box{background:var(--panel-subtle);border:1px solid var(--line);border-radius:var(--radius);gap:8px;padding:10px;display:grid}.result-line{grid-template-columns:92px minmax(0,1fr);gap:8px;display:grid}.result-line span{color:var(--muted)}.result-line strong{overflow-wrap:anywhere}.result-message{color:var(--text-soft)}.secret-reveal-label{color:var(--warn);font-size:12px;font-weight:800}.secret-reveal-value{color:var(--text-soft);letter-spacing:.12em;background:var(--panel);border:1px solid var(--line);border-radius:var(--radius-sm);text-overflow:ellipsis;white-space:nowrap;flex:auto;padding:6px 10px;font-size:13px;overflow:hidden}.modal-actions{background:var(--panel);border-top:1px solid var(--line);justify-content:flex-end;padding:12px 18px}.login-page{background:var(--bg);background-image:radial-gradient(900px 480px at 50% -8%, var(--hero-glow) 0%, #0000 70%), linear-gradient(var(--hero-grid) 1px, transparent 1px), linear-gradient(90deg, var(--hero-grid) 1px, transparent 1px);background-size:auto,44px 44px,44px 44px;place-items:center;min-height:100vh;padding:24px;display:grid;position:relative;overflow:hidden}.login-page .bg-orbs{z-index:0;pointer-events:none;position:absolute;inset:-60px}.login-page .bg-orb{filter:blur(100px);pointer-events:none;border-radius:50%;position:absolute}.login-page .bg-orb--1{background:color-mix(in srgb, var(--brand-2) 40%, transparent);width:700px;height:700px;animation:20s ease-in-out infinite loginOrbFloat1;top:-15%;left:-10%}.login-page .bg-orb--2{background:color-mix(in srgb, var(--brand) 38%, transparent);width:600px;height:600px;animation:24s ease-in-out infinite loginOrbFloat2;top:25%;right:-15%}.login-page .bg-orb--3{background:color-mix(in srgb, var(--brand-2) 30%, transparent);width:500px;height:500px;animation:28s ease-in-out infinite loginOrbFloat3;bottom:-15%;left:30%}@keyframes loginOrbFloat1{0%,to{transform:translate(0)scale(1)}33%{transform:translate(60px,-40px)scale(1.08)}66%{transform:translate(-30px,30px)scale(.92)}}@keyframes loginOrbFloat2{0%,to{transform:translate(0)scale(1)}33%{transform:translate(-50px,-35px)scale(.93)}66%{transform:translate(45px,25px)scale(1.07)}}@keyframes loginOrbFloat3{0%,to{transform:translate(0)scale(1)}33%{transform:translate(40px,45px)scale(1.06)}66%{transform:translate(-55px,-25px)scale(.94)}}@media (width<=720px){.login-page .bg-orb{filter:blur(60px)}.login-page .bg-orb--1{width:350px;height:350px}.login-page .bg-orb--2{width:300px;height:300px}.login-page .bg-orb--3{width:250px;height:250px}}@media (prefers-reduced-motion:reduce){.login-page .bg-orb{animation:none}}.login-page .login-panel{z-index:1;position:relative}.login-panel{background:var(--panel);border:1px solid var(--line);border-radius:var(--radius-lg);width:min(420px,100%);box-shadow:var(--shadow);gap:18px;padding:22px;display:grid}.login-head{justify-content:space-between;align-items:center;gap:12px;display:flex}.login-head-actions{flex-wrap:wrap;justify-content:flex-end;align-items:center;gap:8px;display:flex}.login-chip{min-height:24px;color:var(--brand);background:var(--brand-tint);border:1px solid var(--brand-tint-border);border-radius:999px;align-items:center;padding:0 8px;font-size:12px;display:inline-flex}.login-copy h1{color:var(--heading);margin:0;font-size:22px}.login-copy p{color:var(--muted);margin:8px 0 0}.form-stack{gap:12px;display:grid}.form-stack label{gap:6px;display:grid}.form-stack input{width:100%}.boot-screen{background:var(--bg);align-content:center;place-items:center;gap:18px;min-height:100vh;display:grid}.loader-bar{background:var(--line-strong);border-radius:999px;width:180px;height:4px;overflow:hidden}.loader-bar:before{content:"";background:var(--brand);width:42%;height:100%;animation:1s ease-in-out infinite load;display:block}.spin{animation:.8s linear infinite spin}@keyframes load{0%{transform:translate(-120%)}to{transform:translate(260%)}}@keyframes spin{to{transform:rotate(360deg)}}.secret-reveal{background:var(--warn-tint);border:1px solid var(--warn-border);border-radius:var(--radius);gap:6px;padding:10px;display:grid}.secret-reveal-label{color:var(--warn);align-items:center;gap:6px;font-size:12px;font-weight:800;display:flex}.secret-reveal-row{align-items:center;gap:10px;display:flex}.secret-reveal-value{color:var(--text-soft);letter-spacing:.12em;background:var(--panel);border:1px solid var(--line);border-radius:var(--radius-sm);text-overflow:ellipsis;white-space:nowrap;flex:auto;padding:6px 10px;overflow:hidden}@media (width<=1120px){.shell{grid-template-columns:1fr}.sidebar{height:auto;position:static}.nav-list{grid-template-columns:repeat(4,minmax(0,1fr))}.sidebar-status{display:none}.overview-band,.split-layout,.operation-row,.raw-grid,.message-selector-grid,.message-selector-grid.single{grid-template-columns:1fr}.action-dock{position:static}.action-groups{grid-template-columns:repeat(2,minmax(0,1fr))}}@media (width<=760px){.content,.topbar{padding-left:14px;padding-right:14px}.command-grid,.work-strip,.overview-metrics,.metric-row,.summary-grid,.command-steps,.action-groups{grid-template-columns:1fr}.sidebar{gap:12px;padding:14px}.nav-list{grid-template-columns:repeat(2,minmax(0,1fr))}.topbar,.page-title-row,.entity-head{flex-direction:column;align-items:flex-start}input,.searchbox{width:100%}.toolbar{align-items:stretch}.picker-row,.selected-entity{grid-template-columns:1fr}} diff --git a/cmd/telesrv-admin/web/dist/assets/index-D8u51wND.js b/cmd/telesrv-admin/web/dist/assets/index-CwTwvGWj.js similarity index 99% rename from cmd/telesrv-admin/web/dist/assets/index-D8u51wND.js rename to cmd/telesrv-admin/web/dist/assets/index-CwTwvGWj.js index 9c4c593c..fb9fa274 100644 --- a/cmd/telesrv-admin/web/dist/assets/index-D8u51wND.js +++ b/cmd/telesrv-admin/web/dist/assets/index-CwTwvGWj.js @@ -5,5 +5,5 @@ var e=Object.create,t=Object.defineProperty,n=Object.getOwnPropertyDescriptor,r= `+i[o].replace(` at new `,` at `);return e.displayName&&c.includes(``)&&(c=c.replace(``,e.displayName)),c}while(1<=o&&0<=s);break}}}finally{ie=!1,Error.prepareStackTrace=n}return(e=e?e.displayName||e.name:``)?re(e):``}function oe(e){switch(e.tag){case 5:return re(e.type);case 16:return re(`Lazy`);case 13:return re(`Suspense`);case 19:return re(`SuspenseList`);case 0:case 2:case 15:return e=ae(e.type,!1),e;case 11:return e=ae(e.type.render,!1),e;case 1:return e=ae(e.type,!0),e;default:return``}}function se(e){if(e==null)return null;if(typeof e==`function`)return e.displayName||e.name||null;if(typeof e==`string`)return e;switch(e){case E:return`Fragment`;case T:return`Portal`;case O:return`Profiler`;case D:return`StrictMode`;case M:return`Suspense`;case N:return`SuspenseList`}if(typeof e==`object`)switch(e.$$typeof){case A:return(e.displayName||`Context`)+`.Consumer`;case k:return(e._context.displayName||`Context`)+`.Provider`;case j:var t=e.render;return e=e.displayName,e||=(e=t.displayName||t.name||``,e===``?`ForwardRef`:`ForwardRef(`+e+`)`),e;case P:return t=e.displayName||null,t===null?se(e.type)||`Memo`:t;case F:t=e._payload,e=e._init;try{return se(e(t))}catch{}}return null}function ce(e){var t=e.type;switch(e.tag){case 24:return`Cache`;case 9:return(t.displayName||`Context`)+`.Consumer`;case 10:return(t._context.displayName||`Context`)+`.Provider`;case 18:return`DehydratedFragment`;case 11:return e=t.render,e=e.displayName||e.name||``,t.displayName||(e===``?`ForwardRef`:`ForwardRef(`+e+`)`);case 7:return`Fragment`;case 5:return t;case 4:return`Portal`;case 3:return`Root`;case 6:return`Text`;case 16:return se(t);case 8:return t===D?`StrictMode`:`Mode`;case 22:return`Offscreen`;case 12:return`Profiler`;case 21:return`Scope`;case 13:return`Suspense`;case 19:return`SuspenseList`;case 25:return`TracingMarker`;case 1:case 0:case 17:case 2:case 14:case 15:if(typeof t==`function`)return t.displayName||t.name||null;if(typeof t==`string`)return t}return null}function le(e){switch(typeof e){case`boolean`:case`number`:case`string`:case`undefined`:return e;case`object`:return e;default:return``}}function ue(e){var t=e.type;return(e=e.nodeName)&&e.toLowerCase()===`input`&&(t===`checkbox`||t===`radio`)}function de(e){var t=ue(e)?`checked`:`value`,n=Object.getOwnPropertyDescriptor(e.constructor.prototype,t),r=``+e[t];if(!e.hasOwnProperty(t)&&n!==void 0&&typeof n.get==`function`&&typeof n.set==`function`){var i=n.get,a=n.set;return Object.defineProperty(e,t,{configurable:!0,get:function(){return i.call(this)},set:function(e){r=``+e,a.call(this,e)}}),Object.defineProperty(e,t,{enumerable:n.enumerable}),{getValue:function(){return r},setValue:function(e){r=``+e},stopTracking:function(){e._valueTracker=null,delete e[t]}}}}function R(e){e._valueTracker||=de(e)}function fe(e){if(!e)return!1;var t=e._valueTracker;if(!t)return!0;var n=t.getValue(),r=``;return e&&(r=ue(e)?e.checked?`true`:`false`:e.value),e=r,e===n?!1:(t.setValue(e),!0)}function pe(e){if(e||=typeof document<`u`?document:void 0,e===void 0)return null;try{return e.activeElement||e.body}catch{return e.body}}function me(e,t){var n=t.checked;return ne({},t,{defaultChecked:void 0,defaultValue:void 0,value:void 0,checked:n??e._wrapperState.initialChecked})}function he(e,t){var n=t.defaultValue==null?``:t.defaultValue,r=t.checked==null?t.defaultChecked:t.checked;n=le(t.value==null?n:t.value),e._wrapperState={initialChecked:r,initialValue:n,controlled:t.type===`checkbox`||t.type===`radio`?t.checked!=null:t.value!=null}}function ge(e,t){t=t.checked,t!=null&&S(e,`checked`,t,!1)}function _e(e,t){ge(e,t);var n=le(t.value),r=t.type;if(n!=null)r===`number`?(n===0&&e.value===``||e.value!=n)&&(e.value=``+n):e.value!==``+n&&(e.value=``+n);else if(r===`submit`||r===`reset`){e.removeAttribute(`value`);return}t.hasOwnProperty(`value`)?ye(e,t.type,n):t.hasOwnProperty(`defaultValue`)&&ye(e,t.type,le(t.defaultValue)),t.checked==null&&t.defaultChecked!=null&&(e.defaultChecked=!!t.defaultChecked)}function ve(e,t,n){if(t.hasOwnProperty(`value`)||t.hasOwnProperty(`defaultValue`)){var r=t.type;if(!(r!==`submit`&&r!==`reset`||t.value!==void 0&&t.value!==null))return;t=``+e._wrapperState.initialValue,n||t===e.value||(e.value=t),e.defaultValue=t}n=e.name,n!==``&&(e.name=``),e.defaultChecked=!!e._wrapperState.initialChecked,n!==``&&(e.name=n)}function ye(e,t,n){(t!==`number`||pe(e.ownerDocument)!==e)&&(n==null?e.defaultValue=``+e._wrapperState.initialValue:e.defaultValue!==``+n&&(e.defaultValue=``+n))}var be=Array.isArray;function xe(e,t,n,r){if(e=e.options,t){t={};for(var i=0;i`+t.valueOf().toString()+``,t=De.firstChild;e.firstChild;)e.removeChild(e.firstChild);for(;t.firstChild;)e.appendChild(t.firstChild)}});function ke(e,t){if(t){var n=e.firstChild;if(n&&n===e.lastChild&&n.nodeType===3){n.nodeValue=t;return}}e.textContent=t}var Ae={animationIterationCount:!0,aspectRatio:!0,borderImageOutset:!0,borderImageSlice:!0,borderImageWidth:!0,boxFlex:!0,boxFlexGroup:!0,boxOrdinalGroup:!0,columnCount:!0,columns:!0,flex:!0,flexGrow:!0,flexPositive:!0,flexShrink:!0,flexNegative:!0,flexOrder:!0,gridArea:!0,gridRow:!0,gridRowEnd:!0,gridRowSpan:!0,gridRowStart:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnSpan:!0,gridColumnStart:!0,fontWeight:!0,lineClamp:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,tabSize:!0,widows:!0,zIndex:!0,zoom:!0,fillOpacity:!0,floodOpacity:!0,stopOpacity:!0,strokeDasharray:!0,strokeDashoffset:!0,strokeMiterlimit:!0,strokeOpacity:!0,strokeWidth:!0},je=[`Webkit`,`ms`,`Moz`,`O`];Object.keys(Ae).forEach(function(e){je.forEach(function(t){t=t+e.charAt(0).toUpperCase()+e.substring(1),Ae[t]=Ae[e]})});function Me(e,t,n){return t==null||typeof t==`boolean`||t===``?``:n||typeof t!=`number`||t===0||Ae.hasOwnProperty(e)&&Ae[e]?(``+t).trim():t+`px`}function Ne(e,t){for(var n in e=e.style,t)if(t.hasOwnProperty(n)){var r=n.indexOf(`--`)===0,i=Me(n,t[n],r);n===`float`&&(n=`cssFloat`),r?e.setProperty(n,i):e[n]=i}}var Pe=ne({menuitem:!0},{area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0});function Fe(e,t){if(t){if(Pe[e]&&(t.children!=null||t.dangerouslySetInnerHTML!=null))throw Error(r(137,e));if(t.dangerouslySetInnerHTML!=null){if(t.children!=null)throw Error(r(60));if(typeof t.dangerouslySetInnerHTML!=`object`||!(`__html`in t.dangerouslySetInnerHTML))throw Error(r(61))}if(t.style!=null&&typeof t.style!=`object`)throw Error(r(62))}}function Ie(e,t){if(e.indexOf(`-`)===-1)return typeof t.is==`string`;switch(e){case`annotation-xml`:case`color-profile`:case`font-face`:case`font-face-src`:case`font-face-uri`:case`font-face-format`:case`font-face-name`:case`missing-glyph`:return!1;default:return!0}}var Le=null;function Re(e){return e=e.target||e.srcElement||window,e.correspondingUseElement&&(e=e.correspondingUseElement),e.nodeType===3?e.parentNode:e}var ze=null,Be=null,Ve=null;function He(e){if(e=ji(e)){if(typeof ze!=`function`)throw Error(r(280));var t=e.stateNode;t&&(t=Ni(t),ze(e.stateNode,e.type,t))}}function Ue(e){Be?Ve?Ve.push(e):Ve=[e]:Be=e}function We(){if(Be){var e=Be,t=Ve;if(Ve=Be=null,He(e),t)for(e=0;e>>=0,e===0?32:31-(Ct(e)/wt|0)|0}var Et=64,Dt=4194304;function Ot(e){switch(e&-e){case 1:return 1;case 2:return 2;case 4:return 4;case 8:return 8;case 16:return 16;case 32:return 32;case 64:case 128:case 256:case 512:case 1024:case 2048:case 4096:case 8192:case 16384:case 32768:case 65536:case 131072:case 262144:case 524288:case 1048576:case 2097152:return e&4194240;case 4194304:case 8388608:case 16777216:case 33554432:case 67108864:return e&130023424;case 134217728:return 134217728;case 268435456:return 268435456;case 536870912:return 536870912;case 1073741824:return 1073741824;default:return e}}function kt(e,t){var n=e.pendingLanes;if(n===0)return 0;var r=0,i=e.suspendedLanes,a=e.pingedLanes,o=n&268435455;if(o!==0){var s=o&~i;s===0?(a&=o,a!==0&&(r=Ot(a))):r=Ot(s)}else o=n&~i,o===0?a!==0&&(r=Ot(a)):r=Ot(o);if(r===0)return 0;if(t!==0&&t!==r&&(t&i)===0&&(i=r&-r,a=t&-t,i>=a||i===16&&a&4194240))return t;if(r&4&&(r|=n&16),t=e.entangledLanes,t!==0)for(e=e.entanglements,t&=r;0n;n++)t.push(e);return t}function Pt(e,t,n){e.pendingLanes|=t,t!==536870912&&(e.suspendedLanes=0,e.pingedLanes=0),e=e.eventTimes,t=31-St(t),e[t]=n}function G(e,t){var n=e.pendingLanes&~t;e.pendingLanes=t,e.suspendedLanes=0,e.pingedLanes=0,e.expiredLanes&=t,e.mutableReadLanes&=t,e.entangledLanes&=t,t=e.entanglements;var r=e.eventTimes;for(e=e.expirationTimes;0=Gn),Jn=` `,Yn=!1;function Xn(e,t){switch(e){case`keyup`:return Un.indexOf(t.keyCode)!==-1;case`keydown`:return t.keyCode!==229;case`keypress`:case`mousedown`:case`focusout`:return!0;default:return!1}}function Zn(e){return e=e.detail,typeof e==`object`&&`data`in e?e.data:null}var Qn=!1;function $n(e,t){switch(e){case`compositionend`:return Zn(t);case`keypress`:return t.which===32?(Yn=!0,Jn):null;case`textInput`:return e=t.data,e===Jn&&Yn?null:e;default:return null}}function er(e,t){if(Qn)return e===`compositionend`||!Wn&&Xn(e,t)?(e=X(),mn=pn=fn=null,Qn=!1,e):null;switch(e){case`paste`:return null;case`keypress`:if(!(t.ctrlKey||t.altKey||t.metaKey)||t.ctrlKey&&t.altKey){if(t.char&&1=t)return{node:n,offset:t-e};e=r}a:{for(;n;){if(n.nextSibling){n=n.nextSibling;break a}n=n.parentNode}n=void 0}n=xr(n)}}function Cr(e,t){return e&&t?e===t?!0:e&&e.nodeType===3?!1:t&&t.nodeType===3?Cr(e,t.parentNode):`contains`in e?e.contains(t):e.compareDocumentPosition?!!(e.compareDocumentPosition(t)&16):!1:!1}function wr(){for(var e=window,t=pe();t instanceof e.HTMLIFrameElement;){try{var n=typeof t.contentWindow.location.href==`string`}catch{n=!1}if(n)e=t.contentWindow;else break;t=pe(e.document)}return t}function Tr(e){var t=e&&e.nodeName&&e.nodeName.toLowerCase();return t&&(t===`input`&&(e.type===`text`||e.type===`search`||e.type===`tel`||e.type===`url`||e.type===`password`)||t===`textarea`||e.contentEditable===`true`)}function Er(e){var t=wr(),n=e.focusedElem,r=e.selectionRange;if(t!==n&&n&&n.ownerDocument&&Cr(n.ownerDocument.documentElement,n)){if(r!==null&&Tr(n)){if(t=r.start,e=r.end,e===void 0&&(e=t),`selectionStart`in n)n.selectionStart=t,n.selectionEnd=Math.min(e,n.value.length);else if(e=(t=n.ownerDocument||document)&&t.defaultView||window,e.getSelection){e=e.getSelection();var i=n.textContent.length,a=Math.min(r.start,i);r=r.end===void 0?a:Math.min(r.end,i),!e.extend&&a>r&&(i=r,r=a,a=i),i=Sr(n,a);var o=Sr(n,r);i&&o&&(e.rangeCount!==1||e.anchorNode!==i.node||e.anchorOffset!==i.offset||e.focusNode!==o.node||e.focusOffset!==o.offset)&&(t=t.createRange(),t.setStart(i.node,i.offset),e.removeAllRanges(),a>r?(e.addRange(t),e.extend(o.node,o.offset)):(t.setEnd(o.node,o.offset),e.addRange(t)))}}for(t=[],e=n;e=e.parentNode;)e.nodeType===1&&t.push({element:e,left:e.scrollLeft,top:e.scrollTop});for(typeof n.focus==`function`&&n.focus(),n=0;n=document.documentMode,Or=null,kr=null,Ar=null,jr=!1;function Mr(e,t,n){var r=n.window===n?n.document:n.nodeType===9?n:n.ownerDocument;jr||Or==null||Or!==pe(r)||(r=Or,`selectionStart`in r&&Tr(r)?r={start:r.selectionStart,end:r.selectionEnd}:(r=(r.ownerDocument&&r.ownerDocument.defaultView||window).getSelection(),r={anchorNode:r.anchorNode,anchorOffset:r.anchorOffset,focusNode:r.focusNode,focusOffset:r.focusOffset}),Ar&&br(Ar,r)||(Ar=r,r=ii(kr,`onSelect`),0Fi||(e.current=Pi[Fi],Pi[Fi]=null,Fi--)}function Ri(e,t){Fi++,Pi[Fi]=e.current,e.current=t}var zi={},Bi=Ii(zi),Vi=Ii(!1),Hi=zi;function Ui(e,t){var n=e.type.contextTypes;if(!n)return zi;var r=e.stateNode;if(r&&r.__reactInternalMemoizedUnmaskedChildContext===t)return r.__reactInternalMemoizedMaskedChildContext;var i={},a;for(a in n)i[a]=t[a];return r&&(e=e.stateNode,e.__reactInternalMemoizedUnmaskedChildContext=t,e.__reactInternalMemoizedMaskedChildContext=i),i}function Wi(e){return e=e.childContextTypes,e!=null}function Gi(){Li(Vi),Li(Bi)}function Ki(e,t,n){if(Bi.current!==zi)throw Error(r(168));Ri(Bi,t),Ri(Vi,n)}function qi(e,t,n){var i=e.stateNode;if(t=t.childContextTypes,typeof i.getChildContext!=`function`)return n;for(var a in i=i.getChildContext(),i)if(!(a in t))throw Error(r(108,ce(e)||`Unknown`,a));return ne({},n,i)}function Ji(e){return e=(e=e.stateNode)&&e.__reactInternalMemoizedMergedChildContext||zi,Hi=Bi.current,Ri(Bi,e),Ri(Vi,Vi.current),!0}function Yi(e,t,n){var i=e.stateNode;if(!i)throw Error(r(169));n?(e=qi(e,t,Hi),i.__reactInternalMemoizedMergedChildContext=e,Li(Vi),Li(Bi),Ri(Bi,e)):Li(Vi),Ri(Vi,n)}var Xi=null,Zi=!1,Qi=!1;function $i(e){Xi===null?Xi=[e]:Xi.push(e)}function ea(e){Zi=!0,$i(e)}function ta(){if(!Qi&&Xi!==null){Qi=!0;var e=0,t=q;try{var n=Xi;for(q=1;e>=o,i-=o,la=1<<32-St(t)+i|n<h?(g=d,d=null):g=d.sibling;var _=p(r,d,s[h],c);if(_===null){d===null&&(d=g);break}e&&d&&_.alternate===null&&t(r,d),a=o(_,a,h),u===null?l=_:u.sibling=_,u=_,d=g}if(h===s.length)return n(r,d),_a&&da(r,h),l;if(d===null){for(;hg?(_=h,h=null):_=h.sibling;var y=p(a,h,v.value,l);if(y===null){h===null&&(h=_);break}e&&h&&y.alternate===null&&t(a,h),s=o(y,s,g),d===null?u=y:d.sibling=y,d=y,h=_}if(v.done)return n(a,h),_a&&da(a,g),u;if(h===null){for(;!v.done;g++,v=c.next())v=f(a,v.value,l),v!==null&&(s=o(v,s,g),d===null?u=v:d.sibling=v,d=v);return _a&&da(a,g),u}for(h=i(a,h);!v.done;g++,v=c.next())v=m(h,a,g,v.value,l),v!==null&&(e&&v.alternate!==null&&h.delete(v.key===null?g:v.key),s=o(v,s,g),d===null?u=v:d.sibling=v,d=v);return e&&h.forEach(function(e){return t(a,e)}),_a&&da(a,g),u}function _(e,r,i,o){if(typeof i==`object`&&i&&i.type===E&&i.key===null&&(i=i.props.children),typeof i==`object`&&i){switch(i.$$typeof){case w:a:{for(var c=i.key,l=r;l!==null;){if(l.key===c){if(c=i.type,c===E){if(l.tag===7){n(e,l.sibling),r=a(l,i.props.children),r.return=e,e=r;break a}}else if(l.elementType===c||typeof c==`object`&&c&&c.$$typeof===F&&ja(c)===l.type){n(e,l.sibling),r=a(l,i.props),r.ref=ka(e,l,i),r.return=e,e=r;break a}n(e,l);break}else t(e,l);l=l.sibling}i.type===E?(r=Zl(i.props.children,e.mode,o,i.key),r.return=e,e=r):(o=Xl(i.type,i.key,i.props,null,e.mode,o),o.ref=ka(e,r,i),o.return=e,e=o)}return s(e);case T:a:{for(l=i.key;r!==null;){if(r.key===l)if(r.tag===4&&r.stateNode.containerInfo===i.containerInfo&&r.stateNode.implementation===i.implementation){n(e,r.sibling),r=a(r,i.children||[]),r.return=e,e=r;break a}else{n(e,r);break}else t(e,r);r=r.sibling}r=eu(i,e.mode,o),r.return=e,e=r}return s(e);case F:return l=i._init,_(e,r,l(i._payload),o)}if(be(i))return h(e,r,i,o);if(te(i))return g(e,r,i,o);Aa(e,i)}return typeof i==`string`&&i!==``||typeof i==`number`?(i=``+i,r!==null&&r.tag===6?(n(e,r.sibling),r=a(r,i),r.return=e,e=r):(n(e,r),r=$l(i,e.mode,o),r.return=e,e=r),s(e)):n(e,r)}return _}var Na=Ma(!0),Pa=Ma(!1),Fa=Ii(null),Ia=null,La=null,Ra=null;function za(){Ra=La=Ia=null}function Ba(e){var t=Fa.current;Li(Fa),e._currentValue=t}function Va(e,t,n){for(;e!==null;){var r=e.alternate;if((e.childLanes&t)===t?r!==null&&(r.childLanes&t)!==t&&(r.childLanes|=t):(e.childLanes|=t,r!==null&&(r.childLanes|=t)),e===n)break;e=e.return}}function Ha(e,t){Ia=e,Ra=La=null,e=e.dependencies,e!==null&&e.firstContext!==null&&((e.lanes&t)!==0&&(Ms=!0),e.firstContext=null)}function Ua(e){var t=e._currentValue;if(Ra!==e)if(e={context:e,memoizedValue:t,next:null},La===null){if(Ia===null)throw Error(r(308));La=e,Ia.dependencies={lanes:0,firstContext:e}}else La=La.next=e;return t}var Wa=null;function Ga(e){Wa===null?Wa=[e]:Wa.push(e)}function Ka(e,t,n,r){var i=t.interleaved;return i===null?(n.next=n,Ga(t)):(n.next=i.next,i.next=n),t.interleaved=n,qa(e,r)}function qa(e,t){e.lanes|=t;var n=e.alternate;for(n!==null&&(n.lanes|=t),n=e,e=e.return;e!==null;)e.childLanes|=t,n=e.alternate,n!==null&&(n.childLanes|=t),n=e,e=e.return;return n.tag===3?n.stateNode:null}var Ja=!1;function Ya(e){e.updateQueue={baseState:e.memoizedState,firstBaseUpdate:null,lastBaseUpdate:null,shared:{pending:null,interleaved:null,lanes:0},effects:null}}function Xa(e,t){e=e.updateQueue,t.updateQueue===e&&(t.updateQueue={baseState:e.baseState,firstBaseUpdate:e.firstBaseUpdate,lastBaseUpdate:e.lastBaseUpdate,shared:e.shared,effects:e.effects})}function Za(e,t){return{eventTime:e,lane:t,tag:0,payload:null,callback:null,next:null}}function Qa(e,t,n){var r=e.updateQueue;if(r===null)return null;if(r=r.shared,$&2){var i=r.pending;return i===null?t.next=t:(t.next=i.next,i.next=t),r.pending=t,qa(e,n)}return i=r.interleaved,i===null?(t.next=t,Ga(r)):(t.next=i.next,i.next=t),r.interleaved=t,qa(e,n)}function $a(e,t,n){if(t=t.updateQueue,t!==null&&(t=t.shared,n&4194240)){var r=t.lanes;r&=e.pendingLanes,n|=r,t.lanes=n,K(e,n)}}function eo(e,t){var n=e.updateQueue,r=e.alternate;if(r!==null&&(r=r.updateQueue,n===r)){var i=null,a=null;if(n=n.firstBaseUpdate,n!==null){do{var o={eventTime:n.eventTime,lane:n.lane,tag:n.tag,payload:n.payload,callback:n.callback,next:null};a===null?i=a=o:a=a.next=o,n=n.next}while(n!==null);a===null?i=a=t:a=a.next=t}else i=a=t;n={baseState:r.baseState,firstBaseUpdate:i,lastBaseUpdate:a,shared:r.shared,effects:r.effects},e.updateQueue=n;return}e=n.lastBaseUpdate,e===null?n.firstBaseUpdate=t:e.next=t,n.lastBaseUpdate=t}function to(e,t,n,r){var i=e.updateQueue;Ja=!1;var a=i.firstBaseUpdate,o=i.lastBaseUpdate,s=i.shared.pending;if(s!==null){i.shared.pending=null;var c=s,l=c.next;c.next=null,o===null?a=l:o.next=l,o=c;var u=e.alternate;u!==null&&(u=u.updateQueue,s=u.lastBaseUpdate,s!==o&&(s===null?u.firstBaseUpdate=l:s.next=l,u.lastBaseUpdate=c))}if(a!==null){var d=i.baseState;o=0,u=l=c=null,s=a;do{var f=s.lane,p=s.eventTime;if((r&f)===f){u!==null&&(u=u.next={eventTime:p,lane:0,tag:s.tag,payload:s.payload,callback:s.callback,next:null});a:{var m=e,h=s;switch(f=t,p=n,h.tag){case 1:if(m=h.payload,typeof m==`function`){d=m.call(p,d,f);break a}d=m;break a;case 3:m.flags=m.flags&-65537|128;case 0:if(m=h.payload,f=typeof m==`function`?m.call(p,d,f):m,f==null)break a;d=ne({},d,f);break a;case 2:Ja=!0}}s.callback!==null&&s.lane!==0&&(e.flags|=64,f=i.effects,f===null?i.effects=[s]:f.push(s))}else p={eventTime:p,lane:f,tag:s.tag,payload:s.payload,callback:s.callback,next:null},u===null?(l=u=p,c=d):u=u.next=p,o|=f;if(s=s.next,s===null){if(s=i.shared.pending,s===null)break;f=s,s=f.next,f.next=null,i.lastBaseUpdate=f,i.shared.pending=null}}while(1);if(u===null&&(c=d),i.baseState=c,i.firstBaseUpdate=l,i.lastBaseUpdate=u,t=i.shared.interleaved,t!==null){i=t;do o|=i.lane,i=i.next;while(i!==t)}else a===null&&(i.shared.lanes=0);Jc|=o,e.lanes=o,e.memoizedState=d}}function no(e,t,n){if(e=t.effects,t.effects=null,e!==null)for(t=0;tn?n:4,e(!0);var r=vo.transition;vo.transition={};try{e(!1),t()}finally{q=n,vo.transition=r}}function as(){return Mo().memoizedState}function os(e,t,n){var r=pl(e);if(n={lane:r,action:n,hasEagerState:!1,eagerState:null,next:null},cs(e))ls(t,n);else if(n=Ka(e,t,n,r),n!==null){var i=fl();ml(n,e,r,i),us(n,t,r)}}function ss(e,t,n){var r=pl(e),i={lane:r,action:n,hasEagerState:!1,eagerState:null,next:null};if(cs(e))ls(t,i);else{var a=e.alternate;if(e.lanes===0&&(a===null||a.lanes===0)&&(a=t.lastRenderedReducer,a!==null))try{var o=t.lastRenderedState,s=a(o,n);if(i.hasEagerState=!0,i.eagerState=s,Z(s,o)){var c=t.interleaved;c===null?(i.next=i,Ga(t)):(i.next=c.next,c.next=i),t.interleaved=i;return}}catch{}n=Ka(e,t,i,r),n!==null&&(i=fl(),ml(n,e,r,i),us(n,t,r))}}function cs(e){var t=e.alternate;return e===bo||t!==null&&t===bo}function ls(e,t){wo=Co=!0;var n=e.pending;n===null?t.next=t:(t.next=n.next,n.next=t),e.pending=t}function us(e,t,n){if(n&4194240){var r=t.lanes;r&=e.pendingLanes,n|=r,t.lanes=n,K(e,n)}}var ds={readContext:Ua,useCallback:Do,useContext:Do,useEffect:Do,useImperativeHandle:Do,useInsertionEffect:Do,useLayoutEffect:Do,useMemo:Do,useReducer:Do,useRef:Do,useState:Do,useDebugValue:Do,useDeferredValue:Do,useTransition:Do,useMutableSource:Do,useSyncExternalStore:Do,useId:Do,unstable_isNewReconciler:!1},fs={readContext:Ua,useCallback:function(e,t){return jo().memoizedState=[e,t===void 0?null:t],e},useContext:Ua,useEffect:Jo,useImperativeHandle:function(e,t,n){return n=n==null?null:n.concat([e]),Ko(4194308,4,Qo.bind(null,t,e),n)},useLayoutEffect:function(e,t){return Ko(4194308,4,e,t)},useInsertionEffect:function(e,t){return Ko(4,2,e,t)},useMemo:function(e,t){var n=jo();return t=t===void 0?null:t,e=e(),n.memoizedState=[e,t],e},useReducer:function(e,t,n){var r=jo();return t=n===void 0?t:n(t),r.memoizedState=r.baseState=t,e={pending:null,interleaved:null,lanes:0,dispatch:null,lastRenderedReducer:e,lastRenderedState:t},r.queue=e,e=e.dispatch=os.bind(null,bo,e),[r.memoizedState,e]},useRef:function(e){var t=jo();return e={current:e},t.memoizedState=e},useState:Uo,useDebugValue:es,useDeferredValue:function(e){return jo().memoizedState=e},useTransition:function(){var e=Uo(!1),t=e[0];return e=is.bind(null,e[1]),jo().memoizedState=e,[t,e]},useMutableSource:function(){},useSyncExternalStore:function(e,t,n){var i=bo,a=jo();if(_a){if(n===void 0)throw Error(r(407));n=n()}else{if(n=t(),Vc===null)throw Error(r(349));yo&30||Ro(i,t,n)}a.memoizedState=n;var o={value:n,getSnapshot:t};return a.queue=o,Jo(Bo.bind(null,i,o,e),[e]),i.flags|=2048,Wo(9,zo.bind(null,i,o,n,t),void 0,null),n},useId:function(){var e=jo(),t=Vc.identifierPrefix;if(_a){var n=ua,r=la;n=(r&~(1<<32-St(r)-1)).toString(32)+n,t=`:`+t+`R`+n,n=To++,0<\/script>`,e=e.removeChild(e.firstChild)):typeof i.is==`string`?e=c.createElement(n,{is:i.is}):(e=c.createElement(n),n===`select`&&(c=e,i.multiple?c.multiple=!0:i.size&&(c.size=i.size))):e=c.createElementNS(e,n),e[wi]=t,e[Ti]=i,nc(e,t,!1,!1),t.stateNode=e;a:{switch(c=Ie(n,i),n){case`dialog`:Zr(`cancel`,e),Zr(`close`,e),o=i;break;case`iframe`:case`object`:case`embed`:Zr(`load`,e),o=i;break;case`video`:case`audio`:for(o=0;oel&&(t.flags|=128,i=!0,ac(s,!1),t.lanes=4194304)}else{if(!i)if(e=mo(c),e!==null){if(t.flags|=128,i=!0,n=e.updateQueue,n!==null&&(t.updateQueue=n,t.flags|=4),ac(s,!0),s.tail===null&&s.tailMode===`hidden`&&!c.alternate&&!_a)return oc(t),null}else 2*mt()-s.renderingStartTime>el&&n!==1073741824&&(t.flags|=128,i=!0,ac(s,!1),t.lanes=4194304);s.isBackwards?(c.sibling=t.child,t.child=c):(n=s.last,n===null?t.child=c:n.sibling=c,s.last=c)}return s.tail===null?(oc(t),null):(t=s.tail,s.rendering=t,s.tail=t.sibling,s.renderingStartTime=mt(),t.sibling=null,n=po.current,Ri(po,i?n&1|2:n&1),t);case 22:case 23:return wl(),i=t.memoizedState!==null,e!==null&&e.memoizedState!==null!==i&&(t.flags|=8192),i&&t.mode&1?Wc&1073741824&&(oc(t),t.subtreeFlags&6&&(t.flags|=8192)):oc(t),null;case 24:return null;case 25:return null}throw Error(r(156,t.tag))}function cc(e,t){switch(ma(t),t.tag){case 1:return Wi(t.type)&&Gi(),e=t.flags,e&65536?(t.flags=e&-65537|128,t):null;case 3:return lo(),Li(Vi),Li(Bi),go(),e=t.flags,e&65536&&!(e&128)?(t.flags=e&-65537|128,t):null;case 5:return fo(t),null;case 13:if(Li(po),e=t.memoizedState,e!==null&&e.dehydrated!==null){if(t.alternate===null)throw Error(r(340));Ea()}return e=t.flags,e&65536?(t.flags=e&-65537|128,t):null;case 19:return Li(po),null;case 4:return lo(),null;case 10:return Ba(t.type._context),null;case 22:case 23:return wl(),null;case 24:return null;default:return null}}var lc=!1,uc=!1,dc=typeof WeakSet==`function`?WeakSet:Set,Q=null;function fc(e,t){var n=e.ref;if(n!==null)if(typeof n==`function`)try{n(null)}catch(n){Rl(e,t,n)}else n.current=null}function pc(e,t,n){try{n()}catch(n){Rl(e,t,n)}}var mc=!1;function hc(e,t){if(fi=an,e=wr(),Tr(e)){if(`selectionStart`in e)var n={start:e.selectionStart,end:e.selectionEnd};else a:{n=(n=e.ownerDocument)&&n.defaultView||window;var i=n.getSelection&&n.getSelection();if(i&&i.rangeCount!==0){n=i.anchorNode;var a=i.anchorOffset,o=i.focusNode;i=i.focusOffset;try{n.nodeType,o.nodeType}catch{n=null;break a}var s=0,c=-1,l=-1,u=0,d=0,f=e,p=null;b:for(;;){for(var m;f!==n||a!==0&&f.nodeType!==3||(c=s+a),f!==o||i!==0&&f.nodeType!==3||(l=s+i),f.nodeType===3&&(s+=f.nodeValue.length),(m=f.firstChild)!==null;)p=f,f=m;for(;;){if(f===e)break b;if(p===n&&++u===a&&(c=s),p===o&&++d===i&&(l=s),(m=f.nextSibling)!==null)break;f=p,p=f.parentNode}f=m}n=c===-1||l===-1?null:{start:c,end:l}}else n=null}n||={start:0,end:0}}else n=null;for(pi={focusedElem:e,selectionRange:n},an=!1,Q=t;Q!==null;)if(t=Q,e=t.child,t.subtreeFlags&1028&&e!==null)e.return=t,Q=e;else for(;Q!==null;){t=Q;try{var h=t.alternate;if(t.flags&1024)switch(t.tag){case 0:case 11:case 15:break;case 1:if(h!==null){var g=h.memoizedProps,_=h.memoizedState,v=t.stateNode;v.__reactInternalSnapshotBeforeUpdate=v.getSnapshotBeforeUpdate(t.elementType===t.type?g:hs(t.type,g),_)}break;case 3:var y=t.stateNode.containerInfo;y.nodeType===1?y.textContent=``:y.nodeType===9&&y.documentElement&&y.removeChild(y.documentElement);break;case 5:case 6:case 4:case 17:break;default:throw Error(r(163))}}catch(e){Rl(t,t.return,e)}if(e=t.sibling,e!==null){e.return=t.return,Q=e;break}Q=t.return}return h=mc,mc=!1,h}function gc(e,t,n){var r=t.updateQueue;if(r=r===null?null:r.lastEffect,r!==null){var i=r=r.next;do{if((i.tag&e)===e){var a=i.destroy;i.destroy=void 0,a!==void 0&&pc(t,n,a)}i=i.next}while(i!==r)}}function _c(e,t){if(t=t.updateQueue,t=t===null?null:t.lastEffect,t!==null){var n=t=t.next;do{if((n.tag&e)===e){var r=n.create;n.destroy=r()}n=n.next}while(n!==t)}}function vc(e){var t=e.ref;if(t!==null){var n=e.stateNode;switch(e.tag){case 5:e=n;break;default:e=n}typeof t==`function`?t(e):t.current=e}}function yc(e){var t=e.alternate;t!==null&&(e.alternate=null,yc(t)),e.child=null,e.deletions=null,e.sibling=null,e.tag===5&&(t=e.stateNode,t!==null&&(delete t[wi],delete t[Ti],delete t[Di],delete t[Oi],delete t[ki])),e.stateNode=null,e.return=null,e.dependencies=null,e.memoizedProps=null,e.memoizedState=null,e.pendingProps=null,e.stateNode=null,e.updateQueue=null}function bc(e){return e.tag===5||e.tag===3||e.tag===4}function xc(e){a:for(;;){for(;e.sibling===null;){if(e.return===null||bc(e.return))return null;e=e.return}for(e.sibling.return=e.return,e=e.sibling;e.tag!==5&&e.tag!==6&&e.tag!==18;){if(e.flags&2||e.child===null||e.tag===4)continue a;e.child.return=e,e=e.child}if(!(e.flags&2))return e.stateNode}}function Sc(e,t,n){var r=e.tag;if(r===5||r===6)e=e.stateNode,t?n.nodeType===8?n.parentNode.insertBefore(e,t):n.insertBefore(e,t):(n.nodeType===8?(t=n.parentNode,t.insertBefore(e,n)):(t=n,t.appendChild(e)),n=n._reactRootContainer,n!=null||t.onclick!==null||(t.onclick=di));else if(r!==4&&(e=e.child,e!==null))for(Sc(e,t,n),e=e.sibling;e!==null;)Sc(e,t,n),e=e.sibling}function Cc(e,t,n){var r=e.tag;if(r===5||r===6)e=e.stateNode,t?n.insertBefore(e,t):n.appendChild(e);else if(r!==4&&(e=e.child,e!==null))for(Cc(e,t,n),e=e.sibling;e!==null;)Cc(e,t,n),e=e.sibling}var wc=null,Tc=!1;function Ec(e,t,n){for(n=n.child;n!==null;)Dc(e,t,n),n=n.sibling}function Dc(e,t,n){if(bt&&typeof bt.onCommitFiberUnmount==`function`)try{bt.onCommitFiberUnmount(yt,n)}catch{}switch(n.tag){case 5:uc||fc(n,t);case 6:var r=wc,i=Tc;wc=null,Ec(e,t,n),wc=r,Tc=i,wc!==null&&(Tc?(e=wc,n=n.stateNode,e.nodeType===8?e.parentNode.removeChild(n):e.removeChild(n)):wc.removeChild(n.stateNode));break;case 18:wc!==null&&(Tc?(e=wc,n=n.stateNode,e.nodeType===8?bi(e.parentNode,n):e.nodeType===1&&bi(e,n),nn(e)):bi(wc,n.stateNode));break;case 4:r=wc,i=Tc,wc=n.stateNode.containerInfo,Tc=!0,Ec(e,t,n),wc=r,Tc=i;break;case 0:case 11:case 14:case 15:if(!uc&&(r=n.updateQueue,r!==null&&(r=r.lastEffect,r!==null))){i=r=r.next;do{var a=i,o=a.destroy;a=a.tag,o!==void 0&&(a&2||a&4)&&pc(n,t,o),i=i.next}while(i!==r)}Ec(e,t,n);break;case 1:if(!uc&&(fc(n,t),r=n.stateNode,typeof r.componentWillUnmount==`function`))try{r.props=n.memoizedProps,r.state=n.memoizedState,r.componentWillUnmount()}catch(e){Rl(n,t,e)}Ec(e,t,n);break;case 21:Ec(e,t,n);break;case 22:n.mode&1?(uc=(r=uc)||n.memoizedState!==null,Ec(e,t,n),uc=r):Ec(e,t,n);break;default:Ec(e,t,n)}}function Oc(e){var t=e.updateQueue;if(t!==null){e.updateQueue=null;var n=e.stateNode;n===null&&(n=e.stateNode=new dc),t.forEach(function(t){var r=Hl.bind(null,e,t);n.has(t)||(n.add(t),t.then(r,r))})}}function kc(e,t){var n=t.deletions;if(n!==null)for(var i=0;ia&&(a=s),i&=~o}if(i=a,i=mt()-i,i=(120>i?120:480>i?480:1080>i?1080:1920>i?1920:3e3>i?3e3:4320>i?4320:1960*Lc(i/1960))-i,10e?16:e,ol===null)var i=!1;else{if(e=ol,ol=null,sl=0,$&6)throw Error(r(331));var a=$;for($|=4,Q=e.current;Q!==null;){var o=Q,s=o.child;if(Q.flags&16){var c=o.deletions;if(c!==null){for(var l=0;lmt()-$c?Tl(e,0):Xc|=n),hl(e,t)}function Bl(e,t){t===0&&(e.mode&1?(t=Dt,Dt<<=1,!(Dt&130023424)&&(Dt=4194304)):t=1);var n=fl();e=qa(e,t),e!==null&&(Pt(e,t,n),hl(e,n))}function Vl(e){var t=e.memoizedState,n=0;t!==null&&(n=t.retryLane),Bl(e,n)}function Hl(e,t){var n=0;switch(e.tag){case 13:var i=e.stateNode,a=e.memoizedState;a!==null&&(n=a.retryLane);break;case 19:i=e.stateNode;break;default:throw Error(r(314))}i!==null&&i.delete(t),Bl(e,n)}var Ul=function(e,t,n){if(e!==null)if(e.memoizedProps!==t.pendingProps||Vi.current)Ms=!0;else{if((e.lanes&n)===0&&!(t.flags&128))return Ms=!1,tc(e,t,n);Ms=!!(e.flags&131072)}else Ms=!1,_a&&t.flags&1048576&&fa(t,aa,t.index);switch(t.lanes=0,t.tag){case 2:var i=t.type;$s(e,t),e=t.pendingProps;var a=Ui(t,Bi.current);Ha(t,n),a=ko(null,t,i,e,a,n);var o=Ao();return t.flags|=1,typeof a==`object`&&a&&typeof a.render==`function`&&a.$$typeof===void 0?(t.tag=1,t.memoizedState=null,t.updateQueue=null,Wi(i)?(o=!0,Ji(t)):o=!1,t.memoizedState=a.state!==null&&a.state!==void 0?a.state:null,Ya(t),a.updater=_s,t.stateNode=a,a._reactInternals=t,xs(t,i,e,n),t=Vs(null,t,i,!0,o,n)):(t.tag=0,_a&&o&&pa(t),Ns(null,t,a,n),t=t.child),t;case 16:i=t.elementType;a:{switch($s(e,t),e=t.pendingProps,a=i._init,i=a(i._payload),t.type=i,a=t.tag=Jl(i),e=hs(i,e),a){case 0:t=zs(null,t,i,e,n);break a;case 1:t=Bs(null,t,i,e,n);break a;case 11:t=Ps(null,t,i,e,n);break a;case 14:t=Fs(null,t,i,hs(i.type,e),n);break a}throw Error(r(306,i,``))}return t;case 0:return i=t.type,a=t.pendingProps,a=t.elementType===i?a:hs(i,a),zs(e,t,i,a,n);case 1:return i=t.type,a=t.pendingProps,a=t.elementType===i?a:hs(i,a),Bs(e,t,i,a,n);case 3:a:{if(Hs(t),e===null)throw Error(r(387));i=t.pendingProps,o=t.memoizedState,a=o.element,Xa(e,t),to(t,i,null,n);var s=t.memoizedState;if(i=s.element,o.isDehydrated)if(o={element:i,isDehydrated:!1,cache:s.cache,pendingSuspenseBoundaries:s.pendingSuspenseBoundaries,transitions:s.transitions},t.updateQueue.baseState=o,t.memoizedState=o,t.flags&256){a=Ss(Error(r(423)),t),t=Us(e,t,i,n,a);break a}else if(i!==a){a=Ss(Error(r(424)),t),t=Us(e,t,i,n,a);break a}else for(ga=xi(t.stateNode.containerInfo.firstChild),ha=t,_a=!0,va=null,n=Pa(t,null,i,n),t.child=n;n;)n.flags=n.flags&-3|4096,n=n.sibling;else{if(Ea(),i===a){t=ec(e,t,n);break a}Ns(e,t,i,n)}t=t.child}return t;case 5:return uo(t),e===null&&Sa(t),i=t.type,a=t.pendingProps,o=e===null?null:e.memoizedProps,s=a.children,mi(i,a)?s=null:o!==null&&mi(i,o)&&(t.flags|=32),Rs(e,t),Ns(e,t,s,n),t.child;case 6:return e===null&&Sa(t),null;case 13:return Ks(e,t,n);case 4:return co(t,t.stateNode.containerInfo),i=t.pendingProps,e===null?t.child=Na(t,null,i,n):Ns(e,t,i,n),t.child;case 11:return i=t.type,a=t.pendingProps,a=t.elementType===i?a:hs(i,a),Ps(e,t,i,a,n);case 7:return Ns(e,t,t.pendingProps,n),t.child;case 8:return Ns(e,t,t.pendingProps.children,n),t.child;case 12:return Ns(e,t,t.pendingProps.children,n),t.child;case 10:a:{if(i=t.type._context,a=t.pendingProps,o=t.memoizedProps,s=a.value,Ri(Fa,i._currentValue),i._currentValue=s,o!==null)if(Z(o.value,s)){if(o.children===a.children&&!Vi.current){t=ec(e,t,n);break a}}else for(o=t.child,o!==null&&(o.return=t);o!==null;){var c=o.dependencies;if(c!==null){s=o.child;for(var l=c.firstContext;l!==null;){if(l.context===i){if(o.tag===1){l=Za(-1,n&-n),l.tag=2;var u=o.updateQueue;if(u!==null){u=u.shared;var d=u.pending;d===null?l.next=l:(l.next=d.next,d.next=l),u.pending=l}}o.lanes|=n,l=o.alternate,l!==null&&(l.lanes|=n),Va(o.return,n,t),c.lanes|=n;break}l=l.next}}else if(o.tag===10)s=o.type===t.type?null:o.child;else if(o.tag===18){if(s=o.return,s===null)throw Error(r(341));s.lanes|=n,c=s.alternate,c!==null&&(c.lanes|=n),Va(s,n,t),s=o.sibling}else s=o.child;if(s!==null)s.return=o;else for(s=o;s!==null;){if(s===t){s=null;break}if(o=s.sibling,o!==null){o.return=s.return,s=o;break}s=s.return}o=s}Ns(e,t,a.children,n),t=t.child}return t;case 9:return a=t.type,i=t.pendingProps.children,Ha(t,n),a=Ua(a),i=i(a),t.flags|=1,Ns(e,t,i,n),t.child;case 14:return i=t.type,a=hs(i,t.pendingProps),a=hs(i.type,a),Fs(e,t,i,a,n);case 15:return Is(e,t,t.type,t.pendingProps,n);case 17:return i=t.type,a=t.pendingProps,a=t.elementType===i?a:hs(i,a),$s(e,t),t.tag=1,Wi(i)?(e=!0,Ji(t)):e=!1,Ha(t,n),ys(t,i,a),xs(t,i,a,n),Vs(null,t,i,!0,e,n);case 19:return Qs(e,t,n);case 22:return Ls(e,t,n)}throw Error(r(156,t.tag))};function Wl(e,t){return ut(e,t)}function Gl(e,t,n,r){this.tag=e,this.key=n,this.sibling=this.child=this.return=this.stateNode=this.type=this.elementType=null,this.index=0,this.ref=null,this.pendingProps=t,this.dependencies=this.memoizedState=this.updateQueue=this.memoizedProps=null,this.mode=r,this.subtreeFlags=this.flags=0,this.deletions=null,this.childLanes=this.lanes=0,this.alternate=null}function Kl(e,t,n,r){return new Gl(e,t,n,r)}function ql(e){return e=e.prototype,!(!e||!e.isReactComponent)}function Jl(e){if(typeof e==`function`)return+!!ql(e);if(e!=null){if(e=e.$$typeof,e===j)return 11;if(e===P)return 14}return 2}function Yl(e,t){var n=e.alternate;return n===null?(n=Kl(e.tag,t,e.key,e.mode),n.elementType=e.elementType,n.type=e.type,n.stateNode=e.stateNode,n.alternate=e,e.alternate=n):(n.pendingProps=t,n.type=e.type,n.flags=0,n.subtreeFlags=0,n.deletions=null),n.flags=e.flags&14680064,n.childLanes=e.childLanes,n.lanes=e.lanes,n.child=e.child,n.memoizedProps=e.memoizedProps,n.memoizedState=e.memoizedState,n.updateQueue=e.updateQueue,t=e.dependencies,n.dependencies=t===null?null:{lanes:t.lanes,firstContext:t.firstContext},n.sibling=e.sibling,n.index=e.index,n.ref=e.ref,n}function Xl(e,t,n,i,a,o){var s=2;if(i=e,typeof e==`function`)ql(e)&&(s=1);else if(typeof e==`string`)s=5;else a:switch(e){case E:return Zl(n.children,a,o,t);case D:s=8,a|=8;break;case O:return e=Kl(12,n,t,a|2),e.elementType=O,e.lanes=o,e;case M:return e=Kl(13,n,t,a),e.elementType=M,e.lanes=o,e;case N:return e=Kl(19,n,t,a),e.elementType=N,e.lanes=o,e;case ee:return Ql(n,a,o,t);default:if(typeof e==`object`&&e)switch(e.$$typeof){case k:s=10;break a;case A:s=9;break a;case j:s=11;break a;case P:s=14;break a;case F:s=16,i=null;break a}throw Error(r(130,e==null?e:typeof e,``))}return t=Kl(s,n,t,a),t.elementType=e,t.type=i,t.lanes=o,t}function Zl(e,t,n,r){return e=Kl(7,e,r,t),e.lanes=n,e}function Ql(e,t,n,r){return e=Kl(22,e,r,t),e.elementType=ee,e.lanes=n,e.stateNode={isHidden:!1},e}function $l(e,t,n){return e=Kl(6,e,null,t),e.lanes=n,e}function eu(e,t,n){return t=Kl(4,e.children===null?[]:e.children,e.key,t),t.lanes=n,t.stateNode={containerInfo:e.containerInfo,pendingChildren:null,implementation:e.implementation},t}function tu(e,t,n,r,i){this.tag=t,this.containerInfo=e,this.finishedWork=this.pingCache=this.current=this.pendingChildren=null,this.timeoutHandle=-1,this.callbackNode=this.pendingContext=this.context=null,this.callbackPriority=0,this.eventTimes=Nt(0),this.expirationTimes=Nt(-1),this.entangledLanes=this.finishedLanes=this.mutableReadLanes=this.expiredLanes=this.pingedLanes=this.suspendedLanes=this.pendingLanes=0,this.entanglements=Nt(0),this.identifierPrefix=r,this.onRecoverableError=i,this.mutableSourceEagerHydrationData=null}function nu(e,t,n,r,i,a,o,s,c){return e=new tu(e,t,n,s,c),t===1?(t=1,!0===a&&(t|=8)):t=0,a=Kl(3,null,null,t),e.current=a,a.stateNode=e,a.memoizedState={element:r,isDehydrated:n,cache:null,transitions:null,pendingSuspenseBoundaries:null},Ya(a),e}function ru(e,t,n){var r=3{function n(){if(!(typeof __REACT_DEVTOOLS_GLOBAL_HOOK__>`u`||typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE!=`function`))try{__REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE(n)}catch(e){console.error(e)}}n(),t.exports=p()})),h=o((e=>{var t=m();e.createRoot=t.createRoot,e.hydrateRoot=t.hydrateRoot})),g=c(u()),_=c(h(),1),v=class extends Error{status;constructor(e,t){super(t),this.status=e}},y=`telesrv_admin_csrf`,b=`X-CSRF-Token`,x=``;function S(e){x=(e??``).trim()}function C(){if(typeof document>`u`)return``;for(let e of document.cookie.split(`;`)){let t=e.trim(),n=t.indexOf(`=`);if(!(n<=0||t.slice(0,n)!==y))try{return decodeURIComponent(t.slice(n+1))}catch{return t.slice(n+1)}}return``}function w(){return C()||x}function T(e){let t=(e??`GET`).toUpperCase();return t!==`GET`&&t!==`HEAD`&&t!==`OPTIONS`}function E(e){if(!e)return{};if(e instanceof Headers){let t={};return e.forEach((e,n)=>{t[n]=e}),t}return Array.isArray(e)?Object.fromEntries(e):{...e}}async function D(e,t={}){let n=typeof FormData<`u`&&t.body instanceof FormData?{}:{"Content-Type":`application/json`};if(Object.assign(n,E(t.headers)),T(t.method)){let e=w();e&&(n[b]=e)}let r=await fetch(e,{credentials:`same-origin`,...t,headers:n}),i=await r.text(),a=i?JSON.parse(i):null;if(!r.ok){let e=a?.error||a?.Error||a?.message||r.statusText;throw new v(r.status,e)}return a}function O(e){return e instanceof Error?e.message:String(e)}var k={session:()=>D(`/api/session`),login:async e=>{let t=await D(`/api/login`,{method:`POST`,body:JSON.stringify({secret:e})});return S(t.csrf_token),t},logout:()=>D(`/api/logout`,{method:`POST`,body:`{}`}),accounts:e=>D(`/api/accounts?${e.toString()}`),accountStats:()=>D(`/api/accounts/stats`),sharedDeviceGroups:e=>D(`/api/accounts/shared-devices?${e.toString()}`),account:e=>D(`/api/accounts/${e}`),channels:e=>D(`/api/channels?${e.toString()}`),channel:e=>D(`/api/channels/${e}`),bots:e=>D(`/api/bots?${e.toString()}`),broadcasts:e=>D(`/api/broadcasts?${e.toString()}`),bot:e=>D(`/api/bots/${e}`),collectibleUsernames:e=>D(`/api/collectible-usernames?${e.toString()}`),collectibleUsername:e=>D(`/api/collectible-usernames/${encodeURIComponent(e)}`),dashboard:()=>D(`/api/dashboard`),storageStats:()=>D(`/api/storage/stats`),storageAccounts:e=>D(`/api/storage/accounts?${e.toString()}`),verificationApplications:e=>D(`/api/verification/applications?${e.toString()}`),verificationApplication:e=>D(`/api/verification/applications/${encodeURIComponent(e)}`),verificationCounts:()=>D(`/api/verification/counts`),botVerifiers:e=>D(`/api/botverification/verifiers?${e.toString()}`),verificationIcons:e=>D(`/api/botverification/icons?${e.toString()}`),customVerifications:e=>D(`/api/botverification/marks?${e.toString()}`),customVerificationRequests:e=>D(`/api/botverification/requests?${e.toString()}`),customVerificationRequest:e=>D(`/api/botverification/requests/${encodeURIComponent(e)}`),botVerificationCounts:()=>D(`/api/botverification/counts`),emoji:e=>D(`/api/emoji?${e.toString()}`),emojiAnimation:e=>D(`/api/emoji/${encodeURIComponent(e)}/animation`),messages:e=>D(`/api/messages?${e.toString()}`),message:(e,t)=>D(`/api/messages/detail?${new URLSearchParams({owner_user_id:String(e),msg_id:String(t)}).toString()}`),groupMessages:e=>D(`/api/messages/groups?${e.toString()}`),groupMessage:(e,t)=>D(`/api/messages/groups/detail?${new URLSearchParams({channel_id:String(e),msg_id:String(t)}).toString()}`),moderationCases:e=>D(`/api/moderation/cases?${e.toString()}`),moderationCase:e=>D(`/api/moderation/cases/${e}`),moderationReport:e=>D(`/api/moderation/reports/${e}`),claimModerationCase:(e,t)=>D(`/api/moderation/cases/${e}/claim`,{method:`POST`,body:JSON.stringify({expected_version:t})}),decideModerationCase:(e,t)=>D(`/api/moderation/cases/${e}/decide`,{method:`POST`,body:JSON.stringify(t)}),reviewModerationAppeal:(e,t,n)=>D(`/api/moderation/cases/${e}/appeals/${t}/review`,{method:`POST`,body:JSON.stringify(n)}),stickerSets:e=>D(`/api/stickers?kind=${encodeURIComponent(e)}`),stickerSetDocuments:e=>D(`/api/stickers/${encodeURIComponent(e)}/documents`),stickerDocumentAnimationURL:e=>`/api/stickers/documents/${encodeURIComponent(e)}/animation`,gifCatalogDocumentPreviewURL:e=>`/api/gif-catalog/documents/${encodeURIComponent(e)}/preview`,createStickerSet:e=>D(`/api/actions/create-sticker-set`,{method:`POST`,body:e}),setAccountAvatar:e=>D(`/api/actions/set-account-avatar`,{method:`POST`,body:e}),setChannelAvatar:e=>D(`/api/actions/set-channel-avatar`,{method:`POST`,body:e}),addStickerToSet:e=>D(`/api/actions/add-sticker-to-set`,{method:`POST`,body:e}),gifCatalog:()=>D(`/api/gif-catalog`),createGifCatalogEntry:e=>D(`/api/actions/create-gif-catalog-entry`,{method:`POST`,body:e}),serverIdentity:()=>D(`/api/server/identity`),uploadServerIcon:e=>D(`/api/actions/upload-server-icon`,{method:`POST`,body:e}),serverIconURL:()=>`/api/server/icon?t=${Date.now()}`,serverEnv:()=>D(`/api/server/env`),serverStatus:()=>D(`/api/server/status`),dockerStatus:()=>D(`/api/server/docker-status`),checkServerUpdates:()=>D(`/api/server/check-updates`),action:(e,t)=>D(e,{method:`POST`,body:JSON.stringify(t)})},A=e=>e.replace(/([a-z0-9])([A-Z])/g,`$1-$2`).toLowerCase(),j=(...e)=>e.filter((e,t,n)=>!!e&&e.trim()!==``&&n.indexOf(e)===t).join(` `).trim(),M={xmlns:`http://www.w3.org/2000/svg`,width:24,height:24,viewBox:`0 0 24 24`,fill:`none`,stroke:`currentColor`,strokeWidth:2,strokeLinecap:`round`,strokeLinejoin:`round`},N=(0,g.forwardRef)(({color:e=`currentColor`,size:t=24,strokeWidth:n=2,absoluteStrokeWidth:r,className:i=``,children:a,iconNode:o,...s},c)=>(0,g.createElement)(`svg`,{ref:c,...M,width:t,height:t,stroke:e,strokeWidth:r?Number(n)*24/Number(t):n,className:j(`lucide`,i),...s},[...o.map(([e,t])=>(0,g.createElement)(e,t)),...Array.isArray(a)?a:[a]])),P=(e,t)=>{let n=(0,g.forwardRef)(({className:n,...r},i)=>(0,g.createElement)(N,{ref:i,iconNode:t,className:j(`lucide-${A(e)}`,n),...r}));return n.displayName=`${e}`,n},F=P(`BadgeCheck`,[[`path`,{d:`M3.85 8.62a4 4 0 0 1 4.78-4.77 4 4 0 0 1 6.74 0 4 4 0 0 1 4.78 4.78 4 4 0 0 1 0 6.74 4 4 0 0 1-4.77 4.78 4 4 0 0 1-6.75 0 4 4 0 0 1-4.78-4.77 4 4 0 0 1 0-6.76Z`,key:`3c2336`}],[`path`,{d:`m9 12 2 2 4-4`,key:`dzmm74`}]]),ee=P(`CircleAlert`,[[`circle`,{cx:`12`,cy:`12`,r:`10`,key:`1mglay`}],[`line`,{x1:`12`,x2:`12`,y1:`8`,y2:`12`,key:`1pkeuh`}],[`line`,{x1:`12`,x2:`12.01`,y1:`16`,y2:`16`,key:`4dfq90`}]]),I=P(`CircleCheck`,[[`circle`,{cx:`12`,cy:`12`,r:`10`,key:`1mglay`}],[`path`,{d:`m9 12 2 2 4-4`,key:`dzmm74`}]]),te=P(`CircleX`,[[`circle`,{cx:`12`,cy:`12`,r:`10`,key:`1mglay`}],[`path`,{d:`m15 9-6 6`,key:`1uzhvr`}],[`path`,{d:`m9 9 6 6`,key:`z0biqf`}]]),ne=P(`Layers`,[[`path`,{d:`M12.83 2.18a2 2 0 0 0-1.66 0L2.6 6.08a1 1 0 0 0 0 1.83l8.58 3.91a2 2 0 0 0 1.66 0l8.58-3.9a1 1 0 0 0 0-1.83z`,key:`zw3jo`}],[`path`,{d:`M2 12a1 1 0 0 0 .58.91l8.6 3.91a2 2 0 0 0 1.65 0l8.58-3.9A1 1 0 0 0 22 12`,key:`1wduqc`}],[`path`,{d:`M2 17a1 1 0 0 0 .58.91l8.6 3.91a2 2 0 0 0 1.65 0l8.58-3.9A1 1 0 0 0 22 17`,key:`kqbvx6`}]]),L=P(`LoaderCircle`,[[`path`,{d:`M21 12a9 9 0 1 1-6.219-8.56`,key:`13zald`}]]),re=P(`ShieldX`,[[`path`,{d:`M20 13c0 5-3.5 7.5-7.66 8.95a1 1 0 0 1-.67-.01C7.5 20.5 4 18 4 13V6a1 1 0 0 1 1-1c2 0 4.5-1.2 6.24-2.72a1.17 1.17 0 0 1 1.52 0C14.51 3.81 17 5 19 5a1 1 0 0 1 1 1z`,key:`oel41y`}],[`path`,{d:`m14.5 9.5-5 5`,key:`17q4r4`}],[`path`,{d:`m9.5 9.5 5 5`,key:`18nt4w`}]]),ie=P(`Sparkles`,[[`path`,{d:`M9.937 15.5A2 2 0 0 0 8.5 14.063l-6.135-1.582a.5.5 0 0 1 0-.962L8.5 9.936A2 2 0 0 0 9.937 8.5l1.582-6.135a.5.5 0 0 1 .963 0L14.063 8.5A2 2 0 0 0 15.5 9.937l6.135 1.581a.5.5 0 0 1 0 .964L15.5 14.063a2 2 0 0 0-1.437 1.437l-1.582 6.135a.5.5 0 0 1-.963 0z`,key:`4pj2yx`}],[`path`,{d:`M20 3v4`,key:`1olli1`}],[`path`,{d:`M22 5h-4`,key:`1gvqau`}],[`path`,{d:`M4 17v2`,key:`vumght`}],[`path`,{d:`M5 18H3`,key:`zchphs`}]]),ae=P(`TriangleAlert`,[[`path`,{d:`m21.73 18-8-14a2 2 0 0 0-3.48 0l-8 14A2 2 0 0 0 4 21h16a2 2 0 0 0 1.73-3`,key:`wmoenq`}],[`path`,{d:`M12 9v4`,key:`juzpu7`}],[`path`,{d:`M12 17h.01`,key:`p32p05`}]]),oe=P(`UserRound`,[[`circle`,{cx:`12`,cy:`8`,r:`5`,key:`1hypcn`}],[`path`,{d:`M20 21a8 8 0 0 0-16 0`,key:`rfgkzh`}]]),se=P(`UsersRound`,[[`path`,{d:`M18 21a8 8 0 0 0-16 0`,key:`3ypg7q`}],[`circle`,{cx:`10`,cy:`8`,r:`5`,key:`o932ke`}],[`path`,{d:`M22 20c0-3.37-2-6.5-4-8a5 5 0 0 0-.45-8.3`,key:`10s06x`}]]),ce=P(`Activity`,[[`path`,{d:`M22 12h-2.48a2 2 0 0 0-1.93 1.46l-2.35 8.36a.25.25 0 0 1-.48 0L9.24 2.18a.25.25 0 0 0-.48 0l-2.35 8.36A2 2 0 0 1 4.49 12H2`,key:`169zse`}]]),le=P(`ArrowLeftRight`,[[`path`,{d:`M8 3 4 7l4 4`,key:`9rb6wj`}],[`path`,{d:`M4 7h16`,key:`6tx8e3`}],[`path`,{d:`m16 21 4-4-4-4`,key:`siv7j2`}],[`path`,{d:`M20 17H4`,key:`h6l3hr`}]]),ue=P(`ArrowLeft`,[[`path`,{d:`m12 19-7-7 7-7`,key:`1l729n`}],[`path`,{d:`M19 12H5`,key:`x3x0zl`}]]),de=P(`AtSign`,[[`circle`,{cx:`12`,cy:`12`,r:`4`,key:`4exip2`}],[`path`,{d:`M16 8v5a3 3 0 0 0 6 0v-1a10 10 0 1 0-4 8`,key:`7n84p3`}]]),R=P(`Ban`,[[`circle`,{cx:`12`,cy:`12`,r:`10`,key:`1mglay`}],[`path`,{d:`m4.9 4.9 14.2 14.2`,key:`1m5liu`}]]),fe=P(`Bot`,[[`path`,{d:`M12 8V4H8`,key:`hb8ula`}],[`rect`,{width:`16`,height:`12`,x:`4`,y:`8`,rx:`2`,key:`enze0r`}],[`path`,{d:`M2 14h2`,key:`vft8re`}],[`path`,{d:`M20 14h2`,key:`4cs60a`}],[`path`,{d:`M15 13v2`,key:`1xurst`}],[`path`,{d:`M9 13v2`,key:`rq6x2g`}]]),pe=P(`Building2`,[[`path`,{d:`M6 22V4a2 2 0 0 1 2-2h8a2 2 0 0 1 2 2v18Z`,key:`1b4qmf`}],[`path`,{d:`M6 12H4a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h2`,key:`i71pzd`}],[`path`,{d:`M18 9h2a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2h-2`,key:`10jefs`}],[`path`,{d:`M10 6h4`,key:`1itunk`}],[`path`,{d:`M10 10h4`,key:`tcdvrf`}],[`path`,{d:`M10 14h4`,key:`kelpxr`}],[`path`,{d:`M10 18h4`,key:`1ulq68`}]]),me=P(`Cable`,[[`path`,{d:`M17 21v-2a1 1 0 0 1-1-1v-1a2 2 0 0 1 2-2h2a2 2 0 0 1 2 2v1a1 1 0 0 1-1 1`,key:`10bnsj`}],[`path`,{d:`M19 15V6.5a1 1 0 0 0-7 0v11a1 1 0 0 1-7 0V9`,key:`1eqmu1`}],[`path`,{d:`M21 21v-2h-4`,key:`14zm7j`}],[`path`,{d:`M3 5h4V3`,key:`z442eg`}],[`path`,{d:`M7 5a1 1 0 0 1 1 1v1a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V6a1 1 0 0 1 1-1V3`,key:`ebdjd7`}]]),he=P(`Check`,[[`path`,{d:`M20 6 9 17l-5-5`,key:`1gmf2c`}]]),ge=P(`ChevronDown`,[[`path`,{d:`m6 9 6 6 6-6`,key:`qrunsl`}]]),_e=P(`ChevronLeft`,[[`path`,{d:`m15 18-6-6 6-6`,key:`1wnfg3`}]]),ve=P(`ChevronRight`,[[`path`,{d:`m9 18 6-6-6-6`,key:`mthhwq`}]]),ye=P(`CircleOff`,[[`path`,{d:`m2 2 20 20`,key:`1ooewy`}],[`path`,{d:`M8.35 2.69A10 10 0 0 1 21.3 15.65`,key:`1pfsoa`}],[`path`,{d:`M19.08 19.08A10 10 0 1 1 4.92 4.92`,key:`1ablyi`}]]),be=P(`Copy`,[[`rect`,{width:`14`,height:`14`,x:`8`,y:`8`,rx:`2`,ry:`2`,key:`17jyea`}],[`path`,{d:`M4 16c-1.1 0-2-.9-2-2V4c0-1.1.9-2 2-2h10c1.1 0 2 .9 2 2`,key:`zix9uf`}]]),xe=P(`Cpu`,[[`rect`,{width:`16`,height:`16`,x:`4`,y:`4`,rx:`2`,key:`14l7u7`}],[`rect`,{width:`6`,height:`6`,x:`9`,y:`9`,rx:`1`,key:`5aljv4`}],[`path`,{d:`M15 2v2`,key:`13l42r`}],[`path`,{d:`M15 20v2`,key:`15mkzm`}],[`path`,{d:`M2 15h2`,key:`1gxd5l`}],[`path`,{d:`M2 9h2`,key:`1bbxkp`}],[`path`,{d:`M20 15h2`,key:`19e6y8`}],[`path`,{d:`M20 9h2`,key:`19tzq7`}],[`path`,{d:`M9 2v2`,key:`165o2o`}],[`path`,{d:`M9 20v2`,key:`i2bqo8`}]]),Se=P(`Database`,[[`ellipse`,{cx:`12`,cy:`5`,rx:`9`,ry:`3`,key:`msslwz`}],[`path`,{d:`M3 5V19A9 3 0 0 0 21 19V5`,key:`1wlel7`}],[`path`,{d:`M3 12A9 3 0 0 0 21 12`,key:`mv7ke4`}]]),z=P(`Download`,[[`path`,{d:`M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4`,key:`ih7n3h`}],[`polyline`,{points:`7 10 12 15 17 10`,key:`2ggqvy`}],[`line`,{x1:`12`,x2:`12`,y1:`15`,y2:`3`,key:`1vk2je`}]]),Ce=P(`ExternalLink`,[[`path`,{d:`M15 3h6v6`,key:`1q9fwt`}],[`path`,{d:`M10 14 21 3`,key:`gplh6r`}],[`path`,{d:`M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6`,key:`a6xqqp`}]]),we=P(`Eye`,[[`path`,{d:`M2.062 12.348a1 1 0 0 1 0-.696 10.75 10.75 0 0 1 19.876 0 1 1 0 0 1 0 .696 10.75 10.75 0 0 1-19.876 0`,key:`1nclc0`}],[`circle`,{cx:`12`,cy:`12`,r:`3`,key:`1v7zrd`}]]),Te=P(`FileJson`,[[`path`,{d:`M15 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V7Z`,key:`1rqfz7`}],[`path`,{d:`M14 2v4a2 2 0 0 0 2 2h4`,key:`tnqrlb`}],[`path`,{d:`M10 12a1 1 0 0 0-1 1v1a1 1 0 0 1-1 1 1 1 0 0 1 1 1v1a1 1 0 0 0 1 1`,key:`1oajmo`}],[`path`,{d:`M14 18a1 1 0 0 0 1-1v-1a1 1 0 0 1 1-1 1 1 0 0 1-1-1v-1a1 1 0 0 0-1-1`,key:`mpwhp6`}]]),Ee=P(`Film`,[[`rect`,{width:`18`,height:`18`,x:`3`,y:`3`,rx:`2`,key:`afitv7`}],[`path`,{d:`M7 3v18`,key:`bbkbws`}],[`path`,{d:`M3 7.5h4`,key:`zfgn84`}],[`path`,{d:`M3 12h18`,key:`1i2n21`}],[`path`,{d:`M3 16.5h4`,key:`1230mu`}],[`path`,{d:`M17 3v18`,key:`in4fa5`}],[`path`,{d:`M17 7.5h4`,key:`myr1c1`}],[`path`,{d:`M17 16.5h4`,key:`go4c1d`}]]),De=P(`Flag`,[[`path`,{d:`M4 15s1-1 4-1 5 2 8 2 4-1 4-1V3s-1 1-4 1-5-2-8-2-4 1-4 1z`,key:`i9b6wo`}],[`line`,{x1:`4`,x2:`4`,y1:`22`,y2:`15`,key:`1cm3nv`}]]),Oe=P(`Flame`,[[`path`,{d:`M8.5 14.5A2.5 2.5 0 0 0 11 12c0-1.38-.5-2-1-3-1.072-2.143-.224-4.054 2-6 .5 2.5 2 4.9 4 6.5 2 1.6 3 3.5 3 5.5a7 7 0 1 1-14 0c0-1.153.433-2.294 1-3a2.5 2.5 0 0 0 2.5 2.5z`,key:`96xj49`}]]),ke=P(`Handshake`,[[`path`,{d:`m11 17 2 2a1 1 0 1 0 3-3`,key:`efffak`}],[`path`,{d:`m14 14 2.5 2.5a1 1 0 1 0 3-3l-3.88-3.88a3 3 0 0 0-4.24 0l-.88.88a1 1 0 1 1-3-3l2.81-2.81a5.79 5.79 0 0 1 7.06-.87l.47.28a2 2 0 0 0 1.42.25L21 4`,key:`9pr0kb`}],[`path`,{d:`m21 3 1 11h-2`,key:`1tisrp`}],[`path`,{d:`M3 3 2 14l6.5 6.5a1 1 0 1 0 3-3`,key:`1uvwmv`}],[`path`,{d:`M3 4h8`,key:`1ep09j`}]]),Ae=P(`HardDrive`,[[`line`,{x1:`22`,x2:`2`,y1:`12`,y2:`12`,key:`1y58io`}],[`path`,{d:`M5.45 5.11 2 12v6a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2v-6l-3.45-6.89A2 2 0 0 0 16.76 4H7.24a2 2 0 0 0-1.79 1.11z`,key:`oot6mr`}],[`line`,{x1:`6`,x2:`6.01`,y1:`16`,y2:`16`,key:`sgf278`}],[`line`,{x1:`10`,x2:`10.01`,y1:`16`,y2:`16`,key:`1l4acy`}]]),je=P(`History`,[[`path`,{d:`M3 12a9 9 0 1 0 9-9 9.75 9.75 0 0 0-6.74 2.74L3 8`,key:`1357e3`}],[`path`,{d:`M3 3v5h5`,key:`1xhq8a`}],[`path`,{d:`M12 7v5l4 2`,key:`1fdv2h`}]]),Me=P(`ImageOff`,[[`line`,{x1:`2`,x2:`22`,y1:`2`,y2:`22`,key:`a6p6uj`}],[`path`,{d:`M10.41 10.41a2 2 0 1 1-2.83-2.83`,key:`1bzlo9`}],[`line`,{x1:`13.5`,x2:`6`,y1:`13.5`,y2:`21`,key:`1q0aeu`}],[`line`,{x1:`18`,x2:`21`,y1:`12`,y2:`15`,key:`5mozeu`}],[`path`,{d:`M3.59 3.59A1.99 1.99 0 0 0 3 5v14a2 2 0 0 0 2 2h14c.55 0 1.052-.22 1.41-.59`,key:`mmje98`}],[`path`,{d:`M21 15V5a2 2 0 0 0-2-2H9`,key:`43el77`}]]),Ne=P(`ImagePlus`,[[`path`,{d:`M16 5h6`,key:`1vod17`}],[`path`,{d:`M19 2v6`,key:`4bpg5p`}],[`path`,{d:`M21 11.5V19a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h7.5`,key:`1ue2ih`}],[`path`,{d:`m21 15-3.086-3.086a2 2 0 0 0-2.828 0L6 21`,key:`1xmnt7`}],[`circle`,{cx:`9`,cy:`9`,r:`2`,key:`af1f0g`}]]),Pe=P(`LayoutDashboard`,[[`rect`,{width:`7`,height:`9`,x:`3`,y:`3`,rx:`1`,key:`10lvy0`}],[`rect`,{width:`7`,height:`5`,x:`14`,y:`3`,rx:`1`,key:`16une8`}],[`rect`,{width:`7`,height:`9`,x:`14`,y:`12`,rx:`1`,key:`1hutg5`}],[`rect`,{width:`7`,height:`5`,x:`3`,y:`16`,rx:`1`,key:`ldoo1y`}]]),Fe=P(`LifeBuoy`,[[`circle`,{cx:`12`,cy:`12`,r:`10`,key:`1mglay`}],[`path`,{d:`m4.93 4.93 4.24 4.24`,key:`1ymg45`}],[`path`,{d:`m14.83 9.17 4.24-4.24`,key:`1cb5xl`}],[`path`,{d:`m14.83 14.83 4.24 4.24`,key:`q42g0n`}],[`path`,{d:`m9.17 14.83-4.24 4.24`,key:`bqpfvv`}],[`circle`,{cx:`12`,cy:`12`,r:`4`,key:`4exip2`}]]),Ie=P(`LogOut`,[[`path`,{d:`M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4`,key:`1uf3rs`}],[`polyline`,{points:`16 17 21 12 16 7`,key:`1gabdz`}],[`line`,{x1:`21`,x2:`9`,y1:`12`,y2:`12`,key:`1uyos4`}]]),Le=P(`Mail`,[[`rect`,{width:`20`,height:`16`,x:`2`,y:`4`,rx:`2`,key:`18n3k1`}],[`path`,{d:`m22 7-8.97 5.7a1.94 1.94 0 0 1-2.06 0L2 7`,key:`1ocrg3`}]]),Re=P(`Megaphone`,[[`path`,{d:`m3 11 18-5v12L3 14v-3z`,key:`n962bs`}],[`path`,{d:`M11.6 16.8a3 3 0 1 1-5.8-1.6`,key:`1yl0tm`}]]),ze=P(`MemoryStick`,[[`path`,{d:`M6 19v-3`,key:`1nvgqn`}],[`path`,{d:`M10 19v-3`,key:`iu8nkm`}],[`path`,{d:`M14 19v-3`,key:`kcehxu`}],[`path`,{d:`M18 19v-3`,key:`1vh91z`}],[`path`,{d:`M8 11V9`,key:`63erz4`}],[`path`,{d:`M16 11V9`,key:`fru6f3`}],[`path`,{d:`M12 11V9`,key:`ha00sb`}],[`path`,{d:`M2 15h20`,key:`16ne18`}],[`path`,{d:`M2 7a2 2 0 0 1 2-2h16a2 2 0 0 1 2 2v1.1a2 2 0 0 0 0 3.837V17a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2v-5.1a2 2 0 0 0 0-3.837Z`,key:`lhddv3`}]]),Be=P(`MessageSquareText`,[[`path`,{d:`M21 15a2 2 0 0 1-2 2H7l-4 4V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2z`,key:`1lielz`}],[`path`,{d:`M13 8H7`,key:`14i4kc`}],[`path`,{d:`M17 12H7`,key:`16if0g`}]]),Ve=P(`MonitorSmartphone`,[[`path`,{d:`M18 8V6a2 2 0 0 0-2-2H4a2 2 0 0 0-2 2v7a2 2 0 0 0 2 2h8`,key:`10dyio`}],[`path`,{d:`M10 19v-3.96 3.15`,key:`1irgej`}],[`path`,{d:`M7 19h5`,key:`qswx4l`}],[`rect`,{width:`6`,height:`10`,x:`16`,y:`12`,rx:`2`,key:`1egngj`}]]),He=P(`Moon`,[[`path`,{d:`M12 3a6 6 0 0 0 9 9 9 9 0 1 1-9-9Z`,key:`a7tn18`}]]),Ue=P(`Palette`,[[`circle`,{cx:`13.5`,cy:`6.5`,r:`.5`,fill:`currentColor`,key:`1okk4w`}],[`circle`,{cx:`17.5`,cy:`10.5`,r:`.5`,fill:`currentColor`,key:`f64h9f`}],[`circle`,{cx:`8.5`,cy:`7.5`,r:`.5`,fill:`currentColor`,key:`fotxhn`}],[`circle`,{cx:`6.5`,cy:`12.5`,r:`.5`,fill:`currentColor`,key:`qy21gx`}],[`path`,{d:`M12 2C6.5 2 2 6.5 2 12s4.5 10 10 10c.926 0 1.648-.746 1.648-1.688 0-.437-.18-.835-.437-1.125-.29-.289-.438-.652-.438-1.125a1.64 1.64 0 0 1 1.668-1.668h1.996c3.051 0 5.555-2.503 5.555-5.554C21.965 6.012 17.461 2 12 2z`,key:`12rzf8`}]]),We=P(`Phone`,[[`path`,{d:`M22 16.92v3a2 2 0 0 1-2.18 2 19.79 19.79 0 0 1-8.63-3.07 19.5 19.5 0 0 1-6-6 19.79 19.79 0 0 1-3.07-8.67A2 2 0 0 1 4.11 2h3a2 2 0 0 1 2 1.72 12.84 12.84 0 0 0 .7 2.81 2 2 0 0 1-.45 2.11L8.09 9.91a16 16 0 0 0 6 6l1.27-1.27a2 2 0 0 1 2.11-.45 12.84 12.84 0 0 0 2.81.7A2 2 0 0 1 22 16.92z`,key:`foiqr5`}]]),B=P(`Play`,[[`polygon`,{points:`6 3 20 12 6 21 6 3`,key:`1oa8hb`}]]),Ge=P(`Plus`,[[`path`,{d:`M5 12h14`,key:`1ays0h`}],[`path`,{d:`M12 5v14`,key:`s699le`}]]),Ke=P(`PowerOff`,[[`path`,{d:`M18.36 6.64A9 9 0 0 1 20.77 15`,key:`dxknvb`}],[`path`,{d:`M6.16 6.16a9 9 0 1 0 12.68 12.68`,key:`1x7qb5`}],[`path`,{d:`M12 2v4`,key:`3427ic`}],[`path`,{d:`m2 2 20 20`,key:`1ooewy`}]]),qe=P(`Power`,[[`path`,{d:`M12 2v10`,key:`mnfbl`}],[`path`,{d:`M18.4 6.6a9 9 0 1 1-12.77.04`,key:`obofu9`}]]),Je=P(`Radio`,[[`path`,{d:`M4.9 19.1C1 15.2 1 8.8 4.9 4.9`,key:`1vaf9d`}],[`path`,{d:`M7.8 16.2c-2.3-2.3-2.3-6.1 0-8.5`,key:`u1ii0m`}],[`circle`,{cx:`12`,cy:`12`,r:`2`,key:`1c9p78`}],[`path`,{d:`M16.2 7.8c2.3 2.3 2.3 6.1 0 8.5`,key:`1j5fej`}],[`path`,{d:`M19.1 4.9C23 8.8 23 15.1 19.1 19`,key:`10b0cb`}]]),Ye=P(`RefreshCw`,[[`path`,{d:`M3 12a9 9 0 0 1 9-9 9.75 9.75 0 0 1 6.74 2.74L21 8`,key:`v9h5vc`}],[`path`,{d:`M21 3v5h-5`,key:`1q7to0`}],[`path`,{d:`M21 12a9 9 0 0 1-9 9 9.75 9.75 0 0 1-6.74-2.74L3 16`,key:`3uifl3`}],[`path`,{d:`M8 16H3v5`,key:`1cv678`}]]),Xe=P(`ScrollText`,[[`path`,{d:`M15 12h-5`,key:`r7krc0`}],[`path`,{d:`M15 8h-5`,key:`1khuty`}],[`path`,{d:`M19 17V5a2 2 0 0 0-2-2H4`,key:`zz82l3`}],[`path`,{d:`M8 21h12a2 2 0 0 0 2-2v-1a1 1 0 0 0-1-1H11a1 1 0 0 0-1 1v1a2 2 0 1 1-4 0V5a2 2 0 1 0-4 0v2a1 1 0 0 0 1 1h3`,key:`1ph1d7`}]]),Ze=P(`Search`,[[`circle`,{cx:`11`,cy:`11`,r:`8`,key:`4ej97u`}],[`path`,{d:`m21 21-4.3-4.3`,key:`1qie3q`}]]),Qe=P(`Send`,[[`path`,{d:`M14.536 21.686a.5.5 0 0 0 .937-.024l6.5-19a.496.496 0 0 0-.635-.635l-19 6.5a.5.5 0 0 0-.024.937l7.93 3.18a2 2 0 0 1 1.112 1.11z`,key:`1ffxy3`}],[`path`,{d:`m21.854 2.147-10.94 10.939`,key:`12cjpa`}]]),$e=P(`Server`,[[`rect`,{width:`20`,height:`8`,x:`2`,y:`2`,rx:`2`,ry:`2`,key:`ngkwjq`}],[`rect`,{width:`20`,height:`8`,x:`2`,y:`14`,rx:`2`,ry:`2`,key:`iecqi9`}],[`line`,{x1:`6`,x2:`6.01`,y1:`6`,y2:`6`,key:`16zg32`}],[`line`,{x1:`6`,x2:`6.01`,y1:`18`,y2:`18`,key:`nzw8ys`}]]),V=P(`Settings2`,[[`path`,{d:`M20 7h-9`,key:`3s1dr2`}],[`path`,{d:`M14 17H5`,key:`gfn3mx`}],[`circle`,{cx:`17`,cy:`17`,r:`3`,key:`18b49y`}],[`circle`,{cx:`7`,cy:`7`,r:`3`,key:`dfmy0x`}]]),et=P(`Settings`,[[`path`,{d:`M12.22 2h-.44a2 2 0 0 0-2 2v.18a2 2 0 0 1-1 1.73l-.43.25a2 2 0 0 1-2 0l-.15-.08a2 2 0 0 0-2.73.73l-.22.38a2 2 0 0 0 .73 2.73l.15.1a2 2 0 0 1 1 1.72v.51a2 2 0 0 1-1 1.74l-.15.09a2 2 0 0 0-.73 2.73l.22.38a2 2 0 0 0 2.73.73l.15-.08a2 2 0 0 1 2 0l.43.25a2 2 0 0 1 1 1.73V20a2 2 0 0 0 2 2h.44a2 2 0 0 0 2-2v-.18a2 2 0 0 1 1-1.73l.43-.25a2 2 0 0 1 2 0l.15.08a2 2 0 0 0 2.73-.73l.22-.39a2 2 0 0 0-.73-2.73l-.15-.08a2 2 0 0 1-1-1.74v-.5a2 2 0 0 1 1-1.74l.15-.09a2 2 0 0 0 .73-2.73l-.22-.38a2 2 0 0 0-2.73-.73l-.15.08a2 2 0 0 1-2 0l-.43-.25a2 2 0 0 1-1-1.73V4a2 2 0 0 0-2-2z`,key:`1qme2f`}],[`circle`,{cx:`12`,cy:`12`,r:`3`,key:`1v7zrd`}]]),tt=P(`ShieldAlert`,[[`path`,{d:`M20 13c0 5-3.5 7.5-7.66 8.95a1 1 0 0 1-.67-.01C7.5 20.5 4 18 4 13V6a1 1 0 0 1 1-1c2 0 4.5-1.2 6.24-2.72a1.17 1.17 0 0 1 1.52 0C14.51 3.81 17 5 19 5a1 1 0 0 1 1 1z`,key:`oel41y`}],[`path`,{d:`M12 8v4`,key:`1got3b`}],[`path`,{d:`M12 16h.01`,key:`1drbdi`}]]),nt=P(`ShieldCheck`,[[`path`,{d:`M20 13c0 5-3.5 7.5-7.66 8.95a1 1 0 0 1-.67-.01C7.5 20.5 4 18 4 13V6a1 1 0 0 1 1-1c2 0 4.5-1.2 6.24-2.72a1.17 1.17 0 0 1 1.52 0C14.51 3.81 17 5 19 5a1 1 0 0 1 1 1z`,key:`oel41y`}],[`path`,{d:`m9 12 2 2 4-4`,key:`dzmm74`}]]),rt=P(`ShieldOff`,[[`path`,{d:`m2 2 20 20`,key:`1ooewy`}],[`path`,{d:`M5 5a1 1 0 0 0-1 1v7c0 5 3.5 7.5 7.67 8.94a1 1 0 0 0 .67.01c2.35-.82 4.48-1.97 5.9-3.71`,key:`1jlk70`}],[`path`,{d:`M9.309 3.652A12.252 12.252 0 0 0 11.24 2.28a1.17 1.17 0 0 1 1.52 0C14.51 3.81 17 5 19 5a1 1 0 0 1 1 1v7a9.784 9.784 0 0 1-.08 1.264`,key:`18rp1v`}]]),it=P(`Smartphone`,[[`rect`,{width:`14`,height:`20`,x:`5`,y:`2`,rx:`2`,ry:`2`,key:`1yt0o3`}],[`path`,{d:`M12 18h.01`,key:`mhygvu`}]]),at=P(`Smile`,[[`circle`,{cx:`12`,cy:`12`,r:`10`,key:`1mglay`}],[`path`,{d:`M8 14s1.5 2 4 2 4-2 4-2`,key:`1y1vjs`}],[`line`,{x1:`9`,x2:`9.01`,y1:`9`,y2:`9`,key:`yxxnd0`}],[`line`,{x1:`15`,x2:`15.01`,y1:`9`,y2:`9`,key:`1p4y9e`}]]),ot=P(`Stamp`,[[`path`,{d:`M5 22h14`,key:`ehvnwv`}],[`path`,{d:`M19.27 13.73A2.5 2.5 0 0 0 17.5 13h-11A2.5 2.5 0 0 0 4 15.5V17a1 1 0 0 0 1 1h14a1 1 0 0 0 1-1v-1.5c0-.66-.26-1.3-.73-1.77Z`,key:`1sy9ra`}],[`path`,{d:`M14 13V8.5C14 7 15 7 15 5a3 3 0 0 0-3-3c-1.66 0-3 1-3 3s1 2 1 3.5V13`,key:`cnxgux`}]]),st=P(`Sticker`,[[`path`,{d:`M15.5 3H5a2 2 0 0 0-2 2v14c0 1.1.9 2 2 2h14a2 2 0 0 0 2-2V8.5L15.5 3Z`,key:`1wis1t`}],[`path`,{d:`M14 3v4a2 2 0 0 0 2 2h4`,key:`36rjfy`}],[`path`,{d:`M8 13h.01`,key:`1sbv64`}],[`path`,{d:`M16 13h.01`,key:`wip0gl`}],[`path`,{d:`M10 16s.8 1 2 1c1.3 0 2-1 2-1`,key:`1vvgv3`}]]),ct=P(`Sun`,[[`circle`,{cx:`12`,cy:`12`,r:`4`,key:`4exip2`}],[`path`,{d:`M12 2v2`,key:`tus03m`}],[`path`,{d:`M12 20v2`,key:`1lh1kg`}],[`path`,{d:`m4.93 4.93 1.41 1.41`,key:`149t6j`}],[`path`,{d:`m17.66 17.66 1.41 1.41`,key:`ptbguv`}],[`path`,{d:`M2 12h2`,key:`1t8f8n`}],[`path`,{d:`M20 12h2`,key:`1q8mjw`}],[`path`,{d:`m6.34 17.66-1.41 1.41`,key:`1m8zz5`}],[`path`,{d:`m19.07 4.93-1.41 1.41`,key:`1shlcs`}]]),lt=P(`Trash2`,[[`path`,{d:`M3 6h18`,key:`d0wm0j`}],[`path`,{d:`M19 6v14c0 1-1 2-2 2H7c-1 0-2-1-2-2V6`,key:`4alrt4`}],[`path`,{d:`M8 6V4c0-1 1-2 2-2h4c1 0 2 1 2 2v2`,key:`v07s0e`}],[`line`,{x1:`10`,x2:`10`,y1:`11`,y2:`17`,key:`1uufr5`}],[`line`,{x1:`14`,x2:`14`,y1:`11`,y2:`17`,key:`xtxkd`}]]),ut=P(`Undo2`,[[`path`,{d:`M9 14 4 9l5-5`,key:`102s5s`}],[`path`,{d:`M4 9h10.5a5.5 5.5 0 0 1 5.5 5.5a5.5 5.5 0 0 1-5.5 5.5H11`,key:`f3b9sd`}]]),dt=P(`Upload`,[[`path`,{d:`M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4`,key:`ih7n3h`}],[`polyline`,{points:`17 8 12 3 7 8`,key:`t8dd8p`}],[`line`,{x1:`12`,x2:`12`,y1:`3`,y2:`15`,key:`widbto`}]]),ft=P(`User`,[[`path`,{d:`M19 21v-2a4 4 0 0 0-4-4H9a4 4 0 0 0-4 4v2`,key:`975kel`}],[`circle`,{cx:`12`,cy:`7`,r:`4`,key:`17ys0d`}]]),pt=P(`Users`,[[`path`,{d:`M16 21v-2a4 4 0 0 0-4-4H6a4 4 0 0 0-4 4v2`,key:`1yyitq`}],[`circle`,{cx:`9`,cy:`7`,r:`4`,key:`nufk8`}],[`path`,{d:`M22 21v-2a4 4 0 0 0-3-3.87`,key:`kshegd`}],[`path`,{d:`M16 3.13a4 4 0 0 1 0 7.75`,key:`1da9ce`}]]),mt=P(`Vault`,[[`rect`,{width:`18`,height:`18`,x:`3`,y:`3`,rx:`2`,key:`afitv7`}],[`circle`,{cx:`7.5`,cy:`7.5`,r:`.5`,fill:`currentColor`,key:`kqv944`}],[`path`,{d:`m7.9 7.9 2.7 2.7`,key:`hpeyl3`}],[`circle`,{cx:`16.5`,cy:`7.5`,r:`.5`,fill:`currentColor`,key:`w0ekpg`}],[`path`,{d:`m13.4 10.6 2.7-2.7`,key:`264c1n`}],[`circle`,{cx:`7.5`,cy:`16.5`,r:`.5`,fill:`currentColor`,key:`nkw3mc`}],[`path`,{d:`m7.9 16.1 2.7-2.7`,key:`p81g5e`}],[`circle`,{cx:`16.5`,cy:`16.5`,r:`.5`,fill:`currentColor`,key:`fubopw`}],[`path`,{d:`m13.4 13.4 2.7 2.7`,key:`abhel3`}],[`circle`,{cx:`12`,cy:`12`,r:`2`,key:`1c9p78`}]]),ht=P(`X`,[[`path`,{d:`M18 6 6 18`,key:`1bl5f8`}],[`path`,{d:`m6 6 12 12`,key:`d8bk6v`}]]);function gt(e){let t=e.trim();return!t||t.startsWith(`+`)?t:/^\d+$/.test(t)?`+${t}`:t}function H(e){let t=e.trim();return t?t.startsWith(`@`)?t:`@${t}`:``}function _t(e){return`${e.FirstName||``} ${e.LastName||``}`.trim()||`-`}function vt(e){return e.Broadcast&&!e.Megagroup?`Channel`:e.Megagroup&&e.Forum?`Supergroup / Forum`:e.Megagroup?`Supergroup`:`Channel / Group`}function U(e){if(!e||e.startsWith(`0001-`))return``;let t=new Date(e);return Number.isNaN(t.getTime())?``:t.toLocaleString()}function yt(e){if(!e||e<=0)return``;let t=new Date(e*1e3);return Number.isNaN(t.getTime())?``:t.toLocaleString()}function bt(e){let t=(e??``).trim();if(!/^https?:\/\//i.test(t))return``;try{let e=new URL(t);return e.protocol!==`http:`&&e.protocol!==`https:`?``:e.href}catch{return``}}function xt(e){if(!e.trim())return 0;let t=Number.parseInt(e,10);return Number.isFinite(t)?t:0}function St(e){let t=(e??``).trim();if(!t)return`0`;let n=Number(t);return Number.isFinite(n)?n.toLocaleString():t}var Ct={XTR:0,TON:9,USD:2,EUR:2,RUB:2};function wt(e){let t=(e??``).trim().toUpperCase();return t in Ct?Ct[t]:2}function Tt(e,t){let n=(e??``).trim();if(!n)return`0`;if(!/^-?\d+$/.test(n))return n;let r=wt(t),i=n.startsWith(`-`),a=(i?n.slice(1):n).replace(/^0+(?=\d)/,``).padStart(r+1,`0`),o=a.slice(0,a.length-r)||`0`,s=r>0?a.slice(a.length-r):``;r>2&&(s=s.replace(/0+$/,``));let c=i?`-`:``;return s?`${c}${Et(o)}.${s}`:`${c}${Et(o)}`}function Et(e){return e.replace(/\B(?=(\d{3})+(?!\d))/g,` `)}function Dt(e,t){let n=(t??``).trim().toUpperCase(),r=Tt(e,n);return n?`${r} ${n}`:r}function Ot(e,t){let n=(e??``).trim().replace(/\s+/g,``).replace(`,`,`.`);if(!n)return`0`;if(!/^\d*(\.\d*)?$/.test(n)||n===`.`)return null;let r=wt(t),[i,a=``]=n.split(`.`);if(a.length>r)return null;let o=`${i||`0`}${a.padEnd(r,`0`)}`.replace(/^0+(?=\d)/,``);return o===``?`0`:o}function kt(e){let t=(e??``).trim();if(!t||!/^\d+$/.test(t))return`0 B`;let n=Number(t);if(!Number.isFinite(n))return`${t} B`;let r=[`B`,`KB`,`MB`,`GB`,`TB`,`PB`],i=n,a=0;for(;i>=1024&&ae.trim()).filter(Boolean).map(e=>Number.parseInt(e,10));if(n.length===0||n.some(e=>!Number.isFinite(e)||e<=0))throw Error(t);return n}var jt=o((e=>{var t=u(),n=Symbol.for(`react.element`),r=Symbol.for(`react.fragment`),i=Object.prototype.hasOwnProperty,a=t.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner,o={key:!0,ref:!0,__self:!0,__source:!0};function s(e,t,r){var s,c={},l=null,u=null;for(s in r!==void 0&&(l=``+r),t.key!==void 0&&(l=``+t.key),t.ref!==void 0&&(u=t.ref),t)i.call(t,s)&&!o.hasOwnProperty(s)&&(c[s]=t[s]);if(e&&e.defaultProps)for(s in t=e.defaultProps,t)c[s]===void 0&&(c[s]=t[s]);return{$$typeof:n,type:e,key:l,ref:u,props:c,_owner:a.current}}e.Fragment=r,e.jsx=s,e.jsxs=s})),W=o(((e,t)=>{t.exports=jt()}))();function Mt({title:e,eyebrow:t,children:n,actions:r}){return(0,W.jsxs)(`div`,{className:`page-frame`,children:[(0,W.jsxs)(`div`,{className:`page-title-row`,children:[(0,W.jsxs)(`div`,{children:[t&&(0,W.jsx)(`div`,{className:`eyebrow`,children:t}),(0,W.jsx)(`h2`,{children:e})]}),r&&(0,W.jsx)(`div`,{className:`page-actions`,children:r})]}),n]})}function Nt({children:e}){return(0,W.jsx)(`div`,{className:`query-panel`,children:e})}function Pt({main:e,side:t}){return(0,W.jsxs)(`div`,{className:`split-layout`,children:[(0,W.jsx)(`div`,{className:`split-main`,children:e}),(0,W.jsx)(`aside`,{className:`split-side`,children:t})]})}function G({title:e,text:t,action:n}){return(0,W.jsxs)(`div`,{className:`section-head`,children:[(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`h2`,{children:e}),t&&(0,W.jsx)(`p`,{children:t})]}),n&&(0,W.jsx)(`div`,{className:`section-action`,children:n})]})}function K({children:e}){return(0,W.jsxs)(`div`,{className:`alert`,children:[(0,W.jsx)(ee,{size:16}),` `,(0,W.jsx)(`span`,{children:e})]})}function q({children:e,tone:t=`neutral`}){return(0,W.jsx)(`span`,{className:`badge ${t}`,children:e})}function J({label:e,value:t,tone:n=`neutral`,mono:r=!1}){return(0,W.jsxs)(`div`,{className:`metric ${n}`,children:[(0,W.jsx)(`span`,{children:e}),(0,W.jsx)(`strong`,{className:r?`mono`:``,children:t})]})}function Y({label:e,value:t,mono:n=!1}){return(0,W.jsxs)(`div`,{className:`summary-item`,children:[(0,W.jsx)(`span`,{children:e}),(0,W.jsx)(`strong`,{className:n?`mono`:``,children:t})]})}function Ft({rows:e}){return(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{children:`ID`}),(0,W.jsx)(`th`,{children:`Command ID`}),(0,W.jsx)(`th`,{children:`Action`}),(0,W.jsx)(`th`,{children:`Actor`}),(0,W.jsx)(`th`,{children:`Status`}),(0,W.jsx)(`th`,{children:`Dry-run`}),(0,W.jsx)(`th`,{children:`Reason`}),(0,W.jsx)(`th`,{children:`Time`})]})}),(0,W.jsxs)(`tbody`,{children:[e.map(e=>(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`td`,{children:e.ID}),(0,W.jsx)(`td`,{className:`mono`,children:e.CommandID}),(0,W.jsx)(`td`,{children:e.Action}),(0,W.jsx)(`td`,{children:e.Actor}),(0,W.jsx)(`td`,{children:e.Status}),(0,W.jsx)(`td`,{children:e.DryRun?`Yes`:`No`}),(0,W.jsx)(`td`,{className:`truncate`,children:e.Reason}),(0,W.jsx)(`td`,{children:U(e.CreatedAt)})]},e.ID)),e.length===0&&(0,W.jsx)(It,{colSpan:8})]})]})})}function It({colSpan:e}){return(0,W.jsx)(`tr`,{children:(0,W.jsx)(`td`,{colSpan:e,className:`empty-cell`,children:`No results`})})}function Lt({label:e}){return(0,W.jsx)(`section`,{className:`surface`,children:(0,W.jsx)(`div`,{className:`loading-line`,children:e})})}function Rt({value:e}){return(0,W.jsx)(`pre`,{className:`json-block`,children:e||`{}`})}function zt({username:e,collectibles:t}){let n=H(e??``),r=t??[];return r.length===0?(0,W.jsx)(W.Fragment,{children:n||`-`}):(0,W.jsxs)(W.Fragment,{children:[n,(0,W.jsx)(`ul`,{className:`username-branch`,children:r.map(e=>(0,W.jsxs)(`li`,{className:e.Active?``:`inactive`,children:[(0,W.jsx)(`span`,{children:H(e.Username)}),!e.Active&&(0,W.jsx)(`em`,{children:`inactive`})]},e.Username))})]})}var Bt=`verification.review`,Vt=`botverification.review`,Ht=`botverification.manage`,Ut=`server.manage`,Wt=(0,g.createContext)({permissions:[],hideThirdPartyVerification:!0});function Gt({permissions:e,hideThirdPartyVerification:t=!0,children:n}){let r=(0,g.useMemo)(()=>({permissions:e,hideThirdPartyVerification:t}),[e,t]);return(0,W.jsx)(Wt.Provider,{value:r,children:n})}function Kt(){let{permissions:e}=(0,g.useContext)(Wt);return(0,g.useMemo)(()=>({permissions:e,can:t=>e.includes(`*`)||e.includes(t)}),[e])}function qt(e){return Kt().can(e)}function Jt(){return(0,g.useContext)(Wt).hideThirdPartyVerification}function Yt({permission:e,children:t}){let{can:n}=Kt();return n(e)?(0,W.jsx)(W.Fragment,{children:t}):(0,W.jsx)(Xt,{permission:e})}function Xt({permission:e}){return(0,W.jsxs)(Mt,{title:`Not enough rights`,eyebrow:`Console / Access`,children:[(0,W.jsx)(K,{children:`This session was not granted the ${e} permission, so the section stays closed.`}),(0,W.jsx)(`section`,{className:`section-block`,children:(0,W.jsx)(`div`,{className:`entity-head`,children:(0,W.jsxs)(`div`,{children:[(0,W.jsxs)(`div`,{className:`entity-title`,children:[(0,W.jsx)(rt,{size:16}),` `,`Section unavailable`]}),(0,W.jsx)(`div`,{className:`entity-subtitle`,children:`Ask an operator to add the permission to TELESRV_ADMIN_UI_PERMISSIONS and sign in again.`})]})})})]})}function Zt({children:e}){return Jt()?(0,W.jsxs)(Mt,{title:`Feature hidden`,eyebrow:`Console / Third-party marks`,children:[(0,W.jsx)(K,{children:`Third-party bot verification is hidden on this server (TELESRV_HIDE_THIRD_PARTY_VERIFICATION=true).`}),(0,W.jsx)(`section`,{className:`section-block`,children:(0,W.jsx)(`div`,{className:`entity-head`,children:(0,W.jsxs)(`div`,{children:[(0,W.jsxs)(`div`,{className:`entity-title`,children:[(0,W.jsx)(rt,{size:16}),` `,`Not fully finished`]}),(0,W.jsx)(`div`,{className:`entity-subtitle`,children:`This feature may cause unstable server behavior and is hidden by default. Set TELESRV_HIDE_THIRD_PARTY_VERIFICATION=false to re-enable it.`})]})})})]}):(0,W.jsx)(W.Fragment,{children:e})}function Qt(){return{href:`${window.location.pathname}${window.location.search}`,path:window.location.pathname,search:new URLSearchParams(window.location.search)}}function $t(e){return e.startsWith(`/bot-verification`)?`Third-party verification`:e.startsWith(`/verification`)?`Official Verification`:e.startsWith(`/collectible-usernames`)?`Collectible Usernames`:e.startsWith(`/storage`)?`Storage`:e.startsWith(`/accounts/shared-devices`)?`Shared Devices`:e.startsWith(`/accounts`)?`Accounts`:e.startsWith(`/channels`)?`Supergroups and Channels`:e.startsWith(`/bots`)?`Bots`:e.startsWith(`/moderation`)?`Reports and Moderation`:e.startsWith(`/broadcasts`)?`Broadcasts`:e.startsWith(`/emoji`)?`Emoji`:e.startsWith(`/messages`)?`Message Audit`:e.startsWith(`/stickers`)?`Stickers`:e.startsWith(`/gif-catalog`)?`GIFs`:e.startsWith(`/server-settings`)?`Server Settings`:`Operations Console`}var en=`telesrv.admin.theme`,tn=(0,g.createContext)(null);function nn(e){document.documentElement.setAttribute(`data-theme`,e),document.documentElement.style.colorScheme=e}function rn({children:e}){let[t,n]=(0,g.useState)(()=>sn());(0,g.useEffect)(()=>{nn(t);try{localStorage.setItem(en,t)}catch{}},[t]),(0,g.useEffect)(()=>{if(!window.matchMedia)return;let e=window.matchMedia(`(prefers-color-scheme: dark)`),t=e=>{let t=null;try{t=localStorage.getItem(en)}catch{t=null}t!==`light`&&t!==`dark`&&n(e.matches?`dark`:`light`)};return e.addEventListener(`change`,t),()=>e.removeEventListener(`change`,t)},[]);let r=(0,g.useCallback)(e=>n(e),[]),i=(0,g.useCallback)(()=>n(e=>e===`dark`?`light`:`dark`),[]),a=(0,g.useMemo)(()=>({theme:t,setTheme:r,toggleTheme:i}),[t,r,i]);return(0,W.jsx)(tn.Provider,{value:a,children:e})}function an(){let e=(0,g.useContext)(tn);if(!e)throw Error(`useTheme must be used inside ThemeProvider`);return e}function on(){let{theme:e,toggleTheme:t}=an(),n=e===`light`?`Switch to dark theme`:`Switch to light theme`;return(0,W.jsx)(`button`,{className:`theme-toggle`,type:`button`,onClick:t,"aria-label":n,title:n,children:e===`dark`?(0,W.jsx)(ct,{size:16}):(0,W.jsx)(He,{size:16})})}function sn(){try{let e=localStorage.getItem(en);if(e===`light`||e===`dark`)return e}catch{}try{if(window.matchMedia&&window.matchMedia(`(prefers-color-scheme: dark)`).matches)return`dark`}catch{}return`light`}function cn({href:e,navigate:t,className:n,children:r}){return(0,W.jsx)(`a`,{className:n,href:e,onClick:n=>{n.preventDefault(),t(e)},children:r})}function ln(){return(0,W.jsxs)(`div`,{className:`boot-screen`,children:[(0,W.jsxs)(`div`,{className:`brand compact brand-elevated`,children:[(0,W.jsx)(`span`,{className:`brand-mark`,children:(0,W.jsx)(`img`,{src:`/logo.png`,alt:`OwpenGram`})}),(0,W.jsxs)(`span`,{children:[(0,W.jsx)(`strong`,{children:`OwpenGram`}),(0,W.jsx)(`small`,{children:`Admin Console`})]})]}),(0,W.jsx)(`div`,{className:`loader-bar`})]})}function un({actor:e,build:t,route:n,navigate:r,onLogout:i,children:a}){let o=qt(Bt),s=qt(Vt),c=qt(Ut),[l,u]=(0,g.useState)(null);(0,g.useEffect)(()=>{c&&k.serverIdentity().then(e=>u({name:e.name,iconExt:e.icon_ext})).catch(()=>void 0)},[c]);let[d,f]=(0,g.useState)(!1),p=l?.name?.trim()||`OwpenGram`,m=l?.iconExt&&!d?k.serverIconURL():`/logo.png`;(0,g.useEffect)(()=>{document.title=`${p} Admin`},[p]),(0,g.useEffect)(()=>{let e=document.querySelector(`link[rel='icon']`);e||(e=document.createElement(`link`),e.rel=`icon`,document.head.appendChild(e)),e.href=l?.iconExt&&!d?k.serverIconURL():`/logo.png`},[l?.iconExt,d]);let h=Jt(),_=n.path.startsWith(`/messages`),[v,y]=(0,g.useState)(_);(0,g.useEffect)(()=>{_&&y(!0)},[_]);async function b(){await k.logout().catch(()=>void 0),i()}return(0,W.jsxs)(`div`,{className:`shell`,children:[(0,W.jsxs)(`aside`,{className:`sidebar`,children:[(0,W.jsxs)(cn,{className:`brand`,href:`/`,navigate:r,children:[(0,W.jsx)(`span`,{className:`brand-mark`,children:(0,W.jsx)(`img`,{src:m,alt:p,onError:()=>f(!0)})}),(0,W.jsxs)(`span`,{children:[(0,W.jsx)(`strong`,{children:p}),(0,W.jsx)(`small`,{children:`Admin Console`})]})]}),(0,W.jsx)(`div`,{className:`sidebar-label`,children:`Navigation`}),(0,W.jsxs)(`nav`,{className:`nav-list`,"aria-label":`Primary navigation`,children:[(0,W.jsx)(dn,{icon:(0,W.jsx)(Pe,{size:16}),href:`/`,route:n,navigate:r,children:`Overview`}),(0,W.jsx)(dn,{icon:(0,W.jsx)(pt,{size:16}),href:`/accounts`,route:n,navigate:r,children:`Accounts`}),(0,W.jsx)(dn,{icon:(0,W.jsx)(nt,{size:16}),href:`/channels`,route:n,navigate:r,children:`Supergroups / Channels`}),(0,W.jsx)(dn,{icon:(0,W.jsx)(fe,{size:16}),href:`/bots`,route:n,navigate:r,children:`Bots`}),(0,W.jsx)(dn,{icon:(0,W.jsx)(tt,{size:16}),href:`/moderation`,route:n,navigate:r,children:`Reports / Moderation`}),(0,W.jsx)(dn,{icon:(0,W.jsx)(Re,{size:16}),href:`/broadcasts`,route:n,navigate:r,children:`Broadcasts`}),o&&(0,W.jsx)(dn,{icon:(0,W.jsx)(F,{size:16}),href:`/verification`,route:n,navigate:r,children:`Verification`}),s&&!h&&(0,W.jsx)(dn,{icon:(0,W.jsx)(ot,{size:16}),href:`/bot-verification`,route:n,navigate:r,children:`Third-party marks`}),(0,W.jsx)(dn,{icon:(0,W.jsx)(de,{size:16}),href:`/collectible-usernames`,route:n,navigate:r,children:`NFT Usernames`}),(0,W.jsx)(dn,{icon:(0,W.jsx)(Se,{size:16}),href:`/storage`,route:n,navigate:r,children:`Storage`}),(0,W.jsx)(dn,{icon:(0,W.jsx)(st,{size:16}),href:`/stickers`,route:n,navigate:r,children:`Stickers`}),(0,W.jsx)(dn,{icon:(0,W.jsx)(at,{size:16}),href:`/emoji`,route:n,navigate:r,children:`Emoji`}),(0,W.jsx)(dn,{icon:(0,W.jsx)(Ee,{size:16}),href:`/gif-catalog`,route:n,navigate:r,children:`GIFs`}),(0,W.jsxs)(`div`,{className:`nav-section ${_?`active`:``} ${v?`open`:``}`,children:[(0,W.jsxs)(`button`,{className:`nav-section-toggle`,type:`button`,"aria-expanded":v,onClick:()=>y(e=>!e),children:[(0,W.jsx)(Be,{size:16}),(0,W.jsx)(`span`,{children:`Messages`}),(0,W.jsx)(ge,{className:`nav-section-chevron`,size:15})]}),v&&(0,W.jsxs)(`div`,{className:`nav-children`,children:[(0,W.jsx)(dn,{href:`/messages/private`,route:n,navigate:r,activeWhen:e=>e===`/messages`||e===`/messages/detail`||e.startsWith(`/messages/private`),children:`Private`}),(0,W.jsx)(dn,{href:`/messages/groups`,route:n,navigate:r,activeWhen:e=>e.startsWith(`/messages/groups`),children:`Groups`})]})]}),c&&(0,W.jsx)(dn,{icon:(0,W.jsx)(et,{size:16}),href:`/server-settings`,route:n,navigate:r,children:`Server Settings`})]}),(0,W.jsxs)(`div`,{className:`sidebar-status`,children:[(0,W.jsx)(`span`,{className:`sidebar-label`,children:`Version: O7`}),t?.short_commit&&(0,W.jsx)(`span`,{className:`sidebar-label sidebar-build`,title:t.commit+(t.dirty?` (uncommitted changes)`:``),children:`Build: ${t.short_commit}${t.dirty?`+`:``}`})]})]}),(0,W.jsxs)(`div`,{className:`workspace`,children:[(0,W.jsxs)(`header`,{className:`topbar`,children:[(0,W.jsx)(`div`,{children:(0,W.jsx)(`h1`,{children:$t(n.path)})}),(0,W.jsxs)(`div`,{className:`topbar-actions`,children:[(0,W.jsx)(on,{}),(0,W.jsx)(`span`,{className:`actor-pill`,children:`Actor: ${e}`}),(0,W.jsxs)(`button`,{className:`btn ghost icon-text`,type:`button`,onClick:b,title:`Log out`,children:[(0,W.jsx)(Ie,{size:16}),` `,`Log out`]})]})]}),(0,W.jsx)(`main`,{className:`content`,children:a})]})]})}function dn({href:e,route:t,navigate:n,icon:r,children:i,activeWhen:a}){return(0,W.jsxs)(cn,{className:`nav-item ${(a?a(t.path):e===`/`?t.path===`/`:t.path.startsWith(e))?`active`:``}`,href:e,navigate:n,children:[r??(0,W.jsx)(`span`,{"aria-hidden":`true`,className:`nav-dot`}),(0,W.jsx)(`span`,{children:i})]})}function fn({onLogin:e}){let[t,n]=(0,g.useState)(``),[r,i]=(0,g.useState)(``),[a,o]=(0,g.useState)(!1);async function s(n){n.preventDefault(),o(!0),i(``);try{let n=await k.login(t);e({actor:n.actor,permissions:n.permissions??[]})}catch(e){i(O(e))}finally{o(!1)}}return(0,W.jsxs)(`main`,{className:`login-page`,children:[(0,W.jsxs)(`div`,{className:`bg-orbs`,"aria-hidden":`true`,children:[(0,W.jsx)(`div`,{className:`bg-orb bg-orb--1`}),(0,W.jsx)(`div`,{className:`bg-orb bg-orb--2`}),(0,W.jsx)(`div`,{className:`bg-orb bg-orb--3`})]}),(0,W.jsxs)(`section`,{className:`login-panel`,children:[(0,W.jsxs)(`div`,{className:`login-head`,children:[(0,W.jsxs)(`div`,{className:`brand brand-elevated`,children:[(0,W.jsx)(`span`,{className:`brand-mark`,children:(0,W.jsx)(`img`,{src:`/logo.png`,alt:`OwpenGram`})}),(0,W.jsxs)(`span`,{children:[(0,W.jsx)(`strong`,{children:`OwpenGram`}),(0,W.jsx)(`small`,{children:`Admin Console`})]})]}),(0,W.jsxs)(`div`,{className:`login-head-actions`,children:[(0,W.jsx)(on,{}),(0,W.jsx)(`span`,{className:`login-chip`,children:`Local access`})]})]}),(0,W.jsxs)(`div`,{className:`login-copy`,children:[(0,W.jsx)(`h1`,{children:`Operations Admin`}),(0,W.jsx)(`p`,{children:`Enter credentials to open the console.`})]}),r&&(0,W.jsx)(K,{children:r}),(0,W.jsxs)(`form`,{className:`form-stack`,onSubmit:s,children:[(0,W.jsxs)(`label`,{children:[(0,W.jsx)(`span`,{children:`Admin password or token`}),(0,W.jsx)(`input`,{autoFocus:!0,type:`password`,value:t,autoComplete:`current-password`,onChange:e=>n(e.target.value)})]}),(0,W.jsx)(`button`,{className:`btn primary full`,type:`submit`,disabled:a,children:a?`Logging in`:`Log in`})]})]})]})}var pn=m();function mn({kind:e,id:t,onClose:n,onDone:r}){let[i,a]=(0,g.useState)(null),[o,s]=(0,g.useState)(``),[c,l]=(0,g.useState)(``),[u,d]=(0,g.useState)(!1),[f,p]=(0,g.useState)(``);(0,g.useEffect)(()=>{if(!i){s(``);return}let e=URL.createObjectURL(i);return s(e),()=>URL.revokeObjectURL(e)},[i]);async function m(){if(!i){p(`Choose an image file first.`);return}if(!c.trim()){p(`Please enter an operation reason`);return}d(!0),p(``);try{let a=e===`channel`?`channel_id`:`user_id`,o=new FormData;o.set(`metadata`,JSON.stringify({command_id:``,reason:c.trim(),confirm:!0,[a]:t})),o.set(`file`,i,i.name);let s=e===`channel`?await k.setChannelAvatar(o):await k.setAccountAvatar(o);if(s.error){p(s.error);return}r(),n()}catch(e){p(O(e))}finally{d(!1)}}return(0,pn.createPortal)((0,W.jsx)(`div`,{className:`modal-backdrop`,role:`presentation`,children:(0,W.jsxs)(`section`,{className:`modal command-modal`,role:`dialog`,"aria-modal":`true`,"aria-label":`Change avatar`,children:[(0,W.jsxs)(`div`,{className:`modal-head`,children:[(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`div`,{className:`eyebrow`,children:e===`channel`?`Channel`:`Account`}),(0,W.jsx)(`h2`,{children:`Change avatar`})]}),(0,W.jsx)(`button`,{className:`icon-btn`,type:`button`,onClick:n,disabled:u,"aria-label":`Close`,children:(0,W.jsx)(ht,{size:15})})]}),(0,W.jsxs)(`div`,{className:`command-body`,children:[(0,W.jsxs)(`label`,{className:`gift-file-picker ${i?`has-file`:``}`,children:[(0,W.jsx)(`input`,{type:`file`,accept:`image/png,image/jpeg,image/webp`,onChange:e=>a(e.target.files?.[0]??null)}),o?(0,W.jsx)(`img`,{className:`gift-file-icon`,src:o,alt:``,style:{objectFit:`cover`}}):(0,W.jsx)(Ne,{size:22}),(0,W.jsxs)(`span`,{className:`gift-file-copy`,children:[(0,W.jsx)(`span`,{className:`gift-field-label`,children:`New avatar`}),(0,W.jsx)(`strong`,{children:i?i.name:`Choose a JPEG, PNG, or WebP image`})]}),(0,W.jsx)(`span`,{className:`gift-file-action`,children:i?`Change file`:`Choose file`})]}),(0,W.jsxs)(`label`,{className:`gift-reason-field`,children:[(0,W.jsx)(`span`,{children:`Audit reason`}),(0,W.jsx)(`input`,{value:c,placeholder:`Briefly describe why this avatar is being changed`,onChange:e=>l(e.target.value)})]}),f&&(0,W.jsx)(K,{children:f})]}),(0,W.jsxs)(`div`,{className:`modal-actions`,children:[(0,W.jsx)(`button`,{className:`btn`,type:`button`,onClick:n,disabled:u,children:`Close`}),(0,W.jsxs)(`button`,{className:`btn primary`,type:`button`,onClick:m,disabled:u,children:[u?(0,W.jsx)(L,{className:`spin`,size:15}):(0,W.jsx)(dt,{size:15}),`Upload avatar`]})]})]})}),document.body)}function X({label:e,path:t,payload:n,icon:r,compact:i=!1,tone:a=`danger`,disabled:o=!1,onDone:s,onError:c,secretField:l}){let[u,d]=(0,g.useState)(!1),[f,p]=(0,g.useState)(``),[m,h]=(0,g.useState)(null),[_,v]=(0,g.useState)(``),[y,b]=(0,g.useState)(!1),[x,S]=(0,g.useState)(!1);function C(){p(``),h(null),v(``),S(!1)}async function w(e){if(!f.trim()){v(`Please enter an operation reason`);return}b(!0),v(``);try{let r={...n(),reason:f,confirm:e};h(await k.action(t,r)),e&&s?.()}catch(e){v(c?.(e)||O(e))}finally{b(!1)}}let T=m?.dry_run&&!m.error,E=`btn ${a===`danger`?`danger`:a===`warn`?`warn`:a===`primary`?`primary`:``} ${i?`compact-btn`:``}`,D=(0,g.useMemo)(()=>{try{return n()}catch(e){return{payload_error:O(e)}}},[u,n]),A=l&&m?.details&&typeof m.details[l]==`string`?m.details[l]:``,j=A&&m?.details?Object.fromEntries(Object.entries(m.details).filter(([e])=>e!==l)):m?.details;async function M(){await navigator.clipboard.writeText(A),S(!0)}return(0,W.jsxs)(W.Fragment,{children:[(0,W.jsxs)(`button`,{className:E,type:`button`,disabled:o,onClick:()=>{C(),d(!0)},children:[r,e]}),u&&(0,pn.createPortal)((0,W.jsx)(`div`,{className:`modal-backdrop`,role:`presentation`,children:(0,W.jsxs)(`section`,{className:`modal command-modal`,role:`dialog`,"aria-modal":`true`,"aria-label":e,children:[(0,W.jsxs)(`div`,{className:`modal-head`,children:[(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`div`,{className:`eyebrow`,children:`Action Flow`}),(0,W.jsx)(`h2`,{children:e})]}),(0,W.jsx)(`button`,{className:`icon-btn`,type:`button`,onClick:()=>d(!1),"aria-label":`Close`,children:(0,W.jsx)(ht,{size:15})})]}),(0,W.jsxs)(`div`,{className:`command-body`,children:[(0,W.jsxs)(`div`,{className:`command-steps`,children:[(0,W.jsxs)(`div`,{className:`command-step ${f.trim()?`done`:`active`}`,children:[(0,W.jsx)(`span`,{children:`1`}),(0,W.jsx)(`strong`,{children:`Enter reason`})]}),(0,W.jsxs)(`div`,{className:`command-step ${m?.dry_run?`done`:f.trim()?`active`:``}`,children:[(0,W.jsx)(`span`,{children:`2`}),(0,W.jsx)(`strong`,{children:`Dry-run check`})]}),(0,W.jsxs)(`div`,{className:`command-step ${m&&!m.dry_run&&!m.error?`done`:T?`active`:``}`,children:[(0,W.jsx)(`span`,{children:`3`}),(0,W.jsx)(`strong`,{children:`Confirm execution`})]})]}),(0,W.jsxs)(`label`,{className:`form-field`,children:[(0,W.jsx)(`span`,{children:`Operation reason`}),(0,W.jsx)(`textarea`,{value:f,onChange:e=>p(e.target.value),rows:3,placeholder:`Describe why this operation is being performed`})]}),(0,W.jsxs)(`div`,{className:`command-preview`,children:[(0,W.jsxs)(`div`,{className:`preview-head`,children:[(0,W.jsx)(Te,{size:14}),` `,`Request preview`]}),(0,W.jsx)(Rt,{value:JSON.stringify(D,null,2)})]}),_&&(0,W.jsx)(K,{children:_}),m&&(0,W.jsxs)(`div`,{className:`result-box`,children:[(0,W.jsxs)(`div`,{className:`result-title`,children:[m.error?(0,W.jsx)(ee,{size:16}):(0,W.jsx)(I,{size:16}),(0,W.jsx)(`strong`,{children:m.message||m.error||`Action result`})]}),(0,W.jsxs)(`div`,{className:`result-line`,children:[(0,W.jsx)(`span`,{children:`Command ID`}),(0,W.jsx)(`strong`,{children:m.command_id})]}),(0,W.jsxs)(`div`,{className:`result-line`,children:[(0,W.jsx)(`span`,{children:`Status`}),(0,W.jsx)(`strong`,{children:m.status})]}),(0,W.jsxs)(`div`,{className:`result-line`,children:[(0,W.jsx)(`span`,{children:`Dry-run`}),(0,W.jsx)(`strong`,{children:m.dry_run?`Yes`:`No`})]}),(0,W.jsx)(`div`,{className:`result-message`,children:m.message||m.error}),A&&(0,W.jsxs)(`div`,{className:`secret-reveal`,children:[(0,W.jsx)(`div`,{className:`secret-reveal-label`,children:`One-time secret — copy it now, it won't be shown again`}),(0,W.jsxs)(`div`,{className:`secret-reveal-row`,children:[(0,W.jsx)(`code`,{className:`secret-reveal-value`,children:`•`.repeat(Math.min(A.length,40))}),(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>void M(),children:[x?(0,W.jsx)(he,{size:15}):(0,W.jsx)(be,{size:15}),x?`Copied`:`Copy`]})]})]}),j&&Object.keys(j).length>0&&(0,W.jsx)(Rt,{value:JSON.stringify(j,null,2)})]})]}),(0,W.jsxs)(`div`,{className:`modal-actions`,children:[(0,W.jsx)(`button`,{className:`btn`,type:`button`,onClick:()=>d(!1),children:`Close`}),(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>w(!1),disabled:y,children:[y?(0,W.jsx)(L,{size:15,className:`spin`}):(0,W.jsx)(B,{size:15}),m?`Run dry-run again`:`Run dry-run first`]}),(0,W.jsxs)(`button`,{className:`btn danger icon-text`,type:`button`,onClick:()=>w(!0),disabled:y||!T,children:[(0,W.jsx)(I,{size:15}),`Confirm execution`]})]})]})}),document.body)]})}var hn=[[`#FF885E`,`#FF516A`],[`#FFCD6A`,`#FFA85C`],[`#82B1FF`,`#665FFF`],[`#A0DE7E`,`#54CB68`],[`#53EDD6`,`#28C9B7`],[`#72D5FD`,`#2A9EF1`],[`#E0A2F3`,`#D669ED`]];function gn(e){return hn[Math.abs(e)%hn.length]}function _n(e){let t=Array.from(e);return t.length>0?t[0]:``}function vn(e,t,n){let r=`${e} ${t}`.trim().split(/\s+/).filter(Boolean),i=r.length>0?r:n?[n]:[];if(i.length===0)return`T`;let a=_n(i[0]);return i.length>1&&(a+=_n(i[i.length-1])),a.toUpperCase()}function yn({id:e,kind:t=`user`,firstName:n=``,lastName:r=``,username:i=``,title:a=``,size:o=34,refreshKey:s}){let[c,l]=(0,g.useState)(!1);if((0,g.useEffect)(()=>{l(!1)},[e,t,s]),c){let[s,c]=gn(e);return(0,W.jsx)(`div`,{className:`avatar-fallback`,style:{width:o,height:o,background:`linear-gradient(135deg, ${s}, ${c})`,fontSize:Math.round(o*.42)},children:t===`channel`?vn(a,``,i):vn(n,r,i)})}return(0,W.jsx)(`img`,{className:`avatar-photo-img`,src:`${t===`channel`?`/api/channels/${e}/avatar`:`/api/accounts/${e}/avatar`}${s===void 0?``:`?v=${encodeURIComponent(String(s))}`}`,alt:``,loading:`lazy`,style:{width:o,height:o},onError:()=>l(!0)})}function bn({rows:e,userID:t,onDone:n}){let[r,i]=(0,g.useState)(()=>new Set);(0,g.useEffect)(()=>{i(new Set)},[t]);let a=(0,g.useMemo)(()=>e.filter(e=>!r.has(e.Hash)),[e,r]);function o(e){i(t=>e(t)),n()}return(0,W.jsxs)(`div`,{className:`authorization-block`,children:[(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table authorization-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{children:`Device`}),(0,W.jsx)(`th`,{children:`Platform`}),(0,W.jsx)(`th`,{children:`IP`}),(0,W.jsx)(`th`,{children:`Last active`}),(0,W.jsx)(`th`,{className:`device-actions-head`,children:`Actions`})]})}),(0,W.jsxs)(`tbody`,{children:[a.map(n=>(0,W.jsxs)(`tr`,{children:[(0,W.jsxs)(`td`,{className:`device-text`,children:[n.DeviceModel,` `,n.SystemVersion]}),(0,W.jsxs)(`td`,{className:`device-text`,children:[n.Platform,` `,n.AppVersion]}),(0,W.jsx)(`td`,{children:n.IP}),(0,W.jsx)(`td`,{children:U(n.ActiveAt)}),(0,W.jsx)(`td`,{className:`device-actions-cell`,children:(0,W.jsxs)(`div`,{className:`device-actions`,children:[(0,W.jsx)(X,{label:`Revoke current`,icon:(0,W.jsx)(Ie,{size:13}),compact:!0,path:`/api/actions/revoke-sessions`,payload:()=>({user_id:t,hash:n.Hash}),onDone:()=>o(e=>new Set([...e,n.Hash]))}),(0,W.jsx)(X,{label:`Keep current`,icon:(0,W.jsx)(nt,{size:13}),compact:!0,path:`/api/actions/revoke-sessions`,payload:()=>({user_id:t,keep_hash:n.Hash}),onDone:()=>o(()=>new Set(e.filter(e=>e.Hash!==n.Hash).map(e=>e.Hash)))})]})})]},n.Hash)),a.length===0&&(0,W.jsx)(It,{colSpan:5})]})]})}),(0,W.jsx)(`div`,{className:`danger-zone`,children:(0,W.jsx)(X,{label:`Revoke all devices`,icon:(0,W.jsx)(me,{size:15}),path:`/api/actions/revoke-sessions`,payload:()=>({user_id:t,revoke_all:!0}),onDone:()=>o(()=>new Set(e.map(e=>e.Hash)))})})]})}function xn({scam:e,fake:t}){return!e&&!t?null:(0,W.jsxs)(W.Fragment,{children:[e&&(0,W.jsx)(q,{tone:`danger`,children:`SCAM`}),t&&(0,W.jsx)(q,{tone:`danger`,children:`FAKE`})]})}function Sn({idKey:e,id:t,path:n,scam:r,fake:i,onDone:a}){return(0,W.jsxs)(`div`,{className:`action-stack`,children:[(0,W.jsx)(X,{label:r?`Clear SCAM`:`Mark as SCAM`,icon:(0,W.jsx)(tt,{size:15}),tone:`danger`,path:n,payload:()=>({[e]:t,scam:!r,fake:r?i:!1}),onDone:a}),(0,W.jsx)(X,{label:i?`Clear FAKE`:`Mark as FAKE`,icon:(0,W.jsx)(re,{size:15}),tone:`danger`,path:n,payload:()=>({[e]:t,fake:!i,scam:i?r:!1}),onDone:a})]})}function Cn({id:e,support:t,onDone:n}){return(0,W.jsx)(X,{label:t?`Clear support`:`Mark as support`,icon:(0,W.jsx)(Fe,{size:15}),tone:`neutral`,path:`/api/actions/set-support`,payload:()=>({user_id:e,support:!t}),onDone:n})}function wn({idKey:e,id:t,path:n,current:r,onDone:i}){let[a,o]=(0,g.useState)(r.replace(/^@/,``));return(0,W.jsxs)(`div`,{className:`attr-block`,children:[(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Username`}),(0,W.jsx)(`input`,{value:a,onChange:e=>o(e.target.value),placeholder:`username`})]}),(0,W.jsx)(X,{label:`Set username`,icon:(0,W.jsx)(de,{size:15}),tone:`neutral`,path:n,payload:()=>({[e]:t,username:a.trim().replace(/^@/,``)}),onDone:i})]})}function Tn({id:e,path:t,currentFirstName:n,currentLastName:r,onDone:i}){let[a,o]=(0,g.useState)(n),[s,c]=(0,g.useState)(r);return(0,W.jsxs)(`div`,{className:`attr-block`,children:[(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`First name`}),(0,W.jsx)(`input`,{value:a,onChange:e=>o(e.target.value),placeholder:`First name`})]}),(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Last name`}),(0,W.jsx)(`input`,{value:s,onChange:e=>c(e.target.value),placeholder:`Last name`})]}),(0,W.jsx)(X,{label:`Set name`,icon:(0,W.jsx)(oe,{size:15}),tone:`neutral`,path:t,payload:()=>({user_id:e,first_name:a.trim(),last_name:s.trim()}),onDone:i})]})}function En({id:e,path:t,current:n,onDone:r}){let[i,a]=(0,g.useState)(n);return(0,W.jsxs)(`div`,{className:`attr-block`,children:[(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Phone number`}),(0,W.jsx)(`input`,{value:i,onChange:e=>a(e.target.value),placeholder:`15551234567`})]}),(0,W.jsx)(X,{label:`Set phone`,icon:(0,W.jsx)(We,{size:15}),tone:`warn`,path:t,payload:()=>({user_id:e,phone:i.trim()}),onDone:r})]})}function Dn({id:e,path:t,current:n,onDone:r}){let[i,a]=(0,g.useState)(n);return(0,W.jsxs)(`div`,{className:`attr-block`,children:[(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Login email`}),(0,W.jsx)(`input`,{value:i,onChange:e=>a(e.target.value),placeholder:`name@example.com (empty clears it)`,type:`email`})]}),(0,W.jsx)(X,{label:i.trim()?`Set login email`:`Clear login email`,icon:(0,W.jsx)(Le,{size:15}),tone:`warn`,path:t,payload:()=>({user_id:e,email:i.trim()}),onDone:r})]})}function On({idKey:e,id:t,path:n,onDone:r}){let[i,a]=(0,g.useState)(!1),[o,s]=(0,g.useState)(!0),[c,l]=(0,g.useState)(`0`),[u,d]=(0,g.useState)(``);return(0,W.jsxs)(`div`,{className:`attr-block`,children:[(0,W.jsxs)(`label`,{className:`checkline`,children:[(0,W.jsx)(`input`,{type:`checkbox`,checked:i,onChange:e=>a(e.target.checked)}),` `,`Profile color`]}),(0,W.jsxs)(`label`,{className:`checkline`,children:[(0,W.jsx)(`input`,{type:`checkbox`,checked:o,onChange:e=>s(e.target.checked)}),` `,`Enable color`]}),(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Color index`}),(0,W.jsx)(`input`,{type:`number`,min:`0`,max:`20`,value:c,onChange:e=>l(e.target.value)})]}),(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Background emoji ID`}),(0,W.jsx)(`input`,{value:u,onChange:e=>d(e.target.value),placeholder:`0`})]}),(0,W.jsx)(X,{label:`Set color`,icon:(0,W.jsx)(Ue,{size:15}),tone:`neutral`,path:n,payload:()=>({[e]:t,for_profile:i,has_color:o,color:xt(c),background_emoji_id:u.trim()||`0`}),onDone:r})]})}function kn({idKey:e,id:t,path:n,onDone:r}){let[i,a]=(0,g.useState)(``),[o,s]=(0,g.useState)(`0`);return(0,W.jsxs)(`div`,{className:`attr-block`,children:[(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Emoji document ID`}),(0,W.jsx)(`input`,{value:i,onChange:e=>a(e.target.value),placeholder:`0 = clear`})]}),(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Until (unix, 0 = permanent)`}),(0,W.jsx)(`input`,{type:`number`,min:`0`,value:o,onChange:e=>s(e.target.value)})]}),(0,W.jsx)(X,{label:`Set emoji status`,icon:(0,W.jsx)(at,{size:15}),tone:`neutral`,path:n,payload:()=>({[e]:t,document_id:i.trim()||`0`,until:xt(o)}),onDone:r})]})}function An({channel:e,onDone:t}){let[n,r]=(0,g.useState)(e.Gigagroup),[i,a]=(0,g.useState)(e.AntiSpam),[o,s]=(0,g.useState)(e.ParticipantsHidden),[c,l]=(0,g.useState)(e.NoForwards),[u,d]=(0,g.useState)(e.JoinToSend),[f,p]=(0,g.useState)(e.JoinRequest),[m,h]=(0,g.useState)(String(e.SlowmodeSeconds));(0,g.useEffect)(()=>{r(e.Gigagroup),a(e.AntiSpam),s(e.ParticipantsHidden),l(e.NoForwards),d(e.JoinToSend),p(e.JoinRequest),h(String(e.SlowmodeSeconds))},[e]);function _(){let t={channel_id:e.ID};return n!==e.Gigagroup&&(t.gigagroup=n),i!==e.AntiSpam&&(t.antispam=i),o!==e.ParticipantsHidden&&(t.participants_hidden=o),c!==e.NoForwards&&(t.noforwards=c),u!==e.JoinToSend&&(t.join_to_send=u),f!==e.JoinRequest&&(t.join_request=f),xt(m)!==e.SlowmodeSeconds&&(t.slowmode_seconds=xt(m)),t}return(0,W.jsxs)(`div`,{className:`attr-block`,children:[(0,W.jsxs)(`label`,{className:`checkline`,children:[(0,W.jsx)(`input`,{type:`checkbox`,checked:n,onChange:e=>r(e.target.checked)}),` `,`Gigagroup`]}),(0,W.jsxs)(`label`,{className:`checkline`,children:[(0,W.jsx)(`input`,{type:`checkbox`,checked:i,onChange:e=>a(e.target.checked)}),` `,`Aggressive anti-spam`]}),(0,W.jsxs)(`label`,{className:`checkline`,children:[(0,W.jsx)(`input`,{type:`checkbox`,checked:o,onChange:e=>s(e.target.checked)}),` `,`Hide members`]}),(0,W.jsxs)(`label`,{className:`checkline`,children:[(0,W.jsx)(`input`,{type:`checkbox`,checked:c,onChange:e=>l(e.target.checked)}),` `,`Restrict forwarding`]}),(0,W.jsxs)(`label`,{className:`checkline`,children:[(0,W.jsx)(`input`,{type:`checkbox`,checked:u,onChange:e=>d(e.target.checked)}),` `,`Join to send messages`]}),(0,W.jsxs)(`label`,{className:`checkline`,children:[(0,W.jsx)(`input`,{type:`checkbox`,checked:f,onChange:e=>p(e.target.checked)}),` `,`Join by request`]}),(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Slowmode (seconds)`}),(0,W.jsx)(`input`,{type:`number`,min:`0`,max:`86400`,value:m,onChange:e=>h(e.target.value)})]}),(0,W.jsx)(X,{label:`Apply settings`,icon:(0,W.jsx)(V,{size:15}),tone:`warn`,path:`/api/actions/set-channel-settings`,payload:_,onDone:t})]})}function jn({id:e,navigate:t}){let[n,r]=(0,g.useState)(null),[i,a]=(0,g.useState)(``),[o,s]=(0,g.useState)(!1),[c,l]=(0,g.useState)(`profile`),[u,d]=(0,g.useState)(`1`),[f,p]=(0,g.useState)(()=>Mn(new Date(Date.now()+7*864e5))),[m,h]=(0,g.useState)(``),[_,v]=(0,g.useState)(!1),[y,b]=(0,g.useState)(0);async function x(){s(!0),a(``);try{let t=await k.account(e);r(t),t.Restriction.Frozen&&(t.Restriction.Until&&p(Mn(new Date(t.Restriction.Until))),h(t.Restriction.AppealURL||``))}catch(e){a(O(e))}finally{s(!1)}}if((0,g.useEffect)(()=>{x(),l(`profile`)},[e]),i)return(0,W.jsx)(K,{children:i});if(!n)return(0,W.jsx)(Lt,{label:o?`Loading account detail`:`Waiting for data`});let S=n.Account,C=[{key:`profile`,label:`Profile & Status`,icon:(0,W.jsx)(oe,{size:15})},{key:`devices`,label:`Authorized Devices`,icon:(0,W.jsx)(Ve,{size:15})},{key:`actions`,label:`Actions & Management`,icon:(0,W.jsx)(V,{size:15})}];return(0,W.jsxs)(Mt,{title:`Account #${S.ID}`,eyebrow:`Account Profile`,actions:(0,W.jsxs)(`button`,{className:`btn icon-text`,onClick:()=>t(`/accounts`),children:[(0,W.jsx)(ue,{size:15}),` `,`Back to list`]}),children:[(0,W.jsxs)(`section`,{className:`entity-head`,children:[(0,W.jsxs)(`div`,{className:`entity-head-main`,children:[(0,W.jsxs)(`div`,{className:`avatar-edit-slot`,children:[(0,W.jsx)(yn,{id:S.ID,firstName:S.FirstName,lastName:S.LastName,username:S.Username,size:64,refreshKey:y||void 0}),(0,W.jsx)(`button`,{className:`icon-btn avatar-edit-btn`,type:`button`,"aria-label":`Change avatar`,title:`Change avatar`,onClick:()=>v(!0),children:(0,W.jsx)(Ne,{size:13})})]}),(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`div`,{className:`entity-title`,children:_t(S)}),(0,W.jsxs)(`div`,{className:`entity-subtitle`,children:[H(S.Username)||`No username`,` · `,gt(S.Phone)||`No phone`]}),S.Collectibles?.length>0&&(0,W.jsx)(`div`,{className:`entity-subtitle`,children:(0,W.jsx)(zt,{username:``,collectibles:S.Collectibles})})]})]}),(0,W.jsxs)(`div`,{className:`entity-badges`,children:[S.PremiumUntil>0?(0,W.jsx)(q,{tone:`good`,children:`Premium`}):(0,W.jsx)(q,{children:`Not premium`}),n.Verified?(0,W.jsx)(q,{tone:`good`,children:`Verified`}):(0,W.jsx)(q,{children:`Not verified`}),(0,W.jsx)(xn,{scam:n.Scam,fake:n.Fake}),S.Frozen?(0,W.jsx)(q,{tone:`danger`,children:`Account frozen`}):(0,W.jsx)(q,{children:`Account active`})]})]}),(0,W.jsx)(`div`,{className:`toolbar`,role:`group`,"aria-label":`Account sections`,children:C.map(e=>(0,W.jsxs)(`button`,{className:`btn icon-text ${c===e.key?`primary`:``}`,type:`button`,"aria-pressed":c===e.key,onClick:()=>l(e.key),children:[e.icon,` `,e.label]},e.key))}),c===`profile`&&(0,W.jsxs)(`div`,{className:`stacked-sections`,children:[(0,W.jsxs)(`div`,{className:`summary-grid`,children:[(0,W.jsx)(Y,{label:`User ID`,value:String(S.ID),mono:!0}),(0,W.jsx)(Y,{label:`Last active`,value:yt(n.LastSeenAt)||`-`}),(0,W.jsx)(Y,{label:`Premium expires`,value:S.PremiumUntil>0?yt(S.PremiumUntil):`None`}),(0,W.jsx)(Y,{label:`Updated`,value:U(S.UpdatedAt)||`-`}),(0,W.jsx)(Y,{label:`Authorized devices`,value:String(n.Authorizations.length)}),(0,W.jsx)(Y,{label:`Account flags`,value:`support=${n.Support} bot=${n.Bot}`}),(0,W.jsx)(Y,{label:`Restriction`,value:n.HasRestriction?n.Restriction.Reason||`Restricted`:`None`}),(0,W.jsx)(Y,{label:`Frozen since`,value:n.Restriction.Since?U(n.Restriction.Since):`None`}),(0,W.jsx)(Y,{label:`Appeal deadline`,value:n.Restriction.Until?U(n.Restriction.Until):`None`}),(0,W.jsx)(Y,{label:`Appeal URL`,value:n.Restriction.AppealURL||`None`}),(0,W.jsx)(Y,{label:`Created`,value:U(S.CreatedAt)||`-`})]}),n.About&&(0,W.jsx)(`p`,{className:`about-text`,children:n.About})]}),c===`devices`&&(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Authorized Devices`,text:`${n.Authorizations.length} authorizations`}),(0,W.jsx)(bn,{rows:n.Authorizations,userID:S.ID,onDone:x})]}),c===`actions`&&(0,W.jsxs)(`div`,{className:`stacked-sections`,children:[(0,W.jsxs)(`div`,{className:`action-groups`,children:[(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Freeze & Restriction`,text:`Blocks sign-in and marks the account for appeal review.`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsxs)(`div`,{className:`attr-block`,children:[(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Appeal deadline`}),(0,W.jsx)(`input`,{"aria-label":`Freeze appeal deadline`,value:f,onChange:e=>p(e.target.value),type:`datetime-local`})]}),(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Appeal URL`}),(0,W.jsx)(`input`,{"aria-label":`Freeze appeal URL`,value:m,onChange:e=>h(e.target.value),type:`url`,placeholder:`https://...`})]}),(0,W.jsx)(X,{label:S.Frozen?`Update freeze`:`Freeze account`,icon:(0,W.jsx)(ee,{size:15}),tone:`danger`,path:`/api/actions/set-frozen`,payload:()=>({user_id:S.ID,frozen:!0,freeze_until:new Date(f).toISOString(),freeze_appeal_url:m.trim()}),onDone:x}),S.Frozen&&(0,W.jsx)(X,{label:`Unfreeze account`,icon:(0,W.jsx)(ee,{size:15}),path:`/api/actions/set-frozen`,payload:()=>({user_id:S.ID,frozen:!1}),onDone:x})]})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Premium`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsxs)(`div`,{className:`attr-block`,children:[(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Premium duration (months)`}),(0,W.jsx)(`input`,{"aria-label":`Set premium duration in months`,value:u,onChange:e=>d(e.target.value),type:`number`,min:`1`,max:`120`})]}),(0,W.jsxs)(`div`,{className:`action-stack`,children:[(0,W.jsx)(X,{label:`Set premium`,icon:(0,W.jsx)(ie,{size:15}),tone:`warn`,path:`/api/actions/grant-premium`,payload:()=>({user_id:S.ID,months:xt(u)}),onDone:x}),(0,W.jsx)(X,{label:`Clear premium`,icon:(0,W.jsx)(ie,{size:15}),tone:`warn`,path:`/api/actions/grant-premium`,payload:()=>({user_id:S.ID,months:0}),onDone:x})]})]})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Verification & Moderation Flags`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsxs)(`div`,{className:`action-stack`,children:[(0,W.jsx)(X,{label:n.Verified?`Clear verified`:`Set verified`,icon:(0,W.jsx)(F,{size:15}),tone:`warn`,path:`/api/actions/set-verified`,payload:()=>({user_id:S.ID,verified:!n.Verified}),onDone:x}),(0,W.jsx)(Sn,{idKey:`user_id`,id:S.ID,path:`/api/actions/set-account-flags`,scam:n.Scam,fake:n.Fake,onDone:x}),(0,W.jsx)(Cn,{id:S.ID,support:n.Support,onDone:x})]})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Username`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsx)(wn,{idKey:`user_id`,id:S.ID,path:`/api/actions/set-account-username`,current:S.Username,onDone:x})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Name`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsx)(Tn,{id:S.ID,path:`/api/actions/set-account-profile`,currentFirstName:S.FirstName,currentLastName:S.LastName,onDone:x})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Phone Number`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsx)(En,{id:S.ID,path:`/api/actions/set-account-phone`,current:S.Phone,onDone:x})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Login Email`,text:`The email used for sign-in / password-recovery, not a contact address.`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsx)(Dn,{id:S.ID,path:`/api/actions/set-account-login-email`,current:S.LoginEmail,onDone:x})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Profile Color`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsx)(On,{idKey:`user_id`,id:S.ID,path:`/api/actions/set-account-color`,onDone:x})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Emoji Status`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsx)(kn,{idKey:`user_id`,id:S.ID,path:`/api/actions/set-account-emoji-status`,onDone:x})})]})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Recent Admin Actions`,text:`Last 30 audit rows`,action:(0,W.jsx)(Xe,{size:16})}),(0,W.jsx)(Ft,{rows:n.AuditLogs})]})]}),_&&(0,W.jsx)(mn,{kind:`user`,id:S.ID,onClose:()=>v(!1),onDone:()=>{b(e=>e+1),x()}})]})}function Mn(e){return new Date(e.getTime()-e.getTimezoneOffset()*6e4).toISOString().slice(0,16)}function Nn(e){return e.reduce((e,t)=>(e.devices+=t.DeviceCount,e),{devices:0})}function Pn(e){return e.reduce((e,t)=>(t.Megagroup&&(e.megagroups+=1),t.Broadcast&&(e.broadcasts+=1),t.Verified&&(e.verified+=1),e),{megagroups:0,broadcasts:0,verified:0})}var Fn={beforeID:0,beforeActiveUS:0};function In({navigate:e}){let[t,n]=(0,g.useState)(``),[r,i]=(0,g.useState)(50),[a,o]=(0,g.useState)(null),[s,c]=(0,g.useState)(null),[l,u]=(0,g.useState)([]),[d,f]=(0,g.useState)(Fn),[p,m]=(0,g.useState)(!1),[h,_]=(0,g.useState)(``);async function v(e,t){m(!0),_(``);let n=new URLSearchParams({limit:String(r)});e.trim()&&n.set(`q`,e.trim()),(t.beforeID||t.beforeActiveUS)&&(n.set(`before_id`,String(t.beforeID)),n.set(`before_active_us`,String(t.beforeActiveUS)));try{let e=await k.accounts(n);return o(e),e}catch(e){return _(O(e)),null}finally{m(!1)}}async function y(){u([]),f(Fn),await v(t,Fn)}async function b(){if(!a?.has_more)return;let e={beforeID:a.next_before_id,beforeActiveUS:a.next_before_active_us};await v(t,e)&&(u(e=>[...e,d]),f(e))}async function x(){if(l.length===0)return;let e=l[l.length-1];await v(t,e)&&(u(e=>e.slice(0,-1)),f(e))}async function S(){try{c(await k.accountStats())}catch{}}(0,g.useEffect)(()=>{y(),S()},[]);let C=Nn(a?.rows??[]),w=l.length>0&&!p,T=!!a?.has_more&&!p;return(0,W.jsxs)(Mt,{title:`Accounts`,eyebrow:a?.listing===!1?`Search results`:`Recently active accounts`,actions:(0,W.jsxs)(W.Fragment,{children:[(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>e(`/accounts/shared-devices`),children:[(0,W.jsx)(it,{size:15}),` `,`Shared devices`]}),(0,W.jsxs)(`button`,{className:`btn`,type:`button`,onClick:()=>{y(),S()},disabled:p,children:[(0,W.jsx)(Ye,{size:15}),` `,`Refresh`]})]}),children:[h&&(0,W.jsx)(K,{children:h}),(0,W.jsxs)(`div`,{className:`metric-row`,children:[(0,W.jsx)(J,{label:`Total users`,value:s?String(s.total):`…`}),(0,W.jsx)(J,{label:`Online now`,value:s?String(s.online):`…`,tone:`good`}),(0,W.jsx)(J,{label:`Online device records`,value:String(C.devices)})]}),(0,W.jsx)(Nt,{children:(0,W.jsxs)(`form`,{className:`toolbar`,onSubmit:e=>{e.preventDefault(),y()},children:[(0,W.jsxs)(`label`,{className:`searchbox`,children:[(0,W.jsx)(Ze,{size:15}),(0,W.jsx)(`input`,{value:t,onChange:e=>n(e.target.value),placeholder:`User ID / phone / username / email / name`})]}),(0,W.jsxs)(`label`,{className:`gift-page-size`,children:[(0,W.jsx)(`span`,{children:`Limit`}),(0,W.jsxs)(`select`,{value:String(r),onChange:e=>i(Number(e.target.value)),children:[(0,W.jsx)(`option`,{value:`10`,children:`10`}),(0,W.jsx)(`option`,{value:`20`,children:`20`}),(0,W.jsx)(`option`,{value:`50`,children:`50`}),(0,W.jsx)(`option`,{value:`100`,children:`100`})]})]}),(0,W.jsxs)(`button`,{className:`btn primary icon-text`,type:`submit`,disabled:p,children:[p?(0,W.jsx)(L,{size:15,className:`spin`}):(0,W.jsx)(Ze,{size:15}),` `,`Search`]}),(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>void x(),disabled:!w,children:[(0,W.jsx)(_e,{size:15}),` `,`Previous page`]}),(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>void b(),disabled:!T,children:[(0,W.jsx)(ve,{size:15}),` `,`Next page`]})]})}),(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{className:`avatar-col`}),(0,W.jsx)(`th`,{children:`User ID`}),(0,W.jsx)(`th`,{children:`Phone`}),(0,W.jsx)(`th`,{children:`Username`}),(0,W.jsx)(`th`,{children:`Name`}),(0,W.jsx)(`th`,{children:`Login email`}),(0,W.jsx)(`th`,{children:`Device`}),(0,W.jsx)(`th`,{children:`Last active`}),(0,W.jsx)(`th`,{children:`Premium`}),(0,W.jsx)(`th`,{children:`Verified`}),(0,W.jsx)(`th`,{children:`Frozen`}),(0,W.jsx)(`th`,{children:`Updated`}),(0,W.jsx)(`th`,{})]})}),(0,W.jsxs)(`tbody`,{children:[a?.rows.map(t=>(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`td`,{className:`avatar-col`,children:(0,W.jsx)(`button`,{className:`avatar-link`,type:`button`,onClick:()=>e(`/accounts/${t.ID}`),"aria-label":`Open account ${t.ID}`,children:(0,W.jsx)(yn,{id:t.ID,firstName:t.FirstName,lastName:t.LastName,username:t.Username})})}),(0,W.jsx)(`td`,{className:`mono`,children:t.ID}),(0,W.jsx)(`td`,{children:gt(t.Phone)}),(0,W.jsx)(`td`,{children:(0,W.jsx)(zt,{username:t.Username,collectibles:t.Collectibles})}),(0,W.jsx)(`td`,{children:_t(t)}),(0,W.jsx)(`td`,{children:t.LoginEmail||(0,W.jsx)(`span`,{className:`muted-cell`,children:`None`})}),(0,W.jsx)(`td`,{children:t.DeviceCount}),(0,W.jsx)(`td`,{children:U(t.LastActiveAt)}),(0,W.jsx)(`td`,{children:t.PremiumUntil>0?(0,W.jsxs)(q,{tone:`good`,children:[`Premium`,` `,yt(t.PremiumUntil)]}):(0,W.jsx)(q,{children:`None`})}),(0,W.jsxs)(`td`,{children:[t.Verified?(0,W.jsx)(q,{tone:`good`,children:`Verified`}):(0,W.jsx)(q,{children:`Not verified`}),` `,(0,W.jsx)(xn,{scam:t.Scam,fake:t.Fake})]}),(0,W.jsx)(`td`,{children:t.Frozen?(0,W.jsx)(q,{tone:`danger`,children:`Frozen`}):(0,W.jsx)(q,{children:`Normal`})}),(0,W.jsx)(`td`,{children:U(t.UpdatedAt)}),(0,W.jsx)(`td`,{children:(0,W.jsxs)(`button`,{className:`row-link`,onClick:()=>e(`/accounts/${t.ID}`),children:[`Details`,` `,(0,W.jsx)(ve,{size:14})]})})]},t.ID)),(!a||a.rows.length===0)&&(0,W.jsx)(It,{colSpan:12})]})]})})]})}function Ln({navigate:e}){let[t,n]=(0,g.useState)([]),[r,i]=(0,g.useState)(!1),[a,o]=(0,g.useState)(0),[s,c]=(0,g.useState)(!1),[l,u]=(0,g.useState)(``);async function d(e=!1){c(!0),u(``);let t=new URLSearchParams({limit:`20`,offset:String(e?a:0)});try{let r=await k.sharedDeviceGroups(t),a=r.rows??[];n(t=>e?[...t,...a]:a),o(r.next_offset),i(!!r.has_more)}catch(e){u(O(e))}finally{c(!1)}}(0,g.useEffect)(()=>{d(!1)},[]);let f=t.reduce((e,t)=>e+t.AccountCount,0);return(0,W.jsxs)(Mt,{title:`Shared Devices`,eyebrow:`Multi-account signal — device/IP overlap across different accounts`,actions:(0,W.jsxs)(W.Fragment,{children:[(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>e(`/accounts`),children:[(0,W.jsx)(ue,{size:15}),` `,`Back to accounts`]}),(0,W.jsxs)(`button`,{className:`btn`,type:`button`,onClick:()=>d(!1),disabled:s,children:[(0,W.jsx)(Ye,{size:15,className:s?`spin`:``}),` `,`Refresh`]})]}),children:[l&&(0,W.jsx)(K,{children:l}),(0,W.jsxs)(`div`,{className:`metric-row`,children:[(0,W.jsx)(J,{label:`Device groups on page`,value:String(t.length)}),(0,W.jsx)(J,{label:`Accounts flagged on page`,value:String(f),tone:`warn`})]}),(0,W.jsxs)(`p`,{className:`about-text`,children:[`Each card below is a device fingerprint (device model + OS + platform + IP) that more than one account has authorized from. `,`device_model/system_version are self-reported by the client, and IP alone can collide innocently -- use this as a lead, not a verdict.`]}),(0,W.jsxs)(`div`,{className:`stacked-sections`,children:[t.map(t=>(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:t.DeviceModel||`Unknown device`,text:`${t.Platform||`unknown platform`} ${t.SystemVersion} · ${t.IP} · last active ${U(t.LastActiveAt)}`,action:(0,W.jsxs)(q,{tone:`warn`,children:[(0,W.jsx)(it,{size:12}),` `,`${t.AccountCount} accounts`]})}),(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{className:`avatar-col`}),(0,W.jsx)(`th`,{children:`User ID`}),(0,W.jsx)(`th`,{children:`Phone`}),(0,W.jsx)(`th`,{children:`Username`}),(0,W.jsx)(`th`,{children:`Name`}),(0,W.jsx)(`th`,{children:`Active from this device`}),(0,W.jsx)(`th`,{})]})}),(0,W.jsx)(`tbody`,{children:t.Accounts.map(t=>(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`td`,{className:`avatar-col`,children:(0,W.jsx)(`button`,{className:`avatar-link`,type:`button`,onClick:()=>e(`/accounts/${t.UserID}`),"aria-label":`Open account ${t.UserID}`,children:(0,W.jsx)(yn,{id:t.UserID,firstName:t.FirstName,lastName:t.LastName,username:t.Username})})}),(0,W.jsx)(`td`,{className:`mono`,children:t.UserID}),(0,W.jsx)(`td`,{children:gt(t.Phone)}),(0,W.jsx)(`td`,{children:H(t.Username)||`-`}),(0,W.jsx)(`td`,{children:_t(t)||`-`}),(0,W.jsx)(`td`,{children:U(t.ActiveAt)}),(0,W.jsx)(`td`,{children:(0,W.jsxs)(`button`,{className:`row-link`,onClick:()=>e(`/accounts/${t.UserID}`),children:[`Details`,` `,(0,W.jsx)(ve,{size:14})]})})]},t.UserID))})]})})]},`${t.DeviceModel}|${t.SystemVersion}|${t.Platform}|${t.IP}`)),t.length===0&&(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsx)(`table`,{className:`data-table`,children:(0,W.jsx)(`tbody`,{children:(0,W.jsx)(It,{colSpan:7})})})})]}),r&&(0,W.jsx)(`div`,{className:`toolbar`,children:(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>d(!0),disabled:s,children:[s?(0,W.jsx)(L,{size:15,className:`spin`}):(0,W.jsx)(ge,{size:15}),` `,`Load more`]})})]})}function Rn({label:e,value:t,onChange:n}){let[r,i]=(0,g.useState)(``),[a,o]=(0,g.useState)([]),[s,c]=(0,g.useState)(!1),[l,u]=(0,g.useState)(``);async function d(){c(!0),u(``);let e=new URLSearchParams({limit:`20`});r.trim()&&e.set(`q`,r.trim());try{o((await k.accounts(e)).rows)}catch(e){u(O(e))}finally{c(!1)}}return(0,g.useEffect)(()=>{d()},[]),(0,W.jsxs)(`div`,{className:`entity-picker`,children:[(0,W.jsxs)(`div`,{className:`picker-head`,children:[(0,W.jsx)(`span`,{children:e}),t?(0,W.jsxs)(`button`,{className:`link-button`,type:`button`,onClick:()=>n(null),children:[(0,W.jsx)(ht,{size:13}),` `,`Clear`]}):null]}),t?(0,W.jsxs)(`div`,{className:`selected-entity`,children:[(0,W.jsx)(he,{size:15}),(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`strong`,{children:_t(t)}),(0,W.jsx)(`span`,{className:`mono`,children:t.ID})]}),(0,W.jsx)(`span`,{children:H(t.Username)||gt(t.Phone)||`-`})]}):null,(0,W.jsxs)(`div`,{className:`picker-search`,children:[(0,W.jsx)(Ze,{size:15}),(0,W.jsx)(`input`,{value:r,onChange:e=>i(e.target.value),onKeyDown:e=>{e.key===`Enter`&&(e.preventDefault(),d())},placeholder:`Search user_id / phone / username`}),(0,W.jsx)(`button`,{className:`btn compact-btn`,type:`button`,onClick:d,disabled:s,children:s?(0,W.jsx)(L,{size:14,className:`spin`}):`Search`})]}),l&&(0,W.jsx)(`div`,{className:`picker-error`,children:l}),(0,W.jsxs)(`div`,{className:`picker-results`,children:[a.map(e=>(0,W.jsxs)(`button`,{className:`picker-row ${t?.ID===e.ID?`selected`:``}`,type:`button`,onClick:()=>n(e),children:[(0,W.jsx)(`span`,{className:`mono`,children:e.ID}),(0,W.jsx)(`strong`,{children:_t(e)}),(0,W.jsx)(`span`,{children:H(e.Username)||gt(e.Phone)||`-`}),e.Verified?(0,W.jsx)(q,{tone:`good`,children:`Verified`}):(0,W.jsx)(q,{children:`Regular`})]},e.ID)),a.length===0&&!s?(0,W.jsx)(`div`,{className:`picker-empty`,children:`No results`}):null]})]})}function zn({label:e,selected:t,onChange:n}){let[r,i]=(0,g.useState)(``),[a,o]=(0,g.useState)([]),[s,c]=(0,g.useState)(!1),[l,u]=(0,g.useState)(``);async function d(){c(!0),u(``);let e=new URLSearchParams({limit:`20`});r.trim()&&e.set(`q`,r.trim());try{o((await k.accounts(e)).rows)}catch(e){u(O(e))}finally{c(!1)}}(0,g.useEffect)(()=>{d()},[]);function f(e){t.some(t=>t.ID===e.ID)?n(t.filter(t=>t.ID!==e.ID)):n([...t,e])}function p(e){n(t.filter(t=>t.ID!==e))}return(0,W.jsxs)(`div`,{className:`entity-picker`,children:[(0,W.jsxs)(`div`,{className:`picker-head`,children:[(0,W.jsx)(`span`,{children:e}),t.length>0?(0,W.jsxs)(`button`,{className:`link-button`,type:`button`,onClick:()=>n([]),children:[(0,W.jsx)(ht,{size:13}),` `,`Clear all`]}):null]}),t.length>0?(0,W.jsx)(`div`,{className:`picker-chip-list`,children:t.map(e=>(0,W.jsxs)(`span`,{className:`picker-chip`,children:[_t(e),` `,(0,W.jsx)(`span`,{className:`mono`,children:e.ID}),(0,W.jsx)(`button`,{type:`button`,onClick:()=>p(e.ID),"aria-label":`Remove ${e.ID}`,children:(0,W.jsx)(ht,{size:12})})]},e.ID))}):null,(0,W.jsxs)(`div`,{className:`picker-search`,children:[(0,W.jsx)(Ze,{size:15}),(0,W.jsx)(`input`,{value:r,onChange:e=>i(e.target.value),onKeyDown:e=>{e.key===`Enter`&&(e.preventDefault(),d())},placeholder:`Search user_id / phone / username`}),(0,W.jsx)(`button`,{className:`btn compact-btn`,type:`button`,onClick:d,disabled:s,children:s?(0,W.jsx)(L,{size:14,className:`spin`}):`Search`})]}),l&&(0,W.jsx)(`div`,{className:`picker-error`,children:l}),(0,W.jsxs)(`div`,{className:`picker-results`,children:[a.map(e=>{let n=t.some(t=>t.ID===e.ID);return(0,W.jsxs)(`button`,{className:`picker-row ${n?`selected`:``}`,type:`button`,onClick:()=>f(e),children:[(0,W.jsx)(`span`,{className:`mono`,children:e.ID}),(0,W.jsx)(`strong`,{children:_t(e)}),(0,W.jsx)(`span`,{children:H(e.Username)||gt(e.Phone)||`-`}),n?(0,W.jsx)(he,{size:15}):null]},e.ID)}),a.length===0&&!s?(0,W.jsx)(`div`,{className:`picker-empty`,children:`No results`}):null]})]})}function Bn({label:e,value:t,onChange:n}){let[r,i]=(0,g.useState)(``),[a,o]=(0,g.useState)([]),[s,c]=(0,g.useState)(!1),[l,u]=(0,g.useState)(``);async function d(){c(!0),u(``);let e=new URLSearchParams({limit:`20`});r.trim()&&e.set(`q`,r.trim().replace(/^@/,``));try{o((await k.bots(e)).rows??[])}catch(e){u(O(e))}finally{c(!1)}}return(0,g.useEffect)(()=>{d()},[]),(0,W.jsxs)(`div`,{className:`entity-picker`,children:[(0,W.jsxs)(`div`,{className:`picker-head`,children:[(0,W.jsx)(`span`,{children:e}),t?(0,W.jsxs)(`button`,{className:`link-button`,type:`button`,onClick:()=>n(null),children:[(0,W.jsx)(ht,{size:13}),` `,`Clear`]}):null]}),t?(0,W.jsxs)(`div`,{className:`selected-entity`,children:[(0,W.jsx)(he,{size:15}),(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`strong`,{children:t.FirstName||`-`}),(0,W.jsx)(`span`,{className:`mono`,children:t.ID})]}),(0,W.jsx)(`span`,{children:H(t.Username)||`-`})]}):null,(0,W.jsxs)(`div`,{className:`picker-search`,children:[(0,W.jsx)(Ze,{size:15}),(0,W.jsx)(`input`,{value:r,onChange:e=>i(e.target.value),onKeyDown:e=>{e.key===`Enter`&&(e.preventDefault(),d())},placeholder:`Bot username or id`}),(0,W.jsx)(`button`,{className:`btn compact-btn`,type:`button`,onClick:d,disabled:s,children:s?(0,W.jsx)(L,{size:14,className:`spin`}):`Search`})]}),l&&(0,W.jsx)(`div`,{className:`picker-error`,children:l}),(0,W.jsxs)(`div`,{className:`picker-results`,children:[a.map(e=>(0,W.jsxs)(`button`,{className:`picker-row ${t?.ID===e.ID?`selected`:``}`,type:`button`,onClick:()=>n(e),children:[(0,W.jsx)(`span`,{className:`mono`,children:e.ID}),(0,W.jsx)(`strong`,{children:e.FirstName||`-`}),(0,W.jsx)(`span`,{children:H(e.Username)||`-`}),e.System?(0,W.jsx)(q,{tone:`warn`,children:`System`}):(0,W.jsx)(q,{children:`Regular`})]},e.ID)),a.length===0&&!s?(0,W.jsx)(`div`,{className:`picker-empty`,children:`No results`}):null]})]})}function Vn({label:e,value:t,onChange:n}){let[r,i]=(0,g.useState)(``),[a,o]=(0,g.useState)([]),[s,c]=(0,g.useState)(!1),[l,u]=(0,g.useState)(``);async function d(){c(!0),u(``);let e=new URLSearchParams({limit:`20`});r.trim()&&e.set(`q`,r.trim());try{o((await k.channels(e)).rows)}catch(e){u(O(e))}finally{c(!1)}}return(0,g.useEffect)(()=>{d()},[]),(0,W.jsxs)(`div`,{className:`entity-picker`,children:[(0,W.jsxs)(`div`,{className:`picker-head`,children:[(0,W.jsx)(`span`,{children:e}),t?(0,W.jsxs)(`button`,{className:`link-button`,type:`button`,onClick:()=>n(null),children:[(0,W.jsx)(ht,{size:13}),` `,`Clear`]}):null]}),t?(0,W.jsxs)(`div`,{className:`selected-entity`,children:[(0,W.jsx)(he,{size:15}),(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`strong`,{children:t.Title||`-`}),(0,W.jsx)(`span`,{className:`mono`,children:t.ID})]}),(0,W.jsx)(`span`,{children:H(t.Username)||vt(t)})]}):null,(0,W.jsxs)(`div`,{className:`picker-search`,children:[(0,W.jsx)(Ze,{size:15}),(0,W.jsx)(`input`,{value:r,onChange:e=>i(e.target.value),onKeyDown:e=>{e.key===`Enter`&&(e.preventDefault(),d())},placeholder:`Search channel_id / username / title`}),(0,W.jsx)(`button`,{className:`btn compact-btn`,type:`button`,onClick:d,disabled:s,children:s?(0,W.jsx)(L,{size:14,className:`spin`}):`Search`})]}),l&&(0,W.jsx)(`div`,{className:`picker-error`,children:l}),(0,W.jsxs)(`div`,{className:`picker-results`,children:[a.map(e=>(0,W.jsxs)(`button`,{className:`picker-row ${t?.ID===e.ID?`selected`:``}`,type:`button`,onClick:()=>n(e),children:[(0,W.jsx)(`span`,{className:`mono`,children:e.ID}),(0,W.jsx)(`strong`,{children:e.Title||`-`}),(0,W.jsx)(`span`,{children:H(e.Username)||vt(e)}),e.Verified?(0,W.jsx)(q,{tone:`good`,children:`Verified`}):(0,W.jsx)(q,{children:vt(e)})]},e.ID)),a.length===0&&!s?(0,W.jsx)(`div`,{className:`picker-empty`,children:`No results`}):null]})]})}function Hn({onClose:e,onMinted:t}){let[n,r]=(0,g.useState)(`vault`),[i,a]=(0,g.useState)(null),[o,s]=(0,g.useState)(null),[c,l]=(0,g.useState)(``),[u,d]=(0,g.useState)(`XTR`),[f,p]=(0,g.useState)(``),[m,h]=(0,g.useState)(!1),[_,v]=(0,g.useState)(`TON`),[y,b]=(0,g.useState)(``),[x,S]=(0,g.useState)(!1),[C,w]=(0,g.useState)(``),[T,E]=(0,g.useState)(``),[D,O]=(0,g.useState)(``),k=Ot(f,u),A=m?Ot(y,_):`0`,j=k===null,M=m&&A===null,N=c.trim()!==``&&f.trim()!==``&&!j&&!M&&(n===`vault`||(n===`user`?i!==null:o!==null));function P(){let e={username:c.trim().replace(/^@/,``),currency:u,amount:k??`0`};if(n===`user`&&i&&(e.owner_user_id=String(i.ID)),n===`channel`&&o&&(e.owner_channel_id=String(o.ID)),m&&(e.crypto_currency=_,e.crypto_amount=A??`0`),C.trim()&&(e.url=C.trim()),T){let t=Date.parse(`${T}T${D||`00:00`}:00Z`);Number.isFinite(t)&&(e.purchase_date=Math.floor(t/1e3))}return e}return(0,pn.createPortal)((0,W.jsx)(`div`,{className:`modal-backdrop`,role:`presentation`,children:(0,W.jsxs)(`section`,{className:`modal command-modal`,role:`dialog`,"aria-modal":`true`,"aria-label":`Mint a collectible username`,children:[(0,W.jsxs)(`div`,{className:`modal-head`,children:[(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`div`,{className:`eyebrow`,children:`NFT usernames`}),(0,W.jsx)(`h2`,{children:`Mint a collectible username`})]}),(0,W.jsx)(`button`,{className:`icon-btn`,type:`button`,onClick:e,"aria-label":`Close`,children:(0,W.jsx)(ht,{size:15})})]}),(0,W.jsxs)(`div`,{className:`command-body`,children:[(0,W.jsxs)(`div`,{className:`mint-field-group`,children:[(0,W.jsx)(`div`,{className:`mint-field-group-label`,children:`1. Username`}),(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Username`}),(0,W.jsx)(`input`,{value:c,onChange:e=>l(e.target.value),placeholder:`durov`})]})]}),(0,W.jsxs)(`div`,{className:`mint-field-group`,children:[(0,W.jsx)(`div`,{className:`mint-field-group-label`,children:`2. Owner`}),(0,W.jsxs)(`div`,{className:`toolbar`,role:`group`,"aria-label":`Owner type`,children:[(0,W.jsxs)(`button`,{type:`button`,className:`btn ${n===`vault`?`primary`:``}`,onClick:()=>r(`vault`),children:[(0,W.jsx)(mt,{size:15}),` `,`Vault (no owner)`]}),(0,W.jsx)(`button`,{type:`button`,className:`btn ${n===`user`?`primary`:``}`,onClick:()=>r(`user`),children:`User owner`}),(0,W.jsx)(`button`,{type:`button`,className:`btn ${n===`channel`?`primary`:``}`,onClick:()=>r(`channel`),children:`Channel owner`})]}),n===`user`&&(0,W.jsx)(Rn,{label:`User owner`,value:i,onChange:a}),n===`channel`&&(0,W.jsx)(Vn,{label:`Channel owner`,value:o,onChange:s}),n===`vault`&&(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Mints the asset unassigned; issue it to someone later from the asset page.`})]}),(0,W.jsxs)(`div`,{className:`mint-field-group`,children:[(0,W.jsx)(`div`,{className:`mint-field-group-label`,children:`3. Price`}),(0,W.jsx)(`p`,{className:`bot-create-note`,children:`A record of what it was sold for -- minting doesn't charge anyone.`}),(0,W.jsxs)(`div`,{className:`bot-create-fields`,children:[(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Currency`}),(0,W.jsxs)(`select`,{value:u,onChange:e=>d(e.target.value),children:[(0,W.jsx)(`option`,{value:`XTR`,children:`XTR`}),(0,W.jsx)(`option`,{value:`TON`,children:`TON`}),(0,W.jsx)(`option`,{value:`USD`,children:`USD`})]})]}),(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Amount (${u})`}),(0,W.jsx)(`input`,{value:f,onChange:e=>p(e.target.value),inputMode:`decimal`,placeholder:`1000`})]})]}),f.trim()!==``&&!j&&(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Clients will show: ${Dt(k??`0`,u)}.`}),j&&(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Not a valid ${u} amount: digits only, at most ${String(wt(u))} decimal places.`}),(0,W.jsxs)(`label`,{className:`checkline`,children:[(0,W.jsx)(`input`,{type:`checkbox`,checked:m,onChange:e=>h(e.target.checked)}),` Also record a TON price`]}),m&&(0,W.jsxs)(`div`,{className:`bot-create-fields`,children:[(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Crypto currency`}),(0,W.jsx)(`select`,{value:_,onChange:e=>v(e.target.value),children:(0,W.jsx)(`option`,{value:`TON`,children:`TON`})})]}),(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Crypto amount (${_})`}),(0,W.jsx)(`input`,{value:y,onChange:e=>b(e.target.value),inputMode:`decimal`,placeholder:`12.5`})]})]}),M&&(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Not a valid ${_} amount: digits only, at most ${String(wt(_))} decimal places.`})]}),(0,W.jsxs)(`div`,{className:`mint-field-group`,children:[(0,W.jsx)(`button`,{type:`button`,className:`link-button`,onClick:()=>S(e=>!e),children:x?`Hide marketplace record`:`+ Add marketplace record (optional)`}),x&&(0,W.jsxs)(`div`,{className:`bot-create-fields`,children:[(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Marketplace URL`}),(0,W.jsx)(`input`,{value:C,onChange:e=>w(e.target.value),placeholder:`https://fragment.com/username/durov`})]}),(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Purchase date (UTC)`}),(0,W.jsx)(`input`,{value:T,onChange:e=>E(e.target.value),type:`date`})]}),(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Purchase time (UTC)`}),(0,W.jsx)(`input`,{value:D,onChange:e=>O(e.target.value),type:`time`,step:60,disabled:!T})]})]})]})]}),(0,W.jsxs)(`div`,{className:`modal-actions`,children:[(0,W.jsx)(`button`,{className:`btn`,type:`button`,onClick:e,children:`Close`}),(0,W.jsx)(X,{disabled:!N,label:`Mint username`,icon:(0,W.jsx)(Ge,{size:15}),tone:`neutral`,path:`/api/actions/mint-collectible-username`,payload:P,onDone:t})]})]})}),document.body)}function Un({navigate:e}){let[t,n]=(0,g.useState)(`all`),[r,i]=(0,g.useState)(``),[a,o]=(0,g.useState)(`50`),[s,c]=(0,g.useState)([]),[l,u]=(0,g.useState)(!1),[d,f]=(0,g.useState)(``),[p,m]=(0,g.useState)(!1),[h,_]=(0,g.useState)(``),[v,y]=(0,g.useState)(!1);async function b(e=!1){m(!0),_(``);let n=new URLSearchParams({limit:a});t!==`all`&&n.set(`status`,t),r.trim()&&n.set(`q`,r.trim().replace(/^@/,``)),e&&d&&n.set(`before_id`,d);try{let t=await k.collectibleUsernames(n),r=t.rows??[];c(t=>e?[...t,...r]:r),f(t.next_before_id??``),u(!!t.has_more)}catch(e){_(O(e))}finally{m(!1)}}(0,g.useEffect)(()=>{b(!1)},[]);let x=s.filter(e=>e.Status===`vault`).length,S=s.filter(e=>e.Status===`owned`).length,C=s.filter(e=>e.Status===`burned`).length;return(0,W.jsxs)(Mt,{title:`Collectible usernames`,eyebrow:`NFT usernames / Registry`,actions:(0,W.jsxs)(W.Fragment,{children:[(0,W.jsxs)(`button`,{className:`btn primary icon-text`,type:`button`,onClick:()=>y(!0),children:[(0,W.jsx)(Ge,{size:15}),` `,`Mint username`]}),(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>b(!1),disabled:p,children:[(0,W.jsx)(Ye,{size:15,className:p?`spin`:``}),` `,`Refresh`]})]}),children:[h&&(0,W.jsx)(K,{children:h}),(0,W.jsxs)(`div`,{className:`metric-row`,children:[(0,W.jsx)(J,{label:`Loaded rows`,value:String(s.length)}),(0,W.jsx)(J,{label:`In vault`,value:String(x)}),(0,W.jsx)(J,{label:`Held by owners`,value:String(S),tone:`good`}),(0,W.jsx)(J,{label:`Burned`,value:String(C),tone:C?`danger`:`neutral`})]}),(0,W.jsx)(Nt,{children:(0,W.jsxs)(`form`,{className:`toolbar`,onSubmit:e=>{e.preventDefault(),b(!1)},children:[(0,W.jsxs)(`label`,{className:`searchbox`,children:[(0,W.jsx)(Ze,{size:15}),(0,W.jsx)(`input`,{value:r,onChange:e=>i(e.target.value),placeholder:`Search by username`})]}),(0,W.jsxs)(`label`,{className:`field-inline`,children:[(0,W.jsx)(`span`,{children:`Status`}),(0,W.jsxs)(`select`,{value:t,onChange:e=>n(e.target.value),children:[(0,W.jsx)(`option`,{value:`all`,children:`All statuses`}),(0,W.jsx)(`option`,{value:`vault`,children:`Vault`}),(0,W.jsx)(`option`,{value:`owned`,children:`Owned`}),(0,W.jsx)(`option`,{value:`burned`,children:`Burned`})]})]}),(0,W.jsxs)(`label`,{className:`field-inline`,children:[(0,W.jsx)(`span`,{children:`Limit`}),(0,W.jsx)(`input`,{className:`small-input`,value:a,onChange:e=>o(e.target.value),type:`number`,min:`1`,max:`200`})]}),(0,W.jsxs)(`button`,{className:`btn primary icon-text`,type:`submit`,disabled:p,children:[p?(0,W.jsx)(L,{size:15,className:`spin`}):(0,W.jsx)(Ze,{size:15}),` `,`Search`]})]})}),(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{children:`Username`}),(0,W.jsx)(`th`,{children:`Status`}),(0,W.jsx)(`th`,{children:`Owner`}),(0,W.jsx)(`th`,{children:`Price`}),(0,W.jsx)(`th`,{children:`Purchase date (UTC)`}),(0,W.jsx)(`th`,{children:`Transfers`}),(0,W.jsx)(`th`,{children:`Updated`}),(0,W.jsx)(`th`,{})]})}),(0,W.jsxs)(`tbody`,{children:[s.map(t=>(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`td`,{children:(0,W.jsx)(`strong`,{children:H(t.Username)})}),(0,W.jsx)(`td`,{children:(0,W.jsx)(Wn,{status:t.Status})}),(0,W.jsx)(`td`,{children:Gn(t,`Vault`)}),(0,W.jsx)(`td`,{className:`mono`,children:Kn(t)}),(0,W.jsx)(`td`,{children:U(t.PurchaseDate)||`-`}),(0,W.jsx)(`td`,{className:`mono`,children:t.TransferCount}),(0,W.jsx)(`td`,{children:U(t.UpdatedAt)||`-`}),(0,W.jsx)(`td`,{children:(0,W.jsxs)(`button`,{className:`row-link`,type:`button`,onClick:()=>e(`/collectible-usernames/${t.ID}`),children:[(0,W.jsx)(de,{size:14}),` `,`Details`,` `,(0,W.jsx)(ve,{size:14})]})})]},t.ID)),s.length===0&&(0,W.jsx)(It,{colSpan:8})]})]})}),l&&(0,W.jsx)(`div`,{className:`toolbar`,children:(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>b(!0),disabled:p,children:[p?(0,W.jsx)(L,{size:15,className:`spin`}):(0,W.jsx)(ge,{size:15}),` `,`Load more`]})}),v&&(0,W.jsx)(Hn,{onClose:()=>y(!1),onMinted:()=>void b(!1)})]})}function Wn({status:e}){return e===`owned`?(0,W.jsx)(q,{tone:`good`,children:`Owned`}):e===`burned`?(0,W.jsxs)(q,{tone:`danger`,children:[(0,W.jsx)(Oe,{size:12}),` `,`Burned`]}):(0,W.jsxs)(q,{children:[(0,W.jsx)(mt,{size:12}),` `,`Vault`]})}function Gn(e,t){return!e.OwnerPeerType||e.OwnerPeerID===``||e.OwnerPeerID===`0`?t:`${H(e.OwnerUsername)||e.OwnerName||e.OwnerPeerID} · ${e.OwnerPeerType}:${e.OwnerPeerID}`}function Kn(e){let t=Dt(e.Amount,e.Currency);return e.CryptoCurrency&&e.CryptoAmount&&e.CryptoAmount!==`0`?`${t} (${Dt(e.CryptoAmount,e.CryptoCurrency)})`:t}function qn({id:e,navigate:t}){let[n,r]=(0,g.useState)(null),[i,a]=(0,g.useState)(``),[o,s]=(0,g.useState)(!1),[c,l]=(0,g.useState)(`profile`),[u,d]=(0,g.useState)(`user`),[f,p]=(0,g.useState)(null),[m,h]=(0,g.useState)(null);async function _(){s(!0),a(``);try{r(await k.collectibleUsername(e))}catch(e){a(O(e))}finally{s(!1)}}if((0,g.useEffect)(()=>{_(),l(`profile`)},[e]),i&&!n)return(0,W.jsx)(K,{children:i});if(!n)return(0,W.jsx)(Lt,{label:o?`Loading collectible username…`:`Waiting for data`});let v=n.asset,y=n.transfers??[],b=`Vault`,x=!!v.OwnerPeerType&&v.OwnerPeerID!==``&&v.OwnerPeerID!==`0`,S=v.Status===`burned`;function C(){x&&t(v.OwnerPeerType===`channel`?`/channels/${v.OwnerPeerID}`:`/accounts/${v.OwnerPeerID}`)}function w(){let e={username:v.Username};return u===`user`&&f&&(e.to_user_id=String(f.ID)),u===`channel`&&m&&(e.to_channel_id=String(m.ID)),e}let T=[{key:`profile`,label:`Profile & Status`,icon:(0,W.jsx)(oe,{size:15})},{key:`actions`,label:`Actions & Management`,icon:(0,W.jsx)(V,{size:15})}];return(0,W.jsxs)(Mt,{title:`Collectible ${H(v.Username)}`,eyebrow:`NFT usernames / Asset`,actions:(0,W.jsxs)(W.Fragment,{children:[(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>t(`/collectible-usernames`),children:[(0,W.jsx)(ue,{size:15}),` `,`Back to list`]}),(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:_,disabled:o,children:[(0,W.jsx)(Ye,{size:15,className:o?`spin`:``}),` `,`Refresh`]})]}),children:[i&&(0,W.jsx)(K,{children:i}),(0,W.jsxs)(`section`,{className:`entity-head`,children:[(0,W.jsx)(`div`,{className:`entity-head-main`,children:(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`div`,{className:`entity-title`,children:H(v.Username)}),(0,W.jsx)(`div`,{className:`entity-subtitle`,children:`Asset #${v.ID}`})]})}),(0,W.jsxs)(`div`,{className:`entity-badges`,children:[(0,W.jsx)(Wn,{status:v.Status}),(0,W.jsx)(q,{tone:v.TransferCount>0?`warn`:`neutral`,children:`${v.TransferCount} transfers`}),v.Status===`owned`&&(0,W.jsx)(q,{tone:v.RegistryActive?`good`:`warn`,children:v.RegistryActive?`Active in profile`:`Hidden in profile`})]})]}),(0,W.jsx)(`div`,{className:`toolbar`,role:`group`,"aria-label":`Asset sections`,children:T.map(e=>(0,W.jsxs)(`button`,{className:`btn icon-text ${c===e.key?`primary`:``}`,type:`button`,"aria-pressed":c===e.key,onClick:()=>l(e.key),children:[e.icon,` `,e.label]},e.key))}),c===`profile`&&(0,W.jsxs)(`div`,{className:`stacked-sections`,children:[(0,W.jsxs)(`div`,{className:`summary-grid`,children:[(0,W.jsx)(Y,{label:`Owner`,value:Gn(v,b)}),(0,W.jsx)(Y,{label:`Price`,value:Kn(v),mono:!0}),(0,W.jsx)(Y,{label:`Purchase date (UTC)`,value:U(v.PurchaseDate)||`-`}),(0,W.jsx)(Y,{label:`Original owner`,value:Xn(v.OriginalOwnerPeerType,v.OriginalOwnerPeerID,b,v.OriginalOwnerUsername)}),(0,W.jsx)(Y,{label:`Transfers`,value:String(v.TransferCount),mono:!0}),(0,W.jsx)(Y,{label:`Created`,value:U(v.CreatedAt)||`-`}),(0,W.jsx)(Y,{label:`Updated`,value:U(v.UpdatedAt)||`-`})]}),(0,W.jsxs)(`div`,{className:`toolbar`,children:[x&&(0,W.jsx)(`button`,{className:`row-link`,type:`button`,onClick:C,children:v.OwnerPeerType===`channel`?`Open owner channel`:`Open owner account`}),v.URL&&(0,W.jsxs)(`a`,{className:`row-link`,href:v.URL,target:`_blank`,rel:`noreferrer noopener`,children:[(0,W.jsx)(Ce,{size:14}),` `,`Open marketplace page`]})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Provenance history`,text:`Mint, transfer, revoke and burn events in chronological order.`,action:(0,W.jsx)(Xe,{size:16})}),(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{children:`ID`}),(0,W.jsx)(`th`,{children:`Event`}),(0,W.jsx)(`th`,{children:`From`}),(0,W.jsx)(`th`,{children:`To`}),(0,W.jsx)(`th`,{children:`Price`}),(0,W.jsx)(`th`,{children:`Actor`}),(0,W.jsx)(`th`,{children:`Reason`}),(0,W.jsx)(`th`,{children:`Time`})]})}),(0,W.jsxs)(`tbody`,{children:[y.map(e=>(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`td`,{className:`mono`,children:e.ID}),(0,W.jsx)(`td`,{children:(0,W.jsx)(Yn,{kind:e.Kind})}),(0,W.jsx)(`td`,{className:`mono`,children:Xn(e.FromPeerType,e.FromPeerID,b,e.FromUsername)}),(0,W.jsx)(`td`,{className:`mono`,children:Xn(e.ToPeerType,e.ToPeerID,b,e.ToUsername)}),(0,W.jsx)(`td`,{className:`mono`,children:e.Amount&&e.Amount!==`0`?Dt(e.Amount,e.Currency):`-`}),(0,W.jsx)(`td`,{children:e.Actor||`-`}),(0,W.jsx)(`td`,{className:`truncate`,children:e.Reason||`-`}),(0,W.jsx)(`td`,{children:U(e.CreatedAt)||`-`})]},e.ID)),y.length===0&&(0,W.jsx)(It,{colSpan:8})]})]})})]})]}),c===`actions`&&(0,W.jsx)(`div`,{className:`stacked-sections`,children:S?(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Asset Operations`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsx)(`p`,{className:`bot-create-note`,children:`This username is burned — no further operations are possible.`})})]}):(0,W.jsxs)(`div`,{className:`action-groups`,children:[(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Transfer Ownership`,text:`Sent immediately; appended to the provenance history.`}),(0,W.jsxs)(`div`,{className:`card-body`,children:[(0,W.jsxs)(`div`,{className:`toolbar`,role:`group`,"aria-label":`Recipient type`,children:[(0,W.jsx)(`button`,{type:`button`,className:`btn ${u===`user`?`primary`:``}`,onClick:()=>d(`user`),children:`To user`}),(0,W.jsx)(`button`,{type:`button`,className:`btn ${u===`channel`?`primary`:``}`,onClick:()=>d(`channel`),children:`To channel`})]}),u===`user`?(0,W.jsx)(Rn,{label:`To user`,value:f,onChange:p}):(0,W.jsx)(Vn,{label:`To channel`,value:m,onChange:h}),(0,W.jsx)(X,{label:`Transfer`,icon:(0,W.jsx)(le,{size:15}),tone:`warn`,path:`/api/actions/transfer-collectible-username`,payload:w,onDone:_})]})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Revoke To Vault`,text:`Returns the username to the vault; it can be issued again later.`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsx)(`div`,{className:`action-stack`,children:(0,W.jsx)(X,{label:`Revoke to vault`,icon:(0,W.jsx)(ut,{size:15}),tone:`warn`,path:`/api/actions/revoke-collectible-username`,payload:()=>({username:v.Username,burn:!1}),onDone:_})})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Danger Zone`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsxs)(`div`,{className:`danger-zone`,children:[(0,W.jsx)(X,{label:`Burn permanently`,icon:(0,W.jsx)(Oe,{size:15}),tone:`danger`,path:`/api/actions/revoke-collectible-username`,payload:()=>({username:v.Username,burn:!0}),onDone:_}),(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Irreversible: the username is destroyed and can never be issued again.`}),(0,W.jsx)(X,{label:`Delete record`,icon:(0,W.jsx)(lt,{size:15}),tone:`danger`,path:`/api/actions/delete-collectible-username`,payload:()=>({username:v.Username}),onDone:()=>t(`/collectible-usernames`)}),(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Erases the asset and its ownership history, and frees the username for a fresh issue. Use this for a username issued by mistake; a burn keeps the history instead.`})]})})]})]})})]})}var Jn={mint:`Mint`,transfer:`Transfer`,burn:`Burn`,revoke:`Revoke`};function Yn({kind:e}){return(0,W.jsx)(q,{tone:e===`burn`?`danger`:e===`revoke`?`warn`:e===`mint`?`good`:`neutral`,children:Jn[e]})}function Xn(e,t,n,r=``){if(!e||t===``||t===`0`)return n;let i=H(r);return i?`${i} · ${e}:${t}`:`${e}:${t}`}function Zn({id:e,navigate:t}){let[n,r]=(0,g.useState)(null),[i,a]=(0,g.useState)(``),[o,s]=(0,g.useState)(!1),[c,l]=(0,g.useState)(`profile`),[u,d]=(0,g.useState)(!1),[f,p]=(0,g.useState)(0);async function m(){s(!0),a(``);try{r(await k.channel(e))}catch(e){a(O(e))}finally{s(!1)}}if((0,g.useEffect)(()=>{m(),l(`profile`)},[e]),i)return(0,W.jsx)(K,{children:i});if(!n)return(0,W.jsx)(Lt,{label:o?`Loading channel detail`:`Waiting for data`});let h=n.Channel,_=[{key:`profile`,label:`Profile & Status`,icon:(0,W.jsx)(oe,{size:15})},{key:`actions`,label:`Actions & Management`,icon:(0,W.jsx)(V,{size:15})}];return(0,W.jsxs)(Mt,{title:`${vt(h)} #${h.ID}`,eyebrow:`Channel Profile`,actions:(0,W.jsxs)(`button`,{className:`btn icon-text`,onClick:()=>t(`/channels`),children:[(0,W.jsx)(ue,{size:15}),` `,`Back to list`]}),children:[(0,W.jsxs)(`section`,{className:`entity-head`,children:[(0,W.jsxs)(`div`,{className:`entity-head-main`,children:[(0,W.jsxs)(`div`,{className:`avatar-edit-slot`,children:[(0,W.jsx)(yn,{id:h.ID,kind:`channel`,title:h.Title,size:64,refreshKey:f||void 0}),(0,W.jsx)(`button`,{className:`icon-btn avatar-edit-btn`,type:`button`,"aria-label":`Change avatar`,title:`Change avatar`,onClick:()=>d(!0),children:(0,W.jsx)(Ne,{size:13})})]}),(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`div`,{className:`entity-title`,children:h.Title||`-`}),(0,W.jsxs)(`div`,{className:`entity-subtitle`,children:[H(h.Username)||`No username`,` · `,`Creator ${h.CreatorUserID}`]})]})]}),(0,W.jsxs)(`div`,{className:`entity-badges`,children:[(0,W.jsx)(q,{children:vt(h)}),h.Verified?(0,W.jsx)(q,{tone:`good`,children:`Verified`}):(0,W.jsx)(q,{children:`Not verified`}),(0,W.jsx)(xn,{scam:h.Scam,fake:h.Fake}),h.Deleted?(0,W.jsx)(q,{tone:`danger`,children:`Deleted`}):(0,W.jsx)(q,{children:`Valid`})]})]}),(0,W.jsx)(`div`,{className:`toolbar`,role:`group`,"aria-label":`Channel sections`,children:_.map(e=>(0,W.jsxs)(`button`,{className:`btn icon-text ${c===e.key?`primary`:``}`,type:`button`,"aria-pressed":c===e.key,onClick:()=>l(e.key),children:[e.icon,` `,e.label]},e.key))}),c===`profile`&&(0,W.jsxs)(`div`,{className:`stacked-sections`,children:[(0,W.jsxs)(`div`,{className:`summary-grid`,children:[(0,W.jsx)(Y,{label:`Channel ID`,value:String(h.ID),mono:!0}),(0,W.jsx)(Y,{label:`access_hash`,value:String(h.AccessHash),mono:!0}),(0,W.jsx)(Y,{label:`Members`,value:`${h.ParticipantsCount} / Admins ${h.AdminsCount}`}),(0,W.jsx)(Y,{label:`Moderation`,value:`Banned ${h.BannedCount} / Kicked ${h.KickedCount}`}),(0,W.jsx)(Y,{label:`Channel flags`,value:`broadcast=${h.Broadcast} megagroup=${h.Megagroup} forum=${h.Forum}`}),(0,W.jsx)(Y,{label:`top / pinned / PTS`,value:`${h.TopMessageID} / ${h.PinnedMessageID} / ${h.PTS}`}),(0,W.jsx)(Y,{label:`Created`,value:yt(h.Date)||`-`}),(0,W.jsx)(Y,{label:`Updated`,value:U(h.UpdatedAt)||`-`})]}),h.About&&(0,W.jsx)(`p`,{className:`about-text`,children:h.About}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Channel Raw Row`,text:`Database read-only snapshot`}),(0,W.jsx)(Rt,{value:n.ChannelJSON})]})]}),c===`actions`&&(0,W.jsxs)(`div`,{className:`stacked-sections`,children:[(0,W.jsxs)(`div`,{className:`action-groups`,children:[(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Verification & Moderation Flags`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsxs)(`div`,{className:`action-stack`,children:[(0,W.jsx)(X,{label:h.Verified?`Clear verified`:`Set verified`,icon:(0,W.jsx)(F,{size:15}),tone:`warn`,path:`/api/actions/set-channel-verified`,payload:()=>({channel_id:h.ID,verified:!h.Verified}),onDone:m}),(0,W.jsx)(Sn,{idKey:`channel_id`,id:h.ID,path:`/api/actions/set-channel-flags`,scam:h.Scam,fake:h.Fake,onDone:m})]})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Settings`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsx)(An,{channel:h,onDone:m})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Username`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsx)(wn,{idKey:`channel_id`,id:h.ID,path:`/api/actions/set-channel-username`,current:h.Username,onDone:m})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Profile Color`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsx)(On,{idKey:`channel_id`,id:h.ID,path:`/api/actions/set-channel-color`,onDone:m})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Emoji Status`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsx)(kn,{idKey:`channel_id`,id:h.ID,path:`/api/actions/set-channel-emoji-status`,onDone:m})})]})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Recent Admin Actions`,text:`Last 30 audit rows`,action:(0,W.jsx)(Xe,{size:16})}),(0,W.jsx)(Ft,{rows:n.AuditLogs})]})]}),u&&(0,W.jsx)(mn,{kind:`channel`,id:h.ID,onClose:()=>d(!1),onDone:()=>{p(e=>e+1),m()}})]})}var Qn={beforeID:0,beforeUpdatedUS:0};function $n({navigate:e}){let[t,n]=(0,g.useState)(``),[r,i]=(0,g.useState)(50),[a,o]=(0,g.useState)(null),[s,c]=(0,g.useState)([]),[l,u]=(0,g.useState)(Qn),[d,f]=(0,g.useState)(!1),[p,m]=(0,g.useState)(``);async function h(e,t){f(!0),m(``);let n=new URLSearchParams({limit:String(r)});e.trim()&&n.set(`q`,e.trim()),(t.beforeID||t.beforeUpdatedUS)&&(n.set(`before_id`,String(t.beforeID)),n.set(`before_updated_us`,String(t.beforeUpdatedUS)));try{let e=await k.channels(n);return o(e),e}catch(e){return m(O(e)),null}finally{f(!1)}}async function _(){c([]),u(Qn),await h(t,Qn)}async function v(){if(!a?.has_more)return;let e={beforeID:a.next_before_id,beforeUpdatedUS:a.next_before_updated_us};await h(t,e)&&(c(e=>[...e,l]),u(e))}async function y(){if(s.length===0)return;let e=s[s.length-1];await h(t,e)&&(c(e=>e.slice(0,-1)),u(e))}(0,g.useEffect)(()=>{_()},[]);let b=Pn(a?.rows??[]),x=s.length>0&&!d,S=!!a?.has_more&&!d;return(0,W.jsxs)(Mt,{title:`Supergroups and Channels`,eyebrow:a?.listing===!1?`Search results`:`Recently updated`,actions:(0,W.jsxs)(`button`,{className:`btn`,type:`button`,onClick:()=>void _(),disabled:d,children:[(0,W.jsx)(Ye,{size:15}),` `,`Refresh`]}),children:[p&&(0,W.jsx)(K,{children:p}),(0,W.jsxs)(`div`,{className:`metric-row`,children:[(0,W.jsx)(J,{label:`Entities on page`,value:String(a?.rows.length??0)}),(0,W.jsx)(J,{label:`Supergroups`,value:String(b.megagroups)}),(0,W.jsx)(J,{label:`Channels`,value:String(b.broadcasts)}),(0,W.jsx)(J,{label:`Verified`,value:String(b.verified),tone:`good`})]}),(0,W.jsx)(Nt,{children:(0,W.jsxs)(`form`,{className:`toolbar`,onSubmit:e=>{e.preventDefault(),_()},children:[(0,W.jsxs)(`label`,{className:`searchbox`,children:[(0,W.jsx)(Ze,{size:15}),(0,W.jsx)(`input`,{value:t,onChange:e=>n(e.target.value),placeholder:`Channel ID / username / title`})]}),(0,W.jsxs)(`label`,{className:`gift-page-size`,children:[(0,W.jsx)(`span`,{children:`Limit`}),(0,W.jsxs)(`select`,{value:String(r),onChange:e=>i(Number(e.target.value)),children:[(0,W.jsx)(`option`,{value:`10`,children:`10`}),(0,W.jsx)(`option`,{value:`20`,children:`20`}),(0,W.jsx)(`option`,{value:`50`,children:`50`}),(0,W.jsx)(`option`,{value:`100`,children:`100`})]})]}),(0,W.jsxs)(`button`,{className:`btn primary icon-text`,type:`submit`,disabled:d,children:[d?(0,W.jsx)(L,{size:15,className:`spin`}):(0,W.jsx)(Ze,{size:15}),` `,`Search`]}),(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>void y(),disabled:!x,children:[(0,W.jsx)(_e,{size:15}),` `,`Previous page`]}),(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>void v(),disabled:!S,children:[(0,W.jsx)(ve,{size:15}),` `,`Next page`]})]})}),(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{className:`avatar-col`}),(0,W.jsx)(`th`,{children:`Channel ID`}),(0,W.jsx)(`th`,{children:`Kind`}),(0,W.jsx)(`th`,{children:`Username`}),(0,W.jsx)(`th`,{children:`Title`}),(0,W.jsx)(`th`,{children:`Members`}),(0,W.jsx)(`th`,{children:`Admins`}),(0,W.jsx)(`th`,{children:`PTS`}),(0,W.jsx)(`th`,{children:`Verified`}),(0,W.jsx)(`th`,{children:`Updated`}),(0,W.jsx)(`th`,{})]})}),(0,W.jsxs)(`tbody`,{children:[a?.rows.map(t=>(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`td`,{className:`avatar-col`,children:(0,W.jsx)(`button`,{className:`avatar-link`,type:`button`,onClick:()=>e(`/channels/${t.ID}`),"aria-label":`Open channel ${t.ID}`,children:(0,W.jsx)(yn,{id:t.ID,kind:`channel`,title:t.Title})})}),(0,W.jsx)(`td`,{className:`mono`,children:t.ID}),(0,W.jsx)(`td`,{children:vt(t)}),(0,W.jsx)(`td`,{children:H(t.Username)}),(0,W.jsx)(`td`,{children:t.Title}),(0,W.jsx)(`td`,{children:t.ParticipantsCount}),(0,W.jsx)(`td`,{children:t.AdminsCount}),(0,W.jsx)(`td`,{children:t.PTS}),(0,W.jsxs)(`td`,{children:[t.Verified?(0,W.jsx)(q,{tone:`good`,children:`Verified`}):(0,W.jsx)(q,{children:`Not verified`}),` `,(0,W.jsx)(xn,{scam:t.Scam,fake:t.Fake})]}),(0,W.jsx)(`td`,{children:U(t.UpdatedAt)}),(0,W.jsx)(`td`,{children:(0,W.jsxs)(`button`,{className:`row-link`,onClick:()=>e(`/channels/${t.ID}`),children:[`Details`,` `,(0,W.jsx)(ve,{size:14})]})})]},t.ID)),(!a||a.rows.length===0)&&(0,W.jsx)(It,{colSpan:11})]})]})})]})}function er({botID:e,onClose:t}){let[n,r]=(0,g.useState)(``),[i,a]=(0,g.useState)(!1),[o,s]=(0,g.useState)(``),[c,l]=(0,g.useState)(!1);async function u(){if(!n.trim()){s(`Please enter an operation reason`);return}a(!0),s(``),l(!1);try{let t=await k.action(`/api/actions/export-bot-token`,{command_id:``,reason:n.trim(),confirm:!0,bot_user_id:e}),r=t.details?.token;if(t.error||typeof r!=`string`||!r){s(t.error||`No token returned.`);return}await navigator.clipboard.writeText(r),l(!0)}catch(e){s(O(e))}finally{a(!1)}}return(0,pn.createPortal)((0,W.jsx)(`div`,{className:`modal-backdrop`,role:`presentation`,children:(0,W.jsxs)(`section`,{className:`modal command-modal`,role:`dialog`,"aria-modal":`true`,"aria-label":`Copy bot token`,children:[(0,W.jsxs)(`div`,{className:`modal-head`,children:[(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`div`,{className:`eyebrow`,children:`Bot`}),(0,W.jsx)(`h2`,{children:`Copy bot token`})]}),(0,W.jsx)(`button`,{className:`icon-btn`,type:`button`,onClick:t,disabled:i,"aria-label":`Close`,children:(0,W.jsx)(ht,{size:15})})]}),(0,W.jsxs)(`div`,{className:`command-body`,children:[(0,W.jsx)(`p`,{children:`The token is written straight to your clipboard and is never shown on screen. Paste it wherever it's needed right after copying.`}),(0,W.jsxs)(`label`,{className:`form-field`,children:[(0,W.jsx)(`span`,{children:`Operation reason`}),(0,W.jsx)(`textarea`,{value:n,onChange:e=>r(e.target.value),rows:3,placeholder:`Describe why this token is being retrieved`})]}),o&&(0,W.jsx)(K,{children:o}),c&&(0,W.jsx)(`div`,{className:`secret-reveal`,children:(0,W.jsxs)(`div`,{className:`secret-reveal-label`,children:[(0,W.jsx)(he,{size:14}),` `,`Token copied to clipboard.`]})})]}),(0,W.jsxs)(`div`,{className:`modal-actions`,children:[(0,W.jsx)(`button`,{className:`btn`,type:`button`,onClick:t,disabled:i,children:`Close`}),(0,W.jsxs)(`button`,{className:`btn primary icon-text`,type:`button`,onClick:()=>void u(),disabled:i,children:[(0,W.jsx)(be,{size:15}),` `,c?`Copy again`:`Copy token`]})]})]})}),document.body)}function tr({id:e,navigate:t}){let[n,r]=(0,g.useState)(null),[i,a]=(0,g.useState)(``),[o,s]=(0,g.useState)(!1),[c,l]=(0,g.useState)(`profile`),[u,d]=(0,g.useState)(!1),[f,p]=(0,g.useState)(0),[m,h]=(0,g.useState)(!1);async function _(){s(!0),a(``);try{r(await k.bot(e))}catch(e){a(O(e))}finally{s(!1)}}if((0,g.useEffect)(()=>{_(),l(`profile`)},[e]),i)return(0,W.jsx)(K,{children:i});if(!n)return(0,W.jsx)(Lt,{label:o?`Loading bot detail`:`Waiting for data`});let v=n.Bot,y=[{key:`profile`,label:`Profile & Status`,icon:(0,W.jsx)(oe,{size:15})},{key:`actions`,label:`Actions & Management`,icon:(0,W.jsx)(V,{size:15})}];return(0,W.jsxs)(Mt,{title:`Bot #${v.ID}`,eyebrow:`Bot Profile`,actions:(0,W.jsxs)(`button`,{className:`btn icon-text`,onClick:()=>t(`/bots`),children:[(0,W.jsx)(ue,{size:15}),` `,`Back to list`]}),children:[(0,W.jsxs)(`section`,{className:`entity-head`,children:[(0,W.jsxs)(`div`,{className:`entity-head-main`,children:[(0,W.jsxs)(`div`,{className:`avatar-edit-slot`,children:[(0,W.jsx)(yn,{id:v.ID,firstName:v.FirstName,username:v.Username,size:64,refreshKey:f||void 0}),(0,W.jsx)(`button`,{className:`icon-btn avatar-edit-btn`,type:`button`,"aria-label":`Change avatar`,title:`Change avatar`,onClick:()=>d(!0),children:(0,W.jsx)(Ne,{size:13})})]}),(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`div`,{className:`entity-title`,children:v.FirstName||`Unnamed bot`}),(0,W.jsx)(`div`,{className:`entity-subtitle`,children:H(v.Username)||`No username`})]})]}),(0,W.jsxs)(`div`,{className:`entity-badges`,children:[(0,W.jsx)(q,{tone:v.System?`warn`:`neutral`,children:v.System?`System`:`User`}),v.Verified?(0,W.jsx)(q,{tone:`good`,children:`Verified`}):(0,W.jsx)(q,{children:`Not verified`}),(0,W.jsx)(xn,{scam:v.Scam,fake:v.Fake})]})]}),(0,W.jsx)(`div`,{className:`toolbar`,role:`group`,"aria-label":`Bot sections`,children:y.map(e=>(0,W.jsxs)(`button`,{className:`btn icon-text ${c===e.key?`primary`:``}`,type:`button`,"aria-pressed":c===e.key,onClick:()=>l(e.key),children:[e.icon,` `,e.label]},e.key))}),c===`profile`&&(0,W.jsxs)(`div`,{className:`stacked-sections`,children:[(0,W.jsxs)(`div`,{className:`summary-grid`,children:[(0,W.jsx)(Y,{label:`Bot ID`,value:String(v.ID),mono:!0}),(0,W.jsx)(Y,{label:`Owner`,value:v.OwnerUserID>0?`${v.OwnerUserID} ${H(n.OwnerUsername)}`.trim():`None`}),(0,W.jsx)(Y,{label:`Type`,value:v.System?`System`:`User`}),(0,W.jsx)(Y,{label:`Updated`,value:U(v.UpdatedAt)||`-`}),(0,W.jsx)(Y,{label:`Created`,value:U(v.CreatedAt)||`-`})]}),n.About&&(0,W.jsx)(`p`,{className:`about-text`,children:n.About}),n.Description&&n.Description.trim()!==n.About.trim()&&(0,W.jsx)(`p`,{className:`about-text`,children:n.Description})]}),c===`actions`&&(0,W.jsxs)(`div`,{className:`stacked-sections`,children:[(0,W.jsxs)(`div`,{className:`action-groups`,children:[(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Verification & Moderation Flags`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsxs)(`div`,{className:`action-stack`,children:[(0,W.jsx)(X,{label:v.Verified?`Clear verified`:`Set verified`,icon:(0,W.jsx)(F,{size:15}),tone:`neutral`,path:`/api/actions/set-verified`,payload:()=>({user_id:v.ID,verified:!v.Verified}),onDone:_}),(0,W.jsx)(Sn,{idKey:`user_id`,id:v.ID,path:`/api/actions/set-account-flags`,scam:v.Scam,fake:v.Fake,onDone:_})]})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Username`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsx)(wn,{idKey:`user_id`,id:v.ID,path:`/api/actions/set-account-username`,current:v.Username,onDone:_})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Profile Color`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsx)(On,{idKey:`user_id`,id:v.ID,path:`/api/actions/set-account-color`,onDone:_})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Emoji Status`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsx)(kn,{idKey:`user_id`,id:v.ID,path:`/api/actions/set-account-emoji-status`,onDone:_})})]}),!v.System&&(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Credentials`}),(0,W.jsxs)(`div`,{className:`card-body`,children:[(0,W.jsx)(`div`,{className:`action-stack`,children:(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>h(!0),children:[(0,W.jsx)(be,{size:15}),` `,`Copy token`]})}),(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Copies straight to the clipboard through a dedicated confirmation step -- the token itself is never shown on this page.`})]})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Danger Zone`}),(0,W.jsx)(`div`,{className:`card-body`,children:v.System?(0,W.jsx)(`p`,{className:`bot-create-note`,children:`System bots are built in and cannot be deleted.`}):(0,W.jsxs)(`div`,{className:`danger-zone`,children:[(0,W.jsx)(X,{label:`Delete bot`,icon:(0,W.jsx)(lt,{size:15}),tone:`danger`,path:`/api/actions/delete-bot`,payload:()=>({bot_user_id:v.ID}),onDone:()=>t(`/bots`)}),(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Permanently deletes this user-created bot and invalidates its token. This cannot be undone.`})]})})]})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Recent Admin Actions`,text:`Last 30 audit rows`,action:(0,W.jsx)(Xe,{size:16})}),(0,W.jsx)(Ft,{rows:n.AuditLogs})]})]}),u&&(0,W.jsx)(mn,{kind:`user`,id:v.ID,onClose:()=>d(!1),onDone:()=>{p(e=>e+1),_()}}),m&&(0,W.jsx)(er,{botID:v.ID,onClose:()=>h(!1)})]})}function nr({onClose:e,onCreated:t}){let[n,r]=(0,g.useState)(``),[i,a]=(0,g.useState)(``),[o,s]=(0,g.useState)(``);return(0,pn.createPortal)((0,W.jsx)(`div`,{className:`modal-backdrop`,role:`presentation`,children:(0,W.jsxs)(`section`,{className:`modal command-modal`,role:`dialog`,"aria-modal":`true`,"aria-label":`Create bot`,children:[(0,W.jsxs)(`div`,{className:`modal-head`,children:[(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`div`,{className:`eyebrow`,children:`Bots`}),(0,W.jsx)(`h2`,{children:`Create bot`})]}),(0,W.jsx)(`button`,{className:`icon-btn`,type:`button`,onClick:e,"aria-label":`Close`,children:(0,W.jsx)(ht,{size:15})})]}),(0,W.jsxs)(`div`,{className:`command-body`,children:[(0,W.jsx)(`p`,{children:`Provision a bot account owned by the given user. The token is shown once after confirmation.`}),(0,W.jsxs)(`div`,{className:`bot-create-fields`,children:[(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Owner user ID`}),(0,W.jsx)(`input`,{value:n,onChange:e=>r(e.target.value),type:`number`,min:`1`,placeholder:`123456789`})]}),(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Display name`}),(0,W.jsx)(`input`,{value:i,onChange:e=>a(e.target.value),placeholder:`e.g. Service Bot`,maxLength:64})]}),(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Username`}),(0,W.jsx)(`input`,{value:o,onChange:e=>s(e.target.value),placeholder:`my_service_bot`})]})]}),(0,W.jsx)(`span`,{className:`bot-create-note`,children:`Username must be 5-32 characters and end with 'bot'.`})]}),(0,W.jsxs)(`div`,{className:`modal-actions`,children:[(0,W.jsx)(`button`,{className:`btn`,type:`button`,onClick:e,children:`Close`}),(0,W.jsx)(X,{label:`Create bot`,icon:(0,W.jsx)(Ge,{size:15}),tone:`neutral`,path:`/api/actions/create-bot`,payload:()=>({owner_user_id:xt(n),name:i.trim(),username:o.trim().replace(/^@/,``)}),secretField:`token`,onDone:t})]})]})}),document.body)}var rr={beforeID:0};function ir({navigate:e}){let[t,n]=(0,g.useState)(``),[r,i]=(0,g.useState)(50),[a,o]=(0,g.useState)(null),[s,c]=(0,g.useState)([]),[l,u]=(0,g.useState)(rr),[d,f]=(0,g.useState)(!1),[p,m]=(0,g.useState)(``),[h,_]=(0,g.useState)(!1);async function v(e,t){f(!0),m(``);let n=new URLSearchParams({limit:String(r)});e.trim()&&n.set(`q`,e.trim()),t.beforeID&&n.set(`before_id`,String(t.beforeID));try{let e=await k.bots(n);return o(e),e}catch(e){return m(O(e)),null}finally{f(!1)}}async function y(){c([]),u(rr),await v(t,rr)}async function b(){if(!a?.has_more)return;let e={beforeID:a.next_before_id};await v(t,e)&&(c(e=>[...e,l]),u(e))}async function x(){if(s.length===0)return;let e=s[s.length-1];await v(t,e)&&(c(e=>e.slice(0,-1)),u(e))}(0,g.useEffect)(()=>{y()},[]);let S=a?.rows??[],C=S.filter(e=>e.Verified).length,w=S.filter(e=>e.System).length,T=s.length>0&&!d,E=!!a?.has_more&&!d;return(0,W.jsxs)(Mt,{title:`Bots`,eyebrow:a?.listing===!1?`Search results`:`Recently created bots`,actions:(0,W.jsxs)(W.Fragment,{children:[(0,W.jsxs)(`button`,{className:`btn primary icon-text`,type:`button`,onClick:()=>_(!0),children:[(0,W.jsx)(Ge,{size:15}),` `,`Create bot`]}),(0,W.jsxs)(`button`,{className:`btn`,type:`button`,onClick:()=>void y(),disabled:d,children:[(0,W.jsx)(Ye,{size:15}),` `,`Refresh`]})]}),children:[p&&(0,W.jsx)(K,{children:p}),(0,W.jsxs)(`div`,{className:`metric-row`,children:[(0,W.jsx)(J,{label:`Bots on page`,value:String(S.length)}),(0,W.jsx)(J,{label:`Verified`,value:String(C),tone:`good`}),(0,W.jsx)(J,{label:`System`,value:String(w)})]}),(0,W.jsx)(Nt,{children:(0,W.jsxs)(`form`,{className:`toolbar`,onSubmit:e=>{e.preventDefault(),y()},children:[(0,W.jsxs)(`label`,{className:`searchbox`,children:[(0,W.jsx)(Ze,{size:15}),(0,W.jsx)(`input`,{value:t,onChange:e=>n(e.target.value),placeholder:`Bot ID / username`})]}),(0,W.jsxs)(`label`,{className:`gift-page-size`,children:[(0,W.jsx)(`span`,{children:`Limit`}),(0,W.jsxs)(`select`,{value:String(r),onChange:e=>i(Number(e.target.value)),children:[(0,W.jsx)(`option`,{value:`10`,children:`10`}),(0,W.jsx)(`option`,{value:`20`,children:`20`}),(0,W.jsx)(`option`,{value:`50`,children:`50`}),(0,W.jsx)(`option`,{value:`100`,children:`100`})]})]}),(0,W.jsxs)(`button`,{className:`btn primary icon-text`,type:`submit`,disabled:d,children:[d?(0,W.jsx)(L,{size:15,className:`spin`}):(0,W.jsx)(Ze,{size:15}),` `,`Search`]}),(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>void x(),disabled:!T,children:[(0,W.jsx)(_e,{size:15}),` `,`Previous page`]}),(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>void b(),disabled:!E,children:[(0,W.jsx)(ve,{size:15}),` `,`Next page`]})]})}),(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{className:`avatar-col`}),(0,W.jsx)(`th`,{children:`Bot ID`}),(0,W.jsx)(`th`,{children:`Username`}),(0,W.jsx)(`th`,{children:`Name`}),(0,W.jsx)(`th`,{children:`Owner`}),(0,W.jsx)(`th`,{children:`Verified`}),(0,W.jsx)(`th`,{children:`Type`}),(0,W.jsx)(`th`,{children:`Created`}),(0,W.jsx)(`th`,{})]})}),(0,W.jsxs)(`tbody`,{children:[S.map(t=>(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`td`,{className:`avatar-col`,children:(0,W.jsx)(`button`,{className:`avatar-link`,type:`button`,onClick:()=>e(`/bots/${t.ID}`),"aria-label":`Open bot ${t.ID}`,children:(0,W.jsx)(yn,{id:t.ID,firstName:t.FirstName,username:t.Username})})}),(0,W.jsx)(`td`,{className:`mono`,children:t.ID}),(0,W.jsx)(`td`,{children:H(t.Username)||`-`}),(0,W.jsx)(`td`,{children:t.FirstName||`-`}),(0,W.jsx)(`td`,{className:`mono`,children:t.OwnerUserID>0?t.OwnerUserID:`-`}),(0,W.jsxs)(`td`,{children:[t.Verified?(0,W.jsxs)(q,{tone:`good`,children:[(0,W.jsx)(F,{size:12}),` `,`Verified`]}):(0,W.jsx)(q,{children:`Not verified`}),` `,(0,W.jsx)(xn,{scam:t.Scam,fake:t.Fake})]}),(0,W.jsx)(`td`,{children:t.System?(0,W.jsx)(q,{tone:`warn`,children:`System`}):(0,W.jsx)(q,{children:`User`})}),(0,W.jsx)(`td`,{children:U(t.CreatedAt)}),(0,W.jsx)(`td`,{children:(0,W.jsxs)(`button`,{className:`row-link`,onClick:()=>e(`/bots/${t.ID}`),children:[(0,W.jsx)(fe,{size:14}),` `,`Details`,` `,(0,W.jsx)(ve,{size:14})]})})]},t.ID)),S.length===0&&(0,W.jsx)(It,{colSpan:9})]})]})}),h&&(0,W.jsx)(nr,{onClose:()=>_(!1),onCreated:()=>void y()})]})}function ar({onClose:e,onCreated:t}){let[n,r]=(0,g.useState)(``),[i,a]=(0,g.useState)(`all`),[o,s]=(0,g.useState)([]),c=(0,g.useMemo)(()=>!n.trim()||i===`selected`&&o.length===0,[n,i,o]);return(0,pn.createPortal)((0,W.jsx)(`div`,{className:`modal-backdrop`,role:`presentation`,children:(0,W.jsxs)(`section`,{className:`modal command-modal`,role:`dialog`,"aria-modal":`true`,"aria-label":`Send broadcast`,children:[(0,W.jsxs)(`div`,{className:`modal-head`,children:[(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`div`,{className:`eyebrow`,children:`Broadcasts`}),(0,W.jsx)(`h2`,{children:`Send broadcast`})]}),(0,W.jsx)(`button`,{className:`icon-btn`,type:`button`,onClick:e,"aria-label":`Close`,children:(0,W.jsx)(ht,{size:15})})]}),(0,W.jsxs)(`div`,{className:`command-body`,children:[(0,W.jsx)(`p`,{children:`Sends a message from the official system account (777000) to all users or to a chosen list. Delivery happens in the background and may take a few minutes for large audiences.`}),(0,W.jsxs)(`label`,{className:`form-field`,children:[(0,W.jsx)(`span`,{children:`Message`}),(0,W.jsx)(`textarea`,{value:n,onChange:e=>r(e.target.value),rows:5,maxLength:4096,placeholder:`What's new...`})]}),(0,W.jsx)(`div`,{className:`bot-create-fields`,children:(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Target`}),(0,W.jsxs)(`select`,{value:i,onChange:e=>a(e.target.value),children:[(0,W.jsx)(`option`,{value:`all`,children:`All users`}),(0,W.jsx)(`option`,{value:`selected`,children:`Selected users`})]})]})}),i===`selected`&&(0,W.jsx)(zn,{label:`Recipients`,selected:o,onChange:s})]}),(0,W.jsxs)(`div`,{className:`modal-actions`,children:[(0,W.jsx)(`button`,{className:`btn`,type:`button`,onClick:e,children:`Close`}),(0,W.jsx)(X,{label:`Send broadcast`,icon:(0,W.jsx)(Qe,{size:15}),tone:`neutral`,path:`/api/actions/create-broadcast`,disabled:c,payload:()=>({message:n.trim(),target_mode:i,user_ids:i===`selected`?o.map(e=>e.ID):void 0}),onDone:t})]})]})}),document.body)}var or={beforeID:0};function sr(){let[e,t]=(0,g.useState)(null),[n,r]=(0,g.useState)([]),[i,a]=(0,g.useState)(or),[o,s]=(0,g.useState)(!1),[c,l]=(0,g.useState)(``),[u,d]=(0,g.useState)(!1);async function f(e){s(!0),l(``);let n=new URLSearchParams({limit:`50`});e.beforeID&&n.set(`before_id`,String(e.beforeID));try{let e=await k.broadcasts(n);return t(e),e}catch(e){return l(O(e)),null}finally{s(!1)}}async function p(){r([]),a(or),await f(or)}async function m(){if(!e?.has_more)return;let t={beforeID:e.next_before_id};await f(t)&&(r(e=>[...e,i]),a(t))}async function h(){if(n.length===0)return;let e=n[n.length-1];await f(e)&&(r(e=>e.slice(0,-1)),a(e))}(0,g.useEffect)(()=>{p()},[]);let _=e?.rows??[],v=_.filter(e=>e.SentCount+e.FailedCount0&&!o,b=!!e?.has_more&&!o;return(0,W.jsxs)(Mt,{title:`Broadcasts`,eyebrow:`Announcements sent from the official system account`,actions:(0,W.jsxs)(W.Fragment,{children:[(0,W.jsxs)(`button`,{className:`btn primary icon-text`,type:`button`,onClick:()=>d(!0),children:[(0,W.jsx)(Qe,{size:15}),` `,`Send broadcast`]}),(0,W.jsxs)(`button`,{className:`btn`,type:`button`,onClick:()=>void p(),disabled:o,children:[(0,W.jsx)(Ye,{size:15}),` `,`Refresh`]})]}),children:[c&&(0,W.jsx)(K,{children:c}),(0,W.jsxs)(`div`,{className:`metric-row`,children:[(0,W.jsx)(J,{label:`Campaigns on page`,value:String(_.length)}),(0,W.jsx)(J,{label:`Still delivering`,value:String(v),tone:v>0?`warn`:`neutral`})]}),(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{children:`ID`}),(0,W.jsx)(`th`,{children:`Message`}),(0,W.jsx)(`th`,{children:`Target`}),(0,W.jsx)(`th`,{children:`Sent`}),(0,W.jsx)(`th`,{children:`Failed`}),(0,W.jsx)(`th`,{children:`Total`}),(0,W.jsx)(`th`,{children:`Created by`}),(0,W.jsx)(`th`,{children:`Created`})]})}),(0,W.jsxs)(`tbody`,{children:[_.map(e=>{let t=e.SentCount+e.FailedCount,n=e.TotalCount>0&&t>=e.TotalCount;return(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`td`,{className:`mono`,children:e.ID}),(0,W.jsx)(`td`,{className:`truncate`,children:e.Message}),(0,W.jsx)(`td`,{children:e.TargetMode===`all`?(0,W.jsx)(q,{tone:`warn`,children:`All users`}):(0,W.jsx)(q,{children:`Selected`})}),(0,W.jsx)(`td`,{children:e.SentCount}),(0,W.jsx)(`td`,{children:e.FailedCount>0?(0,W.jsx)(q,{tone:`danger`,children:e.FailedCount}):e.FailedCount}),(0,W.jsx)(`td`,{children:e.TotalCount}),(0,W.jsx)(`td`,{children:e.CreatedBy||`-`}),(0,W.jsxs)(`td`,{children:[U(e.CreatedAt),!n&&(0,W.jsx)(q,{tone:`warn`,children:`Sending`})]})]},e.ID)}),_.length===0&&(0,W.jsx)(It,{colSpan:8})]})]})}),(0,W.jsxs)(`div`,{className:`toolbar`,children:[(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>void h(),disabled:!y,children:[(0,W.jsx)(_e,{size:15}),` `,`Previous page`]}),(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>void m(),disabled:!b,children:[o?(0,W.jsx)(L,{size:15,className:`spin`}):(0,W.jsx)(ve,{size:15}),` `,`Next page`]})]}),u&&(0,W.jsx)(ar,{onClose:()=>d(!1),onCreated:()=>void p()})]})}function cr({navigate:e}){let[t,n]=(0,g.useState)(null),[r,i]=(0,g.useState)(``);(0,g.useEffect)(()=>{let e=!1;async function t(){try{let t=await k.dashboard();e||n(t)}catch(t){e||i(t instanceof Error?t.message:`Failed to load dashboard`)}}t();let r=window.setInterval(()=>void t(),15e3);return()=>{e=!0,window.clearInterval(r)}},[]);let a=t?.counts,o=t?.storage,s=t?.host;return(0,W.jsxs)(`div`,{className:`dashboard-layout`,children:[r&&(0,W.jsx)(K,{children:r}),(0,W.jsxs)(lr,{title:`Needs attention`,children:[(0,W.jsx)(ur,{icon:(0,W.jsx)(De,{}),label:`Pending reports`,value:a?St(String(a.PendingReports)):`…`,tone:a&&a.PendingReports>0?`warn`:`good`,href:`/moderation`,navigate:e}),(0,W.jsx)(ur,{icon:(0,W.jsx)(F,{}),label:`Verification requests`,value:a?St(String(a.PendingVerifications)):`…`,tone:a&&a.PendingVerifications>0?`warn`:`good`,href:`/verification`,navigate:e})]}),(0,W.jsxs)(lr,{title:`People & chats`,children:[(0,W.jsx)(ur,{icon:(0,W.jsx)(pt,{}),label:`Users`,value:a?St(String(a.Users)):`…`,href:`/accounts`,navigate:e}),(0,W.jsx)(ur,{icon:(0,W.jsx)(ce,{}),label:`Online now`,value:a?St(String(a.OnlineUsers)):`…`,sub:`last 5 min`,href:`/accounts`,navigate:e}),(0,W.jsx)(ur,{icon:(0,W.jsx)(fe,{}),label:`Bots`,value:a?St(String(a.Bots)):`…`,href:`/bots`,navigate:e}),(0,W.jsx)(ur,{icon:(0,W.jsx)(Je,{}),label:`Channels`,value:a?St(String(a.BroadcastChannels)):`…`,href:`/channels`,navigate:e}),(0,W.jsx)(ur,{icon:(0,W.jsx)(se,{}),label:`Supergroups`,value:a?St(String(a.Supergroups)):`…`,href:`/channels`,navigate:e})]}),(0,W.jsxs)(lr,{title:`Content`,children:[(0,W.jsx)(ur,{icon:(0,W.jsx)(st,{}),label:`Sticker packs`,value:a?St(String(a.StickerSets)):`…`,href:`/stickers`,navigate:e}),(0,W.jsx)(ur,{icon:(0,W.jsx)(at,{}),label:`Emoji packs`,value:a?St(String(a.EmojiSets)):`…`,href:`/emoji`,navigate:e}),(0,W.jsx)(ur,{icon:(0,W.jsx)(Ee,{}),label:`GIFs`,value:a?St(String(a.Gifs)):`…`,sub:`saved by users`,href:`/gif-catalog`,navigate:e}),(0,W.jsx)(ur,{icon:(0,W.jsx)(Se,{}),label:`Media storage used`,value:o?kt(o.PhysicalBytes):`…`,sub:o?`${o.BackendKind} backend`:void 0,href:`/storage`,navigate:e})]}),(0,W.jsxs)(lr,{title:`Server health`,hint:s?.Ready?void 0:`waiting for first sample…`,children:[(0,W.jsx)(dr,{icon:(0,W.jsx)(xe,{}),label:`CPU load`,percent:s?.Ready?s.CPUPercent:void 0,valueText:s?.Ready?`${s.CPUPercent.toFixed(0)}%`:`…`}),(0,W.jsx)(dr,{icon:(0,W.jsx)(ze,{}),label:`RAM used`,percent:s?.Ready&&s.MemTotalBytes>0?s.MemUsedBytes/s.MemTotalBytes*100:void 0,valueText:s?.Ready?kt(String(s.MemUsedBytes)):`…`,sub:s?.Ready?`of ${kt(String(s.MemTotalBytes))}`:void 0}),(0,W.jsx)(dr,{icon:(0,W.jsx)(Ae,{}),label:`Disk free`,percent:s?.Ready&&s.DiskTotalBytes>0?(s.DiskTotalBytes-s.DiskFreeBytes)/s.DiskTotalBytes*100:void 0,valueText:s?.Ready?kt(String(s.DiskFreeBytes)):`…`,sub:s?.Ready?`of ${kt(String(s.DiskTotalBytes))}`:void 0,warnAbove:85})]})]})}function lr({title:e,hint:t,children:n}){return(0,W.jsxs)(`div`,{className:`dashboard-section`,children:[(0,W.jsxs)(`div`,{className:`dashboard-section-title`,children:[e,t&&(0,W.jsx)(`span`,{children:t})]}),(0,W.jsx)(`div`,{className:`dashboard-grid`,children:n})]})}function ur({icon:e,label:t,value:n,sub:r,tone:i=`neutral`,href:a,navigate:o}){let s=i===`neutral`?``:` ${i}`,c=(0,W.jsxs)(W.Fragment,{children:[(0,W.jsxs)(`div`,{className:`stat-tile-head`,children:[(0,W.jsx)(`span`,{className:`stat-tile-icon`,children:e}),i===`warn`&&(0,W.jsx)(ae,{size:15,className:`stat-tile-open`})]}),(0,W.jsx)(`div`,{className:`stat-tile-value`,children:n}),(0,W.jsx)(`div`,{className:`stat-tile-label`,children:t}),r&&(0,W.jsx)(`div`,{className:`stat-tile-sub`,children:r})]});return a&&o?(0,W.jsx)(`a`,{className:`stat-tile clickable${s}`,href:a,onClick:e=>{e.preventDefault(),o(a)},children:c}):(0,W.jsx)(`div`,{className:`stat-tile${s}`,children:c})}function dr({icon:e,label:t,percent:n,valueText:r,sub:i,warnAbove:a=90}){let o=n===void 0?0:Math.max(0,Math.min(100,n)),s=n===void 0?`neutral`:n>=a?`danger`:n>=a-15?`warn`:`neutral`;return(0,W.jsxs)(`div`,{className:`stat-tile${s===`neutral`?``:` ${s}`}`,children:[(0,W.jsx)(`div`,{className:`stat-tile-head`,children:(0,W.jsx)(`span`,{className:`stat-tile-icon`,children:e})}),(0,W.jsx)(`div`,{className:`stat-tile-value`,children:r}),(0,W.jsx)(`div`,{className:`stat-tile-label`,children:t}),i&&(0,W.jsx)(`div`,{className:`stat-tile-sub`,children:i}),(0,W.jsx)(`div`,{className:`stat-tile-bar`,children:(0,W.jsx)(`span`,{style:{width:`${o}%`}})})]})}function fr({channelID:e,msgID:t,navigate:n}){let[r,i]=(0,g.useState)(null),[a,o]=(0,g.useState)(``);async function s(){o(``);try{i(await k.groupMessage(e,t))}catch(e){o(O(e))}}if((0,g.useEffect)(()=>{s()},[e,t]),a)return(0,W.jsx)(K,{children:a});if(!r)return(0,W.jsx)(Lt,{label:`Loading`});let c=r.Message;return(0,W.jsx)(Mt,{title:`Group Message #${c.ID}`,eyebrow:`Message Detail`,actions:(0,W.jsxs)(`button`,{className:`btn icon-text`,onClick:()=>n(`/messages/groups`),children:[(0,W.jsx)(ue,{size:15}),` `,`Back to group messages`]}),children:(0,W.jsxs)(`div`,{className:`stacked-sections`,children:[(0,W.jsxs)(`section`,{className:`entity-head`,children:[(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`div`,{className:`entity-title`,children:`Channel / Group ${c.ChannelID}`}),(0,W.jsx)(`div`,{className:`entity-subtitle`,children:`Sender ${c.SenderUserID} · ${yt(c.Date)}`})]}),(0,W.jsxs)(`div`,{className:`entity-badges`,children:[c.Deleted?(0,W.jsx)(q,{tone:`danger`,children:`Deleted`}):(0,W.jsx)(q,{children:`Live`}),c.Pinned&&(0,W.jsx)(q,{tone:`warn`,children:`Pinned`}),c.Post&&(0,W.jsx)(q,{children:`Channel post`}),(0,W.jsxs)(q,{children:[`pts `,c.PTS]})]})]}),(0,W.jsxs)(`div`,{className:`summary-grid`,children:[(0,W.jsx)(Y,{label:`Message ID`,value:String(c.ID),mono:!0}),(0,W.jsx)(Y,{label:`Channel / Group`,value:String(c.ChannelID),mono:!0}),(0,W.jsx)(Y,{label:`From Peer`,value:`${c.FromPeerType}:${c.FromPeerID}`,mono:!0}),(0,W.jsx)(Y,{label:`Views`,value:String(c.ViewsCount)})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Channel Message Row`,text:`channel_messages read-only snapshot`}),(0,W.jsx)(Rt,{value:r.MessageJSON})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Channel Row`,text:`channels read-only snapshot`}),(0,W.jsx)(Rt,{value:r.ChannelJSON})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Channel Update Events`,text:`durable channel_update_events`}),(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{children:`PTS`}),(0,W.jsx)(`th`,{children:`Count`}),(0,W.jsx)(`th`,{children:`Type`}),(0,W.jsx)(`th`,{children:`Message ID`}),(0,W.jsx)(`th`,{children:`Sender`}),(0,W.jsx)(`th`,{children:`Time`})]})}),(0,W.jsxs)(`tbody`,{children:[r.UpdateEvents.map(e=>(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`td`,{children:e.PTS}),(0,W.jsx)(`td`,{children:e.PTSCount}),(0,W.jsx)(`td`,{children:e.Type}),(0,W.jsx)(`td`,{children:e.MessageID}),(0,W.jsx)(`td`,{children:e.SenderUserID}),(0,W.jsx)(`td`,{children:yt(e.Date)})]},`${e.PTS}-${e.Type}-${e.MessageID}`)),r.UpdateEvents.length===0&&(0,W.jsx)(It,{colSpan:6})]})]})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Event JSON`}),(0,W.jsxs)(`div`,{className:`raw-grid`,children:[r.UpdateEvents.map(e=>(0,W.jsx)(Rt,{value:e.JSON},`${e.PTS}-${e.Type}-json`)),r.UpdateEvents.length===0&&(0,W.jsx)(`div`,{className:`empty-panel`,children:`No results`})]})]})]})})}function pr({navigate:e}){let[t,n]=(0,g.useState)(null),[r,i]=(0,g.useState)(``),[a,o]=(0,g.useState)(``),[s,c]=(0,g.useState)(`100`),[l,u]=(0,g.useState)(null),[d,f]=(0,g.useState)(``);async function p(e=!1){if(f(``),!t){f(`Search and select a supergroup or channel first`);return}let n=new URLSearchParams({channel_id:String(t.ID),limit:s});if(e&&l?.rows.length){let e=l.rows[l.rows.length-1];n.set(`before_date`,String(e.Date)),n.set(`before_id`,String(e.ID)),i(String(e.Date)),o(String(e.ID))}else r&&n.set(`before_date`,r),a&&n.set(`before_id`,a);try{u(await k.groupMessages(n))}catch(e){f(O(e))}}function m(e){n(e),i(``),o(``),u(null)}let h=l?.rows??[];return(0,W.jsxs)(Mt,{title:`Group Messages`,eyebrow:`Supergroup / channel messages`,children:[d&&(0,W.jsx)(K,{children:d}),(0,W.jsxs)(Nt,{children:[(0,W.jsx)(`div`,{className:`message-selector-grid single`,children:(0,W.jsx)(Vn,{label:`Channel / Group`,value:t,onChange:m})}),(0,W.jsxs)(`form`,{className:`toolbar message-query`,onSubmit:e=>{e.preventDefault(),p(!1)},children:[(0,W.jsx)(`input`,{value:r,onChange:e=>i(e.target.value),placeholder:`before_date cursor`}),(0,W.jsx)(`input`,{value:a,onChange:e=>o(e.target.value),placeholder:`before_msg_id cursor`}),(0,W.jsx)(`input`,{className:`small-input`,value:s,onChange:e=>c(e.target.value),placeholder:`limit <= 100`}),(0,W.jsxs)(`button`,{className:`btn primary icon-text`,type:`submit`,children:[(0,W.jsx)(Ze,{size:15}),` `,`Search messages`]}),h.length?(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>p(!0),children:[(0,W.jsx)(ve,{size:15}),` `,`Next page`]}):null]})]}),(0,W.jsxs)(`div`,{className:`metric-row`,children:[(0,W.jsx)(J,{label:`Messages on page`,value:String(h.length)}),(0,W.jsx)(J,{label:`With media`,value:String(h.filter(e=>e.Media&&e.Media!==`{}`).length)}),(0,W.jsx)(J,{label:`Channel posts`,value:String(h.filter(e=>e.Post).length)}),(0,W.jsx)(J,{label:`Channel / Group`,value:t?`${t.Title||vt(t)} (${t.ID})`:`-`})]}),(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{children:`Message ID`}),(0,W.jsx)(`th`,{children:`Time`}),(0,W.jsx)(`th`,{children:`Sender`}),(0,W.jsx)(`th`,{children:`From Peer`}),(0,W.jsx)(`th`,{children:`PTS`}),(0,W.jsx)(`th`,{children:`Views`}),(0,W.jsx)(`th`,{children:`Status`}),(0,W.jsx)(`th`,{children:`Body`}),(0,W.jsx)(`th`,{})]})}),(0,W.jsxs)(`tbody`,{children:[h.map(t=>(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`td`,{className:`mono`,children:t.ID}),(0,W.jsx)(`td`,{children:yt(t.Date)}),(0,W.jsx)(`td`,{className:`mono`,children:t.SenderUserID}),(0,W.jsxs)(`td`,{className:`mono`,children:[t.FromPeerType,`:`,t.FromPeerID]}),(0,W.jsx)(`td`,{children:t.PTS}),(0,W.jsx)(`td`,{children:t.ViewsCount}),(0,W.jsx)(`td`,{children:t.Deleted?(0,W.jsx)(q,{tone:`danger`,children:`Deleted`}):t.Pinned?(0,W.jsx)(q,{tone:`warn`,children:`Pinned`}):(0,W.jsx)(q,{children:`Live`})}),(0,W.jsx)(`td`,{className:`truncate`,children:t.Body}),(0,W.jsx)(`td`,{children:(0,W.jsxs)(`button`,{className:`row-link`,onClick:()=>e(`/messages/groups/detail?channel_id=${t.ChannelID}&msg_id=${t.ID}`),children:[`Details`,` `,(0,W.jsx)(ve,{size:14})]})})]},`${t.ChannelID}-${t.ID}`)),h.length===0&&(0,W.jsx)(It,{colSpan:9})]})]})})]})}function mr({ownerUserID:e,msgID:t,navigate:n}){let[r,i]=(0,g.useState)(null),[a,o]=(0,g.useState)(``);async function s(){o(``);try{i(await k.message(e,t))}catch(e){o(O(e))}}if((0,g.useEffect)(()=>{s()},[e,t]),a)return(0,W.jsx)(K,{children:a});if(!r)return(0,W.jsx)(Lt,{label:`Loading`});let c=r.Message;return(0,W.jsx)(Mt,{title:`Message #${c.BoxID}`,eyebrow:`Message Detail`,actions:(0,W.jsxs)(`button`,{className:`btn icon-text`,onClick:()=>n(`/messages/private`),children:[(0,W.jsx)(ue,{size:15}),` `,`Back to private messages`]}),children:(0,W.jsx)(Pt,{main:(0,W.jsxs)(`div`,{className:`stacked-sections`,children:[(0,W.jsxs)(`section`,{className:`entity-head`,children:[(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`div`,{className:`entity-title`,children:`Owner ${c.OwnerUserID} · Peer ${c.PeerID}`}),(0,W.jsx)(`div`,{className:`entity-subtitle`,children:`Sender ${c.FromUserID} · ${yt(c.Date)}`})]}),(0,W.jsxs)(`div`,{className:`entity-badges`,children:[c.Deleted?(0,W.jsx)(q,{tone:`danger`,children:`Deleted`}):(0,W.jsx)(q,{children:`Live`}),(0,W.jsxs)(q,{children:[`pts `,c.PTS]}),(0,W.jsx)(q,{children:c.Outgoing?`Outgoing`:`Incoming`})]})]}),(0,W.jsxs)(`div`,{className:`summary-grid`,children:[(0,W.jsx)(Y,{label:`Message box ID`,value:String(c.BoxID),mono:!0}),(0,W.jsx)(Y,{label:`Private message ID`,value:String(c.PrivateMessageID),mono:!0}),(0,W.jsx)(Y,{label:`Message sender`,value:String(c.MessageSenderID),mono:!0}),(0,W.jsx)(Y,{label:`Time`,value:yt(c.Date)})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Message Box`,text:`message_boxes read-only snapshot`}),(0,W.jsx)(Rt,{value:r.MessageJSON})]}),(0,W.jsxs)(`div`,{className:`raw-grid`,children:[(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Dialog Row`,text:`dialogs read-only snapshot`}),(0,W.jsx)(Rt,{value:r.DialogJSON})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Private Message Row`,text:`private_messages read-only snapshot`}),(0,W.jsx)(Rt,{value:r.PrivateJSON})]})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Update Events`,text:`durable user_update_events`}),(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{children:`PTS`}),(0,W.jsx)(`th`,{children:`Count`}),(0,W.jsx)(`th`,{children:`Type`}),(0,W.jsx)(`th`,{children:`Time`})]})}),(0,W.jsxs)(`tbody`,{children:[r.UpdateEvents.map(e=>(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`td`,{children:e.PTS}),(0,W.jsx)(`td`,{children:e.PTSCount}),(0,W.jsx)(`td`,{children:e.Type}),(0,W.jsx)(`td`,{children:yt(e.Date)})]},`${e.PTS}-${e.Type}`)),r.UpdateEvents.length===0&&(0,W.jsx)(It,{colSpan:4})]})]})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Dispatch Queue`,text:`online/offline dispatch_outbox`}),(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{children:`ID`}),(0,W.jsx)(`th`,{children:`User ID`}),(0,W.jsx)(`th`,{children:`PTS`}),(0,W.jsx)(`th`,{children:`Type`}),(0,W.jsx)(`th`,{children:`Status`}),(0,W.jsx)(`th`,{children:`Attempts`}),(0,W.jsx)(`th`,{children:`Updated`})]})}),(0,W.jsxs)(`tbody`,{children:[r.Outbox.map(e=>(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`td`,{children:e.ID}),(0,W.jsx)(`td`,{children:e.TargetUserID}),(0,W.jsx)(`td`,{children:e.PTS}),(0,W.jsx)(`td`,{children:e.EventType}),(0,W.jsx)(`td`,{children:e.Status}),(0,W.jsx)(`td`,{children:e.Attempts}),(0,W.jsx)(`td`,{children:U(e.UpdatedAt)})]},e.ID)),r.Outbox.length===0&&(0,W.jsx)(It,{colSpan:7})]})]})})]})]}),side:(0,W.jsxs)(`section`,{className:`action-dock`,children:[(0,W.jsx)(`div`,{className:`dock-title`,children:`Operations`}),(0,W.jsx)(X,{label:`Delete this message`,icon:(0,W.jsx)(lt,{size:15}),path:`/api/actions/delete-messages`,payload:()=>({owner_user_id:c.OwnerUserID,peer_id:c.PeerID,ids:[c.BoxID],revoke:!0}),onDone:s})]})})})}function hr({navigate:e}){let[t,n]=(0,g.useState)(null),[r,i]=(0,g.useState)(null),[a,o]=(0,g.useState)(``),[s,c]=(0,g.useState)(``),[l,u]=(0,g.useState)(`100`),[d,f]=(0,g.useState)(``),[p,m]=(0,g.useState)(!0),[h,_]=(0,g.useState)(!1),[v,y]=(0,g.useState)(``),[b,x]=(0,g.useState)(`1`),[S,C]=(0,g.useState)(null),[w,T]=(0,g.useState)(``);async function E(e=!1){if(T(``),!t||!r){T(`Search and select the owner user and peer user first`);return}let n=new URLSearchParams({owner_user_id:String(t.ID),peer_id:String(r.ID),limit:l});if(e&&S?.rows.length){let e=S.rows[S.rows.length-1];n.set(`before_date`,String(e.Date)),n.set(`before_id`,String(e.BoxID)),o(String(e.Date)),c(String(e.BoxID))}else a&&n.set(`before_date`,a),s&&n.set(`before_id`,s);try{C(await k.messages(n))}catch(e){T(O(e))}}function D(e){n(e),o(``),c(``),C(null)}function A(e){i(e),o(``),c(``),C(null)}return(0,W.jsxs)(Mt,{title:`Private Messages`,eyebrow:`Private message boxes`,children:[w&&(0,W.jsx)(K,{children:w}),(0,W.jsxs)(Nt,{children:[(0,W.jsxs)(`div`,{className:`message-selector-grid`,children:[(0,W.jsx)(Rn,{label:`Owner user`,value:t,onChange:D}),(0,W.jsx)(Rn,{label:`Peer user`,value:r,onChange:A})]}),(0,W.jsxs)(`form`,{className:`toolbar message-query`,onSubmit:e=>{e.preventDefault(),E(!1)},children:[(0,W.jsx)(`input`,{value:a,onChange:e=>o(e.target.value),placeholder:`before_date cursor`}),(0,W.jsx)(`input`,{value:s,onChange:e=>c(e.target.value),placeholder:`before_msg_id cursor`}),(0,W.jsx)(`input`,{className:`small-input`,value:l,onChange:e=>u(e.target.value),placeholder:`limit <= 100`}),(0,W.jsxs)(`button`,{className:`btn primary icon-text`,type:`submit`,children:[(0,W.jsx)(Ze,{size:15}),` `,`Search messages`]}),S?.rows.length?(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>E(!0),children:[(0,W.jsx)(ve,{size:15}),` `,`Next page`]}):null]})]}),(0,W.jsxs)(`div`,{className:`metric-row`,children:[(0,W.jsx)(J,{label:`Messages on page`,value:String(S?.rows.length??0)}),(0,W.jsx)(J,{label:`Deleted`,value:String((S?.rows??[]).filter(e=>e.Deleted).length),tone:`danger`}),(0,W.jsx)(J,{label:`Outgoing`,value:String((S?.rows??[]).filter(e=>e.Outgoing).length)}),(0,W.jsx)(J,{label:`Owner / Peer`,value:t&&r?`${_t(t)} / ${_t(r)}`:`-`})]}),(0,W.jsxs)(`div`,{className:`operation-row`,children:[(0,W.jsxs)(`div`,{className:`operation-box`,children:[(0,W.jsxs)(`div`,{className:`operation-title`,children:[(0,W.jsx)(lt,{size:15}),` `,`Delete selected messages`]}),(0,W.jsx)(`input`,{value:d,onChange:e=>f(e.target.value),placeholder:`Message IDs, comma separated`}),(0,W.jsxs)(`label`,{className:`checkline`,children:[(0,W.jsx)(`input`,{type:`checkbox`,checked:p,onChange:e=>m(e.target.checked)}),` `,`Revoke for both sides`]}),(0,W.jsx)(X,{path:`/api/actions/delete-messages`,label:`Dry-run delete`,payload:()=>({owner_user_id:t?.ID??0,peer_id:r?.ID??0,ids:At(d,`Message IDs are invalid`),revoke:p})})]}),(0,W.jsxs)(`div`,{className:`operation-box`,children:[(0,W.jsxs)(`div`,{className:`operation-title`,children:[(0,W.jsx)(je,{size:15}),` `,`Clear private history`]}),(0,W.jsx)(`input`,{value:v,onChange:e=>y(e.target.value),placeholder:`max_id cutoff`}),(0,W.jsx)(`input`,{value:b,onChange:e=>x(e.target.value),placeholder:`max_batches`}),(0,W.jsxs)(`label`,{className:`checkline`,children:[(0,W.jsx)(`input`,{type:`checkbox`,checked:p,onChange:e=>m(e.target.checked)}),` `,`Revoke for both sides`]}),(0,W.jsxs)(`label`,{className:`checkline`,children:[(0,W.jsx)(`input`,{type:`checkbox`,checked:h,onChange:e=>_(e.target.checked)}),` `,`Clear only this side`]}),(0,W.jsx)(X,{path:`/api/actions/delete-history`,label:`Dry-run clear history`,payload:()=>({owner_user_id:t?.ID??0,peer_id:r?.ID??0,max_id:xt(v),max_batches:xt(b),just_clear:h,revoke:p})})]})]}),(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{children:`Message ID`}),(0,W.jsx)(`th`,{children:`Time`}),(0,W.jsx)(`th`,{children:`Sender`}),(0,W.jsx)(`th`,{children:`Direction`}),(0,W.jsx)(`th`,{children:`PTS`}),(0,W.jsx)(`th`,{children:`Status`}),(0,W.jsx)(`th`,{children:`Body`}),(0,W.jsx)(`th`,{})]})}),(0,W.jsxs)(`tbody`,{children:[S?.rows.map(t=>(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`td`,{className:`mono`,children:t.BoxID}),(0,W.jsx)(`td`,{children:yt(t.Date)}),(0,W.jsx)(`td`,{className:`mono`,children:t.FromUserID}),(0,W.jsx)(`td`,{children:t.Outgoing?`Outgoing`:`Incoming`}),(0,W.jsx)(`td`,{children:t.PTS}),(0,W.jsx)(`td`,{children:t.Deleted?(0,W.jsx)(q,{tone:`danger`,children:`Deleted`}):(0,W.jsx)(q,{children:`Live`})}),(0,W.jsx)(`td`,{className:`truncate`,children:t.Body}),(0,W.jsx)(`td`,{children:(0,W.jsxs)(`button`,{className:`row-link`,onClick:()=>e(`/messages/private/detail?owner_user_id=${t.OwnerUserID}&msg_id=${t.BoxID}`),children:[`Details`,` `,(0,W.jsx)(ve,{size:14})]})})]},`${t.OwnerUserID}-${t.BoxID}`)),(!S||S.rows.length===0)&&(0,W.jsx)(It,{colSpan:8})]})]})})]})}var gr=c(o(((e,t)=>{typeof document<`u`&&typeof navigator<`u`&&(function(n,r){typeof e==`object`&&t!==void 0?t.exports=r():typeof define==`function`&&define.amd?define(r):(n=typeof globalThis<`u`?globalThis:n||self,n.lottie=r())})(e,(function(){var n=``,r=!1,i=-999999,a=function(e){r=!!e},o=function(){return r},s=function(e){n=e},c=function(){return n};function l(e){return document.createElement(e)}function u(e,t){var n,r=e.length,i;for(n=0;n1?n[1]=1:n[1]<=0&&(n[1]=0),I(n[0],n[1],n[2])}function L(e,t){var n=te(e[0]*255,e[1]*255,e[2]*255);return n[2]+=t,n[2]>1?n[2]=1:n[2]<0&&(n[2]=0),I(n[0],n[1],n[2])}function re(e,t){var n=te(e[0]*255,e[1]*255,e[2]*255);return n[0]+=t/360,n[0]>1?--n[0]:n[0]<0&&(n[0]+=1),I(n[0],n[1],n[2])}(function(){var e=[],t,n;for(t=0;t<256;t+=1)n=t.toString(16),e[t]=n.length===1?`0`+n:n;return function(t,n,r){return t<0&&(t=0),n<0&&(n=0),r<0&&(r=0),`#`+e[t]+e[n]+e[r]}})();var ie=function(e){g=!!e},ae=function(){return g},oe=function(e){_=e},se=function(){return _},ce=function(){return v},le=function(e){E=e},ue=function(){return E},de=function(e){y=e};function R(e){return document.createElementNS(`http://www.w3.org/2000/svg`,e)}function fe(e){"@babel/helpers - typeof";return fe=typeof Symbol==`function`&&typeof Symbol.iterator==`symbol`?function(e){return typeof e}:function(e){return e&&typeof Symbol==`function`&&e.constructor===Symbol&&e!==Symbol.prototype?`symbol`:typeof e},fe(e)}var pe=function(){var e=1,t=[],n,r,i={onmessage:function(){},postMessage:function(e){n({data:e})}},a={postMessage:function(e){i.onmessage({data:e})}};function s(e){if(window.Worker&&window.Blob&&o()){var t=new Blob([`var _workerSelf = self; self.onmessage = `,e.toString()],{type:`text/javascript`}),r=URL.createObjectURL(t);return new Worker(r)}return n=e,i}function c(){r||(r=s(function(e){function t(){function e(t,n){var o,s,c=t.length,l,u,d,f;for(s=0;s=0;--t)if(e[t].ty===`sh`)if(e[t].ks.k.i)a(e[t].ks.k);else for(o=e[t].ks.k.length,r=0;rn[0]?!0:n[0]>e[0]?!1:e[1]>n[1]?!0:n[1]>e[1]?!1:e[2]>n[2]?!0:n[2]>e[2]?!1:null}var s=function(){var e=[4,4,14];function t(e){var t=e.t.d;e.t.d={k:[{s:t,t:0}]}}function n(e){var n,r=e.length;for(n=0;n=0;--n)if(e[n].ty===`sh`)if(e[n].ks.k.i)e[n].ks.k.c=e[n].closed;else for(a=e[n].ks.k.length,i=0;i500)&&(this._imageLoaded(),clearInterval(n)),t+=1}.bind(this),50)}function a(t){var n=r(t,this.assetsPath,this.path),i=R(`image`);b?this.testImageLoaded(i):i.addEventListener(`load`,this._imageLoaded,!1),i.addEventListener(`error`,function(){a.img=e,this._imageLoaded()}.bind(this),!1),i.setAttributeNS(`http://www.w3.org/1999/xlink`,`href`,n),this._elementHelper.append?this._elementHelper.append(i):this._elementHelper.appendChild(i);var a={img:i,assetData:t};return a}function o(t){var n=r(t,this.assetsPath,this.path),i=l(`img`);i.crossOrigin=`anonymous`,i.addEventListener(`load`,this._imageLoaded,!1),i.addEventListener(`error`,function(){a.img=e,this._imageLoaded()}.bind(this),!1),i.src=n;var a={img:i,assetData:t};return a}function s(e){var t={assetData:e},n=r(e,this.assetsPath,this.path);return pe.loadData(n,function(e){t.img=e,this._footageLoaded()}.bind(this),function(){t.img={},this._footageLoaded()}.bind(this)),t}function c(e,t){this.imagesLoadedCb=t;var n,r=e.length;for(n=0;n<\/script>`,e=e.removeChild(e.firstChild)):typeof i.is==`string`?e=c.createElement(n,{is:i.is}):(e=c.createElement(n),n===`select`&&(c=e,i.multiple?c.multiple=!0:i.size&&(c.size=i.size))):e=c.createElementNS(e,n),e[wi]=t,e[Ti]=i,nc(e,t,!1,!1),t.stateNode=e;a:{switch(c=Ie(n,i),n){case`dialog`:Zr(`cancel`,e),Zr(`close`,e),o=i;break;case`iframe`:case`object`:case`embed`:Zr(`load`,e),o=i;break;case`video`:case`audio`:for(o=0;oel&&(t.flags|=128,i=!0,ac(s,!1),t.lanes=4194304)}else{if(!i)if(e=mo(c),e!==null){if(t.flags|=128,i=!0,n=e.updateQueue,n!==null&&(t.updateQueue=n,t.flags|=4),ac(s,!0),s.tail===null&&s.tailMode===`hidden`&&!c.alternate&&!_a)return oc(t),null}else 2*mt()-s.renderingStartTime>el&&n!==1073741824&&(t.flags|=128,i=!0,ac(s,!1),t.lanes=4194304);s.isBackwards?(c.sibling=t.child,t.child=c):(n=s.last,n===null?t.child=c:n.sibling=c,s.last=c)}return s.tail===null?(oc(t),null):(t=s.tail,s.rendering=t,s.tail=t.sibling,s.renderingStartTime=mt(),t.sibling=null,n=po.current,Ri(po,i?n&1|2:n&1),t);case 22:case 23:return wl(),i=t.memoizedState!==null,e!==null&&e.memoizedState!==null!==i&&(t.flags|=8192),i&&t.mode&1?Wc&1073741824&&(oc(t),t.subtreeFlags&6&&(t.flags|=8192)):oc(t),null;case 24:return null;case 25:return null}throw Error(r(156,t.tag))}function cc(e,t){switch(ma(t),t.tag){case 1:return Wi(t.type)&&Gi(),e=t.flags,e&65536?(t.flags=e&-65537|128,t):null;case 3:return lo(),Li(Vi),Li(Bi),go(),e=t.flags,e&65536&&!(e&128)?(t.flags=e&-65537|128,t):null;case 5:return fo(t),null;case 13:if(Li(po),e=t.memoizedState,e!==null&&e.dehydrated!==null){if(t.alternate===null)throw Error(r(340));Ea()}return e=t.flags,e&65536?(t.flags=e&-65537|128,t):null;case 19:return Li(po),null;case 4:return lo(),null;case 10:return Ba(t.type._context),null;case 22:case 23:return wl(),null;case 24:return null;default:return null}}var lc=!1,uc=!1,dc=typeof WeakSet==`function`?WeakSet:Set,Q=null;function fc(e,t){var n=e.ref;if(n!==null)if(typeof n==`function`)try{n(null)}catch(n){Rl(e,t,n)}else n.current=null}function pc(e,t,n){try{n()}catch(n){Rl(e,t,n)}}var mc=!1;function hc(e,t){if(fi=an,e=wr(),Tr(e)){if(`selectionStart`in e)var n={start:e.selectionStart,end:e.selectionEnd};else a:{n=(n=e.ownerDocument)&&n.defaultView||window;var i=n.getSelection&&n.getSelection();if(i&&i.rangeCount!==0){n=i.anchorNode;var a=i.anchorOffset,o=i.focusNode;i=i.focusOffset;try{n.nodeType,o.nodeType}catch{n=null;break a}var s=0,c=-1,l=-1,u=0,d=0,f=e,p=null;b:for(;;){for(var m;f!==n||a!==0&&f.nodeType!==3||(c=s+a),f!==o||i!==0&&f.nodeType!==3||(l=s+i),f.nodeType===3&&(s+=f.nodeValue.length),(m=f.firstChild)!==null;)p=f,f=m;for(;;){if(f===e)break b;if(p===n&&++u===a&&(c=s),p===o&&++d===i&&(l=s),(m=f.nextSibling)!==null)break;f=p,p=f.parentNode}f=m}n=c===-1||l===-1?null:{start:c,end:l}}else n=null}n||={start:0,end:0}}else n=null;for(pi={focusedElem:e,selectionRange:n},an=!1,Q=t;Q!==null;)if(t=Q,e=t.child,t.subtreeFlags&1028&&e!==null)e.return=t,Q=e;else for(;Q!==null;){t=Q;try{var h=t.alternate;if(t.flags&1024)switch(t.tag){case 0:case 11:case 15:break;case 1:if(h!==null){var g=h.memoizedProps,_=h.memoizedState,v=t.stateNode;v.__reactInternalSnapshotBeforeUpdate=v.getSnapshotBeforeUpdate(t.elementType===t.type?g:hs(t.type,g),_)}break;case 3:var y=t.stateNode.containerInfo;y.nodeType===1?y.textContent=``:y.nodeType===9&&y.documentElement&&y.removeChild(y.documentElement);break;case 5:case 6:case 4:case 17:break;default:throw Error(r(163))}}catch(e){Rl(t,t.return,e)}if(e=t.sibling,e!==null){e.return=t.return,Q=e;break}Q=t.return}return h=mc,mc=!1,h}function gc(e,t,n){var r=t.updateQueue;if(r=r===null?null:r.lastEffect,r!==null){var i=r=r.next;do{if((i.tag&e)===e){var a=i.destroy;i.destroy=void 0,a!==void 0&&pc(t,n,a)}i=i.next}while(i!==r)}}function _c(e,t){if(t=t.updateQueue,t=t===null?null:t.lastEffect,t!==null){var n=t=t.next;do{if((n.tag&e)===e){var r=n.create;n.destroy=r()}n=n.next}while(n!==t)}}function vc(e){var t=e.ref;if(t!==null){var n=e.stateNode;switch(e.tag){case 5:e=n;break;default:e=n}typeof t==`function`?t(e):t.current=e}}function yc(e){var t=e.alternate;t!==null&&(e.alternate=null,yc(t)),e.child=null,e.deletions=null,e.sibling=null,e.tag===5&&(t=e.stateNode,t!==null&&(delete t[wi],delete t[Ti],delete t[Di],delete t[Oi],delete t[ki])),e.stateNode=null,e.return=null,e.dependencies=null,e.memoizedProps=null,e.memoizedState=null,e.pendingProps=null,e.stateNode=null,e.updateQueue=null}function bc(e){return e.tag===5||e.tag===3||e.tag===4}function xc(e){a:for(;;){for(;e.sibling===null;){if(e.return===null||bc(e.return))return null;e=e.return}for(e.sibling.return=e.return,e=e.sibling;e.tag!==5&&e.tag!==6&&e.tag!==18;){if(e.flags&2||e.child===null||e.tag===4)continue a;e.child.return=e,e=e.child}if(!(e.flags&2))return e.stateNode}}function Sc(e,t,n){var r=e.tag;if(r===5||r===6)e=e.stateNode,t?n.nodeType===8?n.parentNode.insertBefore(e,t):n.insertBefore(e,t):(n.nodeType===8?(t=n.parentNode,t.insertBefore(e,n)):(t=n,t.appendChild(e)),n=n._reactRootContainer,n!=null||t.onclick!==null||(t.onclick=di));else if(r!==4&&(e=e.child,e!==null))for(Sc(e,t,n),e=e.sibling;e!==null;)Sc(e,t,n),e=e.sibling}function Cc(e,t,n){var r=e.tag;if(r===5||r===6)e=e.stateNode,t?n.insertBefore(e,t):n.appendChild(e);else if(r!==4&&(e=e.child,e!==null))for(Cc(e,t,n),e=e.sibling;e!==null;)Cc(e,t,n),e=e.sibling}var wc=null,Tc=!1;function Ec(e,t,n){for(n=n.child;n!==null;)Dc(e,t,n),n=n.sibling}function Dc(e,t,n){if(bt&&typeof bt.onCommitFiberUnmount==`function`)try{bt.onCommitFiberUnmount(yt,n)}catch{}switch(n.tag){case 5:uc||fc(n,t);case 6:var r=wc,i=Tc;wc=null,Ec(e,t,n),wc=r,Tc=i,wc!==null&&(Tc?(e=wc,n=n.stateNode,e.nodeType===8?e.parentNode.removeChild(n):e.removeChild(n)):wc.removeChild(n.stateNode));break;case 18:wc!==null&&(Tc?(e=wc,n=n.stateNode,e.nodeType===8?bi(e.parentNode,n):e.nodeType===1&&bi(e,n),nn(e)):bi(wc,n.stateNode));break;case 4:r=wc,i=Tc,wc=n.stateNode.containerInfo,Tc=!0,Ec(e,t,n),wc=r,Tc=i;break;case 0:case 11:case 14:case 15:if(!uc&&(r=n.updateQueue,r!==null&&(r=r.lastEffect,r!==null))){i=r=r.next;do{var a=i,o=a.destroy;a=a.tag,o!==void 0&&(a&2||a&4)&&pc(n,t,o),i=i.next}while(i!==r)}Ec(e,t,n);break;case 1:if(!uc&&(fc(n,t),r=n.stateNode,typeof r.componentWillUnmount==`function`))try{r.props=n.memoizedProps,r.state=n.memoizedState,r.componentWillUnmount()}catch(e){Rl(n,t,e)}Ec(e,t,n);break;case 21:Ec(e,t,n);break;case 22:n.mode&1?(uc=(r=uc)||n.memoizedState!==null,Ec(e,t,n),uc=r):Ec(e,t,n);break;default:Ec(e,t,n)}}function Oc(e){var t=e.updateQueue;if(t!==null){e.updateQueue=null;var n=e.stateNode;n===null&&(n=e.stateNode=new dc),t.forEach(function(t){var r=Hl.bind(null,e,t);n.has(t)||(n.add(t),t.then(r,r))})}}function kc(e,t){var n=t.deletions;if(n!==null)for(var i=0;ia&&(a=s),i&=~o}if(i=a,i=mt()-i,i=(120>i?120:480>i?480:1080>i?1080:1920>i?1920:3e3>i?3e3:4320>i?4320:1960*Lc(i/1960))-i,10e?16:e,ol===null)var i=!1;else{if(e=ol,ol=null,sl=0,$&6)throw Error(r(331));var a=$;for($|=4,Q=e.current;Q!==null;){var o=Q,s=o.child;if(Q.flags&16){var c=o.deletions;if(c!==null){for(var l=0;lmt()-$c?Tl(e,0):Xc|=n),hl(e,t)}function Bl(e,t){t===0&&(e.mode&1?(t=Dt,Dt<<=1,!(Dt&130023424)&&(Dt=4194304)):t=1);var n=fl();e=qa(e,t),e!==null&&(Pt(e,t,n),hl(e,n))}function Vl(e){var t=e.memoizedState,n=0;t!==null&&(n=t.retryLane),Bl(e,n)}function Hl(e,t){var n=0;switch(e.tag){case 13:var i=e.stateNode,a=e.memoizedState;a!==null&&(n=a.retryLane);break;case 19:i=e.stateNode;break;default:throw Error(r(314))}i!==null&&i.delete(t),Bl(e,n)}var Ul=function(e,t,n){if(e!==null)if(e.memoizedProps!==t.pendingProps||Vi.current)Ms=!0;else{if((e.lanes&n)===0&&!(t.flags&128))return Ms=!1,tc(e,t,n);Ms=!!(e.flags&131072)}else Ms=!1,_a&&t.flags&1048576&&fa(t,aa,t.index);switch(t.lanes=0,t.tag){case 2:var i=t.type;$s(e,t),e=t.pendingProps;var a=Ui(t,Bi.current);Ha(t,n),a=ko(null,t,i,e,a,n);var o=Ao();return t.flags|=1,typeof a==`object`&&a&&typeof a.render==`function`&&a.$$typeof===void 0?(t.tag=1,t.memoizedState=null,t.updateQueue=null,Wi(i)?(o=!0,Ji(t)):o=!1,t.memoizedState=a.state!==null&&a.state!==void 0?a.state:null,Ya(t),a.updater=_s,t.stateNode=a,a._reactInternals=t,xs(t,i,e,n),t=Vs(null,t,i,!0,o,n)):(t.tag=0,_a&&o&&pa(t),Ns(null,t,a,n),t=t.child),t;case 16:i=t.elementType;a:{switch($s(e,t),e=t.pendingProps,a=i._init,i=a(i._payload),t.type=i,a=t.tag=Jl(i),e=hs(i,e),a){case 0:t=zs(null,t,i,e,n);break a;case 1:t=Bs(null,t,i,e,n);break a;case 11:t=Ps(null,t,i,e,n);break a;case 14:t=Fs(null,t,i,hs(i.type,e),n);break a}throw Error(r(306,i,``))}return t;case 0:return i=t.type,a=t.pendingProps,a=t.elementType===i?a:hs(i,a),zs(e,t,i,a,n);case 1:return i=t.type,a=t.pendingProps,a=t.elementType===i?a:hs(i,a),Bs(e,t,i,a,n);case 3:a:{if(Hs(t),e===null)throw Error(r(387));i=t.pendingProps,o=t.memoizedState,a=o.element,Xa(e,t),to(t,i,null,n);var s=t.memoizedState;if(i=s.element,o.isDehydrated)if(o={element:i,isDehydrated:!1,cache:s.cache,pendingSuspenseBoundaries:s.pendingSuspenseBoundaries,transitions:s.transitions},t.updateQueue.baseState=o,t.memoizedState=o,t.flags&256){a=Ss(Error(r(423)),t),t=Us(e,t,i,n,a);break a}else if(i!==a){a=Ss(Error(r(424)),t),t=Us(e,t,i,n,a);break a}else for(ga=xi(t.stateNode.containerInfo.firstChild),ha=t,_a=!0,va=null,n=Pa(t,null,i,n),t.child=n;n;)n.flags=n.flags&-3|4096,n=n.sibling;else{if(Ea(),i===a){t=ec(e,t,n);break a}Ns(e,t,i,n)}t=t.child}return t;case 5:return uo(t),e===null&&Sa(t),i=t.type,a=t.pendingProps,o=e===null?null:e.memoizedProps,s=a.children,mi(i,a)?s=null:o!==null&&mi(i,o)&&(t.flags|=32),Rs(e,t),Ns(e,t,s,n),t.child;case 6:return e===null&&Sa(t),null;case 13:return Ks(e,t,n);case 4:return co(t,t.stateNode.containerInfo),i=t.pendingProps,e===null?t.child=Na(t,null,i,n):Ns(e,t,i,n),t.child;case 11:return i=t.type,a=t.pendingProps,a=t.elementType===i?a:hs(i,a),Ps(e,t,i,a,n);case 7:return Ns(e,t,t.pendingProps,n),t.child;case 8:return Ns(e,t,t.pendingProps.children,n),t.child;case 12:return Ns(e,t,t.pendingProps.children,n),t.child;case 10:a:{if(i=t.type._context,a=t.pendingProps,o=t.memoizedProps,s=a.value,Ri(Fa,i._currentValue),i._currentValue=s,o!==null)if(Z(o.value,s)){if(o.children===a.children&&!Vi.current){t=ec(e,t,n);break a}}else for(o=t.child,o!==null&&(o.return=t);o!==null;){var c=o.dependencies;if(c!==null){s=o.child;for(var l=c.firstContext;l!==null;){if(l.context===i){if(o.tag===1){l=Za(-1,n&-n),l.tag=2;var u=o.updateQueue;if(u!==null){u=u.shared;var d=u.pending;d===null?l.next=l:(l.next=d.next,d.next=l),u.pending=l}}o.lanes|=n,l=o.alternate,l!==null&&(l.lanes|=n),Va(o.return,n,t),c.lanes|=n;break}l=l.next}}else if(o.tag===10)s=o.type===t.type?null:o.child;else if(o.tag===18){if(s=o.return,s===null)throw Error(r(341));s.lanes|=n,c=s.alternate,c!==null&&(c.lanes|=n),Va(s,n,t),s=o.sibling}else s=o.child;if(s!==null)s.return=o;else for(s=o;s!==null;){if(s===t){s=null;break}if(o=s.sibling,o!==null){o.return=s.return,s=o;break}s=s.return}o=s}Ns(e,t,a.children,n),t=t.child}return t;case 9:return a=t.type,i=t.pendingProps.children,Ha(t,n),a=Ua(a),i=i(a),t.flags|=1,Ns(e,t,i,n),t.child;case 14:return i=t.type,a=hs(i,t.pendingProps),a=hs(i.type,a),Fs(e,t,i,a,n);case 15:return Is(e,t,t.type,t.pendingProps,n);case 17:return i=t.type,a=t.pendingProps,a=t.elementType===i?a:hs(i,a),$s(e,t),t.tag=1,Wi(i)?(e=!0,Ji(t)):e=!1,Ha(t,n),ys(t,i,a),xs(t,i,a,n),Vs(null,t,i,!0,e,n);case 19:return Qs(e,t,n);case 22:return Ls(e,t,n)}throw Error(r(156,t.tag))};function Wl(e,t){return ut(e,t)}function Gl(e,t,n,r){this.tag=e,this.key=n,this.sibling=this.child=this.return=this.stateNode=this.type=this.elementType=null,this.index=0,this.ref=null,this.pendingProps=t,this.dependencies=this.memoizedState=this.updateQueue=this.memoizedProps=null,this.mode=r,this.subtreeFlags=this.flags=0,this.deletions=null,this.childLanes=this.lanes=0,this.alternate=null}function Kl(e,t,n,r){return new Gl(e,t,n,r)}function ql(e){return e=e.prototype,!(!e||!e.isReactComponent)}function Jl(e){if(typeof e==`function`)return+!!ql(e);if(e!=null){if(e=e.$$typeof,e===j)return 11;if(e===P)return 14}return 2}function Yl(e,t){var n=e.alternate;return n===null?(n=Kl(e.tag,t,e.key,e.mode),n.elementType=e.elementType,n.type=e.type,n.stateNode=e.stateNode,n.alternate=e,e.alternate=n):(n.pendingProps=t,n.type=e.type,n.flags=0,n.subtreeFlags=0,n.deletions=null),n.flags=e.flags&14680064,n.childLanes=e.childLanes,n.lanes=e.lanes,n.child=e.child,n.memoizedProps=e.memoizedProps,n.memoizedState=e.memoizedState,n.updateQueue=e.updateQueue,t=e.dependencies,n.dependencies=t===null?null:{lanes:t.lanes,firstContext:t.firstContext},n.sibling=e.sibling,n.index=e.index,n.ref=e.ref,n}function Xl(e,t,n,i,a,o){var s=2;if(i=e,typeof e==`function`)ql(e)&&(s=1);else if(typeof e==`string`)s=5;else a:switch(e){case E:return Zl(n.children,a,o,t);case D:s=8,a|=8;break;case O:return e=Kl(12,n,t,a|2),e.elementType=O,e.lanes=o,e;case M:return e=Kl(13,n,t,a),e.elementType=M,e.lanes=o,e;case N:return e=Kl(19,n,t,a),e.elementType=N,e.lanes=o,e;case ee:return Ql(n,a,o,t);default:if(typeof e==`object`&&e)switch(e.$$typeof){case k:s=10;break a;case A:s=9;break a;case j:s=11;break a;case P:s=14;break a;case F:s=16,i=null;break a}throw Error(r(130,e==null?e:typeof e,``))}return t=Kl(s,n,t,a),t.elementType=e,t.type=i,t.lanes=o,t}function Zl(e,t,n,r){return e=Kl(7,e,r,t),e.lanes=n,e}function Ql(e,t,n,r){return e=Kl(22,e,r,t),e.elementType=ee,e.lanes=n,e.stateNode={isHidden:!1},e}function $l(e,t,n){return e=Kl(6,e,null,t),e.lanes=n,e}function eu(e,t,n){return t=Kl(4,e.children===null?[]:e.children,e.key,t),t.lanes=n,t.stateNode={containerInfo:e.containerInfo,pendingChildren:null,implementation:e.implementation},t}function tu(e,t,n,r,i){this.tag=t,this.containerInfo=e,this.finishedWork=this.pingCache=this.current=this.pendingChildren=null,this.timeoutHandle=-1,this.callbackNode=this.pendingContext=this.context=null,this.callbackPriority=0,this.eventTimes=Nt(0),this.expirationTimes=Nt(-1),this.entangledLanes=this.finishedLanes=this.mutableReadLanes=this.expiredLanes=this.pingedLanes=this.suspendedLanes=this.pendingLanes=0,this.entanglements=Nt(0),this.identifierPrefix=r,this.onRecoverableError=i,this.mutableSourceEagerHydrationData=null}function nu(e,t,n,r,i,a,o,s,c){return e=new tu(e,t,n,s,c),t===1?(t=1,!0===a&&(t|=8)):t=0,a=Kl(3,null,null,t),e.current=a,a.stateNode=e,a.memoizedState={element:r,isDehydrated:n,cache:null,transitions:null,pendingSuspenseBoundaries:null},Ya(a),e}function ru(e,t,n){var r=3{function n(){if(!(typeof __REACT_DEVTOOLS_GLOBAL_HOOK__>`u`||typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE!=`function`))try{__REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE(n)}catch(e){console.error(e)}}n(),t.exports=p()})),h=o((e=>{var t=m();e.createRoot=t.createRoot,e.hydrateRoot=t.hydrateRoot})),g=c(u()),_=c(h(),1),v=class extends Error{status;constructor(e,t){super(t),this.status=e}},y=`telesrv_admin_csrf`,b=`X-CSRF-Token`,x=``;function S(e){x=(e??``).trim()}function C(){if(typeof document>`u`)return``;for(let e of document.cookie.split(`;`)){let t=e.trim(),n=t.indexOf(`=`);if(!(n<=0||t.slice(0,n)!==y))try{return decodeURIComponent(t.slice(n+1))}catch{return t.slice(n+1)}}return``}function w(){return C()||x}function T(e){let t=(e??`GET`).toUpperCase();return t!==`GET`&&t!==`HEAD`&&t!==`OPTIONS`}function E(e){if(!e)return{};if(e instanceof Headers){let t={};return e.forEach((e,n)=>{t[n]=e}),t}return Array.isArray(e)?Object.fromEntries(e):{...e}}async function D(e,t={}){let n=typeof FormData<`u`&&t.body instanceof FormData?{}:{"Content-Type":`application/json`};if(Object.assign(n,E(t.headers)),T(t.method)){let e=w();e&&(n[b]=e)}let r=await fetch(e,{credentials:`same-origin`,...t,headers:n}),i=await r.text(),a=i?JSON.parse(i):null;if(!r.ok){let e=a?.error||a?.Error||a?.message||r.statusText;throw new v(r.status,e)}return a}function O(e){return e instanceof Error?e.message:String(e)}var k={session:()=>D(`/api/session`),login:async e=>{let t=await D(`/api/login`,{method:`POST`,body:JSON.stringify({secret:e})});return S(t.csrf_token),t},logout:()=>D(`/api/logout`,{method:`POST`,body:`{}`}),accounts:e=>D(`/api/accounts?${e.toString()}`),accountStats:()=>D(`/api/accounts/stats`),sharedDeviceGroups:e=>D(`/api/accounts/shared-devices?${e.toString()}`),account:e=>D(`/api/accounts/${e}`),channels:e=>D(`/api/channels?${e.toString()}`),channel:e=>D(`/api/channels/${e}`),bots:e=>D(`/api/bots?${e.toString()}`),broadcasts:e=>D(`/api/broadcasts?${e.toString()}`),bot:e=>D(`/api/bots/${e}`),collectibleUsernames:e=>D(`/api/collectible-usernames?${e.toString()}`),collectibleUsername:e=>D(`/api/collectible-usernames/${encodeURIComponent(e)}`),dashboard:()=>D(`/api/dashboard`),storageStats:()=>D(`/api/storage/stats`),storageAccounts:e=>D(`/api/storage/accounts?${e.toString()}`),verificationApplications:e=>D(`/api/verification/applications?${e.toString()}`),verificationApplication:e=>D(`/api/verification/applications/${encodeURIComponent(e)}`),verificationCounts:()=>D(`/api/verification/counts`),botVerifiers:e=>D(`/api/botverification/verifiers?${e.toString()}`),verificationIcons:e=>D(`/api/botverification/icons?${e.toString()}`),customVerifications:e=>D(`/api/botverification/marks?${e.toString()}`),customVerificationRequests:e=>D(`/api/botverification/requests?${e.toString()}`),customVerificationRequest:e=>D(`/api/botverification/requests/${encodeURIComponent(e)}`),botVerificationCounts:()=>D(`/api/botverification/counts`),emoji:e=>D(`/api/emoji?${e.toString()}`),emojiAnimation:e=>D(`/api/emoji/${encodeURIComponent(e)}/animation`),messages:e=>D(`/api/messages?${e.toString()}`),message:(e,t)=>D(`/api/messages/detail?${new URLSearchParams({owner_user_id:String(e),msg_id:String(t)}).toString()}`),groupMessages:e=>D(`/api/messages/groups?${e.toString()}`),groupMessage:(e,t)=>D(`/api/messages/groups/detail?${new URLSearchParams({channel_id:String(e),msg_id:String(t)}).toString()}`),moderationCases:e=>D(`/api/moderation/cases?${e.toString()}`),moderationCase:e=>D(`/api/moderation/cases/${e}`),moderationReport:e=>D(`/api/moderation/reports/${e}`),claimModerationCase:(e,t)=>D(`/api/moderation/cases/${e}/claim`,{method:`POST`,body:JSON.stringify({expected_version:t})}),decideModerationCase:(e,t)=>D(`/api/moderation/cases/${e}/decide`,{method:`POST`,body:JSON.stringify(t)}),reviewModerationAppeal:(e,t,n)=>D(`/api/moderation/cases/${e}/appeals/${t}/review`,{method:`POST`,body:JSON.stringify(n)}),stickerSets:e=>D(`/api/stickers?kind=${encodeURIComponent(e)}`),stickerSetDocuments:e=>D(`/api/stickers/${encodeURIComponent(e)}/documents`),stickerDocumentAnimationURL:e=>`/api/stickers/documents/${encodeURIComponent(e)}/animation`,gifCatalogDocumentPreviewURL:e=>`/api/gif-catalog/documents/${encodeURIComponent(e)}/preview`,createStickerSet:e=>D(`/api/actions/create-sticker-set`,{method:`POST`,body:e}),setAccountAvatar:e=>D(`/api/actions/set-account-avatar`,{method:`POST`,body:e}),setChannelAvatar:e=>D(`/api/actions/set-channel-avatar`,{method:`POST`,body:e}),addStickerToSet:e=>D(`/api/actions/add-sticker-to-set`,{method:`POST`,body:e}),gifCatalog:()=>D(`/api/gif-catalog`),createGifCatalogEntry:e=>D(`/api/actions/create-gif-catalog-entry`,{method:`POST`,body:e}),serverIdentity:()=>D(`/api/server/identity`),uploadServerIcon:e=>D(`/api/actions/upload-server-icon`,{method:`POST`,body:e}),serverIconURL:()=>`/api/server/icon?t=${Date.now()}`,serverEnv:()=>D(`/api/server/env`),serverStatus:()=>D(`/api/server/status`),dockerStatus:()=>D(`/api/server/docker-status`),checkServerUpdates:()=>D(`/api/server/check-updates`),action:(e,t)=>D(e,{method:`POST`,body:JSON.stringify(t)})},A=e=>e.replace(/([a-z0-9])([A-Z])/g,`$1-$2`).toLowerCase(),j=(...e)=>e.filter((e,t,n)=>!!e&&e.trim()!==``&&n.indexOf(e)===t).join(` `).trim(),M={xmlns:`http://www.w3.org/2000/svg`,width:24,height:24,viewBox:`0 0 24 24`,fill:`none`,stroke:`currentColor`,strokeWidth:2,strokeLinecap:`round`,strokeLinejoin:`round`},N=(0,g.forwardRef)(({color:e=`currentColor`,size:t=24,strokeWidth:n=2,absoluteStrokeWidth:r,className:i=``,children:a,iconNode:o,...s},c)=>(0,g.createElement)(`svg`,{ref:c,...M,width:t,height:t,stroke:e,strokeWidth:r?Number(n)*24/Number(t):n,className:j(`lucide`,i),...s},[...o.map(([e,t])=>(0,g.createElement)(e,t)),...Array.isArray(a)?a:[a]])),P=(e,t)=>{let n=(0,g.forwardRef)(({className:n,...r},i)=>(0,g.createElement)(N,{ref:i,iconNode:t,className:j(`lucide-${A(e)}`,n),...r}));return n.displayName=`${e}`,n},F=P(`BadgeCheck`,[[`path`,{d:`M3.85 8.62a4 4 0 0 1 4.78-4.77 4 4 0 0 1 6.74 0 4 4 0 0 1 4.78 4.78 4 4 0 0 1 0 6.74 4 4 0 0 1-4.77 4.78 4 4 0 0 1-6.75 0 4 4 0 0 1-4.78-4.77 4 4 0 0 1 0-6.76Z`,key:`3c2336`}],[`path`,{d:`m9 12 2 2 4-4`,key:`dzmm74`}]]),ee=P(`CircleAlert`,[[`circle`,{cx:`12`,cy:`12`,r:`10`,key:`1mglay`}],[`line`,{x1:`12`,x2:`12`,y1:`8`,y2:`12`,key:`1pkeuh`}],[`line`,{x1:`12`,x2:`12.01`,y1:`16`,y2:`16`,key:`4dfq90`}]]),I=P(`CircleCheck`,[[`circle`,{cx:`12`,cy:`12`,r:`10`,key:`1mglay`}],[`path`,{d:`m9 12 2 2 4-4`,key:`dzmm74`}]]),te=P(`CircleX`,[[`circle`,{cx:`12`,cy:`12`,r:`10`,key:`1mglay`}],[`path`,{d:`m15 9-6 6`,key:`1uzhvr`}],[`path`,{d:`m9 9 6 6`,key:`z0biqf`}]]),ne=P(`Layers`,[[`path`,{d:`M12.83 2.18a2 2 0 0 0-1.66 0L2.6 6.08a1 1 0 0 0 0 1.83l8.58 3.91a2 2 0 0 0 1.66 0l8.58-3.9a1 1 0 0 0 0-1.83z`,key:`zw3jo`}],[`path`,{d:`M2 12a1 1 0 0 0 .58.91l8.6 3.91a2 2 0 0 0 1.65 0l8.58-3.9A1 1 0 0 0 22 12`,key:`1wduqc`}],[`path`,{d:`M2 17a1 1 0 0 0 .58.91l8.6 3.91a2 2 0 0 0 1.65 0l8.58-3.9A1 1 0 0 0 22 17`,key:`kqbvx6`}]]),L=P(`LoaderCircle`,[[`path`,{d:`M21 12a9 9 0 1 1-6.219-8.56`,key:`13zald`}]]),re=P(`ShieldX`,[[`path`,{d:`M20 13c0 5-3.5 7.5-7.66 8.95a1 1 0 0 1-.67-.01C7.5 20.5 4 18 4 13V6a1 1 0 0 1 1-1c2 0 4.5-1.2 6.24-2.72a1.17 1.17 0 0 1 1.52 0C14.51 3.81 17 5 19 5a1 1 0 0 1 1 1z`,key:`oel41y`}],[`path`,{d:`m14.5 9.5-5 5`,key:`17q4r4`}],[`path`,{d:`m9.5 9.5 5 5`,key:`18nt4w`}]]),ie=P(`Sparkles`,[[`path`,{d:`M9.937 15.5A2 2 0 0 0 8.5 14.063l-6.135-1.582a.5.5 0 0 1 0-.962L8.5 9.936A2 2 0 0 0 9.937 8.5l1.582-6.135a.5.5 0 0 1 .963 0L14.063 8.5A2 2 0 0 0 15.5 9.937l6.135 1.581a.5.5 0 0 1 0 .964L15.5 14.063a2 2 0 0 0-1.437 1.437l-1.582 6.135a.5.5 0 0 1-.963 0z`,key:`4pj2yx`}],[`path`,{d:`M20 3v4`,key:`1olli1`}],[`path`,{d:`M22 5h-4`,key:`1gvqau`}],[`path`,{d:`M4 17v2`,key:`vumght`}],[`path`,{d:`M5 18H3`,key:`zchphs`}]]),ae=P(`TriangleAlert`,[[`path`,{d:`m21.73 18-8-14a2 2 0 0 0-3.48 0l-8 14A2 2 0 0 0 4 21h16a2 2 0 0 0 1.73-3`,key:`wmoenq`}],[`path`,{d:`M12 9v4`,key:`juzpu7`}],[`path`,{d:`M12 17h.01`,key:`p32p05`}]]),oe=P(`UserRound`,[[`circle`,{cx:`12`,cy:`8`,r:`5`,key:`1hypcn`}],[`path`,{d:`M20 21a8 8 0 0 0-16 0`,key:`rfgkzh`}]]),se=P(`UsersRound`,[[`path`,{d:`M18 21a8 8 0 0 0-16 0`,key:`3ypg7q`}],[`circle`,{cx:`10`,cy:`8`,r:`5`,key:`o932ke`}],[`path`,{d:`M22 20c0-3.37-2-6.5-4-8a5 5 0 0 0-.45-8.3`,key:`10s06x`}]]),ce=P(`Activity`,[[`path`,{d:`M22 12h-2.48a2 2 0 0 0-1.93 1.46l-2.35 8.36a.25.25 0 0 1-.48 0L9.24 2.18a.25.25 0 0 0-.48 0l-2.35 8.36A2 2 0 0 1 4.49 12H2`,key:`169zse`}]]),le=P(`ArrowLeftRight`,[[`path`,{d:`M8 3 4 7l4 4`,key:`9rb6wj`}],[`path`,{d:`M4 7h16`,key:`6tx8e3`}],[`path`,{d:`m16 21 4-4-4-4`,key:`siv7j2`}],[`path`,{d:`M20 17H4`,key:`h6l3hr`}]]),ue=P(`ArrowLeft`,[[`path`,{d:`m12 19-7-7 7-7`,key:`1l729n`}],[`path`,{d:`M19 12H5`,key:`x3x0zl`}]]),de=P(`AtSign`,[[`circle`,{cx:`12`,cy:`12`,r:`4`,key:`4exip2`}],[`path`,{d:`M16 8v5a3 3 0 0 0 6 0v-1a10 10 0 1 0-4 8`,key:`7n84p3`}]]),R=P(`Ban`,[[`circle`,{cx:`12`,cy:`12`,r:`10`,key:`1mglay`}],[`path`,{d:`m4.9 4.9 14.2 14.2`,key:`1m5liu`}]]),fe=P(`Bot`,[[`path`,{d:`M12 8V4H8`,key:`hb8ula`}],[`rect`,{width:`16`,height:`12`,x:`4`,y:`8`,rx:`2`,key:`enze0r`}],[`path`,{d:`M2 14h2`,key:`vft8re`}],[`path`,{d:`M20 14h2`,key:`4cs60a`}],[`path`,{d:`M15 13v2`,key:`1xurst`}],[`path`,{d:`M9 13v2`,key:`rq6x2g`}]]),pe=P(`Building2`,[[`path`,{d:`M6 22V4a2 2 0 0 1 2-2h8a2 2 0 0 1 2 2v18Z`,key:`1b4qmf`}],[`path`,{d:`M6 12H4a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h2`,key:`i71pzd`}],[`path`,{d:`M18 9h2a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2h-2`,key:`10jefs`}],[`path`,{d:`M10 6h4`,key:`1itunk`}],[`path`,{d:`M10 10h4`,key:`tcdvrf`}],[`path`,{d:`M10 14h4`,key:`kelpxr`}],[`path`,{d:`M10 18h4`,key:`1ulq68`}]]),me=P(`Cable`,[[`path`,{d:`M17 21v-2a1 1 0 0 1-1-1v-1a2 2 0 0 1 2-2h2a2 2 0 0 1 2 2v1a1 1 0 0 1-1 1`,key:`10bnsj`}],[`path`,{d:`M19 15V6.5a1 1 0 0 0-7 0v11a1 1 0 0 1-7 0V9`,key:`1eqmu1`}],[`path`,{d:`M21 21v-2h-4`,key:`14zm7j`}],[`path`,{d:`M3 5h4V3`,key:`z442eg`}],[`path`,{d:`M7 5a1 1 0 0 1 1 1v1a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V6a1 1 0 0 1 1-1V3`,key:`ebdjd7`}]]),he=P(`Check`,[[`path`,{d:`M20 6 9 17l-5-5`,key:`1gmf2c`}]]),ge=P(`ChevronDown`,[[`path`,{d:`m6 9 6 6 6-6`,key:`qrunsl`}]]),_e=P(`ChevronLeft`,[[`path`,{d:`m15 18-6-6 6-6`,key:`1wnfg3`}]]),ve=P(`ChevronRight`,[[`path`,{d:`m9 18 6-6-6-6`,key:`mthhwq`}]]),ye=P(`CircleOff`,[[`path`,{d:`m2 2 20 20`,key:`1ooewy`}],[`path`,{d:`M8.35 2.69A10 10 0 0 1 21.3 15.65`,key:`1pfsoa`}],[`path`,{d:`M19.08 19.08A10 10 0 1 1 4.92 4.92`,key:`1ablyi`}]]),be=P(`Copy`,[[`rect`,{width:`14`,height:`14`,x:`8`,y:`8`,rx:`2`,ry:`2`,key:`17jyea`}],[`path`,{d:`M4 16c-1.1 0-2-.9-2-2V4c0-1.1.9-2 2-2h10c1.1 0 2 .9 2 2`,key:`zix9uf`}]]),xe=P(`Cpu`,[[`rect`,{width:`16`,height:`16`,x:`4`,y:`4`,rx:`2`,key:`14l7u7`}],[`rect`,{width:`6`,height:`6`,x:`9`,y:`9`,rx:`1`,key:`5aljv4`}],[`path`,{d:`M15 2v2`,key:`13l42r`}],[`path`,{d:`M15 20v2`,key:`15mkzm`}],[`path`,{d:`M2 15h2`,key:`1gxd5l`}],[`path`,{d:`M2 9h2`,key:`1bbxkp`}],[`path`,{d:`M20 15h2`,key:`19e6y8`}],[`path`,{d:`M20 9h2`,key:`19tzq7`}],[`path`,{d:`M9 2v2`,key:`165o2o`}],[`path`,{d:`M9 20v2`,key:`i2bqo8`}]]),Se=P(`Database`,[[`ellipse`,{cx:`12`,cy:`5`,rx:`9`,ry:`3`,key:`msslwz`}],[`path`,{d:`M3 5V19A9 3 0 0 0 21 19V5`,key:`1wlel7`}],[`path`,{d:`M3 12A9 3 0 0 0 21 12`,key:`mv7ke4`}]]),z=P(`Download`,[[`path`,{d:`M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4`,key:`ih7n3h`}],[`polyline`,{points:`7 10 12 15 17 10`,key:`2ggqvy`}],[`line`,{x1:`12`,x2:`12`,y1:`15`,y2:`3`,key:`1vk2je`}]]),Ce=P(`ExternalLink`,[[`path`,{d:`M15 3h6v6`,key:`1q9fwt`}],[`path`,{d:`M10 14 21 3`,key:`gplh6r`}],[`path`,{d:`M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6`,key:`a6xqqp`}]]),we=P(`Eye`,[[`path`,{d:`M2.062 12.348a1 1 0 0 1 0-.696 10.75 10.75 0 0 1 19.876 0 1 1 0 0 1 0 .696 10.75 10.75 0 0 1-19.876 0`,key:`1nclc0`}],[`circle`,{cx:`12`,cy:`12`,r:`3`,key:`1v7zrd`}]]),Te=P(`FileJson`,[[`path`,{d:`M15 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V7Z`,key:`1rqfz7`}],[`path`,{d:`M14 2v4a2 2 0 0 0 2 2h4`,key:`tnqrlb`}],[`path`,{d:`M10 12a1 1 0 0 0-1 1v1a1 1 0 0 1-1 1 1 1 0 0 1 1 1v1a1 1 0 0 0 1 1`,key:`1oajmo`}],[`path`,{d:`M14 18a1 1 0 0 0 1-1v-1a1 1 0 0 1 1-1 1 1 0 0 1-1-1v-1a1 1 0 0 0-1-1`,key:`mpwhp6`}]]),Ee=P(`Film`,[[`rect`,{width:`18`,height:`18`,x:`3`,y:`3`,rx:`2`,key:`afitv7`}],[`path`,{d:`M7 3v18`,key:`bbkbws`}],[`path`,{d:`M3 7.5h4`,key:`zfgn84`}],[`path`,{d:`M3 12h18`,key:`1i2n21`}],[`path`,{d:`M3 16.5h4`,key:`1230mu`}],[`path`,{d:`M17 3v18`,key:`in4fa5`}],[`path`,{d:`M17 7.5h4`,key:`myr1c1`}],[`path`,{d:`M17 16.5h4`,key:`go4c1d`}]]),De=P(`Flag`,[[`path`,{d:`M4 15s1-1 4-1 5 2 8 2 4-1 4-1V3s-1 1-4 1-5-2-8-2-4 1-4 1z`,key:`i9b6wo`}],[`line`,{x1:`4`,x2:`4`,y1:`22`,y2:`15`,key:`1cm3nv`}]]),Oe=P(`Flame`,[[`path`,{d:`M8.5 14.5A2.5 2.5 0 0 0 11 12c0-1.38-.5-2-1-3-1.072-2.143-.224-4.054 2-6 .5 2.5 2 4.9 4 6.5 2 1.6 3 3.5 3 5.5a7 7 0 1 1-14 0c0-1.153.433-2.294 1-3a2.5 2.5 0 0 0 2.5 2.5z`,key:`96xj49`}]]),ke=P(`Handshake`,[[`path`,{d:`m11 17 2 2a1 1 0 1 0 3-3`,key:`efffak`}],[`path`,{d:`m14 14 2.5 2.5a1 1 0 1 0 3-3l-3.88-3.88a3 3 0 0 0-4.24 0l-.88.88a1 1 0 1 1-3-3l2.81-2.81a5.79 5.79 0 0 1 7.06-.87l.47.28a2 2 0 0 0 1.42.25L21 4`,key:`9pr0kb`}],[`path`,{d:`m21 3 1 11h-2`,key:`1tisrp`}],[`path`,{d:`M3 3 2 14l6.5 6.5a1 1 0 1 0 3-3`,key:`1uvwmv`}],[`path`,{d:`M3 4h8`,key:`1ep09j`}]]),Ae=P(`HardDrive`,[[`line`,{x1:`22`,x2:`2`,y1:`12`,y2:`12`,key:`1y58io`}],[`path`,{d:`M5.45 5.11 2 12v6a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2v-6l-3.45-6.89A2 2 0 0 0 16.76 4H7.24a2 2 0 0 0-1.79 1.11z`,key:`oot6mr`}],[`line`,{x1:`6`,x2:`6.01`,y1:`16`,y2:`16`,key:`sgf278`}],[`line`,{x1:`10`,x2:`10.01`,y1:`16`,y2:`16`,key:`1l4acy`}]]),je=P(`History`,[[`path`,{d:`M3 12a9 9 0 1 0 9-9 9.75 9.75 0 0 0-6.74 2.74L3 8`,key:`1357e3`}],[`path`,{d:`M3 3v5h5`,key:`1xhq8a`}],[`path`,{d:`M12 7v5l4 2`,key:`1fdv2h`}]]),Me=P(`ImageOff`,[[`line`,{x1:`2`,x2:`22`,y1:`2`,y2:`22`,key:`a6p6uj`}],[`path`,{d:`M10.41 10.41a2 2 0 1 1-2.83-2.83`,key:`1bzlo9`}],[`line`,{x1:`13.5`,x2:`6`,y1:`13.5`,y2:`21`,key:`1q0aeu`}],[`line`,{x1:`18`,x2:`21`,y1:`12`,y2:`15`,key:`5mozeu`}],[`path`,{d:`M3.59 3.59A1.99 1.99 0 0 0 3 5v14a2 2 0 0 0 2 2h14c.55 0 1.052-.22 1.41-.59`,key:`mmje98`}],[`path`,{d:`M21 15V5a2 2 0 0 0-2-2H9`,key:`43el77`}]]),Ne=P(`ImagePlus`,[[`path`,{d:`M16 5h6`,key:`1vod17`}],[`path`,{d:`M19 2v6`,key:`4bpg5p`}],[`path`,{d:`M21 11.5V19a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h7.5`,key:`1ue2ih`}],[`path`,{d:`m21 15-3.086-3.086a2 2 0 0 0-2.828 0L6 21`,key:`1xmnt7`}],[`circle`,{cx:`9`,cy:`9`,r:`2`,key:`af1f0g`}]]),Pe=P(`LayoutDashboard`,[[`rect`,{width:`7`,height:`9`,x:`3`,y:`3`,rx:`1`,key:`10lvy0`}],[`rect`,{width:`7`,height:`5`,x:`14`,y:`3`,rx:`1`,key:`16une8`}],[`rect`,{width:`7`,height:`9`,x:`14`,y:`12`,rx:`1`,key:`1hutg5`}],[`rect`,{width:`7`,height:`5`,x:`3`,y:`16`,rx:`1`,key:`ldoo1y`}]]),Fe=P(`LifeBuoy`,[[`circle`,{cx:`12`,cy:`12`,r:`10`,key:`1mglay`}],[`path`,{d:`m4.93 4.93 4.24 4.24`,key:`1ymg45`}],[`path`,{d:`m14.83 9.17 4.24-4.24`,key:`1cb5xl`}],[`path`,{d:`m14.83 14.83 4.24 4.24`,key:`q42g0n`}],[`path`,{d:`m9.17 14.83-4.24 4.24`,key:`bqpfvv`}],[`circle`,{cx:`12`,cy:`12`,r:`4`,key:`4exip2`}]]),Ie=P(`LogOut`,[[`path`,{d:`M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4`,key:`1uf3rs`}],[`polyline`,{points:`16 17 21 12 16 7`,key:`1gabdz`}],[`line`,{x1:`21`,x2:`9`,y1:`12`,y2:`12`,key:`1uyos4`}]]),Le=P(`Mail`,[[`rect`,{width:`20`,height:`16`,x:`2`,y:`4`,rx:`2`,key:`18n3k1`}],[`path`,{d:`m22 7-8.97 5.7a1.94 1.94 0 0 1-2.06 0L2 7`,key:`1ocrg3`}]]),Re=P(`Megaphone`,[[`path`,{d:`m3 11 18-5v12L3 14v-3z`,key:`n962bs`}],[`path`,{d:`M11.6 16.8a3 3 0 1 1-5.8-1.6`,key:`1yl0tm`}]]),ze=P(`MemoryStick`,[[`path`,{d:`M6 19v-3`,key:`1nvgqn`}],[`path`,{d:`M10 19v-3`,key:`iu8nkm`}],[`path`,{d:`M14 19v-3`,key:`kcehxu`}],[`path`,{d:`M18 19v-3`,key:`1vh91z`}],[`path`,{d:`M8 11V9`,key:`63erz4`}],[`path`,{d:`M16 11V9`,key:`fru6f3`}],[`path`,{d:`M12 11V9`,key:`ha00sb`}],[`path`,{d:`M2 15h20`,key:`16ne18`}],[`path`,{d:`M2 7a2 2 0 0 1 2-2h16a2 2 0 0 1 2 2v1.1a2 2 0 0 0 0 3.837V17a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2v-5.1a2 2 0 0 0 0-3.837Z`,key:`lhddv3`}]]),Be=P(`MessageSquareText`,[[`path`,{d:`M21 15a2 2 0 0 1-2 2H7l-4 4V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2z`,key:`1lielz`}],[`path`,{d:`M13 8H7`,key:`14i4kc`}],[`path`,{d:`M17 12H7`,key:`16if0g`}]]),Ve=P(`MonitorSmartphone`,[[`path`,{d:`M18 8V6a2 2 0 0 0-2-2H4a2 2 0 0 0-2 2v7a2 2 0 0 0 2 2h8`,key:`10dyio`}],[`path`,{d:`M10 19v-3.96 3.15`,key:`1irgej`}],[`path`,{d:`M7 19h5`,key:`qswx4l`}],[`rect`,{width:`6`,height:`10`,x:`16`,y:`12`,rx:`2`,key:`1egngj`}]]),He=P(`Moon`,[[`path`,{d:`M12 3a6 6 0 0 0 9 9 9 9 0 1 1-9-9Z`,key:`a7tn18`}]]),Ue=P(`Palette`,[[`circle`,{cx:`13.5`,cy:`6.5`,r:`.5`,fill:`currentColor`,key:`1okk4w`}],[`circle`,{cx:`17.5`,cy:`10.5`,r:`.5`,fill:`currentColor`,key:`f64h9f`}],[`circle`,{cx:`8.5`,cy:`7.5`,r:`.5`,fill:`currentColor`,key:`fotxhn`}],[`circle`,{cx:`6.5`,cy:`12.5`,r:`.5`,fill:`currentColor`,key:`qy21gx`}],[`path`,{d:`M12 2C6.5 2 2 6.5 2 12s4.5 10 10 10c.926 0 1.648-.746 1.648-1.688 0-.437-.18-.835-.437-1.125-.29-.289-.438-.652-.438-1.125a1.64 1.64 0 0 1 1.668-1.668h1.996c3.051 0 5.555-2.503 5.555-5.554C21.965 6.012 17.461 2 12 2z`,key:`12rzf8`}]]),We=P(`Phone`,[[`path`,{d:`M22 16.92v3a2 2 0 0 1-2.18 2 19.79 19.79 0 0 1-8.63-3.07 19.5 19.5 0 0 1-6-6 19.79 19.79 0 0 1-3.07-8.67A2 2 0 0 1 4.11 2h3a2 2 0 0 1 2 1.72 12.84 12.84 0 0 0 .7 2.81 2 2 0 0 1-.45 2.11L8.09 9.91a16 16 0 0 0 6 6l1.27-1.27a2 2 0 0 1 2.11-.45 12.84 12.84 0 0 0 2.81.7A2 2 0 0 1 22 16.92z`,key:`foiqr5`}]]),B=P(`Play`,[[`polygon`,{points:`6 3 20 12 6 21 6 3`,key:`1oa8hb`}]]),Ge=P(`Plus`,[[`path`,{d:`M5 12h14`,key:`1ays0h`}],[`path`,{d:`M12 5v14`,key:`s699le`}]]),Ke=P(`PowerOff`,[[`path`,{d:`M18.36 6.64A9 9 0 0 1 20.77 15`,key:`dxknvb`}],[`path`,{d:`M6.16 6.16a9 9 0 1 0 12.68 12.68`,key:`1x7qb5`}],[`path`,{d:`M12 2v4`,key:`3427ic`}],[`path`,{d:`m2 2 20 20`,key:`1ooewy`}]]),qe=P(`Power`,[[`path`,{d:`M12 2v10`,key:`mnfbl`}],[`path`,{d:`M18.4 6.6a9 9 0 1 1-12.77.04`,key:`obofu9`}]]),Je=P(`Radio`,[[`path`,{d:`M4.9 19.1C1 15.2 1 8.8 4.9 4.9`,key:`1vaf9d`}],[`path`,{d:`M7.8 16.2c-2.3-2.3-2.3-6.1 0-8.5`,key:`u1ii0m`}],[`circle`,{cx:`12`,cy:`12`,r:`2`,key:`1c9p78`}],[`path`,{d:`M16.2 7.8c2.3 2.3 2.3 6.1 0 8.5`,key:`1j5fej`}],[`path`,{d:`M19.1 4.9C23 8.8 23 15.1 19.1 19`,key:`10b0cb`}]]),Ye=P(`RefreshCw`,[[`path`,{d:`M3 12a9 9 0 0 1 9-9 9.75 9.75 0 0 1 6.74 2.74L21 8`,key:`v9h5vc`}],[`path`,{d:`M21 3v5h-5`,key:`1q7to0`}],[`path`,{d:`M21 12a9 9 0 0 1-9 9 9.75 9.75 0 0 1-6.74-2.74L3 16`,key:`3uifl3`}],[`path`,{d:`M8 16H3v5`,key:`1cv678`}]]),Xe=P(`ScrollText`,[[`path`,{d:`M15 12h-5`,key:`r7krc0`}],[`path`,{d:`M15 8h-5`,key:`1khuty`}],[`path`,{d:`M19 17V5a2 2 0 0 0-2-2H4`,key:`zz82l3`}],[`path`,{d:`M8 21h12a2 2 0 0 0 2-2v-1a1 1 0 0 0-1-1H11a1 1 0 0 0-1 1v1a2 2 0 1 1-4 0V5a2 2 0 1 0-4 0v2a1 1 0 0 0 1 1h3`,key:`1ph1d7`}]]),Ze=P(`Search`,[[`circle`,{cx:`11`,cy:`11`,r:`8`,key:`4ej97u`}],[`path`,{d:`m21 21-4.3-4.3`,key:`1qie3q`}]]),Qe=P(`Send`,[[`path`,{d:`M14.536 21.686a.5.5 0 0 0 .937-.024l6.5-19a.496.496 0 0 0-.635-.635l-19 6.5a.5.5 0 0 0-.024.937l7.93 3.18a2 2 0 0 1 1.112 1.11z`,key:`1ffxy3`}],[`path`,{d:`m21.854 2.147-10.94 10.939`,key:`12cjpa`}]]),$e=P(`Server`,[[`rect`,{width:`20`,height:`8`,x:`2`,y:`2`,rx:`2`,ry:`2`,key:`ngkwjq`}],[`rect`,{width:`20`,height:`8`,x:`2`,y:`14`,rx:`2`,ry:`2`,key:`iecqi9`}],[`line`,{x1:`6`,x2:`6.01`,y1:`6`,y2:`6`,key:`16zg32`}],[`line`,{x1:`6`,x2:`6.01`,y1:`18`,y2:`18`,key:`nzw8ys`}]]),V=P(`Settings2`,[[`path`,{d:`M20 7h-9`,key:`3s1dr2`}],[`path`,{d:`M14 17H5`,key:`gfn3mx`}],[`circle`,{cx:`17`,cy:`17`,r:`3`,key:`18b49y`}],[`circle`,{cx:`7`,cy:`7`,r:`3`,key:`dfmy0x`}]]),et=P(`Settings`,[[`path`,{d:`M12.22 2h-.44a2 2 0 0 0-2 2v.18a2 2 0 0 1-1 1.73l-.43.25a2 2 0 0 1-2 0l-.15-.08a2 2 0 0 0-2.73.73l-.22.38a2 2 0 0 0 .73 2.73l.15.1a2 2 0 0 1 1 1.72v.51a2 2 0 0 1-1 1.74l-.15.09a2 2 0 0 0-.73 2.73l.22.38a2 2 0 0 0 2.73.73l.15-.08a2 2 0 0 1 2 0l.43.25a2 2 0 0 1 1 1.73V20a2 2 0 0 0 2 2h.44a2 2 0 0 0 2-2v-.18a2 2 0 0 1 1-1.73l.43-.25a2 2 0 0 1 2 0l.15.08a2 2 0 0 0 2.73-.73l.22-.39a2 2 0 0 0-.73-2.73l-.15-.08a2 2 0 0 1-1-1.74v-.5a2 2 0 0 1 1-1.74l.15-.09a2 2 0 0 0 .73-2.73l-.22-.38a2 2 0 0 0-2.73-.73l-.15.08a2 2 0 0 1-2 0l-.43-.25a2 2 0 0 1-1-1.73V4a2 2 0 0 0-2-2z`,key:`1qme2f`}],[`circle`,{cx:`12`,cy:`12`,r:`3`,key:`1v7zrd`}]]),tt=P(`ShieldAlert`,[[`path`,{d:`M20 13c0 5-3.5 7.5-7.66 8.95a1 1 0 0 1-.67-.01C7.5 20.5 4 18 4 13V6a1 1 0 0 1 1-1c2 0 4.5-1.2 6.24-2.72a1.17 1.17 0 0 1 1.52 0C14.51 3.81 17 5 19 5a1 1 0 0 1 1 1z`,key:`oel41y`}],[`path`,{d:`M12 8v4`,key:`1got3b`}],[`path`,{d:`M12 16h.01`,key:`1drbdi`}]]),nt=P(`ShieldCheck`,[[`path`,{d:`M20 13c0 5-3.5 7.5-7.66 8.95a1 1 0 0 1-.67-.01C7.5 20.5 4 18 4 13V6a1 1 0 0 1 1-1c2 0 4.5-1.2 6.24-2.72a1.17 1.17 0 0 1 1.52 0C14.51 3.81 17 5 19 5a1 1 0 0 1 1 1z`,key:`oel41y`}],[`path`,{d:`m9 12 2 2 4-4`,key:`dzmm74`}]]),rt=P(`ShieldOff`,[[`path`,{d:`m2 2 20 20`,key:`1ooewy`}],[`path`,{d:`M5 5a1 1 0 0 0-1 1v7c0 5 3.5 7.5 7.67 8.94a1 1 0 0 0 .67.01c2.35-.82 4.48-1.97 5.9-3.71`,key:`1jlk70`}],[`path`,{d:`M9.309 3.652A12.252 12.252 0 0 0 11.24 2.28a1.17 1.17 0 0 1 1.52 0C14.51 3.81 17 5 19 5a1 1 0 0 1 1 1v7a9.784 9.784 0 0 1-.08 1.264`,key:`18rp1v`}]]),it=P(`Smartphone`,[[`rect`,{width:`14`,height:`20`,x:`5`,y:`2`,rx:`2`,ry:`2`,key:`1yt0o3`}],[`path`,{d:`M12 18h.01`,key:`mhygvu`}]]),at=P(`Smile`,[[`circle`,{cx:`12`,cy:`12`,r:`10`,key:`1mglay`}],[`path`,{d:`M8 14s1.5 2 4 2 4-2 4-2`,key:`1y1vjs`}],[`line`,{x1:`9`,x2:`9.01`,y1:`9`,y2:`9`,key:`yxxnd0`}],[`line`,{x1:`15`,x2:`15.01`,y1:`9`,y2:`9`,key:`1p4y9e`}]]),ot=P(`Stamp`,[[`path`,{d:`M5 22h14`,key:`ehvnwv`}],[`path`,{d:`M19.27 13.73A2.5 2.5 0 0 0 17.5 13h-11A2.5 2.5 0 0 0 4 15.5V17a1 1 0 0 0 1 1h14a1 1 0 0 0 1-1v-1.5c0-.66-.26-1.3-.73-1.77Z`,key:`1sy9ra`}],[`path`,{d:`M14 13V8.5C14 7 15 7 15 5a3 3 0 0 0-3-3c-1.66 0-3 1-3 3s1 2 1 3.5V13`,key:`cnxgux`}]]),st=P(`Sticker`,[[`path`,{d:`M15.5 3H5a2 2 0 0 0-2 2v14c0 1.1.9 2 2 2h14a2 2 0 0 0 2-2V8.5L15.5 3Z`,key:`1wis1t`}],[`path`,{d:`M14 3v4a2 2 0 0 0 2 2h4`,key:`36rjfy`}],[`path`,{d:`M8 13h.01`,key:`1sbv64`}],[`path`,{d:`M16 13h.01`,key:`wip0gl`}],[`path`,{d:`M10 16s.8 1 2 1c1.3 0 2-1 2-1`,key:`1vvgv3`}]]),ct=P(`Sun`,[[`circle`,{cx:`12`,cy:`12`,r:`4`,key:`4exip2`}],[`path`,{d:`M12 2v2`,key:`tus03m`}],[`path`,{d:`M12 20v2`,key:`1lh1kg`}],[`path`,{d:`m4.93 4.93 1.41 1.41`,key:`149t6j`}],[`path`,{d:`m17.66 17.66 1.41 1.41`,key:`ptbguv`}],[`path`,{d:`M2 12h2`,key:`1t8f8n`}],[`path`,{d:`M20 12h2`,key:`1q8mjw`}],[`path`,{d:`m6.34 17.66-1.41 1.41`,key:`1m8zz5`}],[`path`,{d:`m19.07 4.93-1.41 1.41`,key:`1shlcs`}]]),lt=P(`Trash2`,[[`path`,{d:`M3 6h18`,key:`d0wm0j`}],[`path`,{d:`M19 6v14c0 1-1 2-2 2H7c-1 0-2-1-2-2V6`,key:`4alrt4`}],[`path`,{d:`M8 6V4c0-1 1-2 2-2h4c1 0 2 1 2 2v2`,key:`v07s0e`}],[`line`,{x1:`10`,x2:`10`,y1:`11`,y2:`17`,key:`1uufr5`}],[`line`,{x1:`14`,x2:`14`,y1:`11`,y2:`17`,key:`xtxkd`}]]),ut=P(`Undo2`,[[`path`,{d:`M9 14 4 9l5-5`,key:`102s5s`}],[`path`,{d:`M4 9h10.5a5.5 5.5 0 0 1 5.5 5.5a5.5 5.5 0 0 1-5.5 5.5H11`,key:`f3b9sd`}]]),dt=P(`Upload`,[[`path`,{d:`M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4`,key:`ih7n3h`}],[`polyline`,{points:`17 8 12 3 7 8`,key:`t8dd8p`}],[`line`,{x1:`12`,x2:`12`,y1:`3`,y2:`15`,key:`widbto`}]]),ft=P(`User`,[[`path`,{d:`M19 21v-2a4 4 0 0 0-4-4H9a4 4 0 0 0-4 4v2`,key:`975kel`}],[`circle`,{cx:`12`,cy:`7`,r:`4`,key:`17ys0d`}]]),pt=P(`Users`,[[`path`,{d:`M16 21v-2a4 4 0 0 0-4-4H6a4 4 0 0 0-4 4v2`,key:`1yyitq`}],[`circle`,{cx:`9`,cy:`7`,r:`4`,key:`nufk8`}],[`path`,{d:`M22 21v-2a4 4 0 0 0-3-3.87`,key:`kshegd`}],[`path`,{d:`M16 3.13a4 4 0 0 1 0 7.75`,key:`1da9ce`}]]),mt=P(`Vault`,[[`rect`,{width:`18`,height:`18`,x:`3`,y:`3`,rx:`2`,key:`afitv7`}],[`circle`,{cx:`7.5`,cy:`7.5`,r:`.5`,fill:`currentColor`,key:`kqv944`}],[`path`,{d:`m7.9 7.9 2.7 2.7`,key:`hpeyl3`}],[`circle`,{cx:`16.5`,cy:`7.5`,r:`.5`,fill:`currentColor`,key:`w0ekpg`}],[`path`,{d:`m13.4 10.6 2.7-2.7`,key:`264c1n`}],[`circle`,{cx:`7.5`,cy:`16.5`,r:`.5`,fill:`currentColor`,key:`nkw3mc`}],[`path`,{d:`m7.9 16.1 2.7-2.7`,key:`p81g5e`}],[`circle`,{cx:`16.5`,cy:`16.5`,r:`.5`,fill:`currentColor`,key:`fubopw`}],[`path`,{d:`m13.4 13.4 2.7 2.7`,key:`abhel3`}],[`circle`,{cx:`12`,cy:`12`,r:`2`,key:`1c9p78`}]]),ht=P(`X`,[[`path`,{d:`M18 6 6 18`,key:`1bl5f8`}],[`path`,{d:`m6 6 12 12`,key:`d8bk6v`}]]);function gt(e){let t=e.trim();return!t||t.startsWith(`+`)?t:/^\d+$/.test(t)?`+${t}`:t}function H(e){let t=e.trim();return t?t.startsWith(`@`)?t:`@${t}`:``}function _t(e){return`${e.FirstName||``} ${e.LastName||``}`.trim()||`-`}function vt(e){return e.Broadcast&&!e.Megagroup?`Channel`:e.Megagroup&&e.Forum?`Supergroup / Forum`:e.Megagroup?`Supergroup`:`Channel / Group`}function U(e){if(!e||e.startsWith(`0001-`))return``;let t=new Date(e);return Number.isNaN(t.getTime())?``:t.toLocaleString()}function yt(e){if(!e||e<=0)return``;let t=new Date(e*1e3);return Number.isNaN(t.getTime())?``:t.toLocaleString()}function bt(e){let t=(e??``).trim();if(!/^https?:\/\//i.test(t))return``;try{let e=new URL(t);return e.protocol!==`http:`&&e.protocol!==`https:`?``:e.href}catch{return``}}function xt(e){if(!e.trim())return 0;let t=Number.parseInt(e,10);return Number.isFinite(t)?t:0}function St(e){let t=(e??``).trim();if(!t)return`0`;let n=Number(t);return Number.isFinite(n)?n.toLocaleString():t}var Ct={XTR:0,TON:9,USD:2,EUR:2,RUB:2};function wt(e){let t=(e??``).trim().toUpperCase();return t in Ct?Ct[t]:2}function Tt(e,t){let n=(e??``).trim();if(!n)return`0`;if(!/^-?\d+$/.test(n))return n;let r=wt(t),i=n.startsWith(`-`),a=(i?n.slice(1):n).replace(/^0+(?=\d)/,``).padStart(r+1,`0`),o=a.slice(0,a.length-r)||`0`,s=r>0?a.slice(a.length-r):``;r>2&&(s=s.replace(/0+$/,``));let c=i?`-`:``;return s?`${c}${Et(o)}.${s}`:`${c}${Et(o)}`}function Et(e){return e.replace(/\B(?=(\d{3})+(?!\d))/g,` `)}function Dt(e,t){let n=(t??``).trim().toUpperCase(),r=Tt(e,n);return n?`${r} ${n}`:r}function Ot(e,t){let n=(e??``).trim().replace(/\s+/g,``).replace(`,`,`.`);if(!n)return`0`;if(!/^\d*(\.\d*)?$/.test(n)||n===`.`)return null;let r=wt(t),[i,a=``]=n.split(`.`);if(a.length>r)return null;let o=`${i||`0`}${a.padEnd(r,`0`)}`.replace(/^0+(?=\d)/,``);return o===``?`0`:o}function kt(e){let t=(e??``).trim();if(!t||!/^\d+$/.test(t))return`0 B`;let n=Number(t);if(!Number.isFinite(n))return`${t} B`;let r=[`B`,`KB`,`MB`,`GB`,`TB`,`PB`],i=n,a=0;for(;i>=1024&&ae.trim()).filter(Boolean).map(e=>Number.parseInt(e,10));if(n.length===0||n.some(e=>!Number.isFinite(e)||e<=0))throw Error(t);return n}var jt=o((e=>{var t=u(),n=Symbol.for(`react.element`),r=Symbol.for(`react.fragment`),i=Object.prototype.hasOwnProperty,a=t.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner,o={key:!0,ref:!0,__self:!0,__source:!0};function s(e,t,r){var s,c={},l=null,u=null;for(s in r!==void 0&&(l=``+r),t.key!==void 0&&(l=``+t.key),t.ref!==void 0&&(u=t.ref),t)i.call(t,s)&&!o.hasOwnProperty(s)&&(c[s]=t[s]);if(e&&e.defaultProps)for(s in t=e.defaultProps,t)c[s]===void 0&&(c[s]=t[s]);return{$$typeof:n,type:e,key:l,ref:u,props:c,_owner:a.current}}e.Fragment=r,e.jsx=s,e.jsxs=s})),W=o(((e,t)=>{t.exports=jt()}))();function Mt({title:e,eyebrow:t,children:n,actions:r}){return(0,W.jsxs)(`div`,{className:`page-frame`,children:[(0,W.jsxs)(`div`,{className:`page-title-row`,children:[(0,W.jsxs)(`div`,{children:[t&&(0,W.jsx)(`div`,{className:`eyebrow`,children:t}),(0,W.jsx)(`h2`,{children:e})]}),r&&(0,W.jsx)(`div`,{className:`page-actions`,children:r})]}),n]})}function Nt({children:e}){return(0,W.jsx)(`div`,{className:`query-panel`,children:e})}function Pt({main:e,side:t}){return(0,W.jsxs)(`div`,{className:`split-layout`,children:[(0,W.jsx)(`div`,{className:`split-main`,children:e}),(0,W.jsx)(`aside`,{className:`split-side`,children:t})]})}function G({title:e,text:t,action:n}){return(0,W.jsxs)(`div`,{className:`section-head`,children:[(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`h2`,{children:e}),t&&(0,W.jsx)(`p`,{children:t})]}),n&&(0,W.jsx)(`div`,{className:`section-action`,children:n})]})}function K({children:e}){return(0,W.jsxs)(`div`,{className:`alert`,children:[(0,W.jsx)(ee,{size:16}),` `,(0,W.jsx)(`span`,{children:e})]})}function q({children:e,tone:t=`neutral`}){return(0,W.jsx)(`span`,{className:`badge ${t}`,children:e})}function J({label:e,value:t,tone:n=`neutral`,mono:r=!1}){return(0,W.jsxs)(`div`,{className:`metric ${n}`,children:[(0,W.jsx)(`span`,{children:e}),(0,W.jsx)(`strong`,{className:r?`mono`:``,children:t})]})}function Y({label:e,value:t,mono:n=!1}){return(0,W.jsxs)(`div`,{className:`summary-item`,children:[(0,W.jsx)(`span`,{children:e}),(0,W.jsx)(`strong`,{className:n?`mono`:``,children:t})]})}function Ft({rows:e}){return(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{children:`ID`}),(0,W.jsx)(`th`,{children:`Command ID`}),(0,W.jsx)(`th`,{children:`Action`}),(0,W.jsx)(`th`,{children:`Actor`}),(0,W.jsx)(`th`,{children:`Status`}),(0,W.jsx)(`th`,{children:`Dry-run`}),(0,W.jsx)(`th`,{children:`Reason`}),(0,W.jsx)(`th`,{children:`Time`})]})}),(0,W.jsxs)(`tbody`,{children:[e.map(e=>(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`td`,{children:e.ID}),(0,W.jsx)(`td`,{className:`mono`,children:e.CommandID}),(0,W.jsx)(`td`,{children:e.Action}),(0,W.jsx)(`td`,{children:e.Actor}),(0,W.jsx)(`td`,{children:e.Status}),(0,W.jsx)(`td`,{children:e.DryRun?`Yes`:`No`}),(0,W.jsx)(`td`,{className:`truncate`,children:e.Reason}),(0,W.jsx)(`td`,{children:U(e.CreatedAt)})]},e.ID)),e.length===0&&(0,W.jsx)(It,{colSpan:8})]})]})})}function It({colSpan:e}){return(0,W.jsx)(`tr`,{children:(0,W.jsx)(`td`,{colSpan:e,className:`empty-cell`,children:`No results`})})}function Lt({label:e}){return(0,W.jsx)(`section`,{className:`surface`,children:(0,W.jsx)(`div`,{className:`loading-line`,children:e})})}function Rt({value:e}){return(0,W.jsx)(`pre`,{className:`json-block`,children:e||`{}`})}function zt({username:e,collectibles:t}){let n=H(e??``),r=t??[];return r.length===0?(0,W.jsx)(W.Fragment,{children:n||`-`}):(0,W.jsxs)(W.Fragment,{children:[n,(0,W.jsx)(`ul`,{className:`username-branch`,children:r.map(e=>(0,W.jsxs)(`li`,{className:e.Active?``:`inactive`,children:[(0,W.jsx)(`span`,{children:H(e.Username)}),!e.Active&&(0,W.jsx)(`em`,{children:`inactive`})]},e.Username))})]})}var Bt=`verification.review`,Vt=`botverification.review`,Ht=`botverification.manage`,Ut=`server.manage`,Wt=(0,g.createContext)({permissions:[],hideThirdPartyVerification:!0});function Gt({permissions:e,hideThirdPartyVerification:t=!0,children:n}){let r=(0,g.useMemo)(()=>({permissions:e,hideThirdPartyVerification:t}),[e,t]);return(0,W.jsx)(Wt.Provider,{value:r,children:n})}function Kt(){let{permissions:e}=(0,g.useContext)(Wt);return(0,g.useMemo)(()=>({permissions:e,can:t=>e.includes(`*`)||e.includes(t)}),[e])}function qt(e){return Kt().can(e)}function Jt(){return(0,g.useContext)(Wt).hideThirdPartyVerification}function Yt({permission:e,children:t}){let{can:n}=Kt();return n(e)?(0,W.jsx)(W.Fragment,{children:t}):(0,W.jsx)(Xt,{permission:e})}function Xt({permission:e}){return(0,W.jsxs)(Mt,{title:`Not enough rights`,eyebrow:`Console / Access`,children:[(0,W.jsx)(K,{children:`This session was not granted the ${e} permission, so the section stays closed.`}),(0,W.jsx)(`section`,{className:`section-block`,children:(0,W.jsx)(`div`,{className:`entity-head`,children:(0,W.jsxs)(`div`,{children:[(0,W.jsxs)(`div`,{className:`entity-title`,children:[(0,W.jsx)(rt,{size:16}),` `,`Section unavailable`]}),(0,W.jsx)(`div`,{className:`entity-subtitle`,children:`Ask an operator to add the permission to TELESRV_ADMIN_UI_PERMISSIONS and sign in again.`})]})})})]})}function Zt({children:e}){return Jt()?(0,W.jsxs)(Mt,{title:`Feature hidden`,eyebrow:`Console / Third-party marks`,children:[(0,W.jsx)(K,{children:`Third-party bot verification is hidden on this server (TELESRV_HIDE_THIRD_PARTY_VERIFICATION=true).`}),(0,W.jsx)(`section`,{className:`section-block`,children:(0,W.jsx)(`div`,{className:`entity-head`,children:(0,W.jsxs)(`div`,{children:[(0,W.jsxs)(`div`,{className:`entity-title`,children:[(0,W.jsx)(rt,{size:16}),` `,`Not fully finished`]}),(0,W.jsx)(`div`,{className:`entity-subtitle`,children:`This feature may cause unstable server behavior and is hidden by default. Set TELESRV_HIDE_THIRD_PARTY_VERIFICATION=false to re-enable it.`})]})})})]}):(0,W.jsx)(W.Fragment,{children:e})}function Qt(){return{href:`${window.location.pathname}${window.location.search}`,path:window.location.pathname,search:new URLSearchParams(window.location.search)}}function $t(e){return e.startsWith(`/bot-verification`)?`Third-party verification`:e.startsWith(`/verification`)?`Official Verification`:e.startsWith(`/collectible-usernames`)?`Collectible Usernames`:e.startsWith(`/storage`)?`Storage`:e.startsWith(`/accounts/shared-devices`)?`Shared Devices`:e.startsWith(`/accounts`)?`Accounts`:e.startsWith(`/channels`)?`Supergroups and Channels`:e.startsWith(`/bots`)?`Bots`:e.startsWith(`/moderation`)?`Reports and Moderation`:e.startsWith(`/broadcasts`)?`Broadcasts`:e.startsWith(`/emoji`)?`Emoji`:e.startsWith(`/messages`)?`Message Audit`:e.startsWith(`/stickers`)?`Stickers`:e.startsWith(`/gif-catalog`)?`GIFs`:e.startsWith(`/server-settings`)?`Server Settings`:`Operations Console`}var en=`telesrv.admin.theme`,tn=(0,g.createContext)(null);function nn(e){document.documentElement.setAttribute(`data-theme`,e),document.documentElement.style.colorScheme=e}function rn({children:e}){let[t,n]=(0,g.useState)(()=>sn());(0,g.useEffect)(()=>{nn(t);try{localStorage.setItem(en,t)}catch{}},[t]),(0,g.useEffect)(()=>{if(!window.matchMedia)return;let e=window.matchMedia(`(prefers-color-scheme: dark)`),t=e=>{let t=null;try{t=localStorage.getItem(en)}catch{t=null}t!==`light`&&t!==`dark`&&n(e.matches?`dark`:`light`)};return e.addEventListener(`change`,t),()=>e.removeEventListener(`change`,t)},[]);let r=(0,g.useCallback)(e=>n(e),[]),i=(0,g.useCallback)(()=>n(e=>e===`dark`?`light`:`dark`),[]),a=(0,g.useMemo)(()=>({theme:t,setTheme:r,toggleTheme:i}),[t,r,i]);return(0,W.jsx)(tn.Provider,{value:a,children:e})}function an(){let e=(0,g.useContext)(tn);if(!e)throw Error(`useTheme must be used inside ThemeProvider`);return e}function on(){let{theme:e,toggleTheme:t}=an(),n=e===`light`?`Switch to dark theme`:`Switch to light theme`;return(0,W.jsx)(`button`,{className:`theme-toggle`,type:`button`,onClick:t,"aria-label":n,title:n,children:e===`dark`?(0,W.jsx)(ct,{size:16}):(0,W.jsx)(He,{size:16})})}function sn(){try{let e=localStorage.getItem(en);if(e===`light`||e===`dark`)return e}catch{}try{if(window.matchMedia&&window.matchMedia(`(prefers-color-scheme: dark)`).matches)return`dark`}catch{}return`light`}function cn({href:e,navigate:t,className:n,children:r}){return(0,W.jsx)(`a`,{className:n,href:e,onClick:n=>{n.preventDefault(),t(e)},children:r})}function ln(){return(0,W.jsxs)(`div`,{className:`boot-screen`,children:[(0,W.jsxs)(`div`,{className:`brand compact brand-elevated`,children:[(0,W.jsx)(`span`,{className:`brand-mark`,children:(0,W.jsx)(`img`,{src:`/logo.png`,alt:`OwpenGram`})}),(0,W.jsxs)(`span`,{children:[(0,W.jsx)(`strong`,{children:`OwpenGram`}),(0,W.jsx)(`small`,{children:`Admin Console`})]})]}),(0,W.jsx)(`div`,{className:`loader-bar`})]})}function un({actor:e,build:t,route:n,navigate:r,onLogout:i,children:a}){let o=qt(Bt),s=qt(Vt),c=qt(Ut),[l,u]=(0,g.useState)(null);(0,g.useEffect)(()=>{c&&k.serverIdentity().then(e=>u({name:e.name,iconExt:e.icon_ext})).catch(()=>void 0)},[c]);let[d,f]=(0,g.useState)(!1),p=l?.name?.trim()||`OwpenGram`,m=l?.iconExt&&!d?k.serverIconURL():`/logo.png`;(0,g.useEffect)(()=>{document.title=`${p} Admin`},[p]),(0,g.useEffect)(()=>{let e=document.querySelector(`link[rel='icon']`);e||(e=document.createElement(`link`),e.rel=`icon`,document.head.appendChild(e)),e.href=l?.iconExt&&!d?k.serverIconURL():`/logo.png`},[l?.iconExt,d]);let h=Jt(),_=n.path.startsWith(`/messages`),[v,y]=(0,g.useState)(_);(0,g.useEffect)(()=>{_&&y(!0)},[_]);async function b(){await k.logout().catch(()=>void 0),i()}return(0,W.jsxs)(`div`,{className:`shell`,children:[(0,W.jsxs)(`aside`,{className:`sidebar`,children:[(0,W.jsxs)(cn,{className:`brand`,href:`/`,navigate:r,children:[(0,W.jsx)(`span`,{className:`brand-mark`,children:(0,W.jsx)(`img`,{src:m,alt:p,onError:()=>f(!0)})}),(0,W.jsxs)(`span`,{children:[(0,W.jsx)(`strong`,{children:p}),(0,W.jsx)(`small`,{children:`Admin Console`})]})]}),(0,W.jsx)(`div`,{className:`sidebar-label`,children:`Navigation`}),(0,W.jsxs)(`nav`,{className:`nav-list`,"aria-label":`Primary navigation`,children:[(0,W.jsx)(dn,{icon:(0,W.jsx)(Pe,{size:16}),href:`/`,route:n,navigate:r,children:`Overview`}),(0,W.jsx)(dn,{icon:(0,W.jsx)(pt,{size:16}),href:`/accounts`,route:n,navigate:r,children:`Accounts`}),(0,W.jsx)(dn,{icon:(0,W.jsx)(nt,{size:16}),href:`/channels`,route:n,navigate:r,children:`Supergroups / Channels`}),(0,W.jsx)(dn,{icon:(0,W.jsx)(fe,{size:16}),href:`/bots`,route:n,navigate:r,children:`Bots`}),(0,W.jsx)(dn,{icon:(0,W.jsx)(tt,{size:16}),href:`/moderation`,route:n,navigate:r,children:`Reports / Moderation`}),(0,W.jsx)(dn,{icon:(0,W.jsx)(Re,{size:16}),href:`/broadcasts`,route:n,navigate:r,children:`Broadcasts`}),o&&(0,W.jsx)(dn,{icon:(0,W.jsx)(F,{size:16}),href:`/verification`,route:n,navigate:r,children:`Verification`}),s&&!h&&(0,W.jsx)(dn,{icon:(0,W.jsx)(ot,{size:16}),href:`/bot-verification`,route:n,navigate:r,children:`Third-party marks`}),(0,W.jsx)(dn,{icon:(0,W.jsx)(de,{size:16}),href:`/collectible-usernames`,route:n,navigate:r,children:`NFT Usernames`}),(0,W.jsx)(dn,{icon:(0,W.jsx)(Se,{size:16}),href:`/storage`,route:n,navigate:r,children:`Storage`}),(0,W.jsx)(dn,{icon:(0,W.jsx)(st,{size:16}),href:`/stickers`,route:n,navigate:r,children:`Stickers`}),(0,W.jsx)(dn,{icon:(0,W.jsx)(at,{size:16}),href:`/emoji`,route:n,navigate:r,children:`Emoji`}),(0,W.jsx)(dn,{icon:(0,W.jsx)(Ee,{size:16}),href:`/gif-catalog`,route:n,navigate:r,children:`GIFs`}),(0,W.jsxs)(`div`,{className:`nav-section ${_?`active`:``} ${v?`open`:``}`,children:[(0,W.jsxs)(`button`,{className:`nav-section-toggle`,type:`button`,"aria-expanded":v,onClick:()=>y(e=>!e),children:[(0,W.jsx)(Be,{size:16}),(0,W.jsx)(`span`,{children:`Messages`}),(0,W.jsx)(ge,{className:`nav-section-chevron`,size:15})]}),v&&(0,W.jsxs)(`div`,{className:`nav-children`,children:[(0,W.jsx)(dn,{href:`/messages/private`,route:n,navigate:r,activeWhen:e=>e===`/messages`||e===`/messages/detail`||e.startsWith(`/messages/private`),children:`Private`}),(0,W.jsx)(dn,{href:`/messages/groups`,route:n,navigate:r,activeWhen:e=>e.startsWith(`/messages/groups`),children:`Groups`})]})]}),c&&(0,W.jsx)(dn,{icon:(0,W.jsx)(et,{size:16}),href:`/server-settings`,route:n,navigate:r,children:`Server Settings`})]}),(0,W.jsxs)(`div`,{className:`sidebar-status`,children:[(0,W.jsx)(`span`,{className:`sidebar-label`,children:`Version: O7`}),t?.short_commit&&(0,W.jsx)(`span`,{className:`sidebar-label sidebar-build`,title:t.commit+(t.dirty?` (uncommitted changes)`:``),children:`Build: ${t.short_commit}${t.dirty?`+`:``}`})]})]}),(0,W.jsxs)(`div`,{className:`workspace`,children:[(0,W.jsxs)(`header`,{className:`topbar`,children:[(0,W.jsx)(`div`,{children:(0,W.jsx)(`h1`,{children:$t(n.path)})}),(0,W.jsxs)(`div`,{className:`topbar-actions`,children:[(0,W.jsx)(on,{}),(0,W.jsx)(`span`,{className:`actor-pill`,children:`Actor: ${e}`}),(0,W.jsxs)(`button`,{className:`btn ghost icon-text`,type:`button`,onClick:b,title:`Log out`,children:[(0,W.jsx)(Ie,{size:16}),` `,`Log out`]})]})]}),(0,W.jsx)(`main`,{className:`content`,children:a})]})]})}function dn({href:e,route:t,navigate:n,icon:r,children:i,activeWhen:a}){return(0,W.jsxs)(cn,{className:`nav-item ${(a?a(t.path):e===`/`?t.path===`/`:t.path.startsWith(e))?`active`:``}`,href:e,navigate:n,children:[r??(0,W.jsx)(`span`,{"aria-hidden":`true`,className:`nav-dot`}),(0,W.jsx)(`span`,{children:i})]})}function fn({onLogin:e}){let[t,n]=(0,g.useState)(``),[r,i]=(0,g.useState)(``),[a,o]=(0,g.useState)(!1);async function s(n){n.preventDefault(),o(!0),i(``);try{let n=await k.login(t);e({actor:n.actor,permissions:n.permissions??[]})}catch(e){i(O(e))}finally{o(!1)}}return(0,W.jsxs)(`main`,{className:`login-page`,children:[(0,W.jsxs)(`div`,{className:`bg-orbs`,"aria-hidden":`true`,children:[(0,W.jsx)(`div`,{className:`bg-orb bg-orb--1`}),(0,W.jsx)(`div`,{className:`bg-orb bg-orb--2`}),(0,W.jsx)(`div`,{className:`bg-orb bg-orb--3`})]}),(0,W.jsxs)(`section`,{className:`login-panel`,children:[(0,W.jsxs)(`div`,{className:`login-head`,children:[(0,W.jsxs)(`div`,{className:`brand brand-elevated`,children:[(0,W.jsx)(`span`,{className:`brand-mark`,children:(0,W.jsx)(`img`,{src:`/logo.png`,alt:`OwpenGram`})}),(0,W.jsxs)(`span`,{children:[(0,W.jsx)(`strong`,{children:`OwpenGram`}),(0,W.jsx)(`small`,{children:`Admin Console`})]})]}),(0,W.jsxs)(`div`,{className:`login-head-actions`,children:[(0,W.jsx)(on,{}),(0,W.jsx)(`span`,{className:`login-chip`,children:`Local access`})]})]}),(0,W.jsxs)(`div`,{className:`login-copy`,children:[(0,W.jsx)(`h1`,{children:`Operations Admin`}),(0,W.jsx)(`p`,{children:`Enter credentials to open the console.`})]}),r&&(0,W.jsx)(K,{children:r}),(0,W.jsxs)(`form`,{className:`form-stack`,onSubmit:s,children:[(0,W.jsxs)(`label`,{children:[(0,W.jsx)(`span`,{children:`Admin password or token`}),(0,W.jsx)(`input`,{autoFocus:!0,type:`password`,value:t,autoComplete:`current-password`,onChange:e=>n(e.target.value)})]}),(0,W.jsx)(`button`,{className:`btn primary full`,type:`submit`,disabled:a,children:a?`Logging in`:`Log in`})]})]})]})}var pn=m();function mn({kind:e,id:t,onClose:n,onDone:r}){let[i,a]=(0,g.useState)(null),[o,s]=(0,g.useState)(``),[c,l]=(0,g.useState)(``),[u,d]=(0,g.useState)(!1),[f,p]=(0,g.useState)(``);(0,g.useEffect)(()=>{if(!i){s(``);return}let e=URL.createObjectURL(i);return s(e),()=>URL.revokeObjectURL(e)},[i]);async function m(){if(!i){p(`Choose an image file first.`);return}if(!c.trim()){p(`Please enter an operation reason`);return}d(!0),p(``);try{let a=e===`channel`?`channel_id`:`user_id`,o=new FormData;o.set(`metadata`,JSON.stringify({command_id:``,reason:c.trim(),confirm:!0,[a]:t})),o.set(`file`,i,i.name);let s=e===`channel`?await k.setChannelAvatar(o):await k.setAccountAvatar(o);if(s.error){p(s.error);return}r(),n()}catch(e){p(O(e))}finally{d(!1)}}return(0,pn.createPortal)((0,W.jsx)(`div`,{className:`modal-backdrop`,role:`presentation`,children:(0,W.jsxs)(`section`,{className:`modal command-modal`,role:`dialog`,"aria-modal":`true`,"aria-label":`Change avatar`,children:[(0,W.jsxs)(`div`,{className:`modal-head`,children:[(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`div`,{className:`eyebrow`,children:e===`channel`?`Channel`:`Account`}),(0,W.jsx)(`h2`,{children:`Change avatar`})]}),(0,W.jsx)(`button`,{className:`icon-btn`,type:`button`,onClick:n,disabled:u,"aria-label":`Close`,children:(0,W.jsx)(ht,{size:15})})]}),(0,W.jsxs)(`div`,{className:`command-body`,children:[(0,W.jsxs)(`label`,{className:`gift-file-picker ${i?`has-file`:``}`,children:[(0,W.jsx)(`input`,{type:`file`,accept:`image/png,image/jpeg,image/webp`,onChange:e=>a(e.target.files?.[0]??null)}),o?(0,W.jsx)(`img`,{className:`gift-file-icon`,src:o,alt:``,style:{objectFit:`cover`}}):(0,W.jsx)(Ne,{size:22}),(0,W.jsxs)(`span`,{className:`gift-file-copy`,children:[(0,W.jsx)(`span`,{className:`gift-field-label`,children:`New avatar`}),(0,W.jsx)(`strong`,{children:i?i.name:`Choose a JPEG, PNG, or WebP image`})]}),(0,W.jsx)(`span`,{className:`gift-file-action`,children:i?`Change file`:`Choose file`})]}),(0,W.jsxs)(`label`,{className:`gift-reason-field`,children:[(0,W.jsx)(`span`,{children:`Audit reason`}),(0,W.jsx)(`input`,{value:c,placeholder:`Briefly describe why this avatar is being changed`,onChange:e=>l(e.target.value)})]}),f&&(0,W.jsx)(K,{children:f})]}),(0,W.jsxs)(`div`,{className:`modal-actions`,children:[(0,W.jsx)(`button`,{className:`btn`,type:`button`,onClick:n,disabled:u,children:`Close`}),(0,W.jsxs)(`button`,{className:`btn primary`,type:`button`,onClick:m,disabled:u,children:[u?(0,W.jsx)(L,{className:`spin`,size:15}):(0,W.jsx)(dt,{size:15}),`Upload avatar`]})]})]})}),document.body)}function X({label:e,path:t,payload:n,icon:r,compact:i=!1,tone:a=`danger`,disabled:o=!1,onDone:s,onError:c,secretField:l}){let[u,d]=(0,g.useState)(!1),[f,p]=(0,g.useState)(``),[m,h]=(0,g.useState)(null),[_,v]=(0,g.useState)(``),[y,b]=(0,g.useState)(!1),[x,S]=(0,g.useState)(!1);function C(){p(``),h(null),v(``),S(!1)}async function w(e){if(!f.trim()){v(`Please enter an operation reason`);return}b(!0),v(``);try{let r={...n(),reason:f,confirm:e};h(await k.action(t,r)),e&&s?.()}catch(e){v(c?.(e)||O(e))}finally{b(!1)}}let T=m?.dry_run&&!m.error,E=`btn ${a===`danger`?`danger`:a===`warn`?`warn`:a===`primary`?`primary`:``} ${i?`compact-btn`:``}`,D=(0,g.useMemo)(()=>{try{return n()}catch(e){return{payload_error:O(e)}}},[u,n]),A=l&&m?.details&&typeof m.details[l]==`string`?m.details[l]:``,j=A&&m?.details?Object.fromEntries(Object.entries(m.details).filter(([e])=>e!==l)):m?.details;async function M(){await navigator.clipboard.writeText(A),S(!0)}return(0,W.jsxs)(W.Fragment,{children:[(0,W.jsxs)(`button`,{className:E,type:`button`,disabled:o,onClick:()=>{C(),d(!0)},children:[r,e]}),u&&(0,pn.createPortal)((0,W.jsx)(`div`,{className:`modal-backdrop`,role:`presentation`,children:(0,W.jsxs)(`section`,{className:`modal command-modal`,role:`dialog`,"aria-modal":`true`,"aria-label":e,children:[(0,W.jsxs)(`div`,{className:`modal-head`,children:[(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`div`,{className:`eyebrow`,children:`Action Flow`}),(0,W.jsx)(`h2`,{children:e})]}),(0,W.jsx)(`button`,{className:`icon-btn`,type:`button`,onClick:()=>d(!1),"aria-label":`Close`,children:(0,W.jsx)(ht,{size:15})})]}),(0,W.jsxs)(`div`,{className:`command-body`,children:[(0,W.jsxs)(`div`,{className:`command-steps`,children:[(0,W.jsxs)(`div`,{className:`command-step ${f.trim()?`done`:`active`}`,children:[(0,W.jsx)(`span`,{children:`1`}),(0,W.jsx)(`strong`,{children:`Enter reason`})]}),(0,W.jsxs)(`div`,{className:`command-step ${m?.dry_run?`done`:f.trim()?`active`:``}`,children:[(0,W.jsx)(`span`,{children:`2`}),(0,W.jsx)(`strong`,{children:`Dry-run check`})]}),(0,W.jsxs)(`div`,{className:`command-step ${m&&!m.dry_run&&!m.error?`done`:T?`active`:``}`,children:[(0,W.jsx)(`span`,{children:`3`}),(0,W.jsx)(`strong`,{children:`Confirm execution`})]})]}),(0,W.jsxs)(`label`,{className:`form-field`,children:[(0,W.jsx)(`span`,{children:`Operation reason`}),(0,W.jsx)(`textarea`,{value:f,onChange:e=>p(e.target.value),rows:3,placeholder:`Describe why this operation is being performed`})]}),(0,W.jsxs)(`div`,{className:`command-preview`,children:[(0,W.jsxs)(`div`,{className:`preview-head`,children:[(0,W.jsx)(Te,{size:14}),` `,`Request preview`]}),(0,W.jsx)(Rt,{value:JSON.stringify(D,null,2)})]}),_&&(0,W.jsx)(K,{children:_}),m&&(0,W.jsxs)(`div`,{className:`result-box`,children:[(0,W.jsxs)(`div`,{className:`result-title`,children:[m.error?(0,W.jsx)(ee,{size:16}):(0,W.jsx)(I,{size:16}),(0,W.jsx)(`strong`,{children:m.message||m.error||`Action result`})]}),(0,W.jsxs)(`div`,{className:`result-line`,children:[(0,W.jsx)(`span`,{children:`Command ID`}),(0,W.jsx)(`strong`,{children:m.command_id})]}),(0,W.jsxs)(`div`,{className:`result-line`,children:[(0,W.jsx)(`span`,{children:`Status`}),(0,W.jsx)(`strong`,{children:m.status})]}),(0,W.jsxs)(`div`,{className:`result-line`,children:[(0,W.jsx)(`span`,{children:`Dry-run`}),(0,W.jsx)(`strong`,{children:m.dry_run?`Yes`:`No`})]}),(0,W.jsx)(`div`,{className:`result-message`,children:m.message||m.error}),A&&(0,W.jsxs)(`div`,{className:`secret-reveal`,children:[(0,W.jsx)(`div`,{className:`secret-reveal-label`,children:`One-time secret — copy it now, it won't be shown again`}),(0,W.jsxs)(`div`,{className:`secret-reveal-row`,children:[(0,W.jsx)(`code`,{className:`secret-reveal-value`,children:`•`.repeat(Math.min(A.length,40))}),(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>void M(),children:[x?(0,W.jsx)(he,{size:15}):(0,W.jsx)(be,{size:15}),x?`Copied`:`Copy`]})]})]}),j&&Object.keys(j).length>0&&(0,W.jsx)(Rt,{value:JSON.stringify(j,null,2)})]})]}),(0,W.jsxs)(`div`,{className:`modal-actions`,children:[(0,W.jsx)(`button`,{className:`btn`,type:`button`,onClick:()=>d(!1),children:`Close`}),(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>w(!1),disabled:y,children:[y?(0,W.jsx)(L,{size:15,className:`spin`}):(0,W.jsx)(B,{size:15}),m?`Run dry-run again`:`Run dry-run first`]}),(0,W.jsxs)(`button`,{className:`btn danger icon-text`,type:`button`,onClick:()=>w(!0),disabled:y||!T,children:[(0,W.jsx)(I,{size:15}),`Confirm execution`]})]})]})}),document.body)]})}var hn=[[`#FF885E`,`#FF516A`],[`#FFCD6A`,`#FFA85C`],[`#82B1FF`,`#665FFF`],[`#A0DE7E`,`#54CB68`],[`#53EDD6`,`#28C9B7`],[`#72D5FD`,`#2A9EF1`],[`#E0A2F3`,`#D669ED`]];function gn(e){return hn[Math.abs(e)%hn.length]}function _n(e){let t=Array.from(e);return t.length>0?t[0]:``}function vn(e,t,n){let r=`${e} ${t}`.trim().split(/\s+/).filter(Boolean),i=r.length>0?r:n?[n]:[];if(i.length===0)return`T`;let a=_n(i[0]);return i.length>1&&(a+=_n(i[i.length-1])),a.toUpperCase()}function yn({id:e,kind:t=`user`,firstName:n=``,lastName:r=``,username:i=``,title:a=``,size:o=34,refreshKey:s}){let[c,l]=(0,g.useState)(!1);if((0,g.useEffect)(()=>{l(!1)},[e,t,s]),c){let[s,c]=gn(e);return(0,W.jsx)(`div`,{className:`avatar-fallback`,style:{width:o,height:o,background:`linear-gradient(135deg, ${s}, ${c})`,fontSize:Math.round(o*.42)},children:t===`channel`?vn(a,``,i):vn(n,r,i)})}return(0,W.jsx)(`img`,{className:`avatar-photo-img`,src:`${t===`channel`?`/api/channels/${e}/avatar`:`/api/accounts/${e}/avatar`}${s===void 0?``:`?v=${encodeURIComponent(String(s))}`}`,alt:``,loading:`lazy`,style:{width:o,height:o},onError:()=>l(!0)})}function bn({rows:e,userID:t,onDone:n}){let[r,i]=(0,g.useState)(()=>new Set);(0,g.useEffect)(()=>{i(new Set)},[t]);let a=(0,g.useMemo)(()=>e.filter(e=>!r.has(e.Hash)),[e,r]);function o(e){i(t=>e(t)),n()}return(0,W.jsxs)(`div`,{className:`authorization-block`,children:[(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table authorization-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{children:`Device`}),(0,W.jsx)(`th`,{children:`Platform`}),(0,W.jsx)(`th`,{children:`IP`}),(0,W.jsx)(`th`,{children:`Last active`}),(0,W.jsx)(`th`,{className:`device-actions-head`,children:`Actions`})]})}),(0,W.jsxs)(`tbody`,{children:[a.map(n=>(0,W.jsxs)(`tr`,{children:[(0,W.jsxs)(`td`,{className:`device-text`,children:[n.DeviceModel,` `,n.SystemVersion]}),(0,W.jsxs)(`td`,{className:`device-text`,children:[n.Platform,` `,n.AppVersion]}),(0,W.jsx)(`td`,{children:n.IP}),(0,W.jsx)(`td`,{children:U(n.ActiveAt)}),(0,W.jsx)(`td`,{className:`device-actions-cell`,children:(0,W.jsxs)(`div`,{className:`device-actions`,children:[(0,W.jsx)(X,{label:`Revoke current`,icon:(0,W.jsx)(Ie,{size:13}),compact:!0,path:`/api/actions/revoke-sessions`,payload:()=>({user_id:t,hash:n.Hash}),onDone:()=>o(e=>new Set([...e,n.Hash]))}),(0,W.jsx)(X,{label:`Keep current`,icon:(0,W.jsx)(nt,{size:13}),compact:!0,path:`/api/actions/revoke-sessions`,payload:()=>({user_id:t,keep_hash:n.Hash}),onDone:()=>o(()=>new Set(e.filter(e=>e.Hash!==n.Hash).map(e=>e.Hash)))})]})})]},n.Hash)),a.length===0&&(0,W.jsx)(It,{colSpan:5})]})]})}),(0,W.jsx)(`div`,{className:`danger-zone`,children:(0,W.jsx)(X,{label:`Revoke all devices`,icon:(0,W.jsx)(me,{size:15}),path:`/api/actions/revoke-sessions`,payload:()=>({user_id:t,revoke_all:!0}),onDone:()=>o(()=>new Set(e.map(e=>e.Hash)))})})]})}function xn({scam:e,fake:t}){return!e&&!t?null:(0,W.jsxs)(W.Fragment,{children:[e&&(0,W.jsx)(q,{tone:`danger`,children:`SCAM`}),t&&(0,W.jsx)(q,{tone:`danger`,children:`FAKE`})]})}function Sn({idKey:e,id:t,path:n,scam:r,fake:i,onDone:a}){return(0,W.jsxs)(`div`,{className:`action-stack`,children:[(0,W.jsx)(X,{label:r?`Clear SCAM`:`Mark as SCAM`,icon:(0,W.jsx)(tt,{size:15}),tone:`danger`,path:n,payload:()=>({[e]:t,scam:!r,fake:r?i:!1}),onDone:a}),(0,W.jsx)(X,{label:i?`Clear FAKE`:`Mark as FAKE`,icon:(0,W.jsx)(re,{size:15}),tone:`danger`,path:n,payload:()=>({[e]:t,fake:!i,scam:i?r:!1}),onDone:a})]})}function Cn({id:e,support:t,onDone:n}){return(0,W.jsx)(X,{label:t?`Clear support`:`Mark as support`,icon:(0,W.jsx)(Fe,{size:15}),tone:`neutral`,path:`/api/actions/set-support`,payload:()=>({user_id:e,support:!t}),onDone:n})}function wn({idKey:e,id:t,path:n,current:r,onDone:i}){let[a,o]=(0,g.useState)(r.replace(/^@/,``));return(0,W.jsxs)(`div`,{className:`attr-block`,children:[(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Username`}),(0,W.jsx)(`input`,{value:a,onChange:e=>o(e.target.value),placeholder:`username`})]}),(0,W.jsx)(X,{label:`Set username`,icon:(0,W.jsx)(de,{size:15}),tone:`neutral`,path:n,payload:()=>({[e]:t,username:a.trim().replace(/^@/,``)}),onDone:i})]})}function Tn({id:e,path:t,currentFirstName:n,currentLastName:r,onDone:i}){let[a,o]=(0,g.useState)(n),[s,c]=(0,g.useState)(r);return(0,W.jsxs)(`div`,{className:`attr-block`,children:[(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`First name`}),(0,W.jsx)(`input`,{value:a,onChange:e=>o(e.target.value),placeholder:`First name`})]}),(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Last name`}),(0,W.jsx)(`input`,{value:s,onChange:e=>c(e.target.value),placeholder:`Last name`})]}),(0,W.jsx)(X,{label:`Set name`,icon:(0,W.jsx)(oe,{size:15}),tone:`neutral`,path:t,payload:()=>({user_id:e,first_name:a.trim(),last_name:s.trim()}),onDone:i})]})}function En({id:e,path:t,current:n,onDone:r}){let[i,a]=(0,g.useState)(n);return(0,W.jsxs)(`div`,{className:`attr-block`,children:[(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Phone number`}),(0,W.jsx)(`input`,{value:i,onChange:e=>a(e.target.value),placeholder:`15551234567`})]}),(0,W.jsx)(X,{label:`Set phone`,icon:(0,W.jsx)(We,{size:15}),tone:`warn`,path:t,payload:()=>({user_id:e,phone:i.trim()}),onDone:r})]})}function Dn({id:e,path:t,current:n,onDone:r}){let[i,a]=(0,g.useState)(n);return(0,W.jsxs)(`div`,{className:`attr-block`,children:[(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Login email`}),(0,W.jsx)(`input`,{value:i,onChange:e=>a(e.target.value),placeholder:`name@example.com (empty clears it)`,type:`email`})]}),(0,W.jsx)(X,{label:i.trim()?`Set login email`:`Clear login email`,icon:(0,W.jsx)(Le,{size:15}),tone:`warn`,path:t,payload:()=>({user_id:e,email:i.trim()}),onDone:r})]})}function On({idKey:e,id:t,path:n,onDone:r}){let[i,a]=(0,g.useState)(!1),[o,s]=(0,g.useState)(!0),[c,l]=(0,g.useState)(`0`),[u,d]=(0,g.useState)(``);return(0,W.jsxs)(`div`,{className:`attr-block`,children:[(0,W.jsxs)(`label`,{className:`checkline`,children:[(0,W.jsx)(`input`,{type:`checkbox`,checked:i,onChange:e=>a(e.target.checked)}),` `,`Profile color`]}),(0,W.jsxs)(`label`,{className:`checkline`,children:[(0,W.jsx)(`input`,{type:`checkbox`,checked:o,onChange:e=>s(e.target.checked)}),` `,`Enable color`]}),(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Color index`}),(0,W.jsx)(`input`,{type:`number`,min:`0`,max:`20`,value:c,onChange:e=>l(e.target.value)})]}),(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Background emoji ID`}),(0,W.jsx)(`input`,{value:u,onChange:e=>d(e.target.value),placeholder:`0`})]}),(0,W.jsx)(X,{label:`Set color`,icon:(0,W.jsx)(Ue,{size:15}),tone:`neutral`,path:n,payload:()=>({[e]:t,for_profile:i,has_color:o,color:xt(c),background_emoji_id:u.trim()||`0`}),onDone:r})]})}function kn({idKey:e,id:t,path:n,onDone:r}){let[i,a]=(0,g.useState)(``),[o,s]=(0,g.useState)(`0`);return(0,W.jsxs)(`div`,{className:`attr-block`,children:[(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Emoji document ID`}),(0,W.jsx)(`input`,{value:i,onChange:e=>a(e.target.value),placeholder:`0 = clear`})]}),(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Until (unix, 0 = permanent)`}),(0,W.jsx)(`input`,{type:`number`,min:`0`,value:o,onChange:e=>s(e.target.value)})]}),(0,W.jsx)(X,{label:`Set emoji status`,icon:(0,W.jsx)(at,{size:15}),tone:`neutral`,path:n,payload:()=>({[e]:t,document_id:i.trim()||`0`,until:xt(o)}),onDone:r})]})}function An({channel:e,onDone:t}){let[n,r]=(0,g.useState)(e.Gigagroup),[i,a]=(0,g.useState)(e.AntiSpam),[o,s]=(0,g.useState)(e.ParticipantsHidden),[c,l]=(0,g.useState)(e.NoForwards),[u,d]=(0,g.useState)(e.JoinToSend),[f,p]=(0,g.useState)(e.JoinRequest),[m,h]=(0,g.useState)(String(e.SlowmodeSeconds));(0,g.useEffect)(()=>{r(e.Gigagroup),a(e.AntiSpam),s(e.ParticipantsHidden),l(e.NoForwards),d(e.JoinToSend),p(e.JoinRequest),h(String(e.SlowmodeSeconds))},[e]);function _(){let t={channel_id:e.ID};return n!==e.Gigagroup&&(t.gigagroup=n),i!==e.AntiSpam&&(t.antispam=i),o!==e.ParticipantsHidden&&(t.participants_hidden=o),c!==e.NoForwards&&(t.noforwards=c),u!==e.JoinToSend&&(t.join_to_send=u),f!==e.JoinRequest&&(t.join_request=f),xt(m)!==e.SlowmodeSeconds&&(t.slowmode_seconds=xt(m)),t}return(0,W.jsxs)(`div`,{className:`attr-block`,children:[(0,W.jsxs)(`label`,{className:`checkline`,children:[(0,W.jsx)(`input`,{type:`checkbox`,checked:n,onChange:e=>r(e.target.checked)}),` `,`Gigagroup`]}),(0,W.jsxs)(`label`,{className:`checkline`,children:[(0,W.jsx)(`input`,{type:`checkbox`,checked:i,onChange:e=>a(e.target.checked)}),` `,`Aggressive anti-spam`]}),(0,W.jsxs)(`label`,{className:`checkline`,children:[(0,W.jsx)(`input`,{type:`checkbox`,checked:o,onChange:e=>s(e.target.checked)}),` `,`Hide members`]}),(0,W.jsxs)(`label`,{className:`checkline`,children:[(0,W.jsx)(`input`,{type:`checkbox`,checked:c,onChange:e=>l(e.target.checked)}),` `,`Restrict forwarding`]}),(0,W.jsxs)(`label`,{className:`checkline`,children:[(0,W.jsx)(`input`,{type:`checkbox`,checked:u,onChange:e=>d(e.target.checked)}),` `,`Join to send messages`]}),(0,W.jsxs)(`label`,{className:`checkline`,children:[(0,W.jsx)(`input`,{type:`checkbox`,checked:f,onChange:e=>p(e.target.checked)}),` `,`Join by request`]}),(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Slowmode (seconds)`}),(0,W.jsx)(`input`,{type:`number`,min:`0`,max:`86400`,value:m,onChange:e=>h(e.target.value)})]}),(0,W.jsx)(X,{label:`Apply settings`,icon:(0,W.jsx)(V,{size:15}),tone:`warn`,path:`/api/actions/set-channel-settings`,payload:_,onDone:t})]})}function jn({id:e,navigate:t}){let[n,r]=(0,g.useState)(null),[i,a]=(0,g.useState)(``),[o,s]=(0,g.useState)(!1),[c,l]=(0,g.useState)(`profile`),[u,d]=(0,g.useState)(`1`),[f,p]=(0,g.useState)(()=>Mn(new Date(Date.now()+7*864e5))),[m,h]=(0,g.useState)(``),[_,v]=(0,g.useState)(!1),[y,b]=(0,g.useState)(0);async function x(){s(!0),a(``);try{let t=await k.account(e);r(t),t.Restriction.Frozen&&(t.Restriction.Until&&p(Mn(new Date(t.Restriction.Until))),h(t.Restriction.AppealURL||``))}catch(e){a(O(e))}finally{s(!1)}}if((0,g.useEffect)(()=>{x(),l(`profile`)},[e]),i)return(0,W.jsx)(K,{children:i});if(!n)return(0,W.jsx)(Lt,{label:o?`Loading account detail`:`Waiting for data`});let S=n.Account,C=[{key:`profile`,label:`Profile & Status`,icon:(0,W.jsx)(oe,{size:15})},{key:`devices`,label:`Authorized Devices`,icon:(0,W.jsx)(Ve,{size:15})},{key:`actions`,label:`Actions & Management`,icon:(0,W.jsx)(V,{size:15})}];return(0,W.jsxs)(Mt,{title:`Account #${S.ID}`,eyebrow:`Account Profile`,actions:(0,W.jsxs)(`button`,{className:`btn icon-text`,onClick:()=>t(`/accounts`),children:[(0,W.jsx)(ue,{size:15}),` `,`Back to list`]}),children:[(0,W.jsxs)(`section`,{className:`entity-head`,children:[(0,W.jsxs)(`div`,{className:`entity-head-main`,children:[(0,W.jsxs)(`div`,{className:`avatar-edit-slot`,children:[(0,W.jsx)(yn,{id:S.ID,firstName:S.FirstName,lastName:S.LastName,username:S.Username,size:64,refreshKey:y||void 0}),(0,W.jsx)(`button`,{className:`icon-btn avatar-edit-btn`,type:`button`,"aria-label":`Change avatar`,title:`Change avatar`,onClick:()=>v(!0),children:(0,W.jsx)(Ne,{size:13})})]}),(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`div`,{className:`entity-title`,children:_t(S)}),(0,W.jsxs)(`div`,{className:`entity-subtitle`,children:[H(S.Username)||`No username`,` · `,gt(S.Phone)||`No phone`]}),S.Collectibles?.length>0&&(0,W.jsx)(`div`,{className:`entity-subtitle`,children:(0,W.jsx)(zt,{username:``,collectibles:S.Collectibles})})]})]}),(0,W.jsxs)(`div`,{className:`entity-badges`,children:[S.PremiumUntil>0?(0,W.jsx)(q,{tone:`good`,children:`Premium`}):(0,W.jsx)(q,{children:`Not premium`}),n.Verified?(0,W.jsx)(q,{tone:`good`,children:`Verified`}):(0,W.jsx)(q,{children:`Not verified`}),(0,W.jsx)(xn,{scam:n.Scam,fake:n.Fake}),S.Frozen?(0,W.jsx)(q,{tone:`danger`,children:`Account frozen`}):(0,W.jsx)(q,{children:`Account active`})]})]}),(0,W.jsx)(`div`,{className:`toolbar`,role:`group`,"aria-label":`Account sections`,children:C.map(e=>(0,W.jsxs)(`button`,{className:`btn icon-text ${c===e.key?`primary`:``}`,type:`button`,"aria-pressed":c===e.key,onClick:()=>l(e.key),children:[e.icon,` `,e.label]},e.key))}),c===`profile`&&(0,W.jsxs)(`div`,{className:`stacked-sections`,children:[(0,W.jsxs)(`div`,{className:`summary-grid`,children:[(0,W.jsx)(Y,{label:`User ID`,value:String(S.ID),mono:!0}),(0,W.jsx)(Y,{label:`Last active`,value:yt(n.LastSeenAt)||`-`}),(0,W.jsx)(Y,{label:`Premium expires`,value:S.PremiumUntil>0?yt(S.PremiumUntil):`None`}),(0,W.jsx)(Y,{label:`Updated`,value:U(S.UpdatedAt)||`-`}),(0,W.jsx)(Y,{label:`Authorized devices`,value:String(n.Authorizations.length)}),(0,W.jsx)(Y,{label:`Account flags`,value:`support=${n.Support} bot=${n.Bot}`}),(0,W.jsx)(Y,{label:`Restriction`,value:n.HasRestriction?n.Restriction.Reason||`Restricted`:`None`}),(0,W.jsx)(Y,{label:`Frozen since`,value:n.Restriction.Since?U(n.Restriction.Since):`None`}),(0,W.jsx)(Y,{label:`Appeal deadline`,value:n.Restriction.Until?U(n.Restriction.Until):`None`}),(0,W.jsx)(Y,{label:`Appeal URL`,value:n.Restriction.AppealURL||`None`}),(0,W.jsx)(Y,{label:`Created`,value:U(S.CreatedAt)||`-`})]}),n.About&&(0,W.jsx)(`p`,{className:`about-text`,children:n.About})]}),c===`devices`&&(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Authorized Devices`,text:`${n.Authorizations.length} authorizations`}),(0,W.jsx)(bn,{rows:n.Authorizations,userID:S.ID,onDone:x})]}),c===`actions`&&(0,W.jsxs)(`div`,{className:`stacked-sections`,children:[(0,W.jsxs)(`div`,{className:`action-groups`,children:[(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Freeze & Restriction`,text:`Blocks sign-in and marks the account for appeal review.`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsxs)(`div`,{className:`attr-block`,children:[(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Appeal deadline`}),(0,W.jsx)(`input`,{"aria-label":`Freeze appeal deadline`,value:f,onChange:e=>p(e.target.value),type:`datetime-local`})]}),(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Appeal URL`}),(0,W.jsx)(`input`,{"aria-label":`Freeze appeal URL`,value:m,onChange:e=>h(e.target.value),type:`url`,placeholder:`https://...`})]}),(0,W.jsx)(X,{label:S.Frozen?`Update freeze`:`Freeze account`,icon:(0,W.jsx)(ee,{size:15}),tone:`danger`,path:`/api/actions/set-frozen`,payload:()=>({user_id:S.ID,frozen:!0,freeze_until:new Date(f).toISOString(),freeze_appeal_url:m.trim()}),onDone:x}),S.Frozen&&(0,W.jsx)(X,{label:`Unfreeze account`,icon:(0,W.jsx)(ee,{size:15}),path:`/api/actions/set-frozen`,payload:()=>({user_id:S.ID,frozen:!1}),onDone:x})]})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Premium`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsxs)(`div`,{className:`attr-block`,children:[(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Premium duration (months)`}),(0,W.jsx)(`input`,{"aria-label":`Set premium duration in months`,value:u,onChange:e=>d(e.target.value),type:`number`,min:`1`,max:`120`})]}),(0,W.jsxs)(`div`,{className:`action-stack`,children:[(0,W.jsx)(X,{label:`Set premium`,icon:(0,W.jsx)(ie,{size:15}),tone:`warn`,path:`/api/actions/grant-premium`,payload:()=>({user_id:S.ID,months:xt(u)}),onDone:x}),(0,W.jsx)(X,{label:`Clear premium`,icon:(0,W.jsx)(ie,{size:15}),tone:`warn`,path:`/api/actions/grant-premium`,payload:()=>({user_id:S.ID,months:0}),onDone:x})]})]})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Verification & Moderation Flags`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsxs)(`div`,{className:`action-stack`,children:[(0,W.jsx)(X,{label:n.Verified?`Clear verified`:`Set verified`,icon:(0,W.jsx)(F,{size:15}),tone:`warn`,path:`/api/actions/set-verified`,payload:()=>({user_id:S.ID,verified:!n.Verified}),onDone:x}),(0,W.jsx)(Sn,{idKey:`user_id`,id:S.ID,path:`/api/actions/set-account-flags`,scam:n.Scam,fake:n.Fake,onDone:x}),(0,W.jsx)(Cn,{id:S.ID,support:n.Support,onDone:x})]})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Username`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsx)(wn,{idKey:`user_id`,id:S.ID,path:`/api/actions/set-account-username`,current:S.Username,onDone:x})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Name`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsx)(Tn,{id:S.ID,path:`/api/actions/set-account-profile`,currentFirstName:S.FirstName,currentLastName:S.LastName,onDone:x})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Phone Number`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsx)(En,{id:S.ID,path:`/api/actions/set-account-phone`,current:S.Phone,onDone:x})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Login Email`,text:`The email used for sign-in / password-recovery, not a contact address.`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsx)(Dn,{id:S.ID,path:`/api/actions/set-account-login-email`,current:S.LoginEmail,onDone:x})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Profile Color`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsx)(On,{idKey:`user_id`,id:S.ID,path:`/api/actions/set-account-color`,onDone:x})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Emoji Status`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsx)(kn,{idKey:`user_id`,id:S.ID,path:`/api/actions/set-account-emoji-status`,onDone:x})})]})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Recent Admin Actions`,text:`Last 30 audit rows`,action:(0,W.jsx)(Xe,{size:16})}),(0,W.jsx)(Ft,{rows:n.AuditLogs})]})]}),_&&(0,W.jsx)(mn,{kind:`user`,id:S.ID,onClose:()=>v(!1),onDone:()=>{b(e=>e+1),x()}})]})}function Mn(e){return new Date(e.getTime()-e.getTimezoneOffset()*6e4).toISOString().slice(0,16)}function Nn(e){return e.reduce((e,t)=>(e.devices+=t.DeviceCount,e),{devices:0})}function Pn(e){return e.reduce((e,t)=>(t.Megagroup&&(e.megagroups+=1),t.Broadcast&&(e.broadcasts+=1),t.Verified&&(e.verified+=1),e),{megagroups:0,broadcasts:0,verified:0})}var Fn={beforeID:0,beforeActiveUS:0};function In({navigate:e}){let[t,n]=(0,g.useState)(``),[r,i]=(0,g.useState)(50),[a,o]=(0,g.useState)(null),[s,c]=(0,g.useState)(null),[l,u]=(0,g.useState)([]),[d,f]=(0,g.useState)(Fn),[p,m]=(0,g.useState)(!1),[h,_]=(0,g.useState)(``);async function v(e,t){m(!0),_(``);let n=new URLSearchParams({limit:String(r)});e.trim()&&n.set(`q`,e.trim()),(t.beforeID||t.beforeActiveUS)&&(n.set(`before_id`,String(t.beforeID)),n.set(`before_active_us`,String(t.beforeActiveUS)));try{let e=await k.accounts(n);return o(e),e}catch(e){return _(O(e)),null}finally{m(!1)}}async function y(){u([]),f(Fn),await v(t,Fn)}async function b(){if(!a?.has_more)return;let e={beforeID:a.next_before_id,beforeActiveUS:a.next_before_active_us};await v(t,e)&&(u(e=>[...e,d]),f(e))}async function x(){if(l.length===0)return;let e=l[l.length-1];await v(t,e)&&(u(e=>e.slice(0,-1)),f(e))}async function S(){try{c(await k.accountStats())}catch{}}(0,g.useEffect)(()=>{y(),S()},[]);let C=Nn(a?.rows??[]),w=l.length>0&&!p,T=!!a?.has_more&&!p;return(0,W.jsxs)(Mt,{title:`Accounts`,eyebrow:a?.listing===!1?`Search results`:`Recently active accounts`,actions:(0,W.jsxs)(W.Fragment,{children:[(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>e(`/accounts/shared-devices`),children:[(0,W.jsx)(it,{size:15}),` `,`Shared devices`]}),(0,W.jsxs)(`button`,{className:`btn`,type:`button`,onClick:()=>{y(),S()},disabled:p,children:[(0,W.jsx)(Ye,{size:15}),` `,`Refresh`]})]}),children:[h&&(0,W.jsx)(K,{children:h}),(0,W.jsxs)(`div`,{className:`metric-row`,children:[(0,W.jsx)(J,{label:`Total users`,value:s?String(s.total):`…`}),(0,W.jsx)(J,{label:`Online now`,value:s?String(s.online):`…`,tone:`good`}),(0,W.jsx)(J,{label:`Online device records`,value:String(C.devices)})]}),(0,W.jsx)(Nt,{children:(0,W.jsxs)(`form`,{className:`toolbar`,onSubmit:e=>{e.preventDefault(),y()},children:[(0,W.jsxs)(`label`,{className:`searchbox`,children:[(0,W.jsx)(Ze,{size:15}),(0,W.jsx)(`input`,{value:t,onChange:e=>n(e.target.value),placeholder:`User ID / phone / username / email / name`})]}),(0,W.jsxs)(`label`,{className:`gift-page-size`,children:[(0,W.jsx)(`span`,{children:`Limit`}),(0,W.jsxs)(`select`,{value:String(r),onChange:e=>i(Number(e.target.value)),children:[(0,W.jsx)(`option`,{value:`10`,children:`10`}),(0,W.jsx)(`option`,{value:`20`,children:`20`}),(0,W.jsx)(`option`,{value:`50`,children:`50`}),(0,W.jsx)(`option`,{value:`100`,children:`100`})]})]}),(0,W.jsxs)(`button`,{className:`btn primary icon-text`,type:`submit`,disabled:p,children:[p?(0,W.jsx)(L,{size:15,className:`spin`}):(0,W.jsx)(Ze,{size:15}),` `,`Search`]}),(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>void x(),disabled:!w,children:[(0,W.jsx)(_e,{size:15}),` `,`Previous page`]}),(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>void b(),disabled:!T,children:[(0,W.jsx)(ve,{size:15}),` `,`Next page`]})]})}),(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{className:`avatar-col`}),(0,W.jsx)(`th`,{children:`User ID`}),(0,W.jsx)(`th`,{children:`Phone`}),(0,W.jsx)(`th`,{children:`Username`}),(0,W.jsx)(`th`,{children:`Name`}),(0,W.jsx)(`th`,{children:`Login email`}),(0,W.jsx)(`th`,{children:`Device`}),(0,W.jsx)(`th`,{children:`Last active`}),(0,W.jsx)(`th`,{children:`Premium`}),(0,W.jsx)(`th`,{children:`Verified`}),(0,W.jsx)(`th`,{children:`Frozen`}),(0,W.jsx)(`th`,{children:`Updated`}),(0,W.jsx)(`th`,{})]})}),(0,W.jsxs)(`tbody`,{children:[a?.rows.map(t=>(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`td`,{className:`avatar-col`,children:(0,W.jsx)(`button`,{className:`avatar-link`,type:`button`,onClick:()=>e(`/accounts/${t.ID}`),"aria-label":`Open account ${t.ID}`,children:(0,W.jsx)(yn,{id:t.ID,firstName:t.FirstName,lastName:t.LastName,username:t.Username})})}),(0,W.jsx)(`td`,{className:`mono`,children:t.ID}),(0,W.jsx)(`td`,{children:gt(t.Phone)}),(0,W.jsx)(`td`,{children:(0,W.jsx)(zt,{username:t.Username,collectibles:t.Collectibles})}),(0,W.jsx)(`td`,{children:_t(t)}),(0,W.jsx)(`td`,{children:t.LoginEmail||(0,W.jsx)(`span`,{className:`muted-cell`,children:`None`})}),(0,W.jsx)(`td`,{children:t.DeviceCount}),(0,W.jsx)(`td`,{children:U(t.LastActiveAt)}),(0,W.jsx)(`td`,{children:t.PremiumUntil>0?(0,W.jsxs)(q,{tone:`good`,children:[`Premium`,` `,yt(t.PremiumUntil)]}):(0,W.jsx)(q,{children:`None`})}),(0,W.jsxs)(`td`,{children:[t.Verified?(0,W.jsx)(q,{tone:`good`,children:`Verified`}):(0,W.jsx)(q,{children:`Not verified`}),` `,(0,W.jsx)(xn,{scam:t.Scam,fake:t.Fake})]}),(0,W.jsx)(`td`,{children:t.Frozen?(0,W.jsx)(q,{tone:`danger`,children:`Frozen`}):(0,W.jsx)(q,{children:`Normal`})}),(0,W.jsx)(`td`,{children:U(t.UpdatedAt)}),(0,W.jsx)(`td`,{children:(0,W.jsxs)(`button`,{className:`row-link`,onClick:()=>e(`/accounts/${t.ID}`),children:[`Details`,` `,(0,W.jsx)(ve,{size:14})]})})]},t.ID)),(!a||a.rows.length===0)&&(0,W.jsx)(It,{colSpan:12})]})]})})]})}function Ln({navigate:e}){let[t,n]=(0,g.useState)([]),[r,i]=(0,g.useState)(!1),[a,o]=(0,g.useState)(0),[s,c]=(0,g.useState)(!1),[l,u]=(0,g.useState)(``);async function d(e=!1){c(!0),u(``);let t=new URLSearchParams({limit:`20`,offset:String(e?a:0)});try{let r=await k.sharedDeviceGroups(t),a=r.rows??[];n(t=>e?[...t,...a]:a),o(r.next_offset),i(!!r.has_more)}catch(e){u(O(e))}finally{c(!1)}}(0,g.useEffect)(()=>{d(!1)},[]);let f=t.reduce((e,t)=>e+t.AccountCount,0);return(0,W.jsxs)(Mt,{title:`Shared Devices`,eyebrow:`Multi-account signal — device/IP overlap across different accounts`,actions:(0,W.jsxs)(W.Fragment,{children:[(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>e(`/accounts`),children:[(0,W.jsx)(ue,{size:15}),` `,`Back to accounts`]}),(0,W.jsxs)(`button`,{className:`btn`,type:`button`,onClick:()=>d(!1),disabled:s,children:[(0,W.jsx)(Ye,{size:15,className:s?`spin`:``}),` `,`Refresh`]})]}),children:[l&&(0,W.jsx)(K,{children:l}),(0,W.jsxs)(`div`,{className:`metric-row`,children:[(0,W.jsx)(J,{label:`Device groups on page`,value:String(t.length)}),(0,W.jsx)(J,{label:`Accounts flagged on page`,value:String(f),tone:`warn`})]}),(0,W.jsxs)(`p`,{className:`about-text`,children:[`Each card below is a device fingerprint (device model + OS + platform + IP) that more than one account has authorized from. `,`device_model/system_version are self-reported by the client, and IP alone can collide innocently -- use this as a lead, not a verdict.`]}),(0,W.jsxs)(`div`,{className:`stacked-sections`,children:[t.map(t=>(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:t.DeviceModel||`Unknown device`,text:`${t.Platform||`unknown platform`} ${t.SystemVersion} · ${t.IP} · last active ${U(t.LastActiveAt)}`,action:(0,W.jsxs)(q,{tone:`warn`,children:[(0,W.jsx)(it,{size:12}),` `,`${t.AccountCount} accounts`]})}),(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{className:`avatar-col`}),(0,W.jsx)(`th`,{children:`User ID`}),(0,W.jsx)(`th`,{children:`Phone`}),(0,W.jsx)(`th`,{children:`Username`}),(0,W.jsx)(`th`,{children:`Name`}),(0,W.jsx)(`th`,{children:`Active from this device`}),(0,W.jsx)(`th`,{})]})}),(0,W.jsx)(`tbody`,{children:t.Accounts.map(t=>(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`td`,{className:`avatar-col`,children:(0,W.jsx)(`button`,{className:`avatar-link`,type:`button`,onClick:()=>e(`/accounts/${t.UserID}`),"aria-label":`Open account ${t.UserID}`,children:(0,W.jsx)(yn,{id:t.UserID,firstName:t.FirstName,lastName:t.LastName,username:t.Username})})}),(0,W.jsx)(`td`,{className:`mono`,children:t.UserID}),(0,W.jsx)(`td`,{children:gt(t.Phone)}),(0,W.jsx)(`td`,{children:H(t.Username)||`-`}),(0,W.jsx)(`td`,{children:_t(t)||`-`}),(0,W.jsx)(`td`,{children:U(t.ActiveAt)}),(0,W.jsx)(`td`,{children:(0,W.jsxs)(`button`,{className:`row-link`,onClick:()=>e(`/accounts/${t.UserID}`),children:[`Details`,` `,(0,W.jsx)(ve,{size:14})]})})]},t.UserID))})]})})]},`${t.DeviceModel}|${t.SystemVersion}|${t.Platform}|${t.IP}`)),t.length===0&&(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsx)(`table`,{className:`data-table`,children:(0,W.jsx)(`tbody`,{children:(0,W.jsx)(It,{colSpan:7})})})})]}),r&&(0,W.jsx)(`div`,{className:`toolbar`,children:(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>d(!0),disabled:s,children:[s?(0,W.jsx)(L,{size:15,className:`spin`}):(0,W.jsx)(ge,{size:15}),` `,`Load more`]})})]})}function Rn({label:e,value:t,onChange:n}){let[r,i]=(0,g.useState)(``),[a,o]=(0,g.useState)([]),[s,c]=(0,g.useState)(!1),[l,u]=(0,g.useState)(``);async function d(){c(!0),u(``);let e=new URLSearchParams({limit:`20`});r.trim()&&e.set(`q`,r.trim());try{o((await k.accounts(e)).rows)}catch(e){u(O(e))}finally{c(!1)}}return(0,g.useEffect)(()=>{d()},[]),(0,W.jsxs)(`div`,{className:`entity-picker`,children:[(0,W.jsxs)(`div`,{className:`picker-head`,children:[(0,W.jsx)(`span`,{children:e}),t?(0,W.jsxs)(`button`,{className:`link-button`,type:`button`,onClick:()=>n(null),children:[(0,W.jsx)(ht,{size:13}),` `,`Clear`]}):null]}),t?(0,W.jsxs)(`div`,{className:`selected-entity`,children:[(0,W.jsx)(he,{size:15}),(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`strong`,{children:_t(t)}),(0,W.jsx)(`span`,{className:`mono`,children:t.ID})]}),(0,W.jsx)(`span`,{children:H(t.Username)||gt(t.Phone)||`-`})]}):null,(0,W.jsxs)(`div`,{className:`picker-search`,children:[(0,W.jsx)(Ze,{size:15}),(0,W.jsx)(`input`,{value:r,onChange:e=>i(e.target.value),onKeyDown:e=>{e.key===`Enter`&&(e.preventDefault(),d())},placeholder:`Search user_id / phone / username`}),(0,W.jsx)(`button`,{className:`btn compact-btn`,type:`button`,onClick:d,disabled:s,children:s?(0,W.jsx)(L,{size:14,className:`spin`}):`Search`})]}),l&&(0,W.jsx)(`div`,{className:`picker-error`,children:l}),(0,W.jsxs)(`div`,{className:`picker-results`,children:[a.map(e=>(0,W.jsxs)(`button`,{className:`picker-row ${t?.ID===e.ID?`selected`:``}`,type:`button`,onClick:()=>n(e),children:[(0,W.jsx)(`span`,{className:`mono`,children:e.ID}),(0,W.jsx)(`strong`,{children:_t(e)}),(0,W.jsx)(`span`,{children:H(e.Username)||gt(e.Phone)||`-`}),e.Verified?(0,W.jsx)(q,{tone:`good`,children:`Verified`}):(0,W.jsx)(q,{children:`Regular`})]},e.ID)),a.length===0&&!s?(0,W.jsx)(`div`,{className:`picker-empty`,children:`No results`}):null]})]})}function zn({label:e,selected:t,onChange:n}){let[r,i]=(0,g.useState)(``),[a,o]=(0,g.useState)([]),[s,c]=(0,g.useState)(!1),[l,u]=(0,g.useState)(``);async function d(){c(!0),u(``);let e=new URLSearchParams({limit:`20`});r.trim()&&e.set(`q`,r.trim());try{o((await k.accounts(e)).rows)}catch(e){u(O(e))}finally{c(!1)}}(0,g.useEffect)(()=>{d()},[]);function f(e){t.some(t=>t.ID===e.ID)?n(t.filter(t=>t.ID!==e.ID)):n([...t,e])}function p(e){n(t.filter(t=>t.ID!==e))}return(0,W.jsxs)(`div`,{className:`entity-picker`,children:[(0,W.jsxs)(`div`,{className:`picker-head`,children:[(0,W.jsx)(`span`,{children:e}),t.length>0?(0,W.jsxs)(`button`,{className:`link-button`,type:`button`,onClick:()=>n([]),children:[(0,W.jsx)(ht,{size:13}),` `,`Clear all`]}):null]}),t.length>0?(0,W.jsx)(`div`,{className:`picker-chip-list`,children:t.map(e=>(0,W.jsxs)(`span`,{className:`picker-chip`,children:[_t(e),` `,(0,W.jsx)(`span`,{className:`mono`,children:e.ID}),(0,W.jsx)(`button`,{type:`button`,onClick:()=>p(e.ID),"aria-label":`Remove ${e.ID}`,children:(0,W.jsx)(ht,{size:12})})]},e.ID))}):null,(0,W.jsxs)(`div`,{className:`picker-search`,children:[(0,W.jsx)(Ze,{size:15}),(0,W.jsx)(`input`,{value:r,onChange:e=>i(e.target.value),onKeyDown:e=>{e.key===`Enter`&&(e.preventDefault(),d())},placeholder:`Search user_id / phone / username`}),(0,W.jsx)(`button`,{className:`btn compact-btn`,type:`button`,onClick:d,disabled:s,children:s?(0,W.jsx)(L,{size:14,className:`spin`}):`Search`})]}),l&&(0,W.jsx)(`div`,{className:`picker-error`,children:l}),(0,W.jsxs)(`div`,{className:`picker-results`,children:[a.map(e=>{let n=t.some(t=>t.ID===e.ID);return(0,W.jsxs)(`button`,{className:`picker-row ${n?`selected`:``}`,type:`button`,onClick:()=>f(e),children:[(0,W.jsx)(`span`,{className:`mono`,children:e.ID}),(0,W.jsx)(`strong`,{children:_t(e)}),(0,W.jsx)(`span`,{children:H(e.Username)||gt(e.Phone)||`-`}),n?(0,W.jsx)(he,{size:15}):null]},e.ID)}),a.length===0&&!s?(0,W.jsx)(`div`,{className:`picker-empty`,children:`No results`}):null]})]})}function Bn({label:e,value:t,onChange:n}){let[r,i]=(0,g.useState)(``),[a,o]=(0,g.useState)([]),[s,c]=(0,g.useState)(!1),[l,u]=(0,g.useState)(``);async function d(){c(!0),u(``);let e=new URLSearchParams({limit:`20`});r.trim()&&e.set(`q`,r.trim().replace(/^@/,``));try{o((await k.bots(e)).rows??[])}catch(e){u(O(e))}finally{c(!1)}}return(0,g.useEffect)(()=>{d()},[]),(0,W.jsxs)(`div`,{className:`entity-picker`,children:[(0,W.jsxs)(`div`,{className:`picker-head`,children:[(0,W.jsx)(`span`,{children:e}),t?(0,W.jsxs)(`button`,{className:`link-button`,type:`button`,onClick:()=>n(null),children:[(0,W.jsx)(ht,{size:13}),` `,`Clear`]}):null]}),t?(0,W.jsxs)(`div`,{className:`selected-entity`,children:[(0,W.jsx)(he,{size:15}),(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`strong`,{children:t.FirstName||`-`}),(0,W.jsx)(`span`,{className:`mono`,children:t.ID})]}),(0,W.jsx)(`span`,{children:H(t.Username)||`-`})]}):null,(0,W.jsxs)(`div`,{className:`picker-search`,children:[(0,W.jsx)(Ze,{size:15}),(0,W.jsx)(`input`,{value:r,onChange:e=>i(e.target.value),onKeyDown:e=>{e.key===`Enter`&&(e.preventDefault(),d())},placeholder:`Bot username or id`}),(0,W.jsx)(`button`,{className:`btn compact-btn`,type:`button`,onClick:d,disabled:s,children:s?(0,W.jsx)(L,{size:14,className:`spin`}):`Search`})]}),l&&(0,W.jsx)(`div`,{className:`picker-error`,children:l}),(0,W.jsxs)(`div`,{className:`picker-results`,children:[a.map(e=>(0,W.jsxs)(`button`,{className:`picker-row ${t?.ID===e.ID?`selected`:``}`,type:`button`,onClick:()=>n(e),children:[(0,W.jsx)(`span`,{className:`mono`,children:e.ID}),(0,W.jsx)(`strong`,{children:e.FirstName||`-`}),(0,W.jsx)(`span`,{children:H(e.Username)||`-`}),e.System?(0,W.jsx)(q,{tone:`warn`,children:`System`}):(0,W.jsx)(q,{children:`Regular`})]},e.ID)),a.length===0&&!s?(0,W.jsx)(`div`,{className:`picker-empty`,children:`No results`}):null]})]})}function Vn({label:e,value:t,onChange:n}){let[r,i]=(0,g.useState)(``),[a,o]=(0,g.useState)([]),[s,c]=(0,g.useState)(!1),[l,u]=(0,g.useState)(``);async function d(){c(!0),u(``);let e=new URLSearchParams({limit:`20`});r.trim()&&e.set(`q`,r.trim());try{o((await k.channels(e)).rows)}catch(e){u(O(e))}finally{c(!1)}}return(0,g.useEffect)(()=>{d()},[]),(0,W.jsxs)(`div`,{className:`entity-picker`,children:[(0,W.jsxs)(`div`,{className:`picker-head`,children:[(0,W.jsx)(`span`,{children:e}),t?(0,W.jsxs)(`button`,{className:`link-button`,type:`button`,onClick:()=>n(null),children:[(0,W.jsx)(ht,{size:13}),` `,`Clear`]}):null]}),t?(0,W.jsxs)(`div`,{className:`selected-entity`,children:[(0,W.jsx)(he,{size:15}),(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`strong`,{children:t.Title||`-`}),(0,W.jsx)(`span`,{className:`mono`,children:t.ID})]}),(0,W.jsx)(`span`,{children:H(t.Username)||vt(t)})]}):null,(0,W.jsxs)(`div`,{className:`picker-search`,children:[(0,W.jsx)(Ze,{size:15}),(0,W.jsx)(`input`,{value:r,onChange:e=>i(e.target.value),onKeyDown:e=>{e.key===`Enter`&&(e.preventDefault(),d())},placeholder:`Search channel_id / username / title`}),(0,W.jsx)(`button`,{className:`btn compact-btn`,type:`button`,onClick:d,disabled:s,children:s?(0,W.jsx)(L,{size:14,className:`spin`}):`Search`})]}),l&&(0,W.jsx)(`div`,{className:`picker-error`,children:l}),(0,W.jsxs)(`div`,{className:`picker-results`,children:[a.map(e=>(0,W.jsxs)(`button`,{className:`picker-row ${t?.ID===e.ID?`selected`:``}`,type:`button`,onClick:()=>n(e),children:[(0,W.jsx)(`span`,{className:`mono`,children:e.ID}),(0,W.jsx)(`strong`,{children:e.Title||`-`}),(0,W.jsx)(`span`,{children:H(e.Username)||vt(e)}),e.Verified?(0,W.jsx)(q,{tone:`good`,children:`Verified`}):(0,W.jsx)(q,{children:vt(e)})]},e.ID)),a.length===0&&!s?(0,W.jsx)(`div`,{className:`picker-empty`,children:`No results`}):null]})]})}function Hn({onClose:e,onMinted:t}){let[n,r]=(0,g.useState)(`vault`),[i,a]=(0,g.useState)(null),[o,s]=(0,g.useState)(null),[c,l]=(0,g.useState)(``),[u,d]=(0,g.useState)(`XTR`),[f,p]=(0,g.useState)(``),[m,h]=(0,g.useState)(!1),[_,v]=(0,g.useState)(`TON`),[y,b]=(0,g.useState)(``),[x,S]=(0,g.useState)(!1),[C,w]=(0,g.useState)(``),[T,E]=(0,g.useState)(``),[D,O]=(0,g.useState)(``),k=Ot(f,u),A=m?Ot(y,_):`0`,j=k===null,M=m&&A===null,N=c.trim()!==``&&f.trim()!==``&&!j&&!M&&(n===`vault`||(n===`user`?i!==null:o!==null));function P(){let e={username:c.trim().replace(/^@/,``),currency:u,amount:k??`0`};if(n===`user`&&i&&(e.owner_user_id=String(i.ID)),n===`channel`&&o&&(e.owner_channel_id=String(o.ID)),m&&(e.crypto_currency=_,e.crypto_amount=A??`0`),C.trim()&&(e.url=C.trim()),T){let t=Date.parse(`${T}T${D||`00:00`}:00Z`);Number.isFinite(t)&&(e.purchase_date=Math.floor(t/1e3))}return e}return(0,pn.createPortal)((0,W.jsx)(`div`,{className:`modal-backdrop`,role:`presentation`,children:(0,W.jsxs)(`section`,{className:`modal command-modal`,role:`dialog`,"aria-modal":`true`,"aria-label":`Mint a collectible username`,children:[(0,W.jsxs)(`div`,{className:`modal-head`,children:[(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`div`,{className:`eyebrow`,children:`NFT usernames`}),(0,W.jsx)(`h2`,{children:`Mint a collectible username`})]}),(0,W.jsx)(`button`,{className:`icon-btn`,type:`button`,onClick:e,"aria-label":`Close`,children:(0,W.jsx)(ht,{size:15})})]}),(0,W.jsxs)(`div`,{className:`command-body`,children:[(0,W.jsxs)(`div`,{className:`mint-field-group`,children:[(0,W.jsx)(`div`,{className:`mint-field-group-label`,children:`1. Username`}),(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Username`}),(0,W.jsx)(`input`,{value:c,onChange:e=>l(e.target.value),placeholder:`durov`})]})]}),(0,W.jsxs)(`div`,{className:`mint-field-group`,children:[(0,W.jsx)(`div`,{className:`mint-field-group-label`,children:`2. Owner`}),(0,W.jsxs)(`div`,{className:`toolbar`,role:`group`,"aria-label":`Owner type`,children:[(0,W.jsxs)(`button`,{type:`button`,className:`btn ${n===`vault`?`primary`:``}`,onClick:()=>r(`vault`),children:[(0,W.jsx)(mt,{size:15}),` `,`Vault (no owner)`]}),(0,W.jsx)(`button`,{type:`button`,className:`btn ${n===`user`?`primary`:``}`,onClick:()=>r(`user`),children:`User owner`}),(0,W.jsx)(`button`,{type:`button`,className:`btn ${n===`channel`?`primary`:``}`,onClick:()=>r(`channel`),children:`Channel owner`})]}),n===`user`&&(0,W.jsx)(Rn,{label:`User owner`,value:i,onChange:a}),n===`channel`&&(0,W.jsx)(Vn,{label:`Channel owner`,value:o,onChange:s}),n===`vault`&&(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Mints the asset unassigned; issue it to someone later from the asset page.`})]}),(0,W.jsxs)(`div`,{className:`mint-field-group`,children:[(0,W.jsx)(`div`,{className:`mint-field-group-label`,children:`3. Price`}),(0,W.jsx)(`p`,{className:`bot-create-note`,children:`A record of what it was sold for -- minting doesn't charge anyone.`}),(0,W.jsxs)(`div`,{className:`bot-create-fields`,children:[(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Currency`}),(0,W.jsxs)(`select`,{value:u,onChange:e=>d(e.target.value),children:[(0,W.jsx)(`option`,{value:`XTR`,children:`XTR`}),(0,W.jsx)(`option`,{value:`TON`,children:`TON`}),(0,W.jsx)(`option`,{value:`USD`,children:`USD`})]})]}),(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Amount (${u})`}),(0,W.jsx)(`input`,{value:f,onChange:e=>p(e.target.value),inputMode:`decimal`,placeholder:`1000`})]})]}),f.trim()!==``&&!j&&(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Clients will show: ${Dt(k??`0`,u)}.`}),j&&(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Not a valid ${u} amount: digits only, at most ${String(wt(u))} decimal places.`}),(0,W.jsxs)(`label`,{className:`checkline`,children:[(0,W.jsx)(`input`,{type:`checkbox`,checked:m,onChange:e=>h(e.target.checked)}),` Also record a TON price`]}),m&&(0,W.jsxs)(`div`,{className:`bot-create-fields`,children:[(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Crypto currency`}),(0,W.jsx)(`select`,{value:_,onChange:e=>v(e.target.value),children:(0,W.jsx)(`option`,{value:`TON`,children:`TON`})})]}),(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Crypto amount (${_})`}),(0,W.jsx)(`input`,{value:y,onChange:e=>b(e.target.value),inputMode:`decimal`,placeholder:`12.5`})]})]}),M&&(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Not a valid ${_} amount: digits only, at most ${String(wt(_))} decimal places.`})]}),(0,W.jsxs)(`div`,{className:`mint-field-group`,children:[(0,W.jsx)(`button`,{type:`button`,className:`link-button`,onClick:()=>S(e=>!e),children:x?`Hide marketplace record`:`+ Add marketplace record (optional)`}),x&&(0,W.jsxs)(`div`,{className:`bot-create-fields`,children:[(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Marketplace URL`}),(0,W.jsx)(`input`,{value:C,onChange:e=>w(e.target.value),placeholder:`https://fragment.com/username/durov`})]}),(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Purchase date (UTC)`}),(0,W.jsx)(`input`,{value:T,onChange:e=>E(e.target.value),type:`date`})]}),(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Purchase time (UTC)`}),(0,W.jsx)(`input`,{value:D,onChange:e=>O(e.target.value),type:`time`,step:60,disabled:!T})]})]})]})]}),(0,W.jsxs)(`div`,{className:`modal-actions`,children:[(0,W.jsx)(`button`,{className:`btn`,type:`button`,onClick:e,children:`Close`}),(0,W.jsx)(X,{disabled:!N,label:`Mint username`,icon:(0,W.jsx)(Ge,{size:15}),tone:`neutral`,path:`/api/actions/mint-collectible-username`,payload:P,onDone:t})]})]})}),document.body)}function Un({navigate:e}){let[t,n]=(0,g.useState)(`all`),[r,i]=(0,g.useState)(``),[a,o]=(0,g.useState)(`50`),[s,c]=(0,g.useState)([]),[l,u]=(0,g.useState)(!1),[d,f]=(0,g.useState)(``),[p,m]=(0,g.useState)(!1),[h,_]=(0,g.useState)(``),[v,y]=(0,g.useState)(!1);async function b(e=!1){m(!0),_(``);let n=new URLSearchParams({limit:a});t!==`all`&&n.set(`status`,t),r.trim()&&n.set(`q`,r.trim().replace(/^@/,``)),e&&d&&n.set(`before_id`,d);try{let t=await k.collectibleUsernames(n),r=t.rows??[];c(t=>e?[...t,...r]:r),f(t.next_before_id??``),u(!!t.has_more)}catch(e){_(O(e))}finally{m(!1)}}(0,g.useEffect)(()=>{b(!1)},[]);let x=s.filter(e=>e.Status===`vault`).length,S=s.filter(e=>e.Status===`owned`).length,C=s.filter(e=>e.Status===`burned`).length;return(0,W.jsxs)(Mt,{title:`Collectible usernames`,eyebrow:`NFT usernames / Registry`,actions:(0,W.jsxs)(W.Fragment,{children:[(0,W.jsxs)(`button`,{className:`btn primary icon-text`,type:`button`,onClick:()=>y(!0),children:[(0,W.jsx)(Ge,{size:15}),` `,`Mint username`]}),(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>b(!1),disabled:p,children:[(0,W.jsx)(Ye,{size:15,className:p?`spin`:``}),` `,`Refresh`]})]}),children:[h&&(0,W.jsx)(K,{children:h}),(0,W.jsxs)(`div`,{className:`metric-row`,children:[(0,W.jsx)(J,{label:`Loaded rows`,value:String(s.length)}),(0,W.jsx)(J,{label:`In vault`,value:String(x)}),(0,W.jsx)(J,{label:`Held by owners`,value:String(S),tone:`good`}),(0,W.jsx)(J,{label:`Burned`,value:String(C),tone:C?`danger`:`neutral`})]}),(0,W.jsx)(Nt,{children:(0,W.jsxs)(`form`,{className:`toolbar`,onSubmit:e=>{e.preventDefault(),b(!1)},children:[(0,W.jsxs)(`label`,{className:`searchbox`,children:[(0,W.jsx)(Ze,{size:15}),(0,W.jsx)(`input`,{value:r,onChange:e=>i(e.target.value),placeholder:`Search by username`})]}),(0,W.jsxs)(`label`,{className:`field-inline`,children:[(0,W.jsx)(`span`,{children:`Status`}),(0,W.jsxs)(`select`,{value:t,onChange:e=>n(e.target.value),children:[(0,W.jsx)(`option`,{value:`all`,children:`All statuses`}),(0,W.jsx)(`option`,{value:`vault`,children:`Vault`}),(0,W.jsx)(`option`,{value:`owned`,children:`Owned`}),(0,W.jsx)(`option`,{value:`burned`,children:`Burned`})]})]}),(0,W.jsxs)(`label`,{className:`field-inline`,children:[(0,W.jsx)(`span`,{children:`Limit`}),(0,W.jsx)(`input`,{className:`small-input`,value:a,onChange:e=>o(e.target.value),type:`number`,min:`1`,max:`200`})]}),(0,W.jsxs)(`button`,{className:`btn primary icon-text`,type:`submit`,disabled:p,children:[p?(0,W.jsx)(L,{size:15,className:`spin`}):(0,W.jsx)(Ze,{size:15}),` `,`Search`]})]})}),(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{children:`Username`}),(0,W.jsx)(`th`,{children:`Status`}),(0,W.jsx)(`th`,{children:`Owner`}),(0,W.jsx)(`th`,{children:`Price`}),(0,W.jsx)(`th`,{children:`Purchase date (UTC)`}),(0,W.jsx)(`th`,{children:`Transfers`}),(0,W.jsx)(`th`,{children:`Updated`}),(0,W.jsx)(`th`,{})]})}),(0,W.jsxs)(`tbody`,{children:[s.map(t=>(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`td`,{children:(0,W.jsx)(`strong`,{children:H(t.Username)})}),(0,W.jsx)(`td`,{children:(0,W.jsx)(Wn,{status:t.Status})}),(0,W.jsx)(`td`,{children:Gn(t,`Vault`)}),(0,W.jsx)(`td`,{className:`mono`,children:Kn(t)}),(0,W.jsx)(`td`,{children:U(t.PurchaseDate)||`-`}),(0,W.jsx)(`td`,{className:`mono`,children:t.TransferCount}),(0,W.jsx)(`td`,{children:U(t.UpdatedAt)||`-`}),(0,W.jsx)(`td`,{children:(0,W.jsxs)(`button`,{className:`row-link`,type:`button`,onClick:()=>e(`/collectible-usernames/${t.ID}`),children:[(0,W.jsx)(de,{size:14}),` `,`Details`,` `,(0,W.jsx)(ve,{size:14})]})})]},t.ID)),s.length===0&&(0,W.jsx)(It,{colSpan:8})]})]})}),l&&(0,W.jsx)(`div`,{className:`toolbar`,children:(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>b(!0),disabled:p,children:[p?(0,W.jsx)(L,{size:15,className:`spin`}):(0,W.jsx)(ge,{size:15}),` `,`Load more`]})}),v&&(0,W.jsx)(Hn,{onClose:()=>y(!1),onMinted:()=>void b(!1)})]})}function Wn({status:e}){return e===`owned`?(0,W.jsx)(q,{tone:`good`,children:`Owned`}):e===`burned`?(0,W.jsxs)(q,{tone:`danger`,children:[(0,W.jsx)(Oe,{size:12}),` `,`Burned`]}):(0,W.jsxs)(q,{children:[(0,W.jsx)(mt,{size:12}),` `,`Vault`]})}function Gn(e,t){return!e.OwnerPeerType||e.OwnerPeerID===``||e.OwnerPeerID===`0`?t:`${H(e.OwnerUsername)||e.OwnerName||e.OwnerPeerID} · ${e.OwnerPeerType}:${e.OwnerPeerID}`}function Kn(e){let t=Dt(e.Amount,e.Currency);return e.CryptoCurrency&&e.CryptoAmount&&e.CryptoAmount!==`0`?`${Dt(e.CryptoAmount,e.CryptoCurrency)} (${t})`:t}function qn({id:e,navigate:t}){let[n,r]=(0,g.useState)(null),[i,a]=(0,g.useState)(``),[o,s]=(0,g.useState)(!1),[c,l]=(0,g.useState)(`profile`),[u,d]=(0,g.useState)(`user`),[f,p]=(0,g.useState)(null),[m,h]=(0,g.useState)(null);async function _(){s(!0),a(``);try{r(await k.collectibleUsername(e))}catch(e){a(O(e))}finally{s(!1)}}if((0,g.useEffect)(()=>{_(),l(`profile`)},[e]),i&&!n)return(0,W.jsx)(K,{children:i});if(!n)return(0,W.jsx)(Lt,{label:o?`Loading collectible username…`:`Waiting for data`});let v=n.asset,y=n.transfers??[],b=`Vault`,x=!!v.OwnerPeerType&&v.OwnerPeerID!==``&&v.OwnerPeerID!==`0`,S=v.Status===`burned`;function C(){x&&t(v.OwnerPeerType===`channel`?`/channels/${v.OwnerPeerID}`:`/accounts/${v.OwnerPeerID}`)}function w(){let e={username:v.Username};return u===`user`&&f&&(e.to_user_id=String(f.ID)),u===`channel`&&m&&(e.to_channel_id=String(m.ID)),e}let T=[{key:`profile`,label:`Profile & Status`,icon:(0,W.jsx)(oe,{size:15})},{key:`actions`,label:`Actions & Management`,icon:(0,W.jsx)(V,{size:15})}];return(0,W.jsxs)(Mt,{title:`Collectible ${H(v.Username)}`,eyebrow:`NFT usernames / Asset`,actions:(0,W.jsxs)(W.Fragment,{children:[(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>t(`/collectible-usernames`),children:[(0,W.jsx)(ue,{size:15}),` `,`Back to list`]}),(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:_,disabled:o,children:[(0,W.jsx)(Ye,{size:15,className:o?`spin`:``}),` `,`Refresh`]})]}),children:[i&&(0,W.jsx)(K,{children:i}),(0,W.jsxs)(`section`,{className:`entity-head`,children:[(0,W.jsx)(`div`,{className:`entity-head-main`,children:(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`div`,{className:`entity-title`,children:H(v.Username)}),(0,W.jsx)(`div`,{className:`entity-subtitle`,children:`Asset #${v.ID}`})]})}),(0,W.jsxs)(`div`,{className:`entity-badges`,children:[(0,W.jsx)(Wn,{status:v.Status}),(0,W.jsx)(q,{tone:v.TransferCount>0?`warn`:`neutral`,children:`${v.TransferCount} transfers`}),v.Status===`owned`&&(0,W.jsx)(q,{tone:v.RegistryActive?`good`:`warn`,children:v.RegistryActive?`Active in profile`:`Hidden in profile`})]})]}),(0,W.jsx)(`div`,{className:`toolbar`,role:`group`,"aria-label":`Asset sections`,children:T.map(e=>(0,W.jsxs)(`button`,{className:`btn icon-text ${c===e.key?`primary`:``}`,type:`button`,"aria-pressed":c===e.key,onClick:()=>l(e.key),children:[e.icon,` `,e.label]},e.key))}),c===`profile`&&(0,W.jsxs)(`div`,{className:`stacked-sections`,children:[(0,W.jsxs)(`div`,{className:`summary-grid`,children:[(0,W.jsx)(Y,{label:`Owner`,value:Gn(v,b)}),(0,W.jsx)(Y,{label:`Price`,value:Kn(v),mono:!0}),(0,W.jsx)(Y,{label:`Purchase date (UTC)`,value:U(v.PurchaseDate)||`-`}),(0,W.jsx)(Y,{label:`Original owner`,value:Xn(v.OriginalOwnerPeerType,v.OriginalOwnerPeerID,b,v.OriginalOwnerUsername)}),(0,W.jsx)(Y,{label:`Transfers`,value:String(v.TransferCount),mono:!0}),(0,W.jsx)(Y,{label:`Created`,value:U(v.CreatedAt)||`-`}),(0,W.jsx)(Y,{label:`Updated`,value:U(v.UpdatedAt)||`-`})]}),(0,W.jsxs)(`div`,{className:`toolbar`,children:[x&&(0,W.jsx)(`button`,{className:`row-link`,type:`button`,onClick:C,children:v.OwnerPeerType===`channel`?`Open owner channel`:`Open owner account`}),v.URL&&(0,W.jsxs)(`a`,{className:`row-link`,href:v.URL,target:`_blank`,rel:`noreferrer noopener`,children:[(0,W.jsx)(Ce,{size:14}),` `,`Open marketplace page`]})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Provenance history`,text:`Mint, transfer, revoke and burn events in chronological order.`,action:(0,W.jsx)(Xe,{size:16})}),(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{children:`ID`}),(0,W.jsx)(`th`,{children:`Event`}),(0,W.jsx)(`th`,{children:`From`}),(0,W.jsx)(`th`,{children:`To`}),(0,W.jsx)(`th`,{children:`Price`}),(0,W.jsx)(`th`,{children:`Actor`}),(0,W.jsx)(`th`,{children:`Reason`}),(0,W.jsx)(`th`,{children:`Time`})]})}),(0,W.jsxs)(`tbody`,{children:[y.map(e=>(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`td`,{className:`mono`,children:e.ID}),(0,W.jsx)(`td`,{children:(0,W.jsx)(Yn,{kind:e.Kind})}),(0,W.jsx)(`td`,{className:`mono`,children:Xn(e.FromPeerType,e.FromPeerID,b,e.FromUsername)}),(0,W.jsx)(`td`,{className:`mono`,children:Xn(e.ToPeerType,e.ToPeerID,b,e.ToUsername)}),(0,W.jsx)(`td`,{className:`mono`,children:e.Amount&&e.Amount!==`0`?Dt(e.Amount,e.Currency):`-`}),(0,W.jsx)(`td`,{children:e.Actor||`-`}),(0,W.jsx)(`td`,{className:`truncate`,children:e.Reason||`-`}),(0,W.jsx)(`td`,{children:U(e.CreatedAt)||`-`})]},e.ID)),y.length===0&&(0,W.jsx)(It,{colSpan:8})]})]})})]})]}),c===`actions`&&(0,W.jsx)(`div`,{className:`stacked-sections`,children:S?(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Asset Operations`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsx)(`p`,{className:`bot-create-note`,children:`This username is burned — no further operations are possible.`})})]}):(0,W.jsxs)(`div`,{className:`action-groups`,children:[(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Transfer Ownership`,text:`Sent immediately; appended to the provenance history.`}),(0,W.jsxs)(`div`,{className:`card-body`,children:[(0,W.jsxs)(`div`,{className:`toolbar`,role:`group`,"aria-label":`Recipient type`,children:[(0,W.jsx)(`button`,{type:`button`,className:`btn ${u===`user`?`primary`:``}`,onClick:()=>d(`user`),children:`To user`}),(0,W.jsx)(`button`,{type:`button`,className:`btn ${u===`channel`?`primary`:``}`,onClick:()=>d(`channel`),children:`To channel`})]}),u===`user`?(0,W.jsx)(Rn,{label:`To user`,value:f,onChange:p}):(0,W.jsx)(Vn,{label:`To channel`,value:m,onChange:h}),(0,W.jsx)(X,{label:`Transfer`,icon:(0,W.jsx)(le,{size:15}),tone:`warn`,path:`/api/actions/transfer-collectible-username`,payload:w,onDone:_})]})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Revoke To Vault`,text:`Returns the username to the vault; it can be issued again later.`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsx)(`div`,{className:`action-stack`,children:(0,W.jsx)(X,{label:`Revoke to vault`,icon:(0,W.jsx)(ut,{size:15}),tone:`warn`,path:`/api/actions/revoke-collectible-username`,payload:()=>({username:v.Username,burn:!1}),onDone:_})})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Danger Zone`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsxs)(`div`,{className:`danger-zone`,children:[(0,W.jsx)(X,{label:`Burn permanently`,icon:(0,W.jsx)(Oe,{size:15}),tone:`danger`,path:`/api/actions/revoke-collectible-username`,payload:()=>({username:v.Username,burn:!0}),onDone:_}),(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Irreversible: the username is destroyed and can never be issued again.`}),(0,W.jsx)(X,{label:`Delete record`,icon:(0,W.jsx)(lt,{size:15}),tone:`danger`,path:`/api/actions/delete-collectible-username`,payload:()=>({username:v.Username}),onDone:()=>t(`/collectible-usernames`)}),(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Erases the asset and its ownership history, and frees the username for a fresh issue. Use this for a username issued by mistake; a burn keeps the history instead.`})]})})]})]})})]})}var Jn={mint:`Mint`,transfer:`Transfer`,burn:`Burn`,revoke:`Revoke`};function Yn({kind:e}){return(0,W.jsx)(q,{tone:e===`burn`?`danger`:e===`revoke`?`warn`:e===`mint`?`good`:`neutral`,children:Jn[e]})}function Xn(e,t,n,r=``){if(!e||t===``||t===`0`)return n;let i=H(r);return i?`${i} · ${e}:${t}`:`${e}:${t}`}function Zn({id:e,navigate:t}){let[n,r]=(0,g.useState)(null),[i,a]=(0,g.useState)(``),[o,s]=(0,g.useState)(!1),[c,l]=(0,g.useState)(`profile`),[u,d]=(0,g.useState)(!1),[f,p]=(0,g.useState)(0);async function m(){s(!0),a(``);try{r(await k.channel(e))}catch(e){a(O(e))}finally{s(!1)}}if((0,g.useEffect)(()=>{m(),l(`profile`)},[e]),i)return(0,W.jsx)(K,{children:i});if(!n)return(0,W.jsx)(Lt,{label:o?`Loading channel detail`:`Waiting for data`});let h=n.Channel,_=[{key:`profile`,label:`Profile & Status`,icon:(0,W.jsx)(oe,{size:15})},{key:`actions`,label:`Actions & Management`,icon:(0,W.jsx)(V,{size:15})}];return(0,W.jsxs)(Mt,{title:`${vt(h)} #${h.ID}`,eyebrow:`Channel Profile`,actions:(0,W.jsxs)(`button`,{className:`btn icon-text`,onClick:()=>t(`/channels`),children:[(0,W.jsx)(ue,{size:15}),` `,`Back to list`]}),children:[(0,W.jsxs)(`section`,{className:`entity-head`,children:[(0,W.jsxs)(`div`,{className:`entity-head-main`,children:[(0,W.jsxs)(`div`,{className:`avatar-edit-slot`,children:[(0,W.jsx)(yn,{id:h.ID,kind:`channel`,title:h.Title,size:64,refreshKey:f||void 0}),(0,W.jsx)(`button`,{className:`icon-btn avatar-edit-btn`,type:`button`,"aria-label":`Change avatar`,title:`Change avatar`,onClick:()=>d(!0),children:(0,W.jsx)(Ne,{size:13})})]}),(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`div`,{className:`entity-title`,children:h.Title||`-`}),(0,W.jsxs)(`div`,{className:`entity-subtitle`,children:[H(h.Username)||`No username`,` · `,`Creator ${h.CreatorUserID}`]})]})]}),(0,W.jsxs)(`div`,{className:`entity-badges`,children:[(0,W.jsx)(q,{children:vt(h)}),h.Verified?(0,W.jsx)(q,{tone:`good`,children:`Verified`}):(0,W.jsx)(q,{children:`Not verified`}),(0,W.jsx)(xn,{scam:h.Scam,fake:h.Fake}),h.Deleted?(0,W.jsx)(q,{tone:`danger`,children:`Deleted`}):(0,W.jsx)(q,{children:`Valid`})]})]}),(0,W.jsx)(`div`,{className:`toolbar`,role:`group`,"aria-label":`Channel sections`,children:_.map(e=>(0,W.jsxs)(`button`,{className:`btn icon-text ${c===e.key?`primary`:``}`,type:`button`,"aria-pressed":c===e.key,onClick:()=>l(e.key),children:[e.icon,` `,e.label]},e.key))}),c===`profile`&&(0,W.jsxs)(`div`,{className:`stacked-sections`,children:[(0,W.jsxs)(`div`,{className:`summary-grid`,children:[(0,W.jsx)(Y,{label:`Channel ID`,value:String(h.ID),mono:!0}),(0,W.jsx)(Y,{label:`access_hash`,value:String(h.AccessHash),mono:!0}),(0,W.jsx)(Y,{label:`Members`,value:`${h.ParticipantsCount} / Admins ${h.AdminsCount}`}),(0,W.jsx)(Y,{label:`Moderation`,value:`Banned ${h.BannedCount} / Kicked ${h.KickedCount}`}),(0,W.jsx)(Y,{label:`Channel flags`,value:`broadcast=${h.Broadcast} megagroup=${h.Megagroup} forum=${h.Forum}`}),(0,W.jsx)(Y,{label:`top / pinned / PTS`,value:`${h.TopMessageID} / ${h.PinnedMessageID} / ${h.PTS}`}),(0,W.jsx)(Y,{label:`Created`,value:yt(h.Date)||`-`}),(0,W.jsx)(Y,{label:`Updated`,value:U(h.UpdatedAt)||`-`})]}),h.About&&(0,W.jsx)(`p`,{className:`about-text`,children:h.About}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Channel Raw Row`,text:`Database read-only snapshot`}),(0,W.jsx)(Rt,{value:n.ChannelJSON})]})]}),c===`actions`&&(0,W.jsxs)(`div`,{className:`stacked-sections`,children:[(0,W.jsxs)(`div`,{className:`action-groups`,children:[(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Verification & Moderation Flags`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsxs)(`div`,{className:`action-stack`,children:[(0,W.jsx)(X,{label:h.Verified?`Clear verified`:`Set verified`,icon:(0,W.jsx)(F,{size:15}),tone:`warn`,path:`/api/actions/set-channel-verified`,payload:()=>({channel_id:h.ID,verified:!h.Verified}),onDone:m}),(0,W.jsx)(Sn,{idKey:`channel_id`,id:h.ID,path:`/api/actions/set-channel-flags`,scam:h.Scam,fake:h.Fake,onDone:m})]})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Settings`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsx)(An,{channel:h,onDone:m})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Username`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsx)(wn,{idKey:`channel_id`,id:h.ID,path:`/api/actions/set-channel-username`,current:h.Username,onDone:m})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Profile Color`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsx)(On,{idKey:`channel_id`,id:h.ID,path:`/api/actions/set-channel-color`,onDone:m})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Emoji Status`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsx)(kn,{idKey:`channel_id`,id:h.ID,path:`/api/actions/set-channel-emoji-status`,onDone:m})})]})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Recent Admin Actions`,text:`Last 30 audit rows`,action:(0,W.jsx)(Xe,{size:16})}),(0,W.jsx)(Ft,{rows:n.AuditLogs})]})]}),u&&(0,W.jsx)(mn,{kind:`channel`,id:h.ID,onClose:()=>d(!1),onDone:()=>{p(e=>e+1),m()}})]})}var Qn={beforeID:0,beforeUpdatedUS:0};function $n({navigate:e}){let[t,n]=(0,g.useState)(``),[r,i]=(0,g.useState)(50),[a,o]=(0,g.useState)(null),[s,c]=(0,g.useState)([]),[l,u]=(0,g.useState)(Qn),[d,f]=(0,g.useState)(!1),[p,m]=(0,g.useState)(``);async function h(e,t){f(!0),m(``);let n=new URLSearchParams({limit:String(r)});e.trim()&&n.set(`q`,e.trim()),(t.beforeID||t.beforeUpdatedUS)&&(n.set(`before_id`,String(t.beforeID)),n.set(`before_updated_us`,String(t.beforeUpdatedUS)));try{let e=await k.channels(n);return o(e),e}catch(e){return m(O(e)),null}finally{f(!1)}}async function _(){c([]),u(Qn),await h(t,Qn)}async function v(){if(!a?.has_more)return;let e={beforeID:a.next_before_id,beforeUpdatedUS:a.next_before_updated_us};await h(t,e)&&(c(e=>[...e,l]),u(e))}async function y(){if(s.length===0)return;let e=s[s.length-1];await h(t,e)&&(c(e=>e.slice(0,-1)),u(e))}(0,g.useEffect)(()=>{_()},[]);let b=Pn(a?.rows??[]),x=s.length>0&&!d,S=!!a?.has_more&&!d;return(0,W.jsxs)(Mt,{title:`Supergroups and Channels`,eyebrow:a?.listing===!1?`Search results`:`Recently updated`,actions:(0,W.jsxs)(`button`,{className:`btn`,type:`button`,onClick:()=>void _(),disabled:d,children:[(0,W.jsx)(Ye,{size:15}),` `,`Refresh`]}),children:[p&&(0,W.jsx)(K,{children:p}),(0,W.jsxs)(`div`,{className:`metric-row`,children:[(0,W.jsx)(J,{label:`Entities on page`,value:String(a?.rows.length??0)}),(0,W.jsx)(J,{label:`Supergroups`,value:String(b.megagroups)}),(0,W.jsx)(J,{label:`Channels`,value:String(b.broadcasts)}),(0,W.jsx)(J,{label:`Verified`,value:String(b.verified),tone:`good`})]}),(0,W.jsx)(Nt,{children:(0,W.jsxs)(`form`,{className:`toolbar`,onSubmit:e=>{e.preventDefault(),_()},children:[(0,W.jsxs)(`label`,{className:`searchbox`,children:[(0,W.jsx)(Ze,{size:15}),(0,W.jsx)(`input`,{value:t,onChange:e=>n(e.target.value),placeholder:`Channel ID / username / title`})]}),(0,W.jsxs)(`label`,{className:`gift-page-size`,children:[(0,W.jsx)(`span`,{children:`Limit`}),(0,W.jsxs)(`select`,{value:String(r),onChange:e=>i(Number(e.target.value)),children:[(0,W.jsx)(`option`,{value:`10`,children:`10`}),(0,W.jsx)(`option`,{value:`20`,children:`20`}),(0,W.jsx)(`option`,{value:`50`,children:`50`}),(0,W.jsx)(`option`,{value:`100`,children:`100`})]})]}),(0,W.jsxs)(`button`,{className:`btn primary icon-text`,type:`submit`,disabled:d,children:[d?(0,W.jsx)(L,{size:15,className:`spin`}):(0,W.jsx)(Ze,{size:15}),` `,`Search`]}),(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>void y(),disabled:!x,children:[(0,W.jsx)(_e,{size:15}),` `,`Previous page`]}),(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>void v(),disabled:!S,children:[(0,W.jsx)(ve,{size:15}),` `,`Next page`]})]})}),(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{className:`avatar-col`}),(0,W.jsx)(`th`,{children:`Channel ID`}),(0,W.jsx)(`th`,{children:`Kind`}),(0,W.jsx)(`th`,{children:`Username`}),(0,W.jsx)(`th`,{children:`Title`}),(0,W.jsx)(`th`,{children:`Members`}),(0,W.jsx)(`th`,{children:`Admins`}),(0,W.jsx)(`th`,{children:`PTS`}),(0,W.jsx)(`th`,{children:`Verified`}),(0,W.jsx)(`th`,{children:`Updated`}),(0,W.jsx)(`th`,{})]})}),(0,W.jsxs)(`tbody`,{children:[a?.rows.map(t=>(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`td`,{className:`avatar-col`,children:(0,W.jsx)(`button`,{className:`avatar-link`,type:`button`,onClick:()=>e(`/channels/${t.ID}`),"aria-label":`Open channel ${t.ID}`,children:(0,W.jsx)(yn,{id:t.ID,kind:`channel`,title:t.Title})})}),(0,W.jsx)(`td`,{className:`mono`,children:t.ID}),(0,W.jsx)(`td`,{children:vt(t)}),(0,W.jsx)(`td`,{children:H(t.Username)}),(0,W.jsx)(`td`,{children:t.Title}),(0,W.jsx)(`td`,{children:t.ParticipantsCount}),(0,W.jsx)(`td`,{children:t.AdminsCount}),(0,W.jsx)(`td`,{children:t.PTS}),(0,W.jsxs)(`td`,{children:[t.Verified?(0,W.jsx)(q,{tone:`good`,children:`Verified`}):(0,W.jsx)(q,{children:`Not verified`}),` `,(0,W.jsx)(xn,{scam:t.Scam,fake:t.Fake})]}),(0,W.jsx)(`td`,{children:U(t.UpdatedAt)}),(0,W.jsx)(`td`,{children:(0,W.jsxs)(`button`,{className:`row-link`,onClick:()=>e(`/channels/${t.ID}`),children:[`Details`,` `,(0,W.jsx)(ve,{size:14})]})})]},t.ID)),(!a||a.rows.length===0)&&(0,W.jsx)(It,{colSpan:11})]})]})})]})}function er({botID:e,onClose:t}){let[n,r]=(0,g.useState)(``),[i,a]=(0,g.useState)(!1),[o,s]=(0,g.useState)(``),[c,l]=(0,g.useState)(!1);async function u(){if(!n.trim()){s(`Please enter an operation reason`);return}a(!0),s(``),l(!1);try{let t=await k.action(`/api/actions/export-bot-token`,{command_id:``,reason:n.trim(),confirm:!0,bot_user_id:e}),r=t.details?.token;if(t.error||typeof r!=`string`||!r){s(t.error||`No token returned.`);return}await navigator.clipboard.writeText(r),l(!0)}catch(e){s(O(e))}finally{a(!1)}}return(0,pn.createPortal)((0,W.jsx)(`div`,{className:`modal-backdrop`,role:`presentation`,children:(0,W.jsxs)(`section`,{className:`modal command-modal`,role:`dialog`,"aria-modal":`true`,"aria-label":`Copy bot token`,children:[(0,W.jsxs)(`div`,{className:`modal-head`,children:[(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`div`,{className:`eyebrow`,children:`Bot`}),(0,W.jsx)(`h2`,{children:`Copy bot token`})]}),(0,W.jsx)(`button`,{className:`icon-btn`,type:`button`,onClick:t,disabled:i,"aria-label":`Close`,children:(0,W.jsx)(ht,{size:15})})]}),(0,W.jsxs)(`div`,{className:`command-body`,children:[(0,W.jsx)(`p`,{children:`The token is written straight to your clipboard and is never shown on screen. Paste it wherever it's needed right after copying.`}),(0,W.jsxs)(`label`,{className:`form-field`,children:[(0,W.jsx)(`span`,{children:`Operation reason`}),(0,W.jsx)(`textarea`,{value:n,onChange:e=>r(e.target.value),rows:3,placeholder:`Describe why this token is being retrieved`})]}),o&&(0,W.jsx)(K,{children:o}),c&&(0,W.jsx)(`div`,{className:`secret-reveal`,children:(0,W.jsxs)(`div`,{className:`secret-reveal-label`,children:[(0,W.jsx)(he,{size:14}),` `,`Token copied to clipboard.`]})})]}),(0,W.jsxs)(`div`,{className:`modal-actions`,children:[(0,W.jsx)(`button`,{className:`btn`,type:`button`,onClick:t,disabled:i,children:`Close`}),(0,W.jsxs)(`button`,{className:`btn primary icon-text`,type:`button`,onClick:()=>void u(),disabled:i,children:[(0,W.jsx)(be,{size:15}),` `,c?`Copy again`:`Copy token`]})]})]})}),document.body)}function tr({id:e,navigate:t}){let[n,r]=(0,g.useState)(null),[i,a]=(0,g.useState)(``),[o,s]=(0,g.useState)(!1),[c,l]=(0,g.useState)(`profile`),[u,d]=(0,g.useState)(!1),[f,p]=(0,g.useState)(0),[m,h]=(0,g.useState)(!1);async function _(){s(!0),a(``);try{r(await k.bot(e))}catch(e){a(O(e))}finally{s(!1)}}if((0,g.useEffect)(()=>{_(),l(`profile`)},[e]),i)return(0,W.jsx)(K,{children:i});if(!n)return(0,W.jsx)(Lt,{label:o?`Loading bot detail`:`Waiting for data`});let v=n.Bot,y=[{key:`profile`,label:`Profile & Status`,icon:(0,W.jsx)(oe,{size:15})},{key:`actions`,label:`Actions & Management`,icon:(0,W.jsx)(V,{size:15})}];return(0,W.jsxs)(Mt,{title:`Bot #${v.ID}`,eyebrow:`Bot Profile`,actions:(0,W.jsxs)(`button`,{className:`btn icon-text`,onClick:()=>t(`/bots`),children:[(0,W.jsx)(ue,{size:15}),` `,`Back to list`]}),children:[(0,W.jsxs)(`section`,{className:`entity-head`,children:[(0,W.jsxs)(`div`,{className:`entity-head-main`,children:[(0,W.jsxs)(`div`,{className:`avatar-edit-slot`,children:[(0,W.jsx)(yn,{id:v.ID,firstName:v.FirstName,username:v.Username,size:64,refreshKey:f||void 0}),(0,W.jsx)(`button`,{className:`icon-btn avatar-edit-btn`,type:`button`,"aria-label":`Change avatar`,title:`Change avatar`,onClick:()=>d(!0),children:(0,W.jsx)(Ne,{size:13})})]}),(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`div`,{className:`entity-title`,children:v.FirstName||`Unnamed bot`}),(0,W.jsx)(`div`,{className:`entity-subtitle`,children:H(v.Username)||`No username`})]})]}),(0,W.jsxs)(`div`,{className:`entity-badges`,children:[(0,W.jsx)(q,{tone:v.System?`warn`:`neutral`,children:v.System?`System`:`User`}),v.Verified?(0,W.jsx)(q,{tone:`good`,children:`Verified`}):(0,W.jsx)(q,{children:`Not verified`}),(0,W.jsx)(xn,{scam:v.Scam,fake:v.Fake})]})]}),(0,W.jsx)(`div`,{className:`toolbar`,role:`group`,"aria-label":`Bot sections`,children:y.map(e=>(0,W.jsxs)(`button`,{className:`btn icon-text ${c===e.key?`primary`:``}`,type:`button`,"aria-pressed":c===e.key,onClick:()=>l(e.key),children:[e.icon,` `,e.label]},e.key))}),c===`profile`&&(0,W.jsxs)(`div`,{className:`stacked-sections`,children:[(0,W.jsxs)(`div`,{className:`summary-grid`,children:[(0,W.jsx)(Y,{label:`Bot ID`,value:String(v.ID),mono:!0}),(0,W.jsx)(Y,{label:`Owner`,value:v.OwnerUserID>0?`${v.OwnerUserID} ${H(n.OwnerUsername)}`.trim():`None`}),(0,W.jsx)(Y,{label:`Type`,value:v.System?`System`:`User`}),(0,W.jsx)(Y,{label:`Updated`,value:U(v.UpdatedAt)||`-`}),(0,W.jsx)(Y,{label:`Created`,value:U(v.CreatedAt)||`-`})]}),n.About&&(0,W.jsx)(`p`,{className:`about-text`,children:n.About}),n.Description&&n.Description.trim()!==n.About.trim()&&(0,W.jsx)(`p`,{className:`about-text`,children:n.Description})]}),c===`actions`&&(0,W.jsxs)(`div`,{className:`stacked-sections`,children:[(0,W.jsxs)(`div`,{className:`action-groups`,children:[(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Verification & Moderation Flags`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsxs)(`div`,{className:`action-stack`,children:[(0,W.jsx)(X,{label:v.Verified?`Clear verified`:`Set verified`,icon:(0,W.jsx)(F,{size:15}),tone:`neutral`,path:`/api/actions/set-verified`,payload:()=>({user_id:v.ID,verified:!v.Verified}),onDone:_}),(0,W.jsx)(Sn,{idKey:`user_id`,id:v.ID,path:`/api/actions/set-account-flags`,scam:v.Scam,fake:v.Fake,onDone:_})]})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Username`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsx)(wn,{idKey:`user_id`,id:v.ID,path:`/api/actions/set-account-username`,current:v.Username,onDone:_})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Profile Color`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsx)(On,{idKey:`user_id`,id:v.ID,path:`/api/actions/set-account-color`,onDone:_})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Emoji Status`}),(0,W.jsx)(`div`,{className:`card-body`,children:(0,W.jsx)(kn,{idKey:`user_id`,id:v.ID,path:`/api/actions/set-account-emoji-status`,onDone:_})})]}),!v.System&&(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Credentials`}),(0,W.jsxs)(`div`,{className:`card-body`,children:[(0,W.jsx)(`div`,{className:`action-stack`,children:(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>h(!0),children:[(0,W.jsx)(be,{size:15}),` `,`Copy token`]})}),(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Copies straight to the clipboard through a dedicated confirmation step -- the token itself is never shown on this page.`})]})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Danger Zone`}),(0,W.jsx)(`div`,{className:`card-body`,children:v.System?(0,W.jsx)(`p`,{className:`bot-create-note`,children:`System bots are built in and cannot be deleted.`}):(0,W.jsxs)(`div`,{className:`danger-zone`,children:[(0,W.jsx)(X,{label:`Delete bot`,icon:(0,W.jsx)(lt,{size:15}),tone:`danger`,path:`/api/actions/delete-bot`,payload:()=>({bot_user_id:v.ID}),onDone:()=>t(`/bots`)}),(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Permanently deletes this user-created bot and invalidates its token. This cannot be undone.`})]})})]})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Recent Admin Actions`,text:`Last 30 audit rows`,action:(0,W.jsx)(Xe,{size:16})}),(0,W.jsx)(Ft,{rows:n.AuditLogs})]})]}),u&&(0,W.jsx)(mn,{kind:`user`,id:v.ID,onClose:()=>d(!1),onDone:()=>{p(e=>e+1),_()}}),m&&(0,W.jsx)(er,{botID:v.ID,onClose:()=>h(!1)})]})}function nr({onClose:e,onCreated:t}){let[n,r]=(0,g.useState)(``),[i,a]=(0,g.useState)(``),[o,s]=(0,g.useState)(``);return(0,pn.createPortal)((0,W.jsx)(`div`,{className:`modal-backdrop`,role:`presentation`,children:(0,W.jsxs)(`section`,{className:`modal command-modal`,role:`dialog`,"aria-modal":`true`,"aria-label":`Create bot`,children:[(0,W.jsxs)(`div`,{className:`modal-head`,children:[(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`div`,{className:`eyebrow`,children:`Bots`}),(0,W.jsx)(`h2`,{children:`Create bot`})]}),(0,W.jsx)(`button`,{className:`icon-btn`,type:`button`,onClick:e,"aria-label":`Close`,children:(0,W.jsx)(ht,{size:15})})]}),(0,W.jsxs)(`div`,{className:`command-body`,children:[(0,W.jsx)(`p`,{children:`Provision a bot account owned by the given user. The token is shown once after confirmation.`}),(0,W.jsxs)(`div`,{className:`bot-create-fields`,children:[(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Owner user ID`}),(0,W.jsx)(`input`,{value:n,onChange:e=>r(e.target.value),type:`number`,min:`1`,placeholder:`123456789`})]}),(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Display name`}),(0,W.jsx)(`input`,{value:i,onChange:e=>a(e.target.value),placeholder:`e.g. Service Bot`,maxLength:64})]}),(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Username`}),(0,W.jsx)(`input`,{value:o,onChange:e=>s(e.target.value),placeholder:`my_service_bot`})]})]}),(0,W.jsx)(`span`,{className:`bot-create-note`,children:`Username must be 5-32 characters and end with 'bot'.`})]}),(0,W.jsxs)(`div`,{className:`modal-actions`,children:[(0,W.jsx)(`button`,{className:`btn`,type:`button`,onClick:e,children:`Close`}),(0,W.jsx)(X,{label:`Create bot`,icon:(0,W.jsx)(Ge,{size:15}),tone:`neutral`,path:`/api/actions/create-bot`,payload:()=>({owner_user_id:xt(n),name:i.trim(),username:o.trim().replace(/^@/,``)}),secretField:`token`,onDone:t})]})]})}),document.body)}var rr={beforeID:0};function ir({navigate:e}){let[t,n]=(0,g.useState)(``),[r,i]=(0,g.useState)(50),[a,o]=(0,g.useState)(null),[s,c]=(0,g.useState)([]),[l,u]=(0,g.useState)(rr),[d,f]=(0,g.useState)(!1),[p,m]=(0,g.useState)(``),[h,_]=(0,g.useState)(!1);async function v(e,t){f(!0),m(``);let n=new URLSearchParams({limit:String(r)});e.trim()&&n.set(`q`,e.trim()),t.beforeID&&n.set(`before_id`,String(t.beforeID));try{let e=await k.bots(n);return o(e),e}catch(e){return m(O(e)),null}finally{f(!1)}}async function y(){c([]),u(rr),await v(t,rr)}async function b(){if(!a?.has_more)return;let e={beforeID:a.next_before_id};await v(t,e)&&(c(e=>[...e,l]),u(e))}async function x(){if(s.length===0)return;let e=s[s.length-1];await v(t,e)&&(c(e=>e.slice(0,-1)),u(e))}(0,g.useEffect)(()=>{y()},[]);let S=a?.rows??[],C=S.filter(e=>e.Verified).length,w=S.filter(e=>e.System).length,T=s.length>0&&!d,E=!!a?.has_more&&!d;return(0,W.jsxs)(Mt,{title:`Bots`,eyebrow:a?.listing===!1?`Search results`:`Recently created bots`,actions:(0,W.jsxs)(W.Fragment,{children:[(0,W.jsxs)(`button`,{className:`btn primary icon-text`,type:`button`,onClick:()=>_(!0),children:[(0,W.jsx)(Ge,{size:15}),` `,`Create bot`]}),(0,W.jsxs)(`button`,{className:`btn`,type:`button`,onClick:()=>void y(),disabled:d,children:[(0,W.jsx)(Ye,{size:15}),` `,`Refresh`]})]}),children:[p&&(0,W.jsx)(K,{children:p}),(0,W.jsxs)(`div`,{className:`metric-row`,children:[(0,W.jsx)(J,{label:`Bots on page`,value:String(S.length)}),(0,W.jsx)(J,{label:`Verified`,value:String(C),tone:`good`}),(0,W.jsx)(J,{label:`System`,value:String(w)})]}),(0,W.jsx)(Nt,{children:(0,W.jsxs)(`form`,{className:`toolbar`,onSubmit:e=>{e.preventDefault(),y()},children:[(0,W.jsxs)(`label`,{className:`searchbox`,children:[(0,W.jsx)(Ze,{size:15}),(0,W.jsx)(`input`,{value:t,onChange:e=>n(e.target.value),placeholder:`Bot ID / username`})]}),(0,W.jsxs)(`label`,{className:`gift-page-size`,children:[(0,W.jsx)(`span`,{children:`Limit`}),(0,W.jsxs)(`select`,{value:String(r),onChange:e=>i(Number(e.target.value)),children:[(0,W.jsx)(`option`,{value:`10`,children:`10`}),(0,W.jsx)(`option`,{value:`20`,children:`20`}),(0,W.jsx)(`option`,{value:`50`,children:`50`}),(0,W.jsx)(`option`,{value:`100`,children:`100`})]})]}),(0,W.jsxs)(`button`,{className:`btn primary icon-text`,type:`submit`,disabled:d,children:[d?(0,W.jsx)(L,{size:15,className:`spin`}):(0,W.jsx)(Ze,{size:15}),` `,`Search`]}),(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>void x(),disabled:!T,children:[(0,W.jsx)(_e,{size:15}),` `,`Previous page`]}),(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>void b(),disabled:!E,children:[(0,W.jsx)(ve,{size:15}),` `,`Next page`]})]})}),(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{className:`avatar-col`}),(0,W.jsx)(`th`,{children:`Bot ID`}),(0,W.jsx)(`th`,{children:`Username`}),(0,W.jsx)(`th`,{children:`Name`}),(0,W.jsx)(`th`,{children:`Owner`}),(0,W.jsx)(`th`,{children:`Verified`}),(0,W.jsx)(`th`,{children:`Type`}),(0,W.jsx)(`th`,{children:`Created`}),(0,W.jsx)(`th`,{})]})}),(0,W.jsxs)(`tbody`,{children:[S.map(t=>(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`td`,{className:`avatar-col`,children:(0,W.jsx)(`button`,{className:`avatar-link`,type:`button`,onClick:()=>e(`/bots/${t.ID}`),"aria-label":`Open bot ${t.ID}`,children:(0,W.jsx)(yn,{id:t.ID,firstName:t.FirstName,username:t.Username})})}),(0,W.jsx)(`td`,{className:`mono`,children:t.ID}),(0,W.jsx)(`td`,{children:H(t.Username)||`-`}),(0,W.jsx)(`td`,{children:t.FirstName||`-`}),(0,W.jsx)(`td`,{className:`mono`,children:t.OwnerUserID>0?t.OwnerUserID:`-`}),(0,W.jsxs)(`td`,{children:[t.Verified?(0,W.jsxs)(q,{tone:`good`,children:[(0,W.jsx)(F,{size:12}),` `,`Verified`]}):(0,W.jsx)(q,{children:`Not verified`}),` `,(0,W.jsx)(xn,{scam:t.Scam,fake:t.Fake})]}),(0,W.jsx)(`td`,{children:t.System?(0,W.jsx)(q,{tone:`warn`,children:`System`}):(0,W.jsx)(q,{children:`User`})}),(0,W.jsx)(`td`,{children:U(t.CreatedAt)}),(0,W.jsx)(`td`,{children:(0,W.jsxs)(`button`,{className:`row-link`,onClick:()=>e(`/bots/${t.ID}`),children:[(0,W.jsx)(fe,{size:14}),` `,`Details`,` `,(0,W.jsx)(ve,{size:14})]})})]},t.ID)),S.length===0&&(0,W.jsx)(It,{colSpan:9})]})]})}),h&&(0,W.jsx)(nr,{onClose:()=>_(!1),onCreated:()=>void y()})]})}function ar({onClose:e,onCreated:t}){let[n,r]=(0,g.useState)(``),[i,a]=(0,g.useState)(`all`),[o,s]=(0,g.useState)([]),c=(0,g.useMemo)(()=>!n.trim()||i===`selected`&&o.length===0,[n,i,o]);return(0,pn.createPortal)((0,W.jsx)(`div`,{className:`modal-backdrop`,role:`presentation`,children:(0,W.jsxs)(`section`,{className:`modal command-modal`,role:`dialog`,"aria-modal":`true`,"aria-label":`Send broadcast`,children:[(0,W.jsxs)(`div`,{className:`modal-head`,children:[(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`div`,{className:`eyebrow`,children:`Broadcasts`}),(0,W.jsx)(`h2`,{children:`Send broadcast`})]}),(0,W.jsx)(`button`,{className:`icon-btn`,type:`button`,onClick:e,"aria-label":`Close`,children:(0,W.jsx)(ht,{size:15})})]}),(0,W.jsxs)(`div`,{className:`command-body`,children:[(0,W.jsx)(`p`,{children:`Sends a message from the official system account (777000) to all users or to a chosen list. Delivery happens in the background and may take a few minutes for large audiences.`}),(0,W.jsxs)(`label`,{className:`form-field`,children:[(0,W.jsx)(`span`,{children:`Message`}),(0,W.jsx)(`textarea`,{value:n,onChange:e=>r(e.target.value),rows:5,maxLength:4096,placeholder:`What's new...`})]}),(0,W.jsx)(`div`,{className:`bot-create-fields`,children:(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Target`}),(0,W.jsxs)(`select`,{value:i,onChange:e=>a(e.target.value),children:[(0,W.jsx)(`option`,{value:`all`,children:`All users`}),(0,W.jsx)(`option`,{value:`selected`,children:`Selected users`})]})]})}),i===`selected`&&(0,W.jsx)(zn,{label:`Recipients`,selected:o,onChange:s})]}),(0,W.jsxs)(`div`,{className:`modal-actions`,children:[(0,W.jsx)(`button`,{className:`btn`,type:`button`,onClick:e,children:`Close`}),(0,W.jsx)(X,{label:`Send broadcast`,icon:(0,W.jsx)(Qe,{size:15}),tone:`neutral`,path:`/api/actions/create-broadcast`,disabled:c,payload:()=>({message:n.trim(),target_mode:i,user_ids:i===`selected`?o.map(e=>e.ID):void 0}),onDone:t})]})]})}),document.body)}var or={beforeID:0};function sr(){let[e,t]=(0,g.useState)(null),[n,r]=(0,g.useState)([]),[i,a]=(0,g.useState)(or),[o,s]=(0,g.useState)(!1),[c,l]=(0,g.useState)(``),[u,d]=(0,g.useState)(!1);async function f(e){s(!0),l(``);let n=new URLSearchParams({limit:`50`});e.beforeID&&n.set(`before_id`,String(e.beforeID));try{let e=await k.broadcasts(n);return t(e),e}catch(e){return l(O(e)),null}finally{s(!1)}}async function p(){r([]),a(or),await f(or)}async function m(){if(!e?.has_more)return;let t={beforeID:e.next_before_id};await f(t)&&(r(e=>[...e,i]),a(t))}async function h(){if(n.length===0)return;let e=n[n.length-1];await f(e)&&(r(e=>e.slice(0,-1)),a(e))}(0,g.useEffect)(()=>{p()},[]);let _=e?.rows??[],v=_.filter(e=>e.SentCount+e.FailedCount0&&!o,b=!!e?.has_more&&!o;return(0,W.jsxs)(Mt,{title:`Broadcasts`,eyebrow:`Announcements sent from the official system account`,actions:(0,W.jsxs)(W.Fragment,{children:[(0,W.jsxs)(`button`,{className:`btn primary icon-text`,type:`button`,onClick:()=>d(!0),children:[(0,W.jsx)(Qe,{size:15}),` `,`Send broadcast`]}),(0,W.jsxs)(`button`,{className:`btn`,type:`button`,onClick:()=>void p(),disabled:o,children:[(0,W.jsx)(Ye,{size:15}),` `,`Refresh`]})]}),children:[c&&(0,W.jsx)(K,{children:c}),(0,W.jsxs)(`div`,{className:`metric-row`,children:[(0,W.jsx)(J,{label:`Campaigns on page`,value:String(_.length)}),(0,W.jsx)(J,{label:`Still delivering`,value:String(v),tone:v>0?`warn`:`neutral`})]}),(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{children:`ID`}),(0,W.jsx)(`th`,{children:`Message`}),(0,W.jsx)(`th`,{children:`Target`}),(0,W.jsx)(`th`,{children:`Sent`}),(0,W.jsx)(`th`,{children:`Failed`}),(0,W.jsx)(`th`,{children:`Total`}),(0,W.jsx)(`th`,{children:`Created by`}),(0,W.jsx)(`th`,{children:`Created`})]})}),(0,W.jsxs)(`tbody`,{children:[_.map(e=>{let t=e.SentCount+e.FailedCount,n=e.TotalCount>0&&t>=e.TotalCount;return(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`td`,{className:`mono`,children:e.ID}),(0,W.jsx)(`td`,{className:`truncate`,children:e.Message}),(0,W.jsx)(`td`,{children:e.TargetMode===`all`?(0,W.jsx)(q,{tone:`warn`,children:`All users`}):(0,W.jsx)(q,{children:`Selected`})}),(0,W.jsx)(`td`,{children:e.SentCount}),(0,W.jsx)(`td`,{children:e.FailedCount>0?(0,W.jsx)(q,{tone:`danger`,children:e.FailedCount}):e.FailedCount}),(0,W.jsx)(`td`,{children:e.TotalCount}),(0,W.jsx)(`td`,{children:e.CreatedBy||`-`}),(0,W.jsxs)(`td`,{children:[U(e.CreatedAt),!n&&(0,W.jsx)(q,{tone:`warn`,children:`Sending`})]})]},e.ID)}),_.length===0&&(0,W.jsx)(It,{colSpan:8})]})]})}),(0,W.jsxs)(`div`,{className:`toolbar`,children:[(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>void h(),disabled:!y,children:[(0,W.jsx)(_e,{size:15}),` `,`Previous page`]}),(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>void m(),disabled:!b,children:[o?(0,W.jsx)(L,{size:15,className:`spin`}):(0,W.jsx)(ve,{size:15}),` `,`Next page`]})]}),u&&(0,W.jsx)(ar,{onClose:()=>d(!1),onCreated:()=>void p()})]})}function cr({navigate:e}){let[t,n]=(0,g.useState)(null),[r,i]=(0,g.useState)(``);(0,g.useEffect)(()=>{let e=!1;async function t(){try{let t=await k.dashboard();e||n(t)}catch(t){e||i(t instanceof Error?t.message:`Failed to load dashboard`)}}t();let r=window.setInterval(()=>void t(),15e3);return()=>{e=!0,window.clearInterval(r)}},[]);let a=t?.counts,o=t?.storage,s=t?.host;return(0,W.jsxs)(`div`,{className:`dashboard-layout`,children:[r&&(0,W.jsx)(K,{children:r}),(0,W.jsxs)(lr,{title:`Needs attention`,children:[(0,W.jsx)(ur,{icon:(0,W.jsx)(De,{}),label:`Pending reports`,value:a?St(String(a.PendingReports)):`…`,tone:a&&a.PendingReports>0?`warn`:`good`,href:`/moderation`,navigate:e}),(0,W.jsx)(ur,{icon:(0,W.jsx)(F,{}),label:`Verification requests`,value:a?St(String(a.PendingVerifications)):`…`,tone:a&&a.PendingVerifications>0?`warn`:`good`,href:`/verification`,navigate:e})]}),(0,W.jsxs)(lr,{title:`People & chats`,children:[(0,W.jsx)(ur,{icon:(0,W.jsx)(pt,{}),label:`Users`,value:a?St(String(a.Users)):`…`,href:`/accounts`,navigate:e}),(0,W.jsx)(ur,{icon:(0,W.jsx)(ce,{}),label:`Online now`,value:a?St(String(a.OnlineUsers)):`…`,sub:`last 5 min`,href:`/accounts`,navigate:e}),(0,W.jsx)(ur,{icon:(0,W.jsx)(fe,{}),label:`Bots`,value:a?St(String(a.Bots)):`…`,href:`/bots`,navigate:e}),(0,W.jsx)(ur,{icon:(0,W.jsx)(Je,{}),label:`Channels`,value:a?St(String(a.BroadcastChannels)):`…`,href:`/channels`,navigate:e}),(0,W.jsx)(ur,{icon:(0,W.jsx)(se,{}),label:`Supergroups`,value:a?St(String(a.Supergroups)):`…`,href:`/channels`,navigate:e})]}),(0,W.jsxs)(lr,{title:`Content`,children:[(0,W.jsx)(ur,{icon:(0,W.jsx)(st,{}),label:`Sticker packs`,value:a?St(String(a.StickerSets)):`…`,href:`/stickers`,navigate:e}),(0,W.jsx)(ur,{icon:(0,W.jsx)(at,{}),label:`Emoji packs`,value:a?St(String(a.EmojiSets)):`…`,href:`/emoji`,navigate:e}),(0,W.jsx)(ur,{icon:(0,W.jsx)(Ee,{}),label:`GIFs`,value:a?St(String(a.Gifs)):`…`,sub:`saved by users`,href:`/gif-catalog`,navigate:e}),(0,W.jsx)(ur,{icon:(0,W.jsx)(Se,{}),label:`Media storage used`,value:o?kt(o.PhysicalBytes):`…`,sub:o?`${o.BackendKind} backend`:void 0,href:`/storage`,navigate:e})]}),(0,W.jsxs)(lr,{title:`Server health`,hint:s?.Ready?void 0:`waiting for first sample…`,children:[(0,W.jsx)(dr,{icon:(0,W.jsx)(xe,{}),label:`CPU load`,percent:s?.Ready?s.CPUPercent:void 0,valueText:s?.Ready?`${s.CPUPercent.toFixed(0)}%`:`…`}),(0,W.jsx)(dr,{icon:(0,W.jsx)(ze,{}),label:`RAM used`,percent:s?.Ready&&s.MemTotalBytes>0?s.MemUsedBytes/s.MemTotalBytes*100:void 0,valueText:s?.Ready?kt(String(s.MemUsedBytes)):`…`,sub:s?.Ready?`of ${kt(String(s.MemTotalBytes))}`:void 0}),(0,W.jsx)(dr,{icon:(0,W.jsx)(Ae,{}),label:`Disk free`,percent:s?.Ready&&s.DiskTotalBytes>0?(s.DiskTotalBytes-s.DiskFreeBytes)/s.DiskTotalBytes*100:void 0,valueText:s?.Ready?kt(String(s.DiskFreeBytes)):`…`,sub:s?.Ready?`of ${kt(String(s.DiskTotalBytes))}`:void 0,warnAbove:85})]})]})}function lr({title:e,hint:t,children:n}){return(0,W.jsxs)(`div`,{className:`dashboard-section`,children:[(0,W.jsxs)(`div`,{className:`dashboard-section-title`,children:[e,t&&(0,W.jsx)(`span`,{children:t})]}),(0,W.jsx)(`div`,{className:`dashboard-grid`,children:n})]})}function ur({icon:e,label:t,value:n,sub:r,tone:i=`neutral`,href:a,navigate:o}){let s=i===`neutral`?``:` ${i}`,c=(0,W.jsxs)(W.Fragment,{children:[(0,W.jsxs)(`div`,{className:`stat-tile-head`,children:[(0,W.jsx)(`span`,{className:`stat-tile-icon`,children:e}),i===`warn`&&(0,W.jsx)(ae,{size:15,className:`stat-tile-open`})]}),(0,W.jsx)(`div`,{className:`stat-tile-value`,children:n}),(0,W.jsx)(`div`,{className:`stat-tile-label`,children:t}),r&&(0,W.jsx)(`div`,{className:`stat-tile-sub`,children:r})]});return a&&o?(0,W.jsx)(`a`,{className:`stat-tile clickable${s}`,href:a,onClick:e=>{e.preventDefault(),o(a)},children:c}):(0,W.jsx)(`div`,{className:`stat-tile${s}`,children:c})}function dr({icon:e,label:t,percent:n,valueText:r,sub:i,warnAbove:a=90}){let o=n===void 0?0:Math.max(0,Math.min(100,n)),s=n===void 0?`neutral`:n>=a?`danger`:n>=a-15?`warn`:`neutral`;return(0,W.jsxs)(`div`,{className:`stat-tile${s===`neutral`?``:` ${s}`}`,children:[(0,W.jsx)(`div`,{className:`stat-tile-head`,children:(0,W.jsx)(`span`,{className:`stat-tile-icon`,children:e})}),(0,W.jsx)(`div`,{className:`stat-tile-value`,children:r}),(0,W.jsx)(`div`,{className:`stat-tile-label`,children:t}),i&&(0,W.jsx)(`div`,{className:`stat-tile-sub`,children:i}),(0,W.jsx)(`div`,{className:`stat-tile-bar`,children:(0,W.jsx)(`span`,{style:{width:`${o}%`}})})]})}function fr({channelID:e,msgID:t,navigate:n}){let[r,i]=(0,g.useState)(null),[a,o]=(0,g.useState)(``);async function s(){o(``);try{i(await k.groupMessage(e,t))}catch(e){o(O(e))}}if((0,g.useEffect)(()=>{s()},[e,t]),a)return(0,W.jsx)(K,{children:a});if(!r)return(0,W.jsx)(Lt,{label:`Loading`});let c=r.Message;return(0,W.jsx)(Mt,{title:`Group Message #${c.ID}`,eyebrow:`Message Detail`,actions:(0,W.jsxs)(`button`,{className:`btn icon-text`,onClick:()=>n(`/messages/groups`),children:[(0,W.jsx)(ue,{size:15}),` `,`Back to group messages`]}),children:(0,W.jsxs)(`div`,{className:`stacked-sections`,children:[(0,W.jsxs)(`section`,{className:`entity-head`,children:[(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`div`,{className:`entity-title`,children:`Channel / Group ${c.ChannelID}`}),(0,W.jsx)(`div`,{className:`entity-subtitle`,children:`Sender ${c.SenderUserID} · ${yt(c.Date)}`})]}),(0,W.jsxs)(`div`,{className:`entity-badges`,children:[c.Deleted?(0,W.jsx)(q,{tone:`danger`,children:`Deleted`}):(0,W.jsx)(q,{children:`Live`}),c.Pinned&&(0,W.jsx)(q,{tone:`warn`,children:`Pinned`}),c.Post&&(0,W.jsx)(q,{children:`Channel post`}),(0,W.jsxs)(q,{children:[`pts `,c.PTS]})]})]}),(0,W.jsxs)(`div`,{className:`summary-grid`,children:[(0,W.jsx)(Y,{label:`Message ID`,value:String(c.ID),mono:!0}),(0,W.jsx)(Y,{label:`Channel / Group`,value:String(c.ChannelID),mono:!0}),(0,W.jsx)(Y,{label:`From Peer`,value:`${c.FromPeerType}:${c.FromPeerID}`,mono:!0}),(0,W.jsx)(Y,{label:`Views`,value:String(c.ViewsCount)})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Channel Message Row`,text:`channel_messages read-only snapshot`}),(0,W.jsx)(Rt,{value:r.MessageJSON})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Channel Row`,text:`channels read-only snapshot`}),(0,W.jsx)(Rt,{value:r.ChannelJSON})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Channel Update Events`,text:`durable channel_update_events`}),(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{children:`PTS`}),(0,W.jsx)(`th`,{children:`Count`}),(0,W.jsx)(`th`,{children:`Type`}),(0,W.jsx)(`th`,{children:`Message ID`}),(0,W.jsx)(`th`,{children:`Sender`}),(0,W.jsx)(`th`,{children:`Time`})]})}),(0,W.jsxs)(`tbody`,{children:[r.UpdateEvents.map(e=>(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`td`,{children:e.PTS}),(0,W.jsx)(`td`,{children:e.PTSCount}),(0,W.jsx)(`td`,{children:e.Type}),(0,W.jsx)(`td`,{children:e.MessageID}),(0,W.jsx)(`td`,{children:e.SenderUserID}),(0,W.jsx)(`td`,{children:yt(e.Date)})]},`${e.PTS}-${e.Type}-${e.MessageID}`)),r.UpdateEvents.length===0&&(0,W.jsx)(It,{colSpan:6})]})]})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Event JSON`}),(0,W.jsxs)(`div`,{className:`raw-grid`,children:[r.UpdateEvents.map(e=>(0,W.jsx)(Rt,{value:e.JSON},`${e.PTS}-${e.Type}-json`)),r.UpdateEvents.length===0&&(0,W.jsx)(`div`,{className:`empty-panel`,children:`No results`})]})]})]})})}function pr({navigate:e}){let[t,n]=(0,g.useState)(null),[r,i]=(0,g.useState)(``),[a,o]=(0,g.useState)(``),[s,c]=(0,g.useState)(`100`),[l,u]=(0,g.useState)(null),[d,f]=(0,g.useState)(``);async function p(e=!1){if(f(``),!t){f(`Search and select a supergroup or channel first`);return}let n=new URLSearchParams({channel_id:String(t.ID),limit:s});if(e&&l?.rows.length){let e=l.rows[l.rows.length-1];n.set(`before_date`,String(e.Date)),n.set(`before_id`,String(e.ID)),i(String(e.Date)),o(String(e.ID))}else r&&n.set(`before_date`,r),a&&n.set(`before_id`,a);try{u(await k.groupMessages(n))}catch(e){f(O(e))}}function m(e){n(e),i(``),o(``),u(null)}let h=l?.rows??[];return(0,W.jsxs)(Mt,{title:`Group Messages`,eyebrow:`Supergroup / channel messages`,children:[d&&(0,W.jsx)(K,{children:d}),(0,W.jsxs)(Nt,{children:[(0,W.jsx)(`div`,{className:`message-selector-grid single`,children:(0,W.jsx)(Vn,{label:`Channel / Group`,value:t,onChange:m})}),(0,W.jsxs)(`form`,{className:`toolbar message-query`,onSubmit:e=>{e.preventDefault(),p(!1)},children:[(0,W.jsx)(`input`,{value:r,onChange:e=>i(e.target.value),placeholder:`before_date cursor`}),(0,W.jsx)(`input`,{value:a,onChange:e=>o(e.target.value),placeholder:`before_msg_id cursor`}),(0,W.jsx)(`input`,{className:`small-input`,value:s,onChange:e=>c(e.target.value),placeholder:`limit <= 100`}),(0,W.jsxs)(`button`,{className:`btn primary icon-text`,type:`submit`,children:[(0,W.jsx)(Ze,{size:15}),` `,`Search messages`]}),h.length?(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>p(!0),children:[(0,W.jsx)(ve,{size:15}),` `,`Next page`]}):null]})]}),(0,W.jsxs)(`div`,{className:`metric-row`,children:[(0,W.jsx)(J,{label:`Messages on page`,value:String(h.length)}),(0,W.jsx)(J,{label:`With media`,value:String(h.filter(e=>e.Media&&e.Media!==`{}`).length)}),(0,W.jsx)(J,{label:`Channel posts`,value:String(h.filter(e=>e.Post).length)}),(0,W.jsx)(J,{label:`Channel / Group`,value:t?`${t.Title||vt(t)} (${t.ID})`:`-`})]}),(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{children:`Message ID`}),(0,W.jsx)(`th`,{children:`Time`}),(0,W.jsx)(`th`,{children:`Sender`}),(0,W.jsx)(`th`,{children:`From Peer`}),(0,W.jsx)(`th`,{children:`PTS`}),(0,W.jsx)(`th`,{children:`Views`}),(0,W.jsx)(`th`,{children:`Status`}),(0,W.jsx)(`th`,{children:`Body`}),(0,W.jsx)(`th`,{})]})}),(0,W.jsxs)(`tbody`,{children:[h.map(t=>(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`td`,{className:`mono`,children:t.ID}),(0,W.jsx)(`td`,{children:yt(t.Date)}),(0,W.jsx)(`td`,{className:`mono`,children:t.SenderUserID}),(0,W.jsxs)(`td`,{className:`mono`,children:[t.FromPeerType,`:`,t.FromPeerID]}),(0,W.jsx)(`td`,{children:t.PTS}),(0,W.jsx)(`td`,{children:t.ViewsCount}),(0,W.jsx)(`td`,{children:t.Deleted?(0,W.jsx)(q,{tone:`danger`,children:`Deleted`}):t.Pinned?(0,W.jsx)(q,{tone:`warn`,children:`Pinned`}):(0,W.jsx)(q,{children:`Live`})}),(0,W.jsx)(`td`,{className:`truncate`,children:t.Body}),(0,W.jsx)(`td`,{children:(0,W.jsxs)(`button`,{className:`row-link`,onClick:()=>e(`/messages/groups/detail?channel_id=${t.ChannelID}&msg_id=${t.ID}`),children:[`Details`,` `,(0,W.jsx)(ve,{size:14})]})})]},`${t.ChannelID}-${t.ID}`)),h.length===0&&(0,W.jsx)(It,{colSpan:9})]})]})})]})}function mr({ownerUserID:e,msgID:t,navigate:n}){let[r,i]=(0,g.useState)(null),[a,o]=(0,g.useState)(``);async function s(){o(``);try{i(await k.message(e,t))}catch(e){o(O(e))}}if((0,g.useEffect)(()=>{s()},[e,t]),a)return(0,W.jsx)(K,{children:a});if(!r)return(0,W.jsx)(Lt,{label:`Loading`});let c=r.Message;return(0,W.jsx)(Mt,{title:`Message #${c.BoxID}`,eyebrow:`Message Detail`,actions:(0,W.jsxs)(`button`,{className:`btn icon-text`,onClick:()=>n(`/messages/private`),children:[(0,W.jsx)(ue,{size:15}),` `,`Back to private messages`]}),children:(0,W.jsx)(Pt,{main:(0,W.jsxs)(`div`,{className:`stacked-sections`,children:[(0,W.jsxs)(`section`,{className:`entity-head`,children:[(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`div`,{className:`entity-title`,children:`Owner ${c.OwnerUserID} · Peer ${c.PeerID}`}),(0,W.jsx)(`div`,{className:`entity-subtitle`,children:`Sender ${c.FromUserID} · ${yt(c.Date)}`})]}),(0,W.jsxs)(`div`,{className:`entity-badges`,children:[c.Deleted?(0,W.jsx)(q,{tone:`danger`,children:`Deleted`}):(0,W.jsx)(q,{children:`Live`}),(0,W.jsxs)(q,{children:[`pts `,c.PTS]}),(0,W.jsx)(q,{children:c.Outgoing?`Outgoing`:`Incoming`})]})]}),(0,W.jsxs)(`div`,{className:`summary-grid`,children:[(0,W.jsx)(Y,{label:`Message box ID`,value:String(c.BoxID),mono:!0}),(0,W.jsx)(Y,{label:`Private message ID`,value:String(c.PrivateMessageID),mono:!0}),(0,W.jsx)(Y,{label:`Message sender`,value:String(c.MessageSenderID),mono:!0}),(0,W.jsx)(Y,{label:`Time`,value:yt(c.Date)})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Message Box`,text:`message_boxes read-only snapshot`}),(0,W.jsx)(Rt,{value:r.MessageJSON})]}),(0,W.jsxs)(`div`,{className:`raw-grid`,children:[(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Dialog Row`,text:`dialogs read-only snapshot`}),(0,W.jsx)(Rt,{value:r.DialogJSON})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Private Message Row`,text:`private_messages read-only snapshot`}),(0,W.jsx)(Rt,{value:r.PrivateJSON})]})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Update Events`,text:`durable user_update_events`}),(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{children:`PTS`}),(0,W.jsx)(`th`,{children:`Count`}),(0,W.jsx)(`th`,{children:`Type`}),(0,W.jsx)(`th`,{children:`Time`})]})}),(0,W.jsxs)(`tbody`,{children:[r.UpdateEvents.map(e=>(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`td`,{children:e.PTS}),(0,W.jsx)(`td`,{children:e.PTSCount}),(0,W.jsx)(`td`,{children:e.Type}),(0,W.jsx)(`td`,{children:yt(e.Date)})]},`${e.PTS}-${e.Type}`)),r.UpdateEvents.length===0&&(0,W.jsx)(It,{colSpan:4})]})]})})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Dispatch Queue`,text:`online/offline dispatch_outbox`}),(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{children:`ID`}),(0,W.jsx)(`th`,{children:`User ID`}),(0,W.jsx)(`th`,{children:`PTS`}),(0,W.jsx)(`th`,{children:`Type`}),(0,W.jsx)(`th`,{children:`Status`}),(0,W.jsx)(`th`,{children:`Attempts`}),(0,W.jsx)(`th`,{children:`Updated`})]})}),(0,W.jsxs)(`tbody`,{children:[r.Outbox.map(e=>(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`td`,{children:e.ID}),(0,W.jsx)(`td`,{children:e.TargetUserID}),(0,W.jsx)(`td`,{children:e.PTS}),(0,W.jsx)(`td`,{children:e.EventType}),(0,W.jsx)(`td`,{children:e.Status}),(0,W.jsx)(`td`,{children:e.Attempts}),(0,W.jsx)(`td`,{children:U(e.UpdatedAt)})]},e.ID)),r.Outbox.length===0&&(0,W.jsx)(It,{colSpan:7})]})]})})]})]}),side:(0,W.jsxs)(`section`,{className:`action-dock`,children:[(0,W.jsx)(`div`,{className:`dock-title`,children:`Operations`}),(0,W.jsx)(X,{label:`Delete this message`,icon:(0,W.jsx)(lt,{size:15}),path:`/api/actions/delete-messages`,payload:()=>({owner_user_id:c.OwnerUserID,peer_id:c.PeerID,ids:[c.BoxID],revoke:!0}),onDone:s})]})})})}function hr({navigate:e}){let[t,n]=(0,g.useState)(null),[r,i]=(0,g.useState)(null),[a,o]=(0,g.useState)(``),[s,c]=(0,g.useState)(``),[l,u]=(0,g.useState)(`100`),[d,f]=(0,g.useState)(``),[p,m]=(0,g.useState)(!0),[h,_]=(0,g.useState)(!1),[v,y]=(0,g.useState)(``),[b,x]=(0,g.useState)(`1`),[S,C]=(0,g.useState)(null),[w,T]=(0,g.useState)(``);async function E(e=!1){if(T(``),!t||!r){T(`Search and select the owner user and peer user first`);return}let n=new URLSearchParams({owner_user_id:String(t.ID),peer_id:String(r.ID),limit:l});if(e&&S?.rows.length){let e=S.rows[S.rows.length-1];n.set(`before_date`,String(e.Date)),n.set(`before_id`,String(e.BoxID)),o(String(e.Date)),c(String(e.BoxID))}else a&&n.set(`before_date`,a),s&&n.set(`before_id`,s);try{C(await k.messages(n))}catch(e){T(O(e))}}function D(e){n(e),o(``),c(``),C(null)}function A(e){i(e),o(``),c(``),C(null)}return(0,W.jsxs)(Mt,{title:`Private Messages`,eyebrow:`Private message boxes`,children:[w&&(0,W.jsx)(K,{children:w}),(0,W.jsxs)(Nt,{children:[(0,W.jsxs)(`div`,{className:`message-selector-grid`,children:[(0,W.jsx)(Rn,{label:`Owner user`,value:t,onChange:D}),(0,W.jsx)(Rn,{label:`Peer user`,value:r,onChange:A})]}),(0,W.jsxs)(`form`,{className:`toolbar message-query`,onSubmit:e=>{e.preventDefault(),E(!1)},children:[(0,W.jsx)(`input`,{value:a,onChange:e=>o(e.target.value),placeholder:`before_date cursor`}),(0,W.jsx)(`input`,{value:s,onChange:e=>c(e.target.value),placeholder:`before_msg_id cursor`}),(0,W.jsx)(`input`,{className:`small-input`,value:l,onChange:e=>u(e.target.value),placeholder:`limit <= 100`}),(0,W.jsxs)(`button`,{className:`btn primary icon-text`,type:`submit`,children:[(0,W.jsx)(Ze,{size:15}),` `,`Search messages`]}),S?.rows.length?(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>E(!0),children:[(0,W.jsx)(ve,{size:15}),` `,`Next page`]}):null]})]}),(0,W.jsxs)(`div`,{className:`metric-row`,children:[(0,W.jsx)(J,{label:`Messages on page`,value:String(S?.rows.length??0)}),(0,W.jsx)(J,{label:`Deleted`,value:String((S?.rows??[]).filter(e=>e.Deleted).length),tone:`danger`}),(0,W.jsx)(J,{label:`Outgoing`,value:String((S?.rows??[]).filter(e=>e.Outgoing).length)}),(0,W.jsx)(J,{label:`Owner / Peer`,value:t&&r?`${_t(t)} / ${_t(r)}`:`-`})]}),(0,W.jsxs)(`div`,{className:`operation-row`,children:[(0,W.jsxs)(`div`,{className:`operation-box`,children:[(0,W.jsxs)(`div`,{className:`operation-title`,children:[(0,W.jsx)(lt,{size:15}),` `,`Delete selected messages`]}),(0,W.jsx)(`input`,{value:d,onChange:e=>f(e.target.value),placeholder:`Message IDs, comma separated`}),(0,W.jsxs)(`label`,{className:`checkline`,children:[(0,W.jsx)(`input`,{type:`checkbox`,checked:p,onChange:e=>m(e.target.checked)}),` `,`Revoke for both sides`]}),(0,W.jsx)(X,{path:`/api/actions/delete-messages`,label:`Dry-run delete`,payload:()=>({owner_user_id:t?.ID??0,peer_id:r?.ID??0,ids:At(d,`Message IDs are invalid`),revoke:p})})]}),(0,W.jsxs)(`div`,{className:`operation-box`,children:[(0,W.jsxs)(`div`,{className:`operation-title`,children:[(0,W.jsx)(je,{size:15}),` `,`Clear private history`]}),(0,W.jsx)(`input`,{value:v,onChange:e=>y(e.target.value),placeholder:`max_id cutoff`}),(0,W.jsx)(`input`,{value:b,onChange:e=>x(e.target.value),placeholder:`max_batches`}),(0,W.jsxs)(`label`,{className:`checkline`,children:[(0,W.jsx)(`input`,{type:`checkbox`,checked:p,onChange:e=>m(e.target.checked)}),` `,`Revoke for both sides`]}),(0,W.jsxs)(`label`,{className:`checkline`,children:[(0,W.jsx)(`input`,{type:`checkbox`,checked:h,onChange:e=>_(e.target.checked)}),` `,`Clear only this side`]}),(0,W.jsx)(X,{path:`/api/actions/delete-history`,label:`Dry-run clear history`,payload:()=>({owner_user_id:t?.ID??0,peer_id:r?.ID??0,max_id:xt(v),max_batches:xt(b),just_clear:h,revoke:p})})]})]}),(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{children:`Message ID`}),(0,W.jsx)(`th`,{children:`Time`}),(0,W.jsx)(`th`,{children:`Sender`}),(0,W.jsx)(`th`,{children:`Direction`}),(0,W.jsx)(`th`,{children:`PTS`}),(0,W.jsx)(`th`,{children:`Status`}),(0,W.jsx)(`th`,{children:`Body`}),(0,W.jsx)(`th`,{})]})}),(0,W.jsxs)(`tbody`,{children:[S?.rows.map(t=>(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`td`,{className:`mono`,children:t.BoxID}),(0,W.jsx)(`td`,{children:yt(t.Date)}),(0,W.jsx)(`td`,{className:`mono`,children:t.FromUserID}),(0,W.jsx)(`td`,{children:t.Outgoing?`Outgoing`:`Incoming`}),(0,W.jsx)(`td`,{children:t.PTS}),(0,W.jsx)(`td`,{children:t.Deleted?(0,W.jsx)(q,{tone:`danger`,children:`Deleted`}):(0,W.jsx)(q,{children:`Live`})}),(0,W.jsx)(`td`,{className:`truncate`,children:t.Body}),(0,W.jsx)(`td`,{children:(0,W.jsxs)(`button`,{className:`row-link`,onClick:()=>e(`/messages/private/detail?owner_user_id=${t.OwnerUserID}&msg_id=${t.BoxID}`),children:[`Details`,` `,(0,W.jsx)(ve,{size:14})]})})]},`${t.OwnerUserID}-${t.BoxID}`)),(!S||S.rows.length===0)&&(0,W.jsx)(It,{colSpan:8})]})]})})]})}var gr=c(o(((e,t)=>{typeof document<`u`&&typeof navigator<`u`&&(function(n,r){typeof e==`object`&&t!==void 0?t.exports=r():typeof define==`function`&&define.amd?define(r):(n=typeof globalThis<`u`?globalThis:n||self,n.lottie=r())})(e,(function(){var n=``,r=!1,i=-999999,a=function(e){r=!!e},o=function(){return r},s=function(e){n=e},c=function(){return n};function l(e){return document.createElement(e)}function u(e,t){var n,r=e.length,i;for(n=0;n1?n[1]=1:n[1]<=0&&(n[1]=0),I(n[0],n[1],n[2])}function L(e,t){var n=te(e[0]*255,e[1]*255,e[2]*255);return n[2]+=t,n[2]>1?n[2]=1:n[2]<0&&(n[2]=0),I(n[0],n[1],n[2])}function re(e,t){var n=te(e[0]*255,e[1]*255,e[2]*255);return n[0]+=t/360,n[0]>1?--n[0]:n[0]<0&&(n[0]+=1),I(n[0],n[1],n[2])}(function(){var e=[],t,n;for(t=0;t<256;t+=1)n=t.toString(16),e[t]=n.length===1?`0`+n:n;return function(t,n,r){return t<0&&(t=0),n<0&&(n=0),r<0&&(r=0),`#`+e[t]+e[n]+e[r]}})();var ie=function(e){g=!!e},ae=function(){return g},oe=function(e){_=e},se=function(){return _},ce=function(){return v},le=function(e){E=e},ue=function(){return E},de=function(e){y=e};function R(e){return document.createElementNS(`http://www.w3.org/2000/svg`,e)}function fe(e){"@babel/helpers - typeof";return fe=typeof Symbol==`function`&&typeof Symbol.iterator==`symbol`?function(e){return typeof e}:function(e){return e&&typeof Symbol==`function`&&e.constructor===Symbol&&e!==Symbol.prototype?`symbol`:typeof e},fe(e)}var pe=function(){var e=1,t=[],n,r,i={onmessage:function(){},postMessage:function(e){n({data:e})}},a={postMessage:function(e){i.onmessage({data:e})}};function s(e){if(window.Worker&&window.Blob&&o()){var t=new Blob([`var _workerSelf = self; self.onmessage = `,e.toString()],{type:`text/javascript`}),r=URL.createObjectURL(t);return new Worker(r)}return n=e,i}function c(){r||(r=s(function(e){function t(){function e(t,n){var o,s,c=t.length,l,u,d,f;for(s=0;s=0;--t)if(e[t].ty===`sh`)if(e[t].ks.k.i)a(e[t].ks.k);else for(o=e[t].ks.k.length,r=0;rn[0]?!0:n[0]>e[0]?!1:e[1]>n[1]?!0:n[1]>e[1]?!1:e[2]>n[2]?!0:n[2]>e[2]?!1:null}var s=function(){var e=[4,4,14];function t(e){var t=e.t.d;e.t.d={k:[{s:t,t:0}]}}function n(e){var n,r=e.length;for(n=0;n=0;--n)if(e[n].ty===`sh`)if(e[n].ks.k.i)e[n].ks.k.c=e[n].closed;else for(a=e[n].ks.k.length,i=0;i500)&&(this._imageLoaded(),clearInterval(n)),t+=1}.bind(this),50)}function a(t){var n=r(t,this.assetsPath,this.path),i=R(`image`);b?this.testImageLoaded(i):i.addEventListener(`load`,this._imageLoaded,!1),i.addEventListener(`error`,function(){a.img=e,this._imageLoaded()}.bind(this),!1),i.setAttributeNS(`http://www.w3.org/1999/xlink`,`href`,n),this._elementHelper.append?this._elementHelper.append(i):this._elementHelper.appendChild(i);var a={img:i,assetData:t};return a}function o(t){var n=r(t,this.assetsPath,this.path),i=l(`img`);i.crossOrigin=`anonymous`,i.addEventListener(`load`,this._imageLoaded,!1),i.addEventListener(`error`,function(){a.img=e,this._imageLoaded()}.bind(this),!1),i.src=n;var a={img:i,assetData:t};return a}function s(e){var t={assetData:e},n=r(e,this.assetsPath,this.path);return pe.loadData(n,function(e){t.img=e,this._footageLoaded()}.bind(this),function(){t.img={},this._footageLoaded()}.bind(this)),t}function c(e,t){this.imagesLoadedCb=t;var n,r=e.length;for(n=0;nthis.animationData.op&&(this.animationData.op=e.op,this.totalFrames=Math.floor(e.op-this.animationData.ip));var t=this.animationData.layers,n,r=t.length,i=e.layers,a,o=i.length;for(a=0;athis.timeCompleted&&(this.currentFrame=this.timeCompleted),this.trigger(`enterFrame`),this.renderFrame(),this.trigger(`drawnFrame`)},z.prototype.renderFrame=function(){if(!(this.isLoaded===!1||!this.renderer))try{this.expressionsPlugin&&this.expressionsPlugin.resetFrame(),this.renderer.renderFrame(this.currentFrame+this.firstFrame)}catch(e){this.triggerRenderFrameError(e)}},z.prototype.play=function(e){e&&this.name!==e||this.isPaused===!0&&(this.isPaused=!1,this.trigger(`_play`),this.audioController.resume(),this._idle&&(this._idle=!1,this.trigger(`_active`)))},z.prototype.pause=function(e){e&&this.name!==e||this.isPaused===!1&&(this.isPaused=!0,this.trigger(`_pause`),this._idle=!0,this.trigger(`_idle`),this.audioController.pause())},z.prototype.togglePause=function(e){e&&this.name!==e||(this.isPaused===!0?this.play():this.pause())},z.prototype.stop=function(e){e&&this.name!==e||(this.pause(),this.playCount=0,this._completedLoop=!1,this.setCurrentRawFrameValue(0))},z.prototype.getMarkerData=function(e){for(var t,n=0;n=this.totalFrames-1&&this.frameModifier>0?!this.loop||this.playCount===this.loop?this.checkSegments(t>this.totalFrames?t%this.totalFrames:0)||(n=!0,t=this.totalFrames-1):t>=this.totalFrames?(this.playCount+=1,this.checkSegments(t%this.totalFrames)||(this.setCurrentRawFrameValue(t%this.totalFrames),this._completedLoop=!0,this.trigger(`loopComplete`))):this.setCurrentRawFrameValue(t):t<0?this.checkSegments(t%this.totalFrames)||(this.loop&&!(this.playCount--<=0&&this.loop!==!0)?(this.setCurrentRawFrameValue(this.totalFrames+t%this.totalFrames),this._completedLoop?this.trigger(`loopComplete`):this._completedLoop=!0):(n=!0,t=0)):this.setCurrentRawFrameValue(t),n&&(this.setCurrentRawFrameValue(t),this.pause(),this.trigger(`complete`))}},z.prototype.adjustSegment=function(e,t){this.playCount=0,e[1]0&&(this.playSpeed<0?this.setSpeed(-this.playSpeed):this.setDirection(-1)),this.totalFrames=e[0]-e[1],this.timeCompleted=this.totalFrames,this.firstFrame=e[1],this.setCurrentRawFrameValue(this.totalFrames-.001-t)):e[1]>e[0]&&(this.frameModifier<0&&(this.playSpeed<0?this.setSpeed(-this.playSpeed):this.setDirection(1)),this.totalFrames=e[1]-e[0],this.timeCompleted=this.totalFrames,this.firstFrame=e[0],this.setCurrentRawFrameValue(.001+t)),this.trigger(`segmentStart`)},z.prototype.setSegment=function(e,t){var n=-1;this.isPaused&&(this.currentRawFrame+this.firstFramet&&(n=t-e)),this.firstFrame=e,this.totalFrames=t-e,this.timeCompleted=this.totalFrames,n!==-1&&this.goToAndStop(n,!0)},z.prototype.playSegments=function(e,t){if(t&&(this.segments.length=0),Se(e[0])===`object`){var n,r=e.length;for(n=0;n=0;--n)t[n].animation.destroy(e)}function T(e,t,n){var r=[].concat([].slice.call(document.getElementsByClassName(`lottie`)),[].slice.call(document.getElementsByClassName(`bodymovin`))),i,a=r.length;for(i=0;i0?n=c:t=c;while(Math.abs(s)>a&&++l=i?g(e,d,t,n):f===0?d:h(e,a,a+c,t,n)}},e}(),Te=function(){function e(e){return e.concat(m(e.length))}return{double:e}}(),Ee=function(){return function(e,t,n){var r=0,i=e,a=m(i),o={newElement:s,release:c};function s(){var e;return r?(--r,e=a[r]):e=t(),e}function c(e){r===i&&(a=Te.double(a),i*=2),n&&n(e),a[r]=e,r+=1}return o}}(),De=function(){function e(){return{addedLength:0,percents:p(`float32`,ue()),lengths:p(`float32`,ue())}}return Ee(8,e)}(),Oe=function(){function e(){return{lengths:[],totalLength:0}}function t(e){var t,n=e.lengths.length;for(t=0;t-.001&&o<.001}function n(n,r,i,a,o,s,c,l,u){if(i===0&&s===0&&u===0)return t(n,r,a,o,c,l);var d=e.sqrt(e.pow(a-n,2)+e.pow(o-r,2)+e.pow(s-i,2)),f=e.sqrt(e.pow(c-n,2)+e.pow(l-r,2)+e.pow(u-i,2)),p=e.sqrt(e.pow(c-a,2)+e.pow(l-o,2)+e.pow(u-s,2)),m=d>f?d>p?d-f-p:p-f-d:p>f?p-f-d:f-d-p;return m>-1e-4&&m<1e-4}var r=function(){return function(e,t,n,r){var i=ue(),a,o,s,c,l,u=0,d,f=[],p=[],m=De.newElement();for(s=n.length,a=0;ao?-1:1,l=!0;l;)if(r[a]<=o&&r[a+1]>o?(s=(o-r[a])/(r[a+1]-r[a]),l=!1):a+=c,a<0||a>=i-1){if(a===i-1)return n[a];l=!1}return n[a]+(n[a+1]-n[a])*s}function l(t,n,r,i,a,o){var s=c(a,o),l=1-s;return[e.round((l*l*l*t[0]+(s*l*l+l*s*l+l*l*s)*r[0]+(s*s*l+l*s*s+s*l*s)*i[0]+s*s*s*n[0])*1e3)/1e3,e.round((l*l*l*t[1]+(s*l*l+l*s*l+l*l*s)*r[1]+(s*s*l+l*s*s+s*l*s)*i[1]+s*s*s*n[1])*1e3)/1e3]}var u=p(`float32`,8);function d(t,n,r,i,a,o,s){a<0?a=0:a>1&&(a=1);var l=c(a,s);o=o>1?1:o;var d=c(o,s),f,p=t.length,m=1-l,h=1-d,g=m*m*m,_=l*m*m*3,v=l*l*m*3,y=l*l*l,b=m*m*h,x=l*m*h+m*l*h+m*m*d,S=l*l*h+m*l*d+l*m*d,C=l*l*d,w=m*h*h,T=l*h*h+m*d*h+m*h*d,E=l*d*h+m*d*d+l*h*d,D=l*d*d,O=h*h*h,k=d*h*h+h*d*h+h*h*d,A=d*d*h+h*d*d+d*h*d,j=d*d*d;for(f=0;f=l.t-n){c.h&&(c=l),i=0;break}if(l.t-n>e){i=a;break}a=v||e=v?x.points.length-1:0;for(f=x.points[S].point.length,d=0;d=T&&C=v)r[0]=b[0],r[1]=b[1],r[2]=b[2];else if(e<=y)r[0]=c.s[0],r[1]=c.s[1],r[2]=c.s[2];else{var j=Ie(c.s),M=Ie(b),N=(e-y)/(v-y);Fe(r,Pe(j,M,N))}else for(a=0;a=v?m=1:e1e-6?(f=Math.acos(p),m=Math.sin(f),h=Math.sin((1-n)*f)/m,g=Math.sin(n*f)/m):(h=1-n,g=n),r[0]=h*i+g*c,r[1]=h*a+g*l,r[2]=h*o+g*u,r[3]=h*s+g*d,r}function Fe(e,t){var n=t[0],r=t[1],i=t[2],a=t[3],o=Math.atan2(2*r*a-2*n*i,1-2*r*r-2*i*i),s=Math.asin(2*n*r+2*i*a),c=Math.atan2(2*n*a-2*r*i,1-2*n*n-2*i*i);e[0]=o/D,e[1]=s/D,e[2]=c/D}function Ie(e){var t=e[0]*D,n=e[1]*D,r=e[2]*D,i=Math.cos(t/2),a=Math.cos(n/2),o=Math.cos(r/2),s=Math.sin(t/2),c=Math.sin(n/2),l=Math.sin(r/2),u=i*a*o-s*c*l;return[s*c*o+i*a*l,s*a*o+i*c*l,i*c*o-s*a*l,u]}function Le(){var e=this.comp.renderedFrame-this.offsetTime,t=this.keyframes[0].t-this.offsetTime,n=this.keyframes[this.keyframes.length-1].t-this.offsetTime;if(!(e===this._caching.lastFrame||this._caching.lastFrame!==je&&(this._caching.lastFrame>=n&&e>=n||this._caching.lastFrame=e&&(this._caching._lastKeyframeIndex=-1,this._caching.lastIndex=0);var r=this.interpolateValue(e,this._caching);this.pv=r}return this._caching.lastFrame=e,this.pv}function Re(e){var t;if(this.propType===`unidimensional`)t=e*this.mult,Me(this.v-t)>1e-5&&(this.v=t,this._mdf=!0);else for(var n=0,r=this.v.length;n1e-5&&(this.v[n]=t,this._mdf=!0),n+=1}function ze(){if(!(this.elem.globalData.frameId===this.frameId||!this.effectsSequence.length)){if(this.lock){this.setVValue(this.pv);return}this.lock=!0,this._mdf=this._isFirstFrame;var e,t=this.effectsSequence.length,n=this.kf?this.pv:this.data.k;for(e=0;e=this._maxLength&&this.doubleArrayLength(),n){case`v`:a=this.v;break;case`i`:a=this.i;break;case`o`:a=this.o;break;default:a=[];break}(!a[r]||a[r]&&!i)&&(a[r]=Ke.newElement()),a[r][0]=e,a[r][1]=t},qe.prototype.setTripleAt=function(e,t,n,r,i,a,o,s){this.setXYAt(e,t,`v`,o,s),this.setXYAt(n,r,`o`,o,s),this.setXYAt(i,a,`i`,o,s)},qe.prototype.reverse=function(){var e=new qe;e.setPathData(this.c,this._length);var t=this.v,n=this.o,r=this.i,i=0;this.c&&(e.setTripleAt(t[0][0],t[0][1],r[0][0],r[0][1],n[0][0],n[0][1],0,!1),i=1);var a=this._length-1,o=this._length,s;for(s=i;s=p[p.length-1].t-this.offsetTime)i=p[p.length-1].s?p[p.length-1].s[0]:p[p.length-2].e[0],o=!0;else{for(var m=r,h=p.length-1,g=!0,_,v,y;g&&(_=p[m],v=p[m+1],!(v.t-this.offsetTime>e));)m=v.t-this.offsetTime)d=1;else if(e<_.t-this.offsetTime)d=0;else{var b;y.__fnct?b=y.__fnct:(b=we.getBezierEasing(_.o.x,_.o.y,_.i.x,_.i.y).get,y.__fnct=b),d=b((e-(_.t-this.offsetTime))/(v.t-this.offsetTime-(_.t-this.offsetTime)))}a=v.s?v.s[0]:_.e[0]}i=_.s[0]}for(l=t._length,u=i.i[0].length,n.lastIndex=r,s=0;sr&&t>r)||(this._caching.lastIndex=i0||e>-1e-6&&e<0?r(e*t)/t:e}function P(){var e=this.props,t=N(e[0]),n=N(e[1]),r=N(e[4]),i=N(e[5]),a=N(e[12]),o=N(e[13]);return`matrix(`+t+`,`+n+`,`+r+`,`+i+`,`+a+`,`+o+`)`}return function(){this.reset=i,this.rotate=a,this.rotateX=o,this.rotateY=s,this.rotateZ=c,this.skew=u,this.skewFromAxis=d,this.shear=l,this.scale=f,this.setTransform=m,this.translate=h,this.transform=g,this.multiply=_,this.applyToPoint=S,this.applyToX=C,this.applyToY=w,this.applyToZ=T,this.applyToPointArray=A,this.applyToTriplePoints=k,this.applyToPointStringified=j,this.toCSS=M,this.to2dCSS=P,this.clone=b,this.cloneFromProps=x,this.equals=y,this.inversePoints=O,this.inversePoint=D,this.getInverseMatrix=E,this._t=this.transform,this.isIdentity=v,this._identity=!0,this._identityCalculated=!1,this.props=p(`float32`,16),this.reset()}}();function $e(e){"@babel/helpers - typeof";return $e=typeof Symbol==`function`&&typeof Symbol.iterator==`symbol`?function(e){return typeof e}:function(e){return e&&typeof Symbol==`function`&&e.constructor===Symbol&&e!==Symbol.prototype?`symbol`:typeof e},$e(e)}var V={},et=`__[STANDALONE]__`,tt=`__[ANIMATIONDATA]__`,nt=``;function rt(e){s(e)}function it(){et===!0?Ce.searchAnimations(tt,et,nt):Ce.searchAnimations()}function at(e){ie(e)}function ot(e){de(e)}function st(e){return et===!0&&(e.animationData=JSON.parse(tt)),Ce.loadAnimation(e)}function ct(e){if(typeof e==`string`)switch(e){case`high`:le(200);break;default:case`medium`:le(50);break;case`low`:le(10);break}else!isNaN(e)&&e>1&&le(e)}function lt(){return typeof navigator<`u`}function ut(e,t){e===`expressions`&&oe(t)}function dt(e){switch(e){case`propertyFactory`:return B;case`shapePropertyFactory`:return Ze;case`matrix`:return Qe;default:return null}}V.play=Ce.play,V.pause=Ce.pause,V.setLocationHref=rt,V.togglePause=Ce.togglePause,V.setSpeed=Ce.setSpeed,V.setDirection=Ce.setDirection,V.stop=Ce.stop,V.searchAnimations=it,V.registerAnimation=Ce.registerAnimation,V.loadAnimation=st,V.setSubframeRendering=at,V.resize=Ce.resize,V.goToAndStop=Ce.goToAndStop,V.destroy=Ce.destroy,V.setQuality=ct,V.inBrowser=lt,V.installPlugin=ut,V.freeze=Ce.freeze,V.unfreeze=Ce.unfreeze,V.setVolume=Ce.setVolume,V.mute=Ce.mute,V.unmute=Ce.unmute,V.getRegisteredAnimations=Ce.getRegisteredAnimations,V.useWebWorker=a,V.setIDPrefix=ot,V.__getFactory=dt,V.version=`5.13.0`;function ft(){document.readyState===`complete`&&(clearInterval(H),it())}function pt(e){for(var t=mt.split(`&`),n=0;n=1?a.push({s:e-1,e:t-1}):(a.push({s:e,e:1}),a.push({s:0,e:t-1}));var o=[],s,c=a.length,l;for(s=0;sr+n)){var u=l.s*i<=r?0:(l.s*i-r)/n,d=l.e*i>=r+n?1:(l.e*i-r)/n;o.push([u,d])}return o.length||o.push([0,0]),o},U.prototype.releasePathsData=function(e){var t,n=e.length;for(t=0;t1?1+r:this.s.v<0?0+r:this.s.v+r,n=this.e.v>1?1+r:this.e.v<0?0+r:this.e.v+r,t>n){var i=t;t=n,n=i}t=Math.round(t*1e4)*1e-4,n=Math.round(n*1e4)*1e-4,this.sValue=t,this.eValue=n}else t=this.sValue,n=this.eValue;var a,o,s=this.shapes.length,c,l,u,d,f,p=0;if(n===t)for(o=0;o=0;--o)if(h=this.shapes[o],h.shape._mdf){for(g=h.localShapeCollection,g.releaseShapes(),this.m===2&&s>1?(b=this.calculateShapeEdges(t,n,h.totalShapeLength,y,p),y+=h.totalShapeLength):b=[[_,v]],l=b.length,c=0;c=1?m.push({s:h.totalShapeLength*(_-1),e:h.totalShapeLength*(v-1)}):(m.push({s:h.totalShapeLength*_,e:h.totalShapeLength}),m.push({s:0,e:h.totalShapeLength*(v-1)}));var x=this.addShapes(h,m[0]);if(m[0].s!==m[0].e){if(m.length>1)if(h.shape.paths.shapes[h.shape.paths._length-1].c){var S=x.pop();this.addPaths(x,g),x=this.addShapes(h,m[1],S)}else this.addPaths(x,g),x=this.addShapes(h,m[1]);this.addPaths(x,g)}}h.shape.paths=g}}else if(this._mdf)for(o=0;ot.e){n.c=!1;break}else t.s<=l&&t.e>=l+u.addedLength?(this.addSegment(i[a].v[s-1],i[a].o[s-1],i[a].i[s],i[a].v[s],n,d,g),g=!1):(p=Ae.getNewSegment(i[a].v[s-1],i[a].v[s],i[a].o[s-1],i[a].i[s],(t.s-l)/u.addedLength,(t.e-l)/u.addedLength,f[s-1]),this.addSegmentFromArray(p,n,d,g),g=!1,n.c=!1),l+=u.addedLength,d+=1;if(i[a].c&&f.length){if(u=f[s-1],l<=t.e){var _=f[s-1].addedLength;t.s<=l&&t.e>=l+_?(this.addSegment(i[a].v[s-1],i[a].o[s-1],i[a].i[0],i[a].v[0],n,d,g),g=!1):(p=Ae.getNewSegment(i[a].v[s-1],i[a].v[0],i[a].o[s-1],i[a].i[0],(t.s-l)/_,(t.e-l)/_,f[s-1]),this.addSegmentFromArray(p,n,d,g),g=!1,n.c=!1)}else n.c=!1;l+=u.addedLength,d+=1}if(n._length&&(n.setXYAt(n.v[h][0],n.v[h][1],`i`,h),n.setXYAt(n.v[n._length-1][0],n.v[n._length-1][1],`o`,n._length-1)),l>t.e)break;a=this.p.keyframes[this.p.keyframes.length-1].t?(r=this.p.getValueAtTime(this.p.keyframes[this.p.keyframes.length-1].t/n,0),i=this.p.getValueAtTime((this.p.keyframes[this.p.keyframes.length-1].t-.05)/n,0)):(r=this.p.pv,i=this.p.getValueAtTime((this.p._caching.lastFrame+this.p.offsetTime-.01)/n,this.p.offsetTime));else if(this.px&&this.px.keyframes&&this.py.keyframes&&this.px.getValueAtTime&&this.py.getValueAtTime){r=[],i=[];var a=this.px,o=this.py;a._caching.lastFrame+a.offsetTime<=a.keyframes[0].t?(r[0]=a.getValueAtTime((a.keyframes[0].t+.01)/n,0),r[1]=o.getValueAtTime((o.keyframes[0].t+.01)/n,0),i[0]=a.getValueAtTime(a.keyframes[0].t/n,0),i[1]=o.getValueAtTime(o.keyframes[0].t/n,0)):a._caching.lastFrame+a.offsetTime>=a.keyframes[a.keyframes.length-1].t?(r[0]=a.getValueAtTime(a.keyframes[a.keyframes.length-1].t/n,0),r[1]=o.getValueAtTime(o.keyframes[o.keyframes.length-1].t/n,0),i[0]=a.getValueAtTime((a.keyframes[a.keyframes.length-1].t-.01)/n,0),i[1]=o.getValueAtTime((o.keyframes[o.keyframes.length-1].t-.01)/n,0)):(r=[a.pv,o.pv],i[0]=a.getValueAtTime((a._caching.lastFrame+a.offsetTime-.01)/n,a.offsetTime),i[1]=o.getValueAtTime((o._caching.lastFrame+o.offsetTime-.01)/n,o.offsetTime))}else i=e,r=i;this.v.rotate(-Math.atan2(r[1]-i[1],r[0]-i[0]))}this.data.p&&this.data.p.s?this.data.p.z?this.v.translate(this.px.v,this.py.v,-this.pz.v):this.v.translate(this.px.v,this.py.v,0):this.v.translate(this.p.v[0],this.p.v[1],-this.p.v[2])}this.frameId=this.elem.globalData.frameId}}function r(){if(this.appliedTransformations=0,this.pre.reset(),!this.a.effectsSequence.length)this.pre.translate(-this.a.v[0],-this.a.v[1],this.a.v[2]),this.appliedTransformations=1;else return;if(!this.s.effectsSequence.length)this.pre.scale(this.s.v[0],this.s.v[1],this.s.v[2]),this.appliedTransformations=2;else return;if(this.sk)if(!this.sk.effectsSequence.length&&!this.sa.effectsSequence.length)this.pre.skewFromAxis(-this.sk.v,this.sa.v),this.appliedTransformations=3;else return;this.r?this.r.effectsSequence.length||(this.pre.rotate(-this.r.v),this.appliedTransformations=4):!this.rz.effectsSequence.length&&!this.ry.effectsSequence.length&&!this.rx.effectsSequence.length&&!this.or.effectsSequence.length&&(this.pre.rotateZ(-this.rz.v).rotateY(this.ry.v).rotateX(this.rx.v).rotateZ(-this.or.v[2]).rotateY(this.or.v[1]).rotateX(this.or.v[0]),this.appliedTransformations=4)}function i(){}function a(e){this._addDynamicProperty(e),this.elem.addDynamicProperty(e),this._isDirty=!0}function o(e,t,n){if(this.elem=e,this.frameId=-1,this.propType=`transform`,this.data=t,this.v=new Qe,this.pre=new Qe,this.appliedTransformations=0,this.initDynamicPropertyContainer(n||e),t.p&&t.p.s?(this.px=B.getProp(e,t.p.x,0,0,this),this.py=B.getProp(e,t.p.y,0,0,this),t.p.z&&(this.pz=B.getProp(e,t.p.z,0,0,this))):this.p=B.getProp(e,t.p||{k:[0,0,0]},1,0,this),t.rx){if(this.rx=B.getProp(e,t.rx,0,D,this),this.ry=B.getProp(e,t.ry,0,D,this),this.rz=B.getProp(e,t.rz,0,D,this),t.or.k[0].ti){var r,i=t.or.k.length;for(r=0;r0;)--n,this._elements.unshift(t[n]);this.dynamicProperties.length?this.k=!0:this.getValue(!0)},xt.prototype.resetElements=function(e){var t,n=e.length;for(t=0;t0?Math.floor(f):Math.ceil(f),h=this.pMatrix.props,g=this.rMatrix.props,_=this.sMatrix.props;this.pMatrix.reset(),this.rMatrix.reset(),this.sMatrix.reset(),this.tMatrix.reset(),this.matrix.reset();var v=0;if(f>0){for(;vm;)this.applyTransforms(this.pMatrix,this.rMatrix,this.sMatrix,this.tr,1,!0),--v;p&&(this.applyTransforms(this.pMatrix,this.rMatrix,this.sMatrix,this.tr,-p,!0),v-=p)}r=this.data.m===1?0:this._currentCopies-1,i=this.data.m===1?1:-1,a=this._currentCopies;for(var y,b;a;){if(t=this.elemsData[r].it,n=t[t.length-1].transform.mProps.v.props,b=n.length,t[t.length-1].transform.mProps._mdf=!0,t[t.length-1].transform.op._mdf=!0,t[t.length-1].transform.op.v=this._currentCopies===1?this.so.v:this.so.v+(this.eo.v-this.so.v)*(r/(this._currentCopies-1)),v!==0){for((r!==0&&i===1||r!==this._currentCopies-1&&i===-1)&&this.applyTransforms(this.pMatrix,this.rMatrix,this.sMatrix,this.tr,1,!1),this.matrix.transform(g[0],g[1],g[2],g[3],g[4],g[5],g[6],g[7],g[8],g[9],g[10],g[11],g[12],g[13],g[14],g[15]),this.matrix.transform(_[0],_[1],_[2],_[3],_[4],_[5],_[6],_[7],_[8],_[9],_[10],_[11],_[12],_[13],_[14],_[15]),this.matrix.transform(h[0],h[1],h[2],h[3],h[4],h[5],h[6],h[7],h[8],h[9],h[10],h[11],h[12],h[13],h[14],h[15]),y=0;y0&&r<1?[t]:[]:[t-r,t+r].filter(function(e){return e>0&&e<1})},At.prototype.split=function(e){if(e<=0)return[kt(this.points[0]),this];if(e>=1)return[this,kt(this.points[this.points.length-1])];var t=Et(this.points[0],this.points[1],e),n=Et(this.points[1],this.points[2],e),r=Et(this.points[2],this.points[3],e),i=Et(t,n,e),a=Et(n,r,e),o=Et(i,a,e);return[new At(this.points[0],t,i,o,!0),new At(o,a,r,this.points[3],!0)]};function jt(e,t){var n=e.points[0][t],r=e.points[e.points.length-1][t];if(n>r){var i=r;r=n,n=i}for(var a=Dt(3*e.a[t],2*e.b[t],e.c[t]),o=0;o0&&a[o]<1){var s=e.point(a[o])[t];sr&&(r=s)}return{min:n,max:r}}At.prototype.bounds=function(){return{x:jt(this,0),y:jt(this,1)}},At.prototype.boundingBox=function(){var e=this.bounds();return{left:e.x.min,right:e.x.max,top:e.y.min,bottom:e.y.max,width:e.x.max-e.x.min,height:e.y.max-e.y.min,cx:(e.x.max+e.x.min)/2,cy:(e.y.max+e.y.min)/2}};function W(e,t,n){var r=e.boundingBox();return{cx:r.cx,cy:r.cy,width:r.width,height:r.height,bez:e,t:(t+n)/2,t1:t,t2:n}}function Mt(e){var t=e.bez.split(.5);return[W(t[0],e.t1,e.t),W(t[1],e.t,e.t2)]}function Nt(e,t){return Math.abs(e.cx-t.cx)*2=a||e.width<=r&&e.height<=r&&t.width<=r&&t.height<=r){i.push([e.t,t.t]);return}var o=Mt(e),s=Mt(t);Pt(o[0],s[0],n+1,r,i,a),Pt(o[0],s[1],n+1,r,i,a),Pt(o[1],s[0],n+1,r,i,a),Pt(o[1],s[1],n+1,r,i,a)}}At.prototype.intersections=function(e,t,n){t===void 0&&(t=2),n===void 0&&(n=7);var r=[];return Pt(W(this,0,1),W(e,0,1),0,t,r,n),r},At.shapeSegment=function(e,t){var n=(t+1)%e.length();return new At(e.v[t],e.o[t],e.i[n],e.v[n],!0)},At.shapeSegmentInverted=function(e,t){var n=(t+1)%e.length();return new At(e.v[n],e.i[n],e.o[t],e.v[t],!0)};function G(e,t){return[e[1]*t[2]-e[2]*t[1],e[2]*t[0]-e[0]*t[2],e[0]*t[1]-e[1]*t[0]]}function K(e,t,n,r){var i=[e[0],e[1],1],a=[t[0],t[1],1],o=[n[0],n[1],1],s=[r[0],r[1],1],c=G(G(i,a),G(o,s));return wt(c[2])?null:[c[0]/c[2],c[1]/c[2]]}function q(e,t,n){return[e[0]+Math.cos(t)*n,e[1]-Math.sin(t)*n]}function J(e,t){return Math.hypot(e[0]-t[0],e[1]-t[1])}function Y(e,t){return Ct(e[0],t[0])&&Ct(e[1],t[1])}function Ft(){}u([vt],Ft),Ft.prototype.initModifierProperties=function(e,t){this.getValue=this.processKeys,this.amplitude=B.getProp(e,t.s,0,null,this),this.frequency=B.getProp(e,t.r,0,null,this),this.pointsType=B.getProp(e,t.pt,0,null,this),this._isAnimated=this.amplitude.effectsSequence.length!==0||this.frequency.effectsSequence.length!==0||this.pointsType.effectsSequence.length!==0};function It(e,t,n,r,i,a,o){var s=n-Math.PI/2,c=n+Math.PI/2,l=t[0]+Math.cos(n)*r*i,u=t[1]-Math.sin(n)*r*i;e.setTripleAt(l,u,l+Math.cos(s)*a,u-Math.sin(s)*a,l+Math.cos(c)*o,u-Math.sin(c)*o,e.length())}function Lt(e,t){var n=[t[0]-e[0],t[1]-e[1]],r=-Math.PI*.5;return[Math.cos(r)*n[0]-Math.sin(r)*n[1],Math.sin(r)*n[0]+Math.cos(r)*n[1]]}function Rt(e,t){var n=t===0?e.length()-1:t-1,r=(t+1)%e.length(),i=e.v[n],a=e.v[r],o=Lt(i,a);return Math.atan2(0,1)-Math.atan2(o[1],o[0])}function zt(e,t,n,r,i,a,o){var s=Rt(t,n),c=t.v[n%t._length],l=t.v[n===0?t._length-1:n-1],u=t.v[(n+1)%t._length],d=a===2?Math.sqrt((c[0]-l[0])**2+(c[1]-l[1])**2):0,f=a===2?Math.sqrt((c[0]-u[0])**2+(c[1]-u[1])**2):0;It(e,t.v[n%t._length],s,o,r,f/((i+1)*2),d/((i+1)*2),a)}function Bt(e,t,n,r,i,a){for(var o=0;o1&&t.length>1&&(i=Wt(e[0],t[t.length-1]),i)?[[e[0].split(i[0])[0]],[t[t.length-1].split(i[1])[1]]]:[n,r]}function Kt(e){for(var t,n=1;n1&&(t=Gt(e[e.length-1],e[0]),e[e.length-1]=t[0],e[0]=t[1]),e}function qt(e,t){var n=e.inflectionPoints(),r,i,a,o;if(n.length===0)return[Ht(e,t)];if(n.length===1||Ct(n[1],1))return a=e.split(n[0]),r=a[0],i=a[1],[Ht(r,t),Ht(i,t)];a=e.split(n[0]),r=a[0];var s=(n[1]-n[0])/(1-n[0]);return a=a[1].split(s),o=a[0],i=a[1],[Ht(r,t),Ht(o,t),Ht(i,t)]}function Jt(){}u([vt],Jt),Jt.prototype.initModifierProperties=function(e,t){this.getValue=this.processKeys,this.amount=B.getProp(e,t.a,0,null,this),this.miterLimit=B.getProp(e,t.ml,0,null,this),this.lineJoin=t.lj,this._isAnimated=this.amount.effectsSequence.length!==0},Jt.prototype.processPath=function(e,t,n,r){var i=Je.newElement();i.c=e.c;var a=e.length();e.c||--a;var o,s,c,l=[];for(o=0;o=0;--o)c=At.shapeSegmentInverted(e,o),l.push(qt(c,t));l=Kt(l);var u=null,d=null;for(o=0;o0&&(o=!1),o){var u=l(`style`);u.setAttribute(`f-forigin`,n[r].fOrigin),u.setAttribute(`f-origin`,n[r].origin),u.setAttribute(`f-family`,n[r].fFamily),u.type=`text/css`,u.innerText=`@font-face {font-family: `+n[r].fFamily+`; font-style: normal; src: url('`+n[r].fPath+`');}`,t.appendChild(u)}}else if(n[r].fOrigin===`g`||n[r].origin===1){for(s=document.querySelectorAll(`link[f-forigin="g"], link[f-origin="1"]`),c=0;c=55296&&n<=56319){var r=e.charCodeAt(1);r>=56320&&r<=57343&&(t=(n-55296)*1024+r-56320+65536)}return t}function S(e,t){var n=e.toString(16)+t.toString(16);return d.indexOf(n)!==-1}function C(e){return e===s}function w(e){return e===o}function T(e){var t=x(e);return t>=c&&t<=u}function E(e){return T(e.substr(0,2))&&T(e.substr(2,2))}function D(e){return t.indexOf(e)!==-1}function O(e,t){var o=x(e.substr(t,2));if(o!==n)return!1;var s=0;for(t+=2;s<5;){if(o=x(e.substr(t,2)),oa)return!1;s+=1,t+=2}return x(e.substr(t,2))===r}function k(){this.isLoaded=!0}var A=function(){this.fonts=[],this.chars=null,this.typekitLoaded=0,this.isLoaded=!1,this._warned=!1,this.initTime=Date.now(),this.setIsLoadedBinded=this.setIsLoaded.bind(this),this.checkLoadedFontsBinded=this.checkLoadedFonts.bind(this)};return A.isModifier=S,A.isZeroWidthJoiner=C,A.isFlagEmoji=E,A.isRegionalCode=T,A.isCombinedCharacter=D,A.isRegionalFlag=O,A.isVariationSelector=w,A.BLACK_FLAG_CODE_POINT=n,A.prototype={addChars:_,addFonts:g,getCharData:v,getFontByName:b,measureText:y,checkLoadedFonts:m,setIsLoaded:k},A}();function Zt(e){this.animationData=e}Zt.prototype.getProp=function(e){return this.animationData.slots&&this.animationData.slots[e.sid]?Object.assign(e,this.animationData.slots[e.sid].p):e};function Qt(e){return new Zt(e)}function $t(){}$t.prototype={initRenderable:function(){this.isInRange=!1,this.hidden=!1,this.isTransparent=!1,this.renderableComponents=[]},addRenderableComponent:function(e){this.renderableComponents.indexOf(e)===-1&&this.renderableComponents.push(e)},removeRenderableComponent:function(e){this.renderableComponents.indexOf(e)!==-1&&this.renderableComponents.splice(this.renderableComponents.indexOf(e),1)},prepareRenderableFrame:function(e){this.checkLayerLimits(e)},checkTransparency:function(){this.finalTransform.mProp.o.v<=0?!this.isTransparent&&this.globalData.renderConfig.hideOnTransparent&&(this.isTransparent=!0,this.hide()):this.isTransparent&&(this.isTransparent=!1,this.show())},checkLayerLimits:function(e){this.data.ip-this.data.st<=e&&this.data.op-this.data.st>e?this.isInRange!==!0&&(this.globalData._mdf=!0,this._mdf=!0,this.isInRange=!0,this.show()):this.isInRange!==!1&&(this.globalData._mdf=!0,this.isInRange=!1,this.hide())},renderRenderable:function(){var e,t=this.renderableComponents.length;for(e=0;e.1)&&this.audio.seek(this._currentTime/this.globalData.frameRate):(this.audio.play(),this.audio.seek(this._currentTime/this.globalData.frameRate),this._isPlaying=!0))},X.prototype.show=function(){},X.prototype.hide=function(){this.audio.pause(),this._isPlaying=!1},X.prototype.pause=function(){this.audio.pause(),this._isPlaying=!1,this._canPlay=!1},X.prototype.resume=function(){this._canPlay=!0},X.prototype.setRate=function(e){this.audio.rate(e)},X.prototype.volume=function(e){this._volumeMultiplier=e,this._previousVolume=e*this._volume,this.audio.volume(this._previousVolume)},X.prototype.getBaseElement=function(){return null},X.prototype.destroy=function(){},X.prototype.sourceRectAtTime=function(){},X.prototype.initExpressions=function(){};function hn(){}hn.prototype.checkLayers=function(e){var t,n=this.layers.length,r;for(this.completeLayers=!0,t=n-1;t>=0;--t)this.elements[t]||(r=this.layers[t],r.ip-r.st<=e-this.layers[t].st&&r.op-r.st>e-this.layers[t].st&&this.buildItem(t)),this.completeLayers=this.elements[t]?this.completeLayers:!1;this.checkPendingElements()},hn.prototype.createItem=function(e){switch(e.ty){case 2:return this.createImage(e);case 0:return this.createComp(e);case 1:return this.createSolid(e);case 3:return this.createNull(e);case 4:return this.createShape(e);case 5:return this.createText(e);case 6:return this.createAudio(e);case 13:return this.createCamera(e);case 15:return this.createFootage(e);default:return this.createNull(e)}},hn.prototype.createCamera=function(){throw Error(`You're using a 3d camera. Try the html renderer.`)},hn.prototype.createAudio=function(e){return new X(e,this.globalData,this)},hn.prototype.createFootage=function(e){return new mn(e,this.globalData,this)},hn.prototype.buildAllItems=function(){var e,t=this.layers.length;for(e=0;e0&&(this.maskElement.setAttribute(`id`,p),this.element.maskedElement.setAttribute(b,`url(`+c()+`#`+p+`)`),r.appendChild(this.maskElement)),this.viewData.length&&this.element.addRenderableComponent(this)}vn.prototype.getMaskProperty=function(e){return this.viewData[e].prop},vn.prototype.renderFrame=function(e){var t=this.element.finalTransform.mat,n,r=this.masksProperties.length;for(n=0;n1&&(r+=` C`+t.o[i-1][0]+`,`+t.o[i-1][1]+` `+t.i[0][0]+`,`+t.i[0][1]+` `+t.v[0][0]+`,`+t.v[0][1]),n.lastPath!==r){var o=``;n.elem&&(t.c&&(o=e.inv?this.solidPath+r:r),n.elem.setAttribute(`d`,o)),n.lastPath=r}},vn.prototype.destroy=function(){this.element=null,this.globalData=null,this.maskElement=null,this.data=null,this.masksProperties=null};var yn=function(){var e={};e.createFilter=t,e.createAlphaToLuminanceFilter=n;function t(e,t){var n=R(`filter`);return n.setAttribute(`id`,e),t!==!0&&(n.setAttribute(`filterUnits`,`objectBoundingBox`),n.setAttribute(`x`,`0%`),n.setAttribute(`y`,`0%`),n.setAttribute(`width`,`100%`),n.setAttribute(`height`,`100%`)),n}function n(){var e=R(`feColorMatrix`);return e.setAttribute(`type`,`matrix`),e.setAttribute(`color-interpolation-filters`,`sRGB`),e.setAttribute(`values`,`0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 1`),e}return e}(),bn=function(){var e={maskType:!0,svgLumaHidden:!0,offscreenCanvas:typeof OffscreenCanvas<`u`};return(/MSIE 10/i.test(navigator.userAgent)||/MSIE 9/i.test(navigator.userAgent)||/rv:11.0/i.test(navigator.userAgent)||/Edge\/\d./i.test(navigator.userAgent))&&(e.maskType=!1),/firefox/i.test(navigator.userAgent)&&(e.svgLumaHidden=!1),e}(),xn={},Sn=`filter_result_`;function Cn(e){var t,n=`SourceGraphic`,r=e.data.ef?e.data.ef.length:0,i=ee(),a=yn.createFilter(i,!0),o=0;this.filters=[];var s;for(t=0;t=0&&(n=this.shapeModifiers[e].processShapes(this._isFirstFrame),!n);--e);}},searchProcessedElement:function(e){for(var t=this.processedElements,n=0,r=t.length;n.01)return!1;n+=1}return!0},Rn.prototype.checkCollapsable=function(){if(this.o.length/2!=this.c.length/4)return!1;if(this.data.k.k[0].s)for(var e=0,t=this.data.k.k.length;e0;)c=r.transformers[g].mProps._mdf||c,--h,--g;if(c)for(h=f-r.styles[u].lvl,g=r.transformers.length-1;h>0;)m.multiply(r.transformers[g].mProps.v),--h,--g}else m=e;if(p=r.sh.paths,o=p._length,c){for(s=``,a=0;a=1?v=.99:v<=-1&&(v=-.99);var y=g*v,b=Math.cos(_+t.a.v)*y+a[0],x=Math.sin(_+t.a.v)*y+a[1];r.setAttribute(`fx`,b),r.setAttribute(`fy`,x),i&&!t.g._collapsable&&(t.of.setAttribute(`fx`,b),t.of.setAttribute(`fy`,x))}}}function u(e,t,n){var r=t.style,i=t.d;i&&(i._mdf||n)&&i.dashStr&&(r.pElem.setAttribute(`stroke-dasharray`,i.dashStr),r.pElem.setAttribute(`stroke-dashoffset`,i.dashoffset[0])),t.c&&(t.c._mdf||n)&&r.pElem.setAttribute(`stroke`,`rgb(`+C(t.c.v[0])+`,`+C(t.c.v[1])+`,`+C(t.c.v[2])+`)`),(t.o._mdf||n)&&r.pElem.setAttribute(`stroke-opacity`,t.o.v),(t.w._mdf||n)&&(r.pElem.setAttribute(`stroke-width`,t.w.v),r.msElem&&r.msElem.setAttribute(`stroke-width`,t.w.v))}return n}();function Gn(e,t,n){this.shapes=[],this.shapesData=e.shapes,this.stylesList=[],this.shapeModifiers=[],this.itemsData=[],this.processedElements=[],this.animatedContents=[],this.initElement(e,t,n),this.prevViewData=[]}u([fn,_n,wn,kn,Tn,pn,En],Gn),Gn.prototype.initSecondaryElement=function(){},Gn.prototype.identityMatrix=new Qe,Gn.prototype.buildExpressionInterface=function(){},Gn.prototype.createContent=function(){this.searchShapes(this.shapesData,this.itemsData,this.prevViewData,this.layerElement,0,[],!0),this.filterUniqueShapes()},Gn.prototype.filterUniqueShapes=function(){var e,t=this.shapes.length,n,r,i=this.stylesList.length,a,o=[],s=!1;for(r=0;r1&&s&&this.setShapesAsAnimated(o)}},Gn.prototype.setShapesAsAnimated=function(e){var t,n=e.length;for(t=0;t=0;--c){if(g=this.searchProcessedElement(e[c]),g?t[c]=n[g-1]:e[c]._render=o,e[c].ty===`fl`||e[c].ty===`st`||e[c].ty===`gf`||e[c].ty===`gs`||e[c].ty===`no`)g?t[c].style.closed=e[c].hd:t[c]=this.createStyleElement(e[c],i),e[c]._render&&t[c].style.pElem.parentNode!==r&&r.appendChild(t[c].style.pElem),f.push(t[c].style);else if(e[c].ty===`gr`){if(!g)t[c]=this.createGroupElement(e[c]);else for(d=t[c].it.length,u=0;u1,this.kf&&this.addEffect(this.getKeyframeValue.bind(this)),this.kf},qn.prototype.addEffect=function(e){this.effectsSequence.push(e),this.elem.addDynamicProperty(this)},qn.prototype.getValue=function(e){if(!((this.elem.globalData.frameId===this.frameId||!this.effectsSequence.length)&&!e)){this.currentData.t=this.data.d.k[this.keysIndex].s.t;var t=this.currentData,n=this.keysIndex;if(this.lock){this.setCurrentData(this.currentData);return}this.lock=!0,this._mdf=!1;var r,i=this.effectsSequence.length,a=e||this.data.d.k[this.keysIndex].s;for(r=0;rt);)n+=1;return this.keysIndex!==n&&(this.keysIndex=n),this.data.d.k[this.keysIndex].s},qn.prototype.buildFinalText=function(e){for(var t=[],n=0,r=e.length,i,a,o=!1,s=!1,c=``;n=55296&&i<=56319?Xt.isRegionalFlag(e,n)?c=e.substr(n,14):(a=e.charCodeAt(n+1),a>=56320&&a<=57343&&(Xt.isModifier(i,a)?(c=e.substr(n,2),o=!0):c=Xt.isFlagEmoji(e.substr(n,4))?e.substr(n,4):e.substr(n,2))):i>56319?(a=e.charCodeAt(n+1),Xt.isVariationSelector(i)&&(o=!0)):Xt.isZeroWidthJoiner(i)&&(o=!0,s=!0),o?(t[t.length-1]+=c,o=!1):t.push(c),n+=c.length;return t},qn.prototype.completeTextData=function(e){e.__complete=!0;var t=this.elem.globalData.fontManager,n=this.data,r=[],i,a,o,s=0,c,l=n.m.g,u=0,d=0,f=0,p=[],m=0,h=0,g,_,v=t.getFontByName(e.f),y,b=0,x=Yt(v);e.fWeight=x.weight,e.fStyle=x.style,e.finalSize=e.s,e.finalText=this.buildFinalText(e.t),a=e.finalText.length,e.finalLineHeight=e.lh;var S=e.tr/1e3*e.finalSize,C;if(e.sz)for(var w=!0,T=e.sz[0],E=e.sz[1],D,O;w;){O=this.buildFinalText(e.t),D=0,m=0,a=O.length,S=e.tr/1e3*e.finalSize;var k=-1;for(i=0;iT&&O[i]!==` `?(k===-1?a+=1:i=k,D+=e.finalLineHeight||e.finalSize*1.2,O.splice(i,+(k===i),`\r`),k=-1,m=0):(m+=b,m+=S);D+=v.ascent*e.finalSize/100,this.canResize&&e.finalSize>this.minimumFontSize&&Eh?m:h,m=-2*S,c=``,o=!0,f+=1):c=j,t.chars?(y=t.getCharData(j,v.fStyle,t.getFontByName(e.f).fFamily),b=o?0:y.w*e.finalSize/100):b=t.measureText(c,e.f,e.finalSize),j===` `?A+=b+S:(m+=b+S+A,A=0),r.push({l:b,an:b,add:u,n:o,anIndexes:[],val:c,line:f,animatorJustifyOffset:0}),l==2){if(u+=b,c===``||c===` `||i===a-1){for((c===``||c===` `)&&(u-=b);d<=i;)r[d].an=u,r[d].ind=s,r[d].extra=b,d+=1;s+=1,u=0}}else if(l==3){if(u+=b,c===``||i===a-1){for(c===``&&(u-=b);d<=i;)r[d].an=u,r[d].ind=s,r[d].extra=b,d+=1;u=0,s+=1}}else r[s].ind=s,r[s].extra=0,s+=1;if(e.l=r,h=m>h?m:h,p.push(m),e.sz)e.boxWidth=e.sz[0],e.justifyOffset=0;else switch(e.boxWidth=h,e.j){case 1:e.justifyOffset=-e.boxWidth;break;case 2:e.justifyOffset=-e.boxWidth/2;break;default:e.justifyOffset=0}e.lineWidths=p;var M=n.a,N,P;_=M.length;var F,ee,I=[];for(g=0;g<_;g+=1){for(N=M[g],N.a.sc&&(e.strokeColorAnim=!0),N.a.sw&&(e.strokeWidthAnim=!0),(N.a.fc||N.a.fh||N.a.fs||N.a.fb)&&(e.fillColorAnim=!0),ee=0,F=N.s.b,i=0;i0?i=this.ne.v/100:a=-this.ne.v/100,this.xe.v>0?o=1-this.xe.v/100:s=1+this.xe.v/100;var c=we.getBezierEasing(i,a,o,s).get,l=0,u=this.finalS,d=this.finalE,f=this.data.sh;if(f===2)l=d===u?+(r>=d):e(0,t(.5/(d-u)+(r-u)/(d-u),1)),l=c(l);else if(f===3)l=d===u?r>=d?0:1:1-e(0,t(.5/(d-u)+(r-u)/(d-u),1)),l=c(l);else if(f===4)d===u?l=0:(l=e(0,t(.5/(d-u)+(r-u)/(d-u),1)),l<.5?l*=2:l=1-2*(l-.5)),l=c(l);else if(f===5){if(d===u)l=0;else{var p=d-u;r=t(e(0,r+.5-u),d-u);var m=-p/2+r,h=p/2;l=Math.sqrt(1-m*m/(h*h))}l=c(l)}else f===6?(d===u?l=0:(r=t(e(0,r+.5-u),d-u),l=(1+Math.cos(Math.PI+Math.PI*2*r/(d-u)))/2),l=c(l)):(r>=n(u)&&(l=r-u<0?e(0,t(t(d,1)-(u-r),1)):e(0,t(d-r,1))),l=c(l));if(this.sm.v!==100){var g=this.sm.v*.01;g===0&&(g=1e-8);var _=.5-g*.5;l<_?l=0:(l=(l-_)/g,l>1&&(l=1))}return l*this.a.v},getValue:function(e){this.iterateDynamicProperties(),this._mdf=e||this._mdf,this._currentTextLength=this.elem.textProperty.currentData.l.length||0,e&&this.data.r===2&&(this.e.v=this._currentTextLength);var t=this.data.r===2?1:100/this.data.totalChars,n=this.o.v/t,r=this.s.v/t+n,i=this.e.v/t+n;if(r>i){var a=r;r=i,i=a}this.finalS=r,this.finalE=i}},u([Ge],r);function i(e,t,n){return new r(e,t,n)}return{getTextSelectorProp:i}}();function Yn(e,t,n){var r={propType:!1},i=B.getProp,a=t.a;this.a={r:a.r?i(e,a.r,0,D,n):r,rx:a.rx?i(e,a.rx,0,D,n):r,ry:a.ry?i(e,a.ry,0,D,n):r,sk:a.sk?i(e,a.sk,0,D,n):r,sa:a.sa?i(e,a.sa,0,D,n):r,s:a.s?i(e,a.s,1,.01,n):r,a:a.a?i(e,a.a,1,0,n):r,o:a.o?i(e,a.o,0,.01,n):r,p:a.p?i(e,a.p,1,0,n):r,sw:a.sw?i(e,a.sw,0,0,n):r,sc:a.sc?i(e,a.sc,1,0,n):r,fc:a.fc?i(e,a.fc,1,0,n):r,fh:a.fh?i(e,a.fh,0,0,n):r,fs:a.fs?i(e,a.fs,0,.01,n):r,fb:a.fb?i(e,a.fb,0,.01,n):r,t:a.t?i(e,a.t,0,0,n):r},this.s=Jn.getTextSelectorProp(e,t.s,n),this.s.t=t.s.t}function Xn(e,t,n){this._isFirstFrame=!0,this._hasMaskedPath=!1,this._frameId=-1,this._textData=e,this._renderType=t,this._elem=n,this._animatorsData=m(this._textData.a.length),this._pathData={},this._moreOptions={alignment:{}},this.renderedLetters=[],this.lettersChangedFlag=!1,this.initDynamicPropertyContainer(n)}Xn.prototype.searchProperties=function(){var e,t=this._textData.a.length,n,r=B.getProp;for(e=0;e=m+Te||!x?(T=(m+Te-g)/h.partialLength,ae=b.point[0]+(h.point[0]-b.point[0])*T,oe=b.point[1]+(h.point[1]-b.point[1])*T,a.translate(-n[0]*f[u].an*.005,-(n[1]*A)*.01),_=!1):x&&(g+=h.partialLength,v+=1,v>=x.length&&(v=0,y+=1,S[y]?x=S[y].points:D.v.c?(v=0,y=0,x=S[y].points):(g-=h.partialLength,x=null)),x&&(b=h,h=x[v],C=h.partialLength));ie=f[u].an/2-f[u].add,a.translate(-ie,0,0)}else ie=f[u].an/2-f[u].add,a.translate(-ie,0,0),a.translate(-n[0]*f[u].an*.005,-n[1]*A*.01,0);for(P=0;Pe?this.textSpans[e].span:R(s?`g`:`text`),b<=e){if(c.setAttribute(`stroke-linecap`,`butt`),c.setAttribute(`stroke-linejoin`,`round`),c.setAttribute(`stroke-miterlimit`,`4`),this.textSpans[e].span=c,s){var S=R(`g`);c.appendChild(S),this.textSpans[e].childSpan=S}this.textSpans[e].span=c,this.layerElement.appendChild(c)}c.style.display=`inherit`}if(l.reset(),d&&(o[e].n&&(f=-g,p+=n.yOffset,p+=+!!h,h=!1),this.applyTextPropertiesToMatrix(n,l,o[e].line,f,p),f+=o[e].l||0,f+=g),s){x=this.globalData.fontManager.getCharData(n.finalText[e],r.fStyle,this.globalData.fontManager.getFontByName(n.f).fFamily);var C;if(x.t===1)C=new ir(x.data,this.globalData,this);else{var w=Qn;x.data&&x.data.shapes&&(w=this.buildShapeData(x.data,n.finalSize)),C=new Gn(w,this.globalData,this)}if(this.textSpans[e].glyph){var T=this.textSpans[e].glyph;this.textSpans[e].childSpan.removeChild(T.layerElement),T.destroy()}this.textSpans[e].glyph=C,C._debug=!0,C.prepareFrame(0),C.renderFrame(),this.textSpans[e].childSpan.appendChild(C.layerElement),x.t===1&&this.textSpans[e].childSpan.setAttribute(`transform`,`scale(`+n.finalSize/100+`,`+n.finalSize/100+`)`)}else d&&c.setAttribute(`transform`,`translate(`+l.props[12]+`,`+l.props[13]+`)`),c.textContent=o[e].val,c.setAttributeNS(`http://www.w3.org/XML/1998/namespace`,`xml:space`,`preserve`)}d&&c&&c.setAttribute(`d`,u)}for(;e=0;--t)(this.completeLayers||this.elements[t])&&this.elements[t].prepareFrame(e-this.layers[t].st);if(this.globalData._mdf)for(t=0;t=0;--n)(this.completeLayers||this.elements[n])&&(this.elements[n].prepareFrame(this.renderedFrame-this.layers[n].st),this.elements[n]._mdf&&(this._mdf=!0))}},rr.prototype.renderInnerContent=function(){var e,t=this.layers.length;for(e=0;e=0;--n)e.finalTransform.multiply(e.transforms[n].transform.mProps.v);e._mdf=i},processSequences:function(e){var t,n=this.sequenceList.length;for(t=0;t=1){this.buffers=[];var e=this.globalData.canvasContext,t=lr.createCanvas(e.canvas.width,e.canvas.height);this.buffers.push(t);var n=lr.createCanvas(e.canvas.width,e.canvas.height);this.buffers.push(n),this.data.tt>=3&&!document._isProxy&&lr.loadLumaCanvas()}this.canvasContext=this.globalData.canvasContext,this.transformCanvas=this.globalData.transformCanvas,this.renderableEffectsManager=new dr(this),this.searchEffectTransforms()},createContent:function(){},setBlendMode:function(){var e=this.globalData;if(e.blendMode!==this.data.bm){e.blendMode=this.data.bm;var t=en(this.data.bm);e.canvasContext.globalCompositeOperation=t}},createRenderableComponents:function(){this.maskManager=new fr(this.data,this),this.transformEffects=this.renderableEffectsManager.getEffects(gn.TRANSFORM_EFFECT)},hideElement:function(){!this.hidden&&(!this.isInRange||this.isTransparent)&&(this.hidden=!0)},showElement:function(){this.isInRange&&!this.isTransparent&&(this.hidden=!1,this._isFirstFrame=!0,this.maskManager._isFirstFrame=!0)},clearCanvas:function(e){e.clearRect(this.transformCanvas.tx,this.transformCanvas.ty,this.transformCanvas.w*this.transformCanvas.sx,this.transformCanvas.h*this.transformCanvas.sy)},prepareLayer:function(){if(this.data.tt>=1){var e=this.buffers[0].getContext(`2d`);this.clearCanvas(e),e.drawImage(this.canvasContext.canvas,0,0),this.currentTransform=this.canvasContext.getTransform(),this.canvasContext.setTransform(1,0,0,1,0,0),this.clearCanvas(this.canvasContext),this.canvasContext.setTransform(this.currentTransform)}},exitLayer:function(){if(this.data.tt>=1){var e=this.buffers[1],t=e.getContext(`2d`);if(this.clearCanvas(t),t.drawImage(this.canvasContext.canvas,0,0),this.canvasContext.setTransform(1,0,0,1,0,0),this.clearCanvas(this.canvasContext),this.canvasContext.setTransform(this.currentTransform),this.comp.getElementById(`tp`in this.data?this.data.tp:this.data.ind-1).renderFrame(!0),this.canvasContext.setTransform(1,0,0,1,0,0),this.data.tt>=3&&!document._isProxy){var n=lr.getLumaCanvas(this.canvasContext.canvas);n.getContext(`2d`).drawImage(this.canvasContext.canvas,0,0),this.clearCanvas(this.canvasContext),this.canvasContext.drawImage(n,0,0)}this.canvasContext.globalCompositeOperation=mr[this.data.tt],this.canvasContext.drawImage(e,0,0),this.canvasContext.globalCompositeOperation=`destination-over`,this.canvasContext.drawImage(this.buffers[0],0,0),this.canvasContext.setTransform(this.currentTransform),this.canvasContext.globalCompositeOperation=`source-over`}},renderFrame:function(e){if(!(this.hidden||this.data.hd)&&!(this.data.td===1&&!e)){this.renderTransform(),this.renderRenderable(),this.renderLocalTransform(),this.setBlendMode();var t=this.data.ty===0;this.prepareLayer(),this.globalData.renderer.save(t),this.globalData.renderer.ctxTransform(this.finalTransform.localMat.props),this.globalData.renderer.ctxOpacity(this.finalTransform.localOpacity),this.renderInnerContent(),this.globalData.renderer.restore(t),this.exitLayer(),this.maskManager.hasMasks&&this.globalData.renderer.restore(!0),this._isFirstFrame&&=!1}},destroy:function(){this.canvasContext=null,this.data=null,this.globalData=null,this.maskManager.destroy()},mHelper:new Qe},pr.prototype.hide=pr.prototype.hideElement,pr.prototype.show=pr.prototype.showElement;function hr(e,t,n,r){this.styledShapes=[],this.tr=[0,0,0,0,0,0];var i=4;t.ty===`rc`?i=5:t.ty===`el`?i=6:t.ty===`sr`&&(i=7),this.sh=Ze.getShapeProp(e,t,i,e);var a,o=n.length,s;for(a=0;a=0;--a){if(d=this.searchProcessedElement(e[a]),d?t[a]=n[d-1]:e[a]._shouldRender=r,e[a].ty===`fl`||e[a].ty===`st`||e[a].ty===`gf`||e[a].ty===`gs`)d?t[a].style.closed=!1:t[a]=this.createStyleElement(e[a],m),l.push(t[a].style);else if(e[a].ty===`gr`){if(!d)t[a]=this.createGroupElement(e[a]);else for(c=t[a].it.length,s=0;s=0;--i)t[i].ty===`tr`?(o=n[i].transform,this.renderShapeTransform(e,o)):t[i].ty===`sh`||t[i].ty===`el`||t[i].ty===`rc`||t[i].ty===`sr`?this.renderPath(t[i],n[i]):t[i].ty===`fl`?this.renderFill(t[i],n[i],o):t[i].ty===`st`?this.renderStroke(t[i],n[i],o):t[i].ty===`gf`||t[i].ty===`gs`?this.renderGradientFill(t[i],n[i],o):t[i].ty===`gr`?this.renderShape(o,t[i].it,n[i].it):t[i].ty;r&&this.drawLayer()},gr.prototype.renderStyledShape=function(e,t){if(this._isFirstFrame||t._mdf||e.transforms._mdf){var n=e.trNodes,r=t.paths,i,a,o,s=r._length;n.length=0;var c=e.transforms.finalTransform;for(o=0;o=1?u=.99:u<=-1&&(u=-.99);var d=c*u,f=Math.cos(l+t.a.v)*d+o[0],p=Math.sin(l+t.a.v)*d+o[1];i=a.createRadialGradient(f,p,0,o[0],o[1],c)}var m,h=e.g.p,g=t.g.c,_=1;for(m=0;ma&&c===`xMidYMid slice`||ii&&s===`meet`||ai&&s===`slice`)?this.transformCanvas.tx=(n-this.transformCanvas.w*(r/this.transformCanvas.h))/2*this.renderConfig.dpr:l===`xMax`&&(ai&&s===`slice`)?this.transformCanvas.tx=(n-this.transformCanvas.w*(r/this.transformCanvas.h))*this.renderConfig.dpr:this.transformCanvas.tx=0,u===`YMid`&&(a>i&&s===`meet`||ai&&s===`meet`||a=0;--e)this.elements[e]&&this.elements[e].destroy&&this.elements[e].destroy();this.elements.length=0,this.globalData.canvasContext=null,this.animationItem.container=null,this.destroyed=!0},Z.prototype.renderFrame=function(e,t){if(!(this.renderedFrame===e&&this.renderConfig.clearCanvas===!0&&!t||this.destroyed||e===-1)){this.renderedFrame=e,this.globalData.frameNum=e-this.animationItem._isFirstFrame,this.globalData.frameId+=1,this.globalData._mdf=!this.renderConfig.clearCanvas||t,this.globalData.projectInterface.currentFrame=e;var n,r=this.layers.length;for(this.completeLayers||this.checkLayers(e),n=r-1;n>=0;--n)(this.completeLayers||this.elements[n])&&this.elements[n].prepareFrame(e-this.layers[n].st);if(this.globalData._mdf){for(this.renderConfig.clearCanvas===!0?this.canvasContext.clearRect(0,0,this.transformCanvas.w,this.transformCanvas.h):this.save(),n=r-1;n>=0;--n)(this.completeLayers||this.elements[n])&&this.elements[n].renderFrame();this.renderConfig.clearCanvas!==!0&&this.restore()}}},Z.prototype.buildItem=function(e){var t=this.elements;if(!(t[e]||this.layers[e].ty===99)){var n=this.createItem(this.layers[e],this,this.globalData);t[e]=n,n.initExpressions()}},Z.prototype.checkPendingElements=function(){for(;this.pendingElements.length;)this.pendingElements.pop().checkParenting()},Z.prototype.hide=function(){this.animationItem.container.style.display=`none`},Z.prototype.show=function(){this.animationItem.container.style.display=`block`};function br(){this.opacity=-1,this.transform=p(`float32`,16),this.fillStyle=``,this.strokeStyle=``,this.lineWidth=``,this.lineCap=``,this.lineJoin=``,this.miterLimit=``,this.id=Math.random()}function xr(){this.stack=[],this.cArrPos=0,this.cTr=new Qe;var e,t=15;for(e=0;e=0;--t)(this.completeLayers||this.elements[t])&&this.elements[t].renderFrame()},Sr.prototype.destroy=function(){var e;for(e=this.layers.length-1;e>=0;--e)this.elements[e]&&this.elements[e].destroy();this.layers=null,this.elements=null},Sr.prototype.createComp=function(e){return new Sr(e,this.globalData,this)};function Cr(e,t){this.animationItem=e,this.renderConfig={clearCanvas:t&&t.clearCanvas!==void 0?t.clearCanvas:!0,context:t&&t.context||null,progressiveLoad:t&&t.progressiveLoad||!1,preserveAspectRatio:t&&t.preserveAspectRatio||`xMidYMid meet`,imagePreserveAspectRatio:t&&t.imagePreserveAspectRatio||`xMidYMid slice`,contentVisibility:t&&t.contentVisibility||`visible`,className:t&&t.className||``,id:t&&t.id||``,runExpressions:!t||t.runExpressions===void 0||t.runExpressions},this.renderConfig.dpr=t&&t.dpr||1,this.animationItem.wrapper&&(this.renderConfig.dpr=t&&t.dpr||window.devicePixelRatio||1),this.renderedFrame=-1,this.globalData={frameNum:-1,_mdf:!1,renderConfig:this.renderConfig,currentGlobalAlpha:-1},this.contextData=new xr,this.elements=[],this.pendingElements=[],this.transformMat=new Qe,this.completeLayers=!1,this.rendererType=`canvas`,this.renderConfig.clearCanvas&&(this.ctxTransform=this.contextData.transform.bind(this.contextData),this.ctxOpacity=this.contextData.opacity.bind(this.contextData),this.ctxFillStyle=this.contextData.fillStyle.bind(this.contextData),this.ctxStrokeStyle=this.contextData.strokeStyle.bind(this.contextData),this.ctxLineWidth=this.contextData.lineWidth.bind(this.contextData),this.ctxLineCap=this.contextData.lineCap.bind(this.contextData),this.ctxLineJoin=this.contextData.lineJoin.bind(this.contextData),this.ctxMiterLimit=this.contextData.miterLimit.bind(this.contextData),this.ctxFill=this.contextData.fill.bind(this.contextData),this.ctxFillRect=this.contextData.fillRect.bind(this.contextData),this.ctxStroke=this.contextData.stroke.bind(this.contextData),this.save=this.contextData.save.bind(this.contextData))}return u([Z],Cr),Cr.prototype.createComp=function(e){return new Sr(e,this.globalData,this)},ye(`canvas`,Cr),_t.registerModifier(`tm`,U),_t.registerModifier(`pb`,yt),_t.registerModifier(`rp`,xt),_t.registerModifier(`rd`,St),_t.registerModifier(`zz`,Ft),_t.registerModifier(`op`,Jt),V}))}))(),1);function _r({documentID:e,className:t=``,showError:n=!0}){let r=(0,g.useRef)(null),i=(0,g.useRef)(null),[a,o]=(0,g.useState)(``),[s,c]=(0,g.useState)(null);return(0,g.useEffect)(()=>{let t=!1,n=null;return o(``),c(null),fetch(k.stickerDocumentAnimationURL(e),{credentials:`same-origin`}).then(async e=>{if(!e.ok){let t=await e.json().catch(()=>null);throw Error(t?.error||e.statusText)}if((e.headers.get(`content-type`)??``).includes(`json`)){let n=await e.json();if(t||!r.current)return;i.current?.destroy(),i.current=gr.default.loadAnimation({container:r.current,renderer:`canvas`,loop:!0,autoplay:!0,animationData:n});return}let a=await e.blob();t||(n=URL.createObjectURL(a),c(n))}).catch(e=>{t||o(O(e))}),()=>{t=!0,i.current?.destroy(),i.current=null,n&&URL.revokeObjectURL(n)}},[e]),(0,W.jsxs)(`div`,{className:`sticker-doc-cell ${t}`.trim(),children:[s?(0,W.jsx)(`img`,{className:`sticker-doc-image`,src:s,alt:``}):(0,W.jsx)(`div`,{className:`sticker-doc-canvas`,ref:r}),a&&n&&(0,W.jsx)(`span`,{className:`sticker-doc-error`,children:a})]})}function vr({kind:e,onClose:t,onCreated:n}){let r=e===`emoji`?`emoji`:`sticker`,[i,a]=(0,g.useState)(``),[o,s]=(0,g.useState)(``),[c,l]=(0,g.useState)(``),[u,d]=(0,g.useState)(null),[f,p]=(0,g.useState)(``),[m,h]=(0,g.useState)(!1),[_,v]=(0,g.useState)(``);async function y(){if(!i.trim()||!o.trim()||!c.trim()||!u){v(`Title, short name, emoji and a first ${r} file are required.`);return}if(!f.trim()){v(`Please enter an operation reason`);return}h(!0),v(``);try{let r=new FormData;r.set(`metadata`,JSON.stringify({command_id:``,reason:f.trim(),confirm:!0,title:i.trim(),short_name:o.trim().toLowerCase(),kind:e,emoji:c.trim()})),r.set(`file`,u,u.name),await k.createStickerSet(r),n(),t()}catch(e){v(O(e))}finally{h(!1)}}return(0,pn.createPortal)((0,W.jsx)(`div`,{className:`modal-backdrop`,role:`presentation`,children:(0,W.jsxs)(`section`,{className:`modal command-modal`,role:`dialog`,"aria-modal":`true`,"aria-label":`Create a new ${r} pack`,children:[(0,W.jsxs)(`div`,{className:`modal-head`,children:[(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`div`,{className:`eyebrow`,children:`New set`}),(0,W.jsx)(`h2`,{children:`Create a new ${r} pack`})]}),(0,W.jsx)(`button`,{className:`icon-btn`,type:`button`,onClick:t,disabled:m,"aria-label":`Close`,children:(0,W.jsx)(ht,{size:15})})]}),(0,W.jsxs)(`div`,{className:`command-body`,children:[(0,W.jsxs)(`div`,{className:`gift-fields-grid`,children:[(0,W.jsxs)(`label`,{children:[(0,W.jsx)(`span`,{children:`Title`}),(0,W.jsx)(`input`,{value:i,maxLength:64,onChange:e=>a(e.target.value)})]}),(0,W.jsxs)(`label`,{children:[(0,W.jsx)(`span`,{children:`Short name`}),(0,W.jsx)(`input`,{value:o,maxLength:32,onChange:e=>s(e.target.value),placeholder:`lowercase_short_name`})]}),(0,W.jsxs)(`label`,{children:[(0,W.jsx)(`span`,{children:`Emoji`}),(0,W.jsx)(`input`,{value:c,onChange:e=>l(e.target.value),placeholder:`e.g. 😀`})]})]}),(0,W.jsxs)(`label`,{className:`gift-file-picker ${u?`has-file`:``}`,children:[(0,W.jsx)(`input`,{type:`file`,accept:`.tgs,.json,.webp,application/json,application/x-tgsticker,image/webp`,onChange:e=>d(e.target.files?.[0]??null)}),(0,W.jsxs)(`span`,{className:`gift-file-copy`,children:[(0,W.jsx)(`span`,{className:`gift-field-label`,children:`First ${r}`}),(0,W.jsx)(`strong`,{children:u?u.name:`Choose a TGS, Lottie JSON, or WebP file`})]}),(0,W.jsx)(`span`,{className:`gift-file-action`,children:u?`Change file`:`Choose file`})]}),(0,W.jsxs)(`label`,{className:`gift-reason-field`,children:[(0,W.jsx)(`span`,{children:`Audit reason`}),(0,W.jsx)(`input`,{value:f,placeholder:`Briefly describe why this gift is being imported`,onChange:e=>p(e.target.value)})]}),_&&(0,W.jsx)(K,{children:_})]}),(0,W.jsxs)(`div`,{className:`modal-actions`,children:[(0,W.jsx)(`button`,{className:`btn`,type:`button`,onClick:t,disabled:m,children:`Close`}),(0,W.jsxs)(`button`,{className:`btn primary`,type:`button`,onClick:y,disabled:m,children:[m?(0,W.jsx)(L,{className:`spin`,size:15}):(0,W.jsx)(dt,{size:15}),`Create ${r} pack`]})]})]})}),document.body)}var yr=24;function Z({set:e,onClose:t}){let n=e.Kind===`emoji`?`emoji`:`sticker`,[r,i]=(0,g.useState)(null),[a,o]=(0,g.useState)(``),[s,c]=(0,g.useState)(1),l=(0,g.useCallback)(()=>{let t=!1;return o(``),k.stickerSetDocuments(e.ID).then(e=>{t||i(e.document_ids??[])}).catch(e=>{t||o(O(e))}),()=>{t=!0}},[e.ID]);(0,g.useEffect)(()=>(i(null),c(1),l()),[l]);let u=r?.length??0,d=Math.max(1,Math.ceil(u/yr)),f=Math.min(s,d),p=(f-1)*yr,m=r?.slice(p,p+yr)??[],h=m.length===0?0:p+1,_=h===0?0:h+m.length-1;return(0,pn.createPortal)((0,W.jsx)(`div`,{className:`modal-backdrop`,role:`presentation`,children:(0,W.jsxs)(`section`,{className:`modal command-modal sticker-preview-modal`,role:`dialog`,"aria-modal":`true`,"aria-label":e.Title||`#${e.ID}`,children:[(0,W.jsxs)(`div`,{className:`modal-head`,children:[(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`div`,{className:`eyebrow`,children:`Set contents`}),(0,W.jsx)(`h2`,{children:e.Title||`#${e.ID}`})]}),(0,W.jsx)(`button`,{className:`icon-btn`,type:`button`,onClick:t,"aria-label":`Close`,children:(0,W.jsx)(ht,{size:15})})]}),(0,W.jsxs)(`div`,{className:`command-body`,children:[(0,W.jsx)(br,{setID:e.ID,noun:n,onAdded:l}),a&&(0,W.jsx)(K,{children:a}),!a&&r===null&&(0,W.jsxs)(`div`,{className:`loading-line`,children:[(0,W.jsx)(L,{className:`spin`,size:18}),` `,`Loading`]}),r!==null&&u===0&&!a&&(0,W.jsx)(`div`,{className:`empty-panel`,children:`This set has no documents.`}),m.length>0&&(0,W.jsx)(`div`,{className:`sticker-doc-grid`,children:m.map(t=>(0,W.jsxs)(`div`,{className:`sticker-doc-grid-cell`,children:[(0,W.jsx)(_r,{documentID:t}),(0,W.jsx)(X,{compact:!0,tone:`danger`,label:`Remove`,icon:(0,W.jsx)(lt,{size:12}),path:`/api/actions/remove-sticker-from-set`,payload:()=>({set_id:e.ID,document_id:t}),onDone:l})]},t))},f),u>yr&&(0,W.jsxs)(`div`,{className:`gift-pager`,children:[(0,W.jsx)(`span`,{className:`gift-pager-range`,children:`Showing ${h}-${_} of ${u}`}),(0,W.jsxs)(`div`,{className:`gift-pager-controls`,children:[(0,W.jsxs)(`button`,{className:`btn compact-btn`,type:`button`,onClick:()=>c(e=>Math.max(1,e-1)),disabled:f<=1,children:[(0,W.jsx)(_e,{size:14}),` `,`Previous`]}),(0,W.jsx)(`span`,{className:`gift-pager-page`,children:`Page ${f} of ${d}`}),(0,W.jsxs)(`button`,{className:`btn compact-btn`,type:`button`,onClick:()=>c(e=>Math.min(d,e+1)),disabled:f>=d,children:[`Next`,` `,(0,W.jsx)(ve,{size:14})]})]})]})]})]})}),document.body)}function br({setID:e,noun:t,onAdded:n}){let[r,i]=(0,g.useState)(null),[a,o]=(0,g.useState)(``),[s,c]=(0,g.useState)(``),[l,u]=(0,g.useState)(!1),[d,f]=(0,g.useState)(``);async function p(){if(!r){f(`Choose a ${t} file first`);return}if(!a.trim()){f(`An emoji is required.`);return}if(!s.trim()){f(`Please enter an operation reason`);return}u(!0),f(``);try{let t=new FormData;t.set(`metadata`,JSON.stringify({command_id:``,reason:s.trim(),confirm:!0,set_id:e,emoji:a.trim()})),t.set(`file`,r,r.name),await k.addStickerToSet(t),i(null),o(``),c(``),n()}catch(e){f(O(e))}finally{u(!1)}}return(0,W.jsxs)(`div`,{className:`sticker-add-form`,children:[(0,W.jsxs)(`label`,{className:`gift-file-picker compact ${r?`has-file`:``}`,children:[(0,W.jsx)(`input`,{type:`file`,accept:`.tgs,.json,.webp,application/json,application/x-tgsticker,image/webp`,onChange:e=>i(e.target.files?.[0]??null)}),(0,W.jsx)(`span`,{className:`gift-file-copy`,children:(0,W.jsx)(`strong`,{children:r?r.name:`Choose a TGS, Lottie JSON, or WebP file`})})]}),(0,W.jsx)(`input`,{className:`small-input`,value:a,onChange:e=>o(e.target.value),placeholder:`e.g. 😀`}),(0,W.jsx)(`input`,{className:`small-input`,value:s,onChange:e=>c(e.target.value),placeholder:`Describe why this operation is being performed`}),(0,W.jsxs)(`button`,{className:`btn primary compact-btn`,type:`button`,onClick:p,disabled:l,children:[l?(0,W.jsx)(L,{className:`spin`,size:14}):(0,W.jsx)(Ge,{size:14}),` `,`Add ${t}`]}),d&&(0,W.jsx)(`span`,{className:`sticker-add-form-error`,children:d})]})}function xr({kind:e}){let[t,n]=(0,g.useState)([]),[r,i]=(0,g.useState)(``),[a,o]=(0,g.useState)(!1),[s,c]=(0,g.useState)(``),[l,u]=(0,g.useState)(10),[d,f]=(0,g.useState)(1),[p,m]=(0,g.useState)({}),[h,_]=(0,g.useState)({}),[v,y]=(0,g.useState)(null),[b,x]=(0,g.useState)(!1),S=e===`emoji`?`Emoji`:`Stickers`,C=e===`emoji`?`Custom-emoji packs — system packs aren't shown here, they're not hand-edited`:`Sticker packs — system packs (dice, animated emoji, gifts) aren't shown here, they're not hand-edited`,w=e===`emoji`?`emoji`:`sticker`;async function T(){o(!0),c(``);try{n((await k.stickerSets(e)).rows??[])}catch(e){c(O(e))}finally{o(!1)}}(0,g.useEffect)(()=>{T()},[e]);let E=(0,g.useMemo)(()=>{let e=r.trim().toLowerCase();return e?t.filter(t=>String(t.ID).includes(e)||t.ShortName.toLowerCase().includes(e)||t.Title.toLowerCase().includes(e)):t},[t,r]);(0,g.useEffect)(()=>{f(1)},[r,l,e]);let D=l===`all`?1:Math.max(1,Math.ceil(E.length/l)),A=Math.min(d,D),j=(0,g.useMemo)(()=>{if(l===`all`)return E;let e=(A-1)*l;return E.slice(e,e+l)},[E,A,l]),M=j.length===0?0:l===`all`?1:(A-1)*l+1,N=M===0?0:M+j.length-1,P=(0,g.useMemo)(()=>({total:t.length,official:t.filter(e=>e.Official).length,archived:t.filter(e=>e.Archived).length}),[t]);return(0,W.jsxs)(Mt,{title:S,eyebrow:C,actions:(0,W.jsxs)(W.Fragment,{children:[(0,W.jsxs)(`button`,{className:`btn`,type:`button`,onClick:()=>T(),disabled:a,children:[(0,W.jsx)(Ye,{size:15}),` `,`Refresh`]}),(0,W.jsxs)(`button`,{className:`btn primary`,type:`button`,onClick:()=>x(!0),children:[(0,W.jsx)(Ge,{size:15}),` `,`Create ${w} pack`]})]}),children:[s&&(0,W.jsx)(K,{children:s}),(0,W.jsxs)(`div`,{className:`metric-row`,children:[(0,W.jsx)(J,{label:`Total sets`,value:String(P.total)}),(0,W.jsx)(J,{label:`Official`,value:String(P.official),tone:`good`}),(0,W.jsx)(J,{label:`Archived`,value:String(P.archived),tone:P.archived>0?`warn`:`neutral`})]}),(0,W.jsx)(Nt,{children:(0,W.jsxs)(`div`,{className:`toolbar`,children:[(0,W.jsxs)(`label`,{className:`searchbox`,children:[(0,W.jsx)(Ze,{size:15}),(0,W.jsx)(`input`,{value:r,onChange:e=>i(e.target.value),placeholder:`Search set ID, short name or title`})]}),(0,W.jsxs)(`label`,{className:`gift-page-size`,children:[(0,W.jsx)(`span`,{children:`Per page`}),(0,W.jsxs)(`select`,{value:String(l),onChange:e=>u(e.target.value===`all`?`all`:Number(e.target.value)),children:[(0,W.jsx)(`option`,{value:`10`,children:`10`}),(0,W.jsx)(`option`,{value:`20`,children:`20`}),(0,W.jsx)(`option`,{value:`50`,children:`50`}),(0,W.jsx)(`option`,{value:`100`,children:`100`}),(0,W.jsx)(`option`,{value:`all`,children:`All`})]})]}),(0,W.jsx)(`span`,{className:`gift-list-summary`,children:`Showing ${E.length} of ${t.length}`})]})}),(0,W.jsx)(`div`,{className:`table-wrap gift-table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{children:`Logo`}),(0,W.jsx)(`th`,{children:`ID`}),(0,W.jsx)(`th`,{children:`Short name`}),(0,W.jsx)(`th`,{children:`Title`}),(0,W.jsx)(`th`,{children:`Documents`}),(0,W.jsx)(`th`,{children:`Official`}),(0,W.jsx)(`th`,{children:`Status`}),(0,W.jsx)(`th`,{children:`Sort order`}),(0,W.jsx)(`th`,{children:`Actions`})]})}),(0,W.jsxs)(`tbody`,{children:[j.map(e=>(0,W.jsxs)(`tr`,{className:e.Archived?`gift-row-disabled`:``,children:[(0,W.jsx)(`td`,{children:e.CoverDocumentID?(0,W.jsx)(_r,{documentID:e.CoverDocumentID,className:`list-thumb`,showError:!1}):(0,W.jsx)(`div`,{className:`sticker-list-thumb-empty`,children:(0,W.jsx)(Me,{size:14})})}),(0,W.jsx)(`td`,{className:`mono`,children:e.ID}),(0,W.jsx)(`td`,{className:`mono`,children:e.ShortName||(0,W.jsx)(`span`,{className:`muted-cell`,children:`None`})}),(0,W.jsx)(`td`,{children:(0,W.jsxs)(`div`,{className:`sort-order-editor`,children:[(0,W.jsx)(`input`,{className:`small-input title-input`,value:h[e.ID]??e.Title,onChange:t=>_(n=>({...n,[e.ID]:t.target.value}))}),(0,W.jsx)(X,{compact:!0,tone:`neutral`,label:`Save`,path:`/api/actions/rename-sticker-set`,payload:()=>({set_id:e.ID,title:(h[e.ID]??e.Title).trim()}),onDone:()=>void T()})]})}),(0,W.jsx)(`td`,{children:e.Count}),(0,W.jsx)(`td`,{children:e.Official?(0,W.jsx)(q,{tone:`good`,children:`Yes`}):(0,W.jsx)(q,{children:`No`})}),(0,W.jsx)(`td`,{children:e.Archived?(0,W.jsx)(q,{tone:`danger`,children:`Archived`}):(0,W.jsx)(q,{tone:`good`,children:`Enabled`})}),(0,W.jsx)(`td`,{children:(0,W.jsxs)(`div`,{className:`sort-order-editor`,children:[(0,W.jsx)(`input`,{type:`number`,className:`small-input`,value:p[e.ID]??String(e.SortOrder),onChange:t=>m(n=>({...n,[e.ID]:t.target.value}))}),(0,W.jsx)(X,{compact:!0,tone:`neutral`,label:`Save`,path:`/api/actions/set-sticker-set-sort-order`,payload:()=>({set_id:e.ID,sort_order:Number(p[e.ID]??e.SortOrder)}),onDone:()=>void T()})]})}),(0,W.jsx)(`td`,{children:(0,W.jsxs)(`div`,{className:`gift-table-actions`,children:[(0,W.jsxs)(`button`,{className:`btn compact-btn`,type:`button`,onClick:()=>y(e),children:[(0,W.jsx)(we,{size:13}),` `,`View`]}),(0,W.jsx)(X,{compact:!0,tone:`neutral`,label:e.Archived?`Unarchive`:`Archive`,path:`/api/actions/set-sticker-set-archived`,payload:()=>({set_id:e.ID,archived:!e.Archived}),onDone:()=>void T()}),(0,W.jsx)(X,{compact:!0,tone:`danger`,label:`Delete`,path:`/api/actions/delete-sticker-set`,payload:()=>({set_id:e.ID}),onDone:()=>void T()})]})})]},e.ID)),j.length===0&&(0,W.jsx)(It,{colSpan:9})]})]})}),l!==`all`&&E.length>0&&(0,W.jsxs)(`div`,{className:`gift-pager`,children:[(0,W.jsx)(`span`,{className:`gift-pager-range`,children:`Showing ${M}-${N} of ${E.length}`}),(0,W.jsxs)(`div`,{className:`gift-pager-controls`,children:[(0,W.jsxs)(`button`,{className:`btn compact-btn`,type:`button`,onClick:()=>f(e=>Math.max(1,e-1)),disabled:A<=1,children:[(0,W.jsx)(_e,{size:14}),` `,`Previous`]}),(0,W.jsx)(`span`,{className:`gift-pager-page`,children:`Page ${A} of ${D}`}),(0,W.jsxs)(`button`,{className:`btn compact-btn`,type:`button`,onClick:()=>f(e=>Math.min(D,e+1)),disabled:A>=D,children:[`Next`,` `,(0,W.jsx)(ve,{size:14})]})]})]}),v&&(0,W.jsx)(Z,{set:v,onClose:()=>y(null)}),b&&(0,W.jsx)(vr,{kind:e,onClose:()=>x(!1),onCreated:()=>void T()})]})}var Sr=[`Love`,`Approval`,`Disapproval`,`Cheers`,`Laughter`,`Astonishment`,`Sadness`,`Anger`,`Neutral`,`Doubt`,`Silly`];function Cr({documentID:e}){let[t,n]=(0,g.useState)(!1);return t?(0,W.jsx)(`div`,{className:`sticker-list-thumb-empty`,children:(0,W.jsx)(Me,{size:14})}):(0,W.jsx)(`video`,{className:`gif-catalog-thumb`,src:k.gifCatalogDocumentPreviewURL(e),muted:!0,loop:!0,autoPlay:!0,playsInline:!0,onError:()=>n(!0)})}function wr(){let[e,t]=(0,g.useState)([]),[n,r]=(0,g.useState)(``),[i,a]=(0,g.useState)(!1),[o,s]=(0,g.useState)(``),[c,l]=(0,g.useState)(10),[u,d]=(0,g.useState)(1),[f,p]=(0,g.useState)({}),[m,h]=(0,g.useState)({}),[_,v]=(0,g.useState)(!1);async function y(){a(!0),s(``);try{t((await k.gifCatalog()).rows??[])}catch(e){s(O(e))}finally{a(!1)}}(0,g.useEffect)(()=>{y()},[]);let b=(0,g.useMemo)(()=>{let t=n.trim().toLowerCase();return t?e.filter(e=>e.ID.includes(t)||e.Title.toLowerCase().includes(t)):e},[e,n]);(0,g.useEffect)(()=>{d(1)},[n,c]);let x=c===`all`?1:Math.max(1,Math.ceil(b.length/c)),S=Math.min(u,x),C=(0,g.useMemo)(()=>{if(c===`all`)return b;let e=(S-1)*c;return b.slice(e,e+c)},[b,S,c]),w=C.length===0?0:c===`all`?1:(S-1)*c+1,T=w===0?0:w+C.length-1,E=(0,g.useMemo)(()=>({total:e.length,enabled:e.filter(e=>e.Enabled).length,uncategorized:e.filter(e=>!e.Category).length}),[e]);return(0,W.jsxs)(Mt,{title:`GIFs`,eyebrow:`Curated GIFs served by @gif in the client's GIF picker (trending + search)`,actions:(0,W.jsxs)(W.Fragment,{children:[(0,W.jsxs)(`button`,{className:`btn`,type:`button`,onClick:()=>y(),disabled:i,children:[(0,W.jsx)(Ye,{size:15}),` `,`Refresh`]}),(0,W.jsx)(X,{tone:`neutral`,label:`Auto-categorize`,path:`/api/actions/auto-categorize-gif-catalog`,payload:()=>({}),onDone:()=>void y()}),(0,W.jsx)(X,{tone:`danger`,label:`Delete uncategorized`,path:`/api/actions/delete-uncategorized-gifs`,payload:()=>({}),onDone:()=>void y()}),(0,W.jsxs)(`button`,{className:`btn primary`,type:`button`,onClick:()=>v(!0),children:[(0,W.jsx)(Ge,{size:15}),` `,`Add GIF`]})]}),children:[o&&(0,W.jsx)(K,{children:o}),(0,W.jsxs)(`div`,{className:`metric-row`,children:[(0,W.jsx)(J,{label:`Total GIFs`,value:String(E.total)}),(0,W.jsx)(J,{label:`Enabled`,value:String(E.enabled),tone:`good`}),(0,W.jsx)(J,{label:`Uncategorized`,value:String(E.uncategorized),tone:E.uncategorized>0?`warn`:void 0})]}),(0,W.jsx)(Nt,{children:(0,W.jsxs)(`div`,{className:`toolbar`,children:[(0,W.jsxs)(`label`,{className:`searchbox`,children:[(0,W.jsx)(Ze,{size:15}),(0,W.jsx)(`input`,{value:n,onChange:e=>r(e.target.value),placeholder:`Search ID or title`})]}),(0,W.jsxs)(`label`,{className:`gift-page-size`,children:[(0,W.jsx)(`span`,{children:`Per page`}),(0,W.jsxs)(`select`,{value:String(c),onChange:e=>l(e.target.value===`all`?`all`:Number(e.target.value)),children:[(0,W.jsx)(`option`,{value:`10`,children:`10`}),(0,W.jsx)(`option`,{value:`20`,children:`20`}),(0,W.jsx)(`option`,{value:`50`,children:`50`}),(0,W.jsx)(`option`,{value:`100`,children:`100`}),(0,W.jsx)(`option`,{value:`all`,children:`All`})]})]}),(0,W.jsx)(`span`,{className:`gift-list-summary`,children:`Showing ${b.length} of ${e.length}`})]})}),(0,W.jsx)(`div`,{className:`table-wrap gift-table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{children:`Preview`}),(0,W.jsx)(`th`,{children:`ID`}),(0,W.jsx)(`th`,{children:`Title`}),(0,W.jsx)(`th`,{children:`Document ID`}),(0,W.jsx)(`th`,{children:`Added by`}),(0,W.jsx)(`th`,{children:`Status`}),(0,W.jsx)(`th`,{children:`Category`}),(0,W.jsx)(`th`,{children:`Sort order`}),(0,W.jsx)(`th`,{children:`Actions`})]})}),(0,W.jsxs)(`tbody`,{children:[C.map(e=>(0,W.jsxs)(`tr`,{className:e.Enabled?``:`gift-row-disabled`,children:[(0,W.jsx)(`td`,{children:(0,W.jsx)(Cr,{documentID:e.DocumentID})}),(0,W.jsx)(`td`,{className:`mono`,children:e.ID}),(0,W.jsx)(`td`,{children:e.Title||(0,W.jsx)(`span`,{className:`muted-cell`,children:`Untitled`})}),(0,W.jsx)(`td`,{className:`mono`,children:e.DocumentID}),(0,W.jsx)(`td`,{children:e.CreatedBy||(0,W.jsx)(`span`,{className:`muted-cell`,children:`—`})}),(0,W.jsx)(`td`,{children:e.Enabled?(0,W.jsx)(q,{tone:`good`,children:`Enabled`}):(0,W.jsx)(q,{tone:`danger`,children:`Disabled`})}),(0,W.jsx)(`td`,{children:(0,W.jsxs)(`div`,{className:`sort-order-editor`,children:[(0,W.jsxs)(`select`,{className:`small-input`,value:m[e.ID]??e.Category,onChange:t=>h(n=>({...n,[e.ID]:t.target.value})),children:[(0,W.jsx)(`option`,{value:``,children:`Uncategorized`}),Sr.map(e=>(0,W.jsx)(`option`,{value:e,children:e},e))]}),(0,W.jsx)(X,{compact:!0,tone:`neutral`,label:`Save`,path:`/api/actions/set-gif-catalog-category`,payload:()=>({id:e.ID,category:m[e.ID]??e.Category}),onDone:()=>void y()})]})}),(0,W.jsx)(`td`,{children:(0,W.jsxs)(`div`,{className:`sort-order-editor`,children:[(0,W.jsx)(`input`,{type:`number`,className:`small-input`,value:f[e.ID]??String(e.SortOrder),onChange:t=>p(n=>({...n,[e.ID]:t.target.value}))}),(0,W.jsx)(X,{compact:!0,tone:`neutral`,label:`Save`,path:`/api/actions/set-gif-catalog-sort-order`,payload:()=>({id:e.ID,sort_order:Number(f[e.ID]??e.SortOrder)}),onDone:()=>void y()})]})}),(0,W.jsx)(`td`,{children:(0,W.jsxs)(`div`,{className:`gift-table-actions`,children:[(0,W.jsx)(X,{compact:!0,tone:`neutral`,label:e.Enabled?`Disable`:`Enable`,path:`/api/actions/set-gif-catalog-enabled`,payload:()=>({id:e.ID,enabled:!e.Enabled}),onDone:()=>void y()}),(0,W.jsx)(X,{compact:!0,tone:`danger`,label:`Delete`,path:`/api/actions/delete-gif-catalog-entry`,payload:()=>({id:e.ID}),onDone:()=>void y()})]})})]},e.ID)),C.length===0&&(0,W.jsx)(It,{colSpan:9})]})]})}),c!==`all`&&b.length>0&&(0,W.jsxs)(`div`,{className:`gift-pager`,children:[(0,W.jsx)(`span`,{className:`gift-pager-range`,children:`Showing ${w}-${T} of ${b.length}`}),(0,W.jsxs)(`div`,{className:`gift-pager-controls`,children:[(0,W.jsxs)(`button`,{className:`btn compact-btn`,type:`button`,onClick:()=>d(e=>Math.max(1,e-1)),disabled:S<=1,children:[(0,W.jsx)(_e,{size:14}),` `,`Previous`]}),(0,W.jsx)(`span`,{className:`gift-pager-page`,children:`Page ${S} of ${x}`}),(0,W.jsxs)(`button`,{className:`btn compact-btn`,type:`button`,onClick:()=>d(e=>Math.min(x,e+1)),disabled:S>=x,children:[`Next`,` `,(0,W.jsx)(ve,{size:14})]})]})]}),_&&(0,W.jsx)(Tr,{onClose:()=>v(!1),onCreated:()=>void y()})]})}function Tr({onClose:e,onCreated:t}){let[n,r]=(0,g.useState)(``),[i,a]=(0,g.useState)(null),[o,s]=(0,g.useState)(null),[c,l]=(0,g.useState)(``),[u,d]=(0,g.useState)(!1),[f,p]=(0,g.useState)(``);function m(e){a(e),s(t=>(t&&URL.revokeObjectURL(t),e?URL.createObjectURL(e):null))}async function h(){if(!n.trim()||!i){p(`Title and a GIF/MP4 file are required.`);return}if(!c.trim()){p(`Please enter an operation reason`);return}d(!0),p(``);try{let r=new FormData;r.set(`metadata`,JSON.stringify({command_id:``,reason:c.trim(),confirm:!0,title:n.trim()})),r.set(`file`,i,i.name),await k.createGifCatalogEntry(r),t(),e()}catch(e){p(O(e))}finally{d(!1)}}return(0,pn.createPortal)((0,W.jsx)(`div`,{className:`modal-backdrop`,role:`presentation`,children:(0,W.jsxs)(`section`,{className:`modal command-modal`,role:`dialog`,"aria-modal":`true`,"aria-label":`Add a GIF`,children:[(0,W.jsxs)(`div`,{className:`modal-head`,children:[(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`div`,{className:`eyebrow`,children:`New catalog entry`}),(0,W.jsx)(`h2`,{children:`Add a GIF`})]}),(0,W.jsx)(`button`,{className:`icon-btn`,type:`button`,onClick:e,disabled:u,"aria-label":`Close`,children:(0,W.jsx)(ht,{size:15})})]}),(0,W.jsxs)(`div`,{className:`command-body`,children:[(0,W.jsx)(`div`,{className:`gift-fields-grid`,children:(0,W.jsxs)(`label`,{children:[(0,W.jsx)(`span`,{children:`Title`}),(0,W.jsx)(`input`,{value:n,maxLength:128,onChange:e=>r(e.target.value)})]})}),(0,W.jsxs)(`label`,{className:`gift-file-picker ${i?`has-file`:``}`,children:[(0,W.jsx)(`input`,{type:`file`,accept:`.gif,.mp4,image/gif,video/mp4`,onChange:e=>m(e.target.files?.[0]??null)}),(0,W.jsxs)(`span`,{className:`gift-file-copy`,children:[(0,W.jsx)(`span`,{className:`gift-field-label`,children:`File`}),(0,W.jsx)(`strong`,{children:i?i.name:`Choose a GIF or MP4 file`})]}),(0,W.jsx)(`span`,{className:`gift-file-action`,children:i?`Change file`:`Choose file`})]}),o&&(0,W.jsx)(`div`,{className:`gif-catalog-preview`,children:i?.type===`video/mp4`?(0,W.jsx)(`video`,{src:o,autoPlay:!0,loop:!0,muted:!0,playsInline:!0}):(0,W.jsx)(`img`,{src:o,alt:``})}),(0,W.jsxs)(`label`,{className:`gift-reason-field`,children:[(0,W.jsx)(`span`,{children:`Audit reason`}),(0,W.jsx)(`input`,{value:c,placeholder:`Briefly describe why this GIF is being added`,onChange:e=>l(e.target.value)})]}),f&&(0,W.jsx)(K,{children:f})]}),(0,W.jsxs)(`div`,{className:`modal-actions`,children:[(0,W.jsx)(`button`,{className:`btn`,type:`button`,onClick:e,disabled:u,children:`Close`}),(0,W.jsxs)(`button`,{className:`btn primary`,type:`button`,onClick:h,disabled:u,children:[u?(0,W.jsx)(L,{className:`spin`,size:15}):(0,W.jsx)(dt,{size:15}),`Add GIF`]})]})]})}),document.body)}function Er(){let[e,t]=(0,g.useState)(`settings`);return(0,W.jsxs)(Mt,{title:`Server Settings`,eyebrow:`Identity, .env, and live process/service control`,children:[(0,W.jsxs)(`div`,{className:`tab-bar`,role:`tablist`,"aria-label":`Server Settings sections`,children:[(0,W.jsx)(`button`,{className:`tab-btn ${e===`settings`?`active`:``}`,type:`button`,role:`tab`,"aria-selected":e===`settings`,onClick:()=>t(`settings`),children:`Settings`}),(0,W.jsx)(`button`,{className:`tab-btn ${e===`services`?`active`:``}`,type:`button`,role:`tab`,"aria-selected":e===`services`,onClick:()=>t(`services`),children:`Services`})]}),e===`settings`?(0,W.jsxs)(`div`,{className:`stacked-sections`,children:[(0,W.jsx)(Dr,{}),(0,W.jsx)(kr,{})]}):(0,W.jsx)(`div`,{className:`stacked-sections`,children:(0,W.jsx)(Br,{})})]})}function Dr(){let[e,t]=(0,g.useState)(null),[n,r]=(0,g.useState)(``),[i,a]=(0,g.useState)(``),[o,s]=(0,g.useState)(!1),[c,l]=(0,g.useState)(0),[u,d]=(0,g.useState)(!1),[f,p]=(0,g.useState)(``);async function m(){p(``);try{let e=await k.serverIdentity();t(e),r(e.name),a(e.description),d(!1)}catch(e){p(O(e))}}return(0,g.useEffect)(()=>{m()},[]),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Server identity`}),f&&(0,W.jsx)(K,{children:f}),e?(0,W.jsxs)(`div`,{className:`card-body identity-card`,children:[(0,W.jsxs)(`div`,{className:`identity-layout`,children:[(0,W.jsxs)(`div`,{className:`avatar-edit-slot`,children:[e.icon_ext&&!u?(0,W.jsx)(`img`,{className:`avatar-photo-img`,src:k.serverIconURL()+`&b=${c}`,alt:``,style:{width:88,height:88},onError:()=>d(!0)}):(0,W.jsx)(`div`,{className:`avatar-fallback server-icon-fallback`,style:{width:88,height:88},children:(0,W.jsx)(Me,{size:26})}),(0,W.jsx)(`button`,{className:`icon-btn avatar-edit-btn`,type:`button`,"aria-label":`Change server icon`,title:`Change server icon`,onClick:()=>s(!0),children:(0,W.jsx)(Ne,{size:14})})]}),(0,W.jsxs)(`div`,{className:`server-identity-fields`,children:[(0,W.jsxs)(`label`,{className:`form-field`,children:[(0,W.jsx)(`span`,{children:`Name`}),(0,W.jsx)(`input`,{value:n,maxLength:128,onChange:e=>r(e.target.value)})]}),(0,W.jsxs)(`label`,{className:`form-field`,children:[(0,W.jsx)(`span`,{children:`Description`}),(0,W.jsx)(`textarea`,{rows:4,value:i,maxLength:512,onChange:e=>a(e.target.value)})]})]})]}),(0,W.jsx)(`div`,{className:`gift-table-actions identity-save-row`,children:(0,W.jsx)(X,{tone:`neutral`,label:`Save identity`,path:`/api/actions/set-server-identity`,payload:()=>({name:n,description:i}),onDone:()=>void m()})})]}):(0,W.jsx)(Lt,{label:`Loading identity...`}),o&&(0,W.jsx)(Or,{hasIcon:!!e?.icon_ext,onClose:()=>s(!1),onDone:()=>{l(e=>e+1),d(!1),m()}})]})}function Or({hasIcon:e,onClose:t,onDone:n}){let[r,i]=(0,g.useState)(null),[a,o]=(0,g.useState)(``),[s,c]=(0,g.useState)(``),[l,u]=(0,g.useState)(!1),[d,f]=(0,g.useState)(``);(0,g.useEffect)(()=>{if(!r){o(``);return}let e=URL.createObjectURL(r);return o(e),()=>URL.revokeObjectURL(e)},[r]);async function p(){if(!r){f(`Choose an image file first.`);return}if(!s.trim()){f(`Please enter an operation reason`);return}u(!0),f(``);try{let e=new FormData;e.set(`metadata`,JSON.stringify({command_id:``,reason:s.trim(),confirm:!0})),e.set(`file`,r,r.name);let i=await k.uploadServerIcon(e);if(i.error){f(i.error);return}n(),t()}catch(e){f(O(e))}finally{u(!1)}}async function m(){if(!s.trim()){f(`Please enter an operation reason`);return}u(!0),f(``);try{let e=await k.action(`/api/actions/remove-server-icon`,{command_id:``,reason:s.trim(),confirm:!0});if(e.error){f(e.error);return}n(),t()}catch(e){f(O(e))}finally{u(!1)}}return(0,pn.createPortal)((0,W.jsx)(`div`,{className:`modal-backdrop`,role:`presentation`,children:(0,W.jsxs)(`section`,{className:`modal command-modal`,role:`dialog`,"aria-modal":`true`,"aria-label":`Change server icon`,children:[(0,W.jsxs)(`div`,{className:`modal-head`,children:[(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`div`,{className:`eyebrow`,children:`Server identity`}),(0,W.jsx)(`h2`,{children:`Change server icon`})]}),(0,W.jsx)(`button`,{className:`icon-btn`,type:`button`,onClick:t,disabled:l,"aria-label":`Close`,children:(0,W.jsx)(ht,{size:15})})]}),(0,W.jsxs)(`div`,{className:`command-body`,children:[(0,W.jsxs)(`label`,{className:`gift-file-picker ${r?`has-file`:``}`,children:[(0,W.jsx)(`input`,{type:`file`,accept:`.png,.jpg,.jpeg,.webp,.gif,image/png,image/jpeg,image/webp,image/gif`,onChange:e=>i(e.target.files?.[0]??null)}),a?(0,W.jsx)(`img`,{className:`gift-file-icon`,src:a,alt:``,style:{objectFit:`cover`}}):(0,W.jsx)(Ne,{size:22}),(0,W.jsxs)(`span`,{className:`gift-file-copy`,children:[(0,W.jsx)(`span`,{className:`gift-field-label`,children:`New icon`}),(0,W.jsx)(`strong`,{children:r?r.name:`Choose a PNG, JPEG, WebP, or GIF image`})]}),(0,W.jsx)(`span`,{className:`gift-file-action`,children:r?`Change file`:`Choose file`})]}),(0,W.jsxs)(`label`,{className:`gift-reason-field`,children:[(0,W.jsx)(`span`,{children:`Audit reason`}),(0,W.jsx)(`input`,{value:s,placeholder:`Briefly describe why the server icon is changing`,onChange:e=>c(e.target.value)})]}),d&&(0,W.jsx)(K,{children:d})]}),(0,W.jsxs)(`div`,{className:`modal-actions`,children:[(0,W.jsx)(`button`,{className:`btn`,type:`button`,onClick:t,disabled:l,children:`Close`}),e&&(0,W.jsxs)(`button`,{className:`btn danger icon-text`,type:`button`,onClick:()=>void m(),disabled:l,children:[l?(0,W.jsx)(L,{className:`spin`,size:15}):(0,W.jsx)(lt,{size:15}),`Remove icon`]}),(0,W.jsxs)(`button`,{className:`btn primary icon-text`,type:`button`,onClick:()=>void p(),disabled:l,children:[l?(0,W.jsx)(L,{className:`spin`,size:15}):(0,W.jsx)(dt,{size:15}),`Upload icon`]})]})]})}),document.body)}function kr(){let[e,t]=(0,g.useState)([]),[n,r]=(0,g.useState)({}),[i,a]=(0,g.useState)({}),[o,s]=(0,g.useState)(``);async function c(){s(``);try{let e=await k.serverEnv();t(e);let n={};for(let t of e)for(let e of t.fields)n[e.key]=e.value;r(n)}catch(e){s(O(e))}}return(0,g.useEffect)(()=>{c()},[]),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Environment (.env)`,text:`${(0,g.useMemo)(()=>e.reduce((e,t)=>e+t.fields.length,0),[e])} setting(s) across ${e.length} group(s). Changes take effect on the next Restart/Update.`}),o&&(0,W.jsx)(K,{children:o}),(0,W.jsx)(`div`,{className:`env-groups`,children:e.map(e=>{let t=!!i[e.title];return(0,W.jsxs)(`div`,{className:`env-group ${t?`open`:``}`,children:[(0,W.jsxs)(`button`,{className:`env-group-toggle`,type:`button`,"aria-expanded":t,onClick:()=>a(t=>({...t,[e.title]:!t[e.title]})),children:[(0,W.jsxs)(`span`,{className:`env-group-toggle-text`,children:[(0,W.jsx)(`span`,{className:`env-group-toggle-title`,children:e.title}),(0,W.jsx)(`span`,{className:`env-group-toggle-count`,children:`${e.fields.length} field${e.fields.length===1?``:`s`}`})]}),(0,W.jsx)(ge,{size:16,className:`env-group-chevron`})]}),t&&(0,W.jsxs)(`div`,{className:`env-group-body`,children:[e.description&&(0,W.jsx)(`p`,{className:`env-group-desc`,children:e.description}),e.fields.map(e=>(0,W.jsxs)(`label`,{className:`form-field env-field`,children:[(0,W.jsx)(`span`,{className:`mono`,children:e.key}),e.description&&(0,W.jsx)(`span`,{className:`env-field-desc`,children:e.description}),(0,W.jsx)(`input`,{type:e.sensitive?`password`:`text`,value:n[e.key]??``,placeholder:e.default_value,onChange:t=>r(n=>({...n,[e.key]:t.target.value}))})]},e.key))]})]},e.title)})}),(0,W.jsx)(`div`,{className:`gift-table-actions env-save-row`,children:(0,W.jsx)(X,{tone:`warn`,label:`Save .env changes`,path:`/api/actions/update-server-env`,payload:()=>({values:n}),onDone:()=>void c()})})]})}function Ar(e){return new Promise(t=>setTimeout(t,e))}function jr(){let[e,t]=(0,g.useState)(!1),[n,r]=(0,g.useState)(!1),i=(0,g.useRef)(!1);return{waiting:e,timedOut:n,watch:(0,g.useCallback)(async(e=15e4)=>{i.current=!1,r(!1),t(!0);let n=``;try{n=(await k.session()).boot_id??``}catch{}let a=Date.now()+e;for(;Date.now(){i.current=!0,t(!1),r(!1)},[])}}function Mr({label:e,timedOut:t,onDismiss:n}){return(0,pn.createPortal)((0,W.jsx)(`div`,{className:`modal-backdrop`,role:`presentation`,children:(0,W.jsx)(`section`,{className:`modal command-modal restart-overlay`,role:`dialog`,"aria-modal":`true`,"aria-label":e,children:t?(0,W.jsxs)(`div`,{className:`command-body restart-overlay-body`,children:[(0,W.jsx)(K,{children:`The admin panel did not come back within the expected time. It may still be building/restarting -- reload manually in a bit, or check the server logs.`}),(0,W.jsxs)(`div`,{className:`gift-table-actions restart-overlay-actions`,children:[(0,W.jsx)(`button`,{className:`btn`,type:`button`,onClick:n,children:`Dismiss`}),(0,W.jsx)(`button`,{className:`btn primary`,type:`button`,onClick:()=>window.location.reload(),children:`Reload now`})]})]}):(0,W.jsxs)(`div`,{className:`command-body restart-overlay-body`,children:[(0,W.jsx)(L,{className:`spin`,size:28}),(0,W.jsx)(`p`,{children:e})]})})}),document.body)}function Nr(e){switch(e){case`good`:return(0,W.jsx)(I,{size:15});case`warn`:return(0,W.jsx)(L,{className:`spin`,size:15});case`danger`:return(0,W.jsx)(te,{size:15});default:return(0,W.jsx)(ye,{size:15})}}function Pr({icon:e,name:t,tone:n,statusLabel:r,detail:i}){return(0,W.jsxs)(`div`,{className:`service-card tone-${n}`,children:[(0,W.jsx)(`div`,{className:`service-card-icon`,children:e}),(0,W.jsxs)(`div`,{className:`service-card-body`,children:[(0,W.jsx)(`div`,{className:`service-card-name`,children:t}),(0,W.jsx)(`div`,{className:`service-card-detail`,children:i??`\xA0`})]}),(0,W.jsxs)(`div`,{className:`service-card-status`,children:[Nr(n),(0,W.jsx)(`span`,{children:r})]})]})}var Fr={postgres:(0,W.jsx)(Se,{size:18}),redis:(0,W.jsx)(ne,{size:18}),minio:(0,W.jsx)(Ae,{size:18})};function Ir(e){let t=e.state.toLowerCase(),n=e.health.toLowerCase();return t!==`running`||n===`unhealthy`?`danger`:n===`starting`?`warn`:`good`}function Lr(e){return e.state.toLowerCase()===`running`?e.health?e.health:`running`:e.state||`stopped`}var Rr=4e3;function zr({onUpdateStarted:e}){let[t,n]=(0,g.useState)(null),[r,i]=(0,g.useState)(``),[a,o]=(0,g.useState)(!1),[s,c]=(0,g.useState)(``),l=(0,g.useCallback)(async()=>{o(!0),c(``),i(``);try{let e=await k.checkServerUpdates();n(e.commits_behind),i(e.commits_behind>0?`${e.commits_behind} new commit${e.commits_behind===1?``:`s`} pulled from GitHub.`:`Already up to date.`)}catch(e){c(O(e))}finally{o(!1)}},[]);(0,g.useEffect)(()=>{l()},[l]);async function u(){let n=t??0;if(window.confirm(`Pull ${n} commit(s), rebuild, and restart owpengram-server and the admin panel?`)){o(!0),c(``);try{let t=await k.action(`/api/actions/update-server`,{command_id:``,reason:`Update via Services tab`,confirm:!0});if(t.error){c(t.error),o(!1);return}e(`Pulled ${n} commit${n===1?``:`s`} -- rebuilding and restarting owpengram-server and the admin panel...`)}catch(e){c(O(e)),o(!1)}}}let d=(t??0)>0;return(0,W.jsxs)(`button`,{className:`btn compact-btn icon-text ${d?`danger`:``}`,type:`button`,disabled:a,title:s||r||void 0,onClick:()=>void(d?u():l()),children:[a?(0,W.jsx)(L,{className:`spin`,size:15}):d?(0,W.jsx)(z,{size:15}):(0,W.jsx)(Ye,{size:15}),d?`Update (${t})`:`Check updates`]})}function Br(){let[e,t]=(0,g.useState)(null),[n,r]=(0,g.useState)(``),[i,a]=(0,g.useState)(null),[o,s]=(0,g.useState)(``),[c,l]=(0,g.useState)(``),u=jr(),d=(0,g.useRef)(!1);d.current=u.waiting;let f=(0,g.useCallback)(async()=>{if(!d.current){try{t(await k.serverStatus()),r(``)}catch(e){r(O(e))}try{a(await k.dockerStatus()),s(``)}catch(e){s(O(e))}}},[]);return(0,g.useEffect)(()=>{f();let e=window.setInterval(()=>void f(),Rr);return()=>window.clearInterval(e)},[f]),(0,W.jsxs)(W.Fragment,{children:[(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Services`,action:(0,W.jsxs)(`div`,{className:`services-header-actions`,children:[(0,W.jsx)(zr,{onUpdateStarted:e=>{l(e),u.watch()}}),(0,W.jsx)(X,{compact:!0,tone:`primary`,label:`Restart`,path:`/api/actions/restart-server`,payload:()=>({}),onDone:()=>{l(`Restarting owpengram-server and the admin panel...`),u.watch()}})]})}),n&&(0,W.jsx)(K,{children:n}),o&&(0,W.jsx)(K,{children:o}),e===null&&i===null&&!n&&!o?(0,W.jsx)(Lt,{label:`Loading service status...`}):(0,W.jsxs)(`div`,{className:`service-grid`,children:[e&&(0,W.jsxs)(W.Fragment,{children:[(0,W.jsx)(Pr,{icon:(0,W.jsx)($e,{size:18}),name:`Server`,tone:e.ServerAlive?`good`:`danger`,statusLabel:e.ServerAlive?`running`:`stopped`,detail:e.ServerAlive?`pid ${e.ServerPID}`:void 0}),(0,W.jsx)(Pr,{icon:(0,W.jsx)(nt,{size:18}),name:`admin panel`,tone:e.AdminAlive?`good`:`danger`,statusLabel:e.AdminAlive?`running`:`stopped`,detail:e.AdminAlive?`pid ${e.AdminPID}`:void 0})]}),i?.map(e=>(0,W.jsx)(Pr,{icon:Fr[e.name]??(0,W.jsx)(Se,{size:18}),name:e.name,tone:Ir(e),statusLabel:Lr(e),detail:e.state},e.name))]})]}),u.waiting&&(0,W.jsx)(Mr,{label:c,timedOut:!1,onDismiss:u.dismiss}),u.timedOut&&(0,W.jsx)(Mr,{label:c,timedOut:!0,onDismiss:u.dismiss})]})}var Vr=`open,in_review,action_pending,action_failed,appeal_review`,Hr=[{value:Vr,label:`Active queue`},{value:`open,in_review,action_pending,action_failed,resolved,dismissed,appeal_review`,label:`All statuses`},{value:`open`,label:`Open`},{value:`in_review`,label:`In review`},{value:`action_pending`,label:`Action pending`},{value:`action_failed`,label:`Action failed`},{value:`appeal_review`,label:`Appeal review`},{value:`resolved`,label:`Resolved`},{value:`dismissed`,label:`Dismissed`}];function Ur({navigate:e}){let[t,n]=(0,g.useState)(Vr),[r,i]=(0,g.useState)(``),[a,o]=(0,g.useState)([]),[s,c]=(0,g.useState)(!1),[l,u]=(0,g.useState)(``);async function d(){c(!0),u(``);try{let e=new URLSearchParams({statuses:t,limit:`100`});r.trim()&&e.set(`assigned_to`,r.trim()),o((await k.moderationCases(e)).cases)}catch(e){u(O(e))}finally{c(!1)}}(0,g.useEffect)(()=>{d()},[]);let f=a.filter(e=>e.Status===`action_pending`||e.Status===`action_failed`).length,p=a.filter(e=>e.Severity===4).length;return(0,W.jsxs)(Mt,{title:`Reports and Moderation`,eyebrow:`Moderation / Cases`,actions:(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:d,disabled:s,children:[(0,W.jsx)(Ye,{size:15,className:s?`spin`:``}),` `,`Refresh`]}),children:[l&&(0,W.jsx)(K,{children:l}),(0,W.jsxs)(`div`,{className:`metric-row`,children:[(0,W.jsx)(J,{label:`Current queue`,value:String(a.length)}),(0,W.jsx)(J,{label:`Critical cases`,value:String(p),tone:p?`danger`:`neutral`}),(0,W.jsx)(J,{label:`Pending / failed actions`,value:String(f),tone:f?`warn`:`good`})]}),(0,W.jsx)(Nt,{children:(0,W.jsxs)(`form`,{className:`toolbar`,onSubmit:e=>{e.preventDefault(),d()},children:[(0,W.jsxs)(`label`,{className:`field-inline`,children:[(0,W.jsx)(`span`,{children:`Status`}),(0,W.jsx)(`select`,{"aria-label":`Case status filter`,value:t,onChange:e=>n(e.target.value),children:Hr.map(e=>(0,W.jsx)(`option`,{value:e.value,children:e.label},e.value))})]}),(0,W.jsxs)(`label`,{className:`field-inline`,children:[(0,W.jsx)(`span`,{children:`Reviewer`}),(0,W.jsx)(`input`,{value:r,onChange:e=>i(e.target.value),placeholder:`Leave blank for all`})]}),(0,W.jsxs)(`button`,{className:`btn primary icon-text`,type:`submit`,disabled:s,children:[(0,W.jsx)(tt,{size:15}),` `,`Search`]})]})}),(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{children:`Case`}),(0,W.jsx)(`th`,{children:`Target`}),(0,W.jsx)(`th`,{children:`Status`}),(0,W.jsx)(`th`,{children:`Severity`}),(0,W.jsx)(`th`,{children:`Reports / Reporters`}),(0,W.jsx)(`th`,{children:`Reviewer`}),(0,W.jsx)(`th`,{children:`Latest report`}),(0,W.jsx)(`th`,{})]})}),(0,W.jsxs)(`tbody`,{children:[a.map(t=>(0,W.jsxs)(`tr`,{children:[(0,W.jsxs)(`td`,{className:`mono`,children:[`#`,t.ID]}),(0,W.jsx)(`td`,{className:`mono`,children:Yr(t.Target.Type,t.Target.ID)}),(0,W.jsx)(`td`,{children:(0,W.jsx)(Wr,{status:t.Status})}),(0,W.jsx)(`td`,{children:(0,W.jsx)(Kr,{value:t.Severity})}),(0,W.jsxs)(`td`,{children:[t.ReportCount,` / `,t.DistinctReporterCount]}),(0,W.jsx)(`td`,{children:t.AssignedTo||`-`}),(0,W.jsx)(`td`,{children:U(t.LastReportAt)}),(0,W.jsx)(`td`,{children:(0,W.jsxs)(`button`,{className:`row-link`,onClick:()=>e(`/moderation/${t.ID}`),children:[`Review`,` `,(0,W.jsx)(ve,{size:14})]})})]},t.ID)),a.length===0&&(0,W.jsx)(It,{colSpan:8})]})]})})]})}function Wr({status:e}){return(0,W.jsx)(q,{tone:e===`resolved`||e===`dismissed`?`good`:e===`action_failed`?`danger`:e===`action_pending`?`warn`:`neutral`,children:Jr(`status`,e)})}var Gr={low:`Low`,medium:`Medium`,high:`High`,critical:`Critical`};function Kr({value:e}){let t=[``,`low`,`medium`,`high`,`critical`][e];return(0,W.jsx)(q,{tone:e>=4?`danger`:e>=3?`warn`:`neutral`,children:t?Gr[t]:e})}var qr={status:{open:`Open`,in_review:`In review`,action_pending:`Action pending`,action_failed:`Action failed`,appeal_review:`Appeal review`,resolved:`Resolved`,dismissed:`Dismissed`},targetType:{channel:`Channel`,chat:`Group`,user:`Account`},source:{account_peer:`Account / peer`,antispam_false_positive:`Anti-spam false positive`,channel_spam:`Channel spam`,encrypted_spam:`Encrypted-chat spam`,ephemeral:`Ephemeral media`,messages:`Messages`,messages_spam:`Message spam`,profile_photo:`Profile photo`,reaction:`Reaction`,sponsored:`Sponsored message`,story:`Story`},reason:{child_abuse:`Child abuse`,copyright:`Copyright`,fake:`Fake`,geo_irrelevant:`Location-irrelevant`,illegal_drugs:`Illegal drugs`,other:`Other`,personal_details:`Personal details`,pornography:`Pornography`,spam:`Spam`,violence:`Violence`}};function Jr(e,t){return qr[e]?.[t]??t}function Yr(e,t){return`${Jr(`targetType`,e)} #${t}`}function Xr({id:e,navigate:t}){let[n,r]=(0,g.useState)(null),[i,a]=(0,g.useState)(null),[o,s]=(0,g.useState)(``),[c,l]=(0,g.useState)(`no_violation`),[u,d]=(0,g.useState)(``),[f,p]=(0,g.useState)(``),[m,h]=(0,g.useState)(!0),[_,v]=(0,g.useState)(!1),[y,b]=(0,g.useState)(``);function x(e){a(e),e&&(d(e.Items.filter(e=>e.Kind===`message`).map(e=>Number(e.ItemID)).filter(e=>Number.isSafeInteger(e)&&e>0).join(`, `)),p(String(e.ReporterUserID)))}async function S(){b(``);try{let t=await k.moderationCase(e);r(t);let n=t.ReportIDs[0];x(n?await k.moderationReport(n):null)}catch(e){b(O(e))}}(0,g.useEffect)(()=>{S()},[e]);let C=(0,g.useMemo)(()=>Zr(c,n?.Case.Target.Type,Qr(u),Number(f),m),[c,n?.Case.Target.Type,u,f,m]),w=(0,g.useMemo)(()=>n?$r(n):{actions:[],label:`None`,blocked:!1},[n]);async function T(){if(n){v(!0),b(``);try{await k.claimModerationCase(e,n.Case.Version),await S()}catch(e){b(O(e))}finally{v(!1)}}}async function E(){if(!n||!o.trim()){b(`A review reason is required.`);return}if(c===`delete_messages`&&C.length===0){b(n.Case.Target.Type===`user`?`Private-message deletion requires valid evidence message IDs and the reporter's owner_user_id.`:`Channel-message deletion requires at least one valid evidence message ID.`);return}if(window.confirm(`Submit the “${ei(c)}” decision? The action will run through the durable action queue.`)){v(!0),b(``);try{r((await k.decideModerationCase(e,{expected_version:n.Case.Version,reason:o.trim(),kind:c===`no_violation`?`no_violation`:`violation`,actions:C})).case),s(``)}catch(e){b(O(e))}finally{v(!1)}}}async function D(t,i){if(!n||!o.trim()){b(`An appeal review reason is required.`);return}if(window.confirm(i?`Grant this appeal?`:`Deny this appeal?`)){v(!0);try{r((await k.reviewModerationAppeal(e,t,{expected_version:n.Case.Version,reason:o.trim(),granted:i,actions:i?w.actions:[]})).case),s(``)}catch(e){b(O(e))}finally{v(!1)}}}if(y&&!n)return(0,W.jsx)(K,{children:y});if(!n)return(0,W.jsx)(Lt,{label:`Loading moderation case…`});let A=n.Case,j=A.Status===`open`||A.Status===`in_review`||A.Status===`appeal_review`,M=(A.Status===`in_review`||A.Status===`action_failed`)&&!!A.AssignedTo,N=M&&(A.Status!==`action_failed`||c!==`no_violation`),P=n.Appeals.find(e=>e.Status===`pending`);return(0,W.jsxs)(Mt,{title:`Review case #${A.ID}`,eyebrow:`Moderation / Case detail`,actions:(0,W.jsxs)(W.Fragment,{children:[(0,W.jsxs)(`button`,{className:`btn icon-text`,onClick:()=>t(`/moderation`),children:[(0,W.jsx)(ue,{size:15}),` `,`Back to queue`]}),(0,W.jsxs)(`button`,{className:`btn icon-text`,onClick:S,children:[(0,W.jsx)(Ye,{size:15}),` `,`Refresh`]})]}),children:[y&&(0,W.jsx)(K,{children:y}),(0,W.jsx)(Pt,{main:(0,W.jsxs)(`div`,{className:`stacked-sections`,children:[(0,W.jsxs)(`section`,{className:`entity-head`,children:[(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`div`,{className:`entity-title`,children:Yr(A.Target.Type,A.Target.ID)}),(0,W.jsx)(`div`,{className:`entity-subtitle`,children:`Version ${A.Version} · Updated ${U(A.UpdatedAt)}`})]}),(0,W.jsxs)(`div`,{className:`entity-badges`,children:[(0,W.jsx)(Wr,{status:A.Status}),(0,W.jsx)(Kr,{value:A.Severity})]})]}),(0,W.jsxs)(`div`,{className:`summary-grid`,children:[(0,W.jsx)(Y,{label:`Target`,value:Yr(A.Target.Type,A.Target.ID),mono:!0}),(0,W.jsx)(Y,{label:`Reports`,value:`${A.ReportCount} reports from ${A.DistinctReporterCount} reporters`}),(0,W.jsx)(Y,{label:`Reviewer`,value:A.AssignedTo||`-`}),(0,W.jsx)(Y,{label:`First / latest report`,value:`${U(A.FirstReportAt)} / ${U(A.LastReportAt)}`})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Report evidence`,text:`Shows up to the latest 100 reports; snapshots are frozen when reports are admitted.`}),(0,W.jsx)(`div`,{className:`toolbar`,children:n.ReportIDs.map(e=>(0,W.jsxs)(`button`,{className:`btn`,onClick:async()=>x(await k.moderationReport(e)),children:[`#`,e]},e))}),i&&(0,W.jsxs)(W.Fragment,{children:[(0,W.jsxs)(`div`,{className:`summary-grid`,children:[(0,W.jsx)(Y,{label:`Source / Reason`,value:`${Jr(`source`,i.Source)} / ${Jr(`reason`,i.Reason)}`}),(0,W.jsx)(Y,{label:`Reporter`,value:String(i.ReporterUserID),mono:!0}),(0,W.jsx)(Y,{label:`Option`,value:i.Option,mono:!0}),(0,W.jsx)(Y,{label:`Time`,value:U(i.CreatedAt)})]}),i.Comment&&(0,W.jsx)(`p`,{className:`about-text`,children:i.Comment}),(0,W.jsx)(Rt,{value:JSON.stringify(i,null,2)})]})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Decision and action audit`,text:`Actions run idempotently through a lease worker; failures retain their error and attempt count.`}),(0,W.jsx)(Rt,{value:JSON.stringify({decisions:n.Decisions,actions:n.Actions},null,2)})]}),n.Appeals.length>0&&(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Appeals`}),(0,W.jsx)(Rt,{value:JSON.stringify(n.Appeals,null,2)})]})]}),side:(0,W.jsxs)(`section`,{className:`action-dock`,children:[(0,W.jsx)(`div`,{className:`dock-title`,children:`Case actions`}),j&&(0,W.jsxs)(`button`,{className:`btn primary icon-text`,disabled:_,onClick:T,children:[(0,W.jsx)(nt,{size:15}),` `,A.AssignedTo?`Renew claim`:`Claim case`]}),(0,W.jsxs)(`label`,{className:`field`,children:[(0,W.jsx)(`span`,{children:`Review reason`}),(0,W.jsx)(`textarea`,{value:o,onChange:e=>s(e.target.value),rows:5})]}),(0,W.jsxs)(`label`,{className:`field`,children:[(0,W.jsx)(`span`,{children:`Decision template`}),(0,W.jsxs)(`select`,{value:c,onChange:e=>l(e.target.value),children:[(0,W.jsx)(`option`,{value:`no_violation`,children:`No violation (dismiss report)`}),(0,W.jsx)(`option`,{value:`scam`,children:`Mark as SCAM`}),(0,W.jsx)(`option`,{value:`fake`,children:`Mark as FAKE`}),(0,W.jsx)(`option`,{value:`freeze`,children:`Freeze account`}),(0,W.jsx)(`option`,{value:`scam_freeze`,children:`SCAM + freeze`}),(0,W.jsx)(`option`,{value:`fake_freeze`,children:`FAKE + freeze`}),(0,W.jsx)(`option`,{value:`delete_messages`,children:`Delete messages covered by evidence`}),(0,W.jsx)(`option`,{value:`delete_account`,children:`Delete account`})]})]}),c===`delete_messages`&&(0,W.jsxs)(W.Fragment,{children:[(0,W.jsxs)(`label`,{className:`field`,children:[(0,W.jsx)(`span`,{children:`Evidence message IDs (comma-separated)`}),(0,W.jsx)(`input`,{value:u,onChange:e=>d(e.target.value),placeholder:`101, 102`})]}),A.Target.Type===`user`&&(0,W.jsxs)(W.Fragment,{children:[(0,W.jsxs)(`label`,{className:`field`,children:[(0,W.jsx)(`span`,{children:`Private-chat owner_user_id`}),(0,W.jsx)(`input`,{value:f,onChange:e=>p(e.target.value),inputMode:`numeric`})]}),(0,W.jsxs)(`label`,{className:`field checkbox-field`,children:[(0,W.jsx)(`input`,{type:`checkbox`,checked:m,onChange:e=>h(e.target.checked)}),(0,W.jsx)(`span`,{children:`Revoke for both sides`})]})]}),(0,W.jsx)(K,{children:`The server will verify again that every message ID exists in this case's immutable report evidence.`})]}),A.Status===`action_failed`&&c===`no_violation`&&(0,W.jsx)(K,{children:`The action was partially executed and cannot be changed directly to no violation. Select a new action to retry while retaining the previous failure audit.`}),M&&(0,W.jsxs)(`button`,{className:`btn danger icon-text`,disabled:_||!N,onClick:E,children:[(0,W.jsx)(I,{size:15}),` `,A.Status===`action_failed`?`Retry action`:`Submit decision`]}),P&&A.AssignedTo&&(0,W.jsxs)(W.Fragment,{children:[(0,W.jsx)(`div`,{className:`dock-title`,children:`Appeal review #${P.ID}`}),(0,W.jsx)(Y,{label:`Automatic remedy after approval`,value:w.label}),w.blocked&&(0,W.jsx)(K,{children:`The case contains a completed irreversible deletion. It cannot be marked as approved and restored; deny it or escalate for manual handling.`}),(0,W.jsx)(`button`,{className:`btn`,disabled:_,onClick:()=>D(P.ID,!1),children:`Deny appeal`}),(0,W.jsx)(`button`,{className:`btn primary`,disabled:_||w.blocked,onClick:()=>D(P.ID,!0),children:`Grant appeal`})]})]})})]})}function Zr(e,t,n,r,i){switch(e){case`scam`:return[{kind:`mark_scam`,payload:{}}];case`fake`:return[{kind:`mark_fake`,payload:{}}];case`freeze`:return[{kind:`freeze_account`,payload:{}}];case`scam_freeze`:return[{kind:`mark_scam`,payload:{}},{kind:`freeze_account`,payload:{}}];case`fake_freeze`:return[{kind:`mark_fake`,payload:{}},{kind:`freeze_account`,payload:{}}];case`delete_messages`:return n.length===0?[]:t===`channel`?[{kind:`delete_channel_message`,payload:{ids:n}}]:t===`user`&&Number.isSafeInteger(r)&&r>0?[{kind:`delete_private_message`,payload:{owner_user_id:r,ids:n,revoke:i}}]:[];case`delete_account`:return[{kind:`delete_account`,payload:{}}];default:return[]}}function Qr(e){let t=e.split(/[,\s]+/).filter(Boolean).map(Number);return t.length===0||t.some(e=>!Number.isSafeInteger(e)||e<=0)?[]:[...new Set(t)]}function $r(e){let t=!1,n=!1,r=!1;for(let i of[...e.Actions].sort((e,t)=>e.ID-t.ID))if(i.Status===`succeeded`)switch(i.Kind){case`mark_scam`:case`mark_fake`:t=!0;break;case`clear_peer_flags`:t=!1;break;case`freeze_account`:n=!0;break;case`unfreeze_account`:n=!1;break;case`delete_private_message`:case`delete_channel_message`:case`delete_account`:r=!0;break}let i=[],a=[];return t&&(i.push({kind:`clear_peer_flags`,payload:{}}),a.push(`Clear SCAM / FAKE`)),n&&(i.push({kind:`unfreeze_account`,payload:{}}),a.push(`Unfreeze account`)),{actions:i,label:a.join(` + `)||`No recovery action needed`,blocked:r}}function ei(e){return{no_violation:`No violation (dismiss report)`,scam:`Mark as SCAM`,fake:`Mark as FAKE`,freeze:`Freeze account`,scam_freeze:`SCAM + freeze`,fake_freeze:`FAKE + freeze`,delete_messages:`Delete messages covered by evidence`,delete_account:`Delete account`}[e]}function ti({navigate:e}){let[t,n]=(0,g.useState)(null),[r,i]=(0,g.useState)([]),[a,o]=(0,g.useState)(!1),[s,c]=(0,g.useState)(0),[l,u]=(0,g.useState)(!1),[d,f]=(0,g.useState)(``);async function p(){try{n(await k.storageStats())}catch{}}async function m(e=!1){u(!0),f(``);let t=new URLSearchParams({limit:`50`,offset:String(e?s:0)});try{let n=await k.storageAccounts(t),r=n.rows??[];i(t=>e?[...t,...r]:r),c(n.next_offset),o(!!n.has_more)}catch(e){f(O(e))}finally{u(!1)}}function h(){p(),m(!1)}(0,g.useEffect)(()=>{h()},[]);let _=t?Math.max(0,Number(t.LogicalBytes)-Number(t.PhysicalBytes)):0;return(0,W.jsxs)(Mt,{title:`Storage`,eyebrow:`Media / Storage usage`,actions:(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:h,disabled:l,children:[(0,W.jsx)(Ye,{size:15,className:l?`spin`:``}),` `,`Refresh`]}),children:[d&&(0,W.jsx)(K,{children:d}),(0,W.jsxs)(`div`,{className:`metric-row`,children:[(0,W.jsx)(J,{label:`Physical usage (on disk / S3)`,value:t?kt(t.PhysicalBytes):`-`}),(0,W.jsx)(J,{label:`Logical usage (sum per account)`,value:t?kt(t.LogicalBytes):`-`}),(0,W.jsx)(J,{label:`Saved by dedup`,value:kt(String(_)),tone:_>0?`good`:`neutral`}),(0,W.jsx)(J,{label:`Backend`,value:t?.BackendKind??`-`})]}),(0,W.jsxs)(`div`,{className:`metric-row`,children:[(0,W.jsx)(J,{label:`Documents`,value:t?St(t.DocumentCount):`-`}),(0,W.jsx)(J,{label:`Photos`,value:t?St(t.PhotoCount):`-`}),(0,W.jsx)(J,{label:`Accounts with media`,value:t?St(t.AccountCount):`-`}),(0,W.jsx)(J,{label:`Unattributed`,value:t?kt(t.UnattributedBytes):`-`,tone:t&&Number(t.UnattributedBytes)>0?`warn`:`neutral`})]}),(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{children:`User ID`}),(0,W.jsx)(`th`,{children:`Account`}),(0,W.jsx)(`th`,{children:`Storage used`}),(0,W.jsx)(`th`,{children:`Files`})]})}),(0,W.jsxs)(`tbody`,{children:[r.map(e=>(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`td`,{className:`mono`,children:e.UserID}),(0,W.jsx)(`td`,{children:H(e.Username)||e.FirstName||`-`}),(0,W.jsx)(`td`,{className:`mono`,children:kt(e.Bytes)}),(0,W.jsx)(`td`,{className:`mono`,children:St(e.FileCount)})]},e.UserID)),r.length===0&&(0,W.jsx)(It,{colSpan:4})]})]})}),a&&(0,W.jsx)(`div`,{className:`toolbar`,children:(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>m(!0),disabled:l,children:[l?(0,W.jsx)(L,{size:15,className:`spin`}):(0,W.jsx)(ge,{size:15}),` `,`Load more`]})})]})}function ni({loader:e,cacheKey:t,className:n,playOnHover:r=!0,onError:i}){let a=(0,g.useRef)(null),o=(0,g.useRef)(null);(0,g.useEffect)(()=>{let t=!1;return e().then(e=>{t||!a.current||(o.current?.destroy(),o.current=gr.default.loadAnimation({container:a.current,renderer:`canvas`,loop:!0,autoplay:!1,animationData:structuredClone(e)}),o.current.goToAndStop(0,!0))}).catch(()=>i?.()),()=>{t=!0,o.current?.destroy(),o.current=null}},[t]);function s(){r&&o.current?.play()}function c(){r&&o.current?.goToAndStop(0,!0)}return(0,W.jsx)(`div`,{className:n,ref:a,onMouseEnter:s,onMouseLeave:c})}function ri(e){let t=e.toLowerCase();return t.includes(`tgsticker`)||t.includes(`lottie`)||t.includes(`json`)}function ii({row:e}){let[t,n]=(0,g.useState)(!ri(e.MimeType));return(0,g.useEffect)(()=>{n(!ri(e.MimeType))},[e.DocumentID,e.MimeType]),t?(0,W.jsx)(`div`,{className:`emoji-picker-glyph`,children:e.Alt||`🙂`}):(0,W.jsx)(ni,{className:`emoji-picker-anim`,cacheKey:e.DocumentID,loader:()=>k.emojiAnimation(e.DocumentID),onError:()=>n(!0)})}function ai({label:e,value:t,onChange:n}){let[r,i]=(0,g.useState)(``),[a,o]=(0,g.useState)([]),[s,c]=(0,g.useState)(!1),[l,u]=(0,g.useState)(``),d=a.find(e=>e.DocumentID===t)??null;async function f(){c(!0),u(``);let e=new URLSearchParams({limit:`24`});r.trim()&&e.set(`q`,r.trim());try{o((await k.emoji(e)).rows??[])}catch(e){u(O(e))}finally{c(!1)}}return(0,g.useEffect)(()=>{f()},[]),(0,W.jsxs)(`div`,{className:`entity-picker`,children:[(0,W.jsxs)(`div`,{className:`picker-head`,children:[(0,W.jsx)(`span`,{children:e}),t?(0,W.jsxs)(`button`,{className:`link-button`,type:`button`,onClick:()=>n(``),children:[(0,W.jsx)(ht,{size:13}),` `,`Clear`]}):null]}),t?(0,W.jsxs)(`div`,{className:`selected-entity`,children:[(0,W.jsx)(he,{size:15}),(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`strong`,{children:d?.Alt||`—`}),(0,W.jsx)(`span`,{className:`mono`,children:t})]}),(0,W.jsx)(`span`,{children:d?.SetTitle||`-`})]}):null,(0,W.jsxs)(`div`,{className:`picker-search`,children:[(0,W.jsx)(Ze,{size:15}),(0,W.jsx)(`input`,{value:r,onChange:e=>i(e.target.value),onKeyDown:e=>{e.key===`Enter`&&(e.preventDefault(),f())},placeholder:`Search document ID or emoji`}),(0,W.jsx)(`button`,{className:`btn compact-btn`,type:`button`,onClick:f,disabled:s,children:s?(0,W.jsx)(L,{size:14,className:`spin`}):`Search`})]}),l&&(0,W.jsx)(`div`,{className:`picker-error`,children:l}),(0,W.jsxs)(`div`,{className:`picker-results emoji-picker-results`,children:[a.map(e=>(0,W.jsxs)(`button`,{className:`picker-row emoji-picker-row ${t===e.DocumentID?`selected`:``}`,type:`button`,onClick:()=>n(e.DocumentID),children:[(0,W.jsx)(ii,{row:e}),(0,W.jsx)(`span`,{className:`mono`,children:e.DocumentID}),(0,W.jsx)(`span`,{children:e.SetTitle||`—`})]},e.DocumentID)),a.length===0&&!s?(0,W.jsx)(`div`,{className:`picker-empty`,children:`No results`}):null]})]})}var oi=[`pending`,`approved`,`rejected`,`revoked`],si=[`user`,`channel`],ci={pending:`Pending`,approved:`Approved`,rejected:`Rejected`,revoked:`Mark revoked`},li={user:`Account`,channel:`Channel`};function ui({navigate:e}){let{can:t}=Kt(),n=t(Ht),r=t(Bt),[i,a]=(0,g.useState)(`requests`),[o,s]=(0,g.useState)([]),[c,l]=(0,g.useState)([]),[u,d]=(0,g.useState)(``),[f,p]=(0,g.useState)(!1);async function m(){d(``),p(!1);try{let[e,t]=await Promise.all([k.botVerifiers(new URLSearchParams({limit:`200`})),k.verificationIcons(new URLSearchParams({limit:`200`}))]);s(e.rows??[]),l(t.rows??[])}catch(e){if(e instanceof v&&e.status===403){s([]),l([]),p(!0);return}d(O(e))}}return(0,g.useEffect)(()=>{m()},[]),(0,W.jsxs)(Mt,{title:`Third-party verification`,eyebrow:`Third-party verification / Verifiers, icons, marks`,actions:r?(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>e(`/verification`),children:[(0,W.jsx)(Ce,{size:15}),` `,`Official verification`]}):void 0,children:[u&&(0,W.jsx)(K,{children:u}),f&&(0,W.jsx)(K,{children:`The server refused the verifier roster and the icon catalogue for this session (403), so both lists are empty here — applications can still be reviewed.`}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`A verifier company's icon — not the official checkmark`,text:`A third-party mark is a verifier bot's own icon, drawn right BEFORE the name of an account, a bot or a channel, plus one line of description in the profile. It says “this verifier vouches for this peer”, and nothing more.`}),(0,W.jsx)(`p`,{className:`bot-create-note`,children:`The icon is a custom emoji document. The client fetches it through messages.getCustomEmojiDocuments, so a document id that resolves to nothing renders as no badge at all — which is why marks are granted from the catalogue below rather than from a typed number.`}),(0,W.jsx)(`p`,{className:`bot-create-note`,children:`The official checkmark is a different mechanism, granted by the platform in the Verification section. The two are stored, shown and taken away separately, and neither one implies the other.`}),!n&&(0,W.jsx)(`p`,{className:`bot-create-note`,children:`This session can read the section and decide applications, but not change verifiers or the icon catalogue — that needs the botverification.manage permission.`})]}),(0,W.jsx)(`div`,{className:`toolbar`,role:`group`,"aria-label":`Third-party verification`,children:[{key:`requests`,label:`Applications`,icon:(0,W.jsx)(ot,{size:15})},{key:`verifiers`,label:`Verifiers`,icon:(0,W.jsx)(pe,{size:15})},{key:`icons`,label:`Icon catalogue`,icon:(0,W.jsx)(st,{size:15})},{key:`marks`,label:`Granted marks`,icon:(0,W.jsx)(F,{size:15})}].map(e=>(0,W.jsxs)(`button`,{className:`btn icon-text ${i===e.key?`primary`:``}`,type:`button`,"aria-pressed":i===e.key,onClick:()=>a(e.key),children:[e.icon,` `,e.label]},e.key))}),i===`requests`&&(0,W.jsx)(di,{navigate:e,verifiers:o}),i===`verifiers`&&(0,W.jsx)(fi,{verifiers:o,icons:c,canManage:n,onChanged:m,navigate:e}),i===`icons`&&(0,W.jsx)(pi,{icons:c,verifiers:o,canManage:n,onChanged:m}),i===`marks`&&(0,W.jsx)(mi,{verifiers:o,canManage:n,navigate:e})]})}function di({navigate:e,verifiers:t}){let[n,r]=(0,g.useState)(`pending`),[i,a]=(0,g.useState)(``),[o,s]=(0,g.useState)(`all`),[c,l]=(0,g.useState)(``),[u,d]=(0,g.useState)(`50`),[f,p]=(0,g.useState)([]),[m,h]=(0,g.useState)({}),[_,v]=(0,g.useState)(!1),[y,b]=(0,g.useState)(``),[x,S]=(0,g.useState)(!1),[C,w]=(0,g.useState)(``);async function T(e=!1){S(!0),w(``);let t=new URLSearchParams({limit:u});n!==`all`&&t.set(`status`,n),i&&t.set(`verifier_bot_id`,i),o!==`all`&&t.set(`peer_type`,o),c.trim()&&t.set(`q`,c.trim().replace(/^@/,``)),e&&y&&t.set(`before_id`,y);try{let n=await k.customVerificationRequests(t),r=n.rows??[];p(t=>e?[...t,...r]:r),b(n.next_before_id??``),v(!!n.has_more)}catch(e){w(O(e))}finally{S(!1)}}async function E(){try{h((await k.botVerificationCounts()).counts??{})}catch(e){w(O(e))}}(0,g.useEffect)(()=>{T(!1),E()},[]);function D(){T(!1),E()}return(0,W.jsxs)(W.Fragment,{children:[(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Application queue`,text:`Applications filed with a verifier bot by the owner of the peer. The counters cover the whole queue, not the page below.`,action:(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:D,disabled:x,children:[(0,W.jsx)(Ye,{size:15,className:x?`spin`:``}),` `,`Refresh`]})}),C&&(0,W.jsx)(K,{children:C}),(0,W.jsx)(`div`,{className:`metric-row`,children:oi.map(e=>(0,W.jsx)(J,{label:ci[e],value:m[e]??`0`,mono:!0,tone:vi(e,m[e]??`0`)},e))})]}),(0,W.jsx)(Nt,{children:(0,W.jsxs)(`form`,{className:`toolbar`,onSubmit:e=>{e.preventDefault(),T(!1)},children:[(0,W.jsxs)(`label`,{className:`searchbox`,children:[(0,W.jsx)(Ze,{size:15}),(0,W.jsx)(`input`,{value:c,onChange:e=>l(e.target.value),placeholder:`Application id, peer id, username or title`})]}),(0,W.jsxs)(`label`,{className:`field-inline`,children:[(0,W.jsx)(`span`,{children:`Status`}),(0,W.jsxs)(`select`,{value:n,onChange:e=>r(e.target.value),children:[(0,W.jsx)(`option`,{value:`all`,children:`All statuses`}),oi.map(e=>(0,W.jsx)(`option`,{value:e,children:ci[e]},e))]})]}),(0,W.jsxs)(`label`,{className:`field-inline`,children:[(0,W.jsx)(`span`,{children:`Verifier`}),(0,W.jsx)(hi,{value:i,verifiers:t,onChange:a})]}),(0,W.jsxs)(`label`,{className:`field-inline`,children:[(0,W.jsx)(`span`,{children:`Peer type`}),(0,W.jsxs)(`select`,{value:o,onChange:e=>s(e.target.value),children:[(0,W.jsx)(`option`,{value:`all`,children:`All types`}),si.map(e=>(0,W.jsx)(`option`,{value:e,children:li[e]},e))]})]}),(0,W.jsxs)(`label`,{className:`field-inline`,children:[(0,W.jsx)(`span`,{children:`Limit`}),(0,W.jsx)(`input`,{className:`small-input`,value:u,onChange:e=>d(e.target.value),type:`number`,min:`1`,max:`200`})]}),(0,W.jsxs)(`button`,{className:`btn primary icon-text`,type:`submit`,disabled:x,children:[x?(0,W.jsx)(L,{size:15,className:`spin`}):(0,W.jsx)(Ze,{size:15}),` `,`Search`]})]})}),(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{children:`ID`}),(0,W.jsx)(`th`,{children:`Verifier`}),(0,W.jsx)(`th`,{children:`Peer`}),(0,W.jsx)(`th`,{children:`Applicant`}),(0,W.jsx)(`th`,{children:`Stated reason`}),(0,W.jsx)(`th`,{children:`Status`}),(0,W.jsx)(`th`,{children:`Filed`}),(0,W.jsx)(`th`,{})]})}),(0,W.jsxs)(`tbody`,{children:[f.map(t=>(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`td`,{className:`mono`,children:(0,W.jsxs)(`button`,{className:`row-link`,type:`button`,onClick:()=>e(`/bot-verification/${t.ID}`),children:[`#`,t.ID]})}),(0,W.jsxs)(`td`,{children:[(0,W.jsx)(`strong`,{children:H(t.VerifierBotUsername)||t.VerifierBotID}),(0,W.jsx)(`div`,{className:`entity-subtitle mono`,children:t.VerifierBotID})]}),(0,W.jsxs)(`td`,{children:[(0,W.jsx)(`strong`,{children:yi(t)}),(0,W.jsxs)(`div`,{className:`entity-subtitle mono`,children:[li[t.PeerType],` · `,t.PeerID]})]}),(0,W.jsxs)(`td`,{children:[H(t.ApplicantUsername)||`-`,(0,W.jsx)(`div`,{className:`entity-subtitle mono`,children:t.ApplicantUserID})]}),(0,W.jsx)(`td`,{className:`truncate`,children:t.Reason||`-`}),(0,W.jsx)(`td`,{children:(0,W.jsx)(gi,{status:t.Status})}),(0,W.jsx)(`td`,{children:U(t.CreatedAt)||`-`}),(0,W.jsx)(`td`,{children:(0,W.jsxs)(`button`,{className:`row-link`,type:`button`,onClick:()=>e(`/bot-verification/${t.ID}`),children:[(0,W.jsx)(ot,{size:14}),` `,`Details`,` `,(0,W.jsx)(ve,{size:14})]})})]},t.ID)),f.length===0&&(0,W.jsx)(It,{colSpan:8})]})]})}),_&&(0,W.jsx)(`div`,{className:`toolbar`,children:(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>T(!0),disabled:x,children:[x?(0,W.jsx)(L,{size:15,className:`spin`}):(0,W.jsx)(ge,{size:15}),` `,`Load more`]})})]})}function fi({verifiers:e,icons:t,canManage:n,onChanged:r,navigate:i}){let[a,o]=(0,g.useState)(null),[s,c]=(0,g.useState)(null),[l,u]=(0,g.useState)(``),[d,f]=(0,g.useState)(``),[p,m]=(0,g.useState)(``),[h,_]=(0,g.useState)(!1),v=t.filter(e=>e.Active),y=v.map(e=>({value:e.DocumentID,label:`${e.Name} · ${e.DocumentID}`}));if(l&&!y.some(e=>e.value===l)){let e=t.find(e=>e.DocumentID===l);y.unshift({value:l,label:`${e?.Name??l} · ${l} (Retired)`})}function b(e){c(e),o(null),u(e.IconDocumentID),f(e.CompanyName),m(e.DefaultDescription),_(e.CanModifyCustomDescription)}function x(){c(null),o(null),u(``),f(``),m(``),_(!1)}function S(){return{bot_id:s?s.BotID:a?String(a.ID):`0`,icon_document_id:l||`0`,company_name:d.trim(),default_description:p.trim(),can_modify_custom_description:h,version:s?s.Version:`0`}}return(0,W.jsxs)(W.Fragment,{children:[n&&(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:s?`Update verifier`:`Grant verifier status`,text:`The bot gets an icon from the catalogue and a company name to vouch under. The same call updates an existing verifier, which is why it carries a version.`,action:s?(0,W.jsx)(`button`,{className:`btn icon-text`,type:`button`,onClick:x,children:`Cancel update`}):void 0}),s?(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Updating ${H(s.BotUsername)||s.BotID} — version ${s.Version} is sent as the optimistic lock, so a row somebody else changed meanwhile is refused instead of overwritten.`}):(0,W.jsx)(Bn,{label:`Bot`,value:a,onChange:o}),(0,W.jsxs)(`div`,{className:`bot-create-fields`,children:[(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Icon from the catalogue`}),(0,W.jsxs)(`select`,{value:l,onChange:e=>u(e.target.value),children:[(0,W.jsx)(`option`,{value:``,children:`Pick an icon`}),y.map(e=>(0,W.jsx)(`option`,{value:e.value,children:e.label},e.value))]})]}),(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Company`}),(0,W.jsx)(`input`,{value:d,onChange:e=>f(e.target.value),placeholder:`Acme Verification Ltd`})]}),(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Default description`}),(0,W.jsx)(`input`,{value:p,onChange:e=>m(e.target.value),placeholder:`Verified by Acme`})]})]}),(0,W.jsxs)(`label`,{className:`checkline`,children:[(0,W.jsx)(`input`,{type:`checkbox`,checked:h,onChange:e=>_(e.target.checked)}),`The verifier may replace the description per peer`]}),(0,W.jsx)(`p`,{className:`bot-create-note`,children:`This is botVerifierSettings.can_modify_custom_description: with it off, every mark this verifier grants carries the default description above, whatever the applicant asked for.`}),v.length===0&&(0,W.jsx)(K,{children:`The catalogue has no active icon, so there is nothing to grant. Add one in the icon catalogue first.`}),(0,W.jsxs)(`div`,{className:`bot-create-actions`,children:[(0,W.jsx)(`span`,{className:`bot-create-note`,children:`The bot can mark peers as soon as the row exists and is enabled.`}),(0,W.jsx)(X,{label:s?`Update verifier`:`Grant verifier status`,icon:(0,W.jsx)(Ge,{size:15}),tone:`neutral`,path:`/api/actions/grant-bot-verifier`,payload:S,onDone:()=>{x(),r()}})]})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Verifier bots`,text:`Bots allowed to hand out their own mark. Verifier status is granted per deployment, so every row here is a badge printer an operator switched on by hand.`,action:(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:r,children:[(0,W.jsx)(Ye,{size:15}),` `,`Refresh`]})}),(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{children:`Bot`}),(0,W.jsx)(`th`,{children:`Company`}),(0,W.jsx)(`th`,{children:`Icon`}),(0,W.jsx)(`th`,{children:`Own description`}),(0,W.jsx)(`th`,{children:`Status`}),(0,W.jsx)(`th`,{children:`Marks`}),(0,W.jsx)(`th`,{children:`Granted by`}),(0,W.jsx)(`th`,{children:`Updated`}),n&&(0,W.jsx)(`th`,{})]})}),(0,W.jsxs)(`tbody`,{children:[e.map(e=>(0,W.jsxs)(`tr`,{children:[(0,W.jsxs)(`td`,{children:[(0,W.jsx)(`button`,{className:`row-link`,type:`button`,onClick:()=>i(`/bots/${e.BotID}`),children:(0,W.jsx)(`strong`,{children:H(e.BotUsername)||e.BotName||e.BotID})}),(0,W.jsx)(`div`,{className:`entity-subtitle mono`,children:e.BotID})]}),(0,W.jsxs)(`td`,{children:[(0,W.jsx)(`strong`,{children:e.CompanyName||`-`}),(0,W.jsx)(`div`,{className:`entity-subtitle truncate`,children:e.DefaultDescription||`Not set`})]}),(0,W.jsxs)(`td`,{children:[e.IconName||`-`,(0,W.jsx)(`div`,{className:`entity-subtitle mono`,children:e.IconDocumentID})]}),(0,W.jsx)(`td`,{children:e.CanModifyCustomDescription?`Yes`:`No`}),(0,W.jsx)(`td`,{children:e.Enabled?(0,W.jsx)(q,{tone:`good`,children:`Enabled`}):(0,W.jsx)(q,{tone:`warn`,children:`disabled`})}),(0,W.jsx)(`td`,{className:`mono`,children:String(e.MarkCount??`0`)}),(0,W.jsxs)(`td`,{children:[e.GrantedBy||`-`,(0,W.jsx)(`div`,{className:`entity-subtitle truncate`,children:e.GrantReason||`-`})]}),(0,W.jsx)(`td`,{children:U(e.UpdatedAt)||`-`}),n&&(0,W.jsx)(`td`,{children:(0,W.jsxs)(`div`,{className:`row-actions`,children:[(0,W.jsx)(`button`,{className:`btn compact-btn`,type:`button`,onClick:()=>b(e),children:`Edit`}),(0,W.jsx)(X,{label:e.Enabled?`Disable`:`Enable`,icon:e.Enabled?(0,W.jsx)(Ke,{size:14}):(0,W.jsx)(qe,{size:14}),tone:e.Enabled?`warn`:`neutral`,compact:!0,path:`/api/actions/set-bot-verifier-enabled`,payload:()=>({bot_id:e.BotID,enabled:!e.Enabled}),onDone:r}),(0,W.jsx)(X,{label:`Revoke status`,icon:(0,W.jsx)(lt,{size:14}),tone:`danger`,compact:!0,path:`/api/actions/revoke-bot-verifier`,payload:()=>({bot_id:e.BotID}),onDone:r})]})})]},e.BotID)),e.length===0&&(0,W.jsx)(It,{colSpan:n?9:8})]})]})}),(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Disabling is the per-verifier kill switch: the marks already granted keep rendering, but the bot can no longer mark anything new and its settings stop being projected into botInfo.`}),(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Revoking verifier status removes the row and every mark this verifier granted — the icon disappears from all of its peers at once.`})]})]})}function pi({icons:e,verifiers:t,canManage:n,onChanged:r}){let[i,a]=(0,g.useState)(``),[o,s]=(0,g.useState)(``),[c,l]=(0,g.useState)(``);function u(){let e={document_id:i.trim()||`0`,name:o.trim()};return c&&(e.owner_bot_id=c),e}return(0,W.jsxs)(W.Fragment,{children:[n&&(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Add or rename an icon`,text:`Search and pick any custom-emoji document already on this deployment (including bundled/system ones). Adding an id that already exists renames it instead of duplicating it.`}),(0,W.jsx)(ai,{label:`Document`,value:i,onChange:a}),(0,W.jsxs)(`div`,{className:`bot-create-fields`,children:[(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Name`}),(0,W.jsx)(`input`,{value:o,onChange:e=>s(e.target.value),placeholder:`Acme blue tick`})]}),(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Owner`}),(0,W.jsxs)(`select`,{value:c,onChange:e=>l(e.target.value),children:[(0,W.jsx)(`option`,{value:``,children:`Shared`}),t.map(e=>(0,W.jsx)(`option`,{value:e.BotID,children:`${e.CompanyName||e.BotID} · ${H(e.BotUsername)||e.BotID}`},e.BotID))]})]})]}),(0,W.jsx)(`p`,{className:`bot-create-note`,children:`A document id that resolves to nothing produces an invisible badge: the peer is marked in the database and the client draws nothing.`}),(0,W.jsx)(`p`,{className:`bot-create-note`,children:`A shared icon may be granted to any verifier; picking an owner reserves it for that one bot.`}),(0,W.jsxs)(`div`,{className:`bot-create-actions`,children:[(0,W.jsx)(`span`,{className:`bot-create-note`,children:`Adding an icon grants nothing by itself — it only makes the document available to grant.`}),(0,W.jsx)(X,{label:`Save icon`,icon:(0,W.jsx)(Ge,{size:15}),tone:`neutral`,path:`/api/actions/upsert-verification-icon`,payload:u,onDone:()=>{a(``),s(``),l(``),r()}})]})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Icon catalogue`,text:`The custom emoji documents a verifier may mark with. Nothing else can be used as an icon, so the catalogue is where a wrong badge is prevented rather than fixed.`,action:(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:r,children:[(0,W.jsx)(Ye,{size:15}),` `,`Refresh`]})}),(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{children:`Document ID`}),(0,W.jsx)(`th`,{children:`Name`}),(0,W.jsx)(`th`,{children:`Owner`}),(0,W.jsx)(`th`,{children:`Status`}),(0,W.jsx)(`th`,{children:`Verifiers using it`}),(0,W.jsx)(`th`,{children:`Filed`}),n&&(0,W.jsx)(`th`,{})]})}),(0,W.jsxs)(`tbody`,{children:[e.map(e=>(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`td`,{className:`mono`,children:e.DocumentID}),(0,W.jsx)(`td`,{children:(0,W.jsx)(`strong`,{children:e.Name||`-`})}),(0,W.jsx)(`td`,{children:e.OwnerBotID&&e.OwnerBotID!==`0`?(0,W.jsxs)(W.Fragment,{children:[H(e.OwnerBotUsername)||e.OwnerBotID,(0,W.jsx)(`div`,{className:`entity-subtitle mono`,children:e.OwnerBotID})]}):(0,W.jsx)(q,{children:`Shared`})}),(0,W.jsx)(`td`,{children:e.Active?(0,W.jsx)(q,{tone:`good`,children:`Active`}):(0,W.jsx)(q,{tone:`warn`,children:`Retired`})}),(0,W.jsx)(`td`,{className:`mono`,children:String(e.UsedByVerifiers??`0`)}),(0,W.jsx)(`td`,{children:U(e.CreatedAt)||`-`}),n&&(0,W.jsx)(`td`,{children:(0,W.jsx)(`div`,{className:`row-actions`,children:(0,W.jsx)(X,{label:e.Active?`Retire`:`Activate`,icon:e.Active?(0,W.jsx)(Ke,{size:14}):(0,W.jsx)(qe,{size:14}),tone:e.Active?`warn`:`neutral`,compact:!0,path:`/api/actions/set-verification-icon-active`,payload:()=>({icon_id:e.ID,active:!e.Active}),onDone:r})})})]},e.ID)),e.length===0&&(0,W.jsx)(It,{colSpan:n?7:6})]})]})}),(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Retiring an icon stops it from being granted to anybody new. Marks already carrying it keep it: the icon is copied onto the mark when it is granted.`})]})]})}function mi({verifiers:e,canManage:t,navigate:n}){let[r,i]=(0,g.useState)(``),[a,o]=(0,g.useState)(`all`),[s,c]=(0,g.useState)(``),[l,u]=(0,g.useState)(`50`),[d,f]=(0,g.useState)([]),[p,m]=(0,g.useState)(!1),[h,_]=(0,g.useState)(``),[v,y]=(0,g.useState)(!1),[b,x]=(0,g.useState)(``);async function S(e=!1){y(!0),x(``);let t=new URLSearchParams({limit:l});r&&t.set(`verifier_bot_id`,r),a!==`all`&&t.set(`peer_type`,a),s.trim()&&t.set(`q`,s.trim().replace(/^@/,``)),e&&h&&t.set(`before_id`,h);try{let n=await k.customVerifications(t),r=n.rows??[];f(t=>e?[...t,...r]:r),_(n.next_before_id??``),m(!!n.has_more)}catch(e){x(O(e))}finally{y(!1)}}return(0,g.useEffect)(()=>{S(!1)},[]),(0,W.jsxs)(W.Fragment,{children:[(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Granted marks`,text:`Every peer currently carrying a third-party mark, whoever granted it — an operator decision, the verifier bot itself, or the peer's owner through bots.setCustomVerification.`,action:(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>S(!1),disabled:v,children:[(0,W.jsx)(Ye,{size:15,className:v?`spin`:``}),` `,`Refresh`]})}),b&&(0,W.jsx)(K,{children:b})]}),(0,W.jsx)(Nt,{children:(0,W.jsxs)(`form`,{className:`toolbar`,onSubmit:e=>{e.preventDefault(),S(!1)},children:[(0,W.jsxs)(`label`,{className:`searchbox`,children:[(0,W.jsx)(Ze,{size:15}),(0,W.jsx)(`input`,{value:s,onChange:e=>c(e.target.value),placeholder:`Peer id, username or title`})]}),(0,W.jsxs)(`label`,{className:`field-inline`,children:[(0,W.jsx)(`span`,{children:`Verifier`}),(0,W.jsx)(hi,{value:r,verifiers:e,onChange:i})]}),(0,W.jsxs)(`label`,{className:`field-inline`,children:[(0,W.jsx)(`span`,{children:`Peer type`}),(0,W.jsxs)(`select`,{value:a,onChange:e=>o(e.target.value),children:[(0,W.jsx)(`option`,{value:`all`,children:`All types`}),si.map(e=>(0,W.jsx)(`option`,{value:e,children:li[e]},e))]})]}),(0,W.jsxs)(`label`,{className:`field-inline`,children:[(0,W.jsx)(`span`,{children:`Limit`}),(0,W.jsx)(`input`,{className:`small-input`,value:l,onChange:e=>u(e.target.value),type:`number`,min:`1`,max:`200`})]}),(0,W.jsxs)(`button`,{className:`btn primary icon-text`,type:`submit`,disabled:v,children:[v?(0,W.jsx)(L,{size:15,className:`spin`}):(0,W.jsx)(Ze,{size:15}),` `,`Search`]})]})}),(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{children:`ID`}),(0,W.jsx)(`th`,{children:`Verifier`}),(0,W.jsx)(`th`,{children:`Peer`}),(0,W.jsx)(`th`,{children:`Description`}),(0,W.jsx)(`th`,{children:`Icon`}),(0,W.jsx)(`th`,{children:`Filed`}),t&&(0,W.jsx)(`th`,{})]})}),(0,W.jsxs)(`tbody`,{children:[d.map(e=>(0,W.jsxs)(`tr`,{children:[(0,W.jsxs)(`td`,{className:`mono`,children:[`#`,e.ID]}),(0,W.jsxs)(`td`,{children:[(0,W.jsx)(`strong`,{children:e.CompanyName||H(e.VerifierBotUsername)||e.VerifierBotID}),(0,W.jsx)(`div`,{className:`entity-subtitle mono`,children:H(e.VerifierBotUsername)||e.VerifierBotID})]}),(0,W.jsxs)(`td`,{children:[(0,W.jsx)(`button`,{className:`row-link`,type:`button`,onClick:()=>n(bi(e.PeerType,e.PeerID)),children:(0,W.jsx)(`strong`,{children:yi(e)})}),(0,W.jsxs)(`div`,{className:`entity-subtitle mono`,children:[li[e.PeerType],` · `,e.PeerID]})]}),(0,W.jsx)(`td`,{className:`truncate`,children:e.Description||`Not set`}),(0,W.jsx)(`td`,{className:`mono`,children:e.IconDocumentID}),(0,W.jsx)(`td`,{children:U(e.CreatedAt)||`-`}),t&&(0,W.jsx)(`td`,{children:(0,W.jsx)(`div`,{className:`row-actions`,children:(0,W.jsx)(X,{label:`Remove mark`,icon:(0,W.jsx)(R,{size:14}),tone:`danger`,compact:!0,path:`/api/actions/revoke-custom-verification`,payload:()=>({verifier_bot_id:e.VerifierBotID,peer_type:e.PeerType,peer_id:e.PeerID}),onDone:()=>S(!1)})})})]},e.ID)),d.length===0&&(0,W.jsx)(It,{colSpan:t?7:6})]})]})}),(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Removing a mark clears the icon and the description from the peer. The application it came from keeps its history.`}),p&&(0,W.jsx)(`div`,{className:`toolbar`,children:(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>S(!0),disabled:v,children:[v?(0,W.jsx)(L,{size:15,className:`spin`}):(0,W.jsx)(ge,{size:15}),` `,`Load more`]})})]})}function hi({value:e,verifiers:t,onChange:n}){return(0,W.jsxs)(`select`,{value:e,onChange:e=>n(e.target.value),children:[(0,W.jsx)(`option`,{value:``,children:`All verifiers`}),t.map(e=>(0,W.jsx)(`option`,{value:e.BotID,children:`${e.CompanyName||e.BotID} · ${H(e.BotUsername)||e.BotID}`+(e.Enabled?``:` (disabled)`)},e.BotID))]})}function gi({status:e}){return(0,W.jsx)(q,{tone:_i(e),children:ci[e]})}function _i(e){return e===`approved`?`good`:e===`pending`?`warn`:e===`rejected`?`danger`:`neutral`}function vi(e,t){return e===`pending`?t!==`0`&&t!==``?`warn`:`neutral`:e===`approved`?`good`:`neutral`}function yi(e){return H(e.PeerUsername)||e.PeerTitle||`#${e.PeerID}`}function bi(e,t){return e===`channel`?`/channels/${t}`:`/accounts/${t}`}function xi({id:e,navigate:t}){let[n,r]=(0,g.useState)(null),[i,a]=(0,g.useState)(``),[o,s]=(0,g.useState)(!1),[c,l]=(0,g.useState)(!1),[u,d]=(0,g.useState)(``);async function f(){l(!0),d(``);try{r(await k.customVerificationRequest(e))}catch(e){d(O(e))}finally{l(!1)}}function p(){s(!1),f()}(0,g.useEffect)(()=>{f()},[e]);function m(e){if(e instanceof v&&e.status===409)return s(!0),f(),`Another admin has already changed this application. The data has been reloaded — check the status before deciding again.`}if(u&&!n)return(0,W.jsx)(K,{children:u});if(!n)return(0,W.jsx)(Lt,{label:`Loading the application…`});let h=n.request,_=Ci(n.verifier),y=n.mark_active,b=h.Status===`pending`,x=h.Status===`approved`,S=i.trim(),C=h.RequestedDescription.trim(),w=!!_?.CanModifyCustomDescription&&C!==``,T=w?C:(_?.DefaultDescription??``).trim();function E(){let e={version:h.Version};return S&&(e.internal_note=S),e}function D(){a(``),s(!1),f()}return(0,W.jsxs)(Mt,{title:`Application #${h.ID}`,eyebrow:`Third-party verification / Review`,actions:(0,W.jsxs)(W.Fragment,{children:[(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>t(`/bot-verification`),children:[(0,W.jsx)(ue,{size:15}),` `,`Back to list`]}),(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:p,disabled:c,children:[(0,W.jsx)(Ye,{size:15,className:c?`spin`:``}),` `,`Refresh`]})]}),children:[u&&(0,W.jsx)(K,{children:u}),o&&(0,W.jsx)(K,{children:`Another admin has already changed this application. The data has been reloaded — check the status before deciding again.`}),(0,W.jsx)(Pt,{main:(0,W.jsxs)(`div`,{className:`stacked-sections`,children:[(0,W.jsxs)(`section`,{className:`entity-head`,children:[(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`div`,{className:`entity-title`,children:yi(h)}),(0,W.jsxs)(`div`,{className:`entity-subtitle mono`,children:[`#`,h.ID,` · `,li[h.PeerType],`:`,h.PeerID,` · v`,h.Version]})]}),(0,W.jsxs)(`div`,{className:`entity-badges`,children:[(0,W.jsx)(gi,{status:h.Status}),y?(0,W.jsxs)(q,{tone:`good`,children:[(0,W.jsx)(F,{size:12}),` `,`Mark is live`]}):(0,W.jsx)(q,{tone:`neutral`,children:`No mark on the peer`})]})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`A verifier company's icon — not the official checkmark`,text:`A third-party mark is a verifier bot's own icon, drawn right BEFORE the name of an account, a bot or a channel, plus one line of description in the profile. It says “this verifier vouches for this peer”, and nothing more.`}),(0,W.jsx)(`p`,{className:`bot-create-note`,children:`The icon is a custom emoji document. The client fetches it through messages.getCustomEmojiDocuments, so a document id that resolves to nothing renders as no badge at all — which is why marks are granted from the catalogue below rather than from a typed number.`})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Verifier`,text:`The company whose icon the peer would carry, as its row stands right now.`,action:(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>t(`/bots/${h.VerifierBotID}`),children:[(0,W.jsx)(pe,{size:15}),` `,`Open verifier bot`]})}),(0,W.jsxs)(`div`,{className:`summary-grid`,children:[(0,W.jsx)(Y,{label:`Company`,value:_?.CompanyName||`-`}),(0,W.jsx)(Y,{label:`Bot`,value:H(h.VerifierBotUsername)||`-`}),(0,W.jsx)(Y,{label:`Verifier bot ID`,value:h.VerifierBotID,mono:!0}),(0,W.jsx)(Y,{label:`Document ID`,value:_?.IconDocumentID||`-`,mono:!0}),(0,W.jsx)(Y,{label:`Name`,value:_?.IconName||`-`}),(0,W.jsx)(Y,{label:`Own description`,value:_?.CanModifyCustomDescription?`Yes`:`No`})]}),(0,W.jsx)(Si,{label:`Default description`,children:_?.DefaultDescription?(0,W.jsx)(`p`,{className:`about-text`,children:_.DefaultDescription}):(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Not set`})}),!_&&(0,W.jsx)(K,{children:`The verifier row is gone: its status was revoked after this application was filed. There is no icon to grant, so the application can only be rejected.`}),_&&!_.Enabled&&(0,W.jsx)(K,{children:`This verifier is disabled. It cannot mark anything new until an operator enables it again.`})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Peer`,text:`The account, bot or channel the icon would be attached to.`,action:(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>t(bi(h.PeerType,h.PeerID)),children:[(0,W.jsx)(Ce,{size:15}),` `,`Open peer`]})}),(0,W.jsxs)(`div`,{className:`summary-grid`,children:[(0,W.jsx)(Y,{label:`Type`,value:li[h.PeerType]}),(0,W.jsx)(Y,{label:`Username`,value:H(h.PeerUsername)||`-`}),(0,W.jsx)(Y,{label:`Title`,value:h.PeerTitle||`-`}),(0,W.jsx)(Y,{label:`Peer ID`,value:h.PeerID,mono:!0})]})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Applicant`,text:`Who filed the application with the verifier bot.`,action:(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>t(`/accounts/${h.ApplicantUserID}`),children:[(0,W.jsx)(ft,{size:15}),` `,`Open account`]})}),(0,W.jsxs)(`div`,{className:`summary-grid`,children:[(0,W.jsx)(Y,{label:`Username`,value:H(h.ApplicantUsername)||`-`}),(0,W.jsx)(Y,{label:`User ID`,value:h.ApplicantUserID,mono:!0}),(0,W.jsx)(Y,{label:`Filed`,value:U(h.CreatedAt)||`-`}),(0,W.jsx)(Y,{label:`Updated`,value:U(h.UpdatedAt)||`-`})]})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Application`,text:`What the applicant wrote, rendered as plain text.`}),(0,W.jsxs)(`div`,{className:`stacked-sections`,children:[(0,W.jsxs)(`div`,{className:`summary-grid`,children:[(0,W.jsx)(Y,{label:`Correlation ID`,value:h.CorrelationID||`-`,mono:!0}),(0,W.jsx)(Y,{label:`Status`,value:ci[h.Status]})]}),(0,W.jsx)(Si,{label:`Stated reason`,children:h.Reason?(0,W.jsx)(`p`,{className:`about-text`,children:h.Reason}):(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Not set`})}),(0,W.jsx)(Si,{label:`Requested description`,children:C?(0,W.jsx)(`p`,{className:`about-text`,children:C}):(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Not set`})}),(0,W.jsx)(Si,{label:`Description the mark would carry`,children:T?(0,W.jsx)(`p`,{className:`about-text`,children:T}):(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Not set`})}),(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Resolved the same way the backend resolves it: the applicant's wording only when this verifier may set its own description, otherwise the verifier's default.`}),C!==``&&!w&&(0,W.jsx)(`p`,{className:`bot-create-note`,children:`This verifier may not set a per-peer description, so the requested wording is ignored and the default is applied.`})]})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Decision`,text:`What was decided, by whom, and with which wording.`}),(0,W.jsxs)(`div`,{className:`stacked-sections`,children:[(0,W.jsxs)(`div`,{className:`summary-grid`,children:[(0,W.jsx)(Y,{label:`Decided by`,value:h.DecidedBy||`-`}),(0,W.jsx)(Y,{label:`Approved`,value:U(h.ApprovedAt)||`-`}),(0,W.jsx)(Y,{label:`Rejected`,value:U(h.RejectedAt)||`-`}),(0,W.jsx)(Y,{label:`Version (optimistic lock)`,value:h.Version,mono:!0})]}),(0,W.jsx)(Si,{label:`Decision reason`,children:h.DecisionReason?(0,W.jsx)(`p`,{className:`about-text`,children:h.DecisionReason}):(0,W.jsx)(`p`,{className:`bot-create-note`,children:`No decision yet`})}),(0,W.jsx)(Si,{label:`Internal note · admins only`,children:h.InternalNote?(0,W.jsx)(`p`,{className:`about-text`,children:h.InternalNote}):(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Not set`})})]})]})]}),side:(0,W.jsxs)(`section`,{className:`action-dock`,children:[(0,W.jsxs)(`div`,{className:`dock-title`,children:[(0,W.jsx)(ot,{size:14}),` `,`Decision`]}),!b&&!x&&(0,W.jsx)(`p`,{className:`bot-create-note`,children:`This status has no available actions.`}),(b||x)&&(0,W.jsxs)(W.Fragment,{children:[(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Internal note`}),(0,W.jsx)(`textarea`,{value:i,onChange:e=>a(e.target.value),rows:3,placeholder:`Handover note for other admins`})]}),(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Optional. Stored with the decision and visible to admins only — never sent to the applicant.`})]}),b&&(0,W.jsxs)(W.Fragment,{children:[!_&&(0,W.jsx)(K,{children:`The verifier row is gone: its status was revoked after this application was filed. There is no icon to grant, so the application can only be rejected.`}),_&&!_.Enabled&&(0,W.jsx)(K,{children:`This verifier is disabled. It cannot mark anything new until an operator enables it again.`}),y&&(0,W.jsx)(`p`,{className:`bot-create-note`,children:`This peer already carries this verifier's mark; approving refreshes the description and records the decision.`}),(0,W.jsxs)(`div`,{className:`action-stack`,children:[(0,W.jsx)(X,{label:`Approve`,icon:(0,W.jsx)(I,{size:15}),tone:`neutral`,path:`/api/botverification/requests/${h.ID}/approve`,payload:E,onDone:D,onError:m}),(0,W.jsx)(X,{label:`Reject`,icon:(0,W.jsx)(te,{size:15}),tone:`warn`,path:`/api/botverification/requests/${h.ID}/reject`,payload:E,onDone:D,onError:m})]}),(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Puts the verifier's icon before the peer's name and its description in the profile, and messages the applicant.`}),(0,W.jsx)(`p`,{className:`bot-create-note`,children:`The reason is mandatory: it is the wording the applicant is told, so write what exactly was missing.`})]}),x&&(0,W.jsxs)(W.Fragment,{children:[(0,W.jsxs)(`div`,{className:`dock-title`,children:[(0,W.jsx)(rt,{size:14}),` `,`Danger zone`]}),(0,W.jsxs)(`div`,{className:`danger-zone`,children:[(0,W.jsx)(X,{label:`Revoke mark`,icon:(0,W.jsx)(R,{size:15}),tone:`danger`,path:`/api/botverification/requests/${h.ID}/revoke`,payload:E,onDone:D,onError:m}),(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Takes the icon and the description off the peer and closes the application as revoked. The official checkmark, if the peer has one, is untouched.`}),!y&&(0,W.jsx)(`p`,{className:`bot-create-note`,children:`The peer carries no mark right now — revoking only closes the application.`})]})]})]})})]})}function Si({label:e,children:t}){return(0,W.jsxs)(`div`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:e}),t]})}function Ci(e){return!e||!e.BotID||e.BotID===`0`?null:e}var wi=[`draft`,`submitted`,`in_review`,`approved`,`rejected`,`cancelled`],Ti=[`bot`,`channel`,`supergroup`,`user`],Ei={draft:`Draft`,submitted:`Submitted`,in_review:`In review`,approved:`Approved`,rejected:`Rejected`,cancelled:`Cancelled`},Di={bot:`Bot`,channel:`Channel`,supergroup:`Supergroup`,user:`User`};function Oi({navigate:e}){let[t,n]=(0,g.useState)(`all`),[r,i]=(0,g.useState)(`all`),[a,o]=(0,g.useState)(``),[s,c]=(0,g.useState)(``),[l,u]=(0,g.useState)(`50`),[d,f]=(0,g.useState)([]),[p,m]=(0,g.useState)({}),[h,_]=(0,g.useState)(!1),[v,y]=(0,g.useState)(``),[b,x]=(0,g.useState)(!1),[S,C]=(0,g.useState)(``);async function w(e=!1){x(!0),C(``);let n=new URLSearchParams({limit:l});t!==`all`&&n.set(`status`,t),r!==`all`&&n.set(`target_type`,r),a.trim()&&n.set(`reviewer`,a.trim()),s.trim()&&n.set(`q`,s.trim().replace(/^@/,``)),e&&v&&n.set(`before_id`,v);try{let t=await k.verificationApplications(n),r=t.rows??[];f(t=>e?[...t,...r]:r),y(t.next_before_id??``),_(!!t.has_more)}catch(e){C(O(e))}finally{x(!1)}}async function T(){try{m((await k.verificationCounts()).counts??{})}catch(e){C(O(e))}}(0,g.useEffect)(()=>{w(!1),T()},[]);function E(){w(!1),T()}return(0,W.jsxs)(Mt,{title:`Verification queue`,eyebrow:`Verification / Queue`,actions:(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:E,disabled:b,children:[(0,W.jsx)(Ye,{size:15,className:b?`spin`:``}),` `,`Refresh`]}),children:[S&&(0,W.jsx)(K,{children:S}),(0,W.jsx)(`div`,{className:`metric-row`,children:wi.map(e=>(0,W.jsx)(J,{label:Ei[e],value:p[e]??`0`,mono:!0,tone:ji(e,p[e]??`0`)},e))}),(0,W.jsx)(Nt,{children:(0,W.jsxs)(`form`,{className:`toolbar`,onSubmit:e=>{e.preventDefault(),w(!1)},children:[(0,W.jsxs)(`label`,{className:`searchbox`,children:[(0,W.jsx)(Ze,{size:15}),(0,W.jsx)(`input`,{value:s,onChange:e=>c(e.target.value),placeholder:`Application id, peer id, username or title`})]}),(0,W.jsxs)(`label`,{className:`field-inline`,children:[(0,W.jsx)(`span`,{children:`Status`}),(0,W.jsxs)(`select`,{value:t,onChange:e=>n(e.target.value),children:[(0,W.jsx)(`option`,{value:`all`,children:`All statuses`}),wi.map(e=>(0,W.jsx)(`option`,{value:e,children:Ei[e]},e))]})]}),(0,W.jsxs)(`label`,{className:`field-inline`,children:[(0,W.jsx)(`span`,{children:`Target type`}),(0,W.jsxs)(`select`,{value:r,onChange:e=>i(e.target.value),children:[(0,W.jsx)(`option`,{value:`all`,children:`All types`}),Ti.map(e=>(0,W.jsx)(`option`,{value:e,children:Di[e]},e))]})]}),(0,W.jsxs)(`label`,{className:`field-inline`,children:[(0,W.jsx)(`span`,{children:`Reviewer`}),(0,W.jsx)(`input`,{value:a,onChange:e=>o(e.target.value),placeholder:`Any reviewer`})]}),(0,W.jsxs)(`label`,{className:`field-inline`,children:[(0,W.jsx)(`span`,{children:`Limit`}),(0,W.jsx)(`input`,{className:`small-input`,value:l,onChange:e=>u(e.target.value),type:`number`,min:`1`,max:`200`})]}),(0,W.jsxs)(`button`,{className:`btn primary icon-text`,type:`submit`,disabled:b,children:[b?(0,W.jsx)(L,{size:15,className:`spin`}):(0,W.jsx)(Ze,{size:15}),` `,`Search`]})]})}),(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{children:`ID`}),(0,W.jsx)(`th`,{children:`Target`}),(0,W.jsx)(`th`,{children:`Applicant`}),(0,W.jsx)(`th`,{children:`Category`}),(0,W.jsx)(`th`,{children:`Status`}),(0,W.jsx)(`th`,{children:`Submitted`}),(0,W.jsx)(`th`,{children:`Reviewer`}),(0,W.jsx)(`th`,{})]})}),(0,W.jsxs)(`tbody`,{children:[d.map(t=>(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`td`,{className:`mono`,children:(0,W.jsxs)(`button`,{className:`row-link`,type:`button`,onClick:()=>e(`/verification/${t.ID}`),children:[`#`,t.ID]})}),(0,W.jsxs)(`td`,{children:[(0,W.jsx)(`strong`,{children:Mi(t)}),(0,W.jsxs)(`div`,{className:`entity-subtitle mono`,children:[Di[t.TargetType],` · `,t.TargetID]}),t.TargetVerified&&(0,W.jsxs)(q,{tone:`good`,children:[(0,W.jsx)(F,{size:12}),` `,`Badge already on`]})]}),(0,W.jsxs)(`td`,{children:[H(t.ApplicantUsername)||t.ApplicantName||`-`,(0,W.jsx)(`div`,{className:`entity-subtitle mono`,children:t.ApplicantUserID})]}),(0,W.jsx)(`td`,{children:t.Category||`-`}),(0,W.jsx)(`td`,{children:(0,W.jsx)(ki,{status:t.Status})}),(0,W.jsx)(`td`,{children:U(t.SubmittedAt)||`-`}),(0,W.jsx)(`td`,{children:t.ReviewerAdminID||`-`}),(0,W.jsx)(`td`,{children:(0,W.jsxs)(`button`,{className:`row-link`,type:`button`,onClick:()=>e(`/verification/${t.ID}`),children:[(0,W.jsx)(nt,{size:14}),` `,`Details`,` `,(0,W.jsx)(ve,{size:14})]})})]},t.ID)),d.length===0&&(0,W.jsx)(It,{colSpan:8})]})]})}),h&&(0,W.jsx)(`div`,{className:`toolbar`,children:(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>w(!0),disabled:b,children:[b?(0,W.jsx)(L,{size:15,className:`spin`}):(0,W.jsx)(ge,{size:15}),` `,`Load more`]})})]})}function ki({status:e}){return(0,W.jsx)(q,{tone:Ai(e),children:Ei[e]})}function Ai(e){return e===`approved`?`good`:e===`submitted`||e===`in_review`?`warn`:e===`rejected`?`danger`:`neutral`}function ji(e,t){return e===`submitted`||e===`in_review`?t!==`0`&&t!==``?`warn`:`neutral`:e===`approved`?`good`:`neutral`}function Mi(e){return H(e.TargetUsername)||e.TargetTitle||`#${e.TargetID}`}function Ni(e){return e.TargetType===`bot`?`/bots/${e.TargetID}`:e.TargetType===`user`?`/accounts/${e.TargetID}`:`/channels/${e.TargetID}`}var Pi={created:`Created`,updated:`Updated`,submitted:`Submitted`,claimed:`Claimed`,approved:`Approved`,rejected:`Rejected`,cancelled:`Cancelled`,revoked:`Badge revoked`,notified:`Applicant notified`};function Fi({id:e,navigate:t}){let{can:n}=Kt(),[r,i]=(0,g.useState)(null),[a,o]=(0,g.useState)(``),[s,c]=(0,g.useState)(!1),[l,u]=(0,g.useState)(!1),[d,f]=(0,g.useState)(``);async function p(){u(!0),f(``);try{i(await k.verificationApplication(e))}catch(e){f(O(e))}finally{u(!1)}}function m(){c(!1),p()}(0,g.useEffect)(()=>{p()},[e]);function h(e){if(e instanceof v&&e.status===409)return c(!0),p(),`Another admin has already changed this application. The data has been reloaded — check the status before deciding again.`}if(d&&!r)return(0,W.jsx)(K,{children:d});if(!r)return(0,W.jsx)(Lt,{label:`Loading the application…`});let _=r.application,y=r.events??[],b=r.applicant_controls_target,x=r.target_verified,S=_.Status===`submitted`,C=_.Status===`submitted`||_.Status===`in_review`,w=_.Status===`approved`&&n(`verification.revoke`),T=a.trim();function E(){let e={version:_.Version};return T&&(e.internal_note=T),e}function D(){o(``),c(!1),p()}return(0,W.jsxs)(Mt,{title:`Application #${_.ID}`,eyebrow:`Verification / Review`,actions:(0,W.jsxs)(W.Fragment,{children:[(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>t(`/verification`),children:[(0,W.jsx)(ue,{size:15}),` `,`Back to list`]}),(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:m,disabled:l,children:[(0,W.jsx)(Ye,{size:15,className:l?`spin`:``}),` `,`Refresh`]})]}),children:[d&&(0,W.jsx)(K,{children:d}),s&&(0,W.jsx)(K,{children:`Another admin has already changed this application. The data has been reloaded — check the status before deciding again.`}),(0,W.jsx)(Pt,{main:(0,W.jsxs)(`div`,{className:`stacked-sections`,children:[(0,W.jsxs)(`section`,{className:`entity-head`,children:[(0,W.jsxs)(`div`,{children:[(0,W.jsx)(`div`,{className:`entity-title`,children:Mi(_)}),(0,W.jsxs)(`div`,{className:`entity-subtitle mono`,children:[`#`,_.ID,` · `,Di[_.TargetType],`:`,_.TargetID,` · v`,_.Version]})]}),(0,W.jsxs)(`div`,{className:`entity-badges`,children:[(0,W.jsx)(ki,{status:_.Status}),x&&(0,W.jsxs)(q,{tone:`good`,children:[(0,W.jsx)(F,{size:12}),` `,`Badge already on`]}),(0,W.jsx)(q,{tone:b?`good`:`danger`,children:b?`Control confirmed`:`No control over the target`})]})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Target`,text:`The peer the badge would be attached to, as it exists right now.`,action:(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>t(Ni(_)),children:[(0,W.jsx)(Ce,{size:15}),` `,`Open target`]})}),(0,W.jsxs)(`div`,{className:`summary-grid`,children:[(0,W.jsx)(Y,{label:`Type`,value:Di[_.TargetType]}),(0,W.jsx)(Y,{label:`Username`,value:H(_.TargetUsername)||`-`}),(0,W.jsx)(Y,{label:`Title`,value:_.TargetTitle||`-`}),(0,W.jsx)(Y,{label:`Peer ID`,value:_.TargetID,mono:!0})]})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Applicant`,text:`Who filed the application and whether they still hold rights on the target.`,action:(0,W.jsxs)(`button`,{className:`btn icon-text`,type:`button`,onClick:()=>t(`/accounts/${_.ApplicantUserID}`),children:[(0,W.jsx)(ft,{size:15}),` `,`Open account`]})}),(0,W.jsxs)(`div`,{className:`summary-grid`,children:[(0,W.jsx)(Y,{label:`Username`,value:H(_.ApplicantUsername)||`-`}),(0,W.jsx)(Y,{label:`Name`,value:_.ApplicantName||`-`}),(0,W.jsx)(Y,{label:`User ID`,value:_.ApplicantUserID,mono:!0}),(0,W.jsx)(Y,{label:`Submitted`,value:U(_.SubmittedAt)||`-`})]}),b?(0,W.jsx)(`p`,{className:`bot-create-note`,children:`The applicant controls the target right now — checked against the live records, not against the submission snapshot.`}):(0,W.jsx)(K,{children:`The applicant no longer controls the target. Approving would hand the badge to someone who does not hold the peer — normally a reason to reject.`})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Application`,text:`Everything the applicant submitted, rendered as plain text.`}),(0,W.jsxs)(`div`,{className:`stacked-sections`,children:[(0,W.jsxs)(`div`,{className:`summary-grid`,children:[(0,W.jsx)(Y,{label:`Category`,value:_.Category||`-`}),(0,W.jsx)(Y,{label:`Correlation ID`,value:_.CorrelationID||`-`,mono:!0}),(0,W.jsx)(Y,{label:`Created`,value:U(_.CreatedAt)||`-`}),(0,W.jsx)(Y,{label:`Updated`,value:U(_.UpdatedAt)||`-`})]}),(0,W.jsx)(Ii,{label:`Description`,children:_.Description?(0,W.jsx)(`p`,{className:`about-text`,children:_.Description}):(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Not provided`})}),(0,W.jsx)(Ii,{label:`Official website`,children:_.OfficialWebsite?(0,W.jsx)(`div`,{className:`about-text`,children:(0,W.jsx)(Li,{value:_.OfficialWebsite})}):(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Not provided`})}),(0,W.jsx)(Ii,{label:`Social links`,children:(0,W.jsx)(Ri,{values:_.SocialLinks})}),(0,W.jsx)(Ii,{label:`Press coverage`,children:(0,W.jsx)(Ri,{values:_.PressLinks})}),(0,W.jsx)(Ii,{label:`Applicant comment`,children:_.AdditionalNote?(0,W.jsx)(`p`,{className:`about-text`,children:_.AdditionalNote}):(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Not provided`})}),(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Only http:// and https:// links are clickable and open in a new tab; anything else is shown as text.`})]})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`Decision`,text:`What was decided, by whom, and with which wording.`}),(0,W.jsxs)(`div`,{className:`stacked-sections`,children:[(0,W.jsxs)(`div`,{className:`summary-grid`,children:[(0,W.jsx)(Y,{label:`Reviewer`,value:_.ReviewerAdminID||`-`}),(0,W.jsx)(Y,{label:`Decided`,value:U(_.ReviewedAt)||`-`}),(0,W.jsx)(Y,{label:`Status`,value:Ei[_.Status]}),(0,W.jsx)(Y,{label:`Version (optimistic lock)`,value:_.Version,mono:!0})]}),(0,W.jsx)(Ii,{label:`Decision reason`,children:_.DecisionReason?(0,W.jsx)(`p`,{className:`about-text`,children:_.DecisionReason}):(0,W.jsx)(`p`,{className:`bot-create-note`,children:`No decision yet`})}),(0,W.jsx)(Ii,{label:`Internal note · admins only`,children:_.InternalNote?(0,W.jsx)(`p`,{className:`about-text`,children:_.InternalNote}):(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Not provided`})})]})]}),(0,W.jsxs)(`section`,{className:`section-block`,children:[(0,W.jsx)(G,{title:`History`,text:`Immutable trail of every status transition, with actor and reason.`}),(0,W.jsx)(`div`,{className:`table-wrap`,children:(0,W.jsxs)(`table`,{className:`data-table`,children:[(0,W.jsx)(`thead`,{children:(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`th`,{children:`Event`}),(0,W.jsx)(`th`,{children:`From → to`}),(0,W.jsx)(`th`,{children:`Actor`}),(0,W.jsx)(`th`,{children:`Reason`}),(0,W.jsx)(`th`,{children:`Internal note`}),(0,W.jsx)(`th`,{children:`Time`})]})}),(0,W.jsxs)(`tbody`,{children:[y.map(e=>(0,W.jsxs)(`tr`,{children:[(0,W.jsx)(`td`,{children:(0,W.jsx)(zi,{kind:e.Kind})}),(0,W.jsxs)(`td`,{className:`mono`,children:[e.FromStatus||`-`,` → `,e.ToStatus||`-`]}),(0,W.jsx)(`td`,{children:e.Actor||`-`}),(0,W.jsx)(`td`,{className:`truncate`,children:e.Reason||`-`}),(0,W.jsx)(`td`,{className:`truncate`,children:e.Note||`-`}),(0,W.jsx)(`td`,{children:U(e.CreatedAt)||`-`})]},e.ID)),y.length===0&&(0,W.jsx)(It,{colSpan:6})]})]})})]})]}),side:(0,W.jsxs)(`section`,{className:`action-dock`,children:[(0,W.jsx)(`div`,{className:`dock-title`,children:`Review actions`}),!S&&!C&&!w&&(0,W.jsx)(`p`,{className:`bot-create-note`,children:`This status has no available actions.`}),S&&(0,W.jsxs)(W.Fragment,{children:[(0,W.jsx)(`div`,{className:`action-stack`,children:(0,W.jsx)(X,{label:`Take into review`,icon:(0,W.jsx)(ke,{size:15}),tone:`neutral`,path:`/api/verification/applications/${_.ID}/claim`,payload:()=>({version:_.Version}),onDone:D,onError:h})}),(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Assigns the application to you and moves it to in review, so two reviewers never work on the same one.`})]}),(C||w)&&(0,W.jsxs)(W.Fragment,{children:[(0,W.jsxs)(`label`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:`Internal note`}),(0,W.jsx)(`textarea`,{value:a,onChange:e=>o(e.target.value),rows:3,placeholder:`Handover note for other reviewers`})]}),(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Optional. Stored with the decision and visible to admins only — never sent to the applicant.`})]}),C&&(0,W.jsxs)(W.Fragment,{children:[!b&&(0,W.jsx)(K,{children:`The applicant no longer controls the target. Approving would hand the badge to someone who does not hold the peer — normally a reason to reject.`}),x&&(0,W.jsx)(`p`,{className:`bot-create-note`,children:`The target already carries the badge; approving only records the decision.`}),(0,W.jsxs)(`div`,{className:`action-stack`,children:[(0,W.jsx)(X,{label:`Approve`,icon:(0,W.jsx)(I,{size:15}),tone:`neutral`,path:`/api/verification/applications/${_.ID}/approve`,payload:E,onDone:D,onError:h}),(0,W.jsx)(X,{label:`Reject`,icon:(0,W.jsx)(te,{size:15}),tone:`warn`,path:`/api/verification/applications/${_.ID}/reject`,payload:E,onDone:D,onError:h})]}),(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Grants the official badge to the target and closes the application.`}),(0,W.jsx)(`p`,{className:`bot-create-note`,children:`The reason is mandatory: it is the wording the applicant is told, so write what exactly was missing.`})]}),w&&(0,W.jsxs)(W.Fragment,{children:[(0,W.jsxs)(`div`,{className:`dock-title`,children:[(0,W.jsx)(rt,{size:14}),` `,`Danger zone`]}),(0,W.jsxs)(`div`,{className:`danger-zone`,children:[(0,W.jsx)(X,{label:`Revoke verification`,icon:(0,W.jsx)(R,{size:15}),tone:`danger`,path:`/api/actions/revoke-verification`,payload:()=>{let e={target_type:_.TargetType,target_id:_.TargetID};return T&&(e.internal_note=T),e},onDone:D,onError:h}),(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Clears the badge from the target. The approved application stays in history.`}),!x&&(0,W.jsx)(`p`,{className:`bot-create-note`,children:`The target carries no badge right now — there is nothing to revoke.`})]})]})]})})]})}function Ii({label:e,children:t}){return(0,W.jsxs)(`div`,{className:`duration-field`,children:[(0,W.jsx)(`span`,{children:e}),t]})}function Li({value:e}){let t=bt(e);return t?(0,W.jsxs)(`a`,{className:`row-link`,href:t,target:`_blank`,rel:`noopener noreferrer`,children:[e,` `,(0,W.jsx)(Ce,{size:13})]}):(0,W.jsx)(`span`,{className:`mono`,children:e})}function Ri({values:e}){let t=(e??[]).filter(e=>e.trim()!==``);return t.length===0?(0,W.jsx)(`p`,{className:`bot-create-note`,children:`Not provided`}):(0,W.jsx)(`div`,{className:`about-text`,children:t.map((e,t)=>(0,W.jsx)(`div`,{children:(0,W.jsx)(Li,{value:e})},`${t}-${e}`))})}function zi({kind:e}){return(0,W.jsx)(q,{tone:e===`approved`?`good`:e===`rejected`||e===`revoked`||e===`cancelled`?`danger`:e===`submitted`||e===`claimed`?`warn`:`neutral`,children:Pi[e]})}function Bi({route:e,navigate:t}){let n=e.path.match(/^\/accounts\/(\d+)$/)?.[1],r=e.path.match(/^\/channels\/(\d+)$/)?.[1],i=e.path.match(/^\/bots\/(\d+)$/)?.[1],a=e.path.match(/^\/moderation\/(\d+)$/)?.[1],o=e.path.match(/^\/collectible-usernames\/(\d+)$/)?.[1],s=e.path.match(/^\/verification\/(\d+)$/)?.[1],c=e.path.match(/^\/bot-verification\/(\d+)$/)?.[1];return c?(0,W.jsx)(Zt,{children:(0,W.jsx)(Yt,{permission:Vt,children:(0,W.jsx)(xi,{id:c,navigate:t})})}):e.path===`/bot-verification`?(0,W.jsx)(Zt,{children:(0,W.jsx)(Yt,{permission:Vt,children:(0,W.jsx)(ui,{navigate:t})})}):s?(0,W.jsx)(Yt,{permission:Bt,children:(0,W.jsx)(Fi,{id:s,navigate:t})}):e.path===`/verification`?(0,W.jsx)(Yt,{permission:Bt,children:(0,W.jsx)(Oi,{navigate:t})}):o?(0,W.jsx)(qn,{id:o,navigate:t}):e.path===`/collectible-usernames`?(0,W.jsx)(Un,{navigate:t}):e.path===`/storage`?(0,W.jsx)(ti,{navigate:t}):n?(0,W.jsx)(jn,{id:Number(n),navigate:t}):r?(0,W.jsx)(Zn,{id:Number(r),navigate:t}):i?(0,W.jsx)(tr,{id:Number(i),navigate:t}):a?(0,W.jsx)(Xr,{id:Number(a),navigate:t}):e.path===`/accounts/shared-devices`?(0,W.jsx)(Ln,{navigate:t}):e.path===`/accounts`?(0,W.jsx)(In,{navigate:t}):e.path===`/channels`?(0,W.jsx)($n,{navigate:t}):e.path===`/bots`?(0,W.jsx)(ir,{navigate:t}):e.path===`/moderation`?(0,W.jsx)(Ur,{navigate:t}):e.path===`/broadcasts`?(0,W.jsx)(sr,{}):e.path===`/emoji`?(0,W.jsx)(xr,{kind:`emoji`}):e.path===`/stickers`?(0,W.jsx)(xr,{kind:`stickers`}):e.path===`/gif-catalog`?(0,W.jsx)(wr,{}):e.path===`/server-settings`?(0,W.jsx)(Yt,{permission:Ut,children:(0,W.jsx)(Er,{})}):e.path===`/messages/detail`||e.path===`/messages/private/detail`?(0,W.jsx)(mr,{ownerUserID:Number(e.search.get(`owner_user_id`)||`0`),msgID:Number(e.search.get(`msg_id`)||`0`),navigate:t}):e.path===`/messages/groups/detail`?(0,W.jsx)(fr,{channelID:Number(e.search.get(`channel_id`)||`0`),msgID:Number(e.search.get(`msg_id`)||`0`),navigate:t}):e.path===`/messages/groups`?(0,W.jsx)(pr,{navigate:t}):e.path===`/messages`||e.path===`/messages/private`?(0,W.jsx)(hr,{navigate:t}):(0,W.jsx)(cr,{navigate:t})}function Vi(){let[e,t]=(0,g.useState)(void 0),[n,r]=(0,g.useState)(()=>Qt());(0,g.useEffect)(()=>{let e=()=>r(Qt());return window.addEventListener(`popstate`,e),()=>window.removeEventListener(`popstate`,e)},[]),(0,g.useEffect)(()=>{k.session().then(e=>t(e)).catch(()=>t(null))},[]);let i=e=>{window.history.pushState(null,``,e),r(Qt())};return e===void 0?(0,W.jsx)(ln,{}):e===null?(0,W.jsx)(fn,{onLogin:t}):(0,W.jsx)(Gt,{permissions:e.permissions??[],hideThirdPartyVerification:e.hide_third_party_verification??!0,children:(0,W.jsx)(un,{actor:e.actor,build:e.build,route:n,navigate:i,onLogout:()=>t(null),children:(0,W.jsx)(Bi,{route:n,navigate:i})})})}_.createRoot(document.getElementById(`root`)).render((0,W.jsx)(g.StrictMode,{children:(0,W.jsx)(rn,{children:(0,W.jsx)(Vi,{})})})); \ No newline at end of file diff --git a/cmd/telesrv-admin/web/dist/index.html b/cmd/telesrv-admin/web/dist/index.html index 7c345aee..6ade798d 100644 --- a/cmd/telesrv-admin/web/dist/index.html +++ b/cmd/telesrv-admin/web/dist/index.html @@ -23,8 +23,8 @@ })(); - - + +
diff --git a/cmd/telesrv-admin/web/package-lock.json b/cmd/telesrv-admin/web/package-lock.json index 18e4c2de..a74b0b78 100644 --- a/cmd/telesrv-admin/web/package-lock.json +++ b/cmd/telesrv-admin/web/package-lock.json @@ -758,9 +758,9 @@ } }, "node_modules/nanoid": { - "version": "3.3.16", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.16.tgz", - "integrity": "sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q==", + "version": "3.3.18", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.18.tgz", + "integrity": "sha512-DTg4MJbGMWkfi6VZFdNt2/caMbQy4Ou+Op/hJQvGEWcnVfoA1QA+xzRKAzw9jD6+GVOOeYr/mIcuDSdug6F6+w==", "dev": true, "funding": [ { diff --git a/cmd/telesrv-admin/web/src/lib/format.ts b/cmd/telesrv-admin/web/src/lib/format.ts index 4c0e3f3f..0ee543ba 100644 --- a/cmd/telesrv-admin/web/src/lib/format.ts +++ b/cmd/telesrv-admin/web/src/lib/format.ts @@ -193,3 +193,20 @@ export function parseIDs(value: string, invalidMessage = "msg ids invalid"): num } return ids; } + +// toUnixSeconds reads a datetime-local input. Such an input carries no zone, so +// the value parses as the operator's local time — which is the time they picked. +// 0 means "empty or unparseable", which every caller treats as "not scheduled". +export function toUnixSeconds(value: string): number { + if (!value.trim()) return 0; + const ms = new Date(value).getTime(); + return Number.isFinite(ms) ? Math.floor(ms / 1000) : 0; +} + +// localInputValue formats a datetime-local default some seconds out, so a +// scheduling form never opens on a value the server would reject as past. +export function localInputValue(offsetSeconds: number): string { + const at = new Date(Date.now() + offsetSeconds * 1000); + const pad = (n: number) => String(n).padStart(2, "0"); + return `${at.getFullYear()}-${pad(at.getMonth() + 1)}-${pad(at.getDate())}T${pad(at.getHours())}:${pad(at.getMinutes())}`; +} diff --git a/cmd/telesrv-admin/web/src/pages/CollectibleUsernamesPage.tsx b/cmd/telesrv-admin/web/src/pages/CollectibleUsernamesPage.tsx index cc92d2ae..764ce884 100644 --- a/cmd/telesrv-admin/web/src/pages/CollectibleUsernamesPage.tsx +++ b/cmd/telesrv-admin/web/src/pages/CollectibleUsernamesPage.tsx @@ -166,7 +166,7 @@ export function ownerLabel(row: CollectibleUsernameRow, vaultLabel: string): str export function priceLabel(row: CollectibleUsernameRow): string { const base = formatCurrency(row.Amount, row.Currency); if (row.CryptoCurrency && row.CryptoAmount && row.CryptoAmount !== "0") { - return `${base} (${formatCurrency(row.CryptoAmount, row.CryptoCurrency)})`; + return `${formatCurrency(row.CryptoAmount, row.CryptoCurrency)} (${base})`; } return base; } diff --git a/cmd/telesrv-admin/web/src/permissions.tsx b/cmd/telesrv-admin/web/src/permissions.tsx index 286ac39c..b5a97ae9 100644 --- a/cmd/telesrv-admin/web/src/permissions.tsx +++ b/cmd/telesrv-admin/web/src/permissions.tsx @@ -5,6 +5,8 @@ import { Alert, PageFrame } from "./components/ui"; // (cmd/telesrv-admin/security.go). "*" is the wildcard an operator configures for // a full-access session. export const permissionAll = "*"; +export const permissionPremiumManage = "premium.manage"; +export const permissionBotTokenRead = "bots.token.read"; export const permissionVerificationReview = "verification.review"; export const permissionVerificationRevoke = "verification.revoke"; // Third-party verification is a separate mechanism and therefore a separate pair of diff --git a/cmd/telesrv-admin/web/src/styles/04-modal-and-login.css b/cmd/telesrv-admin/web/src/styles/04-modal-and-login.css index 195efab2..d1266cc4 100644 --- a/cmd/telesrv-admin/web/src/styles/04-modal-and-login.css +++ b/cmd/telesrv-admin/web/src/styles/04-modal-and-login.css @@ -425,3 +425,34 @@ transform: rotate(360deg); } } +.secret-reveal { + display: grid; + gap: 6px; + padding: 10px; + background: var(--warn-tint); + border: 1px solid var(--warn-border); + border-radius: var(--radius); +} + +.secret-reveal-label { + display: flex; + align-items: center; + gap: 6px; + color: var(--warn); + font-size: 12px; + font-weight: 800; +} + +.secret-reveal-row { display: flex; align-items: center; gap: 10px; } +.secret-reveal-value { + overflow: hidden; + flex: 1 1 auto; + padding: 6px 10px; + color: var(--text-soft); + letter-spacing: .12em; + background: var(--panel); + border: 1px solid var(--line); + border-radius: var(--radius-sm); + text-overflow: ellipsis; + white-space: nowrap; +} diff --git a/cmd/telesrv-load/main.go b/cmd/telesrv-load/main.go index a934c8a8..07ee6b7c 100644 --- a/cmd/telesrv-load/main.go +++ b/cmd/telesrv-load/main.go @@ -38,6 +38,16 @@ func run(ctx context.Context, args []string) error { return runKeygen(args[1:]) case "provision": return runProvision(ctx, args[1:]) + case "plan-dataset": + return runPlanDataset(args[1:]) + case "seed": + return runSeed(ctx, args[1:]) + case "snapshot": + return runSnapshot(ctx, args[1:]) + case "mutate-offline": + return runMutateOffline(ctx, args[1:]) + case "startup-run": + return runStartup(ctx, args[1:]) case "run": return runLoad(ctx, args[1:]) case "summarize": @@ -50,6 +60,231 @@ func run(ctx context.Context, args []string) error { } } +func runPlanDataset(args []string) error { + flags := flag.NewFlagSet("plan-dataset", flag.ContinueOnError) + out := flags.String("out", filepath.FromSlash("data/loadtest/dataset.json"), "owner-only immutable dataset plan") + accounts := flags.Int("accounts", 1000, "logical primary accounts in the provisioned manifest") + seed := flags.Int64("seed", 20260827, "deterministic topology and idempotency seed") + privateFanout := flags.Int("private-fanout", -1, "outgoing private messages per account; -1 uses min(10, accounts-1)") + hotGroups := flags.Int("hot-groups", 10, "hot supergroup count") + hotMembers := flags.Int("hot-members", 0, "members per hot supergroup; 0 uses all accounts") + hotHistory := flags.Int("hot-history", 100, "messages per hot supergroup") + mediumGroups := flags.Int("medium-groups", 100, "medium supergroup count") + mediumMembers := flags.Int("medium-members", 100, "members per medium supergroup") + mediumHistory := flags.Int("medium-history", 30, "messages per medium supergroup") + smallGroups := flags.Int("small-groups", 200, "small supergroup count") + smallMembers := flags.Int("small-members", 20, "members per small supergroup") + smallHistory := flags.Int("small-history", 10, "messages per small supergroup") + heavyGroups := flags.Int("heavy-groups", 200, "heavy-user supergroup count") + heavyAccounts := flags.Int("heavy-accounts", 100, "accounts included in every heavy supergroup") + heavyHistory := flags.Int("heavy-history", 30, "messages per heavy supergroup") + if err := flags.Parse(args); err != nil { + return err + } + if flags.NArg() != 0 { + return errors.New("plan-dataset accepts no positional arguments") + } + if *hotMembers == 0 { + *hotMembers = *accounts + } + if *privateFanout == -1 { + *privateFanout = min(10, max(*accounts-1, 0)) + } + cfg := loadharness.DatasetConfig{ + Accounts: *accounts, Seed: *seed, PrivateFanout: *privateFanout, + HotGroups: *hotGroups, HotMembers: *hotMembers, HotHistory: *hotHistory, + MediumGroups: *mediumGroups, MediumMembers: min(*mediumMembers, *accounts), MediumHistory: *mediumHistory, + SmallGroups: *smallGroups, SmallMembers: min(*smallMembers, *accounts), SmallHistory: *smallHistory, + HeavyGroups: *heavyGroups, HeavyAccounts: min(*heavyAccounts, *accounts), HeavyHistory: *heavyHistory, + } + if _, err := os.Stat(*out); err == nil { + existing, loadErr := loadharness.LoadDataset(*out) + if loadErr != nil { + return loadErr + } + if existing.Config != cfg { + return fmt.Errorf("refusing to replace existing dataset plan %s with different config", *out) + } + fmt.Fprintf(os.Stdout, "dataset plan already exists at %s hash=%s groups=%d private_messages=%d\n", + *out, existing.PlanSHA256, len(existing.Groups), len(existing.PrivateEdges)) + return nil + } else if !os.IsNotExist(err) { + return err + } + dataset, err := loadharness.PlanDataset(cfg) + if err != nil { + return err + } + if err := loadharness.WriteDataset(*out, dataset); err != nil { + return err + } + fmt.Fprintf(os.Stdout, "dataset plan written to %s hash=%s groups=%d private_messages=%d\n", + *out, dataset.PlanSHA256, len(dataset.Groups), len(dataset.PrivateEdges)) + return nil +} + +func runSeed(ctx context.Context, args []string) error { + flags := flag.NewFlagSet("seed", flag.ContinueOnError) + manifest := flags.String("manifest", filepath.FromSlash("data/loadtest/manifest.json"), "provisioned manifest") + sessionKey := flags.String("session-key", filepath.FromSlash("data/loadtest/session.key"), "session encryption key") + rsaOverride := flags.String("rsa-key", "", "optional RSA public/private PEM override") + dataset := flags.String("dataset", filepath.FromSlash("data/loadtest/dataset.json"), "immutable dataset plan") + state := flags.String("state", filepath.FromSlash("data/loadtest/dataset-seed-state.json"), "resumable seed journal") + concurrency := flags.Int("concurrency", 8, "parallel account workers (max 64)") + operationTimeout := flags.Duration("operation-timeout", 30*time.Second, "maximum duration of one seed RPC") + if err := flags.Parse(args); err != nil { + return err + } + if flags.NArg() != 0 { + return errors.New("seed accepts no positional arguments") + } + result, err := loadharness.Seed(ctx, loadharness.SeedConfig{ + ManifestPath: *manifest, SessionKeyPath: *sessionKey, RSAKeyOverride: *rsaOverride, + DatasetPath: *dataset, SeedStatePath: *state, Concurrency: *concurrency, OperationTimeout: *operationTimeout, + }, func(event loadharness.SeedEvent) { + status := "ok" + if event.Err != nil { + status = "error" + } + fmt.Fprintf(os.Stdout, "seed phase=%s %d/%d account=%d status=%s\n", + event.Phase, event.Completed, event.Total, event.Account, status) + }) + if err != nil { + return err + } + fmt.Fprintf(os.Stdout, "seed complete private_messages=%d supergroups=%d invited_members=%d group_messages=%d rich_state_accounts=%d state=%s\n", + result.PrivateMessages, result.Groups, result.InvitedMembers, result.GroupMessages, result.RichStateAccounts, *state) + return nil +} + +func runSnapshot(ctx context.Context, args []string) error { + flags := flag.NewFlagSet("snapshot", flag.ContinueOnError) + manifest := flags.String("manifest", filepath.FromSlash("data/loadtest/manifest.json"), "provisioned manifest") + sessionKey := flags.String("session-key", filepath.FromSlash("data/loadtest/session.key"), "session encryption key") + rsaOverride := flags.String("rsa-key", "", "optional RSA public/private PEM override") + dataset := flags.String("dataset", filepath.FromSlash("data/loadtest/dataset.json"), "immutable dataset plan") + seedState := flags.String("seed-state", filepath.FromSlash("data/loadtest/dataset-seed-state.json"), "completed seed journal") + clientState := flags.String("client-state", filepath.FromSlash("data/loadtest/client-state.json"), "baseline account/dialog/PTS snapshot") + concurrency := flags.Int("concurrency", 8, "parallel account workers (max 64)") + operationTimeout := flags.Duration("operation-timeout", 30*time.Second, "maximum duration of one snapshot RPC") + if err := flags.Parse(args); err != nil { + return err + } + if flags.NArg() != 0 { + return errors.New("snapshot accepts no positional arguments") + } + result, err := loadharness.SnapshotClientState(ctx, loadharness.SnapshotConfig{ + ManifestPath: *manifest, SessionKeyPath: *sessionKey, RSAKeyOverride: *rsaOverride, + DatasetPath: *dataset, SeedStatePath: *seedState, ClientStatePath: *clientState, + Concurrency: *concurrency, OperationTimeout: *operationTimeout, + }, func(event loadharness.SnapshotEvent) { + status := "ok" + if event.Resumed { + status = "resumed" + } + if event.Err != nil { + status = "error" + } + fmt.Fprintf(os.Stdout, "snapshot %d/%d account=%d status=%s\n", event.Completed, event.Total, event.Account, status) + }) + if err != nil { + return err + } + fmt.Fprintf(os.Stdout, "snapshot complete accounts=%d dialogs=%d channel_dialogs=%d client_state=%s\n", + result.Accounts, result.Dialogs, result.Channels, *clientState) + return nil +} + +func runMutateOffline(ctx context.Context, args []string) error { + flags := flag.NewFlagSet("mutate-offline", flag.ContinueOnError) + manifest := flags.String("manifest", filepath.FromSlash("data/loadtest/manifest.json"), "provisioned manifest") + sessionKey := flags.String("session-key", filepath.FromSlash("data/loadtest/session.key"), "session encryption key") + rsaOverride := flags.String("rsa-key", "", "optional RSA public/private PEM override") + dataset := flags.String("dataset", filepath.FromSlash("data/loadtest/dataset.json"), "immutable dataset plan") + seedState := flags.String("seed-state", filepath.FromSlash("data/loadtest/dataset-seed-state.json"), "completed seed journal") + clientState := flags.String("client-state", filepath.FromSlash("data/loadtest/client-state.json"), "immutable old account/channel PTS snapshot") + mutationState := flags.String("mutation-state", filepath.FromSlash("data/loadtest/offline-mutation-state.json"), "resumable offline mutation journal") + concurrency := flags.Int("concurrency", 8, "parallel writer accounts (max 64)") + operationTimeout := flags.Duration("operation-timeout", 30*time.Second, "maximum duration of one mutation RPC") + if err := flags.Parse(args); err != nil { + return err + } + if flags.NArg() != 0 { + return errors.New("mutate-offline accepts no positional arguments") + } + result, err := loadharness.MutateOffline(ctx, loadharness.MutateOfflineConfig{ + ManifestPath: *manifest, SessionKeyPath: *sessionKey, RSAKeyOverride: *rsaOverride, + DatasetPath: *dataset, SeedStatePath: *seedState, ClientStatePath: *clientState, + MutationStatePath: *mutationState, Concurrency: *concurrency, OperationTimeout: *operationTimeout, + }, func(event loadharness.MutationEvent) { + status := "ok" + if event.Err != nil { + status = "error" + } + fmt.Fprintf(os.Stdout, "mutate phase=%s %d/%d account=%d status=%s\n", + event.Phase, event.Completed, event.Total, event.Account, status) + }) + if err != nil { + return err + } + fmt.Fprintf(os.Stdout, "offline mutation complete private_messages=%d dirty_channels=%d channel_messages=%d edited=%d deleted=%d pinned=%d state=%s\n", + result.PrivateMessages, result.DirtyChannels, result.ChannelMessages, result.Edited, result.Deleted, result.Pinned, *mutationState) + return nil +} + +func runStartup(ctx context.Context, args []string) error { + flags := flag.NewFlagSet("startup-run", flag.ContinueOnError) + manifest := flags.String("manifest", filepath.FromSlash("data/loadtest/manifest.json"), "provisioned manifest") + sessionKey := flags.String("session-key", filepath.FromSlash("data/loadtest/session.key"), "session encryption key") + rsaOverride := flags.String("rsa-key", "", "optional RSA public/private PEM override") + dataset := flags.String("dataset", filepath.FromSlash("data/loadtest/dataset.json"), "immutable dataset plan") + seedState := flags.String("seed-state", filepath.FromSlash("data/loadtest/dataset-seed-state.json"), "completed seed journal") + clientState := flags.String("client-state", filepath.FromSlash("data/loadtest/client-state.json"), "immutable old account/channel PTS snapshot") + mutationState := flags.String("mutation-state", filepath.FromSlash("data/loadtest/offline-mutation-state.json"), "completed offline mutation journal") + report := flags.String("report", filepath.FromSlash("data/loadtest/startup-report.json"), "startup correctness and latency report") + events := flags.String("events", filepath.FromSlash("data/loadtest/startup-events.ndjson"), "periodic owner-only startup and server metric evidence") + serverMetrics := flags.String("server-metrics", "http://127.0.0.1:6060/metrics", "server metrics URL; empty disables") + profile := flags.String("profile", loadharness.StartupProfileTDesktopReturningV1, "startup workload: tdesktop-cold-returning-v1 or tdlib-returning-v1") + startOrder := flags.String("start-order", loadharness.StartupOrderShuffled, "account launch order: shuffled or account-index") + startOrderSeed := flags.Int64("start-order-seed", 0, "deterministic shuffled launch seed; 0 uses the dataset seed") + accounts := flags.Int("accounts", 0, "limit first N accounts; 0 uses the complete dataset") + ramp := flags.Duration("ramp", 30*time.Second, "connection start ramp duration") + operationTimeout := flags.Duration("operation-timeout", 30*time.Second, "maximum duration of one startup RPC") + sampleInterval := flags.Duration("sample-interval", 2*time.Second, "server resource sampling interval") + if err := flags.Parse(args); err != nil { + return err + } + if flags.NArg() != 0 { + return errors.New("startup-run accepts no positional arguments") + } + result, err := loadharness.StartupRun(ctx, loadharness.StartupRunConfig{ + ManifestPath: *manifest, SessionKeyPath: *sessionKey, RSAKeyOverride: *rsaOverride, + DatasetPath: *dataset, SeedStatePath: *seedState, ClientStatePath: *clientState, + MutationStatePath: *mutationState, ReportPath: *report, EventsPath: *events, ServerMetricsURL: *serverMetrics, + Profile: *profile, StartOrder: *startOrder, StartOrderSeed: *startOrderSeed, + AccountLimit: *accounts, RampDuration: *ramp, OperationTimeout: *operationTimeout, + SampleInterval: *sampleInterval, + }) + if err != nil { + return err + } + printStartupSummary(result) + if !result.Pass { + return fmt.Errorf("startup acceptance failed; see %s", *report) + } + return nil +} + +func printStartupSummary(report *loadharness.StartupRunReport) { + fmt.Fprintf(os.Stdout, "pass=%v business_ready=%d/%d dialogs=%d channel_dialogs=%d account_diff_calls=%d channel_diff_calls=%d channel_full=%d channel_too_long=%d channel_empty=%d\n", + report.Pass, report.BusinessReady, report.ExpectedAccounts, report.DialogsObserved, report.ChannelDialogs, + report.AccountDifference.Calls, report.ChannelDifference.Calls, report.ChannelDifference.Full, + report.ChannelDifference.TooLong, report.ChannelDifference.Empty) + for _, failure := range report.Failures { + fmt.Fprintln(os.Stdout, "failure:", failure) + } +} + func runKeygen(args []string) error { flags := flag.NewFlagSet("keygen", flag.ContinueOnError) path := flags.String("out", filepath.FromSlash("data/loadtest/session.key"), "owner-only session encryption key file") @@ -78,7 +313,7 @@ func runProvision(ctx context.Context, args []string) error { accounts := flags.Int("accounts", 450, "unique accounts") extraDevices := flags.Int("extra-devices", 50, "accounts receiving a second independent session") concurrency := flags.Int("concurrency", 8, "parallel provisioning workers (max 64)") - phonePrefix := flags.String("phone-prefix", "+155500", "E.164 prefix followed by a six-digit account index") + phonePrefix := flags.String("phone-prefix", loadharness.DefaultPhonePrefix, "possible reserved NANP prefix followed by a six-digit account index") firstName := flags.String("first-name-prefix", "Load", "generated first-name prefix") obfuscated := flags.Bool("obfuscated", true, "use TDesktop-like Obfuscated2 + abridged transport") pfs := flags.Bool("pfs", true, "bind temporary auth keys using PFS") @@ -129,12 +364,17 @@ func runLoad(ctx context.Context, args []string) error { events := flags.String("events", filepath.FromSlash("data/loadtest/events.ndjson"), "periodic NDJSON evidence") fileFixture := flags.String("file-fixture", "", "reusable fixture JSON; empty stores beside manifest") serverMetrics := flags.String("server-metrics", "http://127.0.0.1:6060/metrics", "server metrics URL; empty disables") + startOrder := flags.String("start-order", loadharness.StartupOrderShuffled, "session launch order: shuffled or account-index") + startOrderSeed := flags.Int64("start-order-seed", 20260827, "deterministic shuffled launch seed") sessions := flags.Int("sessions", 0, "limit selected sessions; 0 uses all") duration := flags.Duration("duration", 30*time.Minute, "sustained load duration") recovery := flags.Duration("recovery", 7*time.Minute, "post-disconnect reclamation observation") ramp := flags.Duration("ramp", 2*time.Minute, "connection ramp duration") rpcInterval := flags.Duration("rpc-interval", 5*time.Second, "per-session background RPC interval") messageInterval := flags.Duration("message-interval", 30*time.Second, "per-primary-session message interval; negative disables") + messageRate := flags.Float64("message-rate", 0, "aggregate fixed arrival rate in messages/second; use with message-interval=-1") + messageQueue := flags.Int("message-queue", 8, "bounded pending sends per primary session for fixed-rate workload") + deliverySettle := flags.Duration("delivery-settle", 10*time.Second, "maximum live-delivery settle time before final updates.getDifference reconciliation") fileInterval := flags.Duration("file-interval", time.Minute, "per-session upload.getFile interval") fileSize := flags.Int("file-size", 4<<20, "generated shared download fixture bytes; 0 disables") fileChunk := flags.Int("file-chunk", 1<<20, "upload.getFile bytes per request (max 1MiB)") @@ -155,8 +395,10 @@ func runLoad(ctx context.Context, args []string) error { result, err := loadharness.Run(ctx, loadharness.RunConfig{ ManifestPath: *manifest, SessionKeyPath: *sessionKey, RSAKeyOverride: *rsaOverride, ReportPath: *report, EventsPath: *events, FileFixturePath: *fileFixture, ServerMetricsURL: *serverMetrics, + StartOrder: *startOrder, StartOrderSeed: *startOrderSeed, SessionLimit: *sessions, Duration: *duration, RecoveryDuration: *recovery, RampDuration: *ramp, - RPCInterval: *rpcInterval, MessageInterval: *messageInterval, SampleInterval: *sampleInterval, + RPCInterval: *rpcInterval, MessageInterval: *messageInterval, MessageRate: *messageRate, + MessageQueueDepth: *messageQueue, DeliverySettle: *deliverySettle, SampleInterval: *sampleInterval, FileInterval: *fileInterval, FileSizeBytes: *fileSize, FileChunkBytes: *fileChunk, SetupTimeout: *setupTimeout, OperationTimeout: *operationTimeout, OfflineFraction: *offlineFraction, OfflineAt: *offlineAt, OfflineFor: *offlineFor, @@ -183,6 +425,25 @@ func runSummarize(args []string) error { if err != nil { return err } + var shape struct { + BusinessReady *int `json:"business_ready"` + } + if err := json.Unmarshal(data, &shape); err != nil { + return err + } + if shape.BusinessReady != nil { + var report loadharness.StartupRunReport + decoder := json.NewDecoder(strings.NewReader(string(data))) + decoder.DisallowUnknownFields() + if err := decoder.Decode(&report); err != nil { + return err + } + printStartupSummary(&report) + if !report.Pass { + return errors.New("startup report did not pass") + } + return nil + } var report loadharness.RunReport decoder := json.NewDecoder(strings.NewReader(string(data))) decoder.DisallowUnknownFields() @@ -197,9 +458,9 @@ func runSummarize(args []string) error { } func printSummary(report *loadharness.RunReport) { - fmt.Fprintf(os.Stdout, "pass=%v sessions=%d peak_ready=%d reconnects=%d disconnects=%d flood_waits=%d fatal_errors=%d\n", + fmt.Fprintf(os.Stdout, "pass=%v sessions=%d peak_ready=%d reconnects=%d disconnects=%d flood_waits=%d fatal_errors=%d scheduled=%d delivered=%d missing=%d\n", report.Pass, report.ExpectedSessions, report.PeakReadySessions, report.Reconnects, report.Disconnects, - totalFloodWaits(report), report.WorkerFatalErrors) + totalFloodWaits(report), report.WorkerFatalErrors, report.MessageScheduled, report.Delivery.Delivered, report.Delivery.Missing) for _, failure := range report.Failures { fmt.Fprintln(os.Stdout, "failure:", failure) } @@ -214,12 +475,17 @@ func totalFloodWaits(report *loadharness.RunReport) uint64 { } func usageError() error { - return errors.New("expected one of: keygen, provision, run, summarize, help") + return errors.New("expected one of: keygen, provision, plan-dataset, seed, snapshot, mutate-offline, startup-run, run, summarize, help") } const usageText = `telesrv-load commands: keygen generate an owner-only AES-256 session key provision create accounts and encrypted sessions through real MTProto auth + plan-dataset create an immutable real-data topology with stable RPC identities + seed materialize private dialogs, supergroups and messages via real RPCs + snapshot save paginated real dialogs and old account/channel PTS cursors + mutate-offline create account/channel gaps while preserving the old cursors + startup-run restore old cursors and measure dialogs/difference business readiness run execute sustained real-client load, offline recovery and reclamation summarize print the acceptance summary from a JSON report diff --git a/cmd/telesrv-update/main.go b/cmd/telesrv-update/main.go new file mode 100644 index 00000000..5828ca4e --- /dev/null +++ b/cmd/telesrv-update/main.go @@ -0,0 +1,109 @@ +// Command telesrv-update serves native Telegram client update metadata and +// immutable, range-enabled desktop update packages. +package main + +import ( + "context" + "errors" + "flag" + "fmt" + "net" + "net/http" + "os" + "os/signal" + "syscall" + "time" + + "go.uber.org/zap" + + "telesrv/internal/updatecdn" +) + +func main() { + if err := run(); err != nil { + fmt.Fprintln(os.Stderr, "telesrv-update:", err) + os.Exit(1) + } +} + +func run() error { + listenDefault := envOr("TELESRV_UPDATE_LISTEN", "127.0.0.1:2402") + manifestDefault := envOr("TELESRV_UPDATE_MANIFEST", "data/updates/manifest.json") + filesDefault := envOr("TELESRV_UPDATE_FILES_DIR", "data/updates/files") + + listenAddr := flag.String("listen", listenDefault, "HTTP listen address") + manifestPath := flag.String("manifest", manifestDefault, "release manifest path") + filesDir := flag.String("files", filesDefault, "desktop update package directory") + check := flag.Bool("check", false, "validate the catalog and exit") + flag.Parse() + + store, err := updatecdn.NewStore(*manifestPath, *filesDir) + if err != nil { + return fmt.Errorf("load update catalog: %w", err) + } + if *check { + fmt.Println("update catalog is valid") + return nil + } + handler, err := updatecdn.NewHandler(store) + if err != nil { + return err + } + listener, err := net.Listen("tcp", *listenAddr) + if err != nil { + return fmt.Errorf("listen on %s: %w", *listenAddr, err) + } + + logger, err := zap.NewProduction() + if err != nil { + _ = listener.Close() + return fmt.Errorf("initialize logger: %w", err) + } + defer logger.Sync() //nolint:errcheck + + server := &http.Server{ + Handler: handler, + ReadHeaderTimeout: 5 * time.Second, + ReadTimeout: 30 * time.Second, + WriteTimeout: 5 * time.Minute, + IdleTimeout: 2 * time.Minute, + MaxHeaderBytes: 32 << 10, + } + serveErr := make(chan error, 1) + go func() { + serveErr <- server.Serve(listener) + }() + logger.Info("update service started", + zap.String("listen", listener.Addr().String()), + zap.String("manifest", *manifestPath), + zap.String("files", *filesDir)) + + stopCtx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM) + defer stop() + select { + case err := <-serveErr: + if errors.Is(err, http.ErrServerClosed) { + return nil + } + return fmt.Errorf("serve HTTP: %w", err) + case <-stopCtx.Done(): + } + + shutdownCtx, cancel := context.WithTimeout(context.Background(), 15*time.Second) + defer cancel() + if err := server.Shutdown(shutdownCtx); err != nil { + return fmt.Errorf("shutdown HTTP server: %w", err) + } + if err := <-serveErr; err != nil && !errors.Is(err, http.ErrServerClosed) { + return fmt.Errorf("serve HTTP: %w", err) + } + logger.Info("update service stopped") + return nil +} + +func envOr(key, fallback string) string { + if value, ok := os.LookupEnv(key); ok && value != "" { + return value + } + return fallback +} diff --git a/cmd/telesrv/main.go b/cmd/telesrv/main.go index dfadea80..a809befd 100644 --- a/cmd/telesrv/main.go +++ b/cmd/telesrv/main.go @@ -10,6 +10,7 @@ import ( "os" "os/signal" "runtime" + runtimemetrics "runtime/metrics" "strconv" "strings" "syscall" @@ -60,6 +61,7 @@ import ( "telesrv/internal/app/userprojection" "telesrv/internal/app/users" verificationapp "telesrv/internal/app/verification" + welcomemessagesapp "telesrv/internal/app/welcomemessages" "telesrv/internal/botapi" "telesrv/internal/config" "telesrv/internal/domain" @@ -79,6 +81,7 @@ import ( "telesrv/internal/store/redisstore" "telesrv/internal/telegramloginhttp" "telesrv/internal/turnsrv" + "telesrv/internal/updatecdn" "telesrv/internal/web" ) @@ -273,8 +276,9 @@ func startDebugServer(ctx context.Context, addr string, metricsHandler http.Hand func goRuntimeGaugeSamples() []obsmetrics.GaugeSample { var mem runtime.MemStats runtime.ReadMemStats(&mem) - return []obsmetrics.GaugeSample{ + samples := []obsmetrics.GaugeSample{ {Name: "telesrv_go_goroutines", Value: float64(runtime.NumGoroutine())}, + {Name: "telesrv_go_scheduler_busy_seconds", Value: goSchedulerBusySeconds()}, {Name: "telesrv_go_heap_alloc_bytes", Value: float64(mem.HeapAlloc)}, {Name: "telesrv_go_heap_inuse_bytes", Value: float64(mem.HeapInuse)}, {Name: "telesrv_go_heap_objects", Value: float64(mem.HeapObjects)}, @@ -283,6 +287,28 @@ func goRuntimeGaugeSamples() []obsmetrics.GaugeSample { {Name: "telesrv_go_gc_cycles", Value: float64(mem.NumGC)}, {Name: "telesrv_go_gc_pause_seconds", Value: time.Duration(mem.PauseTotalNs).Seconds()}, } + if value, ok := processCPUSeconds(); ok { + samples = append(samples, obsmetrics.GaugeSample{Name: "telesrv_process_cpu_seconds", Value: value}) + } + return samples +} + +// goSchedulerBusySeconds is a Go scheduler-class estimate. The runtime +// documentation explicitly warns that CPU-class values are overestimates and +// are not comparable to operating-system process CPU time, so capacity reports +// use telesrv_process_cpu_seconds instead. +func goSchedulerBusySeconds() float64 { + samples := []runtimemetrics.Sample{ + {Name: "/cpu/classes/total:cpu-seconds"}, + {Name: "/cpu/classes/idle:cpu-seconds"}, + } + runtimemetrics.Read(samples) + total := samples[0].Value.Float64() + idle := samples[1].Value.Float64() + if total <= idle { + return 0 + } + return total - idle } func mtprotoRuntimeGaugeSamples(snapshot mtprotoedge.RuntimeSnapshot) []obsmetrics.GaugeSample { @@ -303,6 +329,15 @@ func mtprotoRuntimeGaugeSamples(snapshot mtprotoedge.RuntimeSnapshot) []obsmetri {Name: "telesrv_mtproto_inbound_rpc_ready_connections", Value: float64(snapshot.InboundRPCReadyConnections)}, {Name: "telesrv_mtproto_inbound_rpc_task_limit", Value: float64(snapshot.InboundRPCMaxTasks)}, {Name: "telesrv_mtproto_inbound_rpc_byte_limit", Value: float64(snapshot.InboundRPCMaxBytes)}, + {Name: "telesrv_mtproto_rpc_delivery_hook_workers", Value: float64(snapshot.RPCDeliveryHookWorkers)}, + {Name: "telesrv_mtproto_rpc_delivery_hook_capacity", Value: float64(snapshot.RPCDeliveryHookCapacity)}, + {Name: "telesrv_mtproto_rpc_delivery_hook_reserved", Value: float64(snapshot.RPCDeliveryHookReserved)}, + {Name: "telesrv_mtproto_rpc_delivery_hook_queued", Value: float64(snapshot.RPCDeliveryHookQueued)}, + {Name: "telesrv_mtproto_rpc_delivery_hook_running", Value: float64(snapshot.RPCDeliveryHookRunning)}, + {Name: "telesrv_mtproto_rpc_delivery_hook_completed_total", Value: float64(snapshot.RPCDeliveryHookCompleted)}, + {Name: "telesrv_mtproto_rpc_delivery_hook_rejected_total", Value: float64(snapshot.RPCDeliveryHookRejected)}, + {Name: "telesrv_mtproto_rpc_delivery_hook_panics_total", Value: float64(snapshot.RPCDeliveryHookPanics)}, + {Name: "telesrv_mtproto_rpc_delivery_hook_duration_seconds_total", Value: snapshot.RPCDeliveryHookDurationSeconds}, {Name: "telesrv_mtproto_inbound_frame_bytes", Value: float64(snapshot.InboundFrameBytes)}, {Name: "telesrv_mtproto_inbound_frame_byte_limit", Value: float64(snapshot.InboundFrameMaxBytes)}, {Name: "telesrv_mtproto_outbound_tracked_bytes", Labels: []obsmetrics.Label{{Name: "kind", Value: "body"}}, Value: float64(snapshot.OutboundTrackedBytes)}, @@ -445,15 +480,20 @@ type rpcProjectionVerificationNotifier struct { invalidator interface { InvalidateRPCProjectionReadModelForUser(userID int64) InvalidateRPCProjectionReadModelForChannel(channelID int64) + InvalidatePeerIdentityReadModel(domain.Peer) } - users storepkg.UserCache - log *zap.Logger + users storepkg.UserCache + peerIdentity bool + log *zap.Logger } func (n rpcProjectionVerificationNotifier) NotifyPeerVerified(ctx context.Context, peer domain.Peer) error { if n.invalidator == nil { return nil } + if n.peerIdentity { + n.invalidator.InvalidatePeerIdentityReadModel(peer) + } switch peer.Type { case domain.PeerTypeUser: n.invalidator.InvalidateRPCProjectionReadModelForUser(peer.ID) @@ -570,6 +610,15 @@ func run(logger *zap.Logger) error { zap.Bool("schema_dirty", migrationStatus.Dirty), zap.Bool("schema_empty", migrationStatus.Empty), ) + blobRuntimeLock, err := postgres.AcquireBlobRuntimeLock(ctx, cfg.PostgresDSN) + if err != nil { + return fmt.Errorf("acquire blob runtime lock: %w", err) + } + defer func() { + if err := blobRuntimeLock.Close(); err != nil { + logger.Error("release blob runtime lock", zap.Error(err)) + } + }() pool, err := postgres.Open(ctx, cfg.PostgresDSN, postgres.WithMaxConns(cfg.PostgresMaxConns), postgres.WithMinConns(cfg.PostgresMinConns), @@ -649,7 +698,8 @@ func run(logger *zap.Logger) error { if cfg.TelegramLoginEnabled { telegramLoginHTTPHandler, err = telegramloginhttp.NewHandler(telegramloginhttp.Config{ Service: telegramLoginService, Tokens: telegramLoginIDTokens, - Limiter: redisstore.NewRateLimiter(rdb), AppName: cfg.PublicAppName, + BotUsernames: postgres.NewUserStore(pool), + Limiter: redisstore.NewRateLimiter(rdb), AppName: cfg.PublicAppName, Logger: logger.Named("telegram-login-http"), TrustedProxyCIDRs: cfg.TelegramLoginTrustedProxyCIDRs, AllowHTTP: cfg.TelegramLoginAllowHTTP, }) @@ -662,51 +712,157 @@ func run(logger *zap.Logger) error { } authKeyStore := postgres.NewAuthKeyStore(pool) + authKeyGetBatchStore, err := postgres.NewBatchedAuthKeyStore( + authKeyStore, + postgres.AuthKeyGetBatchConfig{ + MaxSize: cfg.AuthKeyGetBatchMax, MaxWait: cfg.AuthKeyGetBatchWait, + QueueSize: cfg.AuthKeyGetBatchQueue, QueryTimeout: cfg.AuthKeyGetBatchTimeout, + }, + ) + if err != nil { + return err + } + defer authKeyGetBatchStore.Close() + authKeySessionLayerStore, err := postgres.NewBatchedAuthKeySessionLayerStore( + authKeyStore, + postgres.AuthKeySessionLayerBatchConfig{ + MaxSize: cfg.LayerAdvanceBatchMax, MaxWait: cfg.LayerAdvanceBatchWait, + QueueSize: cfg.LayerAdvanceBatchQueue, QueryTimeout: cfg.LayerAdvanceBatchTimeout, + }, + ) + if err != nil { + return err + } + defer authKeySessionLayerStore.Close() userStore := postgres.NewUserStore(pool) authzStore := postgres.NewAuthorizationStore(pool) adminStore := postgres.NewAdminStore(pool) updateStateStore := postgres.NewUpdateStateStore(pool) updateEventStore := postgres.NewUpdateEventStore(pool, postgres.WithUpdateEventLogger(logger.Named("store").Named("updates"))) phoneChangeStore := postgres.NewPhoneChangeStore(pool) - readModelVersionStore := storepkg.NewCachedReadModelVersionStore(postgres.NewReadModelVersionStore(pool), 0, 0) + readModelVersionBatchStore, err := storepkg.NewBatchedReadModelVersionStore( + postgres.NewReadModelVersionStore(pool), + storepkg.ReadModelVersionBatchConfig{ + MaxKeys: cfg.ReadModelVersionBatchMaxKeys, MaxWait: cfg.ReadModelVersionBatchWait, + QueueSize: cfg.ReadModelVersionBatchQueue, QueryTimeout: cfg.ReadModelVersionBatchTimeout, + }, + ) + if err != nil { + return err + } + defer readModelVersionBatchStore.Close() + readModelVersionStore := storepkg.NewCachedReadModelVersionStore( + readModelVersionBatchStore, + 0, + cfg.ReadModelVersionCacheMaxEntries, + ) + dialogListSnapshotCache := redisstore.NewDialogListSnapshotCache(rdb, cfg.DialogListSnapshotRedisTTL) + activeChannelIDsPageCache := redisstore.NewActiveChannelIDsPageCache(rdb, cfg.ActiveChannelIDsRedisTTL) dispatchOutboxStore := postgres.NewDispatchOutboxStore(pool, postgres.WithLeaseTimeout(cfg.OutboxLeaseTimeout)) - bootstrapUpdateStore := postgres.NewBootstrapUpdateJobStore(pool) + bootstrapUpdateStore, err := postgres.NewBatchedBootstrapUpdateJobStore( + postgres.NewBootstrapUpdateJobStore(pool), + postgres.BootstrapReadyBatchConfig{ + MaxSize: cfg.BootstrapReadyBatchMax, MaxWait: cfg.BootstrapReadyBatchWait, + QueueSize: cfg.BootstrapReadyBatchQueue, QueryTimeout: cfg.BootstrapReadyBatchTimeout, + Metrics: metricRegistry, + }, + ) + if err != nil { + return err + } + defer bootstrapUpdateStore.Close() botAPIUpdateStore := postgres.NewBotAPIUpdateStore(pool) botCallbackStore := redisstore.NewBotCallbackRegistryStore(rdb) ephemeralStore := redisstore.NewEphemeralMessageStore(rdb) ephemeralReportStore := postgres.NewEphemeralReportStore(pool) + welcomeMessageStore := postgres.NewWelcomeMessageStore(pool) moderationReportStore := postgres.NewModerationReportStore(pool) authDeliveryReportStore := postgres.NewAuthDeliveryReportStore(pool) clientTelemetryStore := postgres.NewClientTelemetryStore(pool) boxIDAllocator := redisstore.NewBoxIDAllocator(rdb, postgres.NewMessageBoxCounterSource(pool)) channelIDAllocator := redisstore.NewChannelIDAllocator(rdb, postgres.NewChannelIDCounterSource(pool)) channelMessageIDAllocator := redisstore.NewChannelMessageIDAllocator(rdb, postgres.NewChannelMessageIDCounterSource(pool)) - secretChatIDAllocator := redisstore.NewSecretChatIDAllocator(rdb, postgres.NewSecretChatIDCounterSource(pool)) - contactStore := userprojection.NewCachedContactStore(postgres.NewContactStore(pool), 0) + reverseContactStore, err := storepkg.NewBatchedReverseContactStore( + postgres.NewContactStore(pool), + storepkg.ReverseContactBatchConfig{ + MaxPairs: cfg.ContactReverseBatchMaxPairs, MaxWait: cfg.ContactReverseBatchWait, + QueueSize: cfg.ContactReverseBatchQueue, QueryTimeout: cfg.ContactReverseBatchTimeout, + }, + ) + if err != nil { + return err + } + defer reverseContactStore.Close() + contactStore := userprojection.NewCachedContactStoreWithMaxViewers( + reverseContactStore, + 0, + cfg.ContactSnapshotCacheMaxViewers, + ) dialogStore := postgres.NewDialogStore(pool) chatlistStore := postgres.NewChatlistStore(pool) messageStore := postgres.NewMessageStore(pool, postgres.WithMessageAllocators(boxIDAllocator), postgres.WithMessageLogger(logger.Named("store").Named("messages"))) + broadcastStore := postgres.NewBroadcastStore(pool) + broadcastService := broadcastapp.NewService(broadcastStore, + broadcastapp.WithMessageSender(messageStore), + broadcastapp.WithLogger(logger.Named("broadcast"))) // 共享频道行/成员缓存 + 统一 read-model LISTEN/NOTIFY 实时失效：消除高频「逐 RPC // 解析频道/成员」在客户端重连同步突发里重复读同一行的放大。 channelRowCache := postgres.NewChannelRowCache(cfg.ChannelRowCacheMaxEntries) + channelTopMessageCache := postgres.NewChannelTopMessageCache(cfg.ChannelTopMessageCacheMaxEntries) channelMemberCache := postgres.NewChannelMemberCache(cfg.ChannelMemberCacheMaxEntries) channelDialogCache := postgres.NewChannelDialogCache(cfg.ChannelDialogCacheMaxEntries) + channelDifferenceCache := postgres.NewChannelDifferenceBaseCache( + cfg.ChannelDifferenceCacheMaxEntries, + cfg.ChannelDifferenceCacheMaxBytes, + cfg.ChannelDifferenceCacheTTL, + ) channelBoostCache := postgres.NewChannelBoostCache(cfg.ChannelBoostCacheMaxEntries, cfg.ChannelBoostCacheTTL) channelStore := postgres.NewChannelStore(pool, postgres.WithChannelAllocators(channelIDAllocator, channelMessageIDAllocator), postgres.WithChannelLogger(logger.Named("store").Named("channels")), postgres.WithChannelRowCache(channelRowCache), + postgres.WithChannelTopMessageCache(channelTopMessageCache), postgres.WithChannelMemberCache(channelMemberCache), postgres.WithChannelDialogCache(channelDialogCache), + postgres.WithChannelDifferenceBaseCache(channelDifferenceCache), postgres.WithChannelBoostCache(channelBoostCache)) - communityStore := postgres.NewCommunityStore(pool, channelIDAllocator, channelMessageIDAllocator) + activeChannelIDsPageBatcher, err := postgres.NewActiveChannelIDsPageBatcher( + channelStore, + postgres.ActiveChannelIDsBatchConfig{ + MaxSize: cfg.ActiveChannelIDsBatchMax, MaxWait: cfg.ActiveChannelIDsBatchWait, + QueueSize: cfg.ActiveChannelIDsBatchQueue, QueryTimeout: cfg.ActiveChannelIDsBatchTimeout, + Metrics: metricRegistry, + }, + ) + if err != nil { + return err + } + defer activeChannelIDsPageBatcher.Close() + metricRegistry.AddGaugeProvider(func() []obsmetrics.GaugeSample { + snapshot := channelDifferenceCache.Snapshot() + return []obsmetrics.GaugeSample{ + {Name: "telesrv_channel_difference_cache_entries", Value: float64(snapshot.Entries)}, + {Name: "telesrv_channel_difference_cache_weight_bytes", Value: float64(snapshot.Weight)}, + {Name: "telesrv_channel_difference_cache_hits", Value: float64(snapshot.Hits)}, + {Name: "telesrv_channel_difference_cache_misses", Value: float64(snapshot.Misses)}, + {Name: "telesrv_channel_difference_cache_loads", Value: float64(snapshot.Loads)}, + {Name: "telesrv_channel_difference_cache_load_errors", Value: float64(snapshot.LoadErrors)}, + } + }) + communityCatalogCache := postgres.NewCommunityCatalogCache() + communityStore := postgres.NewCommunityStore(pool, channelIDAllocator, channelMessageIDAllocator, + postgres.WithCommunityCatalogCache(communityCatalogCache)) pollStore := postgres.NewPollStore(pool) mediaStore := postgres.NewMediaStore(pool) - // 头像投影缓存：所有 projector 共用一层短 TTL owner→头像缓存，消除高频「返回用户」RPC - // 每次投影对每批 owner 固定 2 次的 CurrentProfilePhotosKind PG 查询。 - cachedPhotos := userprojection.NewCachedPhotoProvider(mediaStore, userprojection.DefaultPhotoCacheTTL) + // 头像投影缓存：所有 projector 共用 owner→头像正/负 LRU。profile_photo NOTIFY + // 精确失效负责正常新鲜度，长 TTL 只覆盖漏通知，避免登录 ramp 周期性重查稳定负值。 + cachedPhotos := userprojection.NewCachedPhotoProviderWithMaxEntries( + mediaStore, + cfg.ProfilePhotoCacheTTL, + cfg.ProfilePhotoCacheMaxEntries, + ) privacyStore := privacyapp.NewCachedPrivacyStore(postgres.NewPrivacyStore(pool), 0) storyStore := postgres.NewStoryStore(pool) // Transient upload-part scratch storage always stays on local disk @@ -902,6 +1058,11 @@ func run(logger *zap.Logger) error { Commands: adminStore, Restrictions: adminStore, }) + userProjectionFacts := userprojection.NewDurableUserProjectionFacts( + adminService, + readModelVersionStore, + cfg.UserProjectionFactCacheMaxEntries, + ) storageRetentionMaxAge := cfg.StorageRetentionMaxAge if !cfg.StorageRetentionEnable { storageRetentionMaxAge = 0 @@ -932,7 +1093,7 @@ func run(logger *zap.Logger) error { contactsService := contacts.NewService(contactStore, userStore).Configure( contacts.WithPhotoProvider(cachedPhotos), contacts.WithPrivacyEvaluator(privacyService), - contacts.WithAccountFreezeProvider(adminService), + contacts.WithAccountFreezeProvider(userProjectionFacts), contacts.WithReadModelVersions(readModelVersionStore), contacts.WithHideThirdPartyVerification(cfg.HideThirdPartyVerification), ) @@ -1036,6 +1197,33 @@ func run(logger *zap.Logger) error { botsapp.WithDialogRateLimiter(rateLimiter, cfg.VerificationBotRateLimit, cfg.VerificationBotRateWindow), botsapp.WithPublicBaseURL(cfg.PublicBaseURL), botsapp.WithHideThirdPartyVerification(cfg.HideThirdPartyVerification)) + // The built-in ChatBot and StickersBot are seeded with the default product + // name in their bio (users.about) and description (bots.description). Align + // them with the active branding on startup so the seeded "telesrv" text is + // replaced. SetBotInfo writes both fields; the sync is a no-op when the text + // already matches. + for _, botID := range []int64{domain.ChatBotUserID, domain.StickersBotUserID} { + var wantAbout, wantDesc string + switch botID { + case domain.ChatBotUserID: + wantAbout = domain.ChatBotDescription() + wantDesc = wantAbout + case domain.StickersBotUserID: + wantAbout = domain.StickersBotDescription() + wantDesc = wantAbout + } + if _, curAbout, curDesc, err := botsService.GetBotInfo(ctx, botID); err == nil && curAbout == wantAbout && curDesc == wantDesc { + continue + } + if _, err := botsService.SetBotInfo(ctx, botID, domain.BotInfoUpdate{ + SetAbout: true, + About: wantAbout, + SetDescription: true, + Description: wantDesc, + }); err != nil { + logger.Warn("sync bot branding", zap.Int64("bot", botID), zap.Error(err)) + } + } groupCallStore := postgres.NewGroupCallStore(pool) groupCallsService := groupcallsapp.NewService(groupCallStore, groupcallsapp.WithPublicBaseURL(cfg.PublicBaseURL)) // 群通话媒体面：内嵌 pion SFU（M1+）。SFU 的 liveness reporter 把媒体面存活 @@ -1120,7 +1308,7 @@ func run(logger *zap.Logger) error { // 私聊端对端加密（Secret Chat）握手状态机 + qts 投递队列（盲中继）。 secretChatStore := postgres.NewSecretChatStore(pool) encryptedQueueStore := postgres.NewEncryptedQueueStore(pool) - secretChatService := secretchatapp.NewService(secretChatStore, encryptedQueueStore, secretChatIDAllocator) + secretChatService := secretchatapp.NewService(secretChatStore, encryptedQueueStore) // Passkey:凭据持久化走 postgres;一次性挑战走进程内内存(短 TTL,与 QR 登录 token // 同属进程内一次性凭据,不跨实例)。 passkeyStore := postgres.NewPasskeyStore(pool) @@ -1129,7 +1317,7 @@ func run(logger *zap.Logger) error { passkeyapp.WithAllowedOrigins(cfg.PasskeyAllowedOrigins)) // 自定义云主题(Create a New Theme):主题目录与每用户已安装列表均持久化到 postgres。 themeService := themesapp.NewService(postgres.NewThemeStore(pool)) - usersService := users.NewService(userStore, users.WithBaseUserCache(userCache), users.WithContactStore(contactStore), users.WithPhotoProvider(cachedPhotos), users.WithPrivacyEvaluator(privacyService), users.WithAccountFreezeProvider(adminService), users.WithHideThirdPartyVerification(cfg.HideThirdPartyVerification), users.WithReservedUsernames(cfg.ReservedUsernames)) + usersService := users.NewService(userStore, users.WithBaseUserCache(userCache), users.WithContactStore(contactStore), users.WithPhotoProvider(cachedPhotos), users.WithPrivacyEvaluator(privacyService), users.WithAccountFreezeProvider(userProjectionFacts), users.WithHideThirdPartyVerification(cfg.HideThirdPartyVerification), users.WithReservedUsernames(cfg.ReservedUsernames)) privacyService.ConfigureReadModels(usersService, channelStore) aiComposeService := aiapp.NewService(aiComposeStore, newAIComposeOptions(cfg, rateLimiter, usersService.PremiumActive, logger)...) botsService.SetAIChatGenerator(aiComposeService) @@ -1137,9 +1325,21 @@ func run(logger *zap.Logger) error { dialogs.WithContactStore(contactStore), dialogs.WithPhotoProvider(cachedPhotos), dialogs.WithPrivacyEvaluator(privacyService), - dialogs.WithAccountFreezeProvider(adminService), + dialogs.WithAccountFreezeProvider(userProjectionFacts), dialogs.WithPremiumChecker(usersService.PremiumActive), dialogs.WithReadModelVersions(readModelVersionStore), + dialogs.WithDialogHydrationCaches( + cfg.DialogPrivatePeerCacheMaxEntries, + cfg.DialogPrivatePeerCacheMaxBytes, + cfg.DialogDraftCacheMaxEntries, + cfg.DialogDraftCacheMaxBytes, + ), + dialogs.WithDialogListSnapshotCache( + cfg.DialogListSnapshotCacheMaxEntries, + cfg.DialogListSnapshotCacheMaxHeaders, + cfg.DialogListSnapshotCacheTTL, + ), + dialogs.WithSharedDialogListSnapshotCache(dialogListSnapshotCache), ) // 编译期保证 *users.Service 满足 channel fan-out 跨 viewer 投影预热的可选能力；签名漂移会在 // 这里立刻断编译，而非在运行时静默退化回 O(viewer) 逐 viewer 投影。 @@ -1147,11 +1347,19 @@ func run(logger *zap.Logger) error { channelsService := channelapp.NewService(channelStore, channelapp.WithBotProfileResolver(botsService), channelapp.WithReadModelVersions(readModelVersionStore), + channelapp.WithActiveChannelIDsReadModel( + activeChannelIDsPageCache, + activeChannelIDsPageBatcher, + cfg.ActiveChannelIDsCacheMaxEntries, + cfg.ActiveChannelIDsCacheTTL, + metricRegistry, + ), channelapp.WithSendPermissionChecker(adminService), channelapp.WithReservedUsernames(cfg.ReservedUsernames), ) communitiesService := communitiesapp.NewService(communityStore) ephemeralService := ephemeralapp.NewService(ephemeralStore, channelsService, usersService, botsService) + welcomeMessageService := welcomemessagesapp.NewService(welcomeMessageStore, channelsService) storiesService := storiesapp.NewService(storyStore, storiesapp.WithChannelStoryAccess(channelsService)) chatlistsService := chatlistsapp.NewService( chatlistStore, @@ -1164,7 +1372,7 @@ func run(logger *zap.Logger) error { messageapp.WithContactStore(contactStore), messageapp.WithPhotoProvider(cachedPhotos), messageapp.WithPrivacyEvaluator(privacyService), - messageapp.WithAccountFreezeProvider(adminService), + messageapp.WithAccountFreezeProvider(userProjectionFacts), messageapp.WithReadModelVersions(readModelVersionStore), messageapp.WithBotResponder(botsService), messageapp.WithSendPermissionChecker(adminService), @@ -1191,7 +1399,7 @@ func run(logger *zap.Logger) error { dialogStore, newTranslationOptions(cfg, rateLimiter, logger)..., ) - authService := auth.NewService(userStore, authzStore, codeStore, authKeyStore, tempAuthKeyStore, cfg.DevAuthCode, + authService := auth.NewService(userStore, authzStore, codeStore, authKeyGetBatchStore, tempAuthKeyStore, cfg.DevAuthCode, auth.WithLoginMessages(messageStore, dialogStore), auth.WithLoginCodeDelivery(messageStore), auth.WithPasswords(passwordStore), @@ -1285,6 +1493,14 @@ func run(logger *zap.Logger) error { logger.Info("default verifier seed complete", zap.Int64("bot_id", domain.VerifierBotUserID)) } updatesService := updates.NewService(updateStateStore, updateEventStore, updates.WithLogger(logger.Named("app").Named("updates"))) + var appUpdateResolver updatecdn.Resolver + if cfg.UpdateServiceURL != "" { + client, err := updatecdn.NewClient(cfg.UpdateServiceURL, cfg.UpdateRequestTimeout) + if err != nil { + return fmt.Errorf("initialize update service client: %w", err) + } + appUpdateResolver = client + } router := rpc.New(rpc.Config{ DC: cfg.DC, DefaultCountryCode: cfg.DefaultCountryCode, @@ -1304,17 +1520,29 @@ func run(logger *zap.Logger) error { GroupCallMaxParticipants: cfg.GroupCallMaxParticipants, RtmpIngestURL: cfg.LiveStreamRtmpURL, PublicBaseURL: cfg.PublicBaseURL, + UpdatePublicURL: cfg.UpdatePublicURL, PublicAppScheme: cfg.PublicAppScheme, PublicAppLinkBase: cfg.PublicAppLinkBase, // PFS temp→perm 解析缓存：显式撤销会清缓存并断开连接，re-bind 即时失效； // 配置 TTL 只承担跨进程/异常失效兜底，避免大连接数周期性打满 PG。 - TempKeyResolveCacheTTL: cfg.TempKeyResolveCacheTTL, - TempKeyResolveCacheMaxEntries: cfg.TempKeyResolveCacheMaxEntries, + TempKeyResolveCacheTTL: cfg.TempKeyResolveCacheTTL, + TempKeyResolveCacheMaxEntries: cfg.TempKeyResolveCacheMaxEntries, + PeerIdentityCacheMaxEntries: cfg.PeerIdentityCacheMaxEntries, + StoryActivePeerCacheMaxEntries: cfg.StoryActivePeerCacheMaxEntries, + StoryHiddenListCacheMaxEntries: cfg.StoryHiddenListCacheMaxEntries, + StoryHiddenListCacheMaxBytes: cfg.StoryHiddenListCacheMaxBytes, + PresenceLastSeenBatchMax: cfg.PresenceLastSeenBatchMax, + PresenceLastSeenBatchWait: cfg.PresenceLastSeenBatchWait, + PresenceLastSeenBatchQueue: cfg.PresenceLastSeenBatchQueue, + PresenceLastSeenBatchTimeout: cfg.PresenceLastSeenBatchTimeout, + PresenceLastSeenDrainTimeout: cfg.PresenceLastSeenDrainTimeout, }, rpc.Deps{ Auth: authService, AuthDeliveryReports: authDeliveryReportService, ClientTelemetry: clientTelemetryService, - AuthKeySessionLayers: authKeyStore, + AuthKeySessionLayers: authKeySessionLayerStore, + ReadModelVersions: readModelVersionStore, + UserProjectionFacts: userProjectionFacts, Account: accountService, Privacy: privacyService, Help: help.NewService(helpStore, helpStore, @@ -1323,73 +1551,77 @@ func run(logger *zap.Logger) error { help.WithEmailSignupPhonePrefixes(cfg.EmailSignupPhonePrefixes), help.WithAccountFreezeProvider(adminService), ), - AccountFreeze: adminService, - AICompose: aiComposeService, - Ephemeral: ephemeralService, - EphemeralPush: ephemeralStore, - Moderation: moderationService, - Users: usersService, - Usernames: usernamesService, - BotVerifications: botVerificationService, - TelegramLogin: telegramLoginRPCDependency(telegramLoginService), - Updates: updatesService, - BootstrapUpdates: bootstrapUpdateStore, - BotAPIUpdates: botAPIUpdateStore, - BotCallbacks: botCallbackStore, - Contacts: contactsService, - Dialogs: dialogsService, - Chatlists: chatlistsService, - Messages: messagesService, - Translation: translationService, - Channels: channelsService, - Communities: communitiesService, - Files: filesService, - PremiumPromo: filesService, - Bots: botsService, - ServiceBotCallbacks: botsService, - ServiceBotInlineResults: botsService, - Polls: pollsapp.NewService(pollStore), - Stories: storiesService, - Phone: phoneService, - SecretChats: secretChatService, - Passkey: passkeyService, - Themes: themeService, - GroupCalls: groupCallsService, - LiveStreams: liveStreamDep(liveStreamService), - SFU: sfuService, - TURN: turnService, - LangPack: langPackService, - Sessions: activeSessions, - Metrics: metricRegistry, - Inline: inlineRegistryStore, - Limiter: rateLimiter, + AppUpdates: appUpdateResolver, + AccountFreeze: userProjectionFacts, + AccountFreezeNotifications: adminService, + AICompose: aiComposeService, + Ephemeral: ephemeralService, + EphemeralPush: ephemeralStore, + WelcomeMessages: welcomeMessageService, + Moderation: moderationService, + Users: usersService, + Usernames: usernamesService, + BotVerifications: botVerificationService, + TelegramLogin: telegramLoginRPCDependency(telegramLoginService), + Updates: updatesService, + BootstrapUpdates: bootstrapUpdateStore, + BotAPIUpdates: botAPIUpdateStore, + BotCallbacks: botCallbackStore, + Contacts: contactsService, + Dialogs: dialogsService, + Chatlists: chatlistsService, + Messages: messagesService, + Translation: translationService, + Channels: channelsService, + Communities: communitiesService, + Files: filesService, + PremiumPromo: filesService, + Bots: botsService, + ServiceBotCallbacks: botsService, + ServiceBotInlineResults: botsService, + Polls: pollsapp.NewService(pollStore), + Stories: storiesService, + Phone: phoneService, + SecretChats: secretChatService, + Passkey: passkeyService, + Themes: themeService, + GroupCalls: groupCallsService, + LiveStreams: liveStreamDep(liveStreamService), + SFU: sfuService, + TURN: turnService, + LangPack: langPackService, + Sessions: activeSessions, + Metrics: metricRegistry, + Inline: inlineRegistryStore, + Limiter: rateLimiter, }, logger.Named("rpc"), clock.System) readModelListener := postgres.NewReadModelChangeListener(cfg.PostgresDSN, postgres.ReadModelCacheSet{ - ReadModelVersions: readModelVersionStore, - ChannelRows: channelRowCache, - ChannelMembers: channelMemberCache, - ChannelDialogs: channelDialogCache, - ChannelBoosts: channelBoostCache, - Contacts: postgres.ContactReadModelCaches{contactStore, contactsService}, - Dialogs: dialogsService, - Privacy: privacyService, - ProfilePhotos: cachedPhotos, - Stories: router, - ChannelFullBots: router, - ChannelBotMembers: channelsService, - ChannelMediaCounts: channelsService, - PrivateMediaCounts: messagesService, - RPCProjections: router, - BaseUsers: userCache, - BotProfiles: botsService, - AccountSettings: router, + ReadModelVersions: readModelVersionStore, + ChannelRows: channelRowCache, + ChannelTopMessages: channelTopMessageCache, + CommunityCatalog: communityCatalogCache, + ChannelMembers: channelMemberCache, + ChannelDialogs: channelDialogCache, + ChannelDifferences: channelDifferenceCache, + ChannelBoosts: channelBoostCache, + Contacts: postgres.ContactReadModelCaches{contactStore, contactsService}, + Dialogs: dialogsService, + Privacy: privacyService, + ProfilePhotos: cachedPhotos, + Stories: router, + ChannelFullBots: router, + ChannelBotMembers: channelsService, + ChannelMediaCounts: channelsService, + PrivateMediaCounts: messagesService, + RPCProjections: router, + PeerIdentities: router, + BaseUsers: userCache, + BotProfiles: botsService, + AccountSettings: router, + UserProjectionFacts: userProjectionFacts, }, logger.Named("store").Named("read-model-listener")) go readModelListener.Run(ctx) activeSessions.SetLifecycleObserver(router) - broadcastStore := postgres.NewBroadcastStore(pool) - broadcastService := broadcastapp.NewService(broadcastStore, - broadcastapp.WithMessageSender(messageStore), - broadcastapp.WithLogger(logger.Named("broadcast"))) adminService.Configure(adminapp.Dependencies{ Auth: authService, Revoker: router, @@ -1453,9 +1685,10 @@ func run(logger *zap.Logger) error { if notifier, ok := any(router).(botverificationapp.PeerNotifier); ok { botVerificationService.SetPeerNotifier(compositeBotVerificationNotifier{ cache: rpcProjectionVerificationNotifier{ - invalidator: router, - users: userCache, - log: verificationLogger, + invalidator: router, + users: userCache, + peerIdentity: true, + log: verificationLogger, }, edge: notifier, }) @@ -1474,7 +1707,9 @@ func run(logger *zap.Logger) error { // not wait on however long sending to all of them takes. go broadcastapp.NewWorker(broadcastService, logger.Named("broadcast").Named("delivery"), cfg.BroadcastWorkerInterval, cfg.BroadcastWorkerBatch).Run(ctx) - moderationActionOptions := []moderationapp.ActionExecutorOption{} + moderationActionOptions := []moderationapp.ActionExecutorOption{ + moderationapp.WithAccountDeletionNotifier(router), + } if cfg.PublicLinkWebAddr != "" { moderationActionOptions = append( moderationActionOptions, @@ -1503,6 +1738,7 @@ func run(logger *zap.Logger) error { rpc.WithOutboxUpdateBuilder(router.BuildOutboxUpdates), ).Run(ctx) go rpc.NewBootstrapUpdateDispatcher(router, logger.Named("rpc").Named("bootstrap")).Run(ctx) + go rpc.NewWelcomeDeliveryDispatcher(router, welcomeMessageStore, logger.Named("rpc").Named("welcome-delivery")).Run(ctx) go rpc.NewScheduledDispatcher(router, logger.Named("rpc").Named("scheduled")).Run(ctx) go rpc.NewSuggestedPostDispatcher(router, logger.Named("rpc").Named("suggested-post")).Run(ctx) go rpc.NewExpiryDispatcher(router, logger.Named("rpc").Named("expiry")).Run(ctx) @@ -1510,6 +1746,7 @@ func run(logger *zap.Logger) error { go rpc.NewGroupCallSweepDispatcher(router, logger.Named("rpc").Named("groupcall-sweep"), cfg.GroupCallSweepInterval, cfg.GroupCallCheckTTL).Run(ctx) go router.RunChannelFanout(ctx) go router.RunBotAPIEnqueue(ctx) + go router.RunPresenceLastSeenBatch(ctx) go router.RunPresenceSweeper(ctx, time.Minute) go activeSessions.RunPendingSweeper(ctx, time.Minute) go router.RunPremiumSweeper(ctx, cfg.PremiumSweepInterval, cfg.PremiumSweepBatch) @@ -1567,7 +1804,7 @@ func run(logger *zap.Logger) error { RSAKey: rsaKey, IdentityDir: cfg.IdentityDir, LayerRPC: router, - AuthKeys: authKeyStore, + AuthKeys: authKeyGetBatchStore, ActiveSessions: activeSessions, Metrics: metricRegistry, ObfuscatedTCP: true, @@ -1582,6 +1819,8 @@ func run(logger *zap.Logger) error { RPCGlobalWorkers: cfg.MTProtoRPCGlobalWorkers, RPCGlobalMaxTasks: cfg.MTProtoRPCGlobalMaxTasks, RPCGlobalMaxBytes: cfg.MTProtoRPCGlobalMaxBytes, + RPCDeliveryHookWorkers: cfg.MTProtoRPCDeliveryHookWorkers, + RPCDeliveryHookMaxPending: cfg.MTProtoRPCDeliveryHookMaxPending, RPCExecutionMaxEntries: cfg.MTProtoRPCExecutionMaxEntries, RPCExecutionAuthMaxEntries: cfg.MTProtoRPCExecutionAuthMaxEntries, RPCExecutionSessionMaxEntries: cfg.MTProtoRPCExecutionSessionMaxEntries, diff --git a/cmd/telesrv/process_cpu_fallback.go b/cmd/telesrv/process_cpu_fallback.go new file mode 100644 index 00000000..a8a833aa --- /dev/null +++ b/cmd/telesrv/process_cpu_fallback.go @@ -0,0 +1,7 @@ +//go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !solaris && !windows + +package main + +func processCPUSeconds() (float64, bool) { + return 0, false +} diff --git a/cmd/telesrv/process_cpu_test.go b/cmd/telesrv/process_cpu_test.go new file mode 100644 index 00000000..95920be8 --- /dev/null +++ b/cmd/telesrv/process_cpu_test.go @@ -0,0 +1,12 @@ +//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || windows + +package main + +import "testing" + +func TestProcessCPUSecondsAvailable(t *testing.T) { + seconds, ok := processCPUSeconds() + if !ok || seconds < 0 { + t.Fatalf("process CPU seconds = %v, available=%v", seconds, ok) + } +} diff --git a/cmd/telesrv/process_cpu_unix.go b/cmd/telesrv/process_cpu_unix.go new file mode 100644 index 00000000..60d5b15e --- /dev/null +++ b/cmd/telesrv/process_cpu_unix.go @@ -0,0 +1,17 @@ +//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris + +package main + +import "golang.org/x/sys/unix" + +func processCPUSeconds() (float64, bool) { + var usage unix.Rusage + if err := unix.Getrusage(unix.RUSAGE_SELF, &usage); err != nil { + return 0, false + } + ns := unix.TimevalToNsec(usage.Utime) + unix.TimevalToNsec(usage.Stime) + if ns < 0 { + return 0, false + } + return float64(ns) / 1e9, true +} diff --git a/cmd/telesrv/process_cpu_windows.go b/cmd/telesrv/process_cpu_windows.go new file mode 100644 index 00000000..265b89d2 --- /dev/null +++ b/cmd/telesrv/process_cpu_windows.go @@ -0,0 +1,21 @@ +//go:build windows + +package main + +import "golang.org/x/sys/windows" + +func processCPUSeconds() (float64, bool) { + handle, err := windows.GetCurrentProcess() + if err != nil { + return 0, false + } + var creation, exit, kernel, user windows.Filetime + if err := windows.GetProcessTimes(handle, &creation, &exit, &kernel, &user); err != nil { + return 0, false + } + ns := kernel.Nanoseconds() + user.Nanoseconds() + if ns < 0 { + return 0, false + } + return float64(ns) / 1e9, true +} diff --git a/deploy/docker/.env.example b/deploy/docker/.env.example new file mode 100644 index 00000000..3ab8d330 --- /dev/null +++ b/deploy/docker/.env.example @@ -0,0 +1,100 @@ +# Generated automatically by scripts/new-docker-env.*. Keep the resulting .env +# private and never commit it. + +COMPOSE_PROJECT_NAME=gramsrv-main +TELESRV_DEPLOYMENT_PROFILE=main-monolith-v1 +TELESRV_IMAGE_PREFIX=ghcr.io/iamxvbaba/gramsrv +TELESRV_IMAGE_TAG=main +TELESRV_SERVER_BUILD_TARGET=server-test +TELESRV_LOG_LEVEL=info + +# Build provenance for local builds. +TELESRV_BUILD_COMMIT=unknown +TELESRV_BUILD_BRANCH=main +TELESRV_BUILD_TREE_STATE=unknown +TELESRV_BUILD_DATE=unknown + +# The host-network server and admin reach these dependencies through loopback. +POSTGRES_DB=telesrv_main +POSTGRES_USER=telesrv +POSTGRES_PASSWORD=CHANGEME +TELESRV_POSTGRES_HOST_PORT=15432 +TELESRV_POSTGRES_DSN=postgres://telesrv:CHANGEME@127.0.0.1:15432/telesrv_main?sslmode=disable +TELESRV_REDIS_HOST_PORT=16379 +TELESRV_REDIS_ADDR=127.0.0.1:16379 +TELESRV_REDIS_PASSWORD=CHANGEME + +# Independent random values generated for each deployment. +TELESRV_ADMIN_API_TOKEN=CHANGEME +TELESRV_ADMIN_UI_PASSWORD=CHANGEME +TELESRV_ADMIN_UI_TOKEN= +TELESRV_ADMIN_SESSION_KEY=CHANGEME +TELESRV_TURN_SECRET=CHANGEME +TELESRV_OTP_WEBHOOK_SECRET=CHANGEME + +# Development delivery is accepted automatically on loopback. Internet-facing +# deployments must explicitly opt in or replace it with the webhook provider. +TELESRV_DEV_AUTH_CODE=12345 +TELESRV_PHONE_CODE_DELIVERY_PROVIDER=development +TELESRV_ALLOW_INSECURE_DEVELOPMENT_AUTH=false +TELESRV_OTP_WEBHOOK_URL= +TELESRV_OTP_WEBHOOK_TIMEOUT=5s + +# The published main test image deliberately contains a public test RSA key so +# fresh test clients share one fingerprint. Existing server_state is preserved. +# Build target "server" plus mode "generated" for a private deployment identity. +TELESRV_RSA_IDENTITY_MODE=test + +# Must be a client-reachable IP address, never a DNS name. +TELESRV_ADVERTISE_IP=CHANGEME +TELESRV_SERVER_PORT=2398 +TELESRV_DEFAULT_COUNTRY_CODE=CN +TELESRV_PUBLIC_BASE_URL=CHANGEME +TELESRV_PUBLIC_APP_SCHEME=telesrv +TELESRV_PUBLIC_WEB_BASE_URL=CHANGEME +TELESRV_PUBLIC_LINK_PORT=2401 + +# The monolith owns SFU, TURN, and RTMP. Host mode avoids one Docker mapping per +# TURN relay port. Bridge mode publishes a bounded 64-port compatibility range. +TELESRV_SERVER_HOST_NETWORK=true +TELESRV_SFU_ENABLE=true +TELESRV_SFU_UDP_PORT=12399 +TELESRV_SFU_ADVERTISE_IP=CHANGEME +TELESRV_TURN_ENABLE=true +TELESRV_TURN_UDP_PORT=12400 +TELESRV_TURN_ADVERTISE_IP=CHANGEME +TELESRV_TURN_RELAY_MIN_PORT=12500 +TELESRV_TURN_RELAY_MAX_PORT=12999 +TELESRV_TURN_BRIDGE_RELAY_MAX_PORT=12563 +TELESRV_CALL_TURN_CREDENTIAL_TTL=6h +TELESRV_CALL_FORCE_RELAY=false +TELESRV_LIVESTREAM_ENABLE=true +TELESRV_LIVESTREAM_RTMP_PORT=2400 +TELESRV_LIVESTREAM_RTMP_URL=CHANGEME + +# Direct host listeners and their health-probe addresses. +TELESRV_PUBLIC_BIND_IP=127.0.0.1 +TELESRV_PUBLIC_LISTEN_HOST=127.0.0.1 +TELESRV_LOCAL_BIND_IP=127.0.0.1 +TELESRV_LOCAL_LISTEN_HOST=127.0.0.1 +TELESRV_SERVER_HEALTH_IP=127.0.0.1 +TELESRV_SERVER_HEALTH_URL_HOST=127.0.0.1 +TELESRV_ADMIN_API_PORT=2599 +TELESRV_ADMIN_BIND_IP=127.0.0.1 +TELESRV_ADMIN_LISTEN_HOST=127.0.0.1 +TELESRV_ADMIN_HEALTH_IP=127.0.0.1 +TELESRV_ADMIN_PORT=2600 + +# Durable media state. Switching an existing deployment between localfs and S3 +# requires the explicit blob migration procedure. +TELESRV_BLOB_BACKEND=localfs +TELESRV_EXTERNAL_MEDIA_ENABLE=true +TELESRV_WEBPAGE_PREVIEW_ENABLE=true +TELESRV_S3_ENDPOINT= +TELESRV_S3_REGION= +TELESRV_S3_BUCKET= +TELESRV_S3_ACCESS_KEY_ID= +TELESRV_S3_SECRET_ACCESS_KEY= +TELESRV_S3_USE_SSL=true +TELESRV_S3_PATH_STYLE=false +TELESRV_S3_CREATE_BUCKET=false diff --git a/deploy/docker/assets/test-server-rsa.pem.b64 b/deploy/docker/assets/test-server-rsa.pem.b64 new file mode 100644 index 00000000..8e18c104 --- /dev/null +++ b/deploy/docker/assets/test-server-rsa.pem.b64 @@ -0,0 +1 @@ +LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBeEYvLzBNMCsvNVB6Z2ROYWdUWCtKK2RKZ3I3NVpDVHVpRzhpNHg3WXdtSkYramlPCkdDam03WDdCTENhTWMxK2hPWllETDMrR3ZsZS9BS3lrVzFxb3VhQ0pNVngvSCsybDhMRlhMZWxaMlBMYXdUYjgKQTdCbFRxV3pMM2RiNUJ1Z01OV3ppTDlUdWhSOEluMWJ3S1kwN1FWcFI5aW41empBc0FHTEJrK21HdDBEblZ5TQpmMVhvcDJsTENGTm1tMEY0eWtjQWVhTENDSVBiR1dkZGxpTFk4eEVFaEk0R08ybDFVM2taTXdJT2RPbkFHSkZ0CmdVQW9UZStGSFI2RjFzOWFkQ1ZaQjF0ZUwvaGY5UitXbWVrSnd5Z1Z6ME1ZRUg3eTZVNDlUNDUrL1c3T0Y2WDYKZzBXMGoxdVNTcnNZNHFON3R3eGJUYWQ5emRHWjd5cys5ditQdVFJREFRQUJBb0lCQUFqdXFPOHhkczBmU0xNKwpEdDdUdXVUTHcyODhDcElBa0EwS3FSYVZuNXh2NWVqMHk1blR1blZSRDY1WGJvb003b04xREY0THVmQk1nM2FmClk3WjRFRGFwVTdRNEZkdzQ3aFJkcks1ODc4WkxmYUhPUTNaVGZyZ3VGMUZ3WjNDZnhSQ1RsOS8vZStwNTVnK1gKamlYY0tZb2lkZUI3dlY5cUdIR3BFRTdRTHFrSUVpbk1FV05hQjh1dGN0SDdUWGRXYTRweWZJR2lQckhNTjJ6SApoRjQwSWI3bkpBNmtodHpzTkNEU0Q5WG5ibEVORW9kMUU1Z1JzalE5ZkdzaGRCdHBEc1hyTEJGTDdLTUREb1FtCmN6cnQvS3hsWk1wYnRPZno2dWE1ZUtFQkJUdE51dG1WY3AxcTl5K2NRcFBaem5ZaVJUTCtPSnpWZ2Z1SE9PLzAKZWEyai93RUNnWUVBNkk2ZitFTG84QVA3UTRXMHFzc3VYS3ZIRUYvUkVFZngyTHVlaDBsclVoVlIzSWdqYWtGYwpiVFJsTEVRSzhRTmJEQW1OTXVIckVabmptR3U3bnkzek45NHNsQy95Y0k1cGQ5aFFHVndPMjJlcjlvMitNOXcyCkpwQjRRZjhjOFNLL3BIUU45K2pPdEJ4VjJkcmJmZTBvVW9LRXRZeUQ1Y2J0akZUM3lmZUEyQ0VDZ1lFQTJDdW8KUzg0MWtWcHB4MUt3cEw0aTFmZ0dRUHlrYUtyRDRvR1pyWWd2MkZ4VzU1aS9xNUZjWUw2ZkUzN0phTTFwby9SQgp0bkhnMzVOYW5nL3l1Wlh6NkViNEswQ3lMKzhMdWhDSWI2UHhEdnF5Q1hia1hUd0hTVlJBbkdFTVNOM3phLzdGCkZDSkYxQUJXZzhqbEtSZEEvbFJ3cW84UDhaZ0JlQk1xcEtaaDVKa0NnWUJoQ0ltazI3NDN6MkY2dGdKQk5VL2QKNk9yQllVbHBJcXU5ZytOTWpZelREZ1EvSVNxdHZpSGppdllmOXpBZGlnbm1SdUg4ZGhsUUdjYkdKVVYrMEh4bwpOaktoampQNVZPS2ExODNzRnVZNEU5VERwamJUaXJHcGU2UkIzVUZsTjl1QXNjL1dQZlJwWUYxTjdpeWhLV0FtCnRVRE1RNW9ST09TTEpqVFJ0NHl5SVFLQmdRQ1RmeTVsRXYyd0FQMzk5K2o1YjVhN1luRjU5Q2lHRmtaMERiUDcKR05wMGlZVHVuMlhndmQxSFVhbWZGcnA4blBRQTM4L2FtZGN6RmdzVm9KSWdtVFdFZnJBa2F3OXA3M1NUNzJYNApydWJ6THBFK0xmWmh1MnpKVndpQzZ5RURzeFc5MFdkTmRwa29yMVpZczBIUmlNRmJCK2ljSitOY0dEaWdZb3VOCkxzM0t1UUtCZ1FDVEF4Vk03ek5QZ3NmZnVkWlA3Rk1ueTIwTE1SNitGUW83eFJ6NUVsWWFDVmdYTTFOSDRLL3IKeUZrT0NHaE9ONkkvTVVOQlB4V0xFdVpCUmZ5cmx5M2JwM2o3UjYvaExYNGZOeXc5QjNHUXVWeUNIRDJENHRvZAo2SjVWby9Fc2VxcGVlS2E2Q3YvWTJIVkIwa2ZHdzFWQ0MvZ00wMUw4dWVkM2hzcjJMRDJrQ3c9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo= diff --git a/deploy/docker/assets/test-server-rsa.pub b/deploy/docker/assets/test-server-rsa.pub new file mode 100644 index 00000000..afe012cf --- /dev/null +++ b/deploy/docker/assets/test-server-rsa.pub @@ -0,0 +1,8 @@ +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAxF//0M0+/5PzgdNagTX+J+dJgr75ZCTuiG8i4x7YwmJF+jiOGCjm +7X7BLCaMc1+hOZYDL3+Gvle/AKykW1qouaCJMVx/H+2l8LFXLelZ2PLawTb8A7Bl +TqWzL3db5BugMNWziL9TuhR8In1bwKY07QVpR9in5zjAsAGLBk+mGt0DnVyMf1Xo +p2lLCFNmm0F4ykcAeaLCCIPbGWddliLY8xEEhI4GO2l1U3kZMwIOdOnAGJFtgUAo +Te+FHR6F1s9adCVZB1teL/hf9R+WmekJwygVz0MYEH7y6U49T45+/W7OF6X6g0W0 +j1uSSrsY4qN7twxbTad9zdGZ7ys+9v+PuQIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/deploy/docker/compose.bridge-network.yaml b/deploy/docker/compose.bridge-network.yaml new file mode 100644 index 00000000..2fded77b --- /dev/null +++ b/deploy/docker/compose.bridge-network.yaml @@ -0,0 +1,63 @@ +services: + server: + # Compatibility fallback for hosts without network_mode: host. The bounded + # TURN relay range is published 1:1 to avoid address translation mismatch. + network_mode: !reset null + environment: + TELESRV_LISTEN: 0.0.0.0:${TELESRV_SERVER_PORT:-2398} + TELESRV_PUBLIC_LINK_WEB_ADDR: 0.0.0.0:${TELESRV_PUBLIC_LINK_PORT:-2401} + TELESRV_POSTGRES_DSN: postgres://${POSTGRES_USER:-telesrv}:${POSTGRES_PASSWORD}@postgres:5432/${POSTGRES_DB:-telesrv_main}?sslmode=disable + TELESRV_REDIS_ADDR: redis:6379 + TELESRV_ADMIN_API_ADDR: 0.0.0.0:${TELESRV_ADMIN_API_PORT:-2599} + TELESRV_TURN_RELAY_MAX_PORT: ${TELESRV_TURN_BRIDGE_RELAY_MAX_PORT:-12563} + TELESRV_SERVER_HEALTH_IP: 127.0.0.1 + TELESRV_SERVER_HEALTH_URL_HOST: 127.0.0.1 + ports: + - name: mtproto + target: ${TELESRV_SERVER_PORT:-2398} + published: "${TELESRV_SERVER_PORT:-2398}" + host_ip: ${TELESRV_PUBLIC_BIND_IP:-127.0.0.1} + protocol: tcp + - name: public-links + target: ${TELESRV_PUBLIC_LINK_PORT:-2401} + published: "${TELESRV_PUBLIC_LINK_PORT:-2401}" + host_ip: ${TELESRV_LOCAL_BIND_IP:-127.0.0.1} + protocol: tcp + - name: rtmp-ingest + target: ${TELESRV_LIVESTREAM_RTMP_PORT:-2400} + published: "${TELESRV_LIVESTREAM_RTMP_PORT:-2400}" + host_ip: ${TELESRV_PUBLIC_BIND_IP:-127.0.0.1} + protocol: tcp + - name: sfu-media + target: ${TELESRV_SFU_UDP_PORT:-12399} + published: "${TELESRV_SFU_UDP_PORT:-12399}" + host_ip: ${TELESRV_PUBLIC_BIND_IP:-127.0.0.1} + protocol: udp + - name: turn + target: ${TELESRV_TURN_UDP_PORT:-12400} + published: "${TELESRV_TURN_UDP_PORT:-12400}" + host_ip: ${TELESRV_PUBLIC_BIND_IP:-127.0.0.1} + protocol: udp + - "${TELESRV_PUBLIC_BIND_IP:-127.0.0.1}:${TELESRV_TURN_RELAY_MIN_PORT:-12500}-${TELESRV_TURN_BRIDGE_RELAY_MAX_PORT:-12563}:${TELESRV_TURN_RELAY_MIN_PORT:-12500}-${TELESRV_TURN_BRIDGE_RELAY_MAX_PORT:-12563}/udp" + networks: + - data + - control + - outbound + + admin: + network_mode: !reset null + environment: + TELESRV_POSTGRES_DSN: postgres://${POSTGRES_USER:-telesrv}:${POSTGRES_PASSWORD}@postgres:5432/${POSTGRES_DB:-telesrv_main}?sslmode=disable + TELESRV_ADMIN_API_ADDR: server:${TELESRV_ADMIN_API_PORT:-2599} + TELESRV_ADMIN_UI_ADDR: 0.0.0.0:${TELESRV_ADMIN_PORT:-2600} + TELESRV_ADMIN_HEALTH_IP: 127.0.0.1 + ports: + - name: admin-ui + target: ${TELESRV_ADMIN_PORT:-2600} + published: "${TELESRV_ADMIN_PORT:-2600}" + host_ip: ${TELESRV_ADMIN_BIND_IP:-127.0.0.1} + protocol: tcp + networks: + - data + - control + - admin_host_access diff --git a/deploy/docker/compose.yaml b/deploy/docker/compose.yaml new file mode 100644 index 00000000..9e1140af --- /dev/null +++ b/deploy/docker/compose.yaml @@ -0,0 +1,228 @@ +name: ${COMPOSE_PROJECT_NAME:-gramsrv-main} + +x-build-args: &build-args + VCS_REF: ${TELESRV_BUILD_COMMIT:-unknown} + VCS_BRANCH: ${TELESRV_BUILD_BRANCH:-main} + VCS_TREE_STATE: ${TELESRV_BUILD_TREE_STATE:-unknown} + BUILD_DATE: ${TELESRV_BUILD_DATE:-unknown} + +x-app: &app + init: true + restart: unless-stopped + read_only: true + user: "10001:10001" + cap_drop: + - ALL + pids_limit: 1024 + security_opt: + - no-new-privileges:true + tmpfs: + - /tmp:rw,noexec,nosuid,nodev,size=128m + stop_grace_period: 1m + logging: &app-logging + driver: json-file + options: + max-size: 10m + max-file: "5" + +services: + postgres: + image: postgres:17-alpine@sha256:979c4379dd698aba0b890599a6104e082035f98ef31d9b9291ec22f2b13059ca + environment: + POSTGRES_DB: ${POSTGRES_DB:-telesrv_main} + POSTGRES_USER: ${POSTGRES_USER:-telesrv} + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?set POSTGRES_PASSWORD in deploy/docker/.env} + POSTGRES_INITDB_ARGS: --data-checksums + TZ: UTC + command: + - postgres + - -c + - max_locks_per_transaction=512 + - -c + - shared_preload_libraries=pg_stat_statements + - -c + - pg_stat_statements.track=all + - -c + - track_io_timing=on + shm_size: 256mb + volumes: + - postgres_data:/var/lib/postgresql/data + - ../postgres-init:/docker-entrypoint-initdb.d:ro + ports: + - name: server-host-postgres + target: 5432 + published: "${TELESRV_POSTGRES_HOST_PORT:-15432}" + host_ip: 127.0.0.1 + protocol: tcp + healthcheck: + test: ["CMD-SHELL", "pg_isready -h 127.0.0.1 -U \"$$POSTGRES_USER\" -d \"$$POSTGRES_DB\""] + interval: 5s + timeout: 3s + retries: 20 + start_period: 10s + restart: unless-stopped + stop_grace_period: 1m + logging: *app-logging + networks: + - data + - server_host_access + + redis: + image: redis:7-alpine@sha256:8b81dd37ff027bec4e516d41acfbe9fe2460070dc6d4a4570a2ac5b9d59df065 + environment: + REDIS_PASSWORD: ${TELESRV_REDIS_PASSWORD:?set TELESRV_REDIS_PASSWORD in deploy/docker/.env} + command: + - sh + - -ec + - exec redis-server --appendonly yes --appendfsync everysec --requirepass "$$REDIS_PASSWORD" + volumes: + - redis_data:/data + ports: + - name: server-host-redis + target: 6379 + published: "${TELESRV_REDIS_HOST_PORT:-16379}" + host_ip: 127.0.0.1 + protocol: tcp + healthcheck: + test: ["CMD-SHELL", "redis-cli --no-auth-warning -a \"$$REDIS_PASSWORD\" ping | grep -qx PONG"] + interval: 5s + timeout: 3s + retries: 20 + start_period: 5s + restart: unless-stopped + stop_grace_period: 30s + logging: *app-logging + networks: + - data + - server_host_access + + server: + <<: *app + image: ${TELESRV_IMAGE_PREFIX:-ghcr.io/iamxvbaba/gramsrv}/server:${TELESRV_IMAGE_TAG:-main} + build: + context: ../.. + dockerfile: Dockerfile + target: ${TELESRV_SERVER_BUILD_TARGET:-server-test} + args: *build-args + environment: + TELESRV_LOG_LEVEL: ${TELESRV_LOG_LEVEL:-info} + TELESRV_LISTEN: ${TELESRV_PUBLIC_LISTEN_HOST:-127.0.0.1}:${TELESRV_SERVER_PORT:-2398} + TELESRV_ADVERTISE_IP: ${TELESRV_ADVERTISE_IP:?set TELESRV_ADVERTISE_IP in deploy/docker/.env} + TELESRV_DEFAULT_COUNTRY_CODE: ${TELESRV_DEFAULT_COUNTRY_CODE:-CN} + TELESRV_PUBLIC_BASE_URL: ${TELESRV_PUBLIC_BASE_URL:?set TELESRV_PUBLIC_BASE_URL in deploy/docker/.env} + TELESRV_PUBLIC_APP_SCHEME: ${TELESRV_PUBLIC_APP_SCHEME:-telesrv} + TELESRV_PUBLIC_WEB_BASE_URL: ${TELESRV_PUBLIC_WEB_BASE_URL:?set TELESRV_PUBLIC_WEB_BASE_URL in deploy/docker/.env} + TELESRV_PUBLIC_LINK_WEB_ADDR: ${TELESRV_LOCAL_LISTEN_HOST:-127.0.0.1}:${TELESRV_PUBLIC_LINK_PORT:-2401} + TELESRV_POSTGRES_DSN: ${TELESRV_POSTGRES_DSN:?set TELESRV_POSTGRES_DSN in deploy/docker/.env} + TELESRV_REDIS_ADDR: ${TELESRV_REDIS_ADDR:-127.0.0.1:16379} + TELESRV_REDIS_PASSWORD: ${TELESRV_REDIS_PASSWORD:?set TELESRV_REDIS_PASSWORD in deploy/docker/.env} + TELESRV_REDIS_DB: 0 + TELESRV_ADMIN_API_ADDR: 127.0.0.1:${TELESRV_ADMIN_API_PORT:-2599} + TELESRV_ADMIN_API_TOKEN: ${TELESRV_ADMIN_API_TOKEN:?set TELESRV_ADMIN_API_TOKEN in deploy/docker/.env} + TELESRV_DEV_AUTH_CODE: ${TELESRV_DEV_AUTH_CODE:-12345} + TELESRV_PHONE_CODE_DELIVERY_PROVIDER: ${TELESRV_PHONE_CODE_DELIVERY_PROVIDER:-development} + TELESRV_OTP_WEBHOOK_URL: ${TELESRV_OTP_WEBHOOK_URL:-} + TELESRV_OTP_WEBHOOK_SECRET: ${TELESRV_OTP_WEBHOOK_SECRET:-} + TELESRV_OTP_WEBHOOK_TIMEOUT: ${TELESRV_OTP_WEBHOOK_TIMEOUT:-5s} + TELESRV_RSA_KEY: /var/lib/telesrv/server_rsa.pem + TELESRV_RSA_IDENTITY_MODE: ${TELESRV_RSA_IDENTITY_MODE:-test} + TELESRV_SFU_ENABLE: ${TELESRV_SFU_ENABLE:-true} + TELESRV_SFU_UDP_PORT: ${TELESRV_SFU_UDP_PORT:-12399} + TELESRV_SFU_ADVERTISE_IP: ${TELESRV_SFU_ADVERTISE_IP:?set TELESRV_SFU_ADVERTISE_IP in deploy/docker/.env} + TELESRV_TURN_ENABLE: ${TELESRV_TURN_ENABLE:-true} + TELESRV_TURN_UDP_PORT: ${TELESRV_TURN_UDP_PORT:-12400} + TELESRV_TURN_ADVERTISE_IP: ${TELESRV_TURN_ADVERTISE_IP:?set TELESRV_TURN_ADVERTISE_IP in deploy/docker/.env} + TELESRV_TURN_SECRET: ${TELESRV_TURN_SECRET:?set TELESRV_TURN_SECRET in deploy/docker/.env} + TELESRV_TURN_RELAY_MIN_PORT: ${TELESRV_TURN_RELAY_MIN_PORT:-12500} + TELESRV_TURN_RELAY_MAX_PORT: ${TELESRV_TURN_RELAY_MAX_PORT:-12999} + TELESRV_CALL_TURN_CREDENTIAL_TTL: ${TELESRV_CALL_TURN_CREDENTIAL_TTL:-6h} + TELESRV_CALL_FORCE_RELAY: ${TELESRV_CALL_FORCE_RELAY:-false} + TELESRV_LIVESTREAM_ENABLE: ${TELESRV_LIVESTREAM_ENABLE:-true} + TELESRV_LIVESTREAM_RTMP_ADDR: :${TELESRV_LIVESTREAM_RTMP_PORT:-2400} + TELESRV_LIVESTREAM_RTMP_URL: ${TELESRV_LIVESTREAM_RTMP_URL:?set TELESRV_LIVESTREAM_RTMP_URL in deploy/docker/.env} + TELESRV_LIVESTREAM_WORK_DIR: /var/lib/telesrv/livestream + TELESRV_LANGPACK_SEED_DIR: /usr/share/telesrv/langpack + TELESRV_BLOB_BACKEND: ${TELESRV_BLOB_BACKEND:-localfs} + TELESRV_BLOB_DIR: /var/lib/telesrv/blobs + TELESRV_BLOB_STAGING_DIR: /var/lib/telesrv/blob-staging + TELESRV_MAPTILE_CACHE_DIR: /var/lib/telesrv/maptiles + TELESRV_EXTERNAL_MEDIA_ENABLE: ${TELESRV_EXTERNAL_MEDIA_ENABLE:-true} + TELESRV_WEBPAGE_PREVIEW_ENABLE: ${TELESRV_WEBPAGE_PREVIEW_ENABLE:-true} + TELESRV_S3_ENDPOINT: ${TELESRV_S3_ENDPOINT:-} + TELESRV_S3_REGION: ${TELESRV_S3_REGION:-} + TELESRV_S3_BUCKET: ${TELESRV_S3_BUCKET:-} + TELESRV_S3_ACCESS_KEY_ID: ${TELESRV_S3_ACCESS_KEY_ID:-} + TELESRV_S3_SECRET_ACCESS_KEY: ${TELESRV_S3_SECRET_ACCESS_KEY:-} + TELESRV_S3_USE_SSL: ${TELESRV_S3_USE_SSL:-true} + TELESRV_S3_PATH_STYLE: ${TELESRV_S3_PATH_STYLE:-false} + TELESRV_S3_CREATE_BUCKET: ${TELESRV_S3_CREATE_BUCKET:-false} + TELESRV_SERVER_PORT: ${TELESRV_SERVER_PORT:-2398} + TELESRV_PUBLIC_LINK_PORT: ${TELESRV_PUBLIC_LINK_PORT:-2401} + TELESRV_SERVER_HEALTH_IP: ${TELESRV_SERVER_HEALTH_IP:-127.0.0.1} + TELESRV_SERVER_HEALTH_URL_HOST: ${TELESRV_SERVER_HEALTH_URL_HOST:-127.0.0.1} + depends_on: + postgres: + condition: service_healthy + redis: + condition: service_healthy + volumes: + - server_state:/var/lib/telesrv + network_mode: host + healthcheck: + test: + - CMD-SHELL + - >- + wget -q -O /dev/null "http://$${TELESRV_SERVER_HEALTH_URL_HOST}:$${TELESRV_PUBLIC_LINK_PORT}/healthz" + && nc -z "$${TELESRV_SERVER_HEALTH_IP}" "$${TELESRV_SERVER_PORT}" + interval: 5s + timeout: 5s + retries: 114 + start_period: 30s + + admin: + <<: *app + image: ${TELESRV_IMAGE_PREFIX:-ghcr.io/iamxvbaba/gramsrv}/admin:${TELESRV_IMAGE_TAG:-main} + build: + context: ../.. + dockerfile: Dockerfile + target: admin + args: *build-args + environment: + TELESRV_POSTGRES_DSN: ${TELESRV_POSTGRES_DSN:?set TELESRV_POSTGRES_DSN in deploy/docker/.env} + TELESRV_ADMIN_API_ADDR: 127.0.0.1:${TELESRV_ADMIN_API_PORT:-2599} + TELESRV_ADMIN_API_TOKEN: ${TELESRV_ADMIN_API_TOKEN:?set TELESRV_ADMIN_API_TOKEN in deploy/docker/.env} + TELESRV_ADMIN_UI_ADDR: ${TELESRV_ADMIN_LISTEN_HOST:-127.0.0.1}:${TELESRV_ADMIN_PORT:-2600} + TELESRV_ADMIN_UI_PASSWORD: ${TELESRV_ADMIN_UI_PASSWORD:?set TELESRV_ADMIN_UI_PASSWORD in deploy/docker/.env} + TELESRV_ADMIN_UI_TOKEN: ${TELESRV_ADMIN_UI_TOKEN:-} + TELESRV_ADMIN_SESSION_KEY: ${TELESRV_ADMIN_SESSION_KEY:?set TELESRV_ADMIN_SESSION_KEY in deploy/docker/.env} + TELESRV_BLOB_BACKEND: ${TELESRV_BLOB_BACKEND:-localfs} + TELESRV_BLOB_DIR: /var/lib/telesrv/blobs + TELESRV_BLOB_STAGING_DIR: /var/lib/telesrv/blob-staging + TELESRV_ADMIN_HEALTH_IP: ${TELESRV_ADMIN_HEALTH_IP:-127.0.0.1} + TELESRV_ADMIN_PORT: ${TELESRV_ADMIN_PORT:-2600} + depends_on: + server: + condition: service_healthy + volumes: + - server_state:/var/lib/telesrv:ro + network_mode: host + healthcheck: + test: ["CMD-SHELL", "nc -z \"$$TELESRV_ADMIN_HEALTH_IP\" \"$$TELESRV_ADMIN_PORT\""] + interval: 5s + timeout: 3s + retries: 12 + start_period: 5s + +networks: + data: + internal: true + server_host_access: + admin_host_access: + control: + internal: true + outbound: + +volumes: + postgres_data: + redis_data: + server_state: diff --git a/deploy/docker/docker-entrypoint.sh b/deploy/docker/docker-entrypoint.sh new file mode 100755 index 00000000..31df0f35 --- /dev/null +++ b/deploy/docker/docker-entrypoint.sh @@ -0,0 +1,99 @@ +#!/bin/sh +set -eu + +umask 077 + +command_name="${1##*/}" + +require_secret() { + name="$1" + value="$(printenv "$name" 2>/dev/null || true)" + normalized="$(printf '%s' "$value" | tr '[:upper:]' '[:lower:]')" + case "$normalized" in + ""|*changeme*|*change-me*|*replace-me*) + echo "telesrv: required secret $name is missing or still uses a placeholder" >&2 + exit 64 + ;; + esac +} + +require_value() { + name="$1" + value="$(printenv "$name" 2>/dev/null || true)" + normalized="$(printf '%s' "$value" | tr '[:upper:]' '[:lower:]')" + case "$normalized" in + ""|*changeme*|*change-me*|*replace-me*) + echo "telesrv: required setting $name is missing or still uses a placeholder" >&2 + exit 64 + ;; + esac +} + +initialize_server_key() { + private_key="${TELESRV_RSA_KEY:-/var/lib/telesrv/server_rsa.pem}" + identity_mode="$(printf '%s' "${TELESRV_RSA_IDENTITY_MODE:-generated}" | tr '[:upper:]' '[:lower:]')" + embedded_private_key=/usr/share/telesrv/keys/test-server-rsa.pem.b64 + key_dir=$(dirname -- "$private_key") + + mkdir -p "$key_dir" + case "$identity_mode" in + generated) ;; + test) + if [ ! -f "$private_key" ]; then + if [ ! -r "$embedded_private_key" ]; then + echo "telesrv: test RSA identity requested, but this image does not contain the published test key; use the server-test target or set TELESRV_RSA_IDENTITY_MODE=generated" >&2 + exit 66 + fi + temporary_key="$private_key.tmp.$$" + trap 'rm -f "$temporary_key"' EXIT HUP INT TERM + base64 -d "$embedded_private_key" >"$temporary_key" + chmod 0600 "$temporary_key" + mv "$temporary_key" "$private_key" + trap - EXIT HUP INT TERM + echo "telesrv: WARNING using the published main test RSA identity; its private key is public" >&2 + fi + ;; + *) + echo "telesrv: TELESRV_RSA_IDENTITY_MODE must be test or generated" >&2 + exit 64 + ;; + esac + + if [ -f "$private_key" ]; then + if ! openssl rsa -in "$private_key" -check -noout >/dev/null 2>&1; then + echo "telesrv: $private_key is not a valid RSA private key" >&2 + exit 65 + fi + chmod 0600 "$private_key" + fi +} + +case "$command_name" in + telesrv) + require_value TELESRV_ADVERTISE_IP + require_value TELESRV_PUBLIC_BASE_URL + require_value TELESRV_PUBLIC_WEB_BASE_URL + require_secret TELESRV_POSTGRES_DSN + require_secret TELESRV_REDIS_PASSWORD + require_secret TELESRV_ADMIN_API_TOKEN + require_secret TELESRV_TURN_SECRET + initialize_server_key + ;; + telesrv-admin) + require_secret TELESRV_POSTGRES_DSN + require_secret TELESRV_ADMIN_API_TOKEN + require_secret TELESRV_ADMIN_SESSION_KEY + admin_password="$(printenv TELESRV_ADMIN_UI_PASSWORD 2>/dev/null || true)" + admin_token="$(printenv TELESRV_ADMIN_UI_TOKEN 2>/dev/null || true)" + if [ -n "$admin_password" ]; then + require_secret TELESRV_ADMIN_UI_PASSWORD + elif [ -n "$admin_token" ]; then + require_secret TELESRV_ADMIN_UI_TOKEN + else + echo "telesrv: TELESRV_ADMIN_UI_PASSWORD or TELESRV_ADMIN_UI_TOKEN is required" >&2 + exit 64 + fi + ;; +esac + +exec "$@" diff --git a/deploy/migrations/0001_init.up.sql b/deploy/migrations/0001_init.up.sql index db244937..67f81ccb 100644 --- a/deploy/migrations/0001_init.up.sql +++ b/deploy/migrations/0001_init.up.sql @@ -2648,7 +2648,9 @@ CREATE TABLE public.secret_chats ( history_deleted boolean DEFAULT false NOT NULL, random_id integer NOT NULL, date integer NOT NULL, - created_at timestamp with time zone DEFAULT now() NOT NULL + created_at timestamp with time zone DEFAULT now() NOT NULL, + CONSTRAINT secret_chats_nonzero_id CHECK ((chat_id <> 0)), + CONSTRAINT secret_chats_random_id_is_chat_id CHECK ((chat_id = random_id)) ); @@ -4524,13 +4526,6 @@ CREATE INDEX upload_parts_object_key_idx ON public.upload_parts USING btree (obj CREATE UNIQUE INDEX uq_emq_dedup ON public.encrypted_message_queue USING btree (receiver_auth_key_id, chat_id, random_id); --- --- Name: uq_secret_chats_admin_random; Type: INDEX; Schema: public; Owner: - --- - -CREATE UNIQUE INDEX uq_secret_chats_admin_random ON public.secret_chats USING btree (admin_auth_key_id, random_id) WHERE (state <> 'discarded'::text); - - -- -- Name: user_channel_member_index_admined_public_idx; Type: INDEX; Schema: public; Owner: - -- diff --git a/deploy/migrations/20260901000001_system_broadcasts.down.sql b/deploy/migrations/20260901000001_system_broadcasts.down.sql new file mode 100644 index 00000000..a607e6de --- /dev/null +++ b/deploy/migrations/20260901000001_system_broadcasts.down.sql @@ -0,0 +1,2 @@ +DROP TABLE IF EXISTS broadcast_recipients; +DROP TABLE IF EXISTS broadcasts; diff --git a/deploy/migrations/20260901000001_system_broadcasts.up.sql b/deploy/migrations/20260901000001_system_broadcasts.up.sql new file mode 100644 index 00000000..1ff26c10 --- /dev/null +++ b/deploy/migrations/20260901000001_system_broadcasts.up.sql @@ -0,0 +1,54 @@ +CREATE TABLE broadcasts ( + id bigserial PRIMARY KEY, + message text NOT NULL CHECK (message <> '' AND octet_length(message) <= 4096), + target_mode varchar(16) NOT NULL CHECK (target_mode IN ('all', 'selected')), + snapshot_max_user_id bigint NOT NULL DEFAULT 0, + enumeration_cursor_user_id bigint NOT NULL DEFAULT 0, + enumeration_done boolean NOT NULL DEFAULT false, + target_count bigint NOT NULL DEFAULT 0 CHECK (target_count >= 0), + materialized_count bigint NOT NULL DEFAULT 0 CHECK (materialized_count >= 0), + sent_count bigint NOT NULL DEFAULT 0 CHECK (sent_count >= 0), + failed_count bigint NOT NULL DEFAULT 0 CHECK (failed_count >= 0), + created_by varchar(128) NOT NULL DEFAULT '', + created_at timestamptz NOT NULL DEFAULT now(), + CHECK (enumeration_cursor_user_id >= 0 AND enumeration_cursor_user_id <= snapshot_max_user_id), + CHECK (sent_count + failed_count <= materialized_count) +); + +CREATE TABLE broadcast_recipients ( + id bigserial PRIMARY KEY, + broadcast_id bigint NOT NULL REFERENCES broadcasts(id) ON DELETE CASCADE, + user_id bigint NOT NULL, + status varchar(16) NOT NULL DEFAULT 'pending' + CHECK (status IN ('pending', 'processing', 'sent', 'failed')), + attempts integer NOT NULL DEFAULT 0 CHECK (attempts >= 0), + next_attempt_at timestamptz NOT NULL DEFAULT now(), + lease_token varchar(64) NOT NULL DEFAULT '', + lease_until timestamptz, + last_error varchar(500) NOT NULL DEFAULT '', + private_message_id bigint NOT NULL DEFAULT 0, + message_box_id integer NOT NULL DEFAULT 0, + pts integer NOT NULL DEFAULT 0, + sent_at timestamptz, + created_at timestamptz NOT NULL DEFAULT now(), + updated_at timestamptz NOT NULL DEFAULT now(), + UNIQUE (broadcast_id, user_id), + CHECK ( + (status = 'sent' AND private_message_id > 0 AND message_box_id > 0 AND pts > 0 AND sent_at IS NOT NULL) + OR + (status <> 'sent' AND private_message_id = 0 AND message_box_id = 0 AND pts = 0 AND sent_at IS NULL) + ), + CHECK ( + (status = 'processing' AND lease_token <> '' AND lease_until IS NOT NULL) + OR + (status <> 'processing' AND lease_token = '' AND lease_until IS NULL) + ) +); + +CREATE INDEX broadcasts_enumeration_idx ON broadcasts (id) + WHERE target_mode = 'all' AND NOT enumeration_done; +CREATE INDEX broadcast_recipients_pending_idx ON broadcast_recipients (next_attempt_at, id) + WHERE status = 'pending'; +CREATE INDEX broadcast_recipients_processing_idx ON broadcast_recipients (lease_until, id) + WHERE status = 'processing'; +CREATE INDEX broadcast_recipients_broadcast_idx ON broadcast_recipients (broadcast_id, id); diff --git a/deploy/migrations/20260901000002_channel_stats_read_model.down.sql b/deploy/migrations/20260901000002_channel_stats_read_model.down.sql new file mode 100644 index 00000000..3aec27b9 --- /dev/null +++ b/deploy/migrations/20260901000002_channel_stats_read_model.down.sql @@ -0,0 +1,3 @@ +DROP INDEX IF EXISTS public.channel_messages_public_forward_source_seek_idx; +DROP INDEX IF EXISTS public.channel_members_stats_period_idx; +DROP INDEX IF EXISTS public.channel_message_viewers_stats_date_idx; diff --git a/deploy/migrations/20260901000002_channel_stats_read_model.up.sql b/deploy/migrations/20260901000002_channel_stats_read_model.up.sql new file mode 100644 index 00000000..b65f7554 --- /dev/null +++ b/deploy/migrations/20260901000002_channel_stats_read_model.up.sql @@ -0,0 +1,18 @@ +-- Bounded stats reads: event-time viewers, membership snapshots, and exact +-- public-forward seek pagination by the durable MessageForward JSON shape. +CREATE INDEX channel_message_viewers_stats_date_idx + ON public.channel_message_viewers (channel_id, viewed_at, viewer_user_id, message_id); + +CREATE INDEX channel_members_stats_period_idx + ON public.channel_members (channel_id, joined_at, left_at, user_id); + +CREATE INDEX channel_messages_public_forward_source_seek_idx + ON public.channel_messages ( + (fwd_from #>> '{From,Type}'), + (fwd_from #>> '{From,ID}'), + (fwd_from #>> '{ChannelPost}'), + message_date DESC, + channel_id ASC, + id DESC + ) + WHERE NOT deleted AND fwd_from <> '{}'::jsonb; diff --git a/deploy/migrations/20260901000003_system_broadcast_entities.down.sql b/deploy/migrations/20260901000003_system_broadcast_entities.down.sql new file mode 100644 index 00000000..2c76e349 --- /dev/null +++ b/deploy/migrations/20260901000003_system_broadcast_entities.down.sql @@ -0,0 +1,3 @@ +ALTER TABLE broadcasts + DROP CONSTRAINT IF EXISTS broadcasts_entities_array_check, + DROP COLUMN IF EXISTS entities; diff --git a/deploy/migrations/20260901000003_system_broadcast_entities.up.sql b/deploy/migrations/20260901000003_system_broadcast_entities.up.sql new file mode 100644 index 00000000..9dc844ac --- /dev/null +++ b/deploy/migrations/20260901000003_system_broadcast_entities.up.sql @@ -0,0 +1,6 @@ +ALTER TABLE broadcasts + ADD COLUMN entities jsonb NOT NULL DEFAULT '[]'::jsonb; + +ALTER TABLE broadcasts + ADD CONSTRAINT broadcasts_entities_array_check + CHECK (jsonb_typeof(entities) = 'array'); diff --git a/deploy/migrations/20260901000004_logical_account_deletion.down.sql b/deploy/migrations/20260901000004_logical_account_deletion.down.sql new file mode 100644 index 00000000..8821e469 --- /dev/null +++ b/deploy/migrations/20260901000004_logical_account_deletion.down.sql @@ -0,0 +1,112 @@ +CREATE OR REPLACE FUNCTION public.telesrv_notify_user_base_read_model() RETURNS trigger + LANGUAGE plpgsql + AS $$ +DECLARE + changed_id BIGINT; + projection_changed BOOLEAN; +BEGIN + IF TG_OP = 'DELETE' THEN + changed_id := OLD.id; + projection_changed := true; + ELSE + changed_id := NEW.id; + IF TG_OP = 'INSERT' THEN + projection_changed := true; + ELSE + projection_changed := + OLD.access_hash IS DISTINCT FROM NEW.access_hash OR + OLD.phone IS DISTINCT FROM NEW.phone OR + OLD.first_name IS DISTINCT FROM NEW.first_name OR + OLD.last_name IS DISTINCT FROM NEW.last_name OR + OLD.username IS DISTINCT FROM NEW.username OR + OLD.country_code IS DISTINCT FROM NEW.country_code OR + OLD.verified IS DISTINCT FROM NEW.verified OR + OLD.support IS DISTINCT FROM NEW.support OR + OLD.about IS DISTINCT FROM NEW.about OR + OLD.default_history_ttl_period IS DISTINCT FROM NEW.default_history_ttl_period OR + OLD.is_bot IS DISTINCT FROM NEW.is_bot OR + OLD.bot_info_version IS DISTINCT FROM NEW.bot_info_version OR + OLD.premium_expires_at IS DISTINCT FROM NEW.premium_expires_at OR + OLD.emoji_status_document_id IS DISTINCT FROM NEW.emoji_status_document_id OR + OLD.emoji_status_until IS DISTINCT FROM NEW.emoji_status_until OR + OLD.color_set IS DISTINCT FROM NEW.color_set OR + OLD.color IS DISTINCT FROM NEW.color OR + OLD.color_background_emoji_id IS DISTINCT FROM NEW.color_background_emoji_id OR + OLD.profile_color_set IS DISTINCT FROM NEW.profile_color_set OR + OLD.profile_color IS DISTINCT FROM NEW.profile_color OR + OLD.profile_color_background_emoji_id IS DISTINCT FROM NEW.profile_color_background_emoji_id; + END IF; + END IF; + + IF projection_changed THEN + PERFORM telesrv_bump_read_model_version('user_base', changed_id, 'user', changed_id); + IF TG_OP = 'INSERT' THEN + PERFORM telesrv_bump_read_model_version('contact_account', changed_id, 'user', changed_id); + END IF; + PERFORM telesrv_bump_read_model_version('contact_account', c.user_id, 'user', c.user_id) + FROM contacts c + WHERE c.contact_user_id = changed_id; + PERFORM telesrv_bump_private_dialog_light_for_user(changed_id); + END IF; + RETURN NULL; +END; +$$; + +CREATE OR REPLACE FUNCTION public.telesrv_notify_user_channel_participants_read_model() RETURNS trigger + LANGUAGE plpgsql + AS $$ +DECLARE + changed_id BIGINT; + old_id BIGINT; + projection_changed BOOLEAN; +BEGIN + IF TG_OP = 'DELETE' THEN + changed_id := OLD.id; + projection_changed := true; + ELSE + changed_id := NEW.id; + IF TG_OP = 'INSERT' THEN + projection_changed := true; + PERFORM telesrv_bump_read_model_version('contact_account', changed_id, 'user', changed_id); + ELSE + old_id := OLD.id; + projection_changed := + OLD.access_hash IS DISTINCT FROM NEW.access_hash OR + OLD.phone IS DISTINCT FROM NEW.phone OR + OLD.first_name IS DISTINCT FROM NEW.first_name OR + OLD.last_name IS DISTINCT FROM NEW.last_name OR + OLD.username IS DISTINCT FROM NEW.username OR + OLD.country_code IS DISTINCT FROM NEW.country_code OR + OLD.verified IS DISTINCT FROM NEW.verified OR + OLD.support IS DISTINCT FROM NEW.support OR + OLD.about IS DISTINCT FROM NEW.about OR + OLD.default_history_ttl_period IS DISTINCT FROM NEW.default_history_ttl_period OR + OLD.is_bot IS DISTINCT FROM NEW.is_bot OR + OLD.bot_info_version IS DISTINCT FROM NEW.bot_info_version OR + OLD.premium_expires_at IS DISTINCT FROM NEW.premium_expires_at OR + OLD.emoji_status_document_id IS DISTINCT FROM NEW.emoji_status_document_id OR + OLD.emoji_status_until IS DISTINCT FROM NEW.emoji_status_until OR + OLD.color_set IS DISTINCT FROM NEW.color_set OR + OLD.color IS DISTINCT FROM NEW.color OR + OLD.color_background_emoji_id IS DISTINCT FROM NEW.color_background_emoji_id OR + OLD.profile_color_set IS DISTINCT FROM NEW.profile_color_set OR + OLD.profile_color IS DISTINCT FROM NEW.profile_color OR + OLD.profile_color_background_emoji_id IS DISTINCT FROM NEW.profile_color_background_emoji_id; + IF old_id IS DISTINCT FROM changed_id THEN + PERFORM telesrv_bump_channel_participants_for_user(old_id); + END IF; + END IF; + END IF; + + IF projection_changed THEN + PERFORM telesrv_bump_channel_participants_for_user(changed_id); + END IF; + RETURN NULL; +END; +$$; + +DROP TRIGGER IF EXISTS users_release_collectible_phone_on_soft_delete ON public.users; +CREATE TRIGGER users_release_collectible_phone_on_soft_delete +BEFORE UPDATE OF deleted_at ON public.users +FOR EACH ROW WHEN (OLD.deleted_at IS NULL AND NEW.deleted_at IS NOT NULL) +EXECUTE FUNCTION public.release_soft_deleted_user_collectible_phone(); diff --git a/deploy/migrations/20260901000004_logical_account_deletion.up.sql b/deploy/migrations/20260901000004_logical_account_deletion.up.sql new file mode 100644 index 00000000..dc8a4f7f --- /dev/null +++ b/deploy/migrations/20260901000004_logical_account_deletion.up.sql @@ -0,0 +1,129 @@ +-- Human account deletion is a logical user tombstone. The deleted user keeps +-- all relationship/history rows, so the users UPDATE must not fan out through +-- every reverse contact, dialog and channel membership. A dedicated event +-- invalidates the base-user and RPC projection caches as one coarse boundary. + +-- Collectible phone ownership is an account asset, not the editable users.phone +-- identity field. Logical deletion preserves it; physical user deletion keeps +-- the separate 0171 release trigger. +DROP TRIGGER IF EXISTS users_release_collectible_phone_on_soft_delete ON public.users; + +CREATE OR REPLACE FUNCTION public.telesrv_notify_user_base_read_model() RETURNS trigger + LANGUAGE plpgsql + AS $$ +DECLARE + changed_id BIGINT; + projection_changed BOOLEAN; +BEGIN + IF TG_OP = 'UPDATE' + AND OLD.deleted_at IS NULL + AND NEW.deleted_at IS NOT NULL THEN + PERFORM telesrv_bump_read_model_version('user_deleted', NEW.id, 'user', NEW.id); + RETURN NULL; + END IF; + + IF TG_OP = 'DELETE' THEN + changed_id := OLD.id; + projection_changed := true; + ELSE + changed_id := NEW.id; + IF TG_OP = 'INSERT' THEN + projection_changed := true; + ELSE + projection_changed := + OLD.access_hash IS DISTINCT FROM NEW.access_hash OR + OLD.phone IS DISTINCT FROM NEW.phone OR + OLD.first_name IS DISTINCT FROM NEW.first_name OR + OLD.last_name IS DISTINCT FROM NEW.last_name OR + OLD.username IS DISTINCT FROM NEW.username OR + OLD.country_code IS DISTINCT FROM NEW.country_code OR + OLD.verified IS DISTINCT FROM NEW.verified OR + OLD.support IS DISTINCT FROM NEW.support OR + OLD.about IS DISTINCT FROM NEW.about OR + OLD.default_history_ttl_period IS DISTINCT FROM NEW.default_history_ttl_period OR + OLD.is_bot IS DISTINCT FROM NEW.is_bot OR + OLD.bot_info_version IS DISTINCT FROM NEW.bot_info_version OR + OLD.premium_expires_at IS DISTINCT FROM NEW.premium_expires_at OR + OLD.emoji_status_document_id IS DISTINCT FROM NEW.emoji_status_document_id OR + OLD.emoji_status_until IS DISTINCT FROM NEW.emoji_status_until OR + OLD.color_set IS DISTINCT FROM NEW.color_set OR + OLD.color IS DISTINCT FROM NEW.color OR + OLD.color_background_emoji_id IS DISTINCT FROM NEW.color_background_emoji_id OR + OLD.profile_color_set IS DISTINCT FROM NEW.profile_color_set OR + OLD.profile_color IS DISTINCT FROM NEW.profile_color OR + OLD.profile_color_background_emoji_id IS DISTINCT FROM NEW.profile_color_background_emoji_id; + END IF; + END IF; + + IF projection_changed THEN + PERFORM telesrv_bump_read_model_version('user_base', changed_id, 'user', changed_id); + IF TG_OP = 'INSERT' THEN + PERFORM telesrv_bump_read_model_version('contact_account', changed_id, 'user', changed_id); + END IF; + PERFORM telesrv_bump_read_model_version('contact_account', c.user_id, 'user', c.user_id) + FROM contacts c + WHERE c.contact_user_id = changed_id; + PERFORM telesrv_bump_private_dialog_light_for_user(changed_id); + END IF; + RETURN NULL; +END; +$$; + +CREATE OR REPLACE FUNCTION public.telesrv_notify_user_channel_participants_read_model() RETURNS trigger + LANGUAGE plpgsql + AS $$ +DECLARE + changed_id BIGINT; + old_id BIGINT; + projection_changed BOOLEAN; +BEGIN + IF TG_OP = 'UPDATE' + AND OLD.deleted_at IS NULL + AND NEW.deleted_at IS NOT NULL THEN + RETURN NULL; + END IF; + + IF TG_OP = 'DELETE' THEN + changed_id := OLD.id; + projection_changed := true; + ELSE + changed_id := NEW.id; + IF TG_OP = 'INSERT' THEN + projection_changed := true; + PERFORM telesrv_bump_read_model_version('contact_account', changed_id, 'user', changed_id); + ELSE + old_id := OLD.id; + projection_changed := + OLD.access_hash IS DISTINCT FROM NEW.access_hash OR + OLD.phone IS DISTINCT FROM NEW.phone OR + OLD.first_name IS DISTINCT FROM NEW.first_name OR + OLD.last_name IS DISTINCT FROM NEW.last_name OR + OLD.username IS DISTINCT FROM NEW.username OR + OLD.country_code IS DISTINCT FROM NEW.country_code OR + OLD.verified IS DISTINCT FROM NEW.verified OR + OLD.support IS DISTINCT FROM NEW.support OR + OLD.about IS DISTINCT FROM NEW.about OR + OLD.default_history_ttl_period IS DISTINCT FROM NEW.default_history_ttl_period OR + OLD.is_bot IS DISTINCT FROM NEW.is_bot OR + OLD.bot_info_version IS DISTINCT FROM NEW.bot_info_version OR + OLD.premium_expires_at IS DISTINCT FROM NEW.premium_expires_at OR + OLD.emoji_status_document_id IS DISTINCT FROM NEW.emoji_status_document_id OR + OLD.emoji_status_until IS DISTINCT FROM NEW.emoji_status_until OR + OLD.color_set IS DISTINCT FROM NEW.color_set OR + OLD.color IS DISTINCT FROM NEW.color OR + OLD.color_background_emoji_id IS DISTINCT FROM NEW.color_background_emoji_id OR + OLD.profile_color_set IS DISTINCT FROM NEW.profile_color_set OR + OLD.profile_color IS DISTINCT FROM NEW.profile_color OR + OLD.profile_color_background_emoji_id IS DISTINCT FROM NEW.profile_color_background_emoji_id; + IF old_id IS DISTINCT FROM changed_id THEN + PERFORM telesrv_bump_channel_participants_for_user(old_id); + END IF; + END IF; + END IF; + + IF projection_changed THEN + PERFORM telesrv_bump_channel_participants_for_user(changed_id); + END IF; + RETURN NULL; +END; +$$; diff --git a/deploy/migrations/20260901000005_suggested_post_lifecycle_retry.down.sql b/deploy/migrations/20260901000005_suggested_post_lifecycle_retry.down.sql new file mode 100644 index 00000000..8723ba0b --- /dev/null +++ b/deploy/migrations/20260901000005_suggested_post_lifecycle_retry.down.sql @@ -0,0 +1,12 @@ +DROP TRIGGER IF EXISTS channel_messages_suggested_post_lifecycle_wakeup ON public.channel_messages; +DROP FUNCTION IF EXISTS public.telesrv_wake_suggested_post_lifecycle_on_delete(); + +DROP TABLE IF EXISTS public.suggested_post_lifecycle_wakeups; +DROP INDEX IF EXISTS public.suggested_post_approvals_published_message_idx; +DROP INDEX IF EXISTS public.suggested_post_approvals_retry_idx; + +ALTER TABLE public.suggested_post_approvals + DROP CONSTRAINT IF EXISTS suggested_post_approvals_retry_shape_check, + DROP COLUMN IF EXISTS last_lifecycle_error, + DROP COLUMN IF EXISTS next_attempt_at, + DROP COLUMN IF EXISTS lifecycle_attempts; diff --git a/deploy/migrations/20260901000005_suggested_post_lifecycle_retry.up.sql b/deploy/migrations/20260901000005_suggested_post_lifecycle_retry.up.sql new file mode 100644 index 00000000..f5b35679 --- /dev/null +++ b/deploy/migrations/20260901000005_suggested_post_lifecycle_retry.up.sql @@ -0,0 +1,94 @@ +-- Isolate poisoned suggested-post lifecycle rows from the global due queue. +-- A failed aggregate remains durable and retryable, but receives a bounded +-- backoff so it cannot monopolize every one-second dispatcher pass. + +ALTER TABLE public.suggested_post_approvals + ADD COLUMN lifecycle_attempts integer NOT NULL DEFAULT 0, + ADD COLUMN next_attempt_at integer NOT NULL DEFAULT 0, + ADD COLUMN last_lifecycle_error text NOT NULL DEFAULT ''; + +ALTER TABLE public.suggested_post_approvals + ADD CONSTRAINT suggested_post_approvals_retry_shape_check CHECK ( + lifecycle_attempts BETWEEN 0 AND 1000000 AND + next_attempt_at >= 0 AND + octet_length(last_lifecycle_error) <= 4096 + ) NOT VALID; + +ALTER TABLE public.suggested_post_approvals + VALIDATE CONSTRAINT suggested_post_approvals_retry_shape_check; + +-- next_attempt_at is the queue's next eligible time, not merely a retry flag. +-- Healthy active rows point at their publish/settlement deadline; only an +-- explicit message-deletion wakeup or an already-due row is <= worker now. +UPDATE public.suggested_post_approvals +SET next_attempt_at = CASE state + WHEN 'scheduled' THEN schedule_date + WHEN 'published' THEN settlement_due + ELSE 0 +END +WHERE state IN ('scheduled','published'); + +CREATE INDEX suggested_post_approvals_retry_idx + ON public.suggested_post_approvals(next_attempt_at,monoforum_id,suggestion_message_id) + WHERE state IN ('scheduled','published'); + +CREATE INDEX suggested_post_approvals_published_message_idx + ON public.suggested_post_approvals(parent_channel_id,published_message_id) + INCLUDE (monoforum_id,suggestion_message_id,next_attempt_at) + WHERE state='published'; + +-- A separate wakeup table avoids a message-row -> approval-row trigger lock +-- that would invert the worker's approval-row -> message-row order. It only +-- contains active suggested-post aggregates and is drained by atomic claim. +CREATE TABLE public.suggested_post_lifecycle_wakeups ( + monoforum_id bigint NOT NULL, + suggestion_message_id integer NOT NULL, + created_at integer NOT NULL, + CONSTRAINT suggested_post_lifecycle_wakeups_pkey + PRIMARY KEY (monoforum_id,suggestion_message_id), + CONSTRAINT suggested_post_lifecycle_wakeups_shape_check + CHECK (monoforum_id>0 AND suggestion_message_id>0 AND created_at>=0) +); + +CREATE INDEX suggested_post_lifecycle_wakeups_due_idx + ON public.suggested_post_lifecycle_wakeups(created_at,monoforum_id,suggestion_message_id); + +-- Preserve deletions that predate this migration without making the recurring +-- worker rescan global channel tombstone history. +INSERT INTO public.suggested_post_lifecycle_wakeups(monoforum_id,suggestion_message_id,created_at) +SELECT a.monoforum_id,a.suggestion_message_id,0 +FROM public.suggested_post_approvals a +WHERE (a.state='scheduled' AND EXISTS ( + SELECT 1 FROM public.channel_messages m + WHERE m.channel_id=a.monoforum_id AND m.id=a.suggestion_message_id AND m.deleted)) + OR (a.state='published' AND EXISTS ( + SELECT 1 FROM public.channel_messages m + WHERE m.channel_id=a.parent_channel_id AND m.id=a.published_message_id AND m.deleted)) +ON CONFLICT DO NOTHING; + +-- Deletion is a durable lifecycle wakeup. Drive the lookup from the exact +-- message being tombstoned and only insert a small queue fact; never rescan +-- global channel tombstones from the one-second worker. +CREATE OR REPLACE FUNCTION public.telesrv_wake_suggested_post_lifecycle_on_delete() +RETURNS trigger LANGUAGE plpgsql AS $$ +BEGIN + INSERT INTO public.suggested_post_lifecycle_wakeups(monoforum_id,suggestion_message_id,created_at) + SELECT monoforum_id,suggestion_message_id,EXTRACT(EPOCH FROM clock_timestamp())::integer + FROM public.suggested_post_approvals + WHERE state='scheduled' AND monoforum_id=NEW.channel_id AND suggestion_message_id=NEW.id + ON CONFLICT DO NOTHING; + + INSERT INTO public.suggested_post_lifecycle_wakeups(monoforum_id,suggestion_message_id,created_at) + SELECT monoforum_id,suggestion_message_id,EXTRACT(EPOCH FROM clock_timestamp())::integer + FROM public.suggested_post_approvals + WHERE state='published' AND parent_channel_id=NEW.channel_id AND published_message_id=NEW.id + ON CONFLICT DO NOTHING; + RETURN NEW; +END +$$; + +CREATE TRIGGER channel_messages_suggested_post_lifecycle_wakeup +AFTER UPDATE OF deleted ON public.channel_messages +FOR EACH ROW +WHEN (NEW.deleted AND NOT OLD.deleted) +EXECUTE FUNCTION public.telesrv_wake_suggested_post_lifecycle_on_delete(); diff --git a/deploy/migrations/20260901000006_sticker_set_system_key_unique.down.sql b/deploy/migrations/20260901000006_sticker_set_system_key_unique.down.sql new file mode 100644 index 00000000..bbe9631e --- /dev/null +++ b/deploy/migrations/20260901000006_sticker_set_system_key_unique.down.sql @@ -0,0 +1,5 @@ +DROP INDEX IF EXISTS public.sticker_sets_system_key_idx; + +CREATE INDEX sticker_sets_system_key_idx + ON public.sticker_sets USING btree (system_key) + WHERE system_key <> ''::text; diff --git a/deploy/migrations/20260901000006_sticker_set_system_key_unique.up.sql b/deploy/migrations/20260901000006_sticker_set_system_key_unique.up.sql new file mode 100644 index 00000000..58b25850 --- /dev/null +++ b/deploy/migrations/20260901000006_sticker_set_system_key_unique.up.sql @@ -0,0 +1,25 @@ +-- system_key is the constructor-routing identity for global sticker sets. More +-- than one row makes messages.getStickerSet/inputStickerSet* nondeterministic +-- and can alternate clients between different catalogs after a restart. + +-- StatusPack is now imported from the official export. Preserve the historical +-- synthesized set as an addressable short-name catalog, but only remove its +-- routing key when another real default-status set already owns that key. +UPDATE public.sticker_sets AS synthesized +SET system_key = '', updated_at = now() +WHERE synthesized.id = 7777000000000001 + AND synthesized.system_key = 'emoji_default_statuses' + AND EXISTS ( + SELECT 1 + FROM public.sticker_sets AS real_set + WHERE real_set.system_key = synthesized.system_key + AND real_set.id <> synthesized.id + ); + +DROP INDEX IF EXISTS public.sticker_sets_system_key_idx; + +-- Fail closed on any other duplicate instead of making the read path choose an +-- arbitrary row. Empty keys are ordinary/non-system sets and are not unique. +CREATE UNIQUE INDEX sticker_sets_system_key_idx + ON public.sticker_sets USING btree (system_key) + WHERE system_key <> ''::text; diff --git a/deploy/migrations/20260901000007_welcome_messages.down.sql b/deploy/migrations/20260901000007_welcome_messages.down.sql new file mode 100644 index 00000000..c6a4fd9d --- /dev/null +++ b/deploy/migrations/20260901000007_welcome_messages.down.sql @@ -0,0 +1,2 @@ +DROP TABLE IF EXISTS welcome_messages; +DROP TABLE IF EXISTS welcome_message_peers; diff --git a/deploy/migrations/20260901000007_welcome_messages.up.sql b/deploy/migrations/20260901000007_welcome_messages.up.sql new file mode 100644 index 00000000..4ceabddd --- /dev/null +++ b/deploy/migrations/20260901000007_welcome_messages.up.sql @@ -0,0 +1,31 @@ +CREATE TABLE welcome_message_peers ( + channel_id bigint PRIMARY KEY REFERENCES channels(id) ON DELETE CASCADE, + next_id integer NOT NULL DEFAULT 1, + revision bigint NOT NULL DEFAULT 1, + updated_at timestamptz NOT NULL DEFAULT now(), + CONSTRAINT welcome_message_peers_shape CHECK ( + channel_id > 0 AND next_id > 0 AND next_id <= 2147483647 AND revision > 0 + ) +); + +CREATE TABLE welcome_messages ( + channel_id bigint NOT NULL REFERENCES welcome_message_peers(channel_id) ON DELETE CASCADE, + id integer NOT NULL, + creator_user_id bigint NOT NULL REFERENCES users(id) ON DELETE RESTRICT, + date integer NOT NULL, + edit_date integer NOT NULL DEFAULT 0, + random_id bigint NOT NULL, + content jsonb NOT NULL, + create_fingerprint bytea NOT NULL, + version bigint NOT NULL DEFAULT 1, + created_at timestamptz NOT NULL DEFAULT now(), + updated_at timestamptz NOT NULL DEFAULT now(), + PRIMARY KEY (channel_id, id), + UNIQUE (channel_id, creator_user_id, random_id), + CONSTRAINT welcome_messages_shape CHECK ( + channel_id > 0 AND id > 0 AND creator_user_id > 0 AND date > 0 AND + edit_date >= 0 AND (edit_date = 0 OR edit_date >= date) AND random_id <> 0 AND + jsonb_typeof(content) = 'object' AND pg_column_size(content) <= 4194304 AND + octet_length(create_fingerprint) = 32 AND version > 0 + ) +); diff --git a/deploy/migrations/20260901000008_welcome_message_deliveries.down.sql b/deploy/migrations/20260901000008_welcome_message_deliveries.down.sql new file mode 100644 index 00000000..5dbce09d --- /dev/null +++ b/deploy/migrations/20260901000008_welcome_message_deliveries.down.sql @@ -0,0 +1,2 @@ +DROP TABLE IF EXISTS welcome_message_deliveries; +DROP SEQUENCE IF EXISTS welcome_message_join_event_id_seq; diff --git a/deploy/migrations/20260901000008_welcome_message_deliveries.up.sql b/deploy/migrations/20260901000008_welcome_message_deliveries.up.sql new file mode 100644 index 00000000..7f1c44a1 --- /dev/null +++ b/deploy/migrations/20260901000008_welcome_message_deliveries.up.sql @@ -0,0 +1,37 @@ +CREATE SEQUENCE welcome_message_join_event_id_seq AS bigint; + +CREATE TABLE welcome_message_deliveries ( + id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY, + join_event_id bigint NOT NULL, + channel_id bigint NOT NULL REFERENCES channels(id) ON DELETE CASCADE, + target_user_id bigint NOT NULL REFERENCES users(id) ON DELETE CASCADE, + template_id integer NOT NULL, + ephemeral_id integer GENERATED ALWAYS AS (((id - 1) % 2147483646 + 1)::integer) STORED, + joined_at integer NOT NULL, + content jsonb NOT NULL, + attempt_count integer NOT NULL DEFAULT 0, + next_attempt_at timestamptz NOT NULL DEFAULT now(), + lease_owner text, + lease_expires_at timestamptz, + delivered_at timestamptz, + last_error text NOT NULL DEFAULT '', + created_at timestamptz NOT NULL DEFAULT now(), + expires_at timestamptz NOT NULL DEFAULT (now() + interval '24 hours'), + UNIQUE (join_event_id, template_id), + UNIQUE (target_user_id, ephemeral_id), + CONSTRAINT welcome_message_deliveries_shape CHECK ( + join_event_id > 0 AND channel_id > 0 AND target_user_id > 0 AND + template_id > 0 AND ephemeral_id > 0 AND joined_at > 0 AND + jsonb_typeof(content) = 'object' AND pg_column_size(content) <= 4194304 AND + attempt_count >= 0 AND char_length(lease_owner) <= 128 AND + char_length(last_error) <= 1024 AND expires_at > created_at AND + expires_at <= created_at + interval '24 hours 1 second' + ) +); + +CREATE INDEX welcome_message_deliveries_due_idx + ON welcome_message_deliveries (next_attempt_at, id) + WHERE delivered_at IS NULL; + +CREATE INDEX welcome_message_deliveries_expiry_idx + ON welcome_message_deliveries (expires_at, id); diff --git a/deploy/migrations/20260901000009_welcome_message_delivery_target_index.down.sql b/deploy/migrations/20260901000009_welcome_message_delivery_target_index.down.sql new file mode 100644 index 00000000..d64c7297 --- /dev/null +++ b/deploy/migrations/20260901000009_welcome_message_delivery_target_index.down.sql @@ -0,0 +1 @@ +DROP INDEX IF EXISTS welcome_message_deliveries_target_idx; diff --git a/deploy/migrations/20260901000009_welcome_message_delivery_target_index.up.sql b/deploy/migrations/20260901000009_welcome_message_delivery_target_index.up.sql new file mode 100644 index 00000000..5f34660c --- /dev/null +++ b/deploy/migrations/20260901000009_welcome_message_delivery_target_index.up.sql @@ -0,0 +1,2 @@ +CREATE INDEX welcome_message_deliveries_target_idx + ON welcome_message_deliveries (channel_id, target_user_id, id); diff --git a/deploy/migrations/20260901000010_dispatch_outbox_append_head_noop.down.sql b/deploy/migrations/20260901000010_dispatch_outbox_append_head_noop.down.sql new file mode 100644 index 00000000..7114d0c0 --- /dev/null +++ b/deploy/migrations/20260901000010_dispatch_outbox_append_head_noop.down.sql @@ -0,0 +1,68 @@ +DROP TRIGGER dispatch_outbox_insert_user_head ON dispatch_outbox; +DROP FUNCTION dispatch_outbox_insert_user_heads(); + +CREATE OR REPLACE FUNCTION dispatch_outbox_maintain_user_head() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +DECLARE + removed_head bigint; +BEGIN + IF TG_OP = 'INSERT' THEN + INSERT INTO dispatch_outbox_user_heads ( + target_user_id, head_id, head_pts, status, next_attempt_at, updated_at + ) VALUES ( + NEW.target_user_id, NEW.id, NEW.pts, NEW.status, NEW.next_attempt_at, NEW.updated_at + ) + ON CONFLICT (target_user_id) DO UPDATE + SET head_id = EXCLUDED.head_id, + head_pts = EXCLUDED.head_pts, + status = EXCLUDED.status, + next_attempt_at = EXCLUDED.next_attempt_at, + updated_at = EXCLUDED.updated_at + WHERE (EXCLUDED.head_pts, EXCLUDED.head_id) < + (dispatch_outbox_user_heads.head_pts, dispatch_outbox_user_heads.head_id); + RETURN NULL; + ELSIF TG_OP = 'UPDATE' THEN + UPDATE dispatch_outbox_user_heads + SET status = NEW.status, + next_attempt_at = NEW.next_attempt_at, + updated_at = NEW.updated_at + WHERE target_user_id = NEW.target_user_id + AND head_id = NEW.id; + RETURN NULL; + END IF; + + DELETE FROM dispatch_outbox_user_heads + WHERE target_user_id = OLD.target_user_id + AND head_id = OLD.id + RETURNING head_id INTO removed_head; + + IF removed_head IS NOT NULL THEN + INSERT INTO dispatch_outbox_user_heads ( + target_user_id, head_id, head_pts, status, next_attempt_at, updated_at + ) + SELECT target_user_id, id, pts, status, next_attempt_at, updated_at + FROM dispatch_outbox + WHERE target_user_id = OLD.target_user_id + ORDER BY pts ASC, id ASC + LIMIT 1 + ON CONFLICT (target_user_id) DO UPDATE + SET head_id = EXCLUDED.head_id, + head_pts = EXCLUDED.head_pts, + status = EXCLUDED.status, + next_attempt_at = EXCLUDED.next_attempt_at, + updated_at = EXCLUDED.updated_at + WHERE (EXCLUDED.head_pts, EXCLUDED.head_id) < + (dispatch_outbox_user_heads.head_pts, dispatch_outbox_user_heads.head_id); + END IF; + RETURN NULL; +END; +$$; + +CREATE TRIGGER dispatch_outbox_insert_user_head +AFTER INSERT ON dispatch_outbox +FOR EACH ROW +EXECUTE FUNCTION dispatch_outbox_maintain_user_head(); + +DROP FUNCTION dispatch_outbox_lane_advisory_key(bigint); diff --git a/deploy/migrations/20260901000010_dispatch_outbox_append_head_noop.up.sql b/deploy/migrations/20260901000010_dispatch_outbox_append_head_noop.up.sql new file mode 100644 index 00000000..046d8614 --- /dev/null +++ b/deploy/migrations/20260901000010_dispatch_outbox_append_head_noop.up.sql @@ -0,0 +1,118 @@ +-- Producers hold a shared per-lane fence until commit. A consumer that may +-- remove the last head takes the exclusive form in a preceding statement; +-- after that fence is acquired, its DELETE sees every earlier append or every +-- later append observes the missing marker and installs a new one. +CREATE FUNCTION dispatch_outbox_lane_advisory_key(target_user_id bigint) +RETURNS bigint +LANGUAGE sql +IMMUTABLE +STRICT +PARALLEL SAFE +AS $$ + SELECT hashtextextended('telesrv:dispatch-outbox-lane:' || target_user_id::text, 0) +$$; + +DROP TRIGGER dispatch_outbox_insert_user_head ON dispatch_outbox; + +CREATE FUNCTION dispatch_outbox_insert_user_heads() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +BEGIN + PERFORM pg_advisory_xact_lock_shared( + dispatch_outbox_lane_advisory_key(streams.target_user_id) + ) + FROM ( + SELECT DISTINCT target_user_id + FROM new_rows + ORDER BY target_user_id + ) AS streams; + + -- The anti-join avoids touching a committed mutable head. ON CONFLICT is + -- retained only for concurrent producers racing to create an empty lane. + WITH candidates AS MATERIALIZED ( + SELECT DISTINCT ON (target_user_id) + target_user_id, id AS head_id, pts AS head_pts, + status, next_attempt_at, updated_at + FROM new_rows + ORDER BY target_user_id, pts, id + ) + INSERT INTO dispatch_outbox_user_heads ( + target_user_id, head_id, head_pts, status, next_attempt_at, updated_at + ) + SELECT + c.target_user_id, c.head_id, c.head_pts, + c.status, c.next_attempt_at, c.updated_at + FROM candidates c + WHERE NOT EXISTS ( + SELECT 1 + FROM dispatch_outbox_user_heads existing + WHERE existing.target_user_id = c.target_user_id + ) + ON CONFLICT (target_user_id) DO NOTHING; + RETURN NULL; +END; +$$; + +CREATE OR REPLACE FUNCTION dispatch_outbox_maintain_user_head() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +DECLARE + removed_head bigint; +BEGIN + IF TG_OP = 'UPDATE' THEN + UPDATE dispatch_outbox_user_heads + SET status = NEW.status, + next_attempt_at = NEW.next_attempt_at, + updated_at = NEW.updated_at + WHERE target_user_id = NEW.target_user_id + AND head_id = NEW.id; + RETURN NULL; + END IF; + + DELETE FROM dispatch_outbox_user_heads + WHERE target_user_id = OLD.target_user_id + AND head_id = OLD.id + RETURNING head_id INTO removed_head; + + IF removed_head IS NOT NULL THEN + INSERT INTO dispatch_outbox_user_heads ( + target_user_id, head_id, head_pts, status, next_attempt_at, updated_at + ) + SELECT target_user_id, id, pts, status, next_attempt_at, updated_at + FROM dispatch_outbox + WHERE target_user_id = OLD.target_user_id + ORDER BY pts ASC, id ASC + LIMIT 1 + ON CONFLICT (target_user_id) DO UPDATE + SET head_id = EXCLUDED.head_id, + head_pts = EXCLUDED.head_pts, + status = EXCLUDED.status, + next_attempt_at = EXCLUDED.next_attempt_at, + updated_at = EXCLUDED.updated_at + WHERE (EXCLUDED.head_pts, EXCLUDED.head_id) < + (dispatch_outbox_user_heads.head_pts, dispatch_outbox_user_heads.head_id); + END IF; + RETURN NULL; +END; +$$; + +CREATE TRIGGER dispatch_outbox_insert_user_head +AFTER INSERT ON dispatch_outbox +REFERENCING NEW TABLE AS new_rows +FOR EACH STATEMENT +EXECUTE FUNCTION dispatch_outbox_insert_user_heads(); + +-- Repair any marker that may be absent when upgrading from an interrupted or +-- older deployment. Startup migration runs before the dispatcher starts. +INSERT INTO dispatch_outbox_user_heads ( + target_user_id, head_id, head_pts, status, next_attempt_at, updated_at +) +SELECT DISTINCT ON (d.target_user_id) + d.target_user_id, d.id, d.pts, d.status, d.next_attempt_at, d.updated_at +FROM dispatch_outbox d +LEFT JOIN dispatch_outbox_user_heads h USING (target_user_id) +WHERE h.target_user_id IS NULL +ORDER BY d.target_user_id, d.pts, d.id +ON CONFLICT (target_user_id) DO NOTHING; diff --git a/deploy/migrations/20260901000011_dialog_top_projection_invalidation.down.sql b/deploy/migrations/20260901000011_dialog_top_projection_invalidation.down.sql new file mode 100644 index 00000000..3db8f02c --- /dev/null +++ b/deploy/migrations/20260901000011_dialog_top_projection_invalidation.down.sql @@ -0,0 +1,11 @@ +DROP TRIGGER IF EXISTS channel_message_reactions_dialog_top_projection_changed ON channel_message_reactions; +DROP FUNCTION IF EXISTS telesrv_notify_channel_top_reactions_read_model(); + +DROP TRIGGER IF EXISTS channel_messages_dialog_top_projection_changed ON channel_messages; +DROP FUNCTION IF EXISTS telesrv_notify_channel_top_message_read_model(); + +DROP TRIGGER IF EXISTS private_message_reactions_dialog_top_projection_changed ON private_message_reactions; +DROP FUNCTION IF EXISTS telesrv_notify_private_top_reactions_read_model(); + +DROP TRIGGER IF EXISTS message_boxes_dialog_top_projection_changed ON message_boxes; +DROP FUNCTION IF EXISTS telesrv_notify_private_top_message_read_model(); diff --git a/deploy/migrations/20260901000011_dialog_top_projection_invalidation.up.sql b/deploy/migrations/20260901000011_dialog_top_projection_invalidation.up.sql new file mode 100644 index 00000000..002ed6f8 --- /dev/null +++ b/deploy/migrations/20260901000011_dialog_top_projection_invalidation.up.sql @@ -0,0 +1,135 @@ +-- Complete the dialog_light/channel_base dependency closure for cached dialog +-- top-message projections. These triggers only bump read-model versions; they +-- do not allocate PTS or mutate message/update facts. + +CREATE OR REPLACE FUNCTION telesrv_notify_private_top_message_read_model() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +BEGIN + IF EXISTS ( + SELECT 1 + FROM dialogs d + WHERE d.user_id = NEW.owner_user_id + AND d.peer_type = NEW.peer_type + AND d.peer_id = NEW.peer_id + AND d.top_message_id = NEW.box_id + ) THEN + PERFORM telesrv_bump_dialog_light(NEW.owner_user_id, NEW.peer_type, NEW.peer_id); + END IF; + RETURN NULL; +END; +$$; + +CREATE TRIGGER message_boxes_dialog_top_projection_changed +AFTER UPDATE OF + message_date, body, entities, deleted, edit_date, silent, noforwards, + reply_to_msg_id, reply_to_peer_type, reply_to_peer_id, reply_to_top_id, + reply_to_story_id, quote_text, quote_entities, quote_offset, + fwd_from_peer_type, fwd_from_peer_id, fwd_from_name, fwd_date, + fwd_saved_from_peer_type, fwd_saved_from_peer_id, fwd_saved_from_msg_id, + media, media_unread, reaction_unread, ttl_period, expires_at, pinned, + saved_peer_type, saved_peer_id, reply_markup, via_bot_id, rich_message, + grouped_id, effect, hide_edited +ON message_boxes +FOR EACH ROW +EXECUTE FUNCTION telesrv_notify_private_top_message_read_model(); + +CREATE OR REPLACE FUNCTION telesrv_notify_private_top_reactions_read_model() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +DECLARE + changed_sender_id BIGINT; + changed_message_id BIGINT; +BEGIN + IF TG_OP = 'DELETE' THEN + changed_sender_id := OLD.message_sender_id; + changed_message_id := OLD.private_message_id; + ELSE + changed_sender_id := NEW.message_sender_id; + changed_message_id := NEW.private_message_id; + END IF; + + PERFORM telesrv_bump_dialog_light(b.owner_user_id, b.peer_type, b.peer_id) + FROM message_boxes b + JOIN dialogs d + ON d.user_id = b.owner_user_id + AND d.peer_type = b.peer_type + AND d.peer_id = b.peer_id + AND d.top_message_id = b.box_id + WHERE b.message_sender_id = changed_sender_id + AND b.private_message_id = changed_message_id + AND NOT b.deleted; + RETURN NULL; +END; +$$; + +CREATE TRIGGER private_message_reactions_dialog_top_projection_changed +AFTER INSERT OR DELETE OR UPDATE +ON private_message_reactions +FOR EACH ROW +EXECUTE FUNCTION telesrv_notify_private_top_reactions_read_model(); + +CREATE OR REPLACE FUNCTION telesrv_notify_channel_top_message_read_model() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +BEGIN + IF EXISTS ( + SELECT 1 + FROM channels c + WHERE c.id = NEW.channel_id + AND c.top_message_id = NEW.id + ) THEN + PERFORM telesrv_bump_read_model_version('channel_base', 0, 'channel', NEW.channel_id); + END IF; + RETURN NULL; +END; +$$; + +CREATE TRIGGER channel_messages_dialog_top_projection_changed +AFTER UPDATE OF + sender_user_id, from_peer_type, from_peer_id, send_as_peer_type, send_as_peer_id, + message_date, edit_date, post, silent, noforwards, body, entities, reply_to, + reply_to_msg_id, reply_to_peer_type, reply_to_peer_id, reply_to_top_id, fwd_from, + discussion_channel_id, discussion_message_id, action, deleted, views_count, media, + ttl_period, expires_at, post_author, pinned, via_bot_id, reply_markup, + from_boosts_applied, rich_message +ON channel_messages +FOR EACH ROW +EXECUTE FUNCTION telesrv_notify_channel_top_message_read_model(); + +CREATE OR REPLACE FUNCTION telesrv_notify_channel_top_reactions_read_model() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +DECLARE + changed_channel_id BIGINT; + changed_message_id INTEGER; +BEGIN + IF TG_OP = 'DELETE' THEN + changed_channel_id := OLD.channel_id; + changed_message_id := OLD.message_id; + ELSE + changed_channel_id := NEW.channel_id; + changed_message_id := NEW.message_id; + END IF; + + IF EXISTS ( + SELECT 1 + FROM channels c + WHERE c.id = changed_channel_id + AND c.top_message_id = changed_message_id + ) THEN + PERFORM telesrv_bump_read_model_version('channel_base', 0, 'channel', changed_channel_id); + END IF; + RETURN NULL; +END; +$$; + +CREATE TRIGGER channel_message_reactions_dialog_top_projection_changed +AFTER INSERT OR DELETE OR UPDATE +ON channel_message_reactions +FOR EACH ROW +EXECUTE FUNCTION telesrv_notify_channel_top_reactions_read_model(); diff --git a/deploy/migrations/20260901000012_community_catalog_read_model.down.sql b/deploy/migrations/20260901000012_community_catalog_read_model.down.sql new file mode 100644 index 00000000..1360a5f9 --- /dev/null +++ b/deploy/migrations/20260901000012_community_catalog_read_model.down.sql @@ -0,0 +1,7 @@ +DROP TRIGGER IF EXISTS communities_bump_catalog_read_model ON public.communities; +DROP FUNCTION IF EXISTS public.telesrv_bump_community_catalog_read_model(); +DELETE FROM public.read_model_versions +WHERE model = 'community_catalog' + AND owner_user_id = 0 + AND peer_type = 'community' + AND peer_id = 0; diff --git a/deploy/migrations/20260901000012_community_catalog_read_model.up.sql b/deploy/migrations/20260901000012_community_catalog_read_model.up.sql new file mode 100644 index 00000000..740e5b4f --- /dev/null +++ b/deploy/migrations/20260901000012_community_catalog_read_model.up.sql @@ -0,0 +1,34 @@ +-- Global Community-catalog presence token. messages.getDialogs needs collapsed +-- Communities only when at least one live Community exists; without this +-- durable invalidation token an empty deployment would repeat the expensive +-- owner-membership query on every dialogs page. + +CREATE OR REPLACE FUNCTION public.telesrv_bump_community_catalog_read_model() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +BEGIN + PERFORM public.telesrv_bump_read_model_version( + 'community_catalog', + 0, + 'community', + 0 + ); + IF TG_OP = 'DELETE' THEN + RETURN OLD; + END IF; + RETURN NEW; +END; +$$; + +DROP TRIGGER IF EXISTS communities_bump_catalog_read_model ON public.communities; +CREATE TRIGGER communities_bump_catalog_read_model +AFTER INSERT OR UPDATE OR DELETE ON public.communities +FOR EACH ROW EXECUTE FUNCTION public.telesrv_bump_community_catalog_read_model(); + +SELECT public.telesrv_bump_read_model_version( + 'community_catalog', + 0, + 'community', + 0 +); diff --git a/deploy/migrations/20260901000013_auth_session_layer_advance_function.down.sql b/deploy/migrations/20260901000013_auth_session_layer_advance_function.down.sql new file mode 100644 index 00000000..cd1ab581 --- /dev/null +++ b/deploy/migrations/20260901000013_auth_session_layer_advance_function.down.sql @@ -0,0 +1,7 @@ +DROP FUNCTION IF EXISTS public.telesrv_advance_auth_session_layer( + bigint, + bigint, + integer, + bigint, + timestamptz +); diff --git a/deploy/migrations/20260901000013_auth_session_layer_advance_function.up.sql b/deploy/migrations/20260901000013_auth_session_layer_advance_function.up.sql new file mode 100644 index 00000000..6240d009 --- /dev/null +++ b/deploy/migrations/20260901000013_auth_session_layer_advance_function.up.sql @@ -0,0 +1,245 @@ +-- Advance one explicit invokeWithLayer observation without paying one client +-- round trip for every lock, comparison and projection update. The caller +-- still owns the surrounding transaction/savepoint so identity_changed can +-- roll the complete attempt back and retry with a fresh READ COMMITTED view. + +CREATE OR REPLACE FUNCTION public.telesrv_advance_auth_session_layer( + p_raw_auth_key_id bigint, + p_session_id bigint, + p_layer integer, + p_msg_id bigint, + p_expires_at timestamptz +) +RETURNS TABLE ( + advance_status text, + current_layer integer, + current_msg_id bigint, + current_observation_id bigint, + current_expires_at timestamptz, + shared_default boolean, + applied boolean +) +LANGUAGE plpgsql +AS $$ +DECLARE + v_now timestamptz := now(); + v_hint_expiry integer; + v_hint_perm_id bigint; + v_hint_bound boolean := false; + v_hint_has_identity boolean := false; + v_hint_identity_id bigint; + v_raw_expiry integer; + v_actual_perm_id bigint; + v_actual_bound boolean := false; + v_actual_has_identity boolean := false; + v_actual_identity_id bigint; + v_perm_expiry integer; + v_current_found boolean := false; + v_current_layer integer := 0; + v_current_msg_id bigint := 0; + v_current_observation_id bigint := 0; + v_current_expires_at timestamptz := p_expires_at; + v_shared_default boolean := false; + v_observation_id bigint; + v_key_ids bigint[]; + v_updated integer; +BEGIN + IF p_layer <= 0 + OR p_msg_id <= 0 + OR p_msg_id % 4 <> 0 + OR (p_msg_id & 4294967295) = 0 + OR p_expires_at IS NULL + OR NOT v_now < p_expires_at + OR p_expires_at - interval '301 seconds' > v_now + interval '30 seconds' + THEN + RETURN QUERY SELECT + 'evidence_invalid'::text, 0, 0::bigint, 0::bigint, + COALESCE(p_expires_at, v_now), false, false; + RETURN; + END IF; + + -- Lock-free identity hint. It is deliberately revalidated after the raw + -- row lock; a newly committed first bind returns identity_changed rather + -- than taking a permanent identity lock in raw->identity order. + SELECT key.expires_at, binding.perm_auth_key_id + INTO v_hint_expiry, v_hint_perm_id + FROM public.auth_keys AS key + LEFT JOIN public.temp_auth_key_bindings AS binding + ON binding.temp_auth_key_id = key.auth_key_id + WHERE key.auth_key_id = p_raw_auth_key_id; + IF NOT FOUND THEN + RETURN QUERY SELECT + 'auth_key_not_found'::text, 0, 0::bigint, 0::bigint, + p_expires_at, false, false; + RETURN; + END IF; + + v_hint_bound := v_hint_perm_id IS NOT NULL; + v_hint_has_identity := v_hint_bound OR v_hint_expiry = 0; + IF v_hint_has_identity THEN + v_hint_identity_id := CASE + WHEN v_hint_bound THEN v_hint_perm_id + ELSE p_raw_auth_key_id + END; + PERFORM pg_advisory_xact_lock( + 1096111176::integer, + hashint8(v_hint_identity_id)::integer + ); + END IF; + + SELECT key.expires_at + INTO v_raw_expiry + FROM public.auth_keys AS key + WHERE key.auth_key_id = p_raw_auth_key_id + FOR UPDATE; + IF NOT FOUND THEN + RETURN QUERY SELECT + 'auth_key_not_found'::text, 0, 0::bigint, 0::bigint, + p_expires_at, false, false; + RETURN; + END IF; + + v_actual_perm_id := NULL; + SELECT binding.perm_auth_key_id + INTO v_actual_perm_id + FROM public.temp_auth_key_bindings AS binding + WHERE binding.temp_auth_key_id = p_raw_auth_key_id; + v_actual_bound := FOUND; + IF NOT v_actual_bound THEN + v_actual_perm_id := p_raw_auth_key_id; + END IF; + v_actual_has_identity := v_actual_bound OR v_raw_expiry = 0; + v_actual_identity_id := v_actual_perm_id; + + IF v_actual_has_identity <> v_hint_has_identity + OR (v_actual_has_identity AND v_actual_identity_id <> v_hint_identity_id) + OR v_actual_bound <> v_hint_bound + OR v_raw_expiry <> v_hint_expiry + THEN + RETURN QUERY SELECT + 'identity_changed'::text, 0, 0::bigint, 0::bigint, + p_expires_at, false, false; + RETURN; + END IF; + + IF v_actual_bound THEN + SELECT key.expires_at + INTO v_perm_expiry + FROM public.auth_keys AS key + WHERE key.auth_key_id = v_actual_perm_id + FOR UPDATE; + IF NOT FOUND OR v_raw_expiry <= 0 OR v_perm_expiry <> 0 THEN + RETURN QUERY SELECT + 'binding_invalid'::text, 0, 0::bigint, 0::bigint, + p_expires_at, false, false; + RETURN; + END IF; + END IF; + + SELECT evidence.layer, + evidence.msg_id, + evidence.observation_id, + evidence.expires_at + INTO v_current_layer, + v_current_msg_id, + v_current_observation_id, + v_current_expires_at + FROM public.auth_key_session_layers AS evidence + WHERE evidence.raw_auth_key_id = p_raw_auth_key_id + AND evidence.session_id = p_session_id + FOR UPDATE; + v_current_found := FOUND; + + IF v_current_found AND v_now < v_current_expires_at THEN + IF p_msg_id < v_current_msg_id THEN + SELECT key.layer = v_current_layer + AND key.layer_observation_id = v_current_observation_id + INTO v_shared_default + FROM public.auth_keys AS key + WHERE key.auth_key_id = v_actual_perm_id; + RETURN QUERY SELECT + 'ok'::text, v_current_layer, v_current_msg_id, + v_current_observation_id, v_current_expires_at, + v_shared_default, false; + RETURN; + END IF; + IF p_msg_id = v_current_msg_id THEN + IF p_layer <> v_current_layer THEN + RETURN QUERY SELECT + 'conflict'::text, v_current_layer, v_current_msg_id, + v_current_observation_id, v_current_expires_at, + false, false; + RETURN; + END IF; + SELECT key.layer = v_current_layer + AND key.layer_observation_id = v_current_observation_id + INTO v_shared_default + FROM public.auth_keys AS key + WHERE key.auth_key_id = v_actual_perm_id; + RETURN QUERY SELECT + 'ok'::text, v_current_layer, v_current_msg_id, + v_current_observation_id, v_current_expires_at, + v_shared_default, false; + RETURN; + END IF; + END IF; + + v_observation_id := nextval('public.auth_key_layer_observation_seq'); + INSERT INTO public.auth_key_session_layers ( + raw_auth_key_id, + session_id, + layer, + msg_id, + observation_id, + expires_at + ) VALUES ( + p_raw_auth_key_id, + p_session_id, + p_layer, + p_msg_id, + v_observation_id, + p_expires_at + ) + ON CONFLICT (raw_auth_key_id, session_id) DO UPDATE SET + layer = EXCLUDED.layer, + msg_id = EXCLUDED.msg_id, + observation_id = EXCLUDED.observation_id, + expires_at = EXCLUDED.expires_at + RETURNING layer, msg_id, observation_id, expires_at + INTO v_current_layer, + v_current_msg_id, + v_current_observation_id, + v_current_expires_at; + + v_key_ids := ARRAY[p_raw_auth_key_id]; + IF v_actual_perm_id <> p_raw_auth_key_id THEN + v_key_ids := array_append(v_key_ids, v_actual_perm_id); + END IF; + UPDATE public.auth_keys AS key + SET layer = p_layer, + layer_observation_id = v_observation_id + WHERE key.auth_key_id = ANY(v_key_ids) + AND key.layer_observation_id < v_observation_id; + GET DIAGNOSTICS v_updated = ROW_COUNT; + IF v_updated <> cardinality(v_key_ids) THEN + RAISE EXCEPTION + 'publish auth session Layer defaults updated % of % locked keys', + v_updated, + cardinality(v_key_ids) + USING ERRCODE = '23000'; + END IF; + + UPDATE public.authorizations AS authz + SET layer = p_layer + WHERE authz.auth_key_id = ANY(v_key_ids); + + RETURN QUERY SELECT + 'ok'::text, v_current_layer, v_current_msg_id, + v_current_observation_id, v_current_expires_at, + true, true; +END; +$$; + +COMMENT ON FUNCTION public.telesrv_advance_auth_session_layer( + bigint, bigint, integer, bigint, timestamptz +) IS 'Atomically advances durable invokeWithLayer evidence while preserving auth identity lock order'; diff --git a/deploy/migrations/20260901000014_peer_identity_read_model.down.sql b/deploy/migrations/20260901000014_peer_identity_read_model.down.sql new file mode 100644 index 00000000..93e9d383 --- /dev/null +++ b/deploy/migrations/20260901000014_peer_identity_read_model.down.sql @@ -0,0 +1,7 @@ +DROP TRIGGER IF EXISTS custom_verifications_peer_identity_changed ON public.custom_verifications; +DROP TRIGGER IF EXISTS peer_usernames_peer_identity_changed ON public.peer_usernames; +DROP FUNCTION IF EXISTS public.telesrv_notify_peer_identity_row(); +DROP FUNCTION IF EXISTS public.telesrv_bump_peer_identity(text, bigint); + +DELETE FROM public.read_model_versions +WHERE model = 'peer_identity'; diff --git a/deploy/migrations/20260901000014_peer_identity_read_model.up.sql b/deploy/migrations/20260901000014_peer_identity_read_model.up.sql new file mode 100644 index 00000000..566ddfed --- /dev/null +++ b/deploy/migrations/20260901000014_peer_identity_read_model.up.sql @@ -0,0 +1,68 @@ +-- Viewer-independent peer decorations are projected on every peer-bearing RPC +-- response. Keep one durable version token for username registry vectors and +-- third-party bot-verification marks so positive and negative L1 entries can be +-- reused without one PostgreSQL query per response page. + +CREATE OR REPLACE FUNCTION public.telesrv_bump_peer_identity( + p_peer_type text, + p_peer_id bigint +) RETURNS void +LANGUAGE plpgsql +AS $$ +BEGIN + IF COALESCE(p_peer_id, 0) = 0 OR p_peer_type NOT IN ('user', 'channel') THEN + RETURN; + END IF; + + PERFORM public.telesrv_bump_read_model_version( + 'peer_identity', 0, p_peer_type, p_peer_id + ); +END; +$$; + +CREATE OR REPLACE FUNCTION public.telesrv_notify_peer_identity_row() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +BEGIN + IF TG_OP = 'DELETE' THEN + PERFORM public.telesrv_bump_peer_identity(OLD.peer_type, OLD.peer_id); + RETURN OLD; + END IF; + + IF TG_OP = 'UPDATE' + AND (OLD.peer_type, OLD.peer_id) IS DISTINCT FROM (NEW.peer_type, NEW.peer_id) THEN + PERFORM public.telesrv_bump_peer_identity(OLD.peer_type, OLD.peer_id); + END IF; + PERFORM public.telesrv_bump_peer_identity(NEW.peer_type, NEW.peer_id); + RETURN NEW; +END; +$$; + +DROP TRIGGER IF EXISTS peer_usernames_peer_identity_changed ON public.peer_usernames; +CREATE TRIGGER peer_usernames_peer_identity_changed +AFTER INSERT OR UPDATE OR DELETE ON public.peer_usernames +FOR EACH ROW EXECUTE FUNCTION public.telesrv_notify_peer_identity_row(); + +DROP TRIGGER IF EXISTS custom_verifications_peer_identity_changed ON public.custom_verifications; +CREATE TRIGGER custom_verifications_peer_identity_changed +AFTER INSERT OR UPDATE OR DELETE ON public.custom_verifications +FOR EACH ROW EXECUTE FUNCTION public.telesrv_notify_peer_identity_row(); + +-- Seed every durable peer, including peers with no registry row/mark. This is +-- what makes an empty result a versioned negative fact rather than a TTL guess. +INSERT INTO public.read_model_versions ( + model, owner_user_id, peer_type, peer_id, version, hash, updated_at +) +SELECT 'peer_identity', 0, 'user', u.id, 1, + public.telesrv_random_read_model_hash(), now() +FROM public.users u +ON CONFLICT (model, owner_user_id, peer_type, peer_id) DO NOTHING; + +INSERT INTO public.read_model_versions ( + model, owner_user_id, peer_type, peer_id, version, hash, updated_at +) +SELECT 'peer_identity', 0, 'channel', c.id, 1, + public.telesrv_random_read_model_hash(), now() +FROM public.channels c +ON CONFLICT (model, owner_user_id, peer_type, peer_id) DO NOTHING; diff --git a/deploy/migrations/20260901000015_story_projection_sparse_read_models.down.sql b/deploy/migrations/20260901000015_story_projection_sparse_read_models.down.sql new file mode 100644 index 00000000..753f3419 --- /dev/null +++ b/deploy/migrations/20260901000015_story_projection_sparse_read_models.down.sql @@ -0,0 +1,43 @@ +DROP TRIGGER IF EXISTS users_story_projection_versions_changed ON public.users; +DROP TRIGGER IF EXISTS channels_story_projection_version_changed ON public.channels; +DROP TRIGGER IF EXISTS telesrv_stories_story_peer_read_model ON public.stories; +DROP TRIGGER IF EXISTS telesrv_story_hidden_peers_story_peer_read_model ON public.story_hidden_peers; + +DROP FUNCTION IF EXISTS public.telesrv_maintain_user_story_projection_versions(); +DROP FUNCTION IF EXISTS public.telesrv_maintain_channel_story_projection_version(); +DROP FUNCTION IF EXISTS public.telesrv_notify_story_row_read_models(); +DROP FUNCTION IF EXISTS public.telesrv_notify_story_hidden_row_read_models(); +DROP FUNCTION IF EXISTS public.telesrv_bump_story_hidden_list(bigint); +DROP FUNCTION IF EXISTS public.telesrv_bump_story_peer(text, bigint); + +CREATE OR REPLACE FUNCTION public.telesrv_notify_story_peer_read_model() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +DECLARE + o_type text; + o_id bigint; +BEGIN + IF TG_OP = 'DELETE' THEN + o_type := OLD.owner_peer_type; + o_id := OLD.owner_peer_id; + ELSE + o_type := NEW.owner_peer_type; + o_id := NEW.owner_peer_id; + END IF; + PERFORM public.telesrv_bump_read_model_version('story_peer', 0, o_type, o_id); + RETURN NULL; +END; +$$; + +CREATE TRIGGER telesrv_stories_story_peer_read_model +AFTER INSERT OR UPDATE OR DELETE ON public.stories +FOR EACH ROW EXECUTE FUNCTION public.telesrv_notify_story_peer_read_model(); + +CREATE TRIGGER telesrv_story_hidden_peers_story_peer_read_model +AFTER INSERT OR UPDATE OR DELETE ON public.story_hidden_peers +FOR EACH ROW EXECUTE FUNCTION public.telesrv_notify_story_peer_read_model(); + +DELETE FROM public.read_model_versions WHERE model = 'story_hidden_list'; +-- story_peer rows seeded for peers without stories are harmless under the +-- previous contract and are retained so rollback cannot erase real versions. diff --git a/deploy/migrations/20260901000015_story_projection_sparse_read_models.up.sql b/deploy/migrations/20260901000015_story_projection_sparse_read_models.up.sql new file mode 100644 index 00000000..f7f8d6d2 --- /dev/null +++ b/deploy/migrations/20260901000015_story_projection_sparse_read_models.up.sql @@ -0,0 +1,161 @@ +-- Split story peer projection into a shared active-story gate and one sparse +-- hidden-peer snapshot per viewer. Both positive and negative facts receive a +-- durable token; active expiry is still enforced by expire_date at read time. + +CREATE OR REPLACE FUNCTION public.telesrv_bump_story_peer( + p_peer_type text, + p_peer_id bigint +) RETURNS void +LANGUAGE plpgsql +AS $$ +BEGIN + IF COALESCE(p_peer_type, '') NOT IN ('user', 'channel') + OR COALESCE(p_peer_id, 0) = 0 THEN + RETURN; + END IF; + PERFORM public.telesrv_bump_read_model_version( + 'story_peer', 0, p_peer_type, p_peer_id + ); +END; +$$; + +CREATE OR REPLACE FUNCTION public.telesrv_bump_story_hidden_list( + p_viewer_user_id bigint +) RETURNS void +LANGUAGE plpgsql +AS $$ +BEGIN + IF COALESCE(p_viewer_user_id, 0) = 0 THEN + RETURN; + END IF; + PERFORM public.telesrv_bump_read_model_version( + 'story_hidden_list', p_viewer_user_id, 'user', p_viewer_user_id + ); +END; +$$; + +CREATE OR REPLACE FUNCTION public.telesrv_notify_story_row_read_models() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +BEGIN + IF TG_OP = 'DELETE' THEN + PERFORM public.telesrv_bump_story_peer(OLD.owner_peer_type, OLD.owner_peer_id); + RETURN OLD; + END IF; + IF TG_OP = 'UPDATE' + AND (OLD.owner_peer_type, OLD.owner_peer_id) + IS DISTINCT FROM (NEW.owner_peer_type, NEW.owner_peer_id) THEN + PERFORM public.telesrv_bump_story_peer(OLD.owner_peer_type, OLD.owner_peer_id); + END IF; + PERFORM public.telesrv_bump_story_peer(NEW.owner_peer_type, NEW.owner_peer_id); + RETURN NEW; +END; +$$; + +CREATE OR REPLACE FUNCTION public.telesrv_notify_story_hidden_row_read_models() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +BEGIN + IF TG_OP = 'DELETE' THEN + PERFORM public.telesrv_bump_story_peer(OLD.owner_peer_type, OLD.owner_peer_id); + PERFORM public.telesrv_bump_story_hidden_list(OLD.viewer_user_id); + RETURN OLD; + END IF; + IF TG_OP = 'UPDATE' THEN + IF (OLD.owner_peer_type, OLD.owner_peer_id) + IS DISTINCT FROM (NEW.owner_peer_type, NEW.owner_peer_id) THEN + PERFORM public.telesrv_bump_story_peer(OLD.owner_peer_type, OLD.owner_peer_id); + END IF; + IF OLD.viewer_user_id IS DISTINCT FROM NEW.viewer_user_id THEN + PERFORM public.telesrv_bump_story_hidden_list(OLD.viewer_user_id); + END IF; + END IF; + PERFORM public.telesrv_bump_story_peer(NEW.owner_peer_type, NEW.owner_peer_id); + PERFORM public.telesrv_bump_story_hidden_list(NEW.viewer_user_id); + RETURN NEW; +END; +$$; + +DROP TRIGGER IF EXISTS telesrv_stories_story_peer_read_model ON public.stories; +CREATE TRIGGER telesrv_stories_story_peer_read_model +AFTER INSERT OR UPDATE OR DELETE ON public.stories +FOR EACH ROW EXECUTE FUNCTION public.telesrv_notify_story_row_read_models(); + +DROP TRIGGER IF EXISTS telesrv_story_hidden_peers_story_peer_read_model ON public.story_hidden_peers; +CREATE TRIGGER telesrv_story_hidden_peers_story_peer_read_model +AFTER INSERT OR UPDATE OR DELETE ON public.story_hidden_peers +FOR EACH ROW EXECUTE FUNCTION public.telesrv_notify_story_hidden_row_read_models(); + +CREATE OR REPLACE FUNCTION public.telesrv_maintain_user_story_projection_versions() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +BEGIN + IF TG_OP = 'DELETE' THEN + PERFORM public.telesrv_bump_story_peer('user', OLD.id); + PERFORM public.telesrv_bump_story_hidden_list(OLD.id); + DELETE FROM public.read_model_versions + WHERE (model = 'story_peer' AND owner_user_id = 0 + AND peer_type = 'user' AND peer_id = OLD.id) + OR (model = 'story_hidden_list' AND owner_user_id = OLD.id + AND peer_type = 'user' AND peer_id = OLD.id); + RETURN OLD; + END IF; + PERFORM public.telesrv_bump_story_peer('user', NEW.id); + PERFORM public.telesrv_bump_story_hidden_list(NEW.id); + RETURN NEW; +END; +$$; + +DROP TRIGGER IF EXISTS users_story_projection_versions_changed ON public.users; +CREATE TRIGGER users_story_projection_versions_changed +AFTER INSERT OR DELETE ON public.users +FOR EACH ROW EXECUTE FUNCTION public.telesrv_maintain_user_story_projection_versions(); + +CREATE OR REPLACE FUNCTION public.telesrv_maintain_channel_story_projection_version() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +BEGIN + IF TG_OP = 'DELETE' THEN + PERFORM public.telesrv_bump_story_peer('channel', OLD.id); + DELETE FROM public.read_model_versions + WHERE model = 'story_peer' AND owner_user_id = 0 + AND peer_type = 'channel' AND peer_id = OLD.id; + RETURN OLD; + END IF; + PERFORM public.telesrv_bump_story_peer('channel', NEW.id); + RETURN NEW; +END; +$$; + +DROP TRIGGER IF EXISTS channels_story_projection_version_changed ON public.channels; +CREATE TRIGGER channels_story_projection_version_changed +AFTER INSERT OR DELETE ON public.channels +FOR EACH ROW EXECUTE FUNCTION public.telesrv_maintain_channel_story_projection_version(); + +INSERT INTO public.read_model_versions ( + model, owner_user_id, peer_type, peer_id, version, hash, updated_at +) +SELECT 'story_peer', 0, 'user', u.id, 1, + public.telesrv_random_read_model_hash(), now() +FROM public.users u +ON CONFLICT (model, owner_user_id, peer_type, peer_id) DO NOTHING; + +INSERT INTO public.read_model_versions ( + model, owner_user_id, peer_type, peer_id, version, hash, updated_at +) +SELECT 'story_peer', 0, 'channel', c.id, 1, + public.telesrv_random_read_model_hash(), now() +FROM public.channels c +ON CONFLICT (model, owner_user_id, peer_type, peer_id) DO NOTHING; + +INSERT INTO public.read_model_versions ( + model, owner_user_id, peer_type, peer_id, version, hash, updated_at +) +SELECT 'story_hidden_list', u.id, 'user', u.id, 1, + public.telesrv_random_read_model_hash(), now() +FROM public.users u +ON CONFLICT (model, owner_user_id, peer_type, peer_id) DO NOTHING; diff --git a/deploy/migrations/20260901000016_dialog_owner_snapshot_read_model.down.sql b/deploy/migrations/20260901000016_dialog_owner_snapshot_read_model.down.sql new file mode 100644 index 00000000..ef728d8d --- /dev/null +++ b/deploy/migrations/20260901000016_dialog_owner_snapshot_read_model.down.sql @@ -0,0 +1,95 @@ +DROP TRIGGER IF EXISTS users_dialog_owner_read_model ON public.users; +DROP FUNCTION IF EXISTS public.telesrv_seed_dialog_owner_read_model(); + +DELETE FROM public.read_model_versions WHERE model = 'dialog_owner'; + +CREATE OR REPLACE FUNCTION public.telesrv_notify_dialog_light_read_model() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +DECLARE + owner_id bigint; + peer_type text; + peer_id bigint; +BEGIN + IF TG_OP = 'DELETE' THEN + owner_id := OLD.user_id; + peer_type := OLD.peer_type; + peer_id := OLD.peer_id; + ELSE + owner_id := NEW.user_id; + peer_type := NEW.peer_type; + peer_id := NEW.peer_id; + END IF; + + PERFORM public.telesrv_bump_dialog_light(owner_id, peer_type, peer_id); + RETURN NULL; +END; +$$; + +CREATE OR REPLACE FUNCTION public.telesrv_notify_channel_dialog_light_read_model() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +DECLARE + owner_id bigint; + channel_id bigint; +BEGIN + IF TG_OP = 'DELETE' THEN + owner_id := OLD.user_id; + channel_id := OLD.channel_id; + ELSE + owner_id := NEW.user_id; + channel_id := NEW.channel_id; + END IF; + + PERFORM public.telesrv_bump_dialog_light(owner_id, 'channel', channel_id); + RETURN NULL; +END; +$$; + +CREATE OR REPLACE FUNCTION public.telesrv_notify_channel_member_read_model() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +DECLARE + channel_id bigint; + user_id bigint; +BEGIN + IF TG_OP = 'DELETE' THEN + channel_id := OLD.channel_id; + user_id := OLD.user_id; + ELSE + channel_id := NEW.channel_id; + user_id := NEW.user_id; + END IF; + + PERFORM public.telesrv_bump_read_model_version('channel_member', user_id, 'channel', channel_id); + PERFORM public.telesrv_bump_dialog_light(user_id, 'channel', channel_id); + RETURN NULL; +END; +$$; + +CREATE OR REPLACE FUNCTION public.telesrv_bump_dialog_light( + p_owner_user_id bigint, + p_peer_type text, + p_peer_id bigint +) +RETURNS void +LANGUAGE plpgsql +AS $$ +BEGIN + IF COALESCE(p_owner_user_id, 0) = 0 + OR COALESCE(p_peer_id, 0) = 0 + OR COALESCE(p_peer_type, '') = '' + THEN + RETURN; + END IF; + + PERFORM public.telesrv_bump_read_model_version( + 'dialog_light', p_owner_user_id, p_peer_type, p_peer_id + ); +END; +$$; + +DROP FUNCTION IF EXISTS public.telesrv_bump_dialog_owner(bigint); diff --git a/deploy/migrations/20260901000016_dialog_owner_snapshot_read_model.up.sql b/deploy/migrations/20260901000016_dialog_owner_snapshot_read_model.up.sql new file mode 100644 index 00000000..299a45e4 --- /dev/null +++ b/deploy/migrations/20260901000016_dialog_owner_snapshot_read_model.up.sql @@ -0,0 +1,161 @@ +-- Owner collection generation for the Redis-backed messages.getDialogs header +-- snapshot. Shared channel mutations remain channel_base-only; membership and +-- owner-local dialog mutations advance this O(1) owner token. + +CREATE OR REPLACE FUNCTION public.telesrv_bump_dialog_owner(p_owner_user_id bigint) +RETURNS void +LANGUAGE plpgsql +AS $$ +BEGIN + IF COALESCE(p_owner_user_id, 0) = 0 THEN + RETURN; + END IF; + + PERFORM public.telesrv_bump_read_model_version( + 'dialog_owner', p_owner_user_id, 'user', p_owner_user_id + ); +END; +$$; + +-- dialog_owner is the owner-wide aggregate of every exact dialog_light +-- dependency. Extending the common helper closes private top-message, +-- reaction, contact/profile and future exact-dialog invalidation paths without +-- copying owner bumps into every trigger. +CREATE OR REPLACE FUNCTION public.telesrv_bump_dialog_light( + p_owner_user_id bigint, + p_peer_type text, + p_peer_id bigint +) +RETURNS void +LANGUAGE plpgsql +AS $$ +BEGIN + IF COALESCE(p_owner_user_id, 0) = 0 + OR COALESCE(p_peer_id, 0) = 0 + OR COALESCE(p_peer_type, '') = '' + THEN + RETURN; + END IF; + + PERFORM public.telesrv_bump_read_model_version( + 'dialog_light', p_owner_user_id, p_peer_type, p_peer_id + ); + PERFORM public.telesrv_bump_dialog_owner(p_owner_user_id); +END; +$$; + +CREATE OR REPLACE FUNCTION public.telesrv_seed_dialog_owner_read_model() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +BEGIN + PERFORM public.telesrv_bump_dialog_owner(NEW.id); + RETURN NULL; +END; +$$; + +CREATE TRIGGER users_dialog_owner_read_model +AFTER INSERT ON public.users +FOR EACH ROW EXECUTE FUNCTION public.telesrv_seed_dialog_owner_read_model(); + +CREATE OR REPLACE FUNCTION public.telesrv_notify_dialog_light_read_model() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +DECLARE + old_owner_id bigint; + old_peer_type text; + old_peer_id bigint; + new_owner_id bigint; + new_peer_type text; + new_peer_id bigint; +BEGIN + IF TG_OP <> 'INSERT' THEN + old_owner_id := OLD.user_id; + old_peer_type := OLD.peer_type; + old_peer_id := OLD.peer_id; + PERFORM public.telesrv_bump_dialog_light(old_owner_id, old_peer_type, old_peer_id); + END IF; + + IF TG_OP <> 'DELETE' THEN + new_owner_id := NEW.user_id; + new_peer_type := NEW.peer_type; + new_peer_id := NEW.peer_id; + IF TG_OP = 'INSERT' + OR (new_owner_id, new_peer_type, new_peer_id) + IS DISTINCT FROM (old_owner_id, old_peer_type, old_peer_id) + THEN + PERFORM public.telesrv_bump_dialog_light(new_owner_id, new_peer_type, new_peer_id); + END IF; + END IF; + RETURN NULL; +END; +$$; + +CREATE OR REPLACE FUNCTION public.telesrv_notify_channel_dialog_light_read_model() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +DECLARE + old_owner_id bigint; + old_channel_id bigint; + new_owner_id bigint; + new_channel_id bigint; +BEGIN + IF TG_OP <> 'INSERT' THEN + old_owner_id := OLD.user_id; + old_channel_id := OLD.channel_id; + PERFORM public.telesrv_bump_dialog_light(old_owner_id, 'channel', old_channel_id); + END IF; + + IF TG_OP <> 'DELETE' THEN + new_owner_id := NEW.user_id; + new_channel_id := NEW.channel_id; + IF TG_OP = 'INSERT' + OR (new_owner_id, new_channel_id) IS DISTINCT FROM (old_owner_id, old_channel_id) + THEN + PERFORM public.telesrv_bump_dialog_light(new_owner_id, 'channel', new_channel_id); + END IF; + END IF; + RETURN NULL; +END; +$$; + +CREATE OR REPLACE FUNCTION public.telesrv_notify_channel_member_read_model() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +DECLARE + old_channel_id bigint; + old_user_id bigint; + new_channel_id bigint; + new_user_id bigint; +BEGIN + IF TG_OP <> 'INSERT' THEN + old_channel_id := OLD.channel_id; + old_user_id := OLD.user_id; + PERFORM public.telesrv_bump_read_model_version('channel_member', old_user_id, 'channel', old_channel_id); + PERFORM public.telesrv_bump_dialog_light(old_user_id, 'channel', old_channel_id); + END IF; + + IF TG_OP <> 'DELETE' THEN + new_channel_id := NEW.channel_id; + new_user_id := NEW.user_id; + IF TG_OP = 'INSERT' + OR (new_user_id, new_channel_id) IS DISTINCT FROM (old_user_id, old_channel_id) + THEN + PERFORM public.telesrv_bump_read_model_version('channel_member', new_user_id, 'channel', new_channel_id); + PERFORM public.telesrv_bump_dialog_light(new_user_id, 'channel', new_channel_id); + END IF; + END IF; + RETURN NULL; +END; +$$; + +INSERT INTO public.read_model_versions ( + model, owner_user_id, peer_type, peer_id, version, hash, updated_at +) +SELECT 'dialog_owner', u.id, 'user', u.id, 1, + public.telesrv_random_read_model_hash(), now() +FROM public.users AS u +ON CONFLICT (model, owner_user_id, peer_type, peer_id) DO NOTHING; diff --git a/deploy/migrations/20260901000017_channel_membership_batch_invalidation.down.sql b/deploy/migrations/20260901000017_channel_membership_batch_invalidation.down.sql new file mode 100644 index 00000000..228af7aa --- /dev/null +++ b/deploy/migrations/20260901000017_channel_membership_batch_invalidation.down.sql @@ -0,0 +1,109 @@ +DROP FUNCTION IF EXISTS public.telesrv_bump_channel_membership_read_models(bigint, bigint[]); + +CREATE OR REPLACE FUNCTION public.telesrv_notify_channel_member_read_model() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +DECLARE + old_channel_id bigint; + old_user_id bigint; + new_channel_id bigint; + new_user_id bigint; +BEGIN + IF TG_OP <> 'INSERT' THEN + old_channel_id := OLD.channel_id; + old_user_id := OLD.user_id; + PERFORM public.telesrv_bump_read_model_version('channel_member', old_user_id, 'channel', old_channel_id); + PERFORM public.telesrv_bump_dialog_light(old_user_id, 'channel', old_channel_id); + END IF; + IF TG_OP <> 'DELETE' THEN + new_channel_id := NEW.channel_id; + new_user_id := NEW.user_id; + IF TG_OP = 'INSERT' OR (new_user_id, new_channel_id) IS DISTINCT FROM (old_user_id, old_channel_id) THEN + PERFORM public.telesrv_bump_read_model_version('channel_member', new_user_id, 'channel', new_channel_id); + PERFORM public.telesrv_bump_dialog_light(new_user_id, 'channel', new_channel_id); + END IF; + END IF; + RETURN NULL; +END; +$$; + +CREATE OR REPLACE FUNCTION public.telesrv_notify_channel_participants_read_model() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +DECLARE + old_channel_id bigint; + new_channel_id bigint; +BEGIN + IF TG_OP = 'DELETE' THEN old_channel_id := OLD.channel_id; + ELSIF TG_OP = 'INSERT' THEN new_channel_id := NEW.channel_id; + ELSE old_channel_id := OLD.channel_id; new_channel_id := NEW.channel_id; + END IF; + IF old_channel_id IS NOT NULL THEN + PERFORM public.telesrv_bump_read_model_version('channel_participants', 0, 'channel', old_channel_id); + END IF; + IF new_channel_id IS NOT NULL AND new_channel_id IS DISTINCT FROM old_channel_id THEN + PERFORM public.telesrv_bump_read_model_version('channel_participants', 0, 'channel', new_channel_id); + END IF; + RETURN NULL; +END; +$$; + +CREATE OR REPLACE FUNCTION public.telesrv_notify_channel_dialog_light_read_model() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +DECLARE + old_owner_id bigint; + old_channel_id bigint; + new_owner_id bigint; + new_channel_id bigint; +BEGIN + IF TG_OP <> 'INSERT' THEN + old_owner_id := OLD.user_id; old_channel_id := OLD.channel_id; + PERFORM public.telesrv_bump_dialog_light(old_owner_id, 'channel', old_channel_id); + END IF; + IF TG_OP <> 'DELETE' THEN + new_owner_id := NEW.user_id; new_channel_id := NEW.channel_id; + IF TG_OP = 'INSERT' OR (new_owner_id, new_channel_id) IS DISTINCT FROM (old_owner_id, old_channel_id) THEN + PERFORM public.telesrv_bump_dialog_light(new_owner_id, 'channel', new_channel_id); + END IF; + END IF; + RETURN NULL; +END; +$$; + +CREATE OR REPLACE FUNCTION public.telesrv_notify_channel_active_memberships_read_model() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +DECLARE + old_owner bigint; + new_owner bigint; + changed boolean; +BEGIN + IF TG_OP = 'DELETE' THEN + old_owner := OLD.user_id; + IF old_owner <> 0 THEN PERFORM public.telesrv_bump_read_model_version('channel_active_memberships', old_owner, 'user', old_owner); END IF; + RETURN NULL; + END IF; + new_owner := NEW.user_id; + IF TG_OP = 'INSERT' THEN + IF new_owner <> 0 THEN PERFORM public.telesrv_bump_read_model_version('channel_active_memberships', new_owner, 'user', new_owner); END IF; + RETURN NULL; + END IF; + old_owner := OLD.user_id; + changed := OLD.user_id IS DISTINCT FROM NEW.user_id OR OLD.channel_id IS DISTINCT FROM NEW.channel_id OR + OLD.status IS DISTINCT FROM NEW.status OR OLD.deleted IS DISTINCT FROM NEW.deleted; + IF changed THEN + IF old_owner <> 0 THEN PERFORM public.telesrv_bump_read_model_version('channel_active_memberships', old_owner, 'user', old_owner); END IF; + IF new_owner <> 0 AND new_owner IS DISTINCT FROM old_owner THEN + PERFORM public.telesrv_bump_read_model_version('channel_active_memberships', new_owner, 'user', new_owner); + END IF; + END IF; + RETURN NULL; +END; +$$; + +DROP FUNCTION IF EXISTS public.telesrv_membership_batch_active(); diff --git a/deploy/migrations/20260901000017_channel_membership_batch_invalidation.up.sql b/deploy/migrations/20260901000017_channel_membership_batch_invalidation.up.sql new file mode 100644 index 00000000..ef1cad87 --- /dev/null +++ b/deploy/migrations/20260901000017_channel_membership_batch_invalidation.up.sql @@ -0,0 +1,221 @@ +-- Batch membership mutations are one durable state transition. Row triggers +-- remain authoritative for ordinary statements, while the explicitly scoped +-- batch path suppresses their per-row write amplification and advances every +-- distinct dependency once before the transaction may commit. + +CREATE OR REPLACE FUNCTION public.telesrv_membership_batch_active() +RETURNS boolean +LANGUAGE sql +STABLE +AS $$ + SELECT COALESCE(current_setting('telesrv.membership_batch_mode', true), '') = 'on' +$$; + +CREATE OR REPLACE FUNCTION public.telesrv_notify_channel_member_read_model() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +DECLARE + old_channel_id bigint; + old_user_id bigint; + new_channel_id bigint; + new_user_id bigint; +BEGIN + IF public.telesrv_membership_batch_active() THEN + RETURN NULL; + END IF; + + IF TG_OP <> 'INSERT' THEN + old_channel_id := OLD.channel_id; + old_user_id := OLD.user_id; + PERFORM public.telesrv_bump_read_model_version('channel_member', old_user_id, 'channel', old_channel_id); + PERFORM public.telesrv_bump_dialog_light(old_user_id, 'channel', old_channel_id); + END IF; + + IF TG_OP <> 'DELETE' THEN + new_channel_id := NEW.channel_id; + new_user_id := NEW.user_id; + IF TG_OP = 'INSERT' + OR (new_user_id, new_channel_id) IS DISTINCT FROM (old_user_id, old_channel_id) + THEN + PERFORM public.telesrv_bump_read_model_version('channel_member', new_user_id, 'channel', new_channel_id); + PERFORM public.telesrv_bump_dialog_light(new_user_id, 'channel', new_channel_id); + END IF; + END IF; + RETURN NULL; +END; +$$; + +CREATE OR REPLACE FUNCTION public.telesrv_notify_channel_participants_read_model() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +DECLARE + old_channel_id bigint; + new_channel_id bigint; +BEGIN + IF public.telesrv_membership_batch_active() THEN + RETURN NULL; + END IF; + + IF TG_OP = 'DELETE' THEN + old_channel_id := OLD.channel_id; + ELSIF TG_OP = 'INSERT' THEN + new_channel_id := NEW.channel_id; + ELSE + old_channel_id := OLD.channel_id; + new_channel_id := NEW.channel_id; + END IF; + + IF old_channel_id IS NOT NULL THEN + PERFORM public.telesrv_bump_read_model_version('channel_participants', 0, 'channel', old_channel_id); + END IF; + IF new_channel_id IS NOT NULL AND new_channel_id IS DISTINCT FROM old_channel_id THEN + PERFORM public.telesrv_bump_read_model_version('channel_participants', 0, 'channel', new_channel_id); + END IF; + RETURN NULL; +END; +$$; + +CREATE OR REPLACE FUNCTION public.telesrv_notify_channel_dialog_light_read_model() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +DECLARE + old_owner_id bigint; + old_channel_id bigint; + new_owner_id bigint; + new_channel_id bigint; +BEGIN + IF public.telesrv_membership_batch_active() THEN + RETURN NULL; + END IF; + + IF TG_OP <> 'INSERT' THEN + old_owner_id := OLD.user_id; + old_channel_id := OLD.channel_id; + PERFORM public.telesrv_bump_dialog_light(old_owner_id, 'channel', old_channel_id); + END IF; + + IF TG_OP <> 'DELETE' THEN + new_owner_id := NEW.user_id; + new_channel_id := NEW.channel_id; + IF TG_OP = 'INSERT' + OR (new_owner_id, new_channel_id) IS DISTINCT FROM (old_owner_id, old_channel_id) + THEN + PERFORM public.telesrv_bump_dialog_light(new_owner_id, 'channel', new_channel_id); + END IF; + END IF; + RETURN NULL; +END; +$$; + +CREATE OR REPLACE FUNCTION public.telesrv_notify_channel_active_memberships_read_model() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +DECLARE + old_owner bigint; + new_owner bigint; + changed boolean; +BEGIN + IF public.telesrv_membership_batch_active() THEN + RETURN NULL; + END IF; + + IF TG_OP = 'DELETE' THEN + old_owner := OLD.user_id; + IF old_owner <> 0 THEN + PERFORM public.telesrv_bump_read_model_version('channel_active_memberships', old_owner, 'user', old_owner); + END IF; + RETURN NULL; + END IF; + + new_owner := NEW.user_id; + IF TG_OP = 'INSERT' THEN + IF new_owner <> 0 THEN + PERFORM public.telesrv_bump_read_model_version('channel_active_memberships', new_owner, 'user', new_owner); + END IF; + RETURN NULL; + END IF; + + old_owner := OLD.user_id; + changed := + OLD.user_id IS DISTINCT FROM NEW.user_id OR + OLD.channel_id IS DISTINCT FROM NEW.channel_id OR + OLD.status IS DISTINCT FROM NEW.status OR + OLD.deleted IS DISTINCT FROM NEW.deleted; + IF changed THEN + IF old_owner <> 0 THEN + PERFORM public.telesrv_bump_read_model_version('channel_active_memberships', old_owner, 'user', old_owner); + END IF; + IF new_owner <> 0 AND new_owner IS DISTINCT FROM old_owner THEN + PERFORM public.telesrv_bump_read_model_version('channel_active_memberships', new_owner, 'user', new_owner); + END IF; + END IF; + RETURN NULL; +END; +$$; + +CREATE OR REPLACE FUNCTION public.telesrv_bump_channel_membership_read_models( + p_channel_id bigint, + p_user_ids bigint[] +) +RETURNS void +LANGUAGE plpgsql +AS $$ +DECLARE + changed record; +BEGIN + IF COALESCE(p_channel_id, 0) <= 0 OR COALESCE(cardinality(p_user_ids), 0) = 0 THEN + RETURN; + END IF; + + FOR changed IN + WITH requested AS MATERIALIZED ( + SELECT DISTINCT user_id + FROM unnest(p_user_ids) AS input(user_id) + WHERE user_id > 0 + ), keys AS MATERIALIZED ( + SELECT 10 AS priority, 'channel_participants'::text AS model, 0::bigint AS owner_user_id, + 'channel'::text AS peer_type, p_channel_id AS peer_id + UNION + SELECT 20, 'channel_member', user_id, 'channel', p_channel_id FROM requested + UNION + SELECT 30, 'dialog_light', user_id, 'channel', p_channel_id FROM requested + UNION + SELECT 40, 'dialog_owner', user_id, 'user', user_id FROM requested + UNION + SELECT 50, 'channel_active_memberships', user_id, 'user', user_id FROM requested + ), bumped AS ( + INSERT INTO public.read_model_versions ( + model, owner_user_id, peer_type, peer_id, version, hash, updated_at + ) + SELECT model, owner_user_id, peer_type, peer_id, 1, + public.telesrv_random_read_model_hash(), now() + FROM keys + ORDER BY priority, owner_user_id, peer_type, peer_id + ON CONFLICT (model, owner_user_id, peer_type, peer_id) DO UPDATE SET + version = public.read_model_versions.version + 1, + hash = public.telesrv_random_read_model_hash(), + updated_at = EXCLUDED.updated_at + RETURNING model, owner_user_id, peer_type, peer_id, version, hash + ) + SELECT model, owner_user_id, peer_type, peer_id, version, hash + FROM bumped + ORDER BY model, owner_user_id, peer_type, peer_id + LOOP + PERFORM pg_notify( + 'telesrv_read_model_changed', + json_build_object( + 'model', changed.model, + 'owner_user_id', changed.owner_user_id, + 'peer_type', changed.peer_type, + 'peer_id', changed.peer_id, + 'version', changed.version, + 'hash', changed.hash + )::text + ); + END LOOP; +END; +$$; diff --git a/deploy/migrations/20260901000018_channel_membership_batch_lock_order.down.sql b/deploy/migrations/20260901000018_channel_membership_batch_lock_order.down.sql new file mode 100644 index 00000000..6c9c92ae --- /dev/null +++ b/deploy/migrations/20260901000018_channel_membership_batch_lock_order.down.sql @@ -0,0 +1,62 @@ +CREATE OR REPLACE FUNCTION public.telesrv_bump_channel_membership_read_models( + p_channel_id bigint, + p_user_ids bigint[] +) +RETURNS void +LANGUAGE plpgsql +AS $$ +DECLARE + changed record; +BEGIN + IF COALESCE(p_channel_id, 0) <= 0 OR COALESCE(cardinality(p_user_ids), 0) = 0 THEN + RETURN; + END IF; + + FOR changed IN + WITH requested AS MATERIALIZED ( + SELECT DISTINCT user_id + FROM unnest(p_user_ids) AS input(user_id) + WHERE user_id > 0 + ), keys AS MATERIALIZED ( + SELECT 'channel_participants'::text AS model, 0::bigint AS owner_user_id, + 'channel'::text AS peer_type, p_channel_id AS peer_id + UNION + SELECT 'channel_member', user_id, 'channel', p_channel_id FROM requested + UNION + SELECT 'dialog_light', user_id, 'channel', p_channel_id FROM requested + UNION + SELECT 'dialog_owner', user_id, 'user', user_id FROM requested + UNION + SELECT 'channel_active_memberships', user_id, 'user', user_id FROM requested + ), bumped AS ( + INSERT INTO public.read_model_versions ( + model, owner_user_id, peer_type, peer_id, version, hash, updated_at + ) + SELECT model, owner_user_id, peer_type, peer_id, 1, + public.telesrv_random_read_model_hash(), now() + FROM keys + ORDER BY model, owner_user_id, peer_type, peer_id + ON CONFLICT (model, owner_user_id, peer_type, peer_id) DO UPDATE SET + version = public.read_model_versions.version + 1, + hash = public.telesrv_random_read_model_hash(), + updated_at = EXCLUDED.updated_at + RETURNING model, owner_user_id, peer_type, peer_id, version, hash + ) + SELECT model, owner_user_id, peer_type, peer_id, version, hash + FROM bumped + ORDER BY model, owner_user_id, peer_type, peer_id + LOOP + PERFORM pg_notify( + 'telesrv_read_model_changed', + json_build_object( + 'model', changed.model, + 'owner_user_id', changed.owner_user_id, + 'peer_type', changed.peer_type, + 'peer_id', changed.peer_id, + 'version', changed.version, + 'hash', changed.hash + )::text + ); + END LOOP; +END; +$$; diff --git a/deploy/migrations/20260901000018_channel_membership_batch_lock_order.up.sql b/deploy/migrations/20260901000018_channel_membership_batch_lock_order.up.sql new file mode 100644 index 00000000..d700308b --- /dev/null +++ b/deploy/migrations/20260901000018_channel_membership_batch_lock_order.up.sql @@ -0,0 +1,68 @@ +-- 20260901000017 initially ordered version keys lexically, placing +-- channel_active_memberships before the member/dialog keys. Ordinary single-row +-- membership writes acquire those keys in the opposite order, so a concurrent +-- createChannel and batch invite could deadlock. Use the canonical physical +-- mutation order: participants -> member -> dialog -> owner -> active index. + +CREATE OR REPLACE FUNCTION public.telesrv_bump_channel_membership_read_models( + p_channel_id bigint, + p_user_ids bigint[] +) +RETURNS void +LANGUAGE plpgsql +AS $$ +DECLARE + changed record; +BEGIN + IF COALESCE(p_channel_id, 0) <= 0 OR COALESCE(cardinality(p_user_ids), 0) = 0 THEN + RETURN; + END IF; + + FOR changed IN + WITH requested AS MATERIALIZED ( + SELECT DISTINCT user_id + FROM unnest(p_user_ids) AS input(user_id) + WHERE user_id > 0 + ), keys AS MATERIALIZED ( + SELECT 10 AS priority, 'channel_participants'::text AS model, 0::bigint AS owner_user_id, + 'channel'::text AS peer_type, p_channel_id AS peer_id + UNION + SELECT 20, 'channel_member', user_id, 'channel', p_channel_id FROM requested + UNION + SELECT 30, 'dialog_light', user_id, 'channel', p_channel_id FROM requested + UNION + SELECT 40, 'dialog_owner', user_id, 'user', user_id FROM requested + UNION + SELECT 50, 'channel_active_memberships', user_id, 'user', user_id FROM requested + ), bumped AS ( + INSERT INTO public.read_model_versions ( + model, owner_user_id, peer_type, peer_id, version, hash, updated_at + ) + SELECT model, owner_user_id, peer_type, peer_id, 1, + public.telesrv_random_read_model_hash(), now() + FROM keys + ORDER BY priority, owner_user_id, peer_type, peer_id + ON CONFLICT (model, owner_user_id, peer_type, peer_id) DO UPDATE SET + version = public.read_model_versions.version + 1, + hash = public.telesrv_random_read_model_hash(), + updated_at = EXCLUDED.updated_at + RETURNING model, owner_user_id, peer_type, peer_id, version, hash + ) + SELECT model, owner_user_id, peer_type, peer_id, version, hash + FROM bumped + ORDER BY model, owner_user_id, peer_type, peer_id + LOOP + PERFORM pg_notify( + 'telesrv_read_model_changed', + json_build_object( + 'model', changed.model, + 'owner_user_id', changed.owner_user_id, + 'peer_type', changed.peer_type, + 'peer_id', changed.peer_id, + 'version', changed.version, + 'hash', changed.hash + )::text + ); + END LOOP; +END; +$$; diff --git a/deploy/migrations/20260901000019_peer_identity_creation_tokens.down.sql b/deploy/migrations/20260901000019_peer_identity_creation_tokens.down.sql new file mode 100644 index 00000000..2fe853bc --- /dev/null +++ b/deploy/migrations/20260901000019_peer_identity_creation_tokens.down.sql @@ -0,0 +1,7 @@ +DROP TRIGGER IF EXISTS channels_peer_identity_created ON public.channels; +DROP TRIGGER IF EXISTS users_peer_identity_created ON public.users; +DROP FUNCTION IF EXISTS public.telesrv_seed_peer_identity_on_insert(); + +-- Backfilled read_model_versions rows are intentionally retained. 20260901000014 defines +-- one token for every durable peer; deleting them would violate the older +-- migration's contract after rollback and make negative facts uncacheable. diff --git a/deploy/migrations/20260901000019_peer_identity_creation_tokens.up.sql b/deploy/migrations/20260901000019_peer_identity_creation_tokens.up.sql new file mode 100644 index 00000000..2ac3de77 --- /dev/null +++ b/deploy/migrations/20260901000019_peer_identity_creation_tokens.up.sql @@ -0,0 +1,68 @@ +-- 20260901000014 seeded only the peers that existed when that migration ran. Real account +-- provisioning and channel creation after deployment therefore had no durable +-- token, so their empty username/verification facts were deliberately +-- uncacheable. Maintain the token at the peer lifecycle boundary instead. + +CREATE OR REPLACE FUNCTION public.telesrv_seed_peer_identity_on_insert() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +BEGIN + IF TG_TABLE_NAME = 'users' THEN + PERFORM public.telesrv_bump_peer_identity('user', NEW.id); + ELSIF TG_TABLE_NAME = 'channels' THEN + PERFORM public.telesrv_bump_peer_identity('channel', NEW.id); + ELSE + RAISE EXCEPTION 'unsupported peer identity seed table: %', TG_TABLE_NAME; + END IF; + RETURN NEW; +END; +$$; + +DROP TRIGGER IF EXISTS users_peer_identity_created ON public.users; +CREATE TRIGGER users_peer_identity_created +AFTER INSERT ON public.users +FOR EACH ROW EXECUTE FUNCTION public.telesrv_seed_peer_identity_on_insert(); + +DROP TRIGGER IF EXISTS channels_peer_identity_created ON public.channels; +CREATE TRIGGER channels_peer_identity_created +AFTER INSERT ON public.channels +FOR EACH ROW EXECUTE FUNCTION public.telesrv_seed_peer_identity_on_insert(); + +-- Use the same bump helper rather than a silent INSERT so already-running +-- instances that cached a missing/zero token receive exact-key invalidation. +DO $$ +DECLARE + peer_row record; +BEGIN + FOR peer_row IN + SELECT u.id + FROM public.users u + WHERE NOT EXISTS ( + SELECT 1 FROM public.read_model_versions v + WHERE v.model = 'peer_identity' + AND v.owner_user_id = 0 + AND v.peer_type = 'user' + AND v.peer_id = u.id + ) + ORDER BY u.id + LOOP + PERFORM public.telesrv_bump_peer_identity('user', peer_row.id); + END LOOP; + + FOR peer_row IN + SELECT c.id + FROM public.channels c + WHERE NOT EXISTS ( + SELECT 1 FROM public.read_model_versions v + WHERE v.model = 'peer_identity' + AND v.owner_user_id = 0 + AND v.peer_type = 'channel' + AND v.peer_id = c.id + ) + ORDER BY c.id + LOOP + PERFORM public.telesrv_bump_peer_identity('channel', peer_row.id); + END LOOP; +END; +$$; diff --git a/deploy/migrations/20260901000020_temp_auth_key_bind_function.down.sql b/deploy/migrations/20260901000020_temp_auth_key_bind_function.down.sql new file mode 100644 index 00000000..7631ffde --- /dev/null +++ b/deploy/migrations/20260901000020_temp_auth_key_bind_function.down.sql @@ -0,0 +1,8 @@ +DROP FUNCTION IF EXISTS public.telesrv_bind_temp_auth_key( + bigint, + bigint, + bigint, + bigint, + integer, + bytea +); diff --git a/deploy/migrations/20260901000020_temp_auth_key_bind_function.up.sql b/deploy/migrations/20260901000020_temp_auth_key_bind_function.up.sql new file mode 100644 index 00000000..91f66a4f --- /dev/null +++ b/deploy/migrations/20260901000020_temp_auth_key_bind_function.up.sql @@ -0,0 +1,154 @@ +-- Collapse the identity-sensitive auth.bindTempAuthKey write boundary into one +-- database call. The caller still owns the surrounding transaction/savepoint; +-- this function preserves the global identity -> raw temp -> permanent row +-- lock order shared with selector advance, revocation and direct deletion. + +CREATE OR REPLACE FUNCTION public.telesrv_bind_temp_auth_key( + p_temp_auth_key_id bigint, + p_perm_auth_key_id bigint, + p_nonce bigint, + p_temp_session_id bigint, + p_expires_at integer, + p_encrypted_message bytea +) +RETURNS TABLE ( + bind_status text, + merged_layer integer, + merged_observation_id bigint +) +LANGUAGE plpgsql +AS $$ +DECLARE + v_temp_expiry integer; + v_temp_layer integer; + v_temp_observation_id bigint; + v_current_perm_id bigint; + v_perm_expiry integer; + v_perm_layer integer; + v_perm_observation_id bigint; + v_merged_layer integer; + v_merged_observation_id bigint; + v_updated integer; +BEGIN + IF p_expires_at <= 0 OR p_temp_auth_key_id = p_perm_auth_key_id THEN + RETURN QUERY SELECT 'binding_invalid'::text, 0, 0::bigint; + RETURN; + END IF; + + PERFORM pg_advisory_xact_lock( + 1096111176::integer, + hashint8(p_perm_auth_key_id)::integer + ); + + SELECT key.expires_at, key.layer, key.layer_observation_id + INTO v_temp_expiry, v_temp_layer, v_temp_observation_id + FROM public.auth_keys AS key + WHERE key.auth_key_id = p_temp_auth_key_id + FOR UPDATE; + IF NOT FOUND OR v_temp_expiry <= 0 OR v_temp_expiry <> p_expires_at THEN + RETURN QUERY SELECT 'binding_invalid'::text, 0, 0::bigint; + RETURN; + END IF; + + SELECT binding.perm_auth_key_id + INTO v_current_perm_id + FROM public.temp_auth_key_bindings AS binding + WHERE binding.temp_auth_key_id = p_temp_auth_key_id; + IF FOUND AND v_current_perm_id <> p_perm_auth_key_id THEN + RETURN QUERY SELECT 'already_bound'::text, 0, 0::bigint; + RETURN; + END IF; + + SELECT key.expires_at, key.layer, key.layer_observation_id + INTO v_perm_expiry, v_perm_layer, v_perm_observation_id + FROM public.auth_keys AS key + WHERE key.auth_key_id = p_perm_auth_key_id + FOR UPDATE; + IF NOT FOUND OR v_perm_expiry <> 0 THEN + RETURN QUERY SELECT 'binding_invalid'::text, 0, 0::bigint; + RETURN; + END IF; + + IF v_temp_layer < 0 + OR v_perm_layer < 0 + OR v_temp_observation_id < 0 + OR v_perm_observation_id < 0 + OR (v_temp_observation_id > 0 AND v_temp_layer = 0) + OR (v_perm_observation_id > 0 AND v_perm_layer = 0) + THEN + RETURN QUERY SELECT 'layer_invalid'::text, 0, 0::bigint; + RETURN; + END IF; + + IF v_temp_observation_id > v_perm_observation_id THEN + v_merged_layer := v_temp_layer; + v_merged_observation_id := v_temp_observation_id; + ELSIF v_perm_observation_id > v_temp_observation_id THEN + v_merged_layer := v_perm_layer; + v_merged_observation_id := v_perm_observation_id; + ELSIF v_temp_observation_id > 0 AND v_temp_layer <> v_perm_layer THEN + RETURN QUERY SELECT 'layer_conflict'::text, 0, 0::bigint; + RETURN; + ELSIF v_temp_observation_id > 0 THEN + v_merged_layer := v_temp_layer; + v_merged_observation_id := v_temp_observation_id; + ELSE + v_merged_layer := v_perm_layer; + v_merged_observation_id := 0; + END IF; + + INSERT INTO public.temp_auth_key_bindings ( + temp_auth_key_id, + perm_auth_key_id, + nonce, + temp_session_id, + expires_at, + encrypted_message + ) VALUES ( + p_temp_auth_key_id, + p_perm_auth_key_id, + p_nonce, + p_temp_session_id, + p_expires_at, + p_encrypted_message + ) + ON CONFLICT (temp_auth_key_id) DO UPDATE SET + nonce = EXCLUDED.nonce, + temp_session_id = EXCLUDED.temp_session_id, + expires_at = EXCLUDED.expires_at, + encrypted_message = EXCLUDED.encrypted_message, + created_at = now() + WHERE public.temp_auth_key_bindings.perm_auth_key_id = EXCLUDED.perm_auth_key_id; + GET DIAGNOSTICS v_updated = ROW_COUNT; + IF v_updated <> 1 THEN + RETURN QUERY SELECT 'binding_invalid'::text, 0, 0::bigint; + RETURN; + END IF; + + UPDATE public.auth_keys AS key + SET layer = v_merged_layer, + layer_observation_id = v_merged_observation_id + WHERE key.auth_key_id = ANY( + ARRAY[p_temp_auth_key_id, p_perm_auth_key_id]::bigint[] + ); + GET DIAGNOSTICS v_updated = ROW_COUNT; + IF v_updated <> 2 THEN + RAISE EXCEPTION + 'merge bound auth key Layer defaults updated % of 2 locked keys', + v_updated + USING ERRCODE = '23000'; + END IF; + + UPDATE public.authorizations AS authz + SET layer = v_merged_layer + WHERE authz.auth_key_id = ANY( + ARRAY[p_temp_auth_key_id, p_perm_auth_key_id]::bigint[] + ); + + RETURN QUERY SELECT 'ok'::text, v_merged_layer, v_merged_observation_id; +END; +$$; + +COMMENT ON FUNCTION public.telesrv_bind_temp_auth_key( + bigint, bigint, bigint, bigint, integer, bytea +) IS 'Atomically binds a temporary auth key and returns the committed Layer observation while preserving identity lock order'; diff --git a/deploy/migrations/20260901000021_bootstrap_pending_readiness_index.down.sql b/deploy/migrations/20260901000021_bootstrap_pending_readiness_index.down.sql new file mode 100644 index 00000000..58c8597e --- /dev/null +++ b/deploy/migrations/20260901000021_bootstrap_pending_readiness_index.down.sql @@ -0,0 +1 @@ +DROP INDEX IF EXISTS public.bootstrap_update_jobs_pending_auth_idx; diff --git a/deploy/migrations/20260901000021_bootstrap_pending_readiness_index.up.sql b/deploy/migrations/20260901000021_bootstrap_pending_readiness_index.up.sql new file mode 100644 index 00000000..0b961555 --- /dev/null +++ b/deploy/migrations/20260901000021_bootstrap_pending_readiness_index.up.sql @@ -0,0 +1,3 @@ +CREATE INDEX IF NOT EXISTS bootstrap_update_jobs_pending_auth_idx + ON public.bootstrap_update_jobs (user_id, auth_key_id, id) + WHERE (status)::text = 'pending'::text; diff --git a/deploy/migrations/20260901000022_channel_active_monoforum_invalidation.down.sql b/deploy/migrations/20260901000022_channel_active_monoforum_invalidation.down.sql new file mode 100644 index 00000000..7a9f907a --- /dev/null +++ b/deploy/migrations/20260901000022_channel_active_monoforum_invalidation.down.sql @@ -0,0 +1,10 @@ +DROP TRIGGER IF EXISTS channels_monoforum_active_membership_changed ON public.channels; +DROP FUNCTION IF EXISTS public.telesrv_notify_monoforum_channel_visibility_read_model(); +DROP FUNCTION IF EXISTS public.telesrv_bump_monoforum_visibility_owners(bigint, bigint); + +DROP TRIGGER IF EXISTS channel_members_monoforum_manager_visibility_changed ON public.channel_members; +DROP FUNCTION IF EXISTS public.telesrv_notify_monoforum_manager_visibility_read_model(); + +DROP TRIGGER IF EXISTS channel_messages_monoforum_active_membership_changed ON public.channel_messages; +DROP FUNCTION IF EXISTS public.telesrv_notify_monoforum_message_visibility_read_model(); +DROP FUNCTION IF EXISTS public.telesrv_bump_channel_active_membership_owner(bigint); diff --git a/deploy/migrations/20260901000022_channel_active_monoforum_invalidation.up.sql b/deploy/migrations/20260901000022_channel_active_monoforum_invalidation.up.sql new file mode 100644 index 00000000..81119e01 --- /dev/null +++ b/deploy/migrations/20260901000022_channel_active_monoforum_invalidation.up.sql @@ -0,0 +1,194 @@ +-- Extend the owner-scoped channel_active_memberships generation to every +-- durable predicate used by ListActiveChannelIDsForUser. Ordinary memberships +-- are covered by user_channel_member_index; these triggers cover monoforum +-- subscriber message visibility, manager rights, and parent/mono enablement. + +CREATE OR REPLACE FUNCTION public.telesrv_bump_channel_active_membership_owner(p_user_id bigint) +RETURNS void +LANGUAGE plpgsql +AS $$ +BEGIN + IF COALESCE(p_user_id, 0) <= 0 THEN + RETURN; + END IF; + PERFORM public.telesrv_bump_read_model_version( + 'channel_active_memberships', p_user_id, 'user', p_user_id + ); +END; +$$; + +CREATE OR REPLACE FUNCTION public.telesrv_notify_monoforum_message_visibility_read_model() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +DECLARE + old_owner bigint := 0; + new_owner bigint := 0; +BEGIN + IF TG_OP <> 'INSERT' + AND OLD.saved_peer_type = 'user' + AND OLD.saved_peer_id > 0 + AND NOT OLD.deleted + THEN + old_owner := OLD.saved_peer_id; + END IF; + IF TG_OP <> 'DELETE' + AND NEW.saved_peer_type = 'user' + AND NEW.saved_peer_id > 0 + AND NOT NEW.deleted + THEN + new_owner := NEW.saved_peer_id; + END IF; + + IF old_owner > 0 THEN + PERFORM public.telesrv_bump_channel_active_membership_owner(old_owner); + END IF; + IF new_owner > 0 AND new_owner IS DISTINCT FROM old_owner THEN + PERFORM public.telesrv_bump_channel_active_membership_owner(new_owner); + END IF; + RETURN NULL; +END; +$$; + +CREATE TRIGGER channel_messages_monoforum_active_membership_changed +AFTER INSERT OR DELETE OR UPDATE OF channel_id, saved_peer_type, saved_peer_id, deleted +ON public.channel_messages +FOR EACH ROW EXECUTE FUNCTION public.telesrv_notify_monoforum_message_visibility_read_model(); + +CREATE OR REPLACE FUNCTION public.telesrv_notify_monoforum_manager_visibility_read_model() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +BEGIN + IF OLD.role IS NOT DISTINCT FROM NEW.role + AND OLD.admin_rights IS NOT DISTINCT FROM NEW.admin_rights + THEN + RETURN NULL; + END IF; + IF EXISTS ( + SELECT 1 + FROM public.channels AS parent + WHERE parent.id = NEW.channel_id + AND parent.linked_monoforum_id <> 0 + AND parent.broadcast_messages_allowed + AND NOT parent.deleted + ) THEN + PERFORM public.telesrv_bump_channel_active_membership_owner(NEW.user_id); + END IF; + RETURN NULL; +END; +$$; + +CREATE TRIGGER channel_members_monoforum_manager_visibility_changed +AFTER UPDATE OF role, admin_rights ON public.channel_members +FOR EACH ROW EXECUTE FUNCTION public.telesrv_notify_monoforum_manager_visibility_read_model(); + +CREATE OR REPLACE FUNCTION public.telesrv_bump_monoforum_visibility_owners( + p_parent_id bigint, + p_monoforum_id bigint +) +RETURNS void +LANGUAGE plpgsql +AS $$ +DECLARE + affected record; +BEGIN + IF COALESCE(p_parent_id, 0) <= 0 OR COALESCE(p_monoforum_id, 0) <= 0 THEN + RETURN; + END IF; + FOR affected IN + SELECT DISTINCT owner_id + FROM ( + SELECT member.user_id AS owner_id + FROM public.user_channel_member_index AS member + WHERE member.channel_id = p_parent_id + AND member.status = 'active' + AND NOT member.deleted + AND member.role IN ('creator', 'admin') + UNION + SELECT message.saved_peer_id AS owner_id + FROM public.channel_messages AS message + WHERE message.channel_id = p_monoforum_id + AND message.saved_peer_type = 'user' + AND message.saved_peer_id > 0 + AND NOT message.deleted + ) AS owners + WHERE owner_id > 0 + ORDER BY owner_id + LOOP + PERFORM public.telesrv_bump_channel_active_membership_owner(affected.owner_id); + END LOOP; +END; +$$; + +CREATE OR REPLACE FUNCTION public.telesrv_notify_monoforum_channel_visibility_read_model() +RETURNS trigger +LANGUAGE plpgsql +AS $$ +DECLARE + old_parent_id bigint := 0; + old_monoforum_id bigint := 0; + new_parent_id bigint := 0; + new_monoforum_id bigint := 0; +BEGIN + IF (OLD.broadcast_messages_allowed, OLD.linked_monoforum_id, OLD.deleted, OLD.monoforum) + IS NOT DISTINCT FROM + (NEW.broadcast_messages_allowed, NEW.linked_monoforum_id, NEW.deleted, NEW.monoforum) + THEN + RETURN NULL; + END IF; + + IF OLD.linked_monoforum_id > 0 THEN + IF OLD.monoforum THEN + old_parent_id := OLD.linked_monoforum_id; + old_monoforum_id := OLD.id; + ELSE + old_parent_id := OLD.id; + old_monoforum_id := OLD.linked_monoforum_id; + END IF; + END IF; + IF NEW.linked_monoforum_id > 0 THEN + IF NEW.monoforum THEN + new_parent_id := NEW.linked_monoforum_id; + new_monoforum_id := NEW.id; + ELSE + new_parent_id := NEW.id; + new_monoforum_id := NEW.linked_monoforum_id; + END IF; + END IF; + + IF old_parent_id > 0 THEN + PERFORM public.telesrv_bump_monoforum_visibility_owners(old_parent_id, old_monoforum_id); + END IF; + IF new_parent_id > 0 + AND (new_parent_id, new_monoforum_id) + IS DISTINCT FROM (old_parent_id, old_monoforum_id) + THEN + PERFORM public.telesrv_bump_monoforum_visibility_owners(new_parent_id, new_monoforum_id); + END IF; + RETURN NULL; +END; +$$; + +CREATE TRIGGER channels_monoforum_active_membership_changed +AFTER UPDATE OF broadcast_messages_allowed, linked_monoforum_id, deleted, monoforum +ON public.channels +FOR EACH ROW EXECUTE FUNCTION public.telesrv_notify_monoforum_channel_visibility_read_model(); + +-- Existing monoforum owners need a fresh generation before any shared page can +-- be populated under the expanded dependency contract. +DO $$ +DECLARE + linked record; +BEGIN + FOR linked IN + SELECT parent.id AS parent_id, parent.linked_monoforum_id AS monoforum_id + FROM public.channels AS parent + WHERE parent.linked_monoforum_id > 0 + LOOP + PERFORM public.telesrv_bump_monoforum_visibility_owners( + linked.parent_id, linked.monoforum_id + ); + END LOOP; +END; +$$; diff --git a/deploy/migrations/20260901000023_bot_verification_description_limit.down.sql b/deploy/migrations/20260901000023_bot_verification_description_limit.down.sql new file mode 100644 index 00000000..8ca15adc --- /dev/null +++ b/deploy/migrations/20260901000023_bot_verification_description_limit.down.sql @@ -0,0 +1,9 @@ +ALTER TABLE public.bot_verifier_settings + DROP CONSTRAINT bot_verifier_settings_default_description_check, + ADD CONSTRAINT bot_verifier_settings_default_description_check + CHECK (octet_length(default_description) <= 280); + +ALTER TABLE public.custom_verification_requests + DROP CONSTRAINT custom_verification_requests_requested_description_check, + ADD CONSTRAINT custom_verification_requests_requested_description_check + CHECK (octet_length(requested_description) <= 280); diff --git a/deploy/migrations/20260901000023_bot_verification_description_limit.up.sql b/deploy/migrations/20260901000023_bot_verification_description_limit.up.sql new file mode 100644 index 00000000..c9bdd475 --- /dev/null +++ b/deploy/migrations/20260901000023_bot_verification_description_limit.up.sql @@ -0,0 +1,9 @@ +ALTER TABLE public.bot_verifier_settings + DROP CONSTRAINT bot_verifier_settings_default_description_check, + ADD CONSTRAINT bot_verifier_settings_default_description_check + CHECK (octet_length(default_description) <= 512); + +ALTER TABLE public.custom_verification_requests + DROP CONSTRAINT custom_verification_requests_requested_description_check, + ADD CONSTRAINT custom_verification_requests_requested_description_check + CHECK (octet_length(requested_description) <= 512); diff --git a/deploy/postgres-init/010_branch_databases.sql b/deploy/postgres-init/010_branch_databases.sql new file mode 100644 index 00000000..d01e6cfd --- /dev/null +++ b/deploy/postgres-init/010_branch_databases.sql @@ -0,0 +1,11 @@ +\set ON_ERROR_STOP on + +-- main and v2 intentionally have independent migration histories. Keep them +-- in separate PostgreSQL databases even when they share the local container. +SELECT 'CREATE DATABASE telesrv_main OWNER telesrv' +WHERE NOT EXISTS (SELECT 1 FROM pg_database WHERE datname = 'telesrv_main') +\gexec + +SELECT 'CREATE DATABASE telesrv_v2 OWNER telesrv' +WHERE NOT EXISTS (SELECT 1 FROM pg_database WHERE datname = 'telesrv_v2') +\gexec diff --git a/deploy/update/manifest.example.json b/deploy/update/manifest.example.json new file mode 100644 index 00000000..7967f70f --- /dev/null +++ b/deploy/update/manifest.example.json @@ -0,0 +1,46 @@ +{ + "schema_version": 1, + "desktop": { + "win64": { + "stable": { + "build": 7000007, + "version": "7.0.7", + "file": "tx64upd7000007", + "sha256": "0000000000000000000000000000000000000000000000000000000000000000", + "size": 0, + "disabled": true + } + } + }, + "apps": { + "android": { + "stable": { + "id": 2026080701, + "version": "12.9.1", + "url": "https://updates.example.test/apps/telesrv-12.9.1.apk", + "url_by_source": { + "com.android.vending": "https://play.google.com/store/apps/details?id=your.application.id" + }, + "can_not_skip": false, + "notes": { + "en": "A new version is available.", + "ru": "Доступна новая версия приложения." + }, + "disabled": true + } + }, + "ios": { + "stable": { + "id": 2026080702, + "version": "12.9.1", + "url": "https://apps.apple.com/app/id0000000000", + "can_not_skip": false, + "notes": { + "en": "A new version is available in the App Store.", + "ru": "В App Store доступна новая версия приложения." + }, + "disabled": true + } + } + } +} diff --git a/docs/admin-panel-api.en.md b/docs/admin-panel-api.en.md new file mode 100644 index 00000000..9ce2bf56 --- /dev/null +++ b/docs/admin-panel-api.en.md @@ -0,0 +1,403 @@ +# Admin panel: all routes and API contracts + +Documentation of every route in the built-in `telesrv` admin panel — the SPA +page addresses and the API routes behind them. The panel server lives in +`cmd/telesrv-admin`; routes are declared in `(*server).routes()` +(`server.go:50`). + +The panel is a plain HTTP server: it serves the built frontend (`/`) and a +JSON API under the `/api/` prefix. Every API path requires a session (cookie), +and every mutating request additionally requires a CSRF token. Many routes also +check an operator permission (`permission`). + +## How to use this document + +- For each GET endpoint, the **request parameters** (query) and a short **response** shape are listed. +- For each POST endpoint under `/api/actions/*` and the verification decisions, the **request body** (JSON) is given. They all share common fields (see below) plus their own specific fields. +- `int64` in JSON may be sent either as a number or as a string (e.g. `"user_id": "123"` or `"user_id": 123`) — the server accepts both (`flexInt64`). `flexUnix` accepts Unix seconds or a date in `2006-01-02` / RFC3339 form. +- All mutating requests go to the Admin API. A command's response is either `{"status":..., "message":..., "command_id":...}` on success (HTTP 200) or `{"error":..., "code":...}` on error. An optimistic-locking conflict is `409`. + +## Authentication and session + +| Method | Path | Description | +| --- | --- | --- | +| POST | `/api/login` | Log in. Body: `{"secret": "..."}`. Validates the config secret, issues a signed session cookie and CSRF cookie. The only mutating route without a CSRF token (no session yet); only Origin is checked. | +| POST | `/api/logout` | Log out. Destroys the session and CSRF cookie. | +| GET | `/api/session` | Returns `{"actor": "...", "permissions": [...], "csrf_token": "..."}`. Called by the panel on startup. | + +The session lives in a signed cookie (default TTL 12 hours); there is no +server-side session store. Every request except `GET/HEAD/OPTIONS` and +`/api/login` must present: + +- the `telesrv_admin_csrf` cookie; +- the `X-CSRF-Token` header with the same value; +- an Origin matching the host (when Origin is present). + +Violating any of the three — `403 Forbidden`. + +## Permissions and their checks + +The panel distinguishes plain authorization (`requireAuthAPI`) from a +permission check (`requirePermission`). Permission names match the strings in +`TELESRV_ADMIN_UI_PERMISSIONS`: + +| Permission | What it grants | +| --- | --- | +| `*` | All permissions (wildcard). | +| `premium.manage` | Managing the Premium plan catalog, granting Premium. | +| `bots.token.read` | Exporting a bot token (`/api/actions/export-bot-token`). | +| `verification.review` | Reading and deciding the official verification queue. | +| `verification.revoke` | Stripping the official badge (in addition to `verification.review`). | +| `botverification.review` | Reading and deciding the third-party (bot) verification queue. | +| `botverification.manage` | Appointing verifiers, editing the icon catalog, stripping a third-party mark. | + +Official and third-party verification rights are intentionally independent. The +session's permission list is returned from `/api/session` so the UI can hide +unavailable sections. + +## Interface pages (SPA) + +SPA routes are declarative: any section name is served as `/` (index.html), and +the frontend decides what to render (`web/src/pages/Routes.tsx`). + +| Path | Page | +| --- | --- | +| `/` | Dashboard (counters, storage stats, section links). | +| `/accounts` | Account list (with search). | +| `/accounts/{id}` | Account card: profile, actions. | +| `/channels` | Supergroup and channel list. | +| `/channels/{id}` | Channel card. | +| `/bots` | Bot list. | +| `/bots/{id}` | Bot card. | +| `/broadcasts` | Broadcasts. | +| `/monetization`, `/premium` | Stars and Premium: plans, grants. Requires `premium.manage`. | +| `/moderation` | Complaints and moderation: case list. | +| `/moderation/{id}` | Moderation case details. | +| `/emoji` | Emoji set catalog. | +| `/stickers` | Sticker pack catalog. | +| `/gif-catalog` | GIF catalog. | +| `/messages`, `/messages/private` | Private message audit. | +| `/messages/detail`, `/messages/private/detail` | Private message detail (`?owner_user_id=&msg_id=`). | +| `/messages/groups` | Group/channel message audit. | +| `/messages/groups/detail` | Group message detail (`?channel_id=&msg_id=`). | +| `/gifts` | Star gifts: catalog, collectibles, auctions. | +| `/give-gifts` | Gift granting. | +| `/collectible-usernames` | Collectible usernames. | +| `/collectible-usernames/{id}` | Collectible username card. | +| `/collectible-phones` | Anonymous numbers. | +| `/account-ratings` | Account ratings. | +| `/account-ratings/{user_id}` | Account rating card. | +| `/storage` | Object storage: stats. | +| `/verification` | Official verification: application queue. Requires `verification.review`. | +| `/verification/{id}` | Official verification application details. Requires `verification.review`. | +| `/bot-verification` | Third-party verification: verifiers, icons, marks, queue. Requires `botverification.review`. | +| `/bot-verification/{id}` | Third-party verification request details. Requires `botverification.review`. | + +An unknown API path returns `404 {"error":"api route not found"}`; any unknown +frontend path is served as `/`. + +## Response conventions + +- Successful reads — `200` + JSON; files (avatars, animations, previews) — the file itself. +- Errors — JSON of the form `{"error": "...", "code": "..."}` with the corresponding HTTP status. +- `401` — missing/expired session; `403` — CSRF/Origin violation or missing permission (in `requirePermission` the body gets an added `permission` field); `409` — optimistic-locking conflict (moderation case, verification); `502` — Admin API unreachable. +- Errors from commands sent to the Admin API are returned as `{"status": ..., "message": ..., "error": ...}`. + +## Common command fields (POST `/api/actions/*`) + +Every mutating request carries in its body: + +| Field | Type | Description | +| --- | --- | --- | +| `command_id` | string | Idempotency key for the command. Repeating the same `command_id` does not execute the action twice. If empty — generated by the server. | +| `reason` | string | Mandatory operation reason (audit). | +| `confirm` | bool | Operator confirmation (`true`). | + +--- + +## API: dashboard and storage + +| Method | Path | Description | +| --- | --- | --- | +| GET | `/api/dashboard` | Summary: `counts`, `storage`, and optionally `host`. | +| GET | `/api/storage/stats` | Object storage statistics. | + +## API: accounts + +| Method | Path | Parameters / response | +| --- | --- | --- | +| GET | `/api/accounts` | Params: `q` (search), `before_id` (int64), `before_active_us` (int64, microseconds), `limit` (int). Response: `query`, `limit`, `rows`, `has_more`, `next_before_id`, `next_before_active_us`, `listing`. | +| GET | `/api/accounts/{id}` | Account card: profile, flags, statistics. | +| GET | `/api/accounts/{id}/avatar` | Account avatar (file). | +| GET | `/api/account-ratings` | Params: `q`, `min_level` (int), `user_id` (int64), `before_id` (int64), `limit` (int). Response: `rows`, `has_more`, `next_before_id`. | +| GET | `/api/account-ratings/{user_id}` | Response: `rating`, `events`. | + +## API: channels and supergroups + +| Method | Path | Parameters / response | +| --- | --- | --- | +| GET | `/api/channels` | Params: `q`, `before_id` (int64), `before_updated_us` (int64, microseconds), `limit` (int). Response: `query`, `limit`, `rows`, `has_more`, `next_before_id`, `next_before_updated_us`, `listing`. | +| GET | `/api/channels/{id}` | Channel card. | +| GET | `/api/channels/{id}/avatar` | Channel avatar (file). | + +## API: bots and broadcasts + +| Method | Path | Parameters / response | +| --- | --- | --- | +| GET | `/api/bots` | Params: `q`, `before_id` (int64), `limit` (int). Response: `query`, `limit`, `rows`, `has_more`, `next_before_id`, `listing`. | +| GET | `/api/bots/{id}` | Bot card. | +| GET | `/api/broadcasts` | Params: `before_id` (int64), `limit` (int). Response: `limit`, `rows`, `has_more`, `next_before_id`. | + +## API: media catalogs + +| Method | Path | Parameters / response | +| --- | --- | --- | +| GET | `/api/emoji` | Params: `q`, `before_id` (int64), `limit` (int). Response: `query`, `rows`, `has_more`, `next_before_id`, `listing`. | +| GET | `/api/emoji/{id}/animation` | Emoji Lottie animation (file). | +| GET | `/api/stickers` | Param: `kind` (string, type filter). Response: `rows`, `max_items`. | +| GET | `/api/stickers/{id}/documents` | Response: `document_ids`. | +| GET | `/api/stickers/documents/{id}/animation` | Sticker animation (file). | +| GET | `/api/gif-catalog` | Response: proxied from Admin API (`/v1/gif-catalog`). | +| GET | `/api/gif-catalog/documents/{id}/preview` | GIF preview (file). | + +## API: message audit + +| Method | Path | Parameters / response | +| --- | --- | --- | +| GET | `/api/messages` | Params: `owner_user_id` (int64, required with `peer_id`), `peer_id` (int64), `before_date` (int64), `before_id` (int), `limit` (int). Response: `owner_user_id`, `peer_id`, `before_date`, `before_id`, `limit`, `rows`. | +| GET | `/api/messages/detail` | Params: `owner_user_id` (int64, req.), `msg_id` (int, req.). Response: message card. | +| GET | `/api/messages/groups` | Params: `channel_id` (int64, req.), `before_date` (int64), `before_id` (int), `limit` (int). Response: `channel_id`, `before_date`, `before_id`, `limit`, `rows`. | +| GET | `/api/messages/groups/detail` | Params: `channel_id` (int64, req.), `msg_id` (int, req.). Response: message card. | + +## API: star gifts and collectibles + +| Method | Path | Parameters / response | +| --- | --- | --- | +| GET | `/api/gifts` | Response: `Gifts` (gift list). | +| GET | `/api/auctions` | Response: `Auctions` — live state of all operator-authored auctions and scheduled drops. | +| GET | `/api/official-gifts` | Response: proxied from Admin API (`/v1/official-gifts`). | +| GET | `/api/official-gifts/{id}/animation` | Official gift animation (file). | +| GET | `/api/gifts/{id}/animation` | Gift animation (file). | +| GET | `/api/gifts/{id}/collectibles` | Response: proxied from Admin API (`/v1/gifts/{id}/collectibles`). | +| GET | `/api/gifts/{id}/collectibles/{kind}/{attribute_id}/animation` | Collectible attribute animation (file). `kind` ∈ {`model`, `pattern`}. | +| GET | `/api/collectible-usernames` | Params: `status` (`` | `vault` | `owned` | `burned`), `owner_user_id` (int64), `before_id` (int64), `limit` (int), `q`. Response: `rows`, `has_more`, `next_before_id`. | +| GET | `/api/collectible-usernames/{id}` | Response: `asset`, `transfers`. | +| GET | `/api/collectible-phones` | Params are passed through to the Admin API as-is (`/v1/collectible-phones?...`). | +| GET | `/api/collectible-phones/{id}` | Params are passed through to the Admin API (`/v1/collectible-phones/{id}?...`). | + +## API: Premium + +All routes in this section require the `premium.manage` permission (checked both +at the panel and at the Admin API). + +| Method | Path | Description | +| --- | --- | --- | +| GET | `/api/premium/plans` | Premium plan catalog (proxied to Admin API `/v1/premium/plans`). | + +## API: moderation + +All reads pass query parameters through to the Admin API as-is +(`/v1/moderation/...`). Decisions are `POST` (see below). + +| Method | Path | Description | +| --- | --- | --- | +| GET | `/api/moderation/cases` | Moderation case list. | +| GET | `/api/moderation/cases/{id}` | Moderation case. | +| GET | `/api/moderation/reports/{id}` | Report. | +| POST | `/api/moderation/cases/{id}/claim` | Claim the case. Body: common fields + `version` (int64), `internal_note` (string). | +| POST | `/api/moderation/cases/{id}/decide` | Decide the case. Body: common fields + `version` (int64), `internal_note` (string). | +| POST | `/api/moderation/cases/{id}/appeals/{appeal_id}/review` | Review an appeal. Body: common fields + `version` (int64), `internal_note` (string). | + +## API: official verification + +All routes require the `verification.review` permission. Reads go straight to +PostgreSQL; decisions always go through the Admin API (command journal, state +machine, optimistic locking). + +| Method | Path | Parameters / body | +| --- | --- | --- | +| GET | `/api/verification/applications` | Params: `status`, `target_type`, `reviewer`, `q`, `before_id`, `limit`. Response: `rows`, `has_more`, `next_before_id`. | +| GET | `/api/verification/applications/{id}` | Response: application, events, `applicant_controls_target`, `target_verified`. | +| GET | `/api/verification/counts` | Application counts by status. | +| POST | `/api/verification/applications/{id}/claim` | Decision body: common fields + `version` (int64), `internal_note` (string). | +| POST | `/api/verification/applications/{id}/approve` | Body: common fields + `version` (int64), `internal_note` (string). Grants badge. | +| POST | `/api/verification/applications/{id}/reject` | Body: common fields + `version` (int64), `internal_note` (string). | +| POST | `/api/actions/revoke-verification` | Strip a badge. Requires `verification.review` **and** `verification.revoke`. Body — see actions section below. | + +A "decided by another moderator" conflict is returned as `409 Conflict`. + +## API: third-party (bot) verification + +A separate mechanism with separate tables, permissions, and routes. Queue reads +and decisions require `botverification.review`; managing verifiers, the icon +catalog, and stripping marks requires `botverification.manage`. + +| Method | Path | Parameters / body | +| --- | --- | --- | +| GET | `/api/botverification/verifiers` | Params: `enabled_only` (bool), `limit` (int). Response: `rows`. | +| GET | `/api/botverification/icons` | Params: `active_only` (bool), `limit` (int). Response: `rows`. | +| GET | `/api/botverification/marks` | Params: `peer_type`, `verifier_bot_id` (int64), `q`, `before_id` (int64), `limit` (int). Response: `rows`, `has_more`, `next_before_id`. | +| GET | `/api/botverification/requests` | Params: `status`, `peer_type`, `verifier_bot_id` (int64), `q`, `before_id` (int64), `limit` (int). Response: `rows`, `has_more`, `next_before_id`. | +| GET | `/api/botverification/requests/{id}` | Response: `request`, `verifier`, `mark_active`. | +| GET | `/api/botverification/counts` | Request counts by status. Response: `counts`. | +| POST | `/api/botverification/requests/{id}/approve` | Decision body: common fields + `version` (int64), `internal_note` (string). | +| POST | `/api/botverification/requests/{id}/reject` | Body: common fields + `version` (int64), `internal_note` (string). | +| POST | `/api/botverification/requests/{id}/revoke` | Body: common fields + `version` (int64), `internal_note` (string). | +| POST | `/api/actions/grant-bot-verifier` | Appoint a bot as verifier. Requires `botverification.manage`. Body — see below. | +| POST | `/api/actions/set-bot-verifier-enabled` | Enable/disable a verifier. Requires `botverification.manage`. Body — see below. | +| POST | `/api/actions/revoke-bot-verifier` | Strip a bot's verifier status. Requires `botverification.manage`. Body — see below. | +| POST | `/api/actions/upsert-verification-icon` | Add/edit a catalog icon. Requires `botverification.manage`. Body — see below. | +| POST | `/api/actions/set-verification-icon-active` | Enable/disable an icon. Requires `botverification.manage`. Body — see below. | +| POST | `/api/actions/revoke-custom-verification` | Strip a third-party mark. Requires `botverification.manage`. Body — see below. | + +--- + +## API: account actions + +All routes are `POST /api/actions/...`, require a session and CSRF. The request +body always contains the **common command fields** (`command_id`, `reason`, +`confirm`) plus the fields from the table below. + +| Path | Specific body fields | Permission | +| --- | --- | --- | +| `set-frozen` | `user_id` (int64), `frozen` (bool), `freeze_until` (time, opt.), `freeze_appeal_url` (string, opt.) | — | +| `grant-premium` | `user_id` (int64), `months` (int) | `premium.manage` | +| `upsert-premium-plan` | `months` (int), `duration_days` (int), `amount_stars` (int64), `fiat_currency` (string), `fiat_amount` (int64), `store_product` (string), `store_quantity` (int), `enabled` (bool), `sort_order` (int), `label` (string), `expected_version` (int64) | `premium.manage` | +| `grant-stars` | `user_id` (int64), `amount` (int64) | — | +| `set-verified` | `user_id` (int64), `verified` (bool) | — | +| `set-account-flags` | `user_id` (int64), `scam` (bool), `fake` (bool) | — | +| `set-support` | `user_id` (int64), `support` (bool) | — | +| `set-account-username` | `user_id` (int64), `username` (string) | — | +| `set-account-profile` | `user_id` (int64), `first_name` (string), `last_name` (string) | — | +| `set-account-phone` | `user_id` (int64), `phone` (string) | — | +| `set-account-login-email` | `user_id` (int64), `email` (string) | — | +| `set-account-avatar` | **multipart**: `metadata` field (JSON with common fields + `user_id` (int64)) and a file in `file` | — | +| `set-account-color` | `user_id` (int64), `for_profile` (bool), `has_color` (bool), `color` (int), `background_emoji_id` (int64) | — | +| `set-account-emoji-status` | `user_id` (int64), `document_id` (int64), `until` (int, seconds) | — | +| `revoke-sessions` | `user_id` (int64), `hash` (int64, opt.), `keep_hash` (int64, opt.), `revoke_all` (bool) | — | + +Example (granting Premium, the case from above): + +```http +POST /api/actions/grant-premium +Content-Type: application/json +X-CSRF-Token: + +{ + "command_id": "grant-premium-001", + "reason": "Incident compensation", + "confirm": true, + "user_id": 123456789, + "months": 12 +} +``` + +## API: channel actions + +| Path | Specific body fields | Permission | +| --- | --- | --- | +| `set-channel-flags` | `channel_id` (int64), `scam` (bool), `fake` (bool) | — | +| `set-channel-settings` | `channel_id` (int64), `gigagroup` (*bool), `antispam` (*bool), `participants_hidden` (*bool), `noforwards` (*bool), `join_to_send` (*bool), `join_request` (*bool), `slowmode_seconds` (*int) — all optional pointers | — | +| `set-channel-username` | `channel_id` (int64), `username` (string) | — | +| `set-channel-color` | `channel_id` (int64), `for_profile` (bool), `has_color` (bool), `color` (int), `background_emoji_id` (int64) | — | +| `set-channel-emoji-status` | `channel_id` (int64), `document_id` (int64), `until` (int) | — | +| `set-channel-avatar` | **multipart**: `metadata` (JSON with common fields + `channel_id` (int64)) and a file `file` | — | +| `set-channel-verified` | `channel_id` (int64), `verified` (bool) | — | + +## API: bot actions + +| Path | Specific body fields | Permission | +| --- | --- | --- | +| `create-bot` | `owner_user_id` (int64), `name` (string), `username` (string) | — | +| `delete-bot` | `bot_user_id` (int64) | — | +| `export-bot-token` | `bot_user_id` (int64) | `bots.token.read` | +| `create-broadcast` | `message` (string), `target_mode` (string), `user_ids` ([]int64, opt.) | — | + +## API: sticker and emoji actions + +| Path | Specific body fields | Permission | +| --- | --- | --- | +| `create-sticker-set` | **multipart**: `metadata` (JSON: common fields + `title`, `short_name`, `kind`, `emoji`, `keywords`) and a file `file` | — | +| `rename-sticker-set` | `set_id` (int64), `title` (string) | — | +| `add-sticker-to-set` | **multipart**: `metadata` (JSON: common fields + `set_id` (string), `emoji`, `keywords`) and a file `file` | — | +| `remove-sticker-from-set` | `set_id` (int64), `document_id` (int64) | — | +| `set-sticker-set-archived` | `set_id` (int64), `archived` (bool) | — | +| `set-sticker-set-sort-order` | `set_id` (int64), `sort_order` (int) | — | +| `delete-sticker-set` | `set_id` (int64) | — | + +## API: GIF catalog actions + +| Path | Specific body fields | Permission | +| --- | --- | --- | +| `create-gif-catalog-entry` | **multipart**: `metadata` (JSON: common fields + `title`) and a file `file` | — | +| `set-gif-catalog-enabled` | `id` (int64, sent as string), `enabled` (bool) | — | +| `set-gif-catalog-sort-order` | `id` (int64, string), `sort_order` (int) | — | +| `delete-gif-catalog-entry` | `id` (int64, string) | — | + +## API: gift and collectible actions + +| Path | Specific body fields | Permission | +| --- | --- | --- | +| `import-gift` | **multipart**: `metadata` (JSON: common fields + `gift_id` (int64), `title`, `stars` (int64), `convert_stars` (int64), `enabled` (bool), `sort_order` (int), `auction` (bool), `auction_slug`, `gifts_per_round` (int), `auction_start_date` (int), `auction_round_duration` (int), `availability_total` (int), `locked_until_date` (int)) and a file `file` | — | +| `import-official-gift` | common fields + `source_gift_id` (string), `gift_id` (int64), `title`, `stars` (int64), `convert_stars` (int64), `enabled` (bool), `sort_order` (int), `include_collectible` (bool), `upgrade_stars` (int64), `supply_total` (int), `slug_prefix` (string), `locked_until_date` (int) | — | +| `publish-gift-collectibles` | **multipart**, `gift_id` sent in query (`?gift_id=`): `metadata` (JSON: common fields + `upgrade_stars` (int64), `supply_total` (int), `slug_prefix` (string), `models` ([]object), `patterns` ([]object), `backdrops` ([]object)); animations are files keyed by the `models`/`patterns` entries | — | +| `set-gift-enabled` | `gift_id` (int64), `enabled` (bool) | — | +| `set-gift-sort-order` | `gift_id` (int64), `sort_order` (int) | — | +| `give-gift` | common fields + `sender_user_id` (int64), `user_id` (int64), `channel_id` (int64), `gift_id` (int64), `hide_name` (bool), `message` (string), `upgrade` (bool), `model_attribute_id` (int64), `pattern_attribute_id` (int64), `backdrop_attribute_id` (int64) | — | + +## API: collectible username actions + +| Path | Specific body fields | Permission | +| --- | --- | --- | +| `mint-collectible-username` | `username` (string), `owner_user_id` (int64), `owner_channel_id` (int64), `currency` (string), `amount` (int64), `crypto_currency` (string), `crypto_amount` (int64), `url` (string), `purchase_date` (int/unix or date) | — | +| `transfer-collectible-username` | `username` (string), `to_user_id` (int64), `to_channel_id` (int64) | — | +| `revoke-collectible-username` | `username` (string), `burn` (bool) | — | +| `delete-collectible-username` | `username` (string) | — | + +## API: anonymous number actions + +| Path | Specific body fields | Permission | +| --- | --- | --- | +| `mint-collectible-phone` | `phone` (string), `tier` (string), `owner_user_id` (int64), `currency` (string), `amount` (int64), `crypto_currency` (string), `crypto_amount` (int64), `url` (string), `purchase_date` (int/unix or date) | — | +| `update-collectible-phone-price` | `phone` (string), `currency` (string), `amount` (int64), `crypto_currency` (string), `crypto_amount` (int64) | — | +| `transfer-collectible-phone` | `phone` (string), `to_user_id` (int64) | — | +| `revoke-collectible-phone` | `phone` (string), `burn` (bool) | — | +| `delete-collectible-phone` | `phone` (string) | — | + +## API: account rating actions + +| Path | Specific body fields | Permission | +| --- | --- | --- | +| `recompute-account-rating` | `user_id` (int64) | — | +| `adjust-account-rating` | `user_id` (int64), `amount` (int64) | — | + +## API: message deletion + +| Path | Specific body fields | Permission | +| --- | --- | --- | +| `delete-messages` | `owner_user_id` (int64), `peer_id` (int64), `ids` ([]int), `revoke` (bool) | — | +| `delete-history` | `owner_user_id` (int64), `peer_id` (int64), `max_id` (int), `min_date` (int), `max_date` (int), `max_batches` (int), `just_clear` (bool), `revoke` (bool) | — | + +## API: verification decisions (request bodies) + +Official verification — `revoke-verification`: + +| Field | Type | Description | +| --- | --- | --- | +| `target_type` | string | Target type (`user` / `channel`, etc., validated by `domain.VerificationTargetType.Valid()`). | +| `target_id` | int64 | Target identifier (not the application!). | +| `internal_note` | string | Operator-only internal note (opt.). | +| + common fields | | `command_id`, `reason`, `confirm`. | + +Third-party verification — verifier/mark actions (`botverification.manage`): + +| Path | Specific body fields | +| --- | --- | +| `grant-bot-verifier` | `bot_id` (int64), `icon_document_id` (int64), `company_name` (string, req.), `default_description` (string), `can_modify_custom_description` (bool), `version` (int64, 0 for new) | +| `set-bot-verifier-enabled` | `bot_id` (int64), `enabled` (bool) | +| `revoke-bot-verifier` | `bot_id` (int64) | +| `upsert-verification-icon` | `document_id` (int64), `name` (string, req.), `owner_bot_id` (int64, opt., 0 = shared) | +| `set-verification-icon-active` | `icon_id` (int64), `active` (bool) | +| `revoke-custom-verification` | `verifier_bot_id` (int64), `peer_type` (string, validated), `peer_id` (int64) | + +All of these also carry the common fields (`command_id`, `reason`, `confirm`). diff --git a/docs/admin-panel-api.ru.md b/docs/admin-panel-api.ru.md new file mode 100644 index 00000000..c3a03875 --- /dev/null +++ b/docs/admin-panel-api.ru.md @@ -0,0 +1,416 @@ +# Админ-панель: все пути и контракты API + +Документация по всем путям встроенной админ-панели `telesrv` — адресам +страниц (SPA) и API-маршрутам, которые за ними стоят. Сервер панели живёт в +`cmd/telesrv-admin`, маршруты объявлены в функции `(*server).routes()` +(`server.go:50`). + +Панель — это обычный HTTP-сервер: он отдаёт собранный фронтенд (`/`) и JSON-API +под префиксом `/api/`. Все API-пути требуют сессию (cookie), а все +изменяющие запросы — ещё и CSRF-токен. Многие маршруты дополнительно проверяют +права оператора (`permission`). + +## Как пользоваться этим документом + +- Для каждого GET-эндпоинта указаны **параметры запроса** (query) и краткая + форма **ответа**. +- Для каждого POST-эндпоинта в блоке `/api/actions/*` и решений верификации + указано **тело запроса** (JSON). Все они разделяют общие поля + (см. ниже) плюс свои специфичные поля. +- `int64` в JSON можно передавать и как число, и как строку (например, + `"user_id": "123"` или `"user_id": 123`) — сервер принимает оба варианта + (`flexInt64`). `flexUnix` принимает Unix-секунды или дату `2006-01-02` / + RFC3339. +- Все изменяющие запросы идут в Admin API. Ответ команды — либо + `{"status":..., "message":..., "command_id":...}` при успехе (HTTP 200), либо + `{"error":..., "code":...}` при ошибке. Конфликт оптимистичной блокировки — + `409`. + +## Аутентификация и сессия + +| Метод | Путь | Описание | +| --- | --- | --- | +| POST | `/api/login` | Вход. Тело: `{"secret": "..."}`. Проверяет секрет из конфига, выдаёт подписанную cookie-сессию и cookie CSRF. Единственный изменяющий маршрут без CSRF-токена; проверяется только Origin. | +| POST | `/api/logout` | Выход. Уничтожает сессию и cookie CSRF. | +| GET | `/api/session` | Возвращает `{"actor": "...", "permissions": [...], "csrf_token": "..."}`. Панель вызывает его при старте. | + +Сессия живёт в подписанной cookie (TTL по умолчанию 12 часов), серверного +хранилища сессий нет. Все запросы, кроме `GET/HEAD/OPTIONS` и `/api/login`, +обязаны предъявить: + +- cookie `telesrv_admin_csrf`; +- заголовок `X-CSRF-Token` с тем же значением; +- Origin, совпадающий с хостом (если Origin присутствует). + +Нарушение любого из трёх условий — `403 Forbidden`. + +## Права и их проверка + +Панель различает обычную авторизацию (`requireAuthAPI`) и проверку права +(`requirePermission`). Имена прав совпадают со строками в +`TELESRV_ADMIN_UI_PERMISSIONS`: + +| Право | Что даёт | +| --- | --- | +| `*` | Все права (wildcard). | +| `premium.manage` | Управление каталогом Premium-планов, начисление Premium. | +| `bots.token.read` | Экспорт токена бота (`/api/actions/export-bot-token`). | +| `verification.review` | Чтение и решение очереди официальной верификации. | +| `verification.revoke` | Снятие официального бейджа (в дополнение к `verification.review`). | +| `botverification.review` | Чтение и решение очереди сторонней (ботовой) верификации. | +| `botverification.manage` | Назначение верификаторов, редактирование каталога иконок, снятие метки сторонней верификации. | + +Права официальной и сторонней верификации намеренно независимы. Список прав +сессии возвращается в `/api/session`, чтобы интерфейс скрывал недоступные +разделы. + +## Страницы интерфейса (SPA) + +SPA-роуты декларативны: любое имя раздела отдаётся сервером как `/` (index.html), +а сам фронтенд решает, что рендерить (`web/src/pages/Routes.tsx`). + +| Путь | Страница | +| --- | --- | +| `/` | Панель управления (счётчики, статистика хранилища, ссылки на разделы). | +| `/accounts` | Список аккаунтов (с поиском). | +| `/accounts/{id}` | Карточка аккаунта: профиль, действия. | +| `/channels` | Список супергрупп и каналов. | +| `/channels/{id}` | Карточка канала. | +| `/bots` | Список ботов. | +| `/bots/{id}` | Карточка бота. | +| `/broadcasts` | Рассылки. | +| `/monetization`, `/premium` | Звёзды и Premium: планы, начисление. Требует `premium.manage`. | +| `/moderation` | Жалобы и модерация: список кейсов. | +| `/moderation/{id}` | Детали кейса модерации. | +| `/emoji` | Каталог emoji-наборов. | +| `/stickers` | Каталог стикерпаков. | +| `/gif-catalog` | Каталог GIF. | +| `/messages`, `/messages/private` | Аудит личных сообщений. | +| `/messages/detail`, `/messages/private/detail` | Детали личного сообщения (`?owner_user_id=&msg_id=`). | +| `/messages/groups` | Аудит сообщений групп/каналов. | +| `/messages/groups/detail` | Детали сообщения в группе (`?channel_id=&msg_id=`). | +| `/gifts` | Звёздные подарки: каталог, коллекционки, аукционы. | +| `/give-gifts` | Выдача подарков. | +| `/collectible-usernames` | Коллекционные юзернеймы. | +| `/collectible-usernames/{id}` | Карточка коллекционного юзернейма. | +| `/collectible-phones` | Анонимные номера. | +| `/account-ratings` | Рейтинг аккаунтов. | +| `/account-ratings/{user_id}` | Карточка рейтинга аккаунта. | +| `/storage` | Объектное хранилище: статистика. | +| `/verification` | Официальная верификация: очередь заявок. Требует `verification.review`. | +| `/verification/{id}` | Детали заявки на официальную верификацию. Требует `verification.review`. | +| `/bot-verification` | Сторонняя верификация: верификаторы, иконки, метки, очередь. Требует `botverification.review`. | +| `/bot-verification/{id}` | Детали запроса сторонней верификации. Требует `botverification.review`. | + +Несуществующий API-путь возвращает `404 {"error":"api route not found"}`; любой +неизвестный путь фронтенда отдаётся как `/`. + +## Соглашения ответов + +- Успешные чтения — `200` + JSON; файлы (аватары, анимации, превью) — сам файл. +- Ошибки — JSON вида `{"error": "...", "code": "..."}` с соответствующим HTTP-статусом. +- `401` — нет/просрочена сессия; `403` — нарушение CSRF/Origin или не хватает права + (в `requirePermission` к телу добавляется поле `permission`); + `409` — конфликт оптимистичной блокировки (кейс модерации, верификация); + `502` — Admin API недоступен. +- Ошибки команд, ушедших в Admin API, возвращаются как + `{"status": ..., "message": ..., "error": ...}`. + +## Общие поля команд (POST `/api/actions/*`) + +Каждый изменяющий запрос несёт в теле: + +| Поле | Тип | Описание | +| --- | --- | --- | +| `command_id` | string | Идемпотентный ключ команды. Повтор с тем же `command_id` не выполняет действие дважды. Если пусто — генерируется сервером. | +| `reason` | string | Обязательная причина операции (аудит). | +| `confirm` | bool | Подтверждение оператором (`true`). | + +--- + +## API: дашборд и хранилище + +| Метод | Путь | Описание | +| --- | --- | --- | +| GET | `/api/dashboard` | Сводка: `counts`, `storage`, при наличии — `host`. | +| GET | `/api/storage/stats` | Статистика объектного хранилища. | + +## API: аккаунты + +| Метод | Путь | Параметры / ответ | +| --- | --- | --- | +| GET | `/api/accounts` | Параметры: `q` (поиск), `before_id` (int64), `before_active_us` (int64, микросекунды), `limit` (int). Ответ: `query`, `limit`, `rows`, `has_more`, `next_before_id`, `next_before_active_us`, `listing`. | +| GET | `/api/accounts/{id}` | Карточка аккаунта: профиль, флаги, статистика (проксируется/читается из БД). | +| GET | `/api/accounts/{id}/avatar` | Аватар аккаунта (файл). | +| GET | `/api/account-ratings` | Параметры: `q`, `min_level` (int), `user_id` (int64), `before_id` (int64), `limit` (int). Ответ: `rows`, `has_more`, `next_before_id`. | +| GET | `/api/account-ratings/{user_id}` | Ответ: `rating`, `events`. | + +## API: каналы и супергруппы + +| Метод | Путь | Параметры / ответ | +| --- | --- | --- | +| GET | `/api/channels` | Параметры: `q`, `before_id` (int64), `before_updated_us` (int64, микросекунды), `limit` (int). Ответ: `query`, `limit`, `rows`, `has_more`, `next_before_id`, `next_before_updated_us`, `listing`. | +| GET | `/api/channels/{id}` | Карточка канала. | +| GET | `/api/channels/{id}/avatar` | Аватар канала (файл). | + +## API: боты и рассылки + +| Метод | Путь | Параметры / ответ | +| --- | --- | --- | +| GET | `/api/bots` | Параметры: `q`, `before_id` (int64), `limit` (int). Ответ: `query`, `limit`, `rows`, `has_more`, `next_before_id`, `listing`. | +| GET | `/api/bots/{id}` | Карточка бота. | +| GET | `/api/broadcasts` | Параметры: `before_id` (int64), `limit` (int). Ответ: `limit`, `rows`, `has_more`, `next_before_id`. | + +## API: медиа-каталоги + +| Метод | Путь | Параметры / ответ | +| --- | --- | --- | +| GET | `/api/emoji` | Параметры: `q`, `before_id` (int64), `limit` (int). Ответ: `query`, `rows`, `has_more`, `next_before_id`, `listing`. | +| GET | `/api/emoji/{id}/animation` | Lottie-анимация emoji (файл). | +| GET | `/api/stickers` | Параметр: `kind` (string, фильтр по типу). Ответ: `rows`, `max_items`. | +| GET | `/api/stickers/{id}/documents` | Ответ: `document_ids`. | +| GET | `/api/stickers/documents/{id}/animation` | Анимация стикера (файл). | +| GET | `/api/gif-catalog` | Ответ: проксируется из Admin API (`/v1/gif-catalog`). | +| GET | `/api/gif-catalog/documents/{id}/preview` | Превью GIF (файл). | + +## API: аудит сообщений + +| Метод | Путь | Параметры / ответ | +| --- | --- | --- | +| GET | `/api/messages` | Параметры: `owner_user_id` (int64, обязателен с `peer_id`), `peer_id` (int64), `before_date` (int64), `before_id` (int), `limit` (int). Ответ: `owner_user_id`, `peer_id`, `before_date`, `before_id`, `limit`, `rows`. | +| GET | `/api/messages/detail` | Параметры: `owner_user_id` (int64, обяз.), `msg_id` (int, обяз.). Ответ: карточка сообщения. | +| GET | `/api/messages/groups` | Параметры: `channel_id` (int64, обяз.), `before_date` (int64), `before_id` (int), `limit` (int). Ответ: `channel_id`, `before_date`, `before_id`, `limit`, `rows`. | +| GET | `/api/messages/groups/detail` | Параметры: `channel_id` (int64, обяз.), `msg_id` (int, обяз.). Ответ: карточка сообщения. | + +## API: звёздные подарки и коллекционки + +| Метод | Путь | Параметры / ответ | +| --- | --- | --- | +| GET | `/api/gifts` | Ответ: `Gifts` (список подарков). | +| GET | `/api/auctions` | Ответ: `Auctions` — текущее состояние всех авторских аукционов и запланированных дропов. | +| GET | `/api/official-gifts` | Ответ: проксируется из Admin API (`/v1/official-gifts`). | +| GET | `/api/official-gifts/{id}/animation` | Анимация официального подарка (файл). | +| GET | `/api/gifts/{id}/animation` | Анимация подарка (файл). | +| GET | `/api/gifts/{id}/collectibles` | Ответ: проксируется из Admin API (`/v1/gifts/{id}/collectibles`). | +| GET | `/api/gifts/{id}/collectibles/{kind}/{attribute_id}/animation` | Анимация атрибута коллекционки (файл). `kind` ∈ {`model`, `pattern`}. | +| GET | `/api/collectible-usernames` | Параметры: `status` (`` | `vault` | `owned` | `burned`), `owner_user_id` (int64), `before_id` (int64), `limit` (int), `q`. Ответ: `rows`, `has_more`, `next_before_id`. | +| GET | `/api/collectible-usernames/{id}` | Ответ: `asset`, `transfers`. | +| GET | `/api/collectible-phones` | Параметры пробрасываются в Admin API как есть (`/v1/collectible-phones?...`). | +| GET | `/api/collectible-phones/{id}` | Параметры пробрасываются в Admin API (`/v1/collectible-phones/{id}?...`). | + +## API: Premium + +Все маршруты раздела требуют права `premium.manage` (проверяется и на уровне +панели, и на стороне Admin API). + +| Метод | Путь | Описание | +| --- | --- | --- | +| GET | `/api/premium/plans` | Каталог Premium-планов (проксируется в Admin API `/v1/premium/plans`). | + +## API: модерация + +Все чтения пробрасывают query-параметры в Admin API как есть +(`/v1/moderation/...`). Решения — `POST` (см. ниже). + +| Метод | Путь | Описание | +| --- | --- | --- | +| GET | `/api/moderation/cases` | Список кейсов модерации. | +| GET | `/api/moderation/cases/{id}` | Кейс модерации. | +| GET | `/api/moderation/reports/{id}` | Жалоба. | +| POST | `/api/moderation/cases/{id}/claim` | Взять кейс на себя. Тело: общие поля + `version` (int64), `internal_note` (string). | +| POST | `/api/moderation/cases/{id}/decide` | Решение по кейсу. Тело: общие поля + `version` (int64), `internal_note` (string). | +| POST | `/api/moderation/cases/{id}/appeals/{appeal_id}/review` | Рассмотрение апелляции. Тело: общие поля + `version` (int64), `internal_note` (string). | + +## API: официальная верификация + +Все маршруты требуют права `verification.review`. Чтения идут напрямую из +PostgreSQL, решения — всегда через Admin API (журнал команд, статусная машина, +оптимистичная блокировка). + +| Метод | Путь | Параметры / тело | +| --- | --- | --- | +| GET | `/api/verification/applications` | Параметры: `status`, `target_type`, `reviewer`, `q`, `before_id`, `limit`. Ответ: `rows`, `has_more`, `next_before_id`. | +| GET | `/api/verification/applications/{id}` | Ответ: заявка, события, `applicant_controls_target`, `target_verified`. | +| GET | `/api/verification/counts` | Счётчики заявок по статусам. | +| POST | `/api/verification/applications/{id}/claim` | Тело решения: общие поля + `version` (int64), `internal_note` (string). | +| POST | `/api/verification/applications/{id}/approve` | Тело: общие поля + `version` (int64), `internal_note` (string). Выдаёт бейдж. | +| POST | `/api/verification/applications/{id}/reject` | Тело: общие поля + `version` (int64), `internal_note` (string). | +| POST | `/api/actions/revoke-verification` | Снять бейдж. Требует `verification.review` **и** `verification.revoke`. Тело — см. ниже в разделе действий. | + +Конфликт «решил другой модератор» возвращается как `409 Conflict`. + +## API: сторонняя (ботовая) верификация + +Отдельный механизм с отдельными таблицами, правами и маршрутами. Чтения и +решения очереди требуют `botverification.review`; управление верификаторами, +каталогом иконок и снятие меток — `botverification.manage`. + +| Метод | Путь | Параметры / тело | +| --- | --- | --- | +| GET | `/api/botverification/verifiers` | Параметры: `enabled_only` (bool), `limit` (int). Ответ: `rows`. | +| GET | `/api/botverification/icons` | Параметры: `active_only` (bool), `limit` (int). Ответ: `rows`. | +| GET | `/api/botverification/marks` | Параметры: `peer_type`, `verifier_bot_id` (int64), `q`, `before_id` (int64), `limit` (int). Ответ: `rows`, `has_more`, `next_before_id`. | +| GET | `/api/botverification/requests` | Параметры: `status`, `peer_type`, `verifier_bot_id` (int64), `q`, `before_id` (int64), `limit` (int). Ответ: `rows`, `has_more`, `next_before_id`. | +| GET | `/api/botverification/requests/{id}` | Ответ: `request`, `verifier`, `mark_active`. | +| GET | `/api/botverification/counts` | Счётчики запросов по статусам. Ответ: `counts`. | +| POST | `/api/botverification/requests/{id}/approve` | Тело решения: общие поля + `version` (int64), `internal_note` (string). | +| POST | `/api/botverification/requests/{id}/reject` | Тело: общие поля + `version` (int64), `internal_note` (string). | +| POST | `/api/botverification/requests/{id}/revoke` | Тело: общие поля + `version` (int64), `internal_note` (string). | +| POST | `/api/actions/grant-bot-verifier` | Назначить бота верификатором. Требует `botverification.manage`. Тело — см. ниже. | +| POST | `/api/actions/set-bot-verifier-enabled` | Включить/отключить верификатора. Требует `botverification.manage`. Тело — см. ниже. | +| POST | `/api/actions/revoke-bot-verifier` | Лишить бота статуса верификатора. Требует `botverification.manage`. Тело — см. ниже. | +| POST | `/api/actions/upsert-verification-icon` | Добавить/изменить иконку в каталоге. Требует `botverification.manage`. Тело — см. ниже. | +| POST | `/api/actions/set-verification-icon-active` | Включить/отключить иконку. Требует `botverification.manage`. Тело — см. ниже. | +| POST | `/api/actions/revoke-custom-verification` | Снять стороннюю метку. Требует `botverification.manage`. Тело — см. ниже. | + +--- + +## API: действия над аккаунтами + +Все маршруты — `POST /api/actions/...`, требуют сессию и CSRF. Тело запроса +всегда содержит **общие поля команд** (`command_id`, `reason`, `confirm`) плюс +поля из таблицы ниже. + +| Путь | Специфичные поля тела | Право | +| --- | --- | --- | +| `set-frozen` | `user_id` (int64), `frozen` (bool), `freeze_until` (time, опц.), `freeze_appeal_url` (string, опц.) | — | +| `grant-premium` | `user_id` (int64), `months` (int) | `premium.manage` | +| `upsert-premium-plan` | `months` (int), `duration_days` (int), `amount_stars` (int64), `fiat_currency` (string), `fiat_amount` (int64), `store_product` (string), `store_quantity` (int), `enabled` (bool), `sort_order` (int), `label` (string), `expected_version` (int64) | `premium.manage` | +| `grant-stars` | `user_id` (int64), `amount` (int64) | — | +| `set-verified` | `user_id` (int64), `verified` (bool) | — | +| `set-account-flags` | `user_id` (int64), `scam` (bool), `fake` (bool) | — | +| `set-support` | `user_id` (int64), `support` (bool) | — | +| `set-account-username` | `user_id` (int64), `username` (string) | — | +| `set-account-profile` | `user_id` (int64), `first_name` (string), `last_name` (string) | — | +| `set-account-phone` | `user_id` (int64), `phone` (string) | — | +| `set-account-login-email` | `user_id` (int64), `email` (string) | — | +| `set-account-avatar` | **multipart**: поле `metadata` (JSON с общими полями + `user_id` (int64)) и файл в поле `file` | — | +| `set-account-color` | `user_id` (int64), `for_profile` (bool), `has_color` (bool), `color` (int), `background_emoji_id` (int64) | — | +| `set-account-emoji-status` | `user_id` (int64), `document_id` (int64), `until` (int, секунды) | — | +| `revoke-sessions` | `user_id` (int64), `hash` (int64, опц.), `keep_hash` (int64, опц.), `revoke_all` (bool) | — | + +Пример (выдача Premium, как в вопросе выше): + +```http +POST /api/actions/grant-premium +Content-Type: application/json +X-CSRF-Token: + +{ + "command_id": "grant-premium-001", + "reason": "Компенсация за инцидент", + "confirm": true, + "user_id": 123456789, + "months": 12 +} +``` + +## API: действия над каналами + +| Путь | Специфичные поля тела | Право | +| --- | --- | --- | +| `set-channel-flags` | `channel_id` (int64), `scam` (bool), `fake` (bool) | — | +| `set-channel-settings` | `channel_id` (int64), `gigagroup` (*bool), `antispam` (*bool), `participants_hidden` (*bool), `noforwards` (*bool), `join_to_send` (*bool), `join_request` (*bool), `slowmode_seconds` (*int) — все опциональные указатели | — | +| `set-channel-username` | `channel_id` (int64), `username` (string) | — | +| `set-channel-color` | `channel_id` (int64), `for_profile` (bool), `has_color` (bool), `color` (int), `background_emoji_id` (int64) | — | +| `set-channel-emoji-status` | `channel_id` (int64), `document_id` (int64), `until` (int) | — | +| `set-channel-avatar` | **multipart**: `metadata` (JSON с общими полями + `channel_id` (int64)) и файл `file` | — | +| `set-channel-verified` | `channel_id` (int64), `verified` (bool) | — | + +## API: действия над ботами + +| Путь | Специфичные поля тела | Право | +| --- | --- | --- | +| `create-bot` | `owner_user_id` (int64), `name` (string), `username` (string) | — | +| `delete-bot` | `bot_user_id` (int64) | — | +| `export-bot-token` | `bot_user_id` (int64) | `bots.token.read` | +| `create-broadcast` | `message` (string), `target_mode` (string), `user_ids` ([]int64, опц.) | — | + +## API: действия над стикерами и emoji + +| Путь | Специфичные поля тела | Право | +| --- | --- | --- | +| `create-sticker-set` | **multipart**: `metadata` (JSON: общие поля + `title`, `short_name`, `kind`, `emoji`, `keywords`) и файл `file` | — | +| `rename-sticker-set` | `set_id` (int64), `title` (string) | — | +| `add-sticker-to-set` | **multipart**: `metadata` (JSON: общие поля + `set_id` (string), `emoji`, `keywords`) и файл `file` | — | +| `remove-sticker-from-set` | `set_id` (int64), `document_id` (int64) | — | +| `set-sticker-set-archived` | `set_id` (int64), `archived` (bool) | — | +| `set-sticker-set-sort-order` | `set_id` (int64), `sort_order` (int) | — | +| `delete-sticker-set` | `set_id` (int64) | — | + +## API: действия над GIF-каталогом + +| Путь | Специфичные поля тела | Право | +| --- | --- | --- | +| `create-gif-catalog-entry` | **multipart**: `metadata` (JSON: общие поля + `title`) и файл `file` | — | +| `set-gif-catalog-enabled` | `id` (int64, передаётся как строка), `enabled` (bool) | — | +| `set-gif-catalog-sort-order` | `id` (int64, строка), `sort_order` (int) | — | +| `delete-gif-catalog-entry` | `id` (int64, строка) | — | + +## API: действия над подарками и коллекционками + +| Путь | Специфичные поля тела | Право | +| --- | --- | --- | +| `import-gift` | **multipart**: `metadata` (JSON: общие поля + `gift_id` (int64), `title`, `stars` (int64), `convert_stars` (int64), `enabled` (bool), `sort_order` (int), `auction` (bool), `auction_slug`, `gifts_per_round` (int), `auction_start_date` (int), `auction_round_duration` (int), `availability_total` (int), `locked_until_date` (int)) и файл `file` | — | +| `import-official-gift` | общие поля + `source_gift_id` (string), `gift_id` (int64), `title`, `stars` (int64), `convert_stars` (int64), `enabled` (bool), `sort_order` (int), `include_collectible` (bool), `upgrade_stars` (int64), `supply_total` (int), `slug_prefix` (string), `locked_until_date` (int) | — | +| `publish-gift-collectibles` | **multipart**, `gift_id` передаётся в query (`?gift_id=`): `metadata` (JSON: общие поля + `upgrade_stars` (int64), `supply_total` (int), `slug_prefix` (string), `models` ([]объект), `patterns` ([]объект), `backdrops` ([]объект)); анимации — файлы по ключам из `models`/`patterns` | — | +| `set-gift-enabled` | `gift_id` (int64), `enabled` (bool) | — | +| `set-gift-sort-order` | `gift_id` (int64), `sort_order` (int) | — | +| `give-gift` | общие поля + `sender_user_id` (int64), `user_id` (int64), `channel_id` (int64), `gift_id` (int64), `hide_name` (bool), `message` (string), `upgrade` (bool), `model_attribute_id` (int64), `pattern_attribute_id` (int64), `backdrop_attribute_id` (int64) | — | + +## API: действия над коллекционными юзернеймами + +| Путь | Специфичные поля тела | Право | +| --- | --- | --- | +| `mint-collectible-username` | `username` (string), `owner_user_id` (int64), `owner_channel_id` (int64), `currency` (string), `amount` (int64), `crypto_currency` (string), `crypto_amount` (int64), `url` (string), `purchase_date` (int/unix или дата) | — | +| `transfer-collectible-username` | `username` (string), `to_user_id` (int64), `to_channel_id` (int64) | — | +| `revoke-collectible-username` | `username` (string), `burn` (bool) | — | +| `delete-collectible-username` | `username` (string) | — | + +## API: действия над анонимными номерами + +| Путь | Специфичные поля тела | Право | +| --- | --- | --- | +| `mint-collectible-phone` | `phone` (string), `tier` (string), `owner_user_id` (int64), `currency` (string), `amount` (int64), `crypto_currency` (string), `crypto_amount` (int64), `url` (string), `purchase_date` (int/unix или дата) | — | +| `update-collectible-phone-price` | `phone` (string), `currency` (string), `amount` (int64), `crypto_currency` (string), `crypto_amount` (int64) | — | +| `transfer-collectible-phone` | `phone` (string), `to_user_id` (int64) | — | +| `revoke-collectible-phone` | `phone` (string), `burn` (bool) | — | +| `delete-collectible-phone` | `phone` (string) | — | + +## API: действия над рейтингом аккаунтов + +| Путь | Специфичные поля тела | Право | +| --- | --- | --- | +| `recompute-account-rating` | `user_id` (int64) | — | +| `adjust-account-rating` | `user_id` (int64), `amount` (int64) | — | + +## API: удаление сообщений + +| Путь | Специфичные поля тела | Право | +| --- | --- | --- | +| `delete-messages` | `owner_user_id` (int64), `peer_id` (int64), `ids` ([]int), `revoke` (bool) | — | +| `delete-history` | `owner_user_id` (int64), `peer_id` (int64), `max_id` (int), `min_date` (int), `max_date` (int), `max_batches` (int), `just_clear` (bool), `revoke` (bool) | — | + +## API: решения верификации (тела запросов) + +Официальная верификация — `revoke-verification`: + +| Поле | Тип | Описание | +| --- | --- | --- | +| `target_type` | string | Тип цели (`user` / `channel` и т.п., валидируется `domain.VerificationTargetType.Valid()`). | +| `target_id` | int64 | Идентификатор цели (не заявки!). | +| `internal_note` | string | Внутренняя заметка оператора (опц.). | +| + общие поля | | `command_id`, `reason`, `confirm`. | + +Сторонняя верификация — действия верификатора/меток (`botverification.manage`): + +| Путь | Специфичные поля тела | +| --- | --- | +| `grant-bot-verifier` | `bot_id` (int64), `icon_document_id` (int64), `company_name` (string, обяз.), `default_description` (string), `can_modify_custom_description` (bool), `version` (int64, 0 для нового) | +| `set-bot-verifier-enabled` | `bot_id` (int64), `enabled` (bool) | +| `revoke-bot-verifier` | `bot_id` (int64) | +| `upsert-verification-icon` | `document_id` (int64), `name` (string, обяз.), `owner_bot_id` (int64, опц., 0 = общая) | +| `set-verification-icon-active` | `icon_id` (int64), `active` (bool) | +| `revoke-custom-verification` | `verifier_bot_id` (int64), `peer_type` (string, валидируется), `peer_id` (int64) | + +Все они также несут общие поля (`command_id`, `reason`, `confirm`). diff --git a/docs/assets/gramsrv-android.png b/docs/assets/gramsrv-android.png new file mode 100644 index 00000000..c95e8b07 Binary files /dev/null and b/docs/assets/gramsrv-android.png differ diff --git a/docs/assets/gramsrv-telegram-desktop.png b/docs/assets/gramsrv-telegram-desktop.png new file mode 100644 index 00000000..52291a2f Binary files /dev/null and b/docs/assets/gramsrv-telegram-desktop.png differ diff --git a/docs/local-setup.md b/docs/local-setup.md new file mode 100644 index 00000000..4d5e2238 --- /dev/null +++ b/docs/local-setup.md @@ -0,0 +1,83 @@ +# Local setup + +This guide shows the shortest safe path for running gramsrv on a development +machine or a small test server. + +## 1. Prepare local configuration + +The repository intentionally tracks only `.env.example`. Your real `.env` is +ignored by Git and must not be committed. + +Linux / macOS: + +```bash +cp .env.example .env +${EDITOR:-nano} .env +``` + +Windows PowerShell: + +```powershell +Copy-Item .env.example .env +notepad .env +``` + +If you prefer a different config filename, set `TELESRV_CONFIG` as a process +environment variable before starting the server. + +## 2. Set the network values + +Review at least these values in `.env`: + +- `TELESRV_LISTEN` is the MTProto bind address. Use `0.0.0.0:2398` when + external clients must connect to this host, or `127.0.0.1:2398` for + same-machine testing only. +- `TELESRV_ADVERTISE_IP` must be a client-reachable IPv4 or IPv6 address, not a + DNS name. Use `127.0.0.1` only when the patched client runs on the same + machine. Use a LAN or public IP for phones, other computers, or remote tests. +- `TELESRV_PUBLIC_BASE_URL` and `TELESRV_PUBLIC_WEB_BASE_URL` are HTTP(S) URLs + used in generated public links. Put hostnames here, not in + `TELESRV_ADVERTISE_IP`. +- `TELESRV_DEV_AUTH_CODE=12345` is convenient for local development but must not + be exposed as a production login code. + +## 3. Start Postgres and Redis + +The development compose file exposes Postgres on `127.0.0.1:5432` and Redis on +`127.0.0.1:6399`, matching the defaults in `.env.example`. + +```bash +docker compose -f deploy/docker-compose.yml up -d +``` + +If you use external Postgres or Redis, update `TELESRV_POSTGRES_DSN` and +`TELESRV_REDIS_ADDR` in `.env`. + +## 4. Build and run the server + +Linux / macOS: + +```bash +go build -o bin/gramsrv ./cmd/telesrv +./bin/gramsrv +``` + +Windows PowerShell: + +```powershell +go build -o bin/gramsrv.exe ./cmd/telesrv +.\bin\gramsrv.exe +``` + +## 5. First-start checklist + +After startup, confirm: + +- migrations completed successfully; +- `data/server_rsa.pem` was created if it did not already exist; +- MTProto is listening on `TELESRV_LISTEN`; +- Postgres and Redis connections are healthy; +- patched clients use the matching DC address, port, and server RSA key. + +For the complete configuration reference, see +[`docs/configuration.en.md`](configuration.en.md). diff --git a/docs/update-service.md b/docs/update-service.md new file mode 100644 index 00000000..d6329940 --- /dev/null +++ b/docs/update-service.md @@ -0,0 +1,175 @@ +# Native client update service + +`cmd/telesrv-update` is a standalone HTTP service that provides two +Telegram-compatible update surfaces: + +- `/current4` and `/files/*` for the built-in Telegram Desktop updater; +- `/v1/resolve` for the main `telesrv` process to answer + `help.getAppUpdate` for Android, iOS, and other supported builds. + +The service has no HTTP upload endpoint. Operators publish a release by placing +an immutable artifact in the configured `files` directory and atomically +replacing `manifest.json`. The catalog validates the file size and SHA-256 +before exposing it, so truncated or accidentally replaced packages fail closed. + +## Quick start + +Create the working directories and start with the disabled example catalog: + +```powershell +New-Item -ItemType Directory -Force data\updates\files +Copy-Item deploy\update\manifest.example.json data\updates\manifest.json + +go run ./cmd/telesrv-update -check +go run ./cmd/telesrv-update +``` + +Check the local endpoints: + +```powershell +Invoke-RestMethod http://127.0.0.1:2402/readyz +Invoke-RestMethod http://127.0.0.1:2402/current4 +``` + +Connect the main server: + +```dotenv +TELESRV_UPDATE_PUBLIC_URL=https://updates.example.test +TELESRV_UPDATE_SERVICE_URL=http://127.0.0.1:2402 +TELESRV_UPDATE_REQUEST_TIMEOUT=2s +``` + +`PUBLIC_URL` must be reachable by clients and is advertised as +`help.getConfig.autoupdate_url_prefix`. `SERVICE_URL` may remain a loopback or +private route. When both routes are identical, `SERVICE_URL` may be omitted. +Production deployments should place an HTTPS reverse proxy in front of the +service without rewriting `/current4` or `/files/*`. + +Standalone service settings: + +```dotenv +TELESRV_UPDATE_LISTEN=127.0.0.1:2402 +TELESRV_UPDATE_MANIFEST=data/updates/manifest.json +TELESRV_UPDATE_FILES_DIR=data/updates/files +``` + +The manifest is reloaded automatically when its timestamp or size changes. A +malformed replacement makes readiness and catalog requests return `503`; it is +never combined with the previously validated snapshot. Validate a candidate +before atomically replacing the active file: + +```powershell +go run ./cmd/telesrv-update ` + -manifest .\manifest.next.json ` + -files .\data\updates\files ` + -check +``` + +## Telegram Desktop contract + +TDesktop requests `/current4`. A Windows x64 stable +release is represented as: + +```json +{ + "win64": { + "stable": { + "released": 7000007, + "link": "/files/tx64upd7000007" + } + } +} +``` + +The client compares `released` with its numeric `AppVersion`, downloads the +artifact with HTTP Range support, verifies the embedded RSA signature, unpacks +it, and only then exposes the normal update banner. A regular EXE or ZIP is not +a valid update package. + +Build packages with TDesktop's `Packer` target. The equivalent Windows x64 +command is: + +```powershell +Packer.exe ` + -version 7000007 ` + -path Telegram.exe ` + -path Updater.exe ` + -path "modules\x64\d3d\d3dcompiler_47.dll" ` + -target win64 +``` + +It produces `tx64upd7000007` and must report `Signature verified!` before the +artifact is published. + +| Platform | `/current4` key | Typical package name | +|---|---|---| +| Windows x64 | `win64` | `tx64upd` | +| Windows ARM64 | `winarm` | `tarm64upd` | +| Windows x86 | `win` | `tupdate` | +| macOS Intel | `mac` | `tmacupd` | +| macOS Apple Silicon | `armac` | `tarmacupd` | +| Linux | `linux` | `tlinuxupd` | + +## Update signing + +The public TDesktop sources contain Telegram's public update key; the matching +private key is not published. A custom deployment must establish its own update +signing identity: + +1. Generate a dedicated RSA-1024 key pair and keep the private key only in a + protected build secret store. +2. Provide the private key to TDesktop's local `DesktopPrivate/packer_private.h`. +3. Embed the matching public key in both the client update verifier and Packer. +4. Rebuild the bootstrap client and Packer before publishing updates. +5. Do not rotate the key without a transition client that trusts both identities. + +The update service never reads the private key and never creates signatures. It +checks SHA-256 and serves an artifact that Packer has already signed. A stock +TDesktop binary cannot install a package signed only by a custom key; the first +custom client build must be distributed out of band. + +## HTTP behavior + +- `/healthz` reports process liveness. +- `/readyz` validates the current catalog. +- `/current`, `/current1` ... `/current4` return desktop metadata with + `Cache-Control: no-cache`. +- `/files/` serves only artifacts referenced by the current validated + catalog, supports GET/HEAD and Range, and emits an immutable cache policy and + a SHA-256-based ETag. +- `/v1/resolve` returns a newer application release or `204 No Content`. + +Unknown package names are not exposed merely because a file exists in the +directory. Published package names are immutable: changing an active file makes +the endpoint return `503` until a matching manifest snapshot is loaded. + +## Android and iOS + +The main server forwards the client platform, current `app_version`, source, +channel, and `lang_code` to `/v1/resolve`. The resolver selects localized notes, +does not offer an equal or older version, and applies `url_by_source` when a +matching installer/store source is configured. + +- A standalone Android build may open or install an APK URL, but the APK must be + signed with the same Android application signing key as the installed build. +- Google Play and other store builds should use the corresponding store URL; + this mechanism does not bypass store policy. +- iOS may display information returned by `help.getAppUpdate`, but installation + still happens through App Store, TestFlight, or MDM. A normal iOS application + cannot replace itself from an arbitrary IPA URL. +- Set `can_not_skip` only after confirming that the target release is actually + available to every affected client. + +## Manifest fields + +- `desktop...build`: numeric TDesktop `AppVersion`. +- `file`, `sha256`, `size`: immutable signed artifact and integrity metadata. +- `apps...id`: stable positive release identifier. +- `version`: value compared with the client's `initConnection.app_version`. +- `notes`: localized text keyed by `en`, `ru`, `ru-ru`, and similar codes. +- `url_by_source`: source-specific installer or store URL. +- `can_not_skip`: whether the client may dismiss the application update. +- `disabled`: keep a valid entry as a draft without publishing it. + +Supported channels are `stable`, `beta`, and `alpha`. See +`deploy/update/manifest.example.json` for a complete disabled example. diff --git a/go.mod b/go.mod index ebfec292..113f9586 100644 --- a/go.mod +++ b/go.mod @@ -9,9 +9,10 @@ require ( github.com/golang-migrate/migrate/v4 v4.19.1 github.com/gotd/ige v0.3.0 github.com/gotd/log/logzap v0.1.1 - github.com/iamxvbaba/td v1.2.1 + github.com/iamxvbaba/td v1.3.2 github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa github.com/jackc/pgx/v5 v5.9.2 + github.com/klauspost/compress v1.19.1 github.com/lestrrat-go/jwx/v3 v3.1.1 github.com/minio/minio-go/v7 v7.2.1 github.com/pion/datachannel v1.6.2 diff --git a/go.sum b/go.sum index 54be9510..346b4d10 100644 --- a/go.sum +++ b/go.sum @@ -83,8 +83,8 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-multierror v1.1.0 h1:B9UzwGQJehnUY1yNrnwREHc3fGbC2xefo8g4TbElacI= github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= -github.com/iamxvbaba/td v1.2.1 h1:5+Ji1F/tdrN8zUxeeEbTPHBQGSnTDE+UAH+8pQi7O1Y= -github.com/iamxvbaba/td v1.2.1/go.mod h1:INkZJi18XbXtVOrldDnPtmQCJvIXhgDZdbo9MV/NY7M= +github.com/iamxvbaba/td v1.3.2 h1:/EwvDU0oiArAof16WDDGfUXg/w02m2MqzDskCnXakZA= +github.com/iamxvbaba/td v1.3.2/go.mod h1:INkZJi18XbXtVOrldDnPtmQCJvIXhgDZdbo9MV/NY7M= github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa h1:s+4MhCQ6YrzisK6hFJUX53drDT4UsSW3DEhKn0ifuHw= github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa/go.mod h1:a/s9Lp5W7n/DD0VrVoyJ00FbP2ytTPDVOivvn2bMlds= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= @@ -141,6 +141,8 @@ github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= +github.com/nyaruka/phonenumbers v1.8.1 h1:2K9YMQuv1dCGqjjzB1DwmdCe89khT4KPBQb2CxAMMlU= +github.com/nyaruka/phonenumbers v1.8.1/go.mod h1:fsKPJ70O9JetEA4ggnJadYTFWwtGPvu/lETTXNXq6Cs= github.com/ogen-go/ogen v1.23.0 h1:QaWeKm2KZ2zy7NkqqO1Vdl5idNqlG+svxdgwVAX+zbo= github.com/ogen-go/ogen v1.23.0/go.mod h1:bwwvC3AmCV+LrL5lazyQwwof90402mdcSyI0FOzzpfM= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= @@ -274,6 +276,8 @@ golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI= golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4= golang.org/x/tools v0.48.0 h1:3+hClM1aLL5mjMKm5ovokw9epgRXPuu2tILgismM6RE= golang.org/x/tools v0.48.0/go.mod h1:08xX0orndb/F7jJxGDicx061tyd5pcMto75YMAXr6lk= +google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= +google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/internal/admin/gif_catalog_test.go b/internal/admin/gif_catalog_test.go new file mode 100644 index 00000000..e28760ee --- /dev/null +++ b/internal/admin/gif_catalog_test.go @@ -0,0 +1,95 @@ +package admin + +import ( + "context" + "strings" + "testing" + + "telesrv/internal/domain" +) + +type fakeGifCatalogService struct { + entries []domain.GifCatalogEntry + listCalls int + uploadCalls int + createCalls int +} + +func (s *fakeGifCatalogService) ValidateGifUpload(_ string, data []byte) (string, bool) { + return "image/gif", strings.HasPrefix(string(data), "GIF89a") +} +func (s *fakeGifCatalogService) AdminUploadGifMaterial(context.Context, string, []byte) (domain.Document, error) { + s.uploadCalls++ + return domain.Document{ID: 91}, nil +} +func (s *fakeGifCatalogService) AdminCreateGifCatalogEntry(context.Context, string, int64) (domain.GifCatalogEntry, error) { + s.createCalls++ + entry := domain.GifCatalogEntry{ID: 92, DocumentID: 91, Title: "Wave", Enabled: true} + s.entries = append(s.entries, entry) + return entry, nil +} +func (s *fakeGifCatalogService) AdminListGifCatalog(context.Context) ([]domain.GifCatalogEntry, error) { + s.listCalls++ + return append([]domain.GifCatalogEntry(nil), s.entries...), nil +} +func (*fakeGifCatalogService) AdminSetGifCatalogEnabled(context.Context, int64, bool) (bool, error) { + return true, nil +} +func (*fakeGifCatalogService) AdminSetGifCatalogSortOrder(context.Context, int64, int) (bool, error) { + return true, nil +} +func (*fakeGifCatalogService) AdminSetGifCatalogCategory(context.Context, int64, string) (bool, error) { + return true, nil +} +func (*fakeGifCatalogService) AdminAutoCategorizeGifCatalog(context.Context) (int, error) { + return 0, nil +} +func (*fakeGifCatalogService) AdminDeleteUncategorizedGifs(context.Context) (int, int, error) { + return 0, 0, nil +} +func (*fakeGifCatalogService) AdminDeleteGifCatalogEntry(context.Context, int64) (bool, error) { + return true, nil +} +func (*fakeGifCatalogService) GetFile(context.Context, domain.FileDownloadRequest) (domain.FileChunk, bool, error) { + return domain.FileChunk{}, false, nil +} + +func TestCreateGifCatalogEntryReplayAndContentFingerprint(t *testing.T) { + ctx := context.Background() + repo := newMemoryCommandRepo() + gifs := &fakeGifCatalogService{} + svc := NewService(Dependencies{Commands: repo, GifCatalog: gifs, Now: fixedNow}) + req := CreateGifCatalogEntryRequest{ + CommandMeta: CommandMeta{CommandID: "gif-create-1", Actor: "ops", Reason: "catalog"}, + Title: "Wave", + FileName: "wave.gif", + Data: []byte("GIF89a-one"), + } + first, err := svc.CreateGifCatalogEntry(ctx, req) + if err != nil || first.Status != string(domain.AdminCommandCompleted) { + t.Fatalf("first create = %+v err=%v", first, err) + } + if gifs.listCalls != 1 || gifs.uploadCalls != 1 || gifs.createCalls != 1 { + t.Fatalf("first calls list/upload/create=%d/%d/%d", gifs.listCalls, gifs.uploadCalls, gifs.createCalls) + } + + // Even when the catalog has become full, the same completed command must be + // replayed before capacity preflight and must not upload another blob. + gifs.entries = make([]domain.GifCatalogEntry, domain.MaxGifCatalogEntries) + replay, err := svc.CreateGifCatalogEntry(ctx, req) + if err != nil || !replay.AlreadyExecuted { + t.Fatalf("replay = %+v err=%v", replay, err) + } + if gifs.listCalls != 1 || gifs.uploadCalls != 1 || gifs.createCalls != 1 { + t.Fatalf("replay calls list/upload/create=%d/%d/%d", gifs.listCalls, gifs.uploadCalls, gifs.createCalls) + } + + conflict := req + conflict.Data = []byte("GIF89a-two") + if _, err := svc.CreateGifCatalogEntry(ctx, conflict); err == nil || err.Error() != "COMMAND_ID_CONFLICT" { + t.Fatalf("different content with same command id err=%v", err) + } + if gifs.listCalls != 1 || gifs.uploadCalls != 1 || gifs.createCalls != 1 { + t.Fatalf("conflict mutated list/upload/create=%d/%d/%d", gifs.listCalls, gifs.uploadCalls, gifs.createCalls) + } +} diff --git a/internal/admin/service.go b/internal/admin/service.go index 69ece289..544efc1b 100644 --- a/internal/admin/service.go +++ b/internal/admin/service.go @@ -4,6 +4,8 @@ import ( "bytes" "compress/gzip" "context" + "crypto/sha256" + "encoding/hex" "encoding/json" "errors" "fmt" @@ -207,10 +209,15 @@ type UsersService interface { // AccountService carries the login-email factor (account_passwords table), // a separate concern from UsersService's users-table fields. type AccountService interface { + // ValidLoginEmail reports whether email is an acceptable login/signup + // email address. + ValidLoginEmail(email string) bool // SetLoginEmail force-sets a user's login/signup email, no OTP required. SetLoginEmail(ctx context.Context, userID int64, email string) error // ClearLoginEmail removes the login email factor entirely. ClearLoginEmail(ctx context.Context, userID int64) error + // LoginEmail returns a user's current login/signup email, if any. + LoginEmail(ctx context.Context, userID int64) (string, bool, error) } // BroadcastService creates and lists system broadcast campaigns (a message @@ -290,6 +297,11 @@ type StickerSetsService interface { // ValidateStickerMaterialUpload is a pure check (no store writes) so a dry-run // preview can validate an uploaded file's shape without materializing it. ValidateStickerMaterialUpload(fileName string, data []byte) (mimeType string, ok bool) + // ValidateAdminCreateStickerSet and ValidateAdminAddStickerToSet are pure + // checks (no store writes), used by a dry-run preview before the + // corresponding Admin* call actually mutates the pack. + ValidateAdminCreateStickerSet(ctx context.Context, title, shortName, emoji string, kind domain.StickerSetKind) error + ValidateAdminAddStickerToSet(ctx context.Context, setID int64, emoji string) error AdminUploadStickerMaterial(ctx context.Context, fileName string, data []byte) (domain.Document, error) AdminCreateStickerSet(ctx context.Context, req domain.CreateStickerSetRequest) (domain.StickerSet, []domain.Document, error) AdminAddStickerToSet(ctx context.Context, setID int64, item domain.StickerSetItemInput) (domain.StickerSet, []domain.Document, error) @@ -695,9 +707,10 @@ type RemoveStickerFromSetRequest struct { type CreateGifCatalogEntryRequest struct { CommandMeta - Title string `json:"title"` - FileName string `json:"file_name"` - Data []byte `json:"-"` + Title string `json:"title"` + FileName string `json:"file_name"` + Data []byte `json:"-"` + ContentSHA256 string `json:"content_sha256,omitempty"` } type SetGifCatalogEnabledRequest struct { @@ -937,8 +950,9 @@ type TransferCollectibleUsernameRequest struct { // permanently when Burn is set. type RevokeCollectibleUsernameRequest struct { CommandMeta - Username string `json:"username"` - Burn bool `json:"burn"` + Username string `json:"username"` + ExpectedOwnerUserID int64 `json:"expected_owner_user_id,string,omitempty"` + Burn bool `json:"burn"` } // DeleteCollectibleUsernameRequest erases a collectible asset entirely. Unlike a @@ -1365,11 +1379,14 @@ func (s *Service) SetProfile(ctx context.Context, req SetProfileRequest) (Comman if req.UserID <= 0 { return CommandResult{}, fmt.Errorf("user_id is required") } + if domain.IsSystemUserID(req.UserID) { + return CommandResult{}, fmt.Errorf("system user profile cannot be changed") + } if s == nil || s.users == nil { return CommandResult{}, fmt.Errorf("admin user dependency is not configured") } - firstName := strings.TrimSpace(req.FirstName) - lastName := strings.TrimSpace(req.LastName) + req.FirstName = strings.TrimSpace(req.FirstName) + req.LastName = strings.TrimSpace(req.LastName) return s.runCommand(ctx, req.CommandMeta, ActionSetProfile, req.UserID, domain.Peer{}, req, func() (CommandResult, error) { u, found, err := s.users.AdminUser(ctx, req.UserID) if err != nil { @@ -1379,18 +1396,21 @@ func (s *Service) SetProfile(ctx context.Context, req SetProfileRequest) (Comman return CommandResult{}, domain.ErrUserNotFound } details := map[string]any{ - "previous_first_name": u.FirstName, "previous_last_name": u.LastName, - "new_first_name": firstName, "new_last_name": lastName, + "previous_first_name": u.FirstName, + "previous_last_name": u.LastName, + "new_first_name": req.FirstName, + "new_last_name": req.LastName, + "would_change": u.FirstName != req.FirstName || u.LastName != req.LastName, } if req.DryRun { - return CommandResult{Message: "dry-run completed", Details: details}, nil + return CommandResult{Message: "profile update validated", Details: details}, nil } updated, err := s.users.UpdateProfile(ctx, req.UserID, domain.UserProfileUpdate{ - FirstName: firstName, HasFirstName: true, - LastName: lastName, HasLastName: true, + FirstName: req.FirstName, HasFirstName: true, + LastName: req.LastName, HasLastName: true, }) if err != nil { - return CommandResult{}, err + return CommandResult{Details: details}, err } if err := s.notifyUserChanged(ctx, updated); err != nil { details["notify_error"] = err.Error() @@ -1409,7 +1429,10 @@ func (s *Service) SetPhone(ctx context.Context, req SetPhoneRequest) (CommandRes if s == nil || s.users == nil { return CommandResult{}, fmt.Errorf("admin user dependency is not configured") } - phone := strings.TrimSpace(req.Phone) + req.Phone = domain.NormalizePhone(req.Phone) + if !domain.ValidPhone(req.Phone) { + return CommandResult{}, domain.ErrPhoneNumberInvalid + } return s.runCommand(ctx, req.CommandMeta, ActionSetPhone, req.UserID, domain.Peer{}, req, func() (CommandResult, error) { u, found, err := s.users.AdminUser(ctx, req.UserID) if err != nil { @@ -1418,15 +1441,22 @@ func (s *Service) SetPhone(ctx context.Context, req SetPhoneRequest) (CommandRes if !found { return CommandResult{}, domain.ErrUserNotFound } - details := map[string]any{"previous_phone": u.Phone, "new_phone": phone} + if u.Bot || domain.IsSystemUserID(u.ID) { + return CommandResult{}, domain.ErrPhoneChangeForbidden + } + details := map[string]any{ + "previous_phone": u.Phone, + "new_phone": req.Phone, + "would_change": u.Phone != req.Phone, + } if req.DryRun { - return CommandResult{Message: "dry-run completed", Details: details}, nil + return CommandResult{Message: "phone update validated", Details: details}, nil } - updated, err := s.users.SetPhone(ctx, req.UserID, phone) + updated, err := s.users.SetPhone(ctx, req.UserID, req.Phone) if err != nil { - return CommandResult{}, err + return CommandResult{Details: details}, err } - details["updated_phone"] = updated.Phone + details["changed"] = u.Phone != updated.Phone if err := s.notifyUserChanged(ctx, updated); err != nil { details["notify_error"] = err.Error() } @@ -1442,26 +1472,46 @@ func (s *Service) SetLoginEmail(ctx context.Context, req SetLoginEmailRequest) ( if req.UserID <= 0 { return CommandResult{}, fmt.Errorf("user_id is required") } - if s == nil || s.account == nil { - return CommandResult{}, fmt.Errorf("admin account dependency is not configured") + if s == nil || s.users == nil || s.account == nil { + return CommandResult{}, fmt.Errorf("admin account dependencies are not configured") + } + req.Email = strings.TrimSpace(req.Email) + if req.Email != "" && !s.account.ValidLoginEmail(req.Email) { + return CommandResult{}, domain.ErrEmailInvalid } - email := strings.TrimSpace(req.Email) return s.runCommand(ctx, req.CommandMeta, ActionSetLoginEmail, req.UserID, domain.Peer{}, req, func() (CommandResult, error) { - details := map[string]any{"new_login_email": email} - if req.DryRun { - return CommandResult{Message: "dry-run completed", Details: details}, nil - } - var err error - if email == "" { - err = s.account.ClearLoginEmail(ctx, req.UserID) - } else { - err = s.account.SetLoginEmail(ctx, req.UserID, email) - } + u, found, err := s.users.AdminUser(ctx, req.UserID) if err != nil { return CommandResult{}, err } + if !found { + return CommandResult{}, domain.ErrUserNotFound + } + if u.Bot || domain.IsSystemUserID(u.ID) { + return CommandResult{}, domain.ErrEmailInvalid + } + previous, _, err := s.account.LoginEmail(ctx, req.UserID) + if err != nil { + return CommandResult{}, err + } + details := map[string]any{ + "previous_login_email": previous, + "new_login_email": req.Email, + "would_change": !strings.EqualFold(previous, req.Email), + } + if req.DryRun { + return CommandResult{Message: "login email update validated", Details: details}, nil + } + if req.Email == "" { + err = s.account.ClearLoginEmail(ctx, req.UserID) + } else { + err = s.account.SetLoginEmail(ctx, req.UserID, req.Email) + } + if err != nil { + return CommandResult{Details: details}, err + } message := "login email updated" - if email == "" { + if req.Email == "" { message = "login email cleared" } return CommandResult{Message: message, Details: details}, nil @@ -1475,31 +1525,37 @@ func (s *Service) SetAccountAvatar(ctx context.Context, req SetAccountAvatarRequ if req.UserID <= 0 { return CommandResult{}, fmt.Errorf("user_id is required") } - if s == nil || s.photos == nil { - return CommandResult{}, fmt.Errorf("admin photos dependency is not configured") + if domain.IsSystemUserID(req.UserID) { + return CommandResult{}, fmt.Errorf("system user avatar cannot be changed") + } + if s == nil || s.users == nil || s.photos == nil { + return CommandResult{}, fmt.Errorf("admin avatar dependencies are not configured") } if len(req.Data) == 0 || len(req.Data) > MaxAccountAvatarBytes || !s.photos.ValidateAvatarUpload(req.Data) { return CommandResult{}, domain.ErrPhotoInvalid } return s.runCommand(ctx, req.CommandMeta, ActionSetAccountAvatar, req.UserID, domain.Peer{}, req, func() (CommandResult, error) { - details := map[string]any{"file_name": req.FileName, "bytes": len(req.Data)} + u, found, err := s.users.AdminUser(ctx, req.UserID) + if err != nil { + return CommandResult{}, err + } + if !found { + return CommandResult{}, domain.ErrUserNotFound + } + details := map[string]any{"file_name": req.FileName, "bytes": len(req.Data), "bot": u.Bot} if req.DryRun { - return CommandResult{Message: "avatar validated", Details: details}, nil + return CommandResult{Message: "avatar update validated", Details: details}, nil } photo, err := s.photos.CreateAvatarFromBytes(ctx, req.Data, req.UserID) if err != nil { return CommandResult{Details: details}, err } - if _, _, err := s.photos.SetCurrentProfilePhotoKind(ctx, domain.PeerTypeUser, req.UserID, domain.ProfilePhotoKindProfile, photo.ID, int(time.Now().Unix())); err != nil { + if _, _, err := s.photos.SetCurrentProfilePhotoKind(ctx, domain.PeerTypeUser, req.UserID, domain.ProfilePhotoKindProfile, photo.ID, int(s.now().Unix())); err != nil { return CommandResult{Details: details}, err } - details["photo_id"] = photo.ID - if s.users != nil { - if u, found, uerr := s.users.AdminUser(ctx, req.UserID); uerr == nil && found { - if nerr := s.notifyUserChanged(ctx, u); nerr != nil { - details["notify_error"] = nerr.Error() - } - } + details["photo_id"] = strconv.FormatInt(photo.ID, 10) + if err := s.notifyUserChanged(ctx, u); err != nil { + details["notify_error"] = err.Error() } return CommandResult{Message: "avatar updated", Details: details}, nil }) @@ -1514,20 +1570,28 @@ func (s *Service) SetChannelAvatar(ctx context.Context, req SetChannelAvatarRequ if req.ChannelID <= 0 { return CommandResult{}, fmt.Errorf("channel_id is required") } - if s == nil || s.photos == nil { - return CommandResult{}, fmt.Errorf("admin photos dependency is not configured") - } - if s.channels == nil { - return CommandResult{}, fmt.Errorf("admin channel dependency is not configured") + if s == nil || s.channels == nil || s.photos == nil { + return CommandResult{}, fmt.Errorf("admin channel avatar dependencies are not configured") } if len(req.Data) == 0 || len(req.Data) > MaxAccountAvatarBytes || !s.photos.ValidateAvatarUpload(req.Data) { return CommandResult{}, domain.ErrPhotoInvalid } target := domain.Peer{Type: domain.PeerTypeChannel, ID: req.ChannelID} return s.runCommand(ctx, req.CommandMeta, ActionSetChannelAvatar, 0, target, req, func() (CommandResult, error) { - details := map[string]any{"file_name": req.FileName, "bytes": len(req.Data)} + channel, err := s.channels.GetChannelByID(ctx, req.ChannelID) + if err != nil { + return CommandResult{}, err + } + if channel.Deleted || channel.Monoforum || (!channel.Broadcast && !channel.Megagroup) { + return CommandResult{}, domain.ErrChannelInvalid + } + details := map[string]any{ + "file_name": req.FileName, + "bytes": len(req.Data), + "previous_photo_id": strconv.FormatInt(channel.PhotoID, 10), + } if req.DryRun { - return CommandResult{Message: "avatar validated", Details: details}, nil + return CommandResult{Message: "channel avatar update validated", Details: details}, nil } photo, err := s.photos.CreateAvatarFromBytes(ctx, req.Data, 0) if err != nil { @@ -1537,7 +1601,7 @@ func (s *Service) SetChannelAvatar(ctx context.Context, req SetChannelAvatarRequ if err != nil { return CommandResult{Details: details}, err } - details["photo_id"] = photo.ID + details["photo_id"] = strconv.FormatInt(photo.ID, 10) if err := s.notifyChannelChanged(ctx, updated); err != nil { details["notify_error"] = err.Error() } @@ -1562,38 +1626,10 @@ func (s *Service) ChannelAvatar(ctx context.Context, channelID int64) ([]byte, s return nil, "", false, nil } photo, found, err := s.photos.GetPhoto(ctx, channel.PhotoID) - if err != nil { - return nil, "", false, err + if err != nil || !found { + return nil, "", found, err } - if !found { - return nil, "", false, nil - } - size, inline, ok := bestAccountPhotoSize(photo.Sizes) - if !ok { - return nil, "", false, nil - } - data := inline - if len(data) == 0 { - chunk, found, err := s.photos.GetFile(ctx, domain.FileDownloadRequest{ - LocationKey: fmt.Sprintf("photo:%d:%s", photo.ID, size.Type), - Limit: MaxAccountAvatarBytes + 1, - }) - if err != nil { - return nil, "", false, err - } - if !found || chunk.Total <= 0 || chunk.Total > MaxAccountAvatarBytes || int64(len(chunk.Bytes)) != chunk.Total { - return nil, "", false, nil - } - data = chunk.Bytes - } - if len(data) == 0 || len(data) > MaxAccountAvatarBytes { - return nil, "", false, nil - } - detected := http.DetectContentType(data) - if !safeAccountImageType(detected) { - return nil, "", false, nil - } - return data, detected, true, nil + return s.avatarBytes(ctx, photo) } // SetUserColor force-sets or clears a user's name/profile color. @@ -1970,6 +2006,9 @@ func (s *Service) RevokeCollectibleUsername(ctx context.Context, req RevokeColle if !domain.ValidCollectibleUsername(req.Username) { return CommandResult{}, codedError(CodeUsernameInvalid, domain.ErrUsernameInvalid) } + if req.ExpectedOwnerUserID < 0 { + return CommandResult{}, fmt.Errorf("expected_owner_user_id must not be negative") + } return s.runCommand(ctx, req.CommandMeta, ActionRevokeCollectibleUsername, 0, domain.Peer{}, req, func() (CommandResult, error) { details := map[string]any{"username": req.Username, "burn": req.Burn} asset, err := s.usernames.Collectible(ctx, req.Username) @@ -1986,6 +2025,9 @@ func (s *Service) RevokeCollectibleUsername(ctx context.Context, req RevokeColle if !req.Burn && !asset.Owned() { return CommandResult{Details: details}, codedError(CodeCollectibleNotOwned, domain.ErrCollectibleUsernameNotOwned) } + if req.ExpectedOwnerUserID > 0 && asset.Owner != (domain.Peer{Type: domain.PeerTypeUser, ID: req.ExpectedOwnerUserID}) { + return CommandResult{Details: details}, codedError(CodeCollectibleNotOwned, domain.ErrCollectibleUsernameNotOwned) + } if req.DryRun { return CommandResult{Message: "collectible username revoke validated", Details: details}, nil } @@ -2362,7 +2404,17 @@ func (s *Service) RevokeSessions(ctx context.Context, req RevokeSessionsRequest) if s == nil || s.auth == nil || s.revoker == nil { return CommandResult{}, fmt.Errorf("admin auth dependencies are not configured") } - if (req.Hash == 0 && req.KeepHash == 0 && !req.RevokeAll) || (req.Hash != 0 && (req.KeepHash != 0 || req.RevokeAll)) { + modeCount := 0 + if req.Hash != 0 { + modeCount++ + } + if req.KeepHash != 0 { + modeCount++ + } + if req.RevokeAll { + modeCount++ + } + if modeCount != 1 { return CommandResult{}, fmt.Errorf("choose one revoke mode") } return s.runCommand(ctx, req.CommandMeta, ActionRevokeSessions, req.UserID, domain.Peer{}, req, func() (CommandResult, error) { @@ -2377,7 +2429,7 @@ func (s *Service) RevokeSessions(ctx context.Context, req RevokeSessionsRequest) details := map[string]any{ "target_hashes": authorizationHashes(targets), "target_count": len(targets), - "keep_hash": keep.Hash, + "keep_hash": authorizationHashString(keep.Hash), } if req.DryRun { return CommandResult{Message: "dry-run completed", Details: details}, nil @@ -2388,9 +2440,10 @@ func (s *Service) RevokeSessions(ctx context.Context, req RevokeSessionsRequest) if err != nil { return CommandResult{}, err } - if found { - revoked = append(revoked, deleted) + if !found { + return CommandResult{}, fmt.Errorf("authorization hash not found") } + revoked = append(revoked, deleted) } else { deleted, err := s.auth.ResetAuthorizations(ctx, req.UserID, keep.AuthKeyID) if err != nil { @@ -2544,12 +2597,13 @@ func (s *Service) AccountAvatar(ctx context.Context, userID int64) ([]byte, stri return nil, "", false, nil } photo, found, err := s.photos.CurrentProfilePhotoKind(ctx, domain.PeerTypeUser, userID, domain.ProfilePhotoKindProfile) - if err != nil { - return nil, "", false, err - } - if !found { - return nil, "", false, nil + if err != nil || !found { + return nil, "", found, err } + return s.avatarBytes(ctx, photo) +} + +func (s *Service) avatarBytes(ctx context.Context, photo domain.Photo) ([]byte, string, bool, error) { size, inline, ok := bestAccountPhotoSize(photo.Sizes) if !ok { return nil, "", false, nil @@ -2560,10 +2614,10 @@ func (s *Service) AccountAvatar(ctx context.Context, userID int64) ([]byte, stri LocationKey: fmt.Sprintf("photo:%d:%s", photo.ID, size.Type), Limit: MaxAccountAvatarBytes + 1, }) - if err != nil { - return nil, "", false, err + if err != nil || !found { + return nil, "", found, err } - if !found || chunk.Total <= 0 || chunk.Total > MaxAccountAvatarBytes || int64(len(chunk.Bytes)) != chunk.Total { + if chunk.Total <= 0 || chunk.Total > MaxAccountAvatarBytes || int64(len(chunk.Bytes)) != chunk.Total { return nil, "", false, nil } data = chunk.Bytes @@ -2571,11 +2625,11 @@ func (s *Service) AccountAvatar(ctx context.Context, userID int64) ([]byte, stri if len(data) == 0 || len(data) > MaxAccountAvatarBytes { return nil, "", false, nil } - detected := http.DetectContentType(data) - if !safeAccountImageType(detected) { + mimeType := http.DetectContentType(data) + if !safeAccountImageType(mimeType) { return nil, "", false, nil } - return data, detected, true, nil + return data, mimeType, true, nil } func bestAccountPhotoSize(sizes []domain.PhotoSize) (domain.PhotoSize, []byte, bool) { @@ -2659,7 +2713,7 @@ func (s *Service) SetStickerSetArchived(ctx context.Context, req SetStickerSetAr func (s *Service) SetStickerSetSortOrder(ctx context.Context, req SetStickerSetSortOrderRequest) (CommandResult, error) { if s == nil || s.stickerSets == nil || req.SetID <= 0 || req.SortOrder < math.MinInt32 || req.SortOrder > math.MaxInt32 { - return CommandResult{}, fmt.Errorf("valid sticker set and service are required") + return CommandResult{}, domain.ErrStickerSetInvalid } return s.runCommand(ctx, req.CommandMeta, ActionSetStickerSetSortOrder, 0, domain.Peer{}, req, func() (CommandResult, error) { details := map[string]any{"set_id": strconv.FormatInt(req.SetID, 10), "sort_order": req.SortOrder} @@ -2674,7 +2728,7 @@ func (s *Service) SetStickerSetSortOrder(ctx context.Context, req SetStickerSetS func (s *Service) RenameStickerSet(ctx context.Context, req RenameStickerSetRequest) (CommandResult, error) { if s == nil || s.stickerSets == nil || req.SetID <= 0 || strings.TrimSpace(req.Title) == "" { - return CommandResult{}, fmt.Errorf("valid sticker set, title and service are required") + return CommandResult{}, domain.ErrStickerSetInvalid } return s.runCommand(ctx, req.CommandMeta, ActionRenameStickerSet, 0, domain.Peer{}, req, func() (CommandResult, error) { details := map[string]any{"set_id": strconv.FormatInt(req.SetID, 10), "title": req.Title} @@ -2692,7 +2746,7 @@ func (s *Service) RenameStickerSet(ctx context.Context, req RenameStickerSetRequ func (s *Service) DeleteStickerSet(ctx context.Context, req DeleteStickerSetRequest) (CommandResult, error) { if s == nil || s.stickerSets == nil || req.SetID <= 0 { - return CommandResult{}, fmt.Errorf("valid sticker set and service are required") + return CommandResult{}, domain.ErrStickerSetInvalid } return s.runCommand(ctx, req.CommandMeta, ActionDeleteStickerSet, 0, domain.Peer{}, req, func() (CommandResult, error) { details := map[string]any{"set_id": strconv.FormatInt(req.SetID, 10)} @@ -2710,7 +2764,7 @@ func (s *Service) DeleteStickerSet(ctx context.Context, req DeleteStickerSetRequ func (s *Service) CreateStickerSet(ctx context.Context, req CreateStickerSetRequest) (CommandResult, error) { if s == nil || s.stickerSets == nil { - return CommandResult{}, fmt.Errorf("sticker sets service is not configured") + return CommandResult{}, domain.ErrStickerSetInvalid } if strings.TrimSpace(req.Title) == "" || strings.TrimSpace(req.ShortName) == "" || strings.TrimSpace(req.Emoji) == "" { return CommandResult{}, domain.ErrStickerSetFileInvalid @@ -2728,6 +2782,9 @@ func (s *Service) CreateStickerSet(ctx context.Context, req CreateStickerSetRequ "title": req.Title, "short_name": req.ShortName, "kind": string(kind), "file_name": req.FileName, "mime_type": mimeType, "bytes": len(req.Data), } + if err := s.stickerSets.ValidateAdminCreateStickerSet(ctx, req.Title, req.ShortName, req.Emoji, kind); err != nil { + return CommandResult{Details: details}, err + } if req.DryRun { return CommandResult{Message: "sticker pack validated", Details: details}, nil } @@ -2757,7 +2814,7 @@ func (s *Service) CreateStickerSet(ctx context.Context, req CreateStickerSetRequ func (s *Service) AddStickerToSet(ctx context.Context, req AddStickerToSetRequest) (CommandResult, error) { if s == nil || s.stickerSets == nil || req.SetID <= 0 { - return CommandResult{}, fmt.Errorf("valid sticker set and service are required") + return CommandResult{}, domain.ErrStickerSetInvalid } if strings.TrimSpace(req.Emoji) == "" { return CommandResult{}, domain.ErrStickerSetEmojiInvalid @@ -2771,6 +2828,12 @@ func (s *Service) AddStickerToSet(ctx context.Context, req AddStickerToSetReques "set_id": strconv.FormatInt(req.SetID, 10), "emoji": req.Emoji, "file_name": req.FileName, "mime_type": mimeType, "bytes": len(req.Data), } + // Validate the target and item before materializing a loose + // document/blob. Keeping this inside runCommand preserves replay of a + // previously completed command even if the pack has since changed. + if err := s.stickerSets.ValidateAdminAddStickerToSet(ctx, req.SetID, req.Emoji); err != nil { + return CommandResult{Details: details}, err + } if req.DryRun { return CommandResult{Message: "sticker upload validated", Details: details}, nil } @@ -2795,7 +2858,7 @@ func (s *Service) AddStickerToSet(ctx context.Context, req AddStickerToSetReques func (s *Service) RemoveStickerFromSet(ctx context.Context, req RemoveStickerFromSetRequest) (CommandResult, error) { if s == nil || s.stickerSets == nil || req.SetID <= 0 || req.DocumentID <= 0 { - return CommandResult{}, fmt.Errorf("valid sticker set, document and service are required") + return CommandResult{}, domain.ErrStickerSetInvalid } return s.runCommand(ctx, req.CommandMeta, ActionRemoveStickerFromSet, 0, domain.Peer{}, req, func() (CommandResult, error) { details := map[string]any{"set_id": strconv.FormatInt(req.SetID, 10), "document_id": strconv.FormatInt(req.DocumentID, 10)} @@ -2811,9 +2874,18 @@ func (s *Service) RemoveStickerFromSet(ctx context.Context, req RemoveStickerFro }) } +// GifCatalog returns every GIF catalog entry for the admin console's +// management view. +func (s *Service) GifCatalog(ctx context.Context) ([]domain.GifCatalogEntry, error) { + if s == nil || s.gifCatalog == nil { + return nil, domain.ErrGifCatalogUnavailable + } + return s.gifCatalog.AdminListGifCatalog(ctx) +} + func (s *Service) CreateGifCatalogEntry(ctx context.Context, req CreateGifCatalogEntryRequest) (CommandResult, error) { if s == nil || s.gifCatalog == nil { - return CommandResult{}, fmt.Errorf("gif catalog service is not configured") + return CommandResult{}, domain.ErrGifCatalogUnavailable } if strings.TrimSpace(req.Title) == "" { return CommandResult{}, domain.ErrGifCatalogEntryInvalid @@ -2822,10 +2894,19 @@ func (s *Service) CreateGifCatalogEntry(ctx context.Context, req CreateGifCatalo if !ok { return CommandResult{}, domain.ErrGifCatalogFileInvalid } + digest := sha256.Sum256(req.Data) + req.ContentSHA256 = hex.EncodeToString(digest[:]) return s.runCommand(ctx, req.CommandMeta, ActionCreateGifCatalogEntry, 0, domain.Peer{}, req, func() (CommandResult, error) { details := map[string]any{ "title": req.Title, "file_name": req.FileName, "mime_type": mimeType, "bytes": len(req.Data), } + entries, err := s.gifCatalog.AdminListGifCatalog(ctx) + if err != nil { + return CommandResult{Details: details}, err + } + if len(entries) >= domain.MaxGifCatalogEntries { + return CommandResult{Details: details}, domain.ErrGifCatalogFull + } if req.DryRun { return CommandResult{Message: "gif catalog entry validated", Details: details}, nil } @@ -2845,7 +2926,7 @@ func (s *Service) CreateGifCatalogEntry(ctx context.Context, req CreateGifCatalo func (s *Service) SetGifCatalogEnabled(ctx context.Context, req SetGifCatalogEnabledRequest) (CommandResult, error) { if s == nil || s.gifCatalog == nil || req.ID <= 0 { - return CommandResult{}, fmt.Errorf("valid gif catalog entry and service are required") + return CommandResult{}, domain.ErrGifCatalogEntryInvalid } return s.runCommand(ctx, req.CommandMeta, ActionSetGifCatalogEnabled, 0, domain.Peer{}, req, func() (CommandResult, error) { details := map[string]any{"id": strconv.FormatInt(req.ID, 10), "enabled": req.Enabled} @@ -2860,7 +2941,7 @@ func (s *Service) SetGifCatalogEnabled(ctx context.Context, req SetGifCatalogEna func (s *Service) SetGifCatalogSortOrder(ctx context.Context, req SetGifCatalogSortOrderRequest) (CommandResult, error) { if s == nil || s.gifCatalog == nil || req.ID <= 0 || req.SortOrder < math.MinInt32 || req.SortOrder > math.MaxInt32 { - return CommandResult{}, fmt.Errorf("valid gif catalog entry and service are required") + return CommandResult{}, domain.ErrGifCatalogEntryInvalid } return s.runCommand(ctx, req.CommandMeta, ActionSetGifCatalogSortOrder, 0, domain.Peer{}, req, func() (CommandResult, error) { details := map[string]any{"id": strconv.FormatInt(req.ID, 10), "sort_order": req.SortOrder} @@ -2938,7 +3019,7 @@ func (s *Service) DeleteUncategorizedGifs(ctx context.Context, req DeleteUncateg func (s *Service) DeleteGifCatalogEntry(ctx context.Context, req DeleteGifCatalogEntryRequest) (CommandResult, error) { if s == nil || s.gifCatalog == nil || req.ID <= 0 { - return CommandResult{}, fmt.Errorf("valid gif catalog entry and service are required") + return CommandResult{}, domain.ErrGifCatalogEntryInvalid } return s.runCommand(ctx, req.CommandMeta, ActionDeleteGifCatalogEntry, 0, domain.Peer{}, req, func() (CommandResult, error) { details := map[string]any{"id": strconv.FormatInt(req.ID, 10)} @@ -3201,7 +3282,7 @@ func revokeTargets(items []domain.Authorization, req RevokeSessionsRequest) ([]d return []domain.Authorization{a}, domain.Authorization{}, nil } } - return nil, domain.Authorization{}, nil + return nil, domain.Authorization{}, fmt.Errorf("authorization hash not found") } var keep domain.Authorization if req.KeepHash != 0 { @@ -3227,15 +3308,26 @@ func revokeTargets(items []domain.Authorization, req RevokeSessionsRequest) ([]d return targets, keep, nil } -func authorizationHashes(items []domain.Authorization) []int64 { - out := make([]int64, 0, len(items)) +func authorizationHashes(items []domain.Authorization) []string { + hashes := make([]int64, 0, len(items)) for _, a := range items { - out = append(out, a.Hash) + hashes = append(hashes, a.Hash) + } + sort.Slice(hashes, func(i, j int) bool { return hashes[i] < hashes[j] }) + out := make([]string, 0, len(hashes)) + for _, hash := range hashes { + out = append(out, authorizationHashString(hash)) } - sort.Slice(out, func(i, j int) bool { return out[i] < out[j] }) return out } +func authorizationHashString(hash int64) string { + if hash == 0 { + return "" + } + return strconv.FormatInt(hash, 10) +} + func normalizeIDs(ids []int) ([]int, error) { if len(ids) == 0 { return nil, domain.ErrMessageIDInvalid diff --git a/internal/adminapi/rbac.go b/internal/adminapi/rbac.go index 0749b218..b313e091 100644 --- a/internal/adminapi/rbac.go +++ b/internal/adminapi/rbac.go @@ -59,6 +59,12 @@ const ( // decide how much a third-party mark is worth. Handing out the queue is // routine; handing out the ability to appoint verifiers is not. PermissionBotVerificationManage = "botverification.manage" + // PermissionPremiumManage guards grants, revocations and refunds. It is kept + // separate from Stars grants because a Premium refund mutates both ledgers. + PermissionPremiumManage = "premium.manage" + // PermissionBotTokenRead is intentionally narrower than unrestricted admin + // access because it reveals a live credential. + PermissionBotTokenRead = "bots.token.read" ) // CodeForbidden is the stable code for a permission failure, so the panel can diff --git a/internal/adminapi/server.go b/internal/adminapi/server.go index 678535bb..c028167e 100644 --- a/internal/adminapi/server.go +++ b/internal/adminapi/server.go @@ -201,7 +201,7 @@ func (s *Server) routes() http.Handler { mux.HandleFunc("POST /v1/bots/create", s.authenticated(s.handleCreateBot)) mux.HandleFunc("POST /v1/broadcasts/create", s.authenticated(s.handleCreateBroadcast)) mux.HandleFunc("POST /v1/bots/delete", s.authenticated(s.handleDeleteBot)) - mux.HandleFunc("POST /v1/bots/export-token", s.authenticated(s.handleExportBotToken)) + mux.HandleFunc("POST /v1/bots/export-token", s.authorized(PermissionBotTokenRead, s.handleExportBotToken)) mux.HandleFunc("POST /v1/messages/delete", s.authenticated(s.handleDeleteMessages)) mux.HandleFunc("POST /v1/messages/delete-history", s.authenticated(s.handleDeleteHistory)) mux.HandleFunc("POST /v1/stickers/set-archived", s.authenticated(s.handleSetStickerSetArchived)) @@ -390,35 +390,13 @@ func (s *Server) handleSetLoginEmail(w http.ResponseWriter, r *http.Request) { } func (s *Server) handleSetAccountAvatar(w http.ResponseWriter, r *http.Request) { - defer r.Body.Close() - r.Body = http.MaxBytesReader(w, r.Body, admin.MaxAccountAvatarBytes+(1<<20)) - if err := r.ParseMultipartForm(1 << 20); err != nil { - writeError(w, http.StatusBadRequest, "invalid multipart form: "+err.Error()) - return - } - if r.MultipartForm != nil { - defer r.MultipartForm.RemoveAll() - } var req admin.SetAccountAvatarRequest - dec := json.NewDecoder(strings.NewReader(r.FormValue("metadata"))) - dec.DisallowUnknownFields() - if err := dec.Decode(&req); err != nil { - writeError(w, http.StatusBadRequest, "invalid metadata: "+err.Error()) + if !s.decodeAvatarUpload(w, r, &req.FileName, &req.Data) { return } - file, header, err := r.FormFile("file") - if err != nil { - writeError(w, http.StatusBadRequest, "avatar file is required") + if !decodeMultipartMetadata(w, r, &req) { return } - defer file.Close() - data, err := io.ReadAll(io.LimitReader(file, admin.MaxAccountAvatarBytes+1)) - if err != nil || len(data) == 0 || int64(len(data)) > admin.MaxAccountAvatarBytes { - writeError(w, http.StatusBadRequest, "avatar file is empty or too large") - return - } - req.FileName = header.Filename - req.Data = data result, err := s.svc.SetAccountAvatar(r.Context(), req) writeCommandResult(w, result, err) } @@ -446,37 +424,54 @@ func (s *Server) handleChannelAvatar(w http.ResponseWriter, r *http.Request) { } func (s *Server) handleSetChannelAvatar(w http.ResponseWriter, r *http.Request) { - defer r.Body.Close() + var req admin.SetChannelAvatarRequest + if !s.decodeAvatarUpload(w, r, &req.FileName, &req.Data) { + return + } + if !decodeMultipartMetadata(w, r, &req) { + return + } + result, err := s.svc.SetChannelAvatar(r.Context(), req) + writeCommandResult(w, result, err) +} + +// decodeAvatarUpload parses a multipart avatar-upload form shared by the +// account and channel avatar endpoints, reading the uploaded file into data. +func (s *Server) decodeAvatarUpload(w http.ResponseWriter, r *http.Request, fileName *string, data *[]byte) bool { r.Body = http.MaxBytesReader(w, r.Body, admin.MaxAccountAvatarBytes+(1<<20)) if err := r.ParseMultipartForm(1 << 20); err != nil { writeError(w, http.StatusBadRequest, "invalid multipart form: "+err.Error()) - return + return false } if r.MultipartForm != nil { defer r.MultipartForm.RemoveAll() } - var req admin.SetChannelAvatarRequest - dec := json.NewDecoder(strings.NewReader(r.FormValue("metadata"))) - dec.DisallowUnknownFields() - if err := dec.Decode(&req); err != nil { - writeError(w, http.StatusBadRequest, "invalid metadata: "+err.Error()) - return - } file, header, err := r.FormFile("file") if err != nil { writeError(w, http.StatusBadRequest, "avatar file is required") - return + return false } defer file.Close() - data, err := io.ReadAll(io.LimitReader(file, admin.MaxAccountAvatarBytes+1)) - if err != nil || len(data) == 0 || int64(len(data)) > admin.MaxAccountAvatarBytes { + raw, err := io.ReadAll(io.LimitReader(file, admin.MaxAccountAvatarBytes+1)) + if err != nil || len(raw) == 0 || int64(len(raw)) > admin.MaxAccountAvatarBytes { writeError(w, http.StatusBadRequest, "avatar file is empty or too large") - return + return false } - req.FileName = header.Filename - req.Data = data - result, err := s.svc.SetChannelAvatar(r.Context(), req) - writeCommandResult(w, result, err) + *fileName = header.Filename + *data = raw + return true +} + +// decodeMultipartMetadata decodes the JSON "metadata" form field of a +// multipart upload into dst, rejecting unknown fields. +func decodeMultipartMetadata(w http.ResponseWriter, r *http.Request, dst any) bool { + dec := json.NewDecoder(strings.NewReader(r.FormValue("metadata"))) + dec.DisallowUnknownFields() + if err := dec.Decode(dst); err != nil { + writeError(w, http.StatusBadRequest, "invalid metadata: "+err.Error()) + return false + } + return true } func (s *Server) handleSetUserColor(w http.ResponseWriter, r *http.Request) { @@ -634,7 +629,7 @@ func (s *Server) handleDeleteStickerSet(w http.ResponseWriter, r *http.Request) func (s *Server) handleCreateStickerSet(w http.ResponseWriter, r *http.Request) { defer r.Body.Close() - r.Body = http.MaxBytesReader(w, r.Body, domain.MaxStickerMaterialDocumentSize+(1<<20)) + r.Body = http.MaxBytesReader(w, r.Body, domain.MaxStickerMaterialDocumentSize+(2<<20)) if err := r.ParseMultipartForm(1 << 20); err != nil { writeError(w, http.StatusBadRequest, "invalid multipart form: "+err.Error()) return @@ -668,7 +663,7 @@ func (s *Server) handleCreateStickerSet(w http.ResponseWriter, r *http.Request) func (s *Server) handleAddStickerToSet(w http.ResponseWriter, r *http.Request) { defer r.Body.Close() - r.Body = http.MaxBytesReader(w, r.Body, domain.MaxStickerMaterialDocumentSize+(1<<20)) + r.Body = http.MaxBytesReader(w, r.Body, domain.MaxStickerMaterialDocumentSize+(2<<20)) if err := r.ParseMultipartForm(1 << 20); err != nil { writeError(w, http.StatusBadRequest, "invalid multipart form: "+err.Error()) return diff --git a/internal/app/account/lifecycle.go b/internal/app/account/lifecycle.go index e59954f0..4023be40 100644 --- a/internal/app/account/lifecycle.go +++ b/internal/app/account/lifecycle.go @@ -19,6 +19,22 @@ import ( const accountDeletionDelay = 7 * 24 * time.Hour +func (s *Service) RevenueWithdrawalPasswordState(ctx context.Context, userID int64) (domain.RevenueWithdrawalPasswordState, error) { + if s == nil || s.lifecycle == nil || userID == 0 { + return domain.RevenueWithdrawalPasswordState{}, fmt.Errorf("revenue withdrawal password state is unavailable") + } + snapshot, found, err := s.lifecycle.AccountDeletionSnapshot(ctx, userID) + if err != nil { + return domain.RevenueWithdrawalPasswordState{}, err + } + if !found { + return domain.RevenueWithdrawalPasswordState{}, domain.ErrUserNotFound + } + return domain.RevenueWithdrawalPasswordState{ + HasPassword: snapshot.HasPassword, PasswordChangedAt: snapshot.PasswordUpdatedAt, + }, nil +} + // DeleteAccount implements the official 2FA deletion decision. A supplied and // valid SRP proof always deletes immediately. Without a proof, an account whose // password is older than seven days and which was active during the last seven @@ -345,17 +361,3 @@ func (s *Service) SweepDueAccountDeletions(ctx context.Context, now time.Time, l } return out, nil } - -func (s *Service) ClaimAccountDeletionNotifications(ctx context.Context, now time.Time, limit int, lease time.Duration) ([]domain.AccountDeletionNotification, error) { - if s == nil || s.lifecycle == nil { - return nil, nil - } - return s.lifecycle.ClaimAccountDeletionNotifications(ctx, now, limit, lease) -} - -func (s *Service) CompleteAccountDeletionNotification(ctx context.Context, id int64, now time.Time) error { - if s == nil || s.lifecycle == nil { - return nil - } - return s.lifecycle.CompleteAccountDeletionNotification(ctx, id, now) -} diff --git a/internal/app/account/lifecycle_test.go b/internal/app/account/lifecycle_test.go index f5eca1f7..3f9afa0f 100644 --- a/internal/app/account/lifecycle_test.go +++ b/internal/app/account/lifecycle_test.go @@ -141,9 +141,3 @@ func (f *fakeAccountLifecycleStore) CancelAccountDeletion(_ context.Context, use func (*fakeAccountLifecycleStore) DueAccountDeletions(context.Context, time.Time, int) ([]domain.AccountDeletionCandidate, error) { return nil, nil } -func (*fakeAccountLifecycleStore) ClaimAccountDeletionNotifications(context.Context, time.Time, int, time.Duration) ([]domain.AccountDeletionNotification, error) { - return nil, nil -} -func (*fakeAccountLifecycleStore) CompleteAccountDeletionNotification(context.Context, int64, time.Time) error { - return nil -} diff --git a/internal/app/account/phone_change.go b/internal/app/account/phone_change.go index a8bb814c..7706ae47 100644 --- a/internal/app/account/phone_change.go +++ b/internal/app/account/phone_change.go @@ -15,18 +15,6 @@ import ( "telesrv/internal/store" ) -type reliablePhoneChangeDispatcher interface { - UsesReliableDispatch() bool -} - -func (s *Service) PhoneChangeUsesReliableDispatch() bool { - if s == nil { - return false - } - reporter, ok := s.phoneChanges.(reliablePhoneChangeDispatcher) - return ok && reporter.UsesReliableDispatch() -} - // SendChangePhoneCode 创建只允许当前 user + perm auth_key 消费的改号验证码。 // CodeStore 会按 purpose+user+auth_key+phone 原子轮换：同一作用域的新请求 // 立即使旧 hash 失效，避免 Android 返回重进页面时留下并行有效验证码。 diff --git a/internal/app/account/phone_change_test.go b/internal/app/account/phone_change_test.go index d6a47c57..bbd7ce4c 100644 --- a/internal/app/account/phone_change_test.go +++ b/internal/app/account/phone_change_test.go @@ -147,7 +147,7 @@ func TestPhoneChangeScopesCodeAndPersistsDurableEvent(t *testing.T) { if err != nil { t.Fatalf("change phone after session reconnect: %v", err) } - if !result.Changed || result.User.Phone != "15550012002" || result.Event.Type != domain.UpdateEventUserPhone || result.Event.Phone != "15550012002" || result.Event.Pts != 1 { + if !result.Changed || result.User.Phone != "15550012002" { t.Fatalf("change result = %+v", result) } if got := f.changes.lastRequest().ExcludeAuthKeyID; got != rawAuthKeyID { @@ -160,7 +160,7 @@ func TestPhoneChangeScopesCodeAndPersistsDurableEvent(t *testing.T) { t.Fatalf("new phone resolves to %+v found=%v", got, found) } events, err := f.events.ListAfter(f.ctx, f.user.ID, 0, 10) - if err != nil || len(events) != 1 || events[0].Type != domain.UpdateEventUserPhone || events[0].Phone != "15550012002" { + if err != nil || len(events) != 0 { t.Fatalf("durable events = %+v err=%v", events, err) } if _, found, _ := f.codes.Get(f.ctx, hash); found { @@ -194,6 +194,26 @@ func TestPhoneChangeRejectsOccupiedAndCrossAuthCode(t *testing.T) { } } +func TestPhoneChangeRejectsOccupiedNationalTrunkVariant(t *testing.T) { + f := newPhoneChangeFixture(t) + occupied, err := f.users.Create(f.ctx, domain.User{AccessHash: 103, Phone: "989981679461", FirstName: "Iran"}) + if err != nil { + t.Fatalf("create occupied user: %v", err) + } + if _, _, err := f.service.SendChangePhoneCode( + f.ctx, + f.user.ID, + f.authKeyID, + 77, + "+98 0998 167 9461", + ); !errors.Is(err, domain.ErrPhoneNumberOccupied) { + t.Fatalf("occupied trunk variant err = %v", err) + } + if got, found, err := f.users.ByPhone(f.ctx, "989981679461"); err != nil || !found || got.ID != occupied.ID { + t.Fatalf("canonical owner user=%+v found=%v err=%v", got, found, err) + } +} + func TestPhoneChangeWrongCodeExhaustsAttempts(t *testing.T) { f := newPhoneChangeFixture(t) hash, _, err := f.service.SendChangePhoneCode(f.ctx, f.user.ID, f.authKeyID, 77, "15550012005") @@ -233,12 +253,12 @@ func TestPhoneChangeNewSendInvalidatesPreviousHash(t *testing.T) { t.Fatalf("new hash change: %v", err) } events, err := f.events.ListAfter(f.ctx, f.user.ID, 0, 10) - if err != nil || len(events) != 1 || events[0].Type != domain.UpdateEventUserPhone { + if err != nil || len(events) != 0 { t.Fatalf("events = %+v err=%v", events, err) } } -func TestPhoneChangeConcurrentReplayAppendsOneEvent(t *testing.T) { +func TestPhoneChangeConcurrentReplayChangesOnceWithoutPTSEvent(t *testing.T) { f := newPhoneChangeFixture(t) hash, _, err := f.service.SendChangePhoneCode(f.ctx, f.user.ID, f.authKeyID, 77, "15550012007") if err != nil { @@ -273,7 +293,7 @@ func TestPhoneChangeConcurrentReplayAppendsOneEvent(t *testing.T) { t.Fatalf("successes=%d expired=%d", successes, expired) } events, err := f.events.ListAfter(f.ctx, f.user.ID, 0, 10) - if err != nil || len(events) != 1 || events[0].Pts != 1 { + if err != nil || len(events) != 0 { t.Fatalf("events = %+v err=%v", events, err) } } diff --git a/internal/app/account/service.go b/internal/app/account/service.go index 03ab3f4d..e6c3dcfa 100644 --- a/internal/app/account/service.go +++ b/internal/app/account/service.go @@ -1053,6 +1053,12 @@ func (s *Service) SetLoginEmail(ctx context.Context, userID int64, email string) return s.passwords.Save(ctx, userID, settings) } +// ValidLoginEmail exposes the same normalization/shape gate to trusted +// administrative dry-runs without duplicating the address policy. +func (s *Service) ValidLoginEmail(email string) bool { + return validLoginEmail(normalizeLoginEmail(email)) +} + // LoginEmail 返回已登录用户的登录邮箱原始地址（用于 verifyEmail 回显 emailVerified.email）。 func (s *Service) LoginEmail(ctx context.Context, userID int64) (string, bool, error) { if s == nil || s.passwords == nil || userID == 0 { diff --git a/internal/app/auth/otp_delivery_test.go b/internal/app/auth/otp_delivery_test.go index 360d5eb8..49ad3e26 100644 --- a/internal/app/auth/otp_delivery_test.go +++ b/internal/app/auth/otp_delivery_test.go @@ -73,6 +73,32 @@ func TestWebhookPhoneLoginUsesRandomSMSCode(t *testing.T) { } } +func TestWebhookPhoneLoginCanonicalizesNationalTrunkBeforeOTP(t *testing.T) { + ctx := context.Background() + sender := &captureOTPSender{} + svc := NewService( + memory.NewUserStore(), + memory.NewAuthorizationStore(), + memory.NewCodeStore(), + nil, + nil, + "fixed-code-must-not-leak", + WithPhoneCodeDelivery(sender, 6), + ) + + hash, err := svc.SendCode(ctx, "+98 0998 167 9461") + if err != nil { + t.Fatalf("SendCode: %v", err) + } + if len(sender.requests) != 1 || sender.requests[0].Recipient != "989981679461" { + t.Fatalf("OTP requests = %+v, want canonical Iran recipient", sender.requests) + } + _, _, needSignUp, err := svc.SignIn(ctx, domain.Authorization{}, "989981679461", hash, sender.requests[0].Code) + if err != nil || !needSignUp { + t.Fatalf("SignIn canonical variant needSignUp=%v err=%v", needSignUp, err) + } +} + func TestWebhookExistingAccountRejectionKeepsDurableAppCode(t *testing.T) { ctx := context.Background() users := memory.NewUserStore() diff --git a/internal/app/auth/service.go b/internal/app/auth/service.go index 8330f31e..8c2b39fb 100644 --- a/internal/app/auth/service.go +++ b/internal/app/auth/service.go @@ -64,7 +64,10 @@ func validPhone(phone string) bool { } func systemUserLoginForbidden(u domain.User) bool { - return domain.IsSystemUserID(u.ID) + // Login-facing callers deliberately use the same non-enumerating error for + // reserved identities and irreversible tombstones. The durable authorization + // store repeats the deleted check under the user lock to close the TOCTOU gap. + return u.Deleted || domain.IsSystemUserID(u.ID) } func systemLoginPhoneForbidden(phone string) bool { @@ -270,12 +273,14 @@ func NewService(users store.UserStore, auths store.AuthorizationStore, codes sto } // BindTempAuthKey 校验并记录 TDesktop PFS temp→perm auth key 绑定。 -func (s *Service) BindTempAuthKey(ctx context.Context, sessionID int64, binding domain.TempAuthKeyBinding) error { +func (s *Service) BindTempAuthKey(ctx context.Context, sessionID int64, binding domain.TempAuthKeyBinding) (domain.TempAuthKeyBindingResult, error) { + var validated domain.TempAuthKeyBindingResult if s.authKeys != nil { - inner, protocolExpiresAt, err := s.validateBindTempAuthKey(ctx, sessionID, binding) + inner, protocolExpiresAt, result, err := s.validateBindTempAuthKey(ctx, sessionID, binding) if err != nil { - return err + return domain.TempAuthKeyBindingResult{}, err } + validated = result binding.TempSessionID = inner.TempSessionID // The bind request's expires_at is a signed client assertion. TDesktop // intentionally adds a small grace interval, while Android derives its @@ -287,21 +292,22 @@ func (s *Service) BindTempAuthKey(ctx context.Context, sessionID int64, binding // The edge may admit the frame immediately before the temporary key's // absolute boundary and the encrypted proof may cross it. This is a temp-key // rotation condition, never a destructive permanent-key proof failure. - return ErrTempAuthKeyEmpty + return domain.TempAuthKeyBindingResult{}, ErrTempAuthKeyEmpty } if s.tempKeys == nil { - return nil + return validated, nil } - if err := s.tempKeys.Save(ctx, binding); err != nil { + result, err := s.tempKeys.SaveWithState(ctx, binding) + if err != nil { if errors.Is(err, store.ErrTempAuthKeyAlreadyBound) { - return ErrTempAuthKeyAlreadyBound + return domain.TempAuthKeyBindingResult{}, ErrTempAuthKeyAlreadyBound } if errors.Is(err, store.ErrAuthKeyBindingInvalid) { - return s.classifyBindingStoreInvalid(ctx, binding) + return domain.TempAuthKeyBindingResult{}, s.classifyBindingStoreInvalid(ctx, binding) } - return err + return domain.TempAuthKeyBindingResult{}, err } - return nil + return result, nil } // ResolveAuthKey 将已绑定的 temp auth_key 解析为对应 perm auth_key。 @@ -323,7 +329,7 @@ func (s *Service) ResolveAuthKey(ctx context.Context, authKeyID [8]byte) ([8]byt // UserID 返回 auth_key 当前绑定的用户。未登录、或两步验证未完成时 found=false。 func (s *Service) UserID(ctx context.Context, authKeyID [8]byte) (int64, bool, error) { - if s == nil || s.auths == nil { + if s == nil || s.auths == nil || s.users == nil { return 0, false, nil } a, found, err := s.auths.ByAuthKey(ctx, authKeyID) @@ -334,7 +340,13 @@ func (s *Service) UserID(ctx context.Context, authKeyID [8]byte) (int64, bool, e // 两步验证未完成：业务鉴权视为未登录，仅允许 auth.checkPassword 继续。 return 0, false, nil } - if domain.IsSystemUserID(a.UserID) { + u, userFound, err := s.users.ByID(ctx, a.UserID) + if err != nil { + return 0, false, err + } + if !userFound || systemUserLoginForbidden(u) { + // A stale row can exist only after an interrupted/legacy path. Fail closed + // before it reaches the Router auth cache and retire it opportunistically. _ = s.auths.Delete(ctx, authKeyID) return 0, false, nil } @@ -344,14 +356,18 @@ func (s *Service) UserID(ctx context.Context, authKeyID [8]byte) (int64, bool, e // PendingPasswordUserID 返回处于"待两步验证"状态的 auth_key 对应的用户。 // UserID 对 password_pending 的 auth_key 返回未登录，auth.checkPassword 借此仍能定位待验证用户。 func (s *Service) PendingPasswordUserID(ctx context.Context, authKeyID [8]byte) (int64, bool, error) { - if s == nil || s.auths == nil { + if s == nil || s.auths == nil || s.users == nil { return 0, false, nil } a, found, err := s.auths.ByAuthKey(ctx, authKeyID) if err != nil || !found || !a.PasswordPending { return 0, false, err } - if domain.IsSystemUserID(a.UserID) { + u, userFound, err := s.users.ByID(ctx, a.UserID) + if err != nil { + return 0, false, err + } + if !userFound || systemUserLoginForbidden(u) { _ = s.auths.Delete(ctx, authKeyID) return 0, false, nil } @@ -359,13 +375,24 @@ func (s *Service) PendingPasswordUserID(ctx context.Context, authKeyID [8]byte) } // CompletePasswordSignIn 在两步验证通过后清除 password_pending，使 auth_key 转为完全授权。 -func (s *Service) CompletePasswordSignIn(ctx context.Context, authKeyID [8]byte) error { +func (s *Service) CompletePasswordSignIn(ctx context.Context, authKeyID [8]byte, expectedUserID int64) error { if s == nil || s.auths == nil { return nil } - if err := s.auths.MarkPasswordPassed(ctx, authKeyID); err != nil { + if expectedUserID == 0 { + return store.ErrAuthorizationStateChanged + } + if err := s.auths.MarkPasswordPassed(ctx, authKeyID, expectedUserID); err != nil { return err } + // Revalidate the active account after the CAS promotion before Router caches + // or binds the session. Account deletion can still linearize immediately + // after the update and must leave the caller unauthorized. + if userID, found, err := s.UserID(ctx, authKeyID); err != nil { + return err + } else if !found || userID != expectedUserID { + return ErrSystemUserLoginForbidden + } // This is where a 2FA account's sign-in actually finishes — finishSignIn // deliberately skipped the welcome message while password_pending. if a, found, err := s.auths.ByAuthKey(ctx, authKeyID); err == nil && found { @@ -1423,7 +1450,11 @@ func (s *Service) AuthKeyClientInfo(ctx context.Context, authKeyID [8]byte) (dom if s == nil || s.authKeys == nil || authKeyID == ([8]byte{}) { return domain.AuthKeyClientInfo{}, false, nil } - key, found, err := s.authKeys.Get(ctx, authKeyID) + // Client metadata is a read-only projection. The physical connection's + // first-frame Get and active-key heartbeat already own the durable orphan + // lease, so this path must not turn every init/profile read into another + // last_used_at write. + key, found, err := s.authKeys.Revalidate(ctx, authKeyID) if err != nil || !found { return domain.AuthKeyClientInfo{}, found, err } @@ -1499,6 +1530,16 @@ func (s *Service) ResetAuthorizations(ctx context.Context, userID int64, keepAut } func (s *Service) bind(ctx context.Context, auth domain.Authorization, userID int64) error { + if s == nil || s.users == nil || s.auths == nil || userID == 0 { + return ErrSystemUserLoginForbidden + } + u, found, err := s.users.ByID(ctx, userID) + if err != nil { + return err + } + if !found || systemUserLoginForbidden(u) { + return ErrSystemUserLoginForbidden + } if s.authKeys != nil { key, found, err := s.authKeys.Get(ctx, auth.AuthKeyID) if err != nil { @@ -1519,6 +1560,9 @@ func (s *Service) bind(ctx context.Context, auth domain.Authorization, userID in if errors.Is(err, store.ErrAuthKeyNotPermanent) { return ErrAuthKeyPermEmpty } + if errors.Is(err, domain.ErrAccountDeleted) || errors.Is(err, domain.ErrUserNotFound) { + return ErrSystemUserLoginForbidden + } return err } return nil @@ -1535,17 +1579,19 @@ func (s *Service) passwordNeeded(ctx context.Context, userID int64) (bool, error return found && settings.HasPassword, nil } -const loginMessageTpl = `Login code: %s. Do not give this code to anyone, even if they say they are from ` + branding.ProductName + `! +func loginMessageTemplate() string { + return `Login code: %s. Do not give this code to anyone, even if they say they are from ` + branding.ProductName + `! This code can be used to log in to your ` + branding.ProductName + ` account. We never ask it for anything else. If you didn't request this code by trying to log in on another device, simply ignore this message.` +} func (s *Service) recordLoginMessage(ctx context.Context, userID int64, code string) (domain.Message, error) { if s.messages == nil || s.dialogs == nil { return domain.Message{}, nil } - body := fmt.Sprintf(loginMessageTpl, code) + body := fmt.Sprintf(loginMessageTemplate(), code) codeOffset := len("Login code: ") msg, err := s.messages.Create(ctx, domain.Message{ OwnerUserID: userID, @@ -1595,53 +1641,58 @@ func (s *Service) recordWelcomeMessage(ctx context.Context, u domain.User) { }) } -func (s *Service) validateBindTempAuthKey(ctx context.Context, sessionID int64, binding domain.TempAuthKeyBinding) (mtcrypto.BindAuthKeyInner, int, error) { +func (s *Service) validateBindTempAuthKey(ctx context.Context, sessionID int64, binding domain.TempAuthKeyBinding) (mtcrypto.BindAuthKeyInner, int, domain.TempAuthKeyBindingResult, error) { if binding.ExpiresAt <= int(time.Now().Unix()) { - return mtcrypto.BindAuthKeyInner{}, 0, ErrExpiresAtInvalid + return mtcrypto.BindAuthKeyInner{}, 0, domain.TempAuthKeyBindingResult{}, ErrExpiresAtInvalid } - temp, found, err := s.authKeys.Get(ctx, binding.TempAuthKeyID) + permID := authKeyIDFromInt64(binding.PermAuthKeyID) + pair, err := s.authKeys.LoadBindingKeys(ctx, binding.TempAuthKeyID, permID) if err != nil { - return mtcrypto.BindAuthKeyInner{}, 0, err + return mtcrypto.BindAuthKeyInner{}, 0, domain.TempAuthKeyBindingResult{}, err } // expires_at in auth.bindTempAuthKey is client-supplied and must only attest // to a still-live binding. It may never create or reclassify a protocol key; // the caller normalizes durable retention to this handshake-authoritative // temp.ExpiresAt instead of trusting the client value. - if !found || temp.ExpiresAt <= int(time.Now().Unix()) { - return mtcrypto.BindAuthKeyInner{}, 0, ErrTempAuthKeyEmpty + if !pair.TemporaryFound || pair.Temporary.ExpiresAt <= int(time.Now().Unix()) { + return mtcrypto.BindAuthKeyInner{}, 0, domain.TempAuthKeyBindingResult{}, ErrTempAuthKeyEmpty } - permID := authKeyIDFromInt64(binding.PermAuthKeyID) - perm, found, err := s.authKeys.Get(ctx, permID) - if err != nil { - return mtcrypto.BindAuthKeyInner{}, 0, err - } - if !found || perm.ExpiresAt != 0 { - return mtcrypto.BindAuthKeyInner{}, 0, ErrEncryptedMessageInvalid + if !pair.PermanentFound || pair.Permanent.ExpiresAt != 0 { + return mtcrypto.BindAuthKeyInner{}, 0, domain.TempAuthKeyBindingResult{}, ErrEncryptedMessageInvalid } - inner, err := decryptBindAuthKeyInner(perm, binding.EncryptedMessage) + inner, err := decryptBindAuthKeyInner(pair.Permanent, binding.EncryptedMessage) if err != nil { - return mtcrypto.BindAuthKeyInner{}, 0, ErrEncryptedMessageInvalid + return mtcrypto.BindAuthKeyInner{}, 0, domain.TempAuthKeyBindingResult{}, ErrEncryptedMessageInvalid } if inner.Nonce != binding.Nonce || inner.TempAuthKeyID != authKeyIDInt64(binding.TempAuthKeyID) || inner.PermAuthKeyID != binding.PermAuthKeyID || inner.TempSessionID != sessionID || inner.ExpiresAt != binding.ExpiresAt { - return mtcrypto.BindAuthKeyInner{}, 0, ErrEncryptedMessageInvalid + return mtcrypto.BindAuthKeyInner{}, 0, domain.TempAuthKeyBindingResult{}, ErrEncryptedMessageInvalid } - if temp.ExpiresAt <= int(time.Now().Unix()) { - return mtcrypto.BindAuthKeyInner{}, 0, ErrTempAuthKeyEmpty + if pair.Temporary.ExpiresAt <= int(time.Now().Unix()) { + return mtcrypto.BindAuthKeyInner{}, 0, domain.TempAuthKeyBindingResult{}, ErrTempAuthKeyEmpty } - return inner, temp.ExpiresAt, nil + layer, observationID, err := store.MergeAuthKeyLayerObservations( + pair.Temporary.Layer, pair.Temporary.LayerObservationID, + pair.Permanent.Layer, pair.Permanent.LayerObservationID, + ) + if err != nil { + return mtcrypto.BindAuthKeyInner{}, 0, domain.TempAuthKeyBindingResult{}, err + } + return inner, pair.Temporary.ExpiresAt, domain.TempAuthKeyBindingResult{ + Layer: layer, LayerObservationID: observationID, + }, nil } func (s *Service) classifyBindingStoreInvalid(ctx context.Context, binding domain.TempAuthKeyBinding) error { if s == nil || s.authKeys == nil { return ErrEncryptedMessageInvalid } - temp, found, err := s.authKeys.Get(ctx, binding.TempAuthKeyID) + temp, found, err := s.authKeys.Revalidate(ctx, binding.TempAuthKeyID) if err != nil { return err } diff --git a/internal/app/auth/service_test.go b/internal/app/auth/service_test.go index 21da4faa..30d7761f 100644 --- a/internal/app/auth/service_test.go +++ b/internal/app/auth/service_test.go @@ -48,7 +48,7 @@ func TestBindTempAuthKeyValidatesEncryptedMessage(t *testing.T) { t.Fatalf("encrypt bind message: %v", err) } - err = svc.BindTempAuthKey(ctx, sessionID, domain.TempAuthKeyBinding{ + _, err = svc.BindTempAuthKey(ctx, sessionID, domain.TempAuthKeyBinding{ TempAuthKeyID: tempKey.ID, PermAuthKeyID: permKey.IntID(), Nonce: nonce, @@ -59,7 +59,7 @@ func TestBindTempAuthKeyValidatesEncryptedMessage(t *testing.T) { t.Fatalf("BindTempAuthKey valid message: %v", err) } - err = svc.BindTempAuthKey(ctx, sessionID+1, domain.TempAuthKeyBinding{ + _, err = svc.BindTempAuthKey(ctx, sessionID+1, domain.TempAuthKeyBinding{ TempAuthKeyID: tempKey.ID, PermAuthKeyID: permKey.IntID(), Nonce: nonce, @@ -89,7 +89,7 @@ func TestBindTempAuthKeyValidatesEncryptedMessage(t *testing.T) { if err != nil { t.Fatalf("encrypt extended bind message: %v", err) } - err = svc.BindTempAuthKey(ctx, sessionID, domain.TempAuthKeyBinding{ + _, err = svc.BindTempAuthKey(ctx, sessionID, domain.TempAuthKeyBinding{ TempAuthKeyID: tempKey.ID, PermAuthKeyID: permKey.IntID(), Nonce: nonce, @@ -120,17 +120,17 @@ func TestBindTempAuthKeyClassifiesExpiryWithoutDestroyingPermanentKey(t *testing PermAuthKeyID: permKey.IntID(), ExpiresAt: int(time.Now().Add(time.Hour).Unix()), } - if err := svc.BindTempAuthKey(ctx, 1001, request); !errors.Is(err, ErrTempAuthKeyEmpty) { + if _, err := svc.BindTempAuthKey(ctx, 1001, request); !errors.Is(err, ErrTempAuthKeyEmpty) { t.Fatalf("expired protocol temp key err = %v, want ErrTempAuthKeyEmpty", err) } request.TempAuthKeyID = testAuthKey(0x33).ID - if err := svc.BindTempAuthKey(ctx, 1001, request); !errors.Is(err, ErrTempAuthKeyEmpty) { + if _, err := svc.BindTempAuthKey(ctx, 1001, request); !errors.Is(err, ErrTempAuthKeyEmpty) { t.Fatalf("missing protocol temp key err = %v, want ErrTempAuthKeyEmpty", err) } request.ExpiresAt = int(time.Now().Add(-time.Second).Unix()) - if err := svc.BindTempAuthKey(ctx, 1001, request); !errors.Is(err, ErrExpiresAtInvalid) { + if _, err := svc.BindTempAuthKey(ctx, 1001, request); !errors.Is(err, ErrExpiresAtInvalid) { t.Fatalf("expired request proof err = %v, want ErrExpiresAtInvalid", err) } } @@ -346,6 +346,59 @@ func TestAuthorizationBindRejectsTemporaryProtocolKey(t *testing.T) { } } +func TestDeletedUserCannotCrossAuthorizationBoundaries(t *testing.T) { + ctx := context.Background() + users := memory.NewUserStore() + authz := memory.NewAuthorizationStore() + deleted, err := users.Create(ctx, domain.User{ + Deleted: true, + DeletedAt: time.Now().Unix(), + DeletionSource: domain.AccountDeletionManual, + }) + if err != nil { + t.Fatalf("create deleted user: %v", err) + } + svc := NewService(users, authz, memory.NewCodeStore(), nil, nil, "12345") + + passkeyAuthKeyID := [8]byte{0x91} + if _, err := svc.BindVerifiedLogin(ctx, domain.Authorization{AuthKeyID: passkeyAuthKeyID}, deleted.ID); !errors.Is(err, ErrSystemUserLoginForbidden) { + t.Fatalf("BindVerifiedLogin deleted user err = %v, want ErrSystemUserLoginForbidden", err) + } + if _, found, err := authz.ByAuthKey(ctx, passkeyAuthKeyID); err != nil || found { + t.Fatalf("deleted passkey authorization found=%v err=%v, want absent", found, err) + } + + qrAuthKeyID := [8]byte{0x92} + if _, err := svc.AcceptLoginToken(ctx, domain.Authorization{AuthKeyID: qrAuthKeyID}, deleted.ID); !errors.Is(err, ErrSystemUserLoginForbidden) { + t.Fatalf("AcceptLoginToken deleted user err = %v, want ErrSystemUserLoginForbidden", err) + } + if _, found, err := authz.ByAuthKey(ctx, qrAuthKeyID); err != nil || found { + t.Fatalf("deleted QR authorization found=%v err=%v, want absent", found, err) + } + + staleAuthKeyID := [8]byte{0x93} + if err := authz.Bind(ctx, domain.Authorization{AuthKeyID: staleAuthKeyID, UserID: deleted.ID}); err != nil { + t.Fatalf("seed stale authorization: %v", err) + } + if userID, found, err := svc.UserID(ctx, staleAuthKeyID); err != nil || found || userID != 0 { + t.Fatalf("UserID stale tombstone = %d found=%v err=%v, want unauthorized", userID, found, err) + } + if _, found, err := authz.ByAuthKey(ctx, staleAuthKeyID); err != nil || found { + t.Fatalf("stale tombstone authorization found=%v err=%v, want retired", found, err) + } + + pendingAuthKeyID := [8]byte{0x94} + if err := authz.Bind(ctx, domain.Authorization{AuthKeyID: pendingAuthKeyID, UserID: deleted.ID, PasswordPending: true}); err != nil { + t.Fatalf("seed stale pending authorization: %v", err) + } + if err := svc.CompletePasswordSignIn(ctx, pendingAuthKeyID, deleted.ID); !errors.Is(err, ErrSystemUserLoginForbidden) { + t.Fatalf("CompletePasswordSignIn deleted user err = %v, want ErrSystemUserLoginForbidden", err) + } + if _, found, err := authz.ByAuthKey(ctx, pendingAuthKeyID); err != nil || found { + t.Fatalf("stale pending tombstone authorization found=%v err=%v, want retired", found, err) + } +} + func TestPhoneCodeAcceptsTDesktopDigitsOnlySignIn(t *testing.T) { ctx := context.Background() users := memory.NewUserStore() @@ -377,6 +430,100 @@ func TestPhoneCodeAcceptsTDesktopDigitsOnlySignIn(t *testing.T) { } } +func TestVirtual888PhoneRegistersAndSignsIn(t *testing.T) { + ctx := context.Background() + users := memory.NewUserStore() + authz := memory.NewAuthorizationStore() + delivery := &captureLoginCodeDelivery{} + svc := NewService( + users, + authz, + memory.NewCodeStore(), + nil, + nil, + "12345", + WithLoginCodeDelivery(delivery), + ) + const ( + formatted = "+888 12-34" + canonical = "8881234" + ) + + firstHash, err := svc.SendCode(ctx, formatted) + if err != nil { + t.Fatalf("SendCode virtual phone: %v", err) + } + verifyCodeForSignUp(t, svc, canonical, firstHash, "12345") + created, _, err := svc.SignUp(ctx, domain.Authorization{AuthKeyID: [8]byte{0x54}}, formatted, firstHash, "Virtual", "User") + if err != nil { + t.Fatalf("SignUp virtual phone: %v", err) + } + if created.Phone != canonical { + t.Fatalf("created phone = %q, want %q", created.Phone, canonical) + } + + secondHash, err := svc.SendCode(ctx, canonical) + if err != nil { + t.Fatalf("SendCode existing virtual phone: %v", err) + } + signedIn, _, needSignUp, err := svc.SignIn(ctx, domain.Authorization{AuthKeyID: [8]byte{0x55}}, formatted, secondHash, "12345") + if err != nil { + t.Fatalf("SignIn virtual phone: %v", err) + } + if needSignUp || signedIn.ID != created.ID { + t.Fatalf("SignIn user=%d needSignUp=%v, want existing user %d", signedIn.ID, needSignUp, created.ID) + } +} + +func TestIranNationalTrunkVariantsShareOneAccountIdentity(t *testing.T) { + ctx := context.Background() + users := memory.NewUserStore() + authz := memory.NewAuthorizationStore() + delivery := &captureLoginCodeDelivery{} + svc := NewService( + users, + authz, + memory.NewCodeStore(), + nil, + nil, + "12345", + WithLoginCodeDelivery(delivery), + ) + const ( + withNationalTrunk = "+98 0998 167 9461" + international = "989981679461" + canonical = "989981679461" + ) + + firstHash, err := svc.SendCode(ctx, withNationalTrunk) + if err != nil { + t.Fatalf("SendCode trunk variant: %v", err) + } + verifyCodeForSignUp(t, svc, international, firstHash, "12345") + created, _, err := svc.SignUp(ctx, domain.Authorization{AuthKeyID: [8]byte{1}}, international, firstHash, "Iran", "User") + if err != nil { + t.Fatalf("SignUp international variant: %v", err) + } + if created.Phone != canonical { + t.Fatalf("created phone = %q, want %q", created.Phone, canonical) + } + + secondHash, err := svc.SendCode(ctx, international) + if err != nil { + t.Fatalf("SendCode existing international variant: %v", err) + } + signedIn, _, needSignUp, err := svc.SignIn(ctx, domain.Authorization{AuthKeyID: [8]byte{2}}, withNationalTrunk, secondHash, "12345") + if err != nil { + t.Fatalf("SignIn trunk variant: %v", err) + } + if needSignUp || signedIn.ID != created.ID { + t.Fatalf("SignIn user=%d needSignUp=%v, want existing user %d", signedIn.ID, needSignUp, created.ID) + } + if got, found, err := users.ByPhone(ctx, canonical); err != nil || !found || got.ID != created.ID { + t.Fatalf("canonical lookup user=%+v found=%v err=%v", got, found, err) + } +} + func verifyCodeForSignUp(t *testing.T, svc *Service, phone, hash, code string) { t.Helper() got, msg, needSignUp, err := svc.SignIn(context.Background(), domain.Authorization{}, phone, hash, code) @@ -809,7 +956,10 @@ func TestSignInExistingTwoFactorAccountNeedsPassword(t *testing.T) { t.Fatalf("PendingPasswordUserID = %d pending=%v err=%v, want %d", pendingUID, pending, err, u.ID) } // 两步验证通过后转为完全授权。 - if err := svc.CompletePasswordSignIn(ctx, key); err != nil { + if err := svc.CompletePasswordSignIn(ctx, key, 0); !errors.Is(err, store.ErrAuthorizationStateChanged) { + t.Fatalf("CompletePasswordSignIn without expected user err=%v, want authorization state changed", err) + } + if err := svc.CompletePasswordSignIn(ctx, key, u.ID); err != nil { t.Fatalf("CompletePasswordSignIn: %v", err) } bound, found, err = svc.UserID(ctx, key) diff --git a/internal/app/auth/welcome_message_test.go b/internal/app/auth/welcome_message_test.go index 118c8865..66e27696 100644 --- a/internal/app/auth/welcome_message_test.go +++ b/internal/app/auth/welcome_message_test.go @@ -151,7 +151,7 @@ func TestTwoFactorSignInDefersWelcomeMessageUntilPasswordCompletes(t *testing.T) t.Fatalf("welcome message fired before password check completed: %+v", pending.Messages[0]) } - if err := svc.CompletePasswordSignIn(ctx, key); err != nil { + if err := svc.CompletePasswordSignIn(ctx, key, u.ID); err != nil { t.Fatalf("CompletePasswordSignIn: %v", err) } diff --git a/internal/app/bots/botfather.go b/internal/app/bots/botfather.go index 34657d55..d1efb819 100644 --- a/internal/app/bots/botfather.go +++ b/internal/app/bots/botfather.go @@ -50,7 +50,8 @@ const ( maxTelegramLoginCommandsPerMessage = 32 ) -const botFatherHelpText = `I can help you create and manage ` + branding.ProductName + ` bots. +func botFatherHelpText() string { + return `I can help you create and manage ` + branding.ProductName + ` bots. You can control me by sending these commands: @@ -73,6 +74,7 @@ You can control me by sending these commands: /done - finish the active Telegram Login configuration /cancel - cancel the current operation /help - show this message` +} // botReply 是内置 service bot 的一条回复。ReplyMarkup 为可选 inline keyboard // 快照（@verifybot 的按钮式对话使用）；落库前经 domain.ValidateReplyMarkup 校验。 @@ -80,6 +82,7 @@ type botReply struct { Text string Entities []domain.MessageEntity ReplyMarkup *domain.MessageReplyMarkup + Media *domain.MessageMedia } // HandlesBot 报告该收件人是否为内置应答 bot（messages.BotResponder 实现）。 @@ -105,7 +108,7 @@ func (s *Service) HandlesBot(botUserID int64) bool { // OnPrivateMessage 处理投递给内置 bot 的私聊消息（messages.BotResponder 实现）。 // msg 是 bot 视角的收件 box 行。回复异步生成（不占用户 sendMessage 的 RPC // goroutine——官方 bot 回复本就异步到达），失败只记日志，绝不影响用户消息本身。 -func (s *Service) OnPrivateMessage(ctx context.Context, botUserID int64, msg domain.Message) { +func (s *Service) OnPrivateMessage(ctx context.Context, botUserID int64, msg domain.Message, session domain.ClientSessionMetadata) { if s == nil || s.messages == nil || !s.HandlesBot(botUserID) { return } @@ -163,7 +166,7 @@ func (s *Service) serviceBotRecipientBlocked(ctx context.Context, botUserID, use } func (s *Service) sendServiceBotReplyResult(ctx context.Context, botUserID, userID int64, reply botReply) (domain.SendPrivateTextResult, bool) { - if s == nil || s.messages == nil || reply.Text == "" { + if s == nil || s.messages == nil || (reply.Text == "" && reply.Media.IsZero()) { return domain.SendPrivateTextResult{}, false } markup := reply.ReplyMarkup @@ -183,6 +186,7 @@ func (s *Service) sendServiceBotReplyResult(ctx context.Context, botUserID, user RandomID: s.botReplyRandomID(), Message: reply.Text, Entities: serviceBotReplyEntities(reply.Text, reply.Entities), + Media: reply.Media, ReplyMarkup: markup, Date: int(s.now().Unix()), RecipientBlocked: s.serviceBotRecipientBlocked(ctx, botUserID, userID), @@ -323,7 +327,7 @@ func (s *Service) handleBotFatherCommand(ctx context.Context, userID int64, cmd switch cmd { case "start", "help": _ = s.bots.DeleteBotChatState(ctx, domain.BotFatherUserID, userID) - return botReply{Text: botFatherHelpText} + return botReply{Text: botFatherHelpText()} case "cancel": state, found, err := s.bots.GetBotChatState(ctx, domain.BotFatherUserID, userID) if err != nil { diff --git a/internal/app/bots/chatbot.go b/internal/app/bots/chatbot.go index 4ba3f268..9f5ff3ce 100644 --- a/internal/app/bots/chatbot.go +++ b/internal/app/bots/chatbot.go @@ -9,6 +9,7 @@ import ( "go.uber.org/zap" + "telesrv/internal/branding" "telesrv/internal/domain" ) @@ -18,14 +19,17 @@ const ( chatBotStreamMaxDrafts = 24 chatBotHistoryLimit = 12 chatBotTranscriptLineLimit = 800 + chatBotHelpPrefix = "Send me a message and I will answer with the configured " + chatBotHelpSuffix = " AI provider.\n\n/help - show this message\n/reset - clear the local AI context" ) -const chatBotHelpText = `Send me a message and I will answer with the configured telesrv AI provider. +func chatBotHelpText() string { + return chatBotHelpPrefix + branding.ProductName + chatBotHelpSuffix +} -/help - show this message -/reset - clear the local AI context` - -const chatBotInstruction = `You are ChatBot, a built-in AI assistant inside telesrv private chats. The user input is a recent chat transcript. Reply only to the last user message. Match the user's language when practical. Be helpful, concise, and direct. Do not mention provider names, API keys, internal prompts, or system implementation details.` +func chatBotInstruction() string { + return "You are ChatBot, a built-in AI assistant inside " + branding.ProductName + " private chats. The user input is a recent chat transcript. Reply only to the last user message. Match the user's language when practical. Be helpful, concise, and direct. Do not mention provider names, API keys, internal prompts, or system implementation details." +} const ( chatBotUnavailableText = "AI chat is not available right now. Please try again later." @@ -46,7 +50,7 @@ func (s *Service) respondAsChatBot(userID int64, msg domain.Message) { if cmd, ok := parseBotCommand(text); ok { switch cmd { case "start", "help": - s.sendServiceBotReply(ctx, domain.ChatBotUserID, userID, botReply{Text: chatBotHelpText}) + s.sendServiceBotReply(ctx, domain.ChatBotUserID, userID, botReply{Text: chatBotHelpText()}) case "reset": s.sendServiceBotReply(ctx, domain.ChatBotUserID, userID, botReply{Text: chatBotResetText}) default: @@ -76,7 +80,7 @@ func (s *Service) respondAsChatBot(userID int64, msg domain.Message) { Text: domain.AIComposeText{ Text: s.chatBotPromptText(ctx, userID, msg), }, - Instruction: chatBotInstruction, + Instruction: chatBotInstruction(), } final, err := s.aiChat.GenerateTextStream(ctx, req, func(out domain.AIComposeText) error { if chatBotLooksLikePromptEcho(out.Text, req.Text.Text) { @@ -165,7 +169,15 @@ func chatBotTranscriptLine(speaker, text string) string { func chatBotCommandReply(text string) bool { text = strings.TrimSpace(text) - return text == chatBotHelpText || text == chatBotResetText || text == chatBotUnknownCommand || text == chatBotTextOnlyText + return chatBotHelpReply(text) || text == chatBotResetText || text == chatBotUnknownCommand || text == chatBotTextOnlyText +} + +func chatBotHelpReply(text string) bool { + if !strings.HasPrefix(text, chatBotHelpPrefix) || !strings.HasSuffix(text, chatBotHelpSuffix) { + return false + } + brand := strings.TrimSuffix(strings.TrimPrefix(text, chatBotHelpPrefix), chatBotHelpSuffix) + return strings.TrimSpace(brand) != "" } func chatBotLooksLikePromptEcho(text, prompt string) bool { diff --git a/internal/app/bots/chatbot_test.go b/internal/app/bots/chatbot_test.go index 2d11d0d2..000f88c5 100644 --- a/internal/app/bots/chatbot_test.go +++ b/internal/app/bots/chatbot_test.go @@ -128,6 +128,19 @@ func TestChatBotSystemSeedAndCommands(t *testing.T) { assertReplyEntityText(t, reply, domain.MessageEntityBotCommand, "/help") } +func TestChatBotCommandReplyRecognizesHelpFromPreviousBrand(t *testing.T) { + oldHelp := chatBotHelpPrefix + "Previous Product" + chatBotHelpSuffix + if !chatBotCommandReply(oldHelp) { + t.Fatal("help reply from previous product brand should be excluded from AI history") + } + if chatBotCommandReply(chatBotHelpPrefix + chatBotHelpSuffix) { + t.Fatal("help-shaped text without a product name should not be classified as a bot command reply") + } + if chatBotCommandReply("ordinary assistant reply") { + t.Fatal("ordinary assistant reply should remain in AI history") + } +} + func TestChatBotStreamsByTypingDraftThenFinalMessage(t *testing.T) { ai := &fakeChatAI{ chunks: []string{"Hel", "Hello from AI"}, diff --git a/internal/app/bots/gifbot_test.go b/internal/app/bots/gifbot_test.go new file mode 100644 index 00000000..c92e06e0 --- /dev/null +++ b/internal/app/bots/gifbot_test.go @@ -0,0 +1,41 @@ +package bots + +import ( + "context" + "testing" + + "telesrv/internal/domain" +) + +type gifCatalogTestSource struct { + entries []domain.GifCatalogEntry + docs []domain.Document +} + +func (s gifCatalogTestSource) ListGifCatalog(context.Context, bool) ([]domain.GifCatalogEntry, error) { + return s.entries, nil +} +func (s gifCatalogTestSource) GetDocuments(context.Context, []int64) ([]domain.Document, error) { + return s.docs, nil +} + +func TestGifBotRanksMatchesAndReturnsPlayableDocuments(t *testing.T) { + doc := domain.Document{ID: 9, MimeType: "video/mp4", Attributes: []domain.DocumentAttribute{{Kind: domain.DocAttrAnimated}, {Kind: domain.DocAttrVideo, W: 320, H: 240, Duration: 1}}} + svc := NewService(nil, nil, nil, WithGifCatalogSource(gifCatalogTestSource{ + entries: []domain.GifCatalogEntry{{ID: 1, Title: "Dog", DocumentID: 9}, {ID: 2, Title: "Cat wave", DocumentID: 9}}, docs: []domain.Document{doc}, + })) + got, handled, err := svc.OnInlineQuery(context.Background(), domain.GifBotUserID, 42, "cat", "") + if err != nil || !handled || got.QueryID != 0 || len(got.Results) != 2 { + t.Fatalf("OnInlineQuery = %+v,%v,%v", got, handled, err) + } + if got.Results[0].ID != "2" || got.Results[0].Media == nil || got.Results[0].Media.Document.ID != 9 { + t.Fatalf("ranked results = %+v", got.Results) + } +} + +func TestGifBotFailsFastOnMissingDocument(t *testing.T) { + svc := NewService(nil, nil, nil, WithGifCatalogSource(gifCatalogTestSource{entries: []domain.GifCatalogEntry{{ID: 1, Title: "Missing", DocumentID: 99}}})) + if _, handled, err := svc.OnInlineQuery(context.Background(), domain.GifBotUserID, 42, "", ""); !handled || err == nil { + t.Fatalf("handled=%v err=%v", handled, err) + } +} diff --git a/internal/app/bots/stickersbot.go b/internal/app/bots/stickersbot.go index 1cdb5ce1..4d5d920d 100644 --- a/internal/app/bots/stickersbot.go +++ b/internal/app/bots/stickersbot.go @@ -13,6 +13,7 @@ import ( "go.uber.org/zap" + "telesrv/internal/branding" "telesrv/internal/domain" "telesrv/internal/links" ) @@ -44,18 +45,17 @@ const ( stickersBotCreatedListPageLimit = 20 ) -const stickersBotHelpText = `I can help you create sticker and custom emoji packs for telesrv. - -Send /newpack to create a sticker pack. -Send /newemoji to create a custom emoji pack. -Send /addsticker to add an item to one of your packs. -Send /delsticker to remove an item from one of your packs. - -Send a sticker/custom emoji, or upload a TGS, Lottie JSON, WebP, WebM, or MP4 file as a document. Send /publish when your pack is ready, then choose a short name for the link. - -/packs - list your created packs -/cancel - cancel the current operation -/help - show this message` +func stickersBotHelpText() string { + return "I can help you create sticker and custom emoji packs for " + branding.ProductName + ".\n\n" + + "Send /newpack to create a sticker pack.\n" + + "Send /newemoji to create a custom emoji pack.\n" + + "Send /addsticker to add an item to one of your packs.\n" + + "Send /delsticker to remove an item from one of your packs.\n\n" + + "Send a sticker/custom emoji, or upload a TGS, Lottie JSON, WebP, WebM, or MP4 file as a document. Send /publish when your pack is ready, then choose a short name for the link.\n\n" + + "/packs - list your created packs\n" + + "/cancel - cancel the current operation\n" + + "/help - show this message" +} var stickersBotGlobalCommands = map[string]bool{ "start": true, "help": true, "cancel": true, @@ -144,9 +144,9 @@ func (s *Service) handleStickersCommand(ctx context.Context, userID int64, cmd s switch cmd { case "start": _ = s.bots.DeleteBotChatState(ctx, domain.StickersBotUserID, userID) - return botReply{Text: stickersBotHelpText} + return botReply{Text: stickersBotHelpText()} case "help": - return botReply{Text: stickersBotHelpText} + return botReply{Text: stickersBotHelpText()} case "cancel": if !found { return botReply{Text: "No active pack to cancel."} @@ -197,9 +197,9 @@ func (s *Service) startStickersEditFlow(ctx context.Context, userID int64, cmd s return internalReply() } if cmd == stickersBotCmdDel { - return botReply{Text: "Send the short name or telesrv link of the pack you want to edit. Use /packs to see your packs."} + return botReply{Text: "Send the short name or " + branding.ProductName + " link of the pack you want to edit. Use /packs to see your packs."} } - return botReply{Text: "Send the short name or telesrv link of the pack you want to add to. Use /packs to see your packs."} + return botReply{Text: "Send the short name or " + branding.ProductName + " link of the pack you want to add to. Use /packs to see your packs."} } func (s *Service) startStickersFlow(ctx context.Context, userID int64, cmd string, kind domain.StickerSetKind) botReply { @@ -228,7 +228,7 @@ func (s *Service) handleStickersSet(ctx context.Context, state domain.BotChatSta } shortName := normalizeStickersBotShortName(raw) if shortName == "" || strings.HasPrefix(shortName, "/") { - return botReply{Text: "Send the pack short name or telesrv link. Use /packs to list your packs, or /cancel."} + return botReply{Text: "Send the pack short name or " + branding.ProductName + " link. Use /packs to list your packs, or /cancel."} } set, _, found, err := s.stickers.ResolveStickerSet(ctx, domain.StickerSetRef{Kind: domain.StickerSetRefByShortName, ShortName: shortName}) if err != nil { @@ -556,7 +556,7 @@ func (s *Service) listStickersBotPacks(ctx context.Context, userID int64) botRep func stickersBotStepPrompt(state domain.BotChatState) botReply { switch state.Step { case stickersBotStepSet: - return botReply{Text: "Send the pack short name or telesrv link, or /cancel."} + return botReply{Text: "Send the pack short name or " + branding.ProductName + " link, or /cancel."} case stickersBotStepTitle: return botReply{Text: "Send a title for this pack, or /cancel."} case stickersBotStepDocument: diff --git a/internal/app/bots/verifierbot.go b/internal/app/bots/verifierbot.go index d12c637a..097f6d3f 100644 --- a/internal/app/bots/verifierbot.go +++ b/internal/app/bots/verifierbot.go @@ -194,13 +194,16 @@ const ( // verifierBotWhatText is the part of /start that is true whether or not an // operator has activated this bot, so it is said first and unconditionally. -const verifierBotWhatText = `I hand out THIRD-PARTY verification. +func verifierBotWhatText() string { + return `I hand out THIRD-PARTY verification. A third-party mark is a verifier's own icon, shown right before the name of a bot, a channel or an account, plus one line of description in its profile. It means "this verifier vouches for this peer" -- nothing more. It is NOT the official ` + branding.ProductName + ` checkmark. The platform badge is granted by the platform itself (@verifybot collects those applications); a third-party mark is granted by the company running a verifier bot. The two are stored, shown and taken away separately, and neither one implies the other.` +} -const verifierBotHelpText = `I am a verifier bot. I grant third-party marks: my icon before the name of your bot, channel or account, plus a description in its profile. This is not the official ` + branding.ProductName + ` checkmark. +func verifierBotHelpText() string { + return `I am a verifier bot. I grant third-party marks: my icon before the name of your bot, channel or account, plus a description in its profile. This is not the official ` + branding.ProductName + ` checkmark. /start - what a third-party mark is and who grants it /verify - apply for the mark @@ -210,6 +213,7 @@ const verifierBotHelpText = `I am a verifier bot. I grant third-party marks: my /help - show this message I do not decide anything: I collect the application, an operator grants or refuses the mark, and I message you here with the outcome.` +} const ( verifierBotIdleText = `I only hand out third-party verification marks. Send /verify to apply, /status to see where your applications stand, /revoke to remove a mark, or /help to see what I understand.` @@ -363,7 +367,7 @@ func (s *Service) handleVerifier(ctx context.Context, userID int64, body string) func (s *Service) handleVerifierCommand(ctx context.Context, userID int64, cmd string, state domain.BotChatState, found bool) botReply { if cmd == "help" { - return botReply{Text: verifierBotHelpText} + return botReply{Text: verifierBotHelpText()} } if s.customVerification == nil { return botReply{Text: verifierUnavailableText} @@ -386,7 +390,7 @@ func (s *Service) handleVerifierCommand(ctx context.Context, userID int64, cmd s case "cancel": return s.cancelVerifierDialog(ctx, userID, state, found) default: - return botReply{Text: verifierBotHelpText} + return botReply{Text: verifierBotHelpText()} } } @@ -532,7 +536,7 @@ func (s *Service) verifierIntro(ctx context.Context, userID int64, state domain. settings, refusal, ok := s.verifierSettings(ctx, userID) if !ok { // No keyboard, no state write: there is nothing for the applicant to press. - return botReply{Text: verifierJoin(verifierBotWhatText, refusal.Text)} + return botReply{Text: verifierJoin(verifierBotWhatText(), refusal.Text)} } state.Step = verifierStepIntro markup := s.verifierOptionKeyboard(&state, [][]verifierOption{{ @@ -544,7 +548,7 @@ func (s *Service) verifierIntro(ctx context.Context, userID int64, state domain. live := fmt.Sprintf("Verifier: %s\n\nThe mark I would put on your peer:\n%s\n\nTap the button below, or send /verify, to apply. An operator reads every application and decides; I only collect it. Send /help for the rest of my commands.", verifierTruncate(strings.TrimSpace(settings.CompanyName), domain.MaxVerifierCompanyLength), verifierDescriptionLine(settings)) - return botReply{Text: verifierJoin(verifierBotWhatText, live), ReplyMarkup: markup} + return botReply{Text: verifierJoin(verifierBotWhatText(), live), ReplyMarkup: markup} } // --------------------------------------------------------------------------- diff --git a/internal/app/bots/verifierbot_test.go b/internal/app/bots/verifierbot_test.go index 66070122..a5dc469a 100644 --- a/internal/app/bots/verifierbot_test.go +++ b/internal/app/bots/verifierbot_test.go @@ -431,7 +431,7 @@ func TestVerifierBotHiddenByThirdPartyVerificationFlag(t *testing.T) { svc.OnPrivateMessage(context.Background(), domain.VerifierBotUserID, domain.Message{ From: domain.Peer{Type: domain.PeerTypeUser, ID: owner.ID}, Body: "/start", - }) + }, domain.ClientSessionMetadata{}) if replies := verifierReplies(t, messages, owner.ID); len(replies) != 0 { t.Fatalf("hidden @verifierbot replied: %+v", replies) } @@ -811,7 +811,7 @@ func TestVerifierBotHelpAndIdleText(t *testing.T) { // /help answers even with no verification service wired at all: it describes the // bot rather than reading any state. help := sendToVerifierBot(t, svc, messages, owner.ID, "/help") - if help.Body != verifierBotHelpText { + if help.Body != verifierBotHelpText() { t.Fatalf("/help = %q", help.Body) } for _, want := range []string{"/start", "/verify", "/status", "/revoke", "/help", "not the official"} { @@ -846,7 +846,7 @@ func TestVerifierBotGlobalCommandsWorkMidStep(t *testing.T) { pressVerifierButton(t, svc, owner.ID, latestVerifierReply(t, messages, owner.ID), "@examplenews") // /help and /status in the middle of the reason step answer and keep the step. - if help := sendToVerifierBot(t, svc, messages, owner.ID, "/help"); help.Body != verifierBotHelpText { + if help := sendToVerifierBot(t, svc, messages, owner.ID, "/help"); help.Body != verifierBotHelpText() { t.Fatalf("/help mid-step = %q", help.Body) } if status := sendToVerifierBot(t, svc, messages, owner.ID, "/status"); status.Body != verifierNoRequestsText { diff --git a/internal/app/bots/verifybot.go b/internal/app/bots/verifybot.go index 26c17e95..da4438d7 100644 --- a/internal/app/bots/verifybot.go +++ b/internal/app/bots/verifybot.go @@ -114,7 +114,8 @@ const ( verifyChoiceBlockedPrefix = "no:" ) -const verifyBotStartText = `I collect applications for official ` + branding.ProductName + ` verification: the badge shown next to the name of a channel, supergroup or bot whose identity has been confirmed. +func verifyBotStartText() string { + return `I collect applications for official ` + branding.ProductName + ` verification: the badge shown next to the name of a channel, supergroup or bot whose identity has been confirmed. Before you apply, check that the subject of the application: - is a channel, supergroup or bot with a public @username; @@ -125,8 +126,10 @@ Before you apply, check that the subject of the application: This badge is never sold and never granted automatically. A person reads every application, and I message you here with the decision. Tap the button below, or send /new, to start. Send /help for the full list of commands.` +} -const verifyBotHelpText = `I collect official ` + branding.ProductName + ` verification applications. +func verifyBotHelpText() string { + return `I collect official ` + branding.ProductName + ` verification applications. /new - file a verification application /status - list your applications and their status @@ -134,6 +137,7 @@ const verifyBotHelpText = `I collect official ` + branding.ProductName + ` verif /help - show this message One application asks for: the subject, a category, a description, the official website, optional social links, links to independent press coverage, and an optional comment for the reviewers. You can send /cancel at any point, and /status any time after filing.` +} const verifyBotIdleText = `I only collect official verification applications. Send /new to file one, /status to check the ones you filed, or /help to see what I understand.` @@ -310,7 +314,7 @@ func (s *Service) handleVerify(ctx context.Context, userID int64, body string) b func (s *Service) handleVerifyCommand(ctx context.Context, userID int64, cmd string, state domain.BotChatState, found bool) botReply { if cmd == "help" { - return botReply{Text: verifyBotHelpText} + return botReply{Text: verifyBotHelpText()} } if s.verification == nil { return botReply{Text: verifyUnavailableText} @@ -328,7 +332,7 @@ func (s *Service) handleVerifyCommand(ctx context.Context, userID int64, cmd str case "cancel": return s.cancelVerifyApplication(ctx, userID, state, found) default: - return botReply{Text: verifyBotHelpText} + return botReply{Text: verifyBotHelpText()} } } @@ -458,7 +462,7 @@ func (s *Service) verifyIntro(ctx context.Context, userID int64, state domain.Bo if !s.saveVerifyState(ctx, state) { return internalReply() } - return botReply{Text: verifyBotStartText, ReplyMarkup: markup} + return botReply{Text: verifyBotStartText(), ReplyMarkup: markup} } // startVerifyApplication is /new and the Apply button. An applicant has at most diff --git a/internal/app/bots/verifybot_test.go b/internal/app/bots/verifybot_test.go index 6fc68350..fdefa5c1 100644 --- a/internal/app/bots/verifybot_test.go +++ b/internal/app/bots/verifybot_test.go @@ -679,7 +679,7 @@ func TestVerifyBotGlobalCommandsWorkMidStep(t *testing.T) { // /help in the middle of the description step answers help and keeps the step. help := sendToVerifyBot(t, svc, messages, owner.ID, "/help") - if help.Body != verifyBotHelpText { + if help.Body != verifyBotHelpText() { t.Fatalf("/help mid-step = %q", help.Body) } status := sendToVerifyBot(t, svc, messages, owner.ID, "/status") @@ -855,7 +855,7 @@ func TestVerifyBotWithoutServiceReportsUnavailable(t *testing.T) { if reply := sendToVerifyBot(t, svc, messages, owner.ID, "/new"); reply.Body != verifyUnavailableText { t.Fatalf("/new without a verification service = %q", reply.Body) } - if reply := sendToVerifyBot(t, svc, messages, owner.ID, "/help"); reply.Body != verifyBotHelpText { + if reply := sendToVerifyBot(t, svc, messages, owner.ID, "/help"); reply.Body != verifyBotHelpText() { t.Fatalf("/help without a verification service = %q", reply.Body) } } diff --git a/internal/app/channels/active_ids_cache.go b/internal/app/channels/active_ids_cache.go index 15b34f6a..308e80ac 100644 --- a/internal/app/channels/active_ids_cache.go +++ b/internal/app/channels/active_ids_cache.go @@ -2,19 +2,31 @@ package channels import ( "context" + "errors" + "fmt" "time" "telesrv/internal/app/readmodel" "telesrv/internal/domain" "telesrv/internal/readmodelcache" + "telesrv/internal/store" ) const ( defaultActiveChannelIDsReadModelTTL = 24 * time.Hour - activeChannelIDsReadModelMaxEntries = 8192 + activeChannelIDsReadModelMaxEntries = 32768 activeChannelIDsNoVersionHash = -1 + activeChannelIDsStableCutAttempts = 2 ) +var errActiveChannelIDsGenerationChanged = errors.New("active channel IDs generation changed") + +// ActiveChannelIDsReadModelMetrics records bounded shared-cache outcomes. +// User IDs and page selectors are deliberately excluded. +type ActiveChannelIDsReadModelMetrics interface { + ActiveChannelIDsCache(outcome string) +} + type activeChannelIDsCacheKey struct { userID int64 afterChannelID int64 @@ -27,13 +39,16 @@ type activeChannelIDsReadModelCache struct { cache *readmodelcache.Cache[activeChannelIDsCacheKey, []int64] } -func newActiveChannelIDsReadModelCache(ttl time.Duration) *activeChannelIDsReadModelCache { +func newActiveChannelIDsReadModelCache(maxEntries int, ttl time.Duration) *activeChannelIDsReadModelCache { + if maxEntries <= 0 { + maxEntries = activeChannelIDsReadModelMaxEntries + } if ttl <= 0 { ttl = defaultActiveChannelIDsReadModelTTL } return &activeChannelIDsReadModelCache{ cache: readmodelcache.New[activeChannelIDsCacheKey, []int64](readmodelcache.Config[activeChannelIDsCacheKey, []int64]{ - MaxEntries: activeChannelIDsReadModelMaxEntries, + MaxEntries: maxEntries, TTL: ttl, Clone: cloneInt64s, }), @@ -67,20 +82,114 @@ func (c *activeChannelIDsReadModelCache) invalidateUsers(userIDs ...int64) { } func (s *Service) cachedActiveChannelIDsForUser(ctx context.Context, userID, afterChannelID int64, limit int) ([]int64, error) { - if s.activeIDsCache == nil || s.versions == nil { - return s.channels.ListActiveChannelIDsForUser(ctx, userID, afterChannelID, limit) + if s.activeIDsShared == nil { + if s.activeIDsCache == nil || s.versions == nil { + return s.channels.ListActiveChannelIDsForUser(ctx, userID, afterChannelID, limit) + } + hash, err := s.activeChannelIDsGeneration(ctx, userID) + if err != nil { + return nil, err + } + key := activeChannelIDsCacheKey{userID: userID, afterChannelID: afterChannelID, limit: limit} + return s.activeIDsCache.getOrLoad(ctx, key, hash, func() ([]int64, error) { + return s.channels.ListActiveChannelIDsForUser(ctx, userID, afterChannelID, limit) + }) + } + if s.activeIDsCache == nil || s.versions == nil || s.activeIDsLoader == nil { + return nil, errors.New("shared active channel IDs read model is incompletely configured") + } + key := activeChannelIDsCacheKey{userID: userID, afterChannelID: afterChannelID, limit: limit} + for attempt := 0; attempt < activeChannelIDsStableCutAttempts; attempt++ { + generation, err := s.activeChannelIDsGeneration(ctx, userID) + if err != nil { + return nil, err + } + channelIDs, err := s.activeIDsCache.getOrLoad(ctx, key, generation, func() ([]int64, error) { + return s.loadSharedActiveChannelIDsPage(ctx, key, generation) + }) + if errors.Is(err, errActiveChannelIDsGenerationChanged) { + s.recordActiveChannelIDsCache("generation_retry") + continue + } + if err != nil { + return nil, err + } + currentGeneration, err := s.activeChannelIDsGeneration(ctx, userID) + if err != nil { + return nil, err + } + if currentGeneration != generation { + s.recordActiveChannelIDsCache("generation_retry") + s.activeIDsCache.invalidateUsers(userID) + continue + } + s.recordActiveChannelIDsCache("served") + return channelIDs, nil + } + return nil, errActiveChannelIDsGenerationChanged +} + +func (s *Service) activeChannelIDsGeneration(ctx context.Context, userID int64) (int64, error) { + if s == nil || s.versions == nil { + return 0, errors.New("active channel IDs read model requires durable versions") } hash, ok, err := s.versions.ReadModelHash(ctx, readmodel.ModelChannelActiveIDs, userID, domain.PeerTypeUser, userID) if err != nil { - return nil, err + return 0, err } if !ok || hash == 0 { - hash = activeChannelIDsNoVersionHash + return activeChannelIDsNoVersionHash, nil + } + return hash, nil +} + +func (s *Service) loadSharedActiveChannelIDsPage( + ctx context.Context, + key activeChannelIDsCacheKey, + generation int64, +) ([]int64, error) { + sharedKey := store.ActiveChannelIDsPageKey{ + UserID: key.userID, Generation: generation, + AfterChannelID: key.afterChannelID, Limit: key.limit, + } + channelIDs, found, err := s.activeIDsShared.GetActiveChannelIDsPage(ctx, sharedKey) + if err != nil { + s.recordActiveChannelIDsCache("read_error") + return nil, err + } + if found { + s.recordActiveChannelIDsCache("hit") + return channelIDs, nil + } + s.recordActiveChannelIDsCache("miss") + channelIDs, err = s.activeIDsLoader.ListActiveChannelIDsForUser( + ctx, key.userID, key.afterChannelID, key.limit, + ) + if err != nil { + return nil, err + } + if generation == activeChannelIDsNoVersionHash && len(channelIDs) != 0 { + return nil, fmt.Errorf("active channel IDs generation missing for non-empty owner %d", key.userID) + } + currentGeneration, err := s.activeChannelIDsGeneration(ctx, key.userID) + if err != nil { + return nil, err + } + if currentGeneration != generation { + return nil, errActiveChannelIDsGenerationChanged + } + if err := s.activeIDsShared.PutActiveChannelIDsPage(ctx, sharedKey, channelIDs); err != nil { + s.recordActiveChannelIDsCache("write_error") + return nil, err + } + s.recordActiveChannelIDsCache("fill") + return channelIDs, nil +} + +func (s *Service) recordActiveChannelIDsCache(outcome string) { + if s != nil && s.activeIDsMetrics != nil { + s.activeIDsMetrics.ActiveChannelIDsCache(outcome) } - key := activeChannelIDsCacheKey{userID: userID, afterChannelID: afterChannelID, limit: limit} - return s.activeIDsCache.getOrLoad(ctx, key, hash, func() ([]int64, error) { - return s.channels.ListActiveChannelIDsForUser(ctx, userID, afterChannelID, limit) - }) } func cloneInt64s(in []int64) []int64 { diff --git a/internal/app/channels/active_ids_shared_test.go b/internal/app/channels/active_ids_shared_test.go new file mode 100644 index 00000000..c3935bb7 --- /dev/null +++ b/internal/app/channels/active_ids_shared_test.go @@ -0,0 +1,261 @@ +package channels + +import ( + "context" + "errors" + "slices" + "sync" + "testing" + + "telesrv/internal/domain" + "telesrv/internal/store" + "telesrv/internal/store/memory" +) + +type fakeActiveChannelIDsPageCache struct { + mu sync.Mutex + values map[store.ActiveChannelIDsPageKey][]int64 + getErr error + putErr error + gets int + puts int +} + +func (f *fakeActiveChannelIDsPageCache) GetActiveChannelIDsPage( + _ context.Context, + key store.ActiveChannelIDsPageKey, +) ([]int64, bool, error) { + f.mu.Lock() + defer f.mu.Unlock() + f.gets++ + if f.getErr != nil { + return nil, false, f.getErr + } + value, found := f.values[key] + return append([]int64(nil), value...), found, nil +} + +func (f *fakeActiveChannelIDsPageCache) PutActiveChannelIDsPage( + _ context.Context, + key store.ActiveChannelIDsPageKey, + value []int64, +) error { + f.mu.Lock() + defer f.mu.Unlock() + f.puts++ + if f.putErr != nil { + return f.putErr + } + if f.values == nil { + f.values = make(map[store.ActiveChannelIDsPageKey][]int64) + } + f.values[key] = append([]int64(nil), value...) + return nil +} + +type fakeActiveChannelIDsLoader struct { + mu sync.Mutex + values []int64 + err error + calls int + onLoad func() +} + +func (f *fakeActiveChannelIDsLoader) ListActiveChannelIDsForUser( + _ context.Context, + _, _ int64, + _ int, +) ([]int64, error) { + f.mu.Lock() + defer f.mu.Unlock() + f.calls++ + if f.onLoad != nil { + f.onLoad() + } + return append([]int64(nil), f.values...), f.err +} + +type fakeActiveChannelIDsMetrics struct { + mu sync.Mutex + outcomes map[string]int +} + +type mutableReadModelVersions struct { + mu sync.Mutex + hashes map[store.ReadModelKey]int64 +} + +func (m *mutableReadModelVersions) ReadModelHash( + _ context.Context, + model string, + ownerUserID int64, + peerType domain.PeerType, + peerID int64, +) (int64, bool, error) { + key := store.ReadModelKey{Model: model, OwnerUserID: ownerUserID, PeerType: peerType, PeerID: peerID} + m.mu.Lock() + defer m.mu.Unlock() + hash := m.hashes[key] + return hash, hash != 0, nil +} + +func (m *mutableReadModelVersions) ReadModelHashes( + _ context.Context, + keys []store.ReadModelKey, +) (map[store.ReadModelKey]int64, error) { + m.mu.Lock() + defer m.mu.Unlock() + out := make(map[store.ReadModelKey]int64, len(keys)) + for _, key := range keys { + out[key] = m.hashes[key] + } + return out, nil +} + +func (m *mutableReadModelVersions) set(key store.ReadModelKey, hash int64) { + m.mu.Lock() + m.hashes[key] = hash + m.mu.Unlock() +} + +func (f *fakeActiveChannelIDsMetrics) ActiveChannelIDsCache(outcome string) { + f.mu.Lock() + defer f.mu.Unlock() + if f.outcomes == nil { + f.outcomes = make(map[string]int) + } + f.outcomes[outcome]++ +} + +func TestActiveChannelIDsSharedPageSurvivesServiceRestart(t *testing.T) { + ctx := context.Background() + const ownerID int64 = 1001 + key := store.ReadModelKey{Model: "channel_active_memberships", OwnerUserID: ownerID, PeerType: domain.PeerTypeUser, PeerID: ownerID} + versions := &fakeReadModelVersions{hashes: map[store.ReadModelKey]int64{key: 501}} + shared := &fakeActiveChannelIDsPageCache{} + firstLoader := &fakeActiveChannelIDsLoader{values: []int64{11, 12}} + firstMetrics := &fakeActiveChannelIDsMetrics{} + first := NewService(memory.NewChannelStore(), + WithReadModelVersions(versions), + WithActiveChannelIDsReadModel(shared, firstLoader, 32, 0, firstMetrics), + ) + got, err := first.ActiveChannelIDsForUser(ctx, ownerID, 0, 1000) + if err != nil || !slices.Equal(got, []int64{11, 12}) { + t.Fatalf("first page = %v err=%v", got, err) + } + if firstLoader.calls != 1 || shared.puts != 1 || firstMetrics.outcomes["miss"] != 1 || firstMetrics.outcomes["fill"] != 1 { + t.Fatalf("first load calls=%d puts=%d metrics=%v", firstLoader.calls, shared.puts, firstMetrics.outcomes) + } + + secondLoader := &fakeActiveChannelIDsLoader{err: errors.New("cold loader must not run")} + secondMetrics := &fakeActiveChannelIDsMetrics{} + second := NewService(memory.NewChannelStore(), + WithReadModelVersions(versions), + WithActiveChannelIDsReadModel(shared, secondLoader, 32, 0, secondMetrics), + ) + got, err = second.ActiveChannelIDsForUser(ctx, ownerID, 0, 1000) + if err != nil || !slices.Equal(got, []int64{11, 12}) { + t.Fatalf("restart page = %v err=%v", got, err) + } + if secondLoader.calls != 0 || secondMetrics.outcomes["hit"] != 1 || secondMetrics.outcomes["served"] != 1 { + t.Fatalf("restart loader=%d metrics=%v", secondLoader.calls, secondMetrics.outcomes) + } +} + +func TestActiveChannelIDsSharedPageFailsClosedOnRedisError(t *testing.T) { + const ownerID int64 = 1001 + key := store.ReadModelKey{Model: "channel_active_memberships", OwnerUserID: ownerID, PeerType: domain.PeerTypeUser, PeerID: ownerID} + versions := &fakeReadModelVersions{hashes: map[store.ReadModelKey]int64{key: 601}} + shared := &fakeActiveChannelIDsPageCache{getErr: errors.New("redis down")} + loader := &fakeActiveChannelIDsLoader{values: []int64{11}} + service := NewService(memory.NewChannelStore(), + WithReadModelVersions(versions), + WithActiveChannelIDsReadModel(shared, loader, 32, 0, nil), + ) + if _, err := service.ActiveChannelIDsForUser(context.Background(), ownerID, 0, 1000); err == nil { + t.Fatal("Redis error was silently bypassed") + } + if loader.calls != 0 { + t.Fatalf("cold loader calls = %d, want 0", loader.calls) + } +} + +func TestActiveChannelIDsSharedPageRetriesGenerationChange(t *testing.T) { + ctx := context.Background() + const ownerID int64 = 1001 + key := store.ReadModelKey{Model: "channel_active_memberships", OwnerUserID: ownerID, PeerType: domain.PeerTypeUser, PeerID: ownerID} + versions := &fakeReadModelVersions{hashes: map[store.ReadModelKey]int64{key: 701}} + shared := &fakeActiveChannelIDsPageCache{} + loader := &fakeActiveChannelIDsLoader{values: []int64{11}} + loader.onLoad = func() { + if loader.calls == 1 { + versions.hashes[key] = 702 + loader.values = []int64{11, 12} + } + } + metrics := &fakeActiveChannelIDsMetrics{} + service := NewService(memory.NewChannelStore(), + WithReadModelVersions(versions), + WithActiveChannelIDsReadModel(shared, loader, 32, 0, metrics), + ) + got, err := service.ActiveChannelIDsForUser(ctx, ownerID, 0, 1000) + if err != nil || !slices.Equal(got, []int64{11, 12}) { + t.Fatalf("page = %v err=%v", got, err) + } + if loader.calls != 2 || shared.puts != 1 || metrics.outcomes["generation_retry"] != 1 { + t.Fatalf("loader=%d puts=%d metrics=%v", loader.calls, shared.puts, metrics.outcomes) + } + oldKey := store.ActiveChannelIDsPageKey{UserID: ownerID, Generation: 701, AfterChannelID: 0, Limit: 1000} + if _, found := shared.values[oldKey]; found { + t.Fatal("generation-raced page was stored under old key") + } +} + +func TestActiveChannelIDsSharedMissingGenerationOnlyCachesEmpty(t *testing.T) { + shared := &fakeActiveChannelIDsPageCache{} + loader := &fakeActiveChannelIDsLoader{values: []int64{11}} + service := NewService(memory.NewChannelStore(), + WithReadModelVersions(&fakeReadModelVersions{}), + WithActiveChannelIDsReadModel(shared, loader, 32, 0, nil), + ) + if _, err := service.ActiveChannelIDsForUser(context.Background(), 1001, 0, 1000); err == nil { + t.Fatal("non-empty page without durable generation accepted") + } + if shared.puts != 0 { + t.Fatalf("shared puts = %d, want 0", shared.puts) + } +} + +func TestActiveChannelIDsLocalWriteInvalidatesCachedGenerationBeforeNotify(t *testing.T) { + ctx := context.Background() + const ownerID int64 = 1001 + versionKey := store.ReadModelKey{Model: "channel_active_memberships", OwnerUserID: ownerID, PeerType: domain.PeerTypeUser, PeerID: ownerID} + baseVersions := &mutableReadModelVersions{hashes: map[store.ReadModelKey]int64{versionKey: 801}} + cachedVersions := store.NewCachedReadModelVersionStore(baseVersions, 0, 32) + oldPageKey := store.ActiveChannelIDsPageKey{UserID: ownerID, Generation: 801, AfterChannelID: 0, Limit: 1000} + shared := &fakeActiveChannelIDsPageCache{values: map[store.ActiveChannelIDsPageKey][]int64{oldPageKey: {11}}} + loader := &fakeActiveChannelIDsLoader{values: []int64{11, 12}} + service := NewService(memory.NewChannelStore(), + WithReadModelVersions(cachedVersions), + WithActiveChannelIDsReadModel(shared, loader, 32, 0, nil), + ) + first, err := service.ActiveChannelIDsForUser(ctx, ownerID, 0, 1000) + if err != nil || !slices.Equal(first, []int64{11}) { + t.Fatalf("first = %v err=%v", first, err) + } + baseVersions.set(versionKey, 802) + // Simulate the synchronous post-commit app hook before PostgreSQL NOTIFY is + // delivered to this process. + service.invalidateActiveChannelIDs(ownerID) + second, err := service.ActiveChannelIDsForUser(ctx, ownerID, 0, 1000) + if err != nil || !slices.Equal(second, []int64{11, 12}) { + t.Fatalf("after local invalidation = %v err=%v", second, err) + } + if loader.calls != 1 { + t.Fatalf("cold loader calls = %d, want 1 for new generation", loader.calls) + } + newPageKey := store.ActiveChannelIDsPageKey{UserID: ownerID, Generation: 802, AfterChannelID: 0, Limit: 1000} + if !slices.Equal(shared.values[newPageKey], []int64{11, 12}) { + t.Fatalf("new generation page = %v", shared.values[newPageKey]) + } +} diff --git a/internal/app/channels/resolve_cache.go b/internal/app/channels/resolve_cache.go index 4ae6ae28..71740279 100644 --- a/internal/app/channels/resolve_cache.go +++ b/internal/app/channels/resolve_cache.go @@ -20,6 +20,14 @@ type channelResolveReadModelCache struct { cache *readmodelcache.Cache[channelViewCacheKey, domain.ChannelView] } +// authoritativeResolveChannelCache marks a store whose ResolveChannel path is +// already guarded by exact channel/member invalidation and reconnect flushes. +// Wrapping that path in a second version-token cache adds no freshness boundary +// and turns every process-cold access check into a read_model_versions query. +type authoritativeResolveChannelCache interface { + AuthoritativeResolveChannelCache() +} + func newChannelResolveReadModelCache(ttl time.Duration) *channelResolveReadModelCache { if ttl <= 0 { ttl = defaultChannelResolveReadModelTTL @@ -41,6 +49,9 @@ func (c *channelResolveReadModelCache) getOrLoad(ctx context.Context, key channe } func (s *Service) cachedResolveChannel(ctx context.Context, userID, channelID int64) (domain.ChannelView, error) { + if _, ok := s.channels.(authoritativeResolveChannelCache); ok { + return s.channels.ResolveChannel(ctx, userID, channelID) + } if s.resolveCache == nil || s.versions == nil { return s.channels.ResolveChannel(ctx, userID, channelID) } diff --git a/internal/app/channels/service.go b/internal/app/channels/service.go index df019b81..40815330 100644 --- a/internal/app/channels/service.go +++ b/internal/app/channels/service.go @@ -4,8 +4,10 @@ import ( "context" "errors" "strings" + "time" "unicode/utf8" + "telesrv/internal/app/readmodel" "telesrv/internal/domain" "telesrv/internal/store" ) @@ -22,6 +24,9 @@ type Service struct { mediaCountCache *mediaCountReadModelCache participantCache *participantsReadModelCache activeIDsCache *activeChannelIDsReadModelCache + activeIDsShared store.ActiveChannelIDsPageCache + activeIDsLoader store.ActiveChannelIDsPageLoader + activeIDsMetrics ActiveChannelIDsReadModelMetrics botMemberIDsCache *activeBotMemberIDsCache // reserved blocks the self-service UpdateUsername (not AdminSetUsername) // from claiming a config.ReservedUsernames entry -- see @@ -35,6 +40,15 @@ type SendPermissionChecker interface { CanSendMessages(ctx context.Context, userID int64) error } +// channelStatsStore is an optional capability kept out of the broad +// store.ChannelStore contract. It lets focused test stores stay small while +// both production backends expose the complete bounded stats read model. +type channelStatsStore interface { + GetChannelStats(ctx context.Context, req domain.ChannelStatsRequest) (domain.ChannelStats, error) + GetChannelMessageStats(ctx context.Context, req domain.ChannelMessageStatsRequest) (domain.ChannelMessageStats, error) + ListChannelMessagePublicForwards(ctx context.Context, req domain.ChannelMessagePublicForwardListRequest) (domain.ChannelMessagePublicForwardList, error) +} + // NewService creates a channel service. func NewService(channels store.ChannelStore, opts ...Option) *Service { s := &Service{ @@ -43,7 +57,7 @@ func NewService(channels store.ChannelStore, opts ...Option) *Service { resolveCache: newChannelResolveReadModelCache(defaultChannelResolveReadModelTTL), mediaCountCache: newMediaCountReadModelCache(defaultMediaCountReadModelTTL), participantCache: newParticipantsReadModelCache(defaultParticipantsReadModelTTL), - activeIDsCache: newActiveChannelIDsReadModelCache(defaultActiveChannelIDsReadModelTTL), + activeIDsCache: newActiveChannelIDsReadModelCache(0, defaultActiveChannelIDsReadModelTTL), botMemberIDsCache: newActiveBotMemberIDsCache(), } for _, opt := range opts { @@ -66,6 +80,25 @@ func WithReadModelVersions(v store.ReadModelVersionStore) Option { } } +// WithActiveChannelIDsReadModel installs the production shared readiness page +// cache and its bounded authoritative cold loader. Supplying the shared cache +// without either durable versions or a loader is a configuration error at read +// time; the service never silently falls back to per-session PostgreSQL reads. +func WithActiveChannelIDsReadModel( + shared store.ActiveChannelIDsPageCache, + loader store.ActiveChannelIDsPageLoader, + maxEntries int, + ttl time.Duration, + metrics ActiveChannelIDsReadModelMetrics, +) Option { + return func(s *Service) { + s.activeIDsShared = shared + s.activeIDsLoader = loader + s.activeIDsMetrics = metrics + s.activeIDsCache = newActiveChannelIDsReadModelCache(maxEntries, ttl) + } +} + func WithSendPermissionChecker(c SendPermissionChecker) Option { return func(s *Service) { s.sendGate = c @@ -202,6 +235,51 @@ func (s *Service) CountChannelMediaCategories(ctx context.Context, userID, chann return s.cachedChannelMediaCounts(ctx, userID, channelID) } +// GetStats returns bounded aggregates derived from durable channel facts. +func (s *Service) GetStats(ctx context.Context, userID int64, req domain.ChannelStatsRequest) (domain.ChannelStats, error) { + if s == nil || s.channels == nil || userID == 0 || req.ChannelID == 0 || !req.Period.Valid() { + return domain.ChannelStats{}, domain.ErrChannelInvalid + } + provider, ok := s.channels.(channelStatsStore) + if !ok { + return domain.ChannelStats{}, domain.ErrChannelInvalid + } + req.ViewerUserID = userID + return provider.GetChannelStats(ctx, req) +} + +// GetMessageStats returns view/reaction event buckets for one exact post. +func (s *Service) GetMessageStats(ctx context.Context, userID int64, req domain.ChannelMessageStatsRequest) (domain.ChannelMessageStats, error) { + if s == nil || s.channels == nil || userID == 0 || req.ChannelID == 0 || req.MessageID <= 0 || + req.MessageID > domain.MaxMessageBoxID || !req.Period.Valid() { + return domain.ChannelMessageStats{}, domain.ErrMessageIDInvalid + } + provider, ok := s.channels.(channelStatsStore) + if !ok { + return domain.ChannelMessageStats{}, domain.ErrChannelInvalid + } + req.ViewerUserID = userID + return provider.GetChannelMessageStats(ctx, req) +} + +// ListMessagePublicForwards returns only public destination posts with a +// validated seek cursor; private forwards never cross this boundary. +func (s *Service) ListMessagePublicForwards(ctx context.Context, userID int64, req domain.ChannelMessagePublicForwardListRequest) (domain.ChannelMessagePublicForwardList, error) { + if s == nil || s.channels == nil || userID == 0 || req.ChannelID == 0 || req.MessageID <= 0 || + req.MessageID > domain.MaxMessageBoxID || req.Limit <= 0 || req.Limit > domain.MaxChannelMessagePublicForwards { + return domain.ChannelMessagePublicForwardList{}, domain.ErrChannelInvalid + } + if _, err := domain.ParseChannelMessagePublicForwardCursor(req.Offset); err != nil { + return domain.ChannelMessagePublicForwardList{}, err + } + provider, ok := s.channels.(channelStatsStore) + if !ok { + return domain.ChannelMessagePublicForwardList{}, domain.ErrChannelInvalid + } + req.ViewerUserID = userID + return provider.ListChannelMessagePublicForwards(ctx, req) +} + // GetChannels returns channel data personalized for userID, ordered by the first occurrence in channelIDs. func (s *Service) GetChannels(ctx context.Context, userID int64, channelIDs []int64) ([]domain.ChannelView, error) { if s == nil || s.channels == nil || userID == 0 { @@ -584,7 +662,7 @@ func (s *Service) AdminSetEmojiStatus(ctx context.Context, channelID int64, stat // AdminSetPhoto force-sets a channel's avatar through the admin path (no // permission checks, no "changed photo" service message). func (s *Service) AdminSetPhoto(ctx context.Context, channelID int64, photo domain.Photo) (domain.Channel, error) { - if s == nil || s.channels == nil || channelID == 0 { + if s == nil || s.channels == nil || channelID == 0 || photo.ID == 0 { return domain.Channel{}, domain.ErrChannelInvalid } return s.channels.SetChannelPhotoAdmin(ctx, channelID, photo) @@ -1968,7 +2046,15 @@ func (s *Service) SendMonoforumMessage(ctx context.Context, req domain.SendMonof if err := s.ensureCanSend(ctx, req.SenderUserID); err != nil { return domain.SendChannelMessageResult{}, err } - return s.channels.SendMonoforumMessage(ctx, req) + result, err := s.channels.SendMonoforumMessage(ctx, req) + if err != nil { + return result, err + } + // The saved-peer owner gains (or refreshes) monoforum readiness visibility. + // Evict locally at commit return; migration 20260901000022 advances the durable token + // and NOTIFY handles every other process. + s.invalidateActiveChannelIDs(req.SavedPeer.ID) + return result, nil } // ListMonoforumHistory 拉取某订阅者在频道私信(monoforum)内的历史。 @@ -2375,7 +2461,20 @@ func activeMembershipUserIDsFromMembers(primary int64, members []domain.ChannelM } func (s *Service) invalidateActiveChannelIDs(userIDs ...int64) { - if s == nil || s.activeIDsCache == nil { + if s == nil { + return + } + if versionCache, ok := s.versions.(store.ReadModelVersionCache); ok { + for _, userID := range uniqueNonZero(userIDs) { + versionCache.InvalidateReadModel(store.ReadModelKey{ + Model: readmodel.ModelChannelActiveIDs, + OwnerUserID: userID, + PeerType: domain.PeerTypeUser, + PeerID: userID, + }) + } + } + if s.activeIDsCache == nil { return } s.activeIDsCache.invalidateUsers(userIDs...) diff --git a/internal/app/channels/service_test.go b/internal/app/channels/service_test.go index f36721c5..67529051 100644 --- a/internal/app/channels/service_test.go +++ b/internal/app/channels/service_test.go @@ -155,6 +155,12 @@ type countingChannelStore struct { resolveStartOnce sync.Once } +type authoritativeCountingChannelStore struct { + *countingChannelStore +} + +func (*authoritativeCountingChannelStore) AuthoritativeResolveChannelCache() {} + func (s *countingChannelStore) GetChannel(ctx context.Context, viewerUserID, channelID int64) (domain.ChannelView, error) { s.getChannelCalls++ return s.ChannelStore.GetChannel(ctx, viewerUserID, channelID) @@ -198,6 +204,20 @@ type fakeReadModelVersions struct { hashes map[store.ReadModelKey]int64 } +type countingReadModelVersions struct { + calls int +} + +func (v *countingReadModelVersions) ReadModelHash(context.Context, string, int64, domain.PeerType, int64) (int64, bool, error) { + v.calls++ + return 0, false, nil +} + +func (v *countingReadModelVersions) ReadModelHashes(context.Context, []store.ReadModelKey) (map[store.ReadModelKey]int64, error) { + v.calls++ + return map[store.ReadModelKey]int64{}, nil +} + func (f *fakeReadModelVersions) ReadModelHash(_ context.Context, model string, ownerUserID int64, peerType domain.PeerType, peerID int64) (int64, bool, error) { hash := f.hashes[store.ReadModelKey{Model: model, OwnerUserID: ownerUserID, PeerType: peerType, PeerID: peerID}] return hash, hash != 0, nil @@ -331,6 +351,39 @@ func TestResolveChannelCachesAccessViewByCompositeReadModelHash(t *testing.T) { } } +func TestResolveChannelDelegatesToAuthoritativeStoreCacheWithoutVersionRead(t *testing.T) { + ctx := context.Background() + const ownerID int64 = 1001 + base := &countingChannelStore{ChannelStore: memory.NewChannelStore()} + created, err := base.CreateChannel(ctx, domain.CreateChannelRequest{ + CreatorUserID: ownerID, Title: "Store-owned Resolve", Megagroup: true, Date: 1700004105, + }) + if err != nil { + t.Fatalf("CreateChannel: %v", err) + } + versions := &countingReadModelVersions{} + service := NewService( + &authoritativeCountingChannelStore{countingChannelStore: base}, + WithReadModelVersions(versions), + ) + + for range 2 { + view, resolveErr := service.ResolveChannel(ctx, ownerID, created.Channel.ID) + if resolveErr != nil { + t.Fatalf("ResolveChannel: %v", resolveErr) + } + if view.Channel.ID != created.Channel.ID || view.Self.UserID != ownerID { + t.Fatalf("resolve view = %+v", view) + } + } + if base.resolveChannelCalls != 2 { + t.Fatalf("authoritative store calls = %d, want 2", base.resolveChannelCalls) + } + if versions.calls != 0 { + t.Fatalf("read-model version calls = %d, want 0", versions.calls) + } +} + func TestActiveChannelIDsForUserCachesPageByReadModelHash(t *testing.T) { ctx := context.Background() const ownerID int64 = 1001 @@ -872,8 +925,8 @@ func TestCreateChatCreatesMegagroupWithChannelPts(t *testing.T) { if !created.Channel.Megagroup || created.Channel.Broadcast { t.Fatalf("channel flags = megagroup:%v broadcast:%v, want megagroup only", created.Channel.Megagroup, created.Channel.Broadcast) } - if created.Channel.Pts != 1 || created.Message.ID != 1 || created.Event.PtsCount != 1 { - t.Fatalf("created pts/message/event = %+v/%+v/%+v, want initial pts=1 message id=1", created.Channel, created.Message, created.Event) + if created.Channel.Pts != domain.FirstChannelEventPts || created.Message.ID != 1 || created.Event.Pts != domain.FirstChannelEventPts || created.Event.PtsCount != 1 { + t.Fatalf("created pts/message/event = %+v/%+v/%+v, want initial event pts=2 message id=1", created.Channel, created.Message, created.Event) } if created.Message.Action == nil || created.Message.Action.Type != domain.ChannelActionCreate { t.Fatalf("create service action = %+v, want channel create", created.Message.Action) @@ -889,8 +942,8 @@ func TestCreateChatCreatesMegagroupWithChannelPts(t *testing.T) { if err != nil { t.Fatalf("SendMessage: %v", err) } - if sent.Message.ID != 2 || sent.Message.Pts != 2 || sent.Event.Pts != 2 || sent.Event.PtsCount != 1 { - t.Fatalf("sent = %+v event=%+v, want message id/pts=2", sent.Message, sent.Event) + if sent.Message.ID != 2 || sent.Message.Pts != 3 || sent.Event.Pts != 3 || sent.Event.PtsCount != 1 { + t.Fatalf("sent = %+v event=%+v, want message id=2 pts=3", sent.Message, sent.Event) } if sent.Message.ViaBotID != 1003 || sent.Event.Message.ViaBotID != 1003 { t.Fatalf("sent via_bot_id = msg %d event %d, want 1003", sent.Message.ViaBotID, sent.Event.Message.ViaBotID) @@ -924,12 +977,12 @@ func TestCreateChatCreatesMegagroupWithChannelPts(t *testing.T) { t.Fatalf("history via_bot_id = %d, want 1003", history.Messages[0].ViaBotID) } - diff, err := service.GetDifference(ctx, 1002, domain.ChannelDifferenceRequest{ChannelID: created.Channel.ID, Pts: 1, Limit: 10}) + diff, err := service.GetDifference(ctx, 1002, domain.ChannelDifferenceRequest{ChannelID: created.Channel.ID, Pts: created.Event.Pts, Limit: 10}) if err != nil { t.Fatalf("GetDifference: %v", err) } - if !diff.Final || diff.Pts != 2 || len(diff.NewMessages) != 1 || diff.NewMessages[0].Body != "hello" { - t.Fatalf("diff = %+v, want single new channel message at pts=2", diff) + if !diff.Final || diff.Pts != 3 || len(diff.NewMessages) != 1 || diff.NewMessages[0].Body != "hello" { + t.Fatalf("diff = %+v, want single new channel message at pts=3", diff) } if diff.NewMessages[0].ViaBotID != 1003 { t.Fatalf("diff via_bot_id = %d, want 1003", diff.NewMessages[0].ViaBotID) @@ -2116,8 +2169,8 @@ func TestChannelEditDeleteAndLocalClearUseChannelPts(t *testing.T) { if err != nil { t.Fatalf("EditMessage: %v", err) } - if edited.Event.Type != domain.ChannelUpdateEditMessage || edited.Event.Pts != 4 || edited.Event.PtsCount != 1 { - t.Fatalf("edit event = %+v, want channel edit pts=4 count=1", edited.Event) + if edited.Event.Type != domain.ChannelUpdateEditMessage || edited.Event.Pts != 5 || edited.Event.PtsCount != 1 { + t.Fatalf("edit event = %+v, want channel edit pts=5 count=1", edited.Event) } duplicate, err := service.SendMessage(ctx, 1002, domain.SendChannelMessageRequest{ChannelID: created.Channel.ID, RandomID: 2, Message: "two", Date: 13}) if err != nil { @@ -2135,14 +2188,14 @@ func TestChannelEditDeleteAndLocalClearUseChannelPts(t *testing.T) { if err != nil { t.Fatalf("DeleteMessages: %v", err) } - if deleted.Event.Type != domain.ChannelUpdateDeleteMessages || deleted.Event.Pts != 6 || deleted.Event.PtsCount != 2 { + if deleted.Event.Type != domain.ChannelUpdateDeleteMessages || deleted.Event.Pts != 7 || deleted.Event.PtsCount != 2 { t.Fatalf("delete event = %+v, want pts advanced by deleted id count", deleted.Event) } - diff, err := service.GetDifference(ctx, 1002, domain.ChannelDifferenceRequest{ChannelID: created.Channel.ID, Pts: 3, Limit: 10}) + diff, err := service.GetDifference(ctx, 1002, domain.ChannelDifferenceRequest{ChannelID: created.Channel.ID, Pts: second.Event.Pts, Limit: 10}) if err != nil { t.Fatalf("GetDifference: %v", err) } - if len(diff.OtherUpdates) != 2 || diff.OtherUpdates[1].Type != domain.ChannelUpdateDeleteMessages || diff.Pts != 6 { + if len(diff.OtherUpdates) != 2 || diff.OtherUpdates[1].Type != domain.ChannelUpdateDeleteMessages || diff.Pts != 7 { t.Fatalf("diff after edit/delete = %+v, want edit then delete through channel pts", diff) } diff --git a/internal/app/contacts/service.go b/internal/app/contacts/service.go index 4074491a..acb931a6 100644 --- a/internal/app/contacts/service.go +++ b/internal/app/contacts/service.go @@ -133,10 +133,17 @@ func (s *Service) AddContact(ctx context.Context, userID int64, input domain.Con if input.FirstName == "" && input.LastName == "" { return domain.Contact{}, ErrContactNameEmpty } - // Android 的 contacts.addContact 会提交带 "+" 前缀的号码（TDesktop 传纯数字或空）， - // 归一成纯数字。空串表示客户端只按 user id 添加联系人，必须原样保留； + // Android 的 contacts.addContact 会提交带 "+" 前缀的号码（TDesktop 传纯数字或空）。 + // 可解析的完整号码写成与账号相同的 E.164 identity；无法解析的本地名片号码只 + // 保留展示 digits，绝不能拿它做账号选择。空串表示客户端只按 user id 添加联系人，必须原样保留； // TL 明确允许省略号码，服务端不得从 target 全局资料反向补出隐私号码。 - input.Phone = digitsOnly(input.Phone) + if input.Phone != "" { + if canonical := domain.NormalizePhone(input.Phone); canonical != "" { + input.Phone = canonical + } else { + input.Phone = digitsOnly(input.Phone) + } + } if s.users != nil { _, found, err := s.users.ByID(ctx, input.ContactUserID) if err != nil { @@ -222,7 +229,7 @@ func (s *Service) ImportContacts(ctx context.Context, userID int64, inputs []dom phones := make([]string, 0, len(inputs)) seenPhones := make(map[string]struct{}, len(inputs)) for _, input := range inputs { - phone := normalizePhone(input.Phone) + phone := domain.NormalizePhone(input.Phone) if phone == "" { continue } @@ -354,7 +361,7 @@ func (s *Service) Search(ctx context.Context, userID int64, query string, limit } phoneQuery := "" if isPhoneSearchQuery(query) { - phoneQuery = normalizePhone(query) + phoneQuery = normalizePhoneQuery(query) } res, err := s.users.Search(ctx, userID, query, phoneQuery, limit) if err != nil { @@ -686,7 +693,7 @@ func digitsOnly(phone string) string { return b.String() } -func normalizePhone(phone string) string { +func normalizePhoneQuery(phone string) string { if !utf8.ValidString(phone) { return "" } diff --git a/internal/app/contacts/service_test.go b/internal/app/contacts/service_test.go index ed6af66d..1dee0799 100644 --- a/internal/app/contacts/service_test.go +++ b/internal/app/contacts/service_test.go @@ -169,6 +169,36 @@ func TestImportContactsBatchesPhonesAndDedupesUpserts(t *testing.T) { } } +func TestImportContactsResolvesNationalTrunkVariantToCanonicalUser(t *testing.T) { + ctx := context.Background() + users := memory.NewUserStore() + contactsStore := memory.NewContactStore() + owner, err := users.Create(ctx, domain.User{Phone: "15551234567", FirstName: "Owner"}) + if err != nil { + t.Fatalf("create owner: %v", err) + } + target, err := users.Create(ctx, domain.User{Phone: "989981679461", FirstName: "Iran"}) + if err != nil { + t.Fatalf("create target: %v", err) + } + svc := NewService(contactsStore, users) + + res, err := svc.ImportContacts(ctx, owner.ID, []domain.ContactInput{{ + ClientID: 98, + Phone: "+98 0998 167 9461", + FirstName: "Saved", + }}) + if err != nil { + t.Fatalf("ImportContacts: %v", err) + } + if len(res.Imported) != 1 || res.Imported[0].UserID != target.ID { + t.Fatalf("imported = %+v, want target %d", res.Imported, target.ID) + } + if len(res.Contacts) != 1 || res.Contacts[0].Phone != "989981679461" { + t.Fatalf("contacts = %+v, want one canonical contact", res.Contacts) + } +} + func TestAddContactWithoutPhoneDoesNotBackfillTargetPhone(t *testing.T) { ctx := context.Background() users := memory.NewUserStore() diff --git a/internal/app/dialogs/draft_read_model_cache.go b/internal/app/dialogs/draft_read_model_cache.go new file mode 100644 index 00000000..2350ba95 --- /dev/null +++ b/internal/app/dialogs/draft_read_model_cache.go @@ -0,0 +1,153 @@ +package dialogs + +import ( + "context" + "time" + + "telesrv/internal/domain" + "telesrv/internal/readmodelcache" +) + +const ( + defaultDialogDraftReadModelTTL = 24 * time.Hour + defaultDialogDraftReadModelMaxEntries = 1000000 + defaultDialogDraftReadModelMaxBytes int64 = 256 << 20 +) + +type dialogDraftCacheEntry struct { + draft domain.DialogDraft + found bool +} + +type dialogDraftReadModelCache struct { + cache *readmodelcache.Cache[dialogPeerCacheKey, dialogDraftCacheEntry] +} + +func newDialogDraftReadModelCache(maxEntries int, maxBytes int64, ttl time.Duration) *dialogDraftReadModelCache { + if ttl <= 0 { + ttl = defaultDialogDraftReadModelTTL + } + return &dialogDraftReadModelCache{cache: readmodelcache.New[dialogPeerCacheKey, dialogDraftCacheEntry](readmodelcache.Config[dialogPeerCacheKey, dialogDraftCacheEntry]{ + MaxEntries: maxEntries, + MaxWeight: maxBytes, + Weight: dialogDraftEntryApproxBytes, + TTL: ttl, + Clone: cloneDialogDraftCacheEntry, + })} +} + +func (s *Service) dialogDraftsReadModel(ctx context.Context, userID int64, peers []domain.Peer) (map[domain.Peer]dialogDraftCacheEntry, error) { + out := make(map[domain.Peer]dialogDraftCacheEntry, len(peers)) + if s == nil || s.dialogs == nil || userID == 0 || len(peers) == 0 { + return out, nil + } + unique := uniqueDialogPeers(peers) + if len(unique) == 0 { + return out, nil + } + keys := make([]dialogPeerCacheKey, 0, len(unique)) + for _, peer := range unique { + keys = append(keys, dialogPeerCacheKey{userID: userID, peer: peer}) + } + hashes := map[domain.Peer]int64{} + if s.versions != nil { + var err error + hashes, err = s.dialogHashes(ctx, userID, unique) + if err != nil { + return nil, err + } + } + var cache *readmodelcache.Cache[dialogPeerCacheKey, dialogDraftCacheEntry] + if s.draftCache != nil { + cache = s.draftCache.cache + } + loaded, err := cache.GetOrLoadBatch(ctx, keys, + func(key dialogPeerCacheKey) (int64, bool) { + hash := hashes[key.peer] + return hash, s.versions != nil && hash != 0 + }, + func(ctx context.Context, missing []dialogPeerCacheKey) (map[dialogPeerCacheKey]dialogDraftCacheEntry, error) { + requested := make([]domain.Peer, 0, len(missing)) + for _, key := range missing { + requested = append(requested, key.peer) + } + drafts, err := s.dialogs.ListDraftsByPeers(ctx, userID, requested) + if err != nil { + return nil, err + } + entries := make(map[dialogPeerCacheKey]dialogDraftCacheEntry, len(missing)) + for _, key := range missing { + entries[key] = dialogDraftCacheEntry{} + } + for _, draft := range drafts { + if draft.TopMessageID != 0 { + continue + } + key := dialogPeerCacheKey{userID: userID, peer: draft.Peer} + if _, ok := entries[key]; ok { + entries[key] = dialogDraftCacheEntry{draft: cloneDraft(draft), found: true} + } + } + return entries, nil + }) + if err != nil { + return nil, err + } + for key, entry := range loaded { + out[key.peer] = entry + } + return out, nil +} + +func uniqueDialogPeers(peers []domain.Peer) []domain.Peer { + out := make([]domain.Peer, 0, len(peers)) + seen := make(map[domain.Peer]struct{}, len(peers)) + for _, peer := range peers { + if peer.ID == 0 || (peer.Type != domain.PeerTypeUser && peer.Type != domain.PeerTypeChannel) { + continue + } + if _, ok := seen[peer]; ok { + continue + } + seen[peer] = struct{}{} + out = append(out, peer) + } + return out +} + +func (c *dialogDraftReadModelCache) invalidate(key dialogPeerCacheKey) { + if c != nil { + c.cache.Invalidate(key) + } +} + +func (c *dialogDraftReadModelCache) flush() { + if c != nil { + c.cache.Flush() + } +} + +func cloneDialogDraftCacheEntry(entry dialogDraftCacheEntry) dialogDraftCacheEntry { + if entry.found { + entry.draft = cloneDraft(entry.draft) + } + return entry +} + +func dialogDraftEntryApproxBytes(entry dialogDraftCacheEntry) int64 { + if !entry.found { + return 64 + } + draft := entry.draft + weight := int64(256 + len(draft.Message) + len(draft.Entities)*64) + if draft.ReplyTo != nil { + weight += int64(128 + len(draft.ReplyTo.QuoteText) + len(draft.ReplyTo.QuoteEntities)*64) + } + if draft.WebPage != nil { + weight += int64(64 + len(draft.WebPage.URL)) + } + if draft.RichMessage != nil { + weight += int64(len(draft.RichMessage.Blocks) + len(draft.RichMessage.BotAPIProjection) + len(draft.RichMessage.Photos)*256 + len(draft.RichMessage.Documents)*256) + } + return weight +} diff --git a/internal/app/dialogs/list_snapshot_cache.go b/internal/app/dialogs/list_snapshot_cache.go new file mode 100644 index 00000000..8bfc79ba --- /dev/null +++ b/internal/app/dialogs/list_snapshot_cache.go @@ -0,0 +1,442 @@ +package dialogs + +import ( + "context" + "encoding/binary" + "hash/fnv" + "sync" + "time" + + "telesrv/internal/app/readmodel" + "telesrv/internal/domain" + "telesrv/internal/readmodelcache" +) + +const ( + dialogListSnapshotTTL = 5 * time.Minute + dialogListSnapshotMaxEntries = 10000 + dialogListSnapshotMaxHeaders = 1000000 + dialogListSnapshotLoadLimit = 10000 +) + +type dialogListSnapshotKey struct { + userID int64 +} + +type dialogListSnapshot struct { + dialogs []domain.Dialog + messages []domain.Message + users []domain.User + hash int64 + state domain.UpdateState + archive *domain.DialogArchiveSummary + channelIDs []int64 + ownerHash int64 + dependencyHash int64 +} + +type dialogListSnapshotCache struct { + cache *readmodelcache.Cache[dialogListSnapshotKey, *dialogListSnapshot] + + indexMu sync.Mutex + channelKeys map[int64]map[dialogListSnapshotKey]struct{} + keyChannels map[dialogListSnapshotKey][]int64 +} + +func newDialogListSnapshotCache(maxEntries int, maxHeaders int64, ttl time.Duration) *dialogListSnapshotCache { + if maxEntries <= 0 { + maxEntries = dialogListSnapshotMaxEntries + } + if maxHeaders <= 0 { + maxHeaders = dialogListSnapshotMaxHeaders + } + if ttl <= 0 { + ttl = dialogListSnapshotTTL + } + c := &dialogListSnapshotCache{ + channelKeys: make(map[int64]map[dialogListSnapshotKey]struct{}), + keyChannels: make(map[dialogListSnapshotKey][]int64), + } + c.cache = readmodelcache.New[dialogListSnapshotKey, *dialogListSnapshot](readmodelcache.Config[dialogListSnapshotKey, *dialogListSnapshot]{ + MaxEntries: maxEntries, + MaxWeight: maxHeaders, + Weight: func(snap *dialogListSnapshot) int64 { + if snap == nil { + return 1 + } + // The historical knob is expressed in header-equivalent units. A + // materialized message/channel is wider than an ordering header, so + // charge conservative multiples and keep the old global bound useful. + memberProjections := 0 + for _, dialog := range snap.dialogs { + if dialog.ChannelMember != nil { + memberProjections++ + } + } + weight := len(snap.dialogs) + memberProjections*2 + len(snap.messages)*4 + len(snap.users)*2 + if weight < 1 { + return 1 + } + return int64(weight) + }, + TTL: ttl, + OnStore: c.indexSnapshot, + OnRemove: c.unindexSnapshot, + }) + return c +} + +func dialogSnapshotKey(userID int64, filter domain.DialogFilter) (dialogListSnapshotKey, bool) { + if userID == 0 || filter.Folder != nil { + return dialogListSnapshotKey{}, false + } + if filter.HasFolderID { + if filter.FolderID != domain.DialogMainFolderID && filter.FolderID != domain.DialogArchiveFolderID { + return dialogListSnapshotKey{}, false + } + } + return dialogListSnapshotKey{userID: userID}, true +} + +func (c *dialogListSnapshotCache) getOrLoad(ctx context.Context, key dialogListSnapshotKey, load func() (*dialogListSnapshot, error)) (*dialogListSnapshot, error) { + if c == nil || c.cache == nil { + return load() + } + return c.cache.GetOrLoad(ctx, key, load) +} + +func (c *dialogListSnapshotCache) getOrLoadVersioned( + ctx context.Context, + key dialogListSnapshotKey, + ownerHash int64, + load func() (*dialogListSnapshot, error), +) (*dialogListSnapshot, error) { + if c == nil || c.cache == nil { + return load() + } + return c.cache.GetOrLoadVersioned(ctx, key, ownerHash, load) +} + +func (c *dialogListSnapshotCache) invalidateOwner(userID int64) { + if c == nil || c.cache == nil || userID == 0 { + return + } + c.cache.InvalidateWhere(func(key dialogListSnapshotKey) bool { return key.userID == userID }) +} + +func (c *dialogListSnapshotCache) invalidateChannel(channelID int64) { + if c == nil || c.cache == nil || channelID == 0 { + return + } + c.indexMu.Lock() + indexed := c.channelKeys[channelID] + keys := make([]dialogListSnapshotKey, 0, len(indexed)) + for key := range indexed { + keys = append(keys, key) + } + c.indexMu.Unlock() + c.cache.Invalidate(keys...) +} + +func (c *dialogListSnapshotCache) flush() { + if c != nil && c.cache != nil { + c.cache.Flush() + c.indexMu.Lock() + c.channelKeys = make(map[int64]map[dialogListSnapshotKey]struct{}) + c.keyChannels = make(map[dialogListSnapshotKey][]int64) + c.indexMu.Unlock() + } +} + +func (c *dialogListSnapshotCache) indexSnapshot(key dialogListSnapshotKey, snap *dialogListSnapshot) { + if c == nil { + return + } + c.indexMu.Lock() + defer c.indexMu.Unlock() + c.unindexSnapshotLocked(key) + if snap == nil || len(snap.channelIDs) == 0 { + return + } + ids := append([]int64(nil), snap.channelIDs...) + c.keyChannels[key] = ids + for _, channelID := range ids { + keys := c.channelKeys[channelID] + if keys == nil { + keys = make(map[dialogListSnapshotKey]struct{}) + c.channelKeys[channelID] = keys + } + keys[key] = struct{}{} + } +} + +func (c *dialogListSnapshotCache) unindexSnapshot(key dialogListSnapshotKey, _ *dialogListSnapshot) { + if c == nil { + return + } + c.indexMu.Lock() + c.unindexSnapshotLocked(key) + c.indexMu.Unlock() +} + +func (c *dialogListSnapshotCache) unindexSnapshotLocked(key dialogListSnapshotKey) { + for _, channelID := range c.keyChannels[key] { + keys := c.channelKeys[channelID] + delete(keys, key) + if len(keys) == 0 { + delete(c.channelKeys, channelID) + } + } + delete(c.keyChannels, key) +} + +func newDialogListSnapshot(list domain.DialogList) *dialogListSnapshot { + channelIDs := make([]int64, 0, len(list.Dialogs)) + seen := make(map[int64]struct{}, len(list.Dialogs)) + for _, dialog := range list.Dialogs { + if dialog.Peer.Type != domain.PeerTypeChannel || dialog.Peer.ID == 0 { + continue + } + if _, ok := seen[dialog.Peer.ID]; ok { + continue + } + seen[dialog.Peer.ID] = struct{}{} + channelIDs = append(channelIDs, dialog.Peer.ID) + } + archive := cloneDialogArchiveSummary(list.ArchiveSummary) + structuralHash := dialogOwnerSnapshotStructuralHash(list.Dialogs, list.Hash) + return &dialogListSnapshot{ + dialogs: cloneDialogSlice(list.Dialogs), + messages: cloneDialogMessages(list.Messages), + users: cloneDialogUsers(list.Users), + hash: dialogHashWithDrafts(structuralHash, list.Dialogs), + state: list.State, + archive: archive, + channelIDs: channelIDs, + } +} + +func dialogListSnapshotPageHeaders(snap *dialogListSnapshot, filter domain.DialogFilter) domain.DialogList { + if snap == nil { + return domain.DialogList{} + } + dialogs := dialogListSnapshotVariant(snap.dialogs, filter) + start := dialogSnapshotPageStart(dialogs, filter) + limit := filter.Limit + if limit <= 0 || limit > 100 { + limit = 100 + } + end := start + limit + if end > len(dialogs) { + end = len(dialogs) + } + if start > end { + start = end + } + hash := readmodel.MixHashes(snap.hash, dialogSnapshotVariantIdentity(filter)) + if snap.ownerHash != 0 && snap.dependencyHash != 0 { + hash = readmodel.MixHashes(hash, snap.ownerHash, snap.dependencyHash) + } + out := domain.DialogList{Count: len(dialogs), Hash: hash, State: snap.state} + out.Dialogs = cloneDialogSlice(dialogs[start:end]) + payloadPeers := make([]domain.Peer, 0, len(out.Dialogs)+1) + for _, dialog := range out.Dialogs { + payloadPeers = append(payloadPeers, dialog.Peer) + } + if dialogSnapshotIncludesArchiveSummary(filter) && snap.archive != nil { + if !filter.PinnedOnly || snap.archive.Pinned { + summary := *snap.archive + out.ArchiveSummary = &summary + if summary.TopPeer.ID != 0 { + payloadPeers = append(payloadPeers, summary.TopPeer) + } + } + } + appendDialogSnapshotPayload(snap, payloadPeers, &out) + return out +} + +func appendDialogSnapshotPayload(snap *dialogListSnapshot, peers []domain.Peer, out *domain.DialogList) { + if snap == nil || out == nil || len(peers) == 0 { + return + } + keep := make(map[domain.Peer]struct{}, len(peers)) + for _, peer := range peers { + if peer.Type != "" && peer.ID != 0 { + keep[peer] = struct{}{} + } + } + for _, msg := range snap.messages { + if _, ok := keep[msg.Peer]; ok { + out.Messages = append(out.Messages, cloneMessageForDialogCache(msg)) + } + } + userIDs := make(map[int64]struct{}, len(keep)) + for peer := range keep { + switch peer.Type { + case domain.PeerTypeUser: + userIDs[peer.ID] = struct{}{} + } + } + for _, user := range snap.users { + if _, ok := userIDs[user.ID]; ok { + out.Users = append(out.Users, cloneDialogUser(user)) + } + } +} + +func dialogOwnerSnapshotStructuralHash(dialogs []domain.Dialog, provided int64) int64 { + if provided != 0 { + return provided + } + h := fnv.New64a() + var buf [96]byte + for _, dialog := range dialogs { + clear(buf[:]) + binary.LittleEndian.PutUint64(buf[:8], uint64(dialog.Peer.ID)) + binary.LittleEndian.PutUint32(buf[8:12], uint32(dialog.FolderID)) + binary.LittleEndian.PutUint32(buf[12:16], uint32(dialog.TopMessage)) + binary.LittleEndian.PutUint32(buf[16:20], uint32(dialog.TopMessageDate)) + binary.LittleEndian.PutUint32(buf[20:24], uint32(dialog.ReadInboxMaxID)) + binary.LittleEndian.PutUint32(buf[24:28], uint32(dialog.ReadOutboxMaxID)) + binary.LittleEndian.PutUint32(buf[28:32], uint32(dialog.UnreadCount)) + binary.LittleEndian.PutUint32(buf[32:36], uint32(dialog.UnreadMentions)) + binary.LittleEndian.PutUint32(buf[36:40], uint32(dialog.UnreadReactions)) + binary.LittleEndian.PutUint32(buf[40:44], uint32(dialog.PinnedOrder)) + if dialog.Pinned { + buf[44] = 1 + } else { + buf[44] = 0 + } + if dialog.UnreadMark { + buf[45] = 1 + } else { + buf[45] = 0 + } + if dialog.PeerSettingsBarHidden { + buf[46] = 1 + } else { + buf[46] = 0 + } + buf[47] = byte(len(dialog.Peer.Type)) + binary.LittleEndian.PutUint32(buf[48:52], uint32(dialog.HistoryClearAnchorID)) + binary.LittleEndian.PutUint32(buf[52:56], uint32(dialog.HistoryClearAnchorDate)) + binary.LittleEndian.PutUint32(buf[56:60], uint32(dialog.TTLPeriod)) + binary.LittleEndian.PutUint32(buf[60:64], uint32(dialog.Pts)) + if dialog.ChannelLeft { + buf[64] = 1 + } + if dialog.HasScheduled { + buf[65] = 1 + } + if dialog.ViewForumAsMessages { + buf[66] = 1 + } + if dialog.TopMessageMentioned { + buf[67] = 1 + } + if dialog.TopMessageMediaUnread { + buf[68] = 1 + } + if dialog.TopMessageUnreadProjected { + buf[69] = 1 + } + if dialog.DefaultSendAs != nil { + binary.LittleEndian.PutUint64(buf[72:80], uint64(dialog.DefaultSendAs.ID)) + buf[80] = byte(len(dialog.DefaultSendAs.Type)) + } + _, _ = h.Write(buf[:]) + _, _ = h.Write([]byte(dialog.Peer.Type)) + _, _ = h.Write([]byte(dialog.ThemeEmoticon)) + if dialog.DefaultSendAs != nil { + _, _ = h.Write([]byte(dialog.DefaultSendAs.Type)) + } + } + sum := int64(h.Sum64() & 0x7fffffffffffffff) + if sum == 0 { + return 1 + } + return sum +} + +func dialogListSnapshotVariant(dialogs []domain.Dialog, filter domain.DialogFilter) []domain.Dialog { + folderID := domain.DialogMainFolderID + if filter.HasFolderID { + folderID = filter.FolderID + } + out := make([]domain.Dialog, 0, len(dialogs)) + for _, dialog := range dialogs { + if dialog.FolderID != folderID || filter.PinnedOnly && !dialog.Pinned || filter.ExcludePinned && dialog.Pinned { + continue + } + out = append(out, dialog) + } + return out +} + +func dialogSnapshotVariantIdentity(filter domain.DialogFilter) int64 { + folderID := domain.DialogMainFolderID + if filter.HasFolderID { + folderID = filter.FolderID + } + identity := int64(folderID + 1) + if filter.PinnedOnly { + identity |= 1 << 8 + } + if filter.ExcludePinned { + identity |= 1 << 9 + } + return identity +} + +func dialogSnapshotIncludesArchiveSummary(filter domain.DialogFilter) bool { + if filter.HasFolderID && filter.FolderID != domain.DialogMainFolderID { + return false + } + if filter.ExcludePinned { + return false + } + return filter.OffsetID == 0 && filter.OffsetDate == 0 && !filter.HasOffsetPeer +} + +func dialogSnapshotPageStart(dialogs []domain.Dialog, filter domain.DialogFilter) int { + if filter.OffsetID == 0 && filter.OffsetDate == 0 && !filter.HasOffsetPeer { + return 0 + } + if filter.HasOffsetPeer { + for i, dialog := range dialogs { + if dialog.Peer == filter.OffsetPeer && + (filter.OffsetID == 0 || dialog.TopMessage == filter.OffsetID) && + (filter.OffsetDate == 0 || dialog.TopMessageDate == filter.OffsetDate) { + return i + 1 + } + } + } + for i, dialog := range dialogs { + if dialogAfterSnapshotOffset(dialog, filter) { + return i + } + } + return len(dialogs) +} + +func dialogAfterSnapshotOffset(dialog domain.Dialog, filter domain.DialogFilter) bool { + if filter.OffsetDate > 0 { + if dialog.TopMessageDate != filter.OffsetDate { + return dialog.TopMessageDate < filter.OffsetDate + } + if filter.OffsetID <= 0 { + return false + } + } + if filter.OffsetID > 0 { + if dialog.TopMessage != filter.OffsetID { + return dialog.TopMessage < filter.OffsetID + } + if filter.HasOffsetPeer { + return dialog.Peer.ID < filter.OffsetPeer.ID + } + return false + } + return filter.HasOffsetPeer && dialog.Peer != filter.OffsetPeer +} diff --git a/internal/app/dialogs/list_snapshot_cache_test.go b/internal/app/dialogs/list_snapshot_cache_test.go new file mode 100644 index 00000000..e7627d4d --- /dev/null +++ b/internal/app/dialogs/list_snapshot_cache_test.go @@ -0,0 +1,43 @@ +package dialogs + +import ( + "testing" + + "telesrv/internal/domain" +) + +func TestDialogOwnerSnapshotStructuralHashCoversMaterializedOwnerFacts(t *testing.T) { + base := domain.Dialog{ + Peer: domain.Peer{Type: domain.PeerTypeChannel, ID: 10}, + TopMessage: 20, + TopMessageDate: 30, + Pts: 40, + HistoryClearAnchorID: 50, + HistoryClearAnchorDate: 60, + TopMessageUnreadProjected: true, + DefaultSendAs: &domain.Peer{Type: domain.PeerTypeChannel, ID: 70}, + } + wantDifferent := []domain.Dialog{ + func() domain.Dialog { out := cloneDialog(base); out.Pts++; return out }(), + func() domain.Dialog { out := cloneDialog(base); out.HistoryClearAnchorID++; return out }(), + func() domain.Dialog { out := cloneDialog(base); out.TopMessageUnreadProjected = false; return out }(), + func() domain.Dialog { out := cloneDialog(base); out.DefaultSendAs.ID++; return out }(), + } + baseHash := dialogOwnerSnapshotStructuralHash([]domain.Dialog{base}, 0) + for index, changed := range wantDifferent { + if got := dialogOwnerSnapshotStructuralHash([]domain.Dialog{changed}, 0); got == baseHash { + t.Fatalf("materialized owner fact case %d did not change structural hash", index) + } + } +} + +func TestDialogListSnapshotHashCoversMaterializedDraft(t *testing.T) { + peer := domain.Peer{Type: domain.PeerTypeUser, ID: 10} + without := newDialogListSnapshot(domain.DialogList{Dialogs: []domain.Dialog{{Peer: peer}}}) + with := newDialogListSnapshot(domain.DialogList{Dialogs: []domain.Dialog{{ + Peer: peer, Draft: &domain.DialogDraft{Peer: peer, Date: 20, Message: "draft"}, + }}}) + if without.hash == with.hash { + t.Fatalf("draft did not change snapshot hash: %d", without.hash) + } +} diff --git a/internal/app/dialogs/read_model_cache.go b/internal/app/dialogs/read_model_cache.go index 9178c6b2..417a90cc 100644 --- a/internal/app/dialogs/read_model_cache.go +++ b/internal/app/dialogs/read_model_cache.go @@ -11,11 +11,10 @@ import ( ) const ( - dialogLightReadModel = readmodel.ModelDialogLight - channelBaseReadModel = readmodel.ModelChannelBase - channelMemberReadModel = readmodel.ModelChannelMember - defaultDialogPeerReadModelTTL = 24 * time.Hour - dialogPeerReadModelMaxEntries = 8192 + dialogLightReadModel = readmodel.ModelDialogLight + defaultDialogPeerReadModelTTL = 24 * time.Hour + defaultDialogPeerReadModelMaxEntries = 500000 + defaultDialogPeerReadModelMaxBytes int64 = 256 << 20 ) type dialogPeerCacheKey struct { @@ -32,12 +31,18 @@ type dialogPeerReadModelCache struct { } func newDialogPeerReadModelCache(ttl time.Duration) *dialogPeerReadModelCache { + return newDialogPeerReadModelCacheWithLimits(defaultDialogPeerReadModelMaxEntries, defaultDialogPeerReadModelMaxBytes, ttl) +} + +func newDialogPeerReadModelCacheWithLimits(maxEntries int, maxBytes int64, ttl time.Duration) *dialogPeerReadModelCache { if ttl <= 0 { ttl = defaultDialogPeerReadModelTTL } return &dialogPeerReadModelCache{ cache: readmodelcache.New[dialogPeerCacheKey, domain.DialogList](readmodelcache.Config[dialogPeerCacheKey, domain.DialogList]{ - MaxEntries: dialogPeerReadModelMaxEntries, + MaxEntries: maxEntries, + MaxWeight: maxBytes, + Weight: dialogPeerListApproxBytes, TTL: ttl, Clone: cloneDialogList, }), @@ -52,7 +57,7 @@ func (s *Service) userPeerDialogsReadModel(ctx context.Context, userID int64, pe if len(unique) == 0 { return domain.DialogList{}, nil } - return s.cachedPeerDialogsReadModel(ctx, userID, unique, s.userDialogHashes, s.loadUserPeerDialogs) + return s.cachedPeerDialogsReadModel(ctx, userID, unique, s.dialogHashes, s.loadUserPeerDialogs) } func (s *Service) channelPeerDialogsReadModel(ctx context.Context, userID int64, channelIDs []int64) (domain.DialogList, error) { @@ -63,7 +68,7 @@ func (s *Service) channelPeerDialogsReadModel(ctx context.Context, userID int64, if len(unique) == 0 { return domain.DialogList{}, nil } - return s.cachedPeerDialogsReadModel(ctx, userID, unique, s.channelDialogHashes, s.loadChannelPeerDialogsByPeers) + return s.loadChannelPeerDialogsByPeers(ctx, userID, unique) } func (s *Service) cachedPeerDialogsReadModel( @@ -73,20 +78,20 @@ func (s *Service) cachedPeerDialogsReadModel( hashesFor func(context.Context, int64, []domain.Peer) (map[domain.Peer]int64, error), load func(context.Context, int64, []domain.Peer) (domain.DialogList, error), ) (domain.DialogList, error) { - if s.peerCache == nil || s.versions == nil { + if s.privatePeerCache == nil || s.versions == nil { return load(ctx, userID, peers) } hashes, err := hashesFor(ctx, userID, peers) if err != nil { return domain.DialogList{}, err } - loadEpoch := s.peerCache.cacheEpoch() + loadEpoch := s.privatePeerCache.cacheEpoch() var out domain.DialogList misses := make([]domain.Peer, 0, len(peers)) for _, peer := range peers { hash := hashes[peer] if hash != 0 { - if cached, ok := s.peerCache.lookup(dialogPeerCacheKey{userID: userID, peer: peer}, hash); ok { + if cached, ok := s.privatePeerCache.lookup(dialogPeerCacheKey{userID: userID, peer: peer}, hash); ok { out = mergeDialogLists(out, cached) continue } @@ -108,7 +113,7 @@ func (s *Service) cachedPeerDialogsReadModel( } peerList := dialogListForPeer(list, peer) peerList.Hash = hash - s.peerCache.putIfEpoch(dialogPeerCacheKey{userID: userID, peer: peer}, peerList, hash, loadEpoch) + s.privatePeerCache.putIfEpoch(dialogPeerCacheKey{userID: userID, peer: peer}, peerList, hash, loadEpoch) } if len(out.Dialogs) > 0 || len(out.Messages) > 0 || len(out.ChannelMessages) > 0 || len(out.Users) > 0 || len(out.Channels) > 0 { return mergeDialogLists(out, list), nil @@ -124,11 +129,8 @@ func (s *Service) loadUserPeerDialogs(ctx context.Context, userID int64, peers [ if err != nil { return domain.DialogList{}, err } - if err := s.attachDrafts(ctx, userID, &list); err != nil { - return domain.DialogList{}, err - } - if err := s.projectDialogUsers(ctx, userID, &list); err != nil { - return domain.DialogList{}, err + for i := range list.Dialogs { + list.Dialogs[i].Draft = nil } return list, nil } @@ -150,16 +152,10 @@ func (s *Service) loadChannelPeerDialogsByPeers(ctx context.Context, userID int6 if err != nil { return domain.DialogList{}, err } - if err := s.attachDrafts(ctx, userID, &out); err != nil { - return domain.DialogList{}, err - } - if err := s.projectDialogUsers(ctx, userID, &out); err != nil { - return domain.DialogList{}, err - } return out, nil } -func (s *Service) userDialogHashes(ctx context.Context, userID int64, peers []domain.Peer) (map[domain.Peer]int64, error) { +func (s *Service) dialogHashes(ctx context.Context, userID int64, peers []domain.Peer) (map[domain.Peer]int64, error) { keys := make([]store.ReadModelKey, 0, len(peers)) for _, peer := range peers { keys = append(keys, store.ReadModelKey{Model: dialogLightReadModel, OwnerUserID: userID, PeerType: peer.Type, PeerID: peer.ID}) @@ -175,32 +171,6 @@ func (s *Service) userDialogHashes(ctx context.Context, userID int64, peers []do return out, nil } -func (s *Service) channelDialogHashes(ctx context.Context, userID int64, peers []domain.Peer) (map[domain.Peer]int64, error) { - keys := make([]store.ReadModelKey, 0, len(peers)*3) - for _, peer := range peers { - keys = append(keys, - store.ReadModelKey{Model: channelBaseReadModel, OwnerUserID: 0, PeerType: peer.Type, PeerID: peer.ID}, - store.ReadModelKey{Model: channelMemberReadModel, OwnerUserID: userID, PeerType: peer.Type, PeerID: peer.ID}, - store.ReadModelKey{Model: dialogLightReadModel, OwnerUserID: userID, PeerType: peer.Type, PeerID: peer.ID}, - ) - } - rows, err := s.versions.ReadModelHashes(ctx, keys) - if err != nil { - return nil, err - } - out := make(map[domain.Peer]int64, len(peers)) - for _, peer := range peers { - base := rows[store.ReadModelKey{Model: channelBaseReadModel, OwnerUserID: 0, PeerType: peer.Type, PeerID: peer.ID}] - if base == 0 { - continue - } - member := rows[store.ReadModelKey{Model: channelMemberReadModel, OwnerUserID: userID, PeerType: peer.Type, PeerID: peer.ID}] - dialog := rows[store.ReadModelKey{Model: dialogLightReadModel, OwnerUserID: userID, PeerType: peer.Type, PeerID: peer.ID}] - out[peer] = readmodel.MixHashes(base, member, dialog) - } - return out, nil -} - // lookup 命中且版本(值自带 DialogList.Hash)匹配才返回;原语已在返回边界 clone。 func (c *dialogPeerReadModelCache) lookup(key dialogPeerCacheKey, currentHash int64) (domain.DialogList, bool) { if c == nil { @@ -246,23 +216,79 @@ func (s *Service) InvalidateDialog(userID int64, peer domain.Peer) { if s == nil || userID == 0 { return } - s.invalidateDialogListHashes(userID) - if s.peerCache == nil || peer.Type == "" || peer.ID == 0 { + s.InvalidateDialogOwner(userID) + if s.draftCache != nil && peer.Type != "" && peer.ID != 0 { + s.draftCache.invalidate(dialogPeerCacheKey{userID: userID, peer: peer}) + } + if s.privatePeerCache != nil && peer.Type == domain.PeerTypeUser && peer.ID != 0 { + s.privatePeerCache.invalidate(dialogPeerCacheKey{userID: userID, peer: peer}) + } +} + +// InvalidateDialogOwner invalidates owner-list L1 state without inventing an +// exact peer. Redis L2 values are version-addressed and validated, so old keys +// expire naturally rather than requiring a global/key-pattern delete. +func (s *Service) InvalidateDialogOwner(userID int64) { + if s == nil || userID == 0 { return } - s.peerCache.invalidate(dialogPeerCacheKey{userID: userID, peer: peer}) + s.invalidateDialogListHashes(userID) + if s.listCache != nil { + s.listCache.invalidateOwner(userID) + } +} + +// InvalidateDialogListsForChannel invalidates only local bounded owner +// snapshots that actually contain the changed shared channel. The listener +// invokes it for channel_base; reconnect flush remains the missed-NOTIFY guard. +func (s *Service) InvalidateDialogListsForChannel(channelID int64) { + if s != nil && s.listCache != nil { + s.listCache.invalidateChannel(channelID) + } } func (s *Service) FlushReadModelCache() { if s == nil { return } - if s.peerCache != nil { - s.peerCache.flush() + if s.privatePeerCache != nil { + s.privatePeerCache.flush() + } + if s.draftCache != nil { + s.draftCache.flush() } if s.listHashCache != nil { s.listHashCache.flush() } + if s.listCache != nil { + s.listCache.flush() + } +} + +func dialogPeerListApproxBytes(list domain.DialogList) int64 { + weight := int64(256 + len(list.Dialogs)*256 + len(list.Messages)*512 + len(list.Users)*512) + for _, dialog := range list.Dialogs { + weight += int64(len(dialog.ThemeEmoticon)) + } + for _, msg := range list.Messages { + weight += int64(len(msg.Body) + len(msg.Entities)*64) + if msg.ReplyTo != nil { + weight += int64(128 + len(msg.ReplyTo.QuoteText) + len(msg.ReplyTo.QuoteEntities)*64) + } + if msg.Forward != nil { + weight += int64(96 + len(msg.Forward.FromName)) + } + if msg.RichMessage != nil { + weight += int64(len(msg.RichMessage.Blocks) + len(msg.RichMessage.BotAPIProjection) + len(msg.RichMessage.Photos)*256 + len(msg.RichMessage.Documents)*256) + } + } + for _, user := range list.Users { + weight += int64(len(user.Phone) + len(user.FirstName) + len(user.LastName) + len(user.About) + len(user.Username) + len(user.PhotoStripped)) + } + if weight < 1 { + return 1 + } + return weight } func (s *Service) invalidateDialogListHashes(userID int64) { @@ -373,9 +399,22 @@ func cloneDialogList(in domain.DialogList) domain.DialogList { in.ChannelMessages = cloneDialogChannelMessages(in.ChannelMessages) in.Users = cloneDialogUsers(in.Users) in.Channels = cloneDialogChannels(in.Channels) + in.ArchiveSummary = cloneDialogArchiveSummary(in.ArchiveSummary) return in } +func cloneDialogArchiveSummary(in *domain.DialogArchiveSummary) *domain.DialogArchiveSummary { + if in == nil { + return nil + } + out := *in + if in.TopDialog != nil { + dialog := cloneDialog(*in.TopDialog) + out.TopDialog = &dialog + } + return &out +} + func cloneDialogSlice(in []domain.Dialog) []domain.Dialog { out := make([]domain.Dialog, len(in)) for i := range in { @@ -385,6 +424,14 @@ func cloneDialogSlice(in []domain.Dialog) []domain.Dialog { } func cloneDialog(in domain.Dialog) domain.Dialog { + if in.DefaultSendAs != nil { + peer := *in.DefaultSendAs + in.DefaultSendAs = &peer + } + if in.ChannelMember != nil { + member := *in.ChannelMember + in.ChannelMember = &member + } if in.Draft != nil { draft := cloneDraft(*in.Draft) in.Draft = &draft diff --git a/internal/app/dialogs/service.go b/internal/app/dialogs/service.go index 53f5d2ae..a1a657d5 100644 --- a/internal/app/dialogs/service.go +++ b/internal/app/dialogs/service.go @@ -7,6 +7,7 @@ import ( "hash/fnv" "reflect" "sort" + "time" "unicode/utf8" "telesrv/internal/app/userprojection" @@ -19,17 +20,20 @@ type PremiumChecker func(ctx context.Context, userID int64) bool // Service 提供会话列表查询。 type Service struct { - dialogs store.DialogStore - channels store.ChannelStore - contacts store.ContactStore - photos userprojection.ProfilePhotoProvider - privacy userprojection.PrivacyEvaluator - freezes userprojection.AccountFreezeProvider - premium PremiumChecker - projector *userprojection.Projector - versions store.ReadModelVersionStore - peerCache *dialogPeerReadModelCache - listHashCache *dialogListHashCache + dialogs store.DialogStore + channels store.ChannelStore + contacts store.ContactStore + photos userprojection.ProfilePhotoProvider + privacy userprojection.PrivacyEvaluator + freezes userprojection.AccountFreezeProvider + premium PremiumChecker + projector *userprojection.Projector + versions store.ReadModelVersionStore + privatePeerCache *dialogPeerReadModelCache + draftCache *dialogDraftReadModelCache + listHashCache *dialogListHashCache + listCache *dialogListSnapshotCache + sharedListCache store.DialogListSnapshotCache } // Option adjusts optional dialogs service dependencies. @@ -64,12 +68,41 @@ func WithReadModelVersions(v store.ReadModelVersionStore) Option { return func(s *Service) { s.versions = v } } +// WithDialogHydrationCaches configures the bounded structural-private-peer and +// cloud-draft working sets. Channel structure has its own store-level cache and +// is deliberately not duplicated here. +func WithDialogHydrationCaches(privateMaxEntries int, privateMaxBytes int64, draftMaxEntries int, draftMaxBytes int64) Option { + return func(s *Service) { + s.privatePeerCache = newDialogPeerReadModelCacheWithLimits(privateMaxEntries, privateMaxBytes, defaultDialogPeerReadModelTTL) + s.draftCache = newDialogDraftReadModelCache(draftMaxEntries, draftMaxBytes, defaultDialogDraftReadModelTTL) + } +} + +// WithDialogListSnapshotCache configures the bounded materialized owner working +// set. maxHeaders is retained as the configuration/API name and measures +// header-equivalent weighted units, so high-membership owners cannot turn +// maxEntries into an unbounded heap commitment. +func WithDialogListSnapshotCache(maxEntries int, maxHeaders int64, ttl time.Duration) Option { + return func(s *Service) { + s.listCache = newDialogListSnapshotCache(maxEntries, maxHeaders, ttl) + } +} + +// WithSharedDialogListSnapshotCache installs the production Redis L2 for +// process-cold materialized owner restoration. Errors are propagated; production +// never silently replaces Redis failure with a full PostgreSQL scan. +func WithSharedDialogListSnapshotCache(cache store.DialogListSnapshotCache) Option { + return func(s *Service) { s.sharedListCache = cache } +} + // NewService 创建 dialogs 服务。 func NewService(dialogs store.DialogStore, channels ...store.ChannelStore) *Service { s := &Service{ - dialogs: dialogs, - peerCache: newDialogPeerReadModelCache(defaultDialogPeerReadModelTTL), - listHashCache: newDialogListHashCache(defaultDialogListHashCacheTTL), + dialogs: dialogs, + privatePeerCache: newDialogPeerReadModelCache(defaultDialogPeerReadModelTTL), + draftCache: newDialogDraftReadModelCache(defaultDialogDraftReadModelMaxEntries, defaultDialogDraftReadModelMaxBytes, defaultDialogDraftReadModelTTL), + listHashCache: newDialogListHashCache(defaultDialogListHashCacheTTL), + listCache: newDialogListSnapshotCache(0, 0, 0), } if len(channels) > 0 { s.channels = channels[0] @@ -129,19 +162,403 @@ func (s *Service) getDialogs(ctx context.Context, userID int64, filter domain.Di } filter.Folder = &folder } + if filter.Limit <= 0 || filter.Limit > 100 { + filter.Limit = 100 + } + if !lightweight { + if key, ok := dialogSnapshotKey(userID, filter); ok && s.supportsDialogListSnapshot() { + listHashEpoch := s.listHashCache.cacheEpoch() + if s.sharedListCache != nil { + page, err := s.stableDialogSnapshotPage(ctx, key, filter) + if err != nil { + return domain.DialogList{}, err + } + s.rememberDialogListHash(userID, filter, page, listHashEpoch) + return page, nil + } + snap, err := s.listCache.getOrLoad(ctx, key, func() (*dialogListSnapshot, error) { + return s.loadDialogListSnapshot(ctx, key) + }) + if err != nil { + return domain.DialogList{}, err + } + page, err := s.hydrateDialogSnapshotPage(ctx, userID, dialogListSnapshotPageHeaders(snap, filter)) + if err != nil { + return domain.DialogList{}, err + } + s.rememberDialogListHash(userID, filter, page, listHashEpoch) + return page, nil + } + } + return s.loadDialogs(ctx, userID, filter, lightweight) +} + +const dialogListSnapshotStableReadAttempts = 4 + +func (s *Service) stableDialogSnapshotPage( + ctx context.Context, + key dialogListSnapshotKey, + filter domain.DialogFilter, +) (domain.DialogList, error) { + for attempt := 0; attempt < dialogListSnapshotStableReadAttempts; attempt++ { + ownerHash, err := s.dialogOwnerHash(ctx, key.userID) + if err != nil { + return domain.DialogList{}, err + } + snap, err := s.listCache.getOrLoadVersioned(ctx, key, ownerHash, func() (*dialogListSnapshot, error) { + return s.loadDialogListSnapshotAtOwnerHash(ctx, key, ownerHash) + }) + if errors.Is(err, errDialogListSnapshotGenerationChanged) { + continue + } + if err != nil { + return domain.DialogList{}, err + } + + page, hydrateErr := s.hydrateDialogSnapshotPage(ctx, key.userID, dialogListSnapshotPageHeaders(snap, filter)) + currentOwnerHash, hashErr := s.dialogOwnerHash(ctx, key.userID) + if hashErr != nil { + return domain.DialogList{}, hashErr + } + if currentOwnerHash != ownerHash { + continue + } + if hydrateErr != nil { + return domain.DialogList{}, hydrateErr + } + return page, nil + } + return domain.DialogList{}, errDialogListSnapshotGenerationChanged +} + +type dialogListSnapshotStore interface { + ListAllBuiltinDialogSnapshotHeaders(context.Context, int64) (domain.DialogList, error) +} + +type channelDialogListSnapshotStore interface { + ListAllBuiltinChannelDialogSnapshot(context.Context, int64) (domain.ChannelDialogList, error) +} + +type channelDialogSnapshotHydrator interface { + HydrateChannelDialogSnapshot(context.Context, int64, []domain.Dialog) (domain.ChannelDialogList, error) +} + +type privateDialogPeerIDStore interface { + ListPrivateDialogPeerIDs(context.Context, int64, int) ([]int64, error) +} + +// PrivateDialogPeerIDs returns the bounded private-peer candidate set used by +// transient presence fan-out without entering the full dialogs projection. +// A process-cold server first tries the version-addressed shared owner snapshot: +// its private dialog headers are fully covered by dialog_owner and can be +// sorted into the same narrow result without another PostgreSQL acquisition. +func (s *Service) PrivateDialogPeerIDs(ctx context.Context, userID int64, limit int) ([]int64, error) { + if s == nil || s.dialogs == nil || userID == 0 { + return nil, nil + } + privateStore, ok := s.dialogs.(privateDialogPeerIDStore) + if !ok { + return nil, errors.New("dialog store does not provide private peer candidates") + } + if limit <= 0 || limit > 4096 { + limit = 4096 + } + if s.sharedListCache == nil || s.versions == nil { + return privateStore.ListPrivateDialogPeerIDs(ctx, userID, limit) + } + for attempt := 0; attempt < dialogListSnapshotStableReadAttempts; attempt++ { + ownerHash, err := s.dialogOwnerHash(ctx, userID) + if err != nil { + return nil, err + } + value, found, err := s.sharedListCache.GetDialogListSnapshot( + ctx, + store.DialogListSnapshotCacheKey{UserID: userID, OwnerHash: ownerHash}, + ) + if err != nil { + return nil, err + } + var ids []int64 + if found { + ids = privateDialogPeerIDsFromDialogs(value.Dialogs, userID, limit) + } else { + ids, err = privateStore.ListPrivateDialogPeerIDs(ctx, userID, limit) + if err != nil { + return nil, err + } + } + currentOwnerHash, err := s.dialogOwnerHash(ctx, userID) + if err != nil { + return nil, err + } + if currentOwnerHash == ownerHash { + return ids, nil + } + } + return nil, errDialogListSnapshotGenerationChanged +} + +func privateDialogPeerIDsFromDialogs(dialogs []domain.Dialog, userID int64, limit int) []int64 { + candidates := make([]domain.Dialog, 0, min(limit, len(dialogs))) + seen := make(map[int64]struct{}, min(limit, len(dialogs))) + for _, dialog := range dialogs { + if dialog.Peer.Type != domain.PeerTypeUser || dialog.Peer.ID == 0 || dialog.Peer.ID == userID { + continue + } + if _, duplicate := seen[dialog.Peer.ID]; duplicate { + continue + } + seen[dialog.Peer.ID] = struct{}{} + candidates = append(candidates, dialog) + } + sort.Slice(candidates, func(i, j int) bool { + if candidates[i].TopMessageDate != candidates[j].TopMessageDate { + return candidates[i].TopMessageDate > candidates[j].TopMessageDate + } + if candidates[i].TopMessage != candidates[j].TopMessage { + return candidates[i].TopMessage > candidates[j].TopMessage + } + return candidates[i].Peer.ID > candidates[j].Peer.ID + }) + if len(candidates) > limit { + candidates = candidates[:limit] + } + ids := make([]int64, len(candidates)) + for index := range candidates { + ids[index] = candidates[index].Peer.ID + } + return ids +} + +func (s *Service) supportsDialogListSnapshot() bool { + if s == nil || s.listCache == nil { + return false + } + if s.dialogs != nil { + if _, ok := s.dialogs.(dialogListSnapshotStore); !ok { + return false + } + } + if s.channels != nil { + if _, ok := s.channels.(channelDialogListSnapshotStore); !ok { + return false + } + if _, ok := s.channels.(channelDialogSnapshotHydrator); !ok { + return false + } + } + return true +} + +func (s *Service) loadDialogOwnerSnapshotHeaders(ctx context.Context, userID int64) (domain.DialogList, error) { + var out domain.DialogList + if s.dialogs != nil { + headers, err := s.dialogs.(dialogListSnapshotStore).ListAllBuiltinDialogSnapshotHeaders(ctx, userID) + if err != nil { + return domain.DialogList{}, err + } + peers := make([]domain.Peer, 0, len(headers.Dialogs)) + for _, dialog := range headers.Dialogs { + if dialog.Peer.Type == domain.PeerTypeUser && dialog.Peer.ID != 0 { + peers = append(peers, dialog.Peer) + } + } + materialized := headers + if len(peers) > 0 { + materialized, err = s.dialogs.ListByPeers(ctx, userID, peers) + if err != nil { + return domain.DialogList{}, err + } + materialized = orderMaterializedDialogList(headers, materialized) + } + out = mergeDialogLists(out, materialized) + } + if s.channels != nil { + materialized, err := s.channels.(channelDialogListSnapshotStore).ListAllBuiltinChannelDialogSnapshot(ctx, userID) + if err != nil { + return domain.DialogList{}, err + } + out = mergeChannelDialogs(out, materialized) + } + sortDialogList(out.Dialogs) + out.Count = len(out.Dialogs) + if err := s.attachArchiveSummaryFromOwnerHeaders(ctx, userID, &out); err != nil { + return domain.DialogList{}, err + } + if err := s.attachOwnerSnapshotDrafts(ctx, userID, &out); err != nil { + return domain.DialogList{}, err + } + return out, nil +} + +// attachOwnerSnapshotDrafts materializes the complete bounded cloud-draft set +// once under the dialog_owner stable-read fence. Draft writes bump +// dialog_light and its aggregate dialog_owner generation, so storing these +// overlays in the version-addressed owner snapshot is exact: page reads no +// longer need one ListDraftsByPeers query apiece, and a concurrent draft write +// forces the snapshot materialization retry before publication. +func (s *Service) attachOwnerSnapshotDrafts(ctx context.Context, userID int64, out *domain.DialogList) error { + if s == nil || s.dialogs == nil || userID == 0 || out == nil || len(out.Dialogs) == 0 { + return nil + } + drafts, err := s.dialogs.ListDrafts(ctx, userID, domain.MaxDialogDraftsPerUser) + if err != nil { + return err + } + byPeer := make(map[domain.Peer]domain.DialogDraft, len(drafts)) + for _, draft := range drafts { + if draft.TopMessageID == 0 && draft.Peer.Type != "" && draft.Peer.ID != 0 { + byPeer[draft.Peer] = cloneDraft(draft) + } + } + for index := range out.Dialogs { + out.Dialogs[index].Draft = nil + if draft, found := byPeer[out.Dialogs[index].Peer]; found { + draft := cloneDraft(draft) + out.Dialogs[index].Draft = &draft + } + } + return nil +} + +func (s *Service) attachArchiveSummaryFromOwnerHeaders(ctx context.Context, userID int64, out *domain.DialogList) error { + if out == nil { + return nil + } + var top domain.Dialog + for _, dialog := range out.Dialogs { + if dialog.FolderID == domain.DialogArchiveFolderID { + top = dialog + break + } + } + if top.Peer.ID == 0 { + return nil + } + unreadPeers, unreadMessages := 0, 0 + if s.dialogs != nil { + peers, messages, err := s.dialogs.CountArchiveUnread(ctx, userID) + if err != nil { + return err + } + unreadPeers += peers + unreadMessages += messages + } + if s.channels != nil { + peers, messages, err := s.channels.CountChannelArchiveUnread(ctx, userID) + if err != nil { + return err + } + unreadPeers += peers + unreadMessages += messages + } + archivePinned := true + if s.dialogs != nil { + pinned, err := s.dialogs.ArchivePinned(ctx, userID) + if err != nil { + return err + } + archivePinned = pinned + } + out.ArchiveSummary = &domain.DialogArchiveSummary{ + TopPeer: top.Peer, TopMessage: top.TopMessage, + TopDialog: cloneDialogPtr(top), + UnreadPeersCount: unreadPeers, UnreadMessagesCount: unreadMessages, + Pinned: archivePinned, + } + return nil +} + +func (s *Service) hydrateDialogSnapshotPage(ctx context.Context, userID int64, headers domain.DialogList) (domain.DialogList, error) { + hydrated := cloneDialogList(headers) + if s.channels != nil { + channelDialogs := make([]domain.Dialog, 0, len(hydrated.Dialogs)+1) + present := make(map[domain.Peer]struct{}, len(hydrated.Dialogs)) + for _, dialog := range hydrated.Dialogs { + present[dialog.Peer] = struct{}{} + if dialog.Peer.Type == domain.PeerTypeChannel && dialog.Peer.ID != 0 { + channelDialogs = append(channelDialogs, dialog) + } + } + if hydrated.ArchiveSummary != nil && hydrated.ArchiveSummary.TopDialog != nil { + top := *hydrated.ArchiveSummary.TopDialog + if top.Peer.Type == domain.PeerTypeChannel && top.Peer.ID != 0 { + if _, ok := present[top.Peer]; !ok { + channelDialogs = append(channelDialogs, top) + } + } + } + if len(channelDialogs) > 0 { + projection, err := s.channels.(channelDialogSnapshotHydrator).HydrateChannelDialogSnapshot(ctx, userID, channelDialogs) + if err != nil { + return domain.DialogList{}, err + } + byPeer := make(map[domain.Peer]domain.Dialog, len(projection.Dialogs)) + for _, dialog := range projection.Dialogs { + byPeer[dialog.Peer] = dialog + } + for index := range hydrated.Dialogs { + if dialog, ok := byPeer[hydrated.Dialogs[index].Peer]; ok { + hydrated.Dialogs[index] = dialog + } + } + hydrated.ChannelMessages = append(hydrated.ChannelMessages, projection.Messages...) + hydrated.Channels = append(hydrated.Channels, projection.Channels...) + hydrated.Users = append(hydrated.Users, projection.Users...) + } + } + // Drafts are part of the version-addressed owner snapshot. Re-reading them + // per page would discard that materialization and recreate a PostgreSQL + // acquisition for every messages.getDialogs cursor. + if err := s.projectDialogUsers(ctx, userID, &hydrated); err != nil { + return domain.DialogList{}, err + } + return hydrated, nil +} + +func orderMaterializedDialogList(headers, materialized domain.DialogList) domain.DialogList { + materialized.Dialogs = orderMaterializedDialogs(headers.Dialogs, materialized.Dialogs) + materialized.Count = len(materialized.Dialogs) + return materialized +} + +func orderMaterializedDialogs(headers, materialized []domain.Dialog) []domain.Dialog { + byPeer := make(map[domain.Peer]domain.Dialog, len(materialized)) + for _, dialog := range materialized { + byPeer[dialog.Peer] = dialog + } + ordered := make([]domain.Dialog, 0, len(headers)) + for _, header := range headers { + if dialog, ok := byPeer[header.Peer]; ok { + ordered = append(ordered, dialog) + continue + } + // Keep the authoritative header so a concurrent disappearance remains + // visible to the generation/dependency guard instead of silently + // shrinking a page while the read model is being materialized. + ordered = append(ordered, header) + } + return ordered +} + +func (s *Service) loadDialogs(ctx context.Context, userID int64, filter domain.DialogFilter, lightweight bool) (domain.DialogList, error) { // 在加载任何会话状态前快照 list-hash epoch：若加载/投影期间发生 dialog_light 写失效， // rememberDialogListHash 会据此拒绝写回 stale hash，避免后续 getDialogs 误返 NotModified。 listHashEpoch := s.listHashCache.cacheEpoch() var out domain.DialogList if s.dialogs != nil { - list, err := s.dialogs.ListByUser(ctx, userID, filter) + var list domain.DialogList + var err error + list, err = s.dialogs.ListByUser(ctx, userID, filter) if err != nil { return domain.DialogList{}, err } out = mergeDialogLists(out, list) } if s.channels != nil { - list, err := s.channels.ListChannelDialogs(ctx, userID, filter) + var list domain.ChannelDialogList + var err error + list, err = s.channels.ListChannelDialogs(ctx, userID, filter) if err != nil { return domain.DialogList{}, err } @@ -246,6 +663,7 @@ func (s *Service) attachArchiveSummary(ctx context.Context, userID int64, filter out.ArchiveSummary = &domain.DialogArchiveSummary{ TopPeer: topDialog.Peer, TopMessage: topDialog.TopMessage, + TopDialog: cloneDialogPtr(topDialog), UnreadPeersCount: unreadPeers, UnreadMessagesCount: unreadMessages, Pinned: archivePinned, @@ -259,6 +677,11 @@ func (s *Service) attachArchiveSummary(ctx context.Context, userID int64, filter return nil } +func cloneDialogPtr(dialog domain.Dialog) *domain.Dialog { + clone := cloneDialog(dialog) + return &clone +} + // GetPeerDialogs 返回指定 peer 的会话摘要。缺失的 peer 由 store 按空会话占位返回。 func (s *Service) GetPeerDialogs(ctx context.Context, userID int64, peers []domain.Peer) (domain.DialogList, error) { if s == nil || userID == 0 || len(peers) == 0 { @@ -292,6 +715,12 @@ func (s *Service) GetPeerDialogs(ctx context.Context, userID int64, peers []doma } out = mergeDialogLists(out, channelOut) } + if err := s.attachDrafts(ctx, userID, &out); err != nil { + return domain.DialogList{}, err + } + if err := s.projectDialogUsers(ctx, userID, &out); err != nil { + return domain.DialogList{}, err + } return out, nil } @@ -836,30 +1265,24 @@ func (s *Service) attachDrafts(ctx context.Context, userID int64, list *domain.D if s == nil || s.dialogs == nil || userID == 0 || list == nil || len(list.Dialogs) == 0 { return nil } - drafts, err := s.dialogs.ListDrafts(ctx, userID, domain.MaxDialogDraftsPerUser) + peers := make([]domain.Peer, 0, len(list.Dialogs)) + for _, dialog := range list.Dialogs { + if dialog.Peer.ID != 0 { + peers = append(peers, dialog.Peer) + } + } + drafts, err := s.dialogDraftsReadModel(ctx, userID, peers) if err != nil { return err } - if len(drafts) == 0 { - return nil - } - byPeer := make(map[domain.Peer]domain.DialogDraft, len(drafts)) - for _, draft := range drafts { - if draft.TopMessageID != 0 { - continue - } - byPeer[draft.Peer] = cloneDraft(draft) - } - if len(byPeer) == 0 { - return nil - } attached := false for i := range list.Dialogs { - draft, ok := byPeer[list.Dialogs[i].Peer] - if !ok { + list.Dialogs[i].Draft = nil + draft, ok := drafts[list.Dialogs[i].Peer] + if !ok || !draft.found { continue } - d := cloneDraft(draft) + d := cloneDraft(draft.draft) list.Dialogs[i].Draft = &d attached = true } @@ -996,7 +1419,8 @@ func writeDraftRichHash(h interface{ Write([]byte) (int, error) }, buf []byte, r binary.LittleEndian.PutUint64(buf[2:10], uint64(len(rich.Blocks))) binary.LittleEndian.PutUint64(buf[10:18], uint64(len(rich.Photos))) binary.LittleEndian.PutUint64(buf[18:26], uint64(len(rich.Documents))) - _, _ = h.Write(buf[:26]) + binary.LittleEndian.PutUint64(buf[26:34], uint64(rich.EffectiveBlocksLayer())) + _, _ = h.Write(buf[:34]) _, _ = h.Write(rich.Blocks) for _, photo := range rich.Photos { binary.LittleEndian.PutUint64(buf[:8], uint64(photo.ID)) diff --git a/internal/app/dialogs/service_test.go b/internal/app/dialogs/service_test.go index dee10f7c..408e6bc5 100644 --- a/internal/app/dialogs/service_test.go +++ b/internal/app/dialogs/service_test.go @@ -14,10 +14,241 @@ import ( type countingDialogStore struct { store.DialogStore - listByUserCalls int - listByPeersCalls int - listByPeersBatches [][]domain.Peer - listDraftsCalls int + listByUserCalls int + listByPeersCalls int + listByPeersBatches [][]domain.Peer + listDraftsByPeersCalls int + listDraftsByPeersBatches [][]domain.Peer + listDraftsByPeersErr error +} + +type snapshotDialogStore struct { + store.DialogStore + list domain.DialogList + snapshotCalls int + listByPeersCalls int + listDraftsCalls int + privatePeerCalls int + onListByPeers func() + onListDrafts func() +} + +func (s *snapshotDialogStore) ListAllBuiltinDialogSnapshotHeaders(_ context.Context, _ int64) (domain.DialogList, error) { + s.snapshotCalls++ + return cloneDialogList(s.list), nil +} + +func (s *snapshotDialogStore) ListByPeers(_ context.Context, _ int64, peers []domain.Peer) (domain.DialogList, error) { + s.listByPeersCalls++ + if s.onListByPeers != nil { + fn := s.onListByPeers + s.onListByPeers = nil + fn() + } + wanted := make(map[domain.Peer]struct{}, len(peers)) + for _, peer := range peers { + wanted[peer] = struct{}{} + } + out := domain.DialogList{} + for _, dialog := range s.list.Dialogs { + if _, ok := wanted[dialog.Peer]; ok { + out.Dialogs = append(out.Dialogs, cloneDialog(dialog)) + } + } + for _, message := range s.list.Messages { + if _, ok := wanted[message.Peer]; ok { + out.Messages = append(out.Messages, cloneMessageForDialogCache(message)) + } + } + for _, user := range s.list.Users { + if _, ok := wanted[domain.Peer{Type: domain.PeerTypeUser, ID: user.ID}]; ok { + out.Users = append(out.Users, cloneDialogUser(user)) + } + } + out.Count = len(out.Dialogs) + return out, nil +} + +func (s *snapshotDialogStore) ListDrafts(ctx context.Context, userID int64, limit int) ([]domain.DialogDraft, error) { + s.listDraftsCalls++ + drafts, err := s.DialogStore.ListDrafts(ctx, userID, limit) + if s.onListDrafts != nil { + fn := s.onListDrafts + s.onListDrafts = nil + fn() + } + return drafts, err +} + +func (s *snapshotDialogStore) ListPrivateDialogPeerIDs(ctx context.Context, userID int64, limit int) ([]int64, error) { + s.privatePeerCalls++ + return s.DialogStore.(privateDialogPeerIDStore).ListPrivateDialogPeerIDs(ctx, userID, limit) +} + +func TestGetDialogsSnapshotReusesOwnerProjectionAcrossCursorPages(t *testing.T) { + ctx := context.Background() + const ownerID int64 = 1001 + peers := []domain.Peer{ + {Type: domain.PeerTypeUser, ID: 2003}, + {Type: domain.PeerTypeUser, ID: 2002}, + {Type: domain.PeerTypeUser, ID: 2001}, + } + base := memory.NewDialogStore() + snapshots := &snapshotDialogStore{DialogStore: base, list: domain.DialogList{ + Dialogs: []domain.Dialog{ + {Peer: peers[0], TopMessage: 30, TopMessageDate: 300}, + {Peer: peers[1], TopMessage: 20, TopMessageDate: 200}, + {Peer: peers[2], TopMessage: 10, TopMessageDate: 100}, + }, + Messages: []domain.Message{ + {ID: 30, Peer: peers[0], From: peers[0], Date: 300, Body: "first"}, + {ID: 20, Peer: peers[1], From: peers[1], Date: 200, Body: "second"}, + {ID: 10, Peer: peers[2], From: peers[2], Date: 100, Body: "third"}, + }, + Users: []domain.User{{ID: 2003}, {ID: 2002}, {ID: 2001}}, + Count: 3, + Hash: 77, + }} + service := NewService(snapshots) + first, err := service.GetDialogs(ctx, ownerID, domain.DialogFilter{ExcludePinned: true, Limit: 1}) + if err != nil { + t.Fatalf("first page: %v", err) + } + if len(first.Dialogs) != 1 || first.Dialogs[0].Peer != peers[0] || len(first.Messages) != 1 || len(first.Users) != 1 || first.Count != 3 { + t.Fatalf("first page = %+v, messages=%d users=%d count=%d", first.Dialogs, len(first.Messages), len(first.Users), first.Count) + } + second, err := service.GetDialogs(ctx, ownerID, domain.DialogFilter{ + ExcludePinned: true, + Limit: 1, + OffsetDate: first.Dialogs[0].TopMessageDate, + OffsetID: first.Dialogs[0].TopMessage, + HasOffsetPeer: true, + OffsetPeer: first.Dialogs[0].Peer, + }) + if err != nil { + t.Fatalf("second page: %v", err) + } + if len(second.Dialogs) != 1 || second.Dialogs[0].Peer != peers[1] || len(second.Messages) != 1 || len(second.Users) != 1 || second.Count != 3 { + t.Fatalf("second page = %+v, messages=%d users=%d count=%d", second.Dialogs, len(second.Messages), len(second.Users), second.Count) + } + if snapshots.snapshotCalls != 1 { + t.Fatalf("snapshot calls = %d, want one owner load across pages", snapshots.snapshotCalls) + } + + service.InvalidateDialog(ownerID, peers[0]) + if _, err := service.GetDialogs(ctx, ownerID, domain.DialogFilter{ExcludePinned: true, Limit: 1}); err != nil { + t.Fatalf("reload after owner invalidation: %v", err) + } + if snapshots.snapshotCalls != 2 { + t.Fatalf("snapshot calls after invalidation = %d, want 2", snapshots.snapshotCalls) + } +} + +func TestGetDialogsSnapshotMaterializesDraftsOnceAcrossCursorPages(t *testing.T) { + ctx := context.Background() + const ownerID int64 = 1101 + firstPeer := domain.Peer{Type: domain.PeerTypeUser, ID: 2101} + secondPeer := domain.Peer{Type: domain.PeerTypeUser, ID: 2102} + base := memory.NewDialogStore() + if err := base.SaveDraft(ctx, ownerID, domain.DialogDraft{ + Peer: secondPeer, Date: 22, Message: "second-page draft", + }); err != nil { + t.Fatal(err) + } + snapshots := &snapshotDialogStore{DialogStore: base, list: domain.DialogList{ + Dialogs: []domain.Dialog{ + {Peer: firstPeer, TopMessage: 2, TopMessageDate: 20}, + {Peer: secondPeer, TopMessage: 1, TopMessageDate: 10}, + }, + Users: []domain.User{{ID: firstPeer.ID}, {ID: secondPeer.ID}}, + }} + service := NewService(snapshots) + first, err := service.GetDialogs(ctx, ownerID, domain.DialogFilter{ExcludePinned: true, Limit: 1}) + if err != nil { + t.Fatal(err) + } + second, err := service.GetDialogs(ctx, ownerID, domain.DialogFilter{ + ExcludePinned: true, Limit: 1, + OffsetDate: first.Dialogs[0].TopMessageDate, OffsetID: first.Dialogs[0].TopMessage, + HasOffsetPeer: true, OffsetPeer: first.Dialogs[0].Peer, + }) + if err != nil { + t.Fatal(err) + } + if len(second.Dialogs) != 1 || second.Dialogs[0].Draft == nil || second.Dialogs[0].Draft.Message != "second-page draft" { + t.Fatalf("second page draft = %+v", second.Dialogs) + } + if snapshots.snapshotCalls != 1 || snapshots.listDraftsCalls != 1 { + t.Fatalf("snapshot/draft loads = %d/%d, want 1/1 across pages", snapshots.snapshotCalls, snapshots.listDraftsCalls) + } +} + +func TestDialogSnapshotChannelDependencyInvalidatesOwnerProjection(t *testing.T) { + const ownerID int64 = 1001 + channelPeer := domain.Peer{Type: domain.PeerTypeChannel, ID: 77} + service := NewService(memory.NewDialogStore()) + key, ok := dialogSnapshotKey(ownerID, domain.DialogFilter{ExcludePinned: true}) + if !ok { + t.Fatal("standard main-folder snapshot key was rejected") + } + service.listCache.cache.Store(key, newDialogListSnapshot(domain.DialogList{ + Dialogs: []domain.Dialog{{Peer: channelPeer, TopMessage: 1, TopMessageDate: 10}}, + Channels: []domain.Channel{{ID: channelPeer.ID, Title: "before"}}, + Count: 1, + })) + service.InvalidateDialogListsForChannel(channelPeer.ID) + if got := service.listCache.cache.Len(); got != 0 { + t.Fatalf("snapshot cache entries = %d, want channel dependency invalidation", got) + } +} + +func TestDialogSnapshotCacheBoundsAggregateHeaderWeight(t *testing.T) { + cache := newDialogListSnapshotCache(10, 3, time.Hour) + first := dialogListSnapshotKey{userID: 1001} + second := dialogListSnapshotKey{userID: 1002} + cache.cache.Store(first, newDialogListSnapshot(domain.DialogList{Dialogs: []domain.Dialog{ + {Peer: domain.Peer{Type: domain.PeerTypeChannel, ID: 1}}, + {Peer: domain.Peer{Type: domain.PeerTypeChannel, ID: 2}}, + }})) + cache.cache.Store(second, newDialogListSnapshot(domain.DialogList{Dialogs: []domain.Dialog{ + {Peer: domain.Peer{Type: domain.PeerTypeChannel, ID: 3}}, + {Peer: domain.Peer{Type: domain.PeerTypeChannel, ID: 4}}, + }})) + if _, ok := cache.cache.Peek(first); ok { + t.Fatal("old owner snapshot should be evicted by aggregate header budget") + } + if _, ok := cache.cache.Peek(second); !ok { + t.Fatal("new owner snapshot should remain within aggregate header budget") + } +} + +func TestDialogSnapshotDependencyIndexTracksLRUEvictionAndReplacement(t *testing.T) { + cache := newDialogListSnapshotCache(1, 10, time.Hour) + first := dialogListSnapshotKey{userID: 1001} + second := dialogListSnapshotKey{userID: 1002} + cache.cache.Store(first, newDialogListSnapshot(domain.DialogList{Dialogs: []domain.Dialog{ + {Peer: domain.Peer{Type: domain.PeerTypeChannel, ID: 7}}, + }})) + cache.cache.Store(second, newDialogListSnapshot(domain.DialogList{Dialogs: []domain.Dialog{ + {Peer: domain.Peer{Type: domain.PeerTypeChannel, ID: 8}}, + }})) + cache.indexMu.Lock() + _, staleEvicted := cache.channelKeys[7] + _, retained := cache.channelKeys[8] + cache.indexMu.Unlock() + if staleEvicted || !retained { + t.Fatalf("dependency index after LRU eviction: channel7=%v channel8=%v", staleEvicted, retained) + } + cache.cache.Store(second, newDialogListSnapshot(domain.DialogList{Dialogs: []domain.Dialog{ + {Peer: domain.Peer{Type: domain.PeerTypeChannel, ID: 9}}, + }})) + cache.indexMu.Lock() + _, staleReplaced := cache.channelKeys[8] + _, replaced := cache.channelKeys[9] + cache.indexMu.Unlock() + if staleReplaced || !replaced { + t.Fatalf("dependency index after replacement: channel8=%v channel9=%v", staleReplaced, replaced) + } } func (s *countingDialogStore) ListByUser(ctx context.Context, userID int64, filter domain.DialogFilter) (domain.DialogList, error) { @@ -31,9 +262,13 @@ func (s *countingDialogStore) ListByPeers(ctx context.Context, userID int64, pee return s.DialogStore.ListByPeers(ctx, userID, peers) } -func (s *countingDialogStore) ListDrafts(ctx context.Context, userID int64, limit int) ([]domain.DialogDraft, error) { - s.listDraftsCalls++ - return s.DialogStore.ListDrafts(ctx, userID, limit) +func (s *countingDialogStore) ListDraftsByPeers(ctx context.Context, userID int64, peers []domain.Peer) ([]domain.DialogDraft, error) { + s.listDraftsByPeersCalls++ + s.listDraftsByPeersBatches = append(s.listDraftsByPeersBatches, append([]domain.Peer(nil), peers...)) + if s.listDraftsByPeersErr != nil { + return nil, s.listDraftsByPeersErr + } + return s.DialogStore.ListDraftsByPeers(ctx, userID, peers) } type fakeDialogReadModelVersions struct { @@ -179,6 +414,51 @@ func TestSaveDraftNoopsWhenOnlyDateChanges(t *testing.T) { } } +func TestGetDialogsLoadsDraftsOnlyForCurrentPage(t *testing.T) { + ctx := context.Background() + const ownerID int64 = 1001 + firstPeer := domain.Peer{Type: domain.PeerTypeUser, ID: 1002} + secondPeer := domain.Peer{Type: domain.PeerTypeUser, ID: 1003} + base := memory.NewDialogStore() + if err := base.SaveList(ctx, ownerID, domain.DialogList{ + Dialogs: []domain.Dialog{ + {Peer: firstPeer, TopMessage: 11, TopMessageDate: 200}, + {Peer: secondPeer, TopMessage: 12, TopMessageDate: 100}, + }, + Messages: []domain.Message{ + {ID: 11, OwnerUserID: ownerID, Peer: firstPeer, From: firstPeer, Date: 200, Body: "first"}, + {ID: 12, OwnerUserID: ownerID, Peer: secondPeer, From: secondPeer, Date: 100, Body: "second"}, + }, + Users: []domain.User{ + {ID: firstPeer.ID, FirstName: "First"}, + {ID: secondPeer.ID, FirstName: "Second"}, + }, + }); err != nil { + t.Fatalf("SaveList: %v", err) + } + if err := base.SaveDraft(ctx, ownerID, domain.DialogDraft{Peer: firstPeer, Date: 201, Message: "first draft"}); err != nil { + t.Fatalf("save first draft: %v", err) + } + if err := base.SaveDraft(ctx, ownerID, domain.DialogDraft{Peer: secondPeer, Date: 202, Message: "second draft"}); err != nil { + t.Fatalf("save second draft: %v", err) + } + counting := &countingDialogStore{DialogStore: base} + + list, err := NewService(counting).GetDialogs(ctx, ownerID, domain.DialogFilter{Limit: 1}) + if err != nil { + t.Fatalf("GetDialogs: %v", err) + } + if len(list.Dialogs) != 1 || list.Dialogs[0].Peer != firstPeer || list.Dialogs[0].Draft == nil || list.Dialogs[0].Draft.Message != "first draft" { + t.Fatalf("dialogs = %+v, want first page with its draft", list.Dialogs) + } + if counting.listDraftsByPeersCalls != 1 || len(counting.listDraftsByPeersBatches) != 1 { + t.Fatalf("ListDraftsByPeers calls/batches = %d/%d, want 1/1", counting.listDraftsByPeersCalls, len(counting.listDraftsByPeersBatches)) + } + if got := counting.listDraftsByPeersBatches[0]; len(got) != 1 || got[0] != firstPeer { + t.Fatalf("draft peer batch = %+v, want current-page peer %+v", got, firstPeer) + } +} + func TestGetPeerDialogsCachesPrivatePeerReadModelByHash(t *testing.T) { ctx := context.Background() const ownerID int64 = 1001 @@ -226,16 +506,19 @@ func TestGetPeerDialogsCachesPrivatePeerReadModelByHash(t *testing.T) { if len(second.Dialogs) != 1 || second.Dialogs[0].TopMessage != 7 { t.Fatalf("second dialog = %+v, want cached top message", second.Dialogs) } - if counting.listByPeersCalls != 1 || counting.listDraftsCalls != 1 { - t.Fatalf("store calls ListByPeers/ListDrafts = %d/%d, want 1/1 after cache hit", counting.listByPeersCalls, counting.listDraftsCalls) + if counting.listByPeersCalls != 1 || counting.listDraftsByPeersCalls != 1 { + t.Fatalf("store calls ListByPeers/ListDraftsByPeers = %d/%d, want 1/1 after cache hit", counting.listByPeersCalls, counting.listDraftsByPeersCalls) + } + if got := counting.listDraftsByPeersBatches[0]; len(got) != 1 || got[0] != peer { + t.Fatalf("draft peer batch = %+v, want only %+v", got, peer) } versions.hashes[store.ReadModelKey{Model: dialogLightReadModel, OwnerUserID: ownerID, PeerType: peer.Type, PeerID: peer.ID}] = 202 if _, err := dialogs.GetPeerDialogs(ctx, ownerID, []domain.Peer{peer}); err != nil { t.Fatalf("third GetPeerDialogs after hash bump: %v", err) } - if counting.listByPeersCalls != 2 || counting.listDraftsCalls != 2 { - t.Fatalf("store calls after hash bump = %d/%d, want 2/2", counting.listByPeersCalls, counting.listDraftsCalls) + if counting.listByPeersCalls != 2 || counting.listDraftsByPeersCalls != 2 { + t.Fatalf("store calls after hash bump = %d/%d, want 2/2", counting.listByPeersCalls, counting.listDraftsByPeersCalls) } if _, err := dialogs.SaveDraft(ctx, ownerID, domain.DialogDraft{Peer: peer, Date: 72, Message: "new draft"}); err != nil { @@ -244,8 +527,8 @@ func TestGetPeerDialogsCachesPrivatePeerReadModelByHash(t *testing.T) { if _, err := dialogs.GetPeerDialogs(ctx, ownerID, []domain.Peer{peer}); err != nil { t.Fatalf("GetPeerDialogs after service invalidation: %v", err) } - if counting.listByPeersCalls != 3 || counting.listDraftsCalls != 3 { - t.Fatalf("store calls after explicit invalidation = %d/%d, want 3/3", counting.listByPeersCalls, counting.listDraftsCalls) + if counting.listByPeersCalls != 3 || counting.listDraftsByPeersCalls != 3 { + t.Fatalf("store calls after explicit invalidation = %d/%d, want 3/3", counting.listByPeersCalls, counting.listDraftsByPeersCalls) } } @@ -295,7 +578,7 @@ func TestGetPeerDialogsReloadsOnlyReadModelCacheMisses(t *testing.T) { } } -func TestGetPeerDialogsCachesChannelPeerReadModelByCompositeHash(t *testing.T) { +func TestGetPeerDialogsUsesStoreChannelProjectionAndVersionedDraftCache(t *testing.T) { ctx := context.Background() const ownerID int64 = 1001 dialogStore := &countingDialogStore{DialogStore: memory.NewDialogStore()} @@ -320,9 +603,7 @@ func TestGetPeerDialogsCachesChannelPeerReadModelByCompositeHash(t *testing.T) { } peer := domain.Peer{Type: domain.PeerTypeChannel, ID: created.Channel.ID} versions := &fakeDialogReadModelVersions{hashes: map[store.ReadModelKey]int64{ - {Model: channelBaseReadModel, OwnerUserID: 0, PeerType: peer.Type, PeerID: peer.ID}: 11, - {Model: channelMemberReadModel, OwnerUserID: ownerID, PeerType: peer.Type, PeerID: peer.ID}: 22, - {Model: dialogLightReadModel, OwnerUserID: ownerID, PeerType: peer.Type, PeerID: peer.ID}: 33, + {Model: dialogLightReadModel, OwnerUserID: ownerID, PeerType: peer.Type, PeerID: peer.ID}: 33, }} dialogs := NewService(dialogStore, channelStore).Configure(WithReadModelVersions(versions)) @@ -339,18 +620,18 @@ func TestGetPeerDialogsCachesChannelPeerReadModelByCompositeHash(t *testing.T) { if _, err := dialogs.GetPeerDialogs(ctx, ownerID, []domain.Peer{peer}); err != nil { t.Fatalf("second GetPeerDialogs: %v", err) } - if channelStore.getChannelDialogsCalls != 1 || dialogStore.listDraftsCalls != 1 { - t.Fatalf("store calls GetChannelDialogs/ListDrafts = %d/%d, want 1/1 after channel cache hit", - channelStore.getChannelDialogsCalls, dialogStore.listDraftsCalls) + if channelStore.getChannelDialogsCalls != 2 || dialogStore.listDraftsByPeersCalls != 1 { + t.Fatalf("store calls GetChannelDialogs/ListDraftsByPeers = %d/%d, want 2/1 without duplicate Service channel cache", + channelStore.getChannelDialogsCalls, dialogStore.listDraftsByPeersCalls) } - versions.hashes[store.ReadModelKey{Model: channelMemberReadModel, OwnerUserID: ownerID, PeerType: peer.Type, PeerID: peer.ID}] = 44 + versions.hashes[store.ReadModelKey{Model: dialogLightReadModel, OwnerUserID: ownerID, PeerType: peer.Type, PeerID: peer.ID}] = 44 if _, err := dialogs.GetPeerDialogs(ctx, ownerID, []domain.Peer{peer}); err != nil { - t.Fatalf("third GetPeerDialogs after member hash bump: %v", err) + t.Fatalf("third GetPeerDialogs after dialog hash bump: %v", err) } - if channelStore.getChannelDialogsCalls != 2 || dialogStore.listDraftsCalls != 2 { - t.Fatalf("store calls after member hash bump = %d/%d, want 2/2", - channelStore.getChannelDialogsCalls, dialogStore.listDraftsCalls) + if channelStore.getChannelDialogsCalls != 3 || dialogStore.listDraftsByPeersCalls != 2 { + t.Fatalf("store calls after dialog hash bump = %d/%d, want 3/2", + channelStore.getChannelDialogsCalls, dialogStore.listDraftsByPeersCalls) } if _, err := dialogs.SaveDraft(ctx, ownerID, domain.DialogDraft{Peer: peer, Date: 1700003220, Message: "channel draft"}); err != nil { @@ -359,9 +640,121 @@ func TestGetPeerDialogsCachesChannelPeerReadModelByCompositeHash(t *testing.T) { if _, err := dialogs.GetPeerDialogs(ctx, ownerID, []domain.Peer{peer}); err != nil { t.Fatalf("GetPeerDialogs after draft invalidation: %v", err) } - if channelStore.getChannelDialogsCalls != 3 || dialogStore.listDraftsCalls != 3 { - t.Fatalf("store calls after draft invalidation = %d/%d, want 3/3", - channelStore.getChannelDialogsCalls, dialogStore.listDraftsCalls) + if channelStore.getChannelDialogsCalls != 4 || dialogStore.listDraftsByPeersCalls != 3 { + t.Fatalf("store calls after draft invalidation = %d/%d, want 4/3", + channelStore.getChannelDialogsCalls, dialogStore.listDraftsByPeersCalls) + } +} + +func TestChannelHydrationDoesNotEvictPrivatePeerStructure(t *testing.T) { + ctx := context.Background() + const ownerID int64 = 1001 + privatePeer := domain.Peer{Type: domain.PeerTypeUser, ID: 1002} + base := memory.NewDialogStore() + if err := base.SaveList(ctx, ownerID, domain.DialogList{ + Dialogs: []domain.Dialog{{Peer: privatePeer, TopMessage: 7, TopMessageDate: 70}}, + Messages: []domain.Message{{ID: 7, OwnerUserID: ownerID, Peer: privatePeer, From: privatePeer, Body: "private"}}, + Users: []domain.User{{ID: privatePeer.ID}}, + }); err != nil { + t.Fatalf("SaveList: %v", err) + } + dialogStore := &countingDialogStore{DialogStore: base} + channelStore := &countingDialogChannelStore{ChannelStore: memory.NewChannelStore()} + channels := appchannels.NewService(channelStore) + channelPeers := make([]domain.Peer, 0, 2) + for i := 0; i < 2; i++ { + created, err := channels.CreateChannel(ctx, ownerID, domain.CreateChannelRequest{Title: "channel", Megagroup: true, Date: 100 + i}) + if err != nil { + t.Fatalf("CreateChannel(%d): %v", i, err) + } + channelPeers = append(channelPeers, domain.Peer{Type: domain.PeerTypeChannel, ID: created.Channel.ID}) + } + versions := &fakeDialogReadModelVersions{hashes: map[store.ReadModelKey]int64{ + {Model: dialogLightReadModel, OwnerUserID: ownerID, PeerType: privatePeer.Type, PeerID: privatePeer.ID}: 1, + }} + dialogs := NewService(dialogStore, channelStore).Configure( + WithReadModelVersions(versions), + WithDialogHydrationCaches(1, 1<<20, 10, 1<<20), + ) + if _, err := dialogs.GetPeerDialogs(ctx, ownerID, []domain.Peer{privatePeer}); err != nil { + t.Fatalf("first private hydration: %v", err) + } + for _, peer := range channelPeers { + if _, err := dialogs.GetPeerDialogs(ctx, ownerID, []domain.Peer{peer}); err != nil { + t.Fatalf("channel hydration %+v: %v", peer, err) + } + } + if _, err := dialogs.GetPeerDialogs(ctx, ownerID, []domain.Peer{privatePeer}); err != nil { + t.Fatalf("second private hydration: %v", err) + } + if dialogStore.listByPeersCalls != 1 { + t.Fatalf("private ListByPeers calls = %d, want 1 after channel churn", dialogStore.listByPeersCalls) + } +} + +func TestPrivatePeerCacheReprojectsCurrentViewerUserFacts(t *testing.T) { + ctx := context.Background() + const ownerID int64 = 1001 + peer := domain.Peer{Type: domain.PeerTypeUser, ID: 1002} + base := memory.NewDialogStore() + if err := base.SaveList(ctx, ownerID, domain.DialogList{ + Dialogs: []domain.Dialog{{Peer: peer, TopMessage: 7}}, + Users: []domain.User{{ID: peer.ID, FirstName: "Peer"}}, + }); err != nil { + t.Fatalf("SaveList: %v", err) + } + counting := &countingDialogStore{DialogStore: base} + versions := &fakeDialogReadModelVersions{hashes: map[store.ReadModelKey]int64{ + {Model: dialogLightReadModel, OwnerUserID: ownerID, PeerType: peer.Type, PeerID: peer.ID}: 101, + }} + photos := dialogProfilePhotos{peer.ID: {PhotoID: 1}} + dialogs := NewService(counting).Configure(WithReadModelVersions(versions), WithPhotoProvider(photos)) + first, err := dialogs.GetPeerDialogs(ctx, ownerID, []domain.Peer{peer}) + if err != nil { + t.Fatalf("first GetPeerDialogs: %v", err) + } + photos[peer.ID] = domain.ProfilePhotoRef{PhotoID: 2} + second, err := dialogs.GetPeerDialogs(ctx, ownerID, []domain.Peer{peer}) + if err != nil { + t.Fatalf("second GetPeerDialogs: %v", err) + } + if len(first.Users) != 1 || first.Users[0].PhotoID != 1 || len(second.Users) != 1 || second.Users[0].PhotoID != 2 { + t.Fatalf("projected photos first/second = %+v/%+v, want 1/2", first.Users, second.Users) + } + if counting.listByPeersCalls != 1 { + t.Fatalf("ListByPeers calls = %d, want one structural load", counting.listByPeersCalls) + } +} + +func TestDraftReadErrorIsNotCachedAsNegative(t *testing.T) { + ctx := context.Background() + const ownerID int64 = 1001 + peer := domain.Peer{Type: domain.PeerTypeUser, ID: 1002} + base := memory.NewDialogStore() + if err := base.SaveList(ctx, ownerID, domain.DialogList{Dialogs: []domain.Dialog{{Peer: peer}}}); err != nil { + t.Fatalf("SaveList: %v", err) + } + if err := base.SaveDraft(ctx, ownerID, domain.DialogDraft{Peer: peer, Message: "recovered"}); err != nil { + t.Fatalf("SaveDraft: %v", err) + } + counting := &countingDialogStore{DialogStore: base, listDraftsByPeersErr: errors.New("temporary draft read failure")} + versions := &fakeDialogReadModelVersions{hashes: map[store.ReadModelKey]int64{ + {Model: dialogLightReadModel, OwnerUserID: ownerID, PeerType: peer.Type, PeerID: peer.ID}: 101, + }} + dialogs := NewService(counting).Configure(WithReadModelVersions(versions)) + if _, err := dialogs.GetPeerDialogs(ctx, ownerID, []domain.Peer{peer}); err == nil { + t.Fatal("first GetPeerDialogs error = nil, want draft read failure") + } + counting.listDraftsByPeersErr = nil + got, err := dialogs.GetPeerDialogs(ctx, ownerID, []domain.Peer{peer}) + if err != nil { + t.Fatalf("recovered GetPeerDialogs: %v", err) + } + if len(got.Dialogs) != 1 || got.Dialogs[0].Draft == nil || got.Dialogs[0].Draft.Message != "recovered" { + t.Fatalf("recovered dialogs = %+v", got.Dialogs) + } + if counting.listDraftsByPeersCalls != 2 { + t.Fatalf("ListDraftsByPeers calls = %d, want retry after error", counting.listDraftsByPeersCalls) } } diff --git a/internal/app/dialogs/shared_list_snapshot.go b/internal/app/dialogs/shared_list_snapshot.go new file mode 100644 index 00000000..f6f3b48b --- /dev/null +++ b/internal/app/dialogs/shared_list_snapshot.go @@ -0,0 +1,208 @@ +package dialogs + +import ( + "context" + "errors" + "sort" + + "telesrv/internal/app/readmodel" + "telesrv/internal/domain" + "telesrv/internal/store" +) + +const dialogListSnapshotMaterializeAttempts = 2 + +var errDialogListSnapshotGenerationChanged = errors.New("dialog list snapshot owner generation changed") + +func (s *Service) loadDialogListSnapshot( + ctx context.Context, + key dialogListSnapshotKey, +) (*dialogListSnapshot, error) { + if s.sharedListCache == nil { + list, err := s.loadDialogOwnerSnapshotHeaders(ctx, key.userID) + if err != nil { + return nil, err + } + return newDialogListSnapshot(list), nil + } + if s.versions == nil { + return nil, errors.New("shared dialog list snapshot requires durable read-model versions") + } + + for attempt := 0; attempt < dialogListSnapshotMaterializeAttempts; attempt++ { + ownerHash, err := s.dialogOwnerHash(ctx, key.userID) + if err != nil { + return nil, err + } + snap, err := s.loadDialogListSnapshotAtOwnerHash(ctx, key, ownerHash) + if errors.Is(err, errDialogListSnapshotGenerationChanged) { + continue + } + return snap, err + } + return nil, errDialogListSnapshotGenerationChanged +} + +func (s *Service) loadDialogListSnapshotAtOwnerHash( + ctx context.Context, + key dialogListSnapshotKey, + ownerHash int64, +) (*dialogListSnapshot, error) { + if s.sharedListCache == nil { + list, err := s.loadDialogOwnerSnapshotHeaders(ctx, key.userID) + if err != nil { + return nil, err + } + return newDialogListSnapshot(list), nil + } + if s.versions == nil { + return nil, errors.New("shared dialog list snapshot requires durable read-model versions") + } + if ownerHash == 0 { + return nil, errors.New("dialog_owner read-model generation missing") + } + + sharedKey := sharedDialogListSnapshotKey(key, ownerHash) + cached, found, err := s.sharedListCache.GetDialogListSnapshot(ctx, sharedKey) + if err != nil { + return nil, err + } + if found { + snap := dialogListSnapshotFromShared(cached) + snap.ownerHash = ownerHash + dependencyHash, err := s.dialogListSnapshotDependencyHash(ctx, ownerHash, snap) + if err != nil { + return nil, err + } + if dependencyHash == cached.DependencyHash { + return snap, nil + } + } + + list, err := s.loadDialogOwnerSnapshotHeaders(ctx, key.userID) + if err != nil { + return nil, err + } + snap := newDialogListSnapshot(list) + currentOwnerHash, err := s.dialogOwnerHash(ctx, key.userID) + if err != nil { + return nil, err + } + if currentOwnerHash != ownerHash { + return nil, errDialogListSnapshotGenerationChanged + } + dependencyHash, err := s.dialogListSnapshotDependencyHash(ctx, ownerHash, snap) + if err != nil { + return nil, err + } + snap.ownerHash = ownerHash + snap.dependencyHash = dependencyHash + value := sharedDialogListSnapshotValue(snap, dependencyHash) + if err := s.sharedListCache.PutDialogListSnapshot(ctx, sharedKey, value); err != nil { + return nil, err + } + return snap, nil +} + +func (s *Service) dialogOwnerHash(ctx context.Context, userID int64) (int64, error) { + hash, found, err := s.versions.ReadModelHash( + ctx, readmodel.ModelDialogOwner, userID, domain.PeerTypeUser, userID, + ) + if err != nil { + return 0, err + } + if !found || hash == 0 { + return 0, errors.New("dialog_owner read-model generation missing") + } + return hash, nil +} + +func (s *Service) dialogListSnapshotDependencyHash( + ctx context.Context, + ownerHash int64, + snap *dialogListSnapshot, +) (int64, error) { + peers := dialogListSnapshotPeers(snap) + keys := make([]store.ReadModelKey, 0, len(peers)) + for _, peer := range peers { + if peer.Type == domain.PeerTypeChannel { + keys = append(keys, store.ReadModelKey{ + Model: readmodel.ModelChannelBase, PeerType: peer.Type, PeerID: peer.ID, + }) + } + } + hashes, err := s.versions.ReadModelHashes(ctx, keys) + if err != nil { + return 0, err + } + values := make([]int64, 0, len(keys)+1) + values = append(values, ownerHash) + for _, key := range keys { + hash := hashes[key] + if hash == 0 { + return 0, errors.New("dialog snapshot dependency generation missing") + } + values = append(values, hash) + } + return readmodel.MixHashes(values...), nil +} + +func dialogListSnapshotPeers(snap *dialogListSnapshot) []domain.Peer { + if snap == nil { + return nil + } + seen := make(map[domain.Peer]struct{}, len(snap.dialogs)+1) + peers := make([]domain.Peer, 0, len(snap.dialogs)+1) + appendPeer := func(peer domain.Peer) { + if peer.Type == "" || peer.ID == 0 { + return + } + if _, found := seen[peer]; found { + return + } + seen[peer] = struct{}{} + peers = append(peers, peer) + } + for _, dialog := range snap.dialogs { + appendPeer(dialog.Peer) + } + if snap.archive != nil { + appendPeer(snap.archive.TopPeer) + } + sort.Slice(peers, func(i, j int) bool { + if peers[i].Type != peers[j].Type { + return peers[i].Type < peers[j].Type + } + return peers[i].ID < peers[j].ID + }) + return peers +} + +func sharedDialogListSnapshotKey(key dialogListSnapshotKey, ownerHash int64) store.DialogListSnapshotCacheKey { + return store.DialogListSnapshotCacheKey{ + UserID: key.userID, OwnerHash: ownerHash, + } +} + +func sharedDialogListSnapshotValue(snap *dialogListSnapshot, dependencyHash int64) store.DialogListSnapshotCacheValue { + value := store.DialogListSnapshotCacheValue{DependencyHash: dependencyHash} + if snap == nil { + return value + } + value.Dialogs = cloneDialogSlice(snap.dialogs) + value.Messages = cloneDialogMessages(snap.messages) + value.Users = cloneDialogUsers(snap.users) + value.State = snap.state + value.ArchiveSummary = cloneDialogArchiveSummary(snap.archive) + return value +} + +func dialogListSnapshotFromShared(value store.DialogListSnapshotCacheValue) *dialogListSnapshot { + list := domain.DialogList{ + Dialogs: value.Dialogs, Messages: value.Messages, Users: value.Users, + State: value.State, ArchiveSummary: value.ArchiveSummary, + } + snap := newDialogListSnapshot(list) + snap.dependencyHash = value.DependencyHash + return snap +} diff --git a/internal/app/dialogs/shared_list_snapshot_test.go b/internal/app/dialogs/shared_list_snapshot_test.go new file mode 100644 index 00000000..df5d5c3a --- /dev/null +++ b/internal/app/dialogs/shared_list_snapshot_test.go @@ -0,0 +1,445 @@ +package dialogs + +import ( + "context" + "errors" + "testing" + + "telesrv/internal/app/readmodel" + "telesrv/internal/domain" + "telesrv/internal/store" + "telesrv/internal/store/memory" +) + +type fakeSharedDialogListSnapshotCache struct { + value store.DialogListSnapshotCacheValue + found bool + getErr error + putErr error + getCalls int + putCalls int + putKey store.DialogListSnapshotCacheKey + putValue store.DialogListSnapshotCacheValue +} + +func (f *fakeSharedDialogListSnapshotCache) GetDialogListSnapshot( + _ context.Context, + _ store.DialogListSnapshotCacheKey, +) (store.DialogListSnapshotCacheValue, bool, error) { + f.getCalls++ + return f.value, f.found, f.getErr +} + +func (f *fakeSharedDialogListSnapshotCache) PutDialogListSnapshot( + _ context.Context, + key store.DialogListSnapshotCacheKey, + value store.DialogListSnapshotCacheValue, +) error { + f.putCalls++ + f.putKey = key + f.putValue = value + return f.putErr +} + +func TestSharedDialogListSnapshotHitAvoidsAuthoritativeHeaderScan(t *testing.T) { + const ownerID int64 = 1001 + peer := domain.Peer{Type: domain.PeerTypeUser, ID: 1002} + versions := &fakeDialogReadModelVersions{hashes: map[store.ReadModelKey]int64{ + {Model: readmodel.ModelDialogOwner, OwnerUserID: ownerID, PeerType: domain.PeerTypeUser, PeerID: ownerID}: 11, + }} + shared := &fakeSharedDialogListSnapshotCache{ + found: true, + value: store.DialogListSnapshotCacheValue{ + DependencyHash: readmodel.MixHashes(11), + Dialogs: []domain.Dialog{{Peer: peer, TopMessage: 7, TopMessageDate: 70}}, + }, + } + authoritative := &snapshotDialogStore{DialogStore: memory.NewDialogStore()} + service := NewService(authoritative).Configure( + WithReadModelVersions(versions), + WithSharedDialogListSnapshotCache(shared), + ) + + snap, err := service.loadDialogListSnapshot(context.Background(), dialogListSnapshotKey{userID: ownerID}) + if err != nil { + t.Fatalf("load shared snapshot: %v", err) + } + if authoritative.snapshotCalls != 0 || shared.getCalls != 1 || shared.putCalls != 0 { + t.Fatalf("calls header/get/put = %d/%d/%d, want 0/1/0", + authoritative.snapshotCalls, shared.getCalls, shared.putCalls) + } + if snap == nil || len(snap.dialogs) != 1 || snap.dialogs[0].Peer != peer { + t.Fatalf("snapshot = %+v", snap) + } +} + +func TestPrivateDialogPeerIDsUsesVersionedSharedOwnerSnapshot(t *testing.T) { + const ownerID int64 = 1001 + newer := domain.Peer{Type: domain.PeerTypeUser, ID: 1004} + older := domain.Peer{Type: domain.PeerTypeUser, ID: 1003} + versions := &fakeDialogReadModelVersions{hashes: map[store.ReadModelKey]int64{ + {Model: readmodel.ModelDialogOwner, OwnerUserID: ownerID, PeerType: domain.PeerTypeUser, PeerID: ownerID}: 41, + }} + shared := &fakeSharedDialogListSnapshotCache{found: true, value: store.DialogListSnapshotCacheValue{ + DependencyHash: readmodel.MixHashes(41), + Dialogs: []domain.Dialog{ + {Peer: domain.Peer{Type: domain.PeerTypeUser, ID: ownerID}, TopMessageDate: 999}, + {Peer: domain.Peer{Type: domain.PeerTypeChannel, ID: 2001}, TopMessageDate: 998}, + {Peer: older, TopMessage: 9, TopMessageDate: 10}, + {Peer: domain.Peer{Type: domain.PeerTypeUser, ID: 1002}, TopMessage: 1, TopMessageDate: 20}, + {Peer: newer, TopMessage: 3, TopMessageDate: 20}, + }, + }} + authoritative := &snapshotDialogStore{DialogStore: memory.NewDialogStore()} + service := NewService(authoritative).Configure( + WithReadModelVersions(versions), + WithSharedDialogListSnapshotCache(shared), + ) + + ids, err := service.PrivateDialogPeerIDs(context.Background(), ownerID, 2) + if err != nil { + t.Fatal(err) + } + if len(ids) != 2 || ids[0] != newer.ID || ids[1] != 1002 { + t.Fatalf("private peer ids = %v, want [%d 1002]", ids, newer.ID) + } + if authoritative.privatePeerCalls != 0 || shared.getCalls != 1 { + t.Fatalf("authoritative/shared calls = %d/%d, want 0/1", authoritative.privatePeerCalls, shared.getCalls) + } +} + +func TestPrivateDialogPeerIDsCacheMissUsesStableNarrowStoreRead(t *testing.T) { + ctx := context.Background() + const ownerID int64 = 1001 + peer := domain.Peer{Type: domain.PeerTypeUser, ID: 1002} + base := memory.NewDialogStore() + if err := base.SaveList(ctx, ownerID, domain.DialogList{Dialogs: []domain.Dialog{{ + Peer: peer, TopMessage: 7, TopMessageDate: 70, + }}}); err != nil { + t.Fatal(err) + } + versions := &fakeDialogReadModelVersions{hashes: map[store.ReadModelKey]int64{ + {Model: readmodel.ModelDialogOwner, OwnerUserID: ownerID, PeerType: domain.PeerTypeUser, PeerID: ownerID}: 42, + }} + shared := &fakeSharedDialogListSnapshotCache{} + authoritative := &snapshotDialogStore{DialogStore: base} + service := NewService(authoritative).Configure( + WithReadModelVersions(versions), + WithSharedDialogListSnapshotCache(shared), + ) + + ids, err := service.PrivateDialogPeerIDs(ctx, ownerID, 100) + if err != nil { + t.Fatal(err) + } + if len(ids) != 1 || ids[0] != peer.ID || authoritative.privatePeerCalls != 1 || shared.getCalls != 1 { + t.Fatalf("ids/calls = %v/%d/%d, want [%d]/1/1", ids, authoritative.privatePeerCalls, shared.getCalls, peer.ID) + } +} + +func TestSharedDialogListSnapshotHitServesMaterializedPageWithoutPeerHydration(t *testing.T) { + const ownerID int64 = 1001 + peer := domain.Peer{Type: domain.PeerTypeUser, ID: 1002} + versions := &fakeDialogReadModelVersions{hashes: map[store.ReadModelKey]int64{ + {Model: readmodel.ModelDialogOwner, OwnerUserID: ownerID, PeerType: domain.PeerTypeUser, PeerID: ownerID}: 12, + }} + shared := &fakeSharedDialogListSnapshotCache{ + found: true, + value: store.DialogListSnapshotCacheValue{ + DependencyHash: readmodel.MixHashes(12), + Dialogs: []domain.Dialog{{ + Peer: peer, TopMessage: 7, TopMessageDate: 70, + Draft: &domain.DialogDraft{Peer: peer, Date: 71, Message: "materialized draft"}, + }}, + Messages: []domain.Message{{ID: 7, Peer: peer, From: peer, Date: 70, Body: "materialized"}}, + Users: []domain.User{{ID: peer.ID, FirstName: "cached"}}, + }, + } + authoritative := &snapshotDialogStore{DialogStore: memory.NewDialogStore()} + service := NewService(authoritative).Configure( + WithReadModelVersions(versions), + WithSharedDialogListSnapshotCache(shared), + ) + + page, err := service.GetDialogs(context.Background(), ownerID, domain.DialogFilter{Limit: 100}) + if err != nil { + t.Fatalf("get materialized shared page: %v", err) + } + if authoritative.snapshotCalls != 0 || authoritative.listByPeersCalls != 0 || authoritative.listDraftsCalls != 0 { + t.Fatalf("authoritative snapshot/peer/draft calls = %d/%d/%d, want 0/0/0", + authoritative.snapshotCalls, authoritative.listByPeersCalls, authoritative.listDraftsCalls) + } + if len(page.Dialogs) != 1 || len(page.Messages) != 1 || page.Messages[0].Body != "materialized" || + len(page.Users) != 1 || page.Users[0].ID != peer.ID || page.Dialogs[0].Draft == nil || + page.Dialogs[0].Draft.Message != "materialized draft" { + t.Fatalf("materialized page = dialogs:%+v messages:%+v users:%+v", page.Dialogs, page.Messages, page.Users) + } +} + +func TestSharedDialogListSnapshotDependencyMismatchRebuildsAndPublishes(t *testing.T) { + const ownerID int64 = 1001 + peer := domain.Peer{Type: domain.PeerTypeUser, ID: 1002} + versions := &fakeDialogReadModelVersions{hashes: map[store.ReadModelKey]int64{ + {Model: readmodel.ModelDialogOwner, OwnerUserID: ownerID, PeerType: domain.PeerTypeUser, PeerID: ownerID}: 31, + }} + shared := &fakeSharedDialogListSnapshotCache{ + found: true, + value: store.DialogListSnapshotCacheValue{ + DependencyHash: 999, + Dialogs: []domain.Dialog{{Peer: peer, TopMessage: 1}}, + }, + } + authoritative := &snapshotDialogStore{DialogStore: memory.NewDialogStore(), list: domain.DialogList{ + Dialogs: []domain.Dialog{{Peer: peer, TopMessage: 8, TopMessageDate: 80}}, Count: 1, + }} + service := NewService(authoritative).Configure( + WithReadModelVersions(versions), + WithSharedDialogListSnapshotCache(shared), + ) + + snap, err := service.loadDialogListSnapshot(context.Background(), dialogListSnapshotKey{userID: ownerID}) + if err != nil { + t.Fatalf("rebuild shared snapshot: %v", err) + } + if authoritative.snapshotCalls != 1 || shared.putCalls != 1 { + t.Fatalf("calls header/put = %d/%d, want 1/1", authoritative.snapshotCalls, shared.putCalls) + } + if shared.putKey.OwnerHash != 31 || shared.putValue.DependencyHash != readmodel.MixHashes(31) { + t.Fatalf("published key/value = %+v/%+v", shared.putKey, shared.putValue) + } + if snap == nil || len(snap.dialogs) != 1 || snap.dialogs[0].TopMessage != 8 { + t.Fatalf("rebuilt snapshot = %+v", snap) + } +} + +func TestSharedDialogListSnapshotValidatesSharedChannelGeneration(t *testing.T) { + const ownerID int64 = 1001 + peer := domain.Peer{Type: domain.PeerTypeChannel, ID: 2001} + versions := &fakeDialogReadModelVersions{hashes: map[store.ReadModelKey]int64{ + {Model: readmodel.ModelDialogOwner, OwnerUserID: ownerID, PeerType: domain.PeerTypeUser, PeerID: ownerID}: 61, + {Model: readmodel.ModelChannelBase, PeerType: peer.Type, PeerID: peer.ID}: 71, + }} + shared := &fakeSharedDialogListSnapshotCache{ + found: true, + value: store.DialogListSnapshotCacheValue{ + DependencyHash: readmodel.MixHashes(61, 70), + Dialogs: []domain.Dialog{{Peer: peer, TopMessage: 1}}, + }, + } + authoritative := &snapshotDialogStore{DialogStore: memory.NewDialogStore(), list: domain.DialogList{ + Dialogs: []domain.Dialog{{Peer: peer, TopMessage: 2}}, Count: 1, + }} + service := NewService(authoritative).Configure( + WithReadModelVersions(versions), + WithSharedDialogListSnapshotCache(shared), + ) + + _, err := service.loadDialogListSnapshot(context.Background(), dialogListSnapshotKey{userID: ownerID}) + if err != nil { + t.Fatalf("rebuild after channel generation change: %v", err) + } + if authoritative.snapshotCalls != 1 || shared.putCalls != 1 || + shared.putValue.DependencyHash != readmodel.MixHashes(61, 71) { + t.Fatalf("calls/header dependency = %d/%d/%d, want 1/1/%d", + authoritative.snapshotCalls, shared.putCalls, shared.putValue.DependencyHash, + readmodel.MixHashes(61, 71)) + } +} + +func TestSharedDialogListSnapshotRedisErrorFailsClosed(t *testing.T) { + const ownerID int64 = 1001 + versions := &fakeDialogReadModelVersions{hashes: map[store.ReadModelKey]int64{ + {Model: readmodel.ModelDialogOwner, OwnerUserID: ownerID, PeerType: domain.PeerTypeUser, PeerID: ownerID}: 51, + }} + shared := &fakeSharedDialogListSnapshotCache{getErr: errors.New("redis unavailable")} + authoritative := &snapshotDialogStore{DialogStore: memory.NewDialogStore()} + service := NewService(authoritative).Configure( + WithReadModelVersions(versions), + WithSharedDialogListSnapshotCache(shared), + ) + + _, err := service.loadDialogListSnapshot(context.Background(), dialogListSnapshotKey{userID: ownerID}) + if err == nil || authoritative.snapshotCalls != 0 || shared.putCalls != 0 { + t.Fatalf("err=%v header_calls=%d put_calls=%d, want fail-closed before PostgreSQL scan", + err, authoritative.snapshotCalls, shared.putCalls) + } +} + +func TestGetDialogsL1RejectsOldOwnerGenerationBeforeHydration(t *testing.T) { + const ownerID int64 = 1001 + peer := domain.Peer{Type: domain.PeerTypeUser, ID: 1002} + ownerKey := store.ReadModelKey{ + Model: readmodel.ModelDialogOwner, OwnerUserID: ownerID, + PeerType: domain.PeerTypeUser, PeerID: ownerID, + } + versions := &fakeDialogReadModelVersions{hashes: map[store.ReadModelKey]int64{ownerKey: 11}} + shared := &fakeSharedDialogListSnapshotCache{} + authoritative := &snapshotDialogStore{DialogStore: memory.NewDialogStore(), list: domain.DialogList{ + Dialogs: []domain.Dialog{{Peer: peer, TopMessage: 7, TopMessageDate: 70}}, + Users: []domain.User{{ID: peer.ID}}, + Count: 1, + }} + service := NewService(authoritative).Configure( + WithReadModelVersions(versions), + WithSharedDialogListSnapshotCache(shared), + ) + filter := domain.DialogFilter{ExcludePinned: true, Limit: 100} + first, err := service.GetDialogs(context.Background(), ownerID, filter) + if err != nil || len(first.Dialogs) != 1 { + t.Fatalf("first GetDialogs = dialogs:%d err:%v", len(first.Dialogs), err) + } + + authoritative.list = domain.DialogList{} + versions.hashes[ownerKey] = 12 + second, err := service.GetDialogs(context.Background(), ownerID, filter) + if err != nil { + t.Fatalf("GetDialogs after owner generation advance: %v", err) + } + if len(second.Dialogs) != 0 || authoritative.snapshotCalls != 2 { + t.Fatalf("second dialogs/snapshot calls = %d/%d, want 0/2", len(second.Dialogs), authoritative.snapshotCalls) + } +} + +func TestGetDialogsRetriesWhenOwnerGenerationChangesDuringHydration(t *testing.T) { + const ownerID int64 = 1001 + peer := domain.Peer{Type: domain.PeerTypeUser, ID: 1002} + ownerKey := store.ReadModelKey{ + Model: readmodel.ModelDialogOwner, OwnerUserID: ownerID, + PeerType: domain.PeerTypeUser, PeerID: ownerID, + } + versions := &fakeDialogReadModelVersions{hashes: map[store.ReadModelKey]int64{ownerKey: 21}} + authoritative := &snapshotDialogStore{DialogStore: memory.NewDialogStore(), list: domain.DialogList{ + Dialogs: []domain.Dialog{{Peer: peer, TopMessage: 7, TopMessageDate: 70}}, + Users: []domain.User{{ID: peer.ID}}, + Count: 1, + }} + authoritative.onListByPeers = func() { + authoritative.list = domain.DialogList{} + versions.hashes[ownerKey] = 22 + } + service := NewService(authoritative).Configure( + WithReadModelVersions(versions), + WithSharedDialogListSnapshotCache(&fakeSharedDialogListSnapshotCache{}), + ) + + list, err := service.GetDialogs(context.Background(), ownerID, domain.DialogFilter{ExcludePinned: true, Limit: 100}) + if err != nil { + t.Fatalf("GetDialogs across owner generation change: %v", err) + } + if len(list.Dialogs) != 0 || authoritative.snapshotCalls != 2 { + t.Fatalf("dialogs/snapshot calls = %d/%d, want stable empty generation and 2 loads", len(list.Dialogs), authoritative.snapshotCalls) + } +} + +func TestGetDialogsRetriesWhenDraftChangesDuringOwnerSnapshot(t *testing.T) { + ctx := context.Background() + const ownerID int64 = 1001 + peer := domain.Peer{Type: domain.PeerTypeUser, ID: 1002} + ownerKey := store.ReadModelKey{ + Model: readmodel.ModelDialogOwner, OwnerUserID: ownerID, + PeerType: domain.PeerTypeUser, PeerID: ownerID, + } + versions := &fakeDialogReadModelVersions{hashes: map[store.ReadModelKey]int64{ownerKey: 31}} + base := memory.NewDialogStore() + if err := base.SaveDraft(ctx, ownerID, domain.DialogDraft{Peer: peer, Date: 1, Message: "old"}); err != nil { + t.Fatal(err) + } + authoritative := &snapshotDialogStore{DialogStore: base, list: domain.DialogList{ + Dialogs: []domain.Dialog{{Peer: peer, TopMessage: 7, TopMessageDate: 70}}, + Users: []domain.User{{ID: peer.ID}}, + Count: 1, + }} + authoritative.onListDrafts = func() { + if err := base.SaveDraft(ctx, ownerID, domain.DialogDraft{Peer: peer, Date: 2, Message: "new"}); err != nil { + t.Fatal(err) + } + versions.hashes[ownerKey] = 32 + } + service := NewService(authoritative).Configure( + WithReadModelVersions(versions), + WithSharedDialogListSnapshotCache(&fakeSharedDialogListSnapshotCache{}), + ) + + list, err := service.GetDialogs(ctx, ownerID, domain.DialogFilter{ExcludePinned: true, Limit: 100}) + if err != nil { + t.Fatalf("GetDialogs across draft generation change: %v", err) + } + if len(list.Dialogs) != 1 || list.Dialogs[0].Draft == nil || list.Dialogs[0].Draft.Message != "new" { + t.Fatalf("stable draft snapshot = %+v", list.Dialogs) + } + if authoritative.snapshotCalls != 2 || authoritative.listDraftsCalls != 2 { + t.Fatalf("snapshot/draft loads = %d/%d, want 2/2 after generation retry", + authoritative.snapshotCalls, authoritative.listDraftsCalls) + } +} + +func TestOwnerBaseSnapshotDerivesBuiltInFolderVariantsOnce(t *testing.T) { + const ownerID int64 = 1001 + mainPinned := domain.Peer{Type: domain.PeerTypeUser, ID: 2001} + mainRegular := domain.Peer{Type: domain.PeerTypeUser, ID: 2002} + archived := domain.Peer{Type: domain.PeerTypeUser, ID: 2003} + ownerKey := store.ReadModelKey{ + Model: readmodel.ModelDialogOwner, OwnerUserID: ownerID, + PeerType: domain.PeerTypeUser, PeerID: ownerID, + } + versions := &fakeDialogReadModelVersions{hashes: map[store.ReadModelKey]int64{ownerKey: 81}} + authoritative := &snapshotDialogStore{DialogStore: memory.NewDialogStore(), list: domain.DialogList{ + Dialogs: []domain.Dialog{ + {Peer: mainPinned, FolderID: domain.DialogMainFolderID, TopMessage: 30, TopMessageDate: 300, Pinned: true, PinnedOrder: 1}, + {Peer: mainRegular, FolderID: domain.DialogMainFolderID, TopMessage: 20, TopMessageDate: 200}, + {Peer: archived, FolderID: domain.DialogArchiveFolderID, TopMessage: 10, TopMessageDate: 100}, + }, + Users: []domain.User{{ID: mainPinned.ID}, {ID: mainRegular.ID}, {ID: archived.ID}}, + }} + shared := &fakeSharedDialogListSnapshotCache{} + service := NewService(authoritative).Configure( + WithReadModelVersions(versions), + WithSharedDialogListSnapshotCache(shared), + ) + + main, err := service.GetDialogs(context.Background(), ownerID, domain.DialogFilter{Limit: 100}) + if err != nil { + t.Fatal(err) + } + excludePinned, err := service.GetDialogs(context.Background(), ownerID, domain.DialogFilter{ExcludePinned: true, Limit: 100}) + if err != nil { + t.Fatal(err) + } + pinned, err := service.GetDialogs(context.Background(), ownerID, domain.DialogFilter{PinnedOnly: true, Limit: 100}) + if err != nil { + t.Fatal(err) + } + archive, err := service.GetDialogs(context.Background(), ownerID, domain.DialogFilter{ + HasFolderID: true, FolderID: domain.DialogArchiveFolderID, Limit: 100, + }) + if err != nil { + t.Fatal(err) + } + explicitMain, err := service.GetDialogs(context.Background(), ownerID, domain.DialogFilter{ + HasFolderID: true, FolderID: domain.DialogMainFolderID, Limit: 100, + }) + if err != nil { + t.Fatal(err) + } + + if authoritative.snapshotCalls != 1 || authoritative.listByPeersCalls != 1 || shared.getCalls != 1 || shared.putCalls != 1 { + t.Fatalf("base/peer/get/put calls = %d/%d/%d/%d, want 1/1/1/1", + authoritative.snapshotCalls, authoritative.listByPeersCalls, shared.getCalls, shared.putCalls) + } + if len(main.Dialogs) != 2 || main.Dialogs[0].Peer != mainPinned || main.Dialogs[1].Peer != mainRegular || main.ArchiveSummary == nil || main.ArchiveSummary.TopPeer != archived { + t.Fatalf("main variant = %+v", main) + } + if len(excludePinned.Dialogs) != 1 || excludePinned.Dialogs[0].Peer != mainRegular || excludePinned.ArchiveSummary != nil { + t.Fatalf("exclude-pinned variant = %+v", excludePinned) + } + if len(pinned.Dialogs) != 1 || pinned.Dialogs[0].Peer != mainPinned || pinned.ArchiveSummary == nil { + t.Fatalf("pinned variant = %+v", pinned) + } + if len(archive.Dialogs) != 1 || archive.Dialogs[0].Peer != archived || archive.ArchiveSummary != nil { + t.Fatalf("archive variant = %+v", archive) + } + if explicitMain.Hash != main.Hash || main.Hash == 0 || excludePinned.Hash == main.Hash || pinned.Hash == main.Hash || archive.Hash == main.Hash { + t.Fatalf("variant hashes main=%d explicit=%d exclude=%d pinned=%d archive=%d", + main.Hash, explicitMain.Hash, excludePinned.Hash, pinned.Hash, archive.Hash) + } +} diff --git a/internal/app/files/blobcache_test.go b/internal/app/files/blobcache_test.go index 9f069d14..13938eeb 100644 --- a/internal/app/files/blobcache_test.go +++ b/internal/app/files/blobcache_test.go @@ -69,7 +69,7 @@ func TestGetFileCachesMetadataAndSmallBlobBytes(t *testing.T) { t.Fatalf("put: %v", err) } media := newFakeMediaStore() - if err := media.PutFileBlob(ctx, domain.FileBlob{LocationKey: "doc:42", ObjectKey: objectKey, Size: 10, MimeType: "application/octet-stream"}); err != nil { + if err := media.PutFileBlob(ctx, domain.FileBlob{LocationKey: "doc:42", Backend: domain.MediaBackendLocalFS, ObjectKey: objectKey, Size: 10, MimeType: "application/octet-stream"}); err != nil { t.Fatalf("put blob: %v", err) } counting := &countingMediaStore{fakeMediaStore: media} @@ -121,7 +121,7 @@ func TestGetFileLogsCacheHitMiss(t *testing.T) { t.Fatalf("put: %v", err) } media := newFakeMediaStore() - if err := media.PutFileBlob(ctx, domain.FileBlob{LocationKey: "doc:log", ObjectKey: objectKey, Size: 10, MimeType: "application/octet-stream"}); err != nil { + if err := media.PutFileBlob(ctx, domain.FileBlob{LocationKey: "doc:log", Backend: domain.MediaBackendLocalFS, ObjectKey: objectKey, Size: 10, MimeType: "application/octet-stream"}); err != nil { t.Fatalf("put blob: %v", err) } blobs := &countingBlobBackend{BlobBackend: local} @@ -176,6 +176,7 @@ func TestGetFileDoesNotByteCacheLargeBlob(t *testing.T) { media := newFakeMediaStore() if err := media.PutFileBlob(ctx, domain.FileBlob{ LocationKey: "doc:large", + Backend: domain.MediaBackendLocalFS, ObjectKey: objectKey, Size: int64(len(content)), MimeType: "application/octet-stream", @@ -199,6 +200,33 @@ func TestGetFileDoesNotByteCacheLargeBlob(t *testing.T) { } } +func TestGetFileRejectsStoredBackendMismatch(t *testing.T) { + ctx := context.Background() + local, err := NewLocalFS(t.TempDir()) + if err != nil { + t.Fatalf("local fs: %v", err) + } + objectKey, err := local.Put(ctx, []byte("must-not-fallback")) + if err != nil { + t.Fatalf("put: %v", err) + } + media := newFakeMediaStore() + if err := media.PutFileBlob(ctx, domain.FileBlob{ + LocationKey: "doc:mismatch", + Backend: domain.MediaBackendS3, + ObjectKey: objectKey, + Size: int64(len("must-not-fallback")), + }); err != nil { + t.Fatalf("put blob: %v", err) + } + svc := NewService(media, local, 2) + if _, found, err := svc.GetFile(ctx, domain.FileDownloadRequest{ + LocationKey: "doc:mismatch", Limit: 128 << 10, + }); err == nil || found { + t.Fatalf("mismatched backend found=%v err=%v", found, err) + } +} + func TestWarmCachesPreloadsStickerSetAndSmallBlobs(t *testing.T) { ctx := context.Background() local, err := NewLocalFS(t.TempDir()) @@ -227,10 +255,10 @@ func TestWarmCachesPreloadsStickerSetAndSmallBlobs(t *testing.T) { if err := media.PutDocument(ctx, doc); err != nil { t.Fatalf("put doc: %v", err) } - if err := media.PutFileBlob(ctx, domain.FileBlob{LocationKey: "doc:100", ObjectKey: mainKey, Size: 7, MimeType: doc.MimeType}); err != nil { + if err := media.PutFileBlob(ctx, domain.FileBlob{LocationKey: "doc:100", Backend: domain.MediaBackendLocalFS, ObjectKey: mainKey, Size: 7, MimeType: doc.MimeType}); err != nil { t.Fatalf("put main blob: %v", err) } - if err := media.PutFileBlob(ctx, domain.FileBlob{LocationKey: "doc:100:m", ObjectKey: thumbKey, Size: 5, MimeType: "image/jpeg"}); err != nil { + if err := media.PutFileBlob(ctx, domain.FileBlob{LocationKey: "doc:100:m", Backend: domain.MediaBackendLocalFS, ObjectKey: thumbKey, Size: 5, MimeType: "image/jpeg"}); err != nil { t.Fatalf("put thumb blob: %v", err) } set := domain.StickerSet{ diff --git a/internal/app/files/photos_test.go b/internal/app/files/photos_test.go index 10058a66..d7d308a5 100644 --- a/internal/app/files/photos_test.go +++ b/internal/app/files/photos_test.go @@ -549,7 +549,7 @@ func TestCreateAvatarVideoMarkupFallsBackToVideoFirstFrame(t *testing.T) { assertAvatarImageSize(t, svc, photo.ID, "a", 160, 160, "image/jpeg") } -func TestCreateAvatarVideoMarkupRejectsSyntheticPreviewAndFallsBackToVideo(t *testing.T) { +func TestCreateAvatarVideoMarkupRejectsDegeneratePreviewAndFallsBackToVideo(t *testing.T) { ctx := context.Background() media := newFakeMediaStore() blobs, err := NewLocalFS(t.TempDir()) @@ -562,7 +562,7 @@ func TestCreateAvatarVideoMarkupRejectsSyntheticPreviewAndFallsBackToVideo(t *te MimeType: "application/x-tgsticker", Thumbs: []domain.PhotoSize{{ Kind: domain.PhotoSizeKindCached, Type: "m", W: 1, H: 1, - Bytes: append([]byte(nil), seedSyntheticTGStickerPreviewThumbPNG...), + Bytes: testJPEG(t, 1, 1), }}, }); err != nil { t.Fatalf("PutDocument: %v", err) @@ -581,14 +581,14 @@ func TestCreateAvatarVideoMarkupRejectsSyntheticPreviewAndFallsBackToVideo(t *te t.Fatalf("CreateAvatarVideoMarkupFromUpload: %v", err) } if thumbnailer.calls != 1 { - t.Fatalf("thumbnailer calls = %d, want synthetic preview rejected and video fallback used", thumbnailer.calls) + t.Fatalf("thumbnailer calls = %d, want degenerate preview rejected and video fallback used", thumbnailer.calls) } chunk, found, err := svc.GetFile(ctx, domain.FileDownloadRequest{LocationKey: fmt.Sprintf("photo:%d:c", photo.ID), Limit: 1 << 20}) if err != nil || !found { t.Fatalf("avatar c blob found=%v err=%v", found, err) } if !bytes.Equal(chunk.Bytes, frame) { - t.Fatal("avatar still did not use extracted video frame after rejecting synthetic preview") + t.Fatal("avatar still did not use extracted video frame after rejecting degenerate preview") } } diff --git a/internal/app/files/seed.go b/internal/app/files/seed.go index 8ca5d97e..09241cbc 100644 --- a/internal/app/files/seed.go +++ b/internal/app/files/seed.go @@ -1,14 +1,10 @@ package files import ( - "bytes" "context" "encoding/hex" "encoding/json" "fmt" - "image" - "image/color" - "image/png" "os" "path/filepath" "regexp" @@ -485,6 +481,9 @@ func (s *Service) importDocument(ctx context.Context, dj seedDocumentJSON, binDi thumbs = append(thumbs, ps) } doc.Thumbs = thumbs + if data, ok := seedBundledDocumentPreview(doc.ID); ok { + doc.Thumbs = appendSeedBundledDocumentPreview(doc.Thumbs, data) + } if existingFound { doc.Thumbs = mergeSeedDocumentThumbs(existing.Thumbs, doc.Thumbs) } @@ -492,10 +491,6 @@ func (s *Service) importDocument(ctx context.Context, dj seedDocumentJSON, binDi return domain.Document{}, err } - if err := s.ensureTGStickerPreviewThumb(ctx, &doc, stats); err != nil { - return domain.Document{}, err - } - if err := s.media.PutDocument(ctx, doc); err != nil { return domain.Document{}, err } @@ -503,6 +498,27 @@ func (s *Service) importDocument(ctx context.Context, dj seedDocumentJSON, binDi return doc, nil } +func appendSeedBundledDocumentPreview(thumbs []domain.PhotoSize, data []byte) []domain.PhotoSize { + for _, thumb := range thumbs { + if thumb.Type == seedBundledDocumentThumbType && seedPhotoSizePreviewTier(thumb) >= 4 { + return thumbs + } + } + out := thumbs[:0] + for _, thumb := range thumbs { + if thumb.Type != seedBundledDocumentThumbType { + out = append(out, thumb) + } + } + return append(out, domain.PhotoSize{ + Kind: domain.PhotoSizeKindCached, + Type: seedBundledDocumentThumbType, + W: 128, + H: 128, + Bytes: append([]byte(nil), data...), + }) +} + func (s *Service) prewarmSmallBlob(objectKey string, data []byte) { if len(data) > 0 && len(data) <= blobBytesCacheMaxEntryBytes { s.byteCache.put(objectKey, data) @@ -520,10 +536,8 @@ var seedTrailingDigits = regexp.MustCompile(`(\d{6,})`) var seedThumbMarker = regexp.MustCompile(`_thumb\d+_`) const seedInlineCachedDocumentThumbMaxBytes = 32 * 1024 -const seedSyntheticDocumentThumbType = "m" var seedThumbType = regexp.MustCompile(`PhotoSize_type([a-z])`) -var seedSyntheticTGStickerPreviewThumbPNG = makeSeedSyntheticTGStickerPreviewThumbPNG() func scanSeedDir(dir string) (seedDirIndex, error) { idx := seedDirIndex{main: map[int64]string{}, thumb: map[int64]map[string]string{}} @@ -758,23 +772,7 @@ func mergeSeedDocumentThumbs(existing, incoming []domain.PhotoSize) []domain.Pho out = append(out, thumb) } - hasRealPreview := false - for _, thumb := range out { - if !seedSyntheticTGStickerPreviewThumb(thumb) && seedPhotoSizePreviewTier(thumb) > 1 { - hasRealPreview = true - break - } - } - if !hasRealPreview { - return out - } - filtered := out[:0] - for _, thumb := range out { - if !seedSyntheticTGStickerPreviewThumb(thumb) { - filtered = append(filtered, thumb) - } - } - return filtered + return out } func seedDocumentThumbByType(thumbs []domain.PhotoSize, typ string) (domain.PhotoSize, bool) { @@ -800,9 +798,6 @@ func seedPhotoSizeBetter(a, b domain.PhotoSize) bool { } func seedPhotoSizePreviewTier(thumb domain.PhotoSize) int { - if seedSyntheticTGStickerPreviewThumb(thumb) { - return 0 - } switch thumb.Kind { case domain.PhotoSizeKindCached: if len(thumb.Bytes) > 0 && thumb.W > 0 && thumb.H > 0 { @@ -820,13 +815,6 @@ func seedPhotoSizePreviewTier(thumb domain.PhotoSize) int { return 1 } -func seedSyntheticTGStickerPreviewThumb(thumb domain.PhotoSize) bool { - return thumb.Kind == domain.PhotoSizeKindCached && - thumb.Type == seedSyntheticDocumentThumbType && - thumb.W == 1 && thumb.H == 1 && - bytes.Equal(thumb.Bytes, seedSyntheticTGStickerPreviewThumbPNG) -} - // ensureSeedCachedThumbBlobs keeps the RPC conversion invariant: document cached // previews are exposed as downloadable PhotoSize entries, so every advertised type // must have a matching blob even when the source JSON carried the bytes inline. @@ -866,43 +854,6 @@ func (s *Service) ensureSeedCachedThumbBlobs(ctx context.Context, doc domain.Doc return nil } -func (s *Service) ensureTGStickerPreviewThumb(ctx context.Context, doc *domain.Document, stats *SeedStats) error { - if !seedDocumentNeedsSyntheticTGStickerPreviewThumb(*doc) { - return nil - } - if s.blobs == nil { - return fmt.Errorf("blob backend not configured for synthetic sticker preview thumb") - } - data := seedSyntheticTGStickerPreviewThumbPNG - objectKey, err := s.blobs.Put(ctx, data) - if err != nil { - return err - } - if err := s.media.PutFileBlob(ctx, domain.FileBlob{ - LocationKey: fmt.Sprintf("doc:%d:%s", doc.ID, seedSyntheticDocumentThumbType), - Backend: domain.MediaBackend(s.blobs.Name()), - ObjectKey: objectKey, - Size: int64(len(data)), - MimeType: "image/png", - }); err != nil { - return err - } - doc.Thumbs = append(doc.Thumbs, domain.PhotoSize{ - Kind: domain.PhotoSizeKindCached, - Type: seedSyntheticDocumentThumbType, - W: 1, - H: 1, - Bytes: append([]byte(nil), data...), - }) - s.prewarmSmallBlob(objectKey, data) - stats.Blobs++ - return nil -} - -func seedDocumentNeedsSyntheticTGStickerPreviewThumb(doc domain.Document) bool { - return doc.MimeType == "application/x-tgsticker" && len(doc.Thumbs) == 0 -} - func seedDocumentHasAttribute(attrs []domain.DocumentAttribute, kind domain.DocumentAttributeKind) bool { for _, attr := range attrs { if attr.Kind == kind { @@ -912,14 +863,6 @@ func seedDocumentHasAttribute(attrs []domain.DocumentAttribute, kind domain.Docu return false } -func makeSeedSyntheticTGStickerPreviewThumbPNG() []byte { - var buf bytes.Buffer - img := image.NewNRGBA(image.Rect(0, 0, 1, 1)) - img.Set(0, 0, color.NRGBA{}) - _ = png.Encode(&buf, img) - return buf.Bytes() -} - func seedThumbMimeType(data []byte) string { switch { case len(data) >= 12 && data[0] == 'R' && data[1] == 'I' && data[2] == 'F' && data[3] == 'F' && @@ -980,9 +923,6 @@ func (s *Service) documentsNeedSeedRepair(ctx context.Context, ids []int64) (boo return false, err } for _, doc := range docs { - if seedDocumentNeedsSyntheticTGStickerPreviewThumb(doc) { - return true, nil - } for _, thumb := range doc.Thumbs { if thumb.Kind == domain.PhotoSizeKindDefault && thumb.Size > 0 && thumb.Size <= seedInlineCachedDocumentThumbMaxBytes { return true, nil diff --git a/internal/app/files/seed_state.go b/internal/app/files/seed_state.go index 0c0d1d5b..22999942 100644 --- a/internal/app/files/seed_state.go +++ b/internal/app/files/seed_state.go @@ -106,13 +106,12 @@ func seedDocumentJSONLocationKeys(dj seedDocumentJSON, index seedDirIndex) []str keys = append(keys, fmt.Sprintf("doc:%d:%s", dj.ID, ps.Type)) } } + if _, ok := seedBundledDocumentPreview(dj.ID); ok { + keys = append(keys, fmt.Sprintf("doc:%d:%s", dj.ID, seedBundledDocumentThumbType)) + } return keys } -func seedDocumentJSONNeedsSyntheticTGStickerPreviewThumb(dj seedDocumentJSON) bool { - return dj.MimeType == "application/x-tgsticker" && len(dj.Thumbs) == 0 -} - func (s *Service) seedDocumentJSONsReady(ctx context.Context, docs []seedDocumentJSON, index seedDirIndex) (bool, error) { expected := make(map[int64]seedDocumentJSON, len(docs)) ids := make([]int64, 0, len(docs)) @@ -152,27 +151,11 @@ func (s *Service) seedDocumentJSONsReady(ctx context.Context, docs []seedDocumen if doc.DCID != s.dc || doc.MimeType != dj.MimeType || doc.Size != dj.Size { return false, nil } - // A catalog without its own thumbnail may share this document with a richer - // catalog. Readiness follows the preview that is actually stored instead of - // demanding the synthetic "m" key and repeatedly downgrading that richer - // document on every import. - if seedDocumentJSONNeedsSyntheticTGStickerPreviewThumb(dj) { - if len(doc.Thumbs) == 0 { + if _, bundled := seedBundledDocumentPreview(dj.ID); bundled { + thumb, ok := seedDocumentThumbByType(doc.Thumbs, seedBundledDocumentThumbType) + if !ok || seedPhotoSizePreviewTier(thumb) < 4 { return false, nil } - for _, thumb := range doc.Thumbs { - switch thumb.Kind { - case domain.PhotoSizeKindDefault, domain.PhotoSizeKindProgressive, domain.PhotoSizeKindCached: - if thumb.Type == "" { - return false, nil - } - key := fmt.Sprintf("doc:%d:%s", doc.ID, thumb.Type) - if _, seen := seenLocationKeys[key]; !seen { - seenLocationKeys[key] = struct{}{} - locationKeys = append(locationKeys, key) - } - } - } } delete(expected, doc.ID) } diff --git a/internal/app/files/seed_test.go b/internal/app/files/seed_test.go index d5cda69f..d017e89e 100644 --- a/internal/app/files/seed_test.go +++ b/internal/app/files/seed_test.go @@ -4,6 +4,7 @@ import ( "bytes" "context" "fmt" + "image/png" "os" "path/filepath" "sort" @@ -463,8 +464,8 @@ func TestSeedMediaRepairsPartialReactionBlobs(t *testing.T) { svc := NewService(media, blobs, 2) if stats, err := svc.SeedMedia(context.Background(), seedDir, 0); err != nil { t.Fatalf("initial seed: %v", err) - } else if stats.Reactions != 1 || stats.Blobs != 3 { - t.Fatalf("initial stats = %+v, want one reaction and three blobs", stats) + } else if stats.Reactions != 1 || stats.Blobs != 2 { + t.Fatalf("initial stats = %+v, want one reaction and two document blobs", stats) } chunk, ok, err := svc.GetFile(context.Background(), domain.FileDownloadRequest{LocationKey: "doc:2222222", Offset: 0, Limit: 4}) if err != nil || !ok { @@ -486,7 +487,7 @@ func TestSeedMediaRepairsPartialReactionBlobs(t *testing.T) { t.Fatalf("repair seed: %v", err) } if stats.Reactions != 1 || stats.Blobs != 2 || stats.Skipped { - t.Fatalf("repair stats = %+v, want two missing/revalidated main blobs without rewriting intact preview", stats) + t.Fatalf("repair stats = %+v, want two revalidated main document blobs", stats) } if _, ok, _ := media.GetFileBlob(context.Background(), "doc:2222222"); !ok { t.Fatal("missing reaction blob was not repaired") @@ -496,10 +497,10 @@ func TestSeedMediaRepairsPartialReactionBlobs(t *testing.T) { } } -func TestSeedCustomEmojiTGSWithoutThumbGetsSyntheticPreview(t *testing.T) { +func TestSeedStatusPackTGSWithoutExportedThumbUsesBundledPreview(t *testing.T) { ctx := context.Background() seedDir := t.TempDir() - const sourceID int64 = 4444444 + const sourceID int64 = 5247133031235329609 writeStatusPackWithoutThumbSeed(t, seedDir, sourceID, 17) media := newFakeMediaStore() @@ -513,7 +514,7 @@ func TestSeedCustomEmojiTGSWithoutThumbGetsSyntheticPreview(t *testing.T) { t.Fatalf("seed media: %v", err) } if stats.StickerSets != 1 || stats.Documents != 1 || stats.Blobs != 2 || stats.Skipped { - t.Fatalf("stats = %+v, want one set, one doc, main blob plus synthetic preview", stats) + t.Fatalf("stats = %+v, want one set, one doc, main blob plus bundled preview", stats) } set, ok, err := media.GetStickerSetByShortName(ctx, "StatusPack") @@ -529,21 +530,52 @@ func TestSeedCustomEmojiTGSWithoutThumbGetsSyntheticPreview(t *testing.T) { } thumb, ok := findCachedThumb(doc.Thumbs) if !ok { - t.Fatalf("document thumbs = %+v, want synthetic cached preview", doc.Thumbs) + t.Fatalf("document thumbs = %+v, want bundled cached preview", doc.Thumbs) } - if thumb.Type != seedSyntheticDocumentThumbType || thumb.W != 1 || thumb.H != 1 || len(thumb.Bytes) == 0 { - t.Fatalf("synthetic thumb = %+v, want 1x1 cached %q thumb", thumb, seedSyntheticDocumentThumbType) + want, ok := seedBundledDocumentPreview(sourceID) + if !ok { + t.Fatal("bundled StatusPack preview missing") + } + if thumb.Type != seedBundledDocumentThumbType || thumb.W != 128 || thumb.H != 128 || !bytes.Equal(thumb.Bytes, want) { + t.Fatalf("bundled thumb = %+v, want visible 128x128 cached %q preview", thumb, seedBundledDocumentThumbType) } blob, ok, err := media.GetFileBlob(ctx, fmt.Sprintf("doc:%d:%s", doc.ID, thumb.Type)) if err != nil || !ok { - t.Fatalf("synthetic thumb blob ok=%v err=%v", ok, err) + t.Fatalf("bundled thumb blob ok=%v err=%v", ok, err) } if blob.MimeType != "image/png" { - t.Fatalf("synthetic thumb blob mime = %q, want image/png", blob.MimeType) + t.Fatalf("bundled thumb blob mime = %q, want image/png", blob.MimeType) } } -func TestSeedMediaRepairsCustomEmojiTGSWithoutThumb(t *testing.T) { +func TestBundledStatusPackPreviewsAreVisibleTransparentPNGs(t *testing.T) { + if len(seedBundledDocumentPreviews) != 11 { + t.Fatalf("bundled StatusPack previews = %d, want 11", len(seedBundledDocumentPreviews)) + } + for documentID, data := range seedBundledDocumentPreviews { + img, err := png.Decode(bytes.NewReader(data)) + if err != nil { + t.Fatalf("decode bundled preview %d: %v", documentID, err) + } + if bounds := img.Bounds(); bounds.Dx() != 128 || bounds.Dy() != 128 { + t.Fatalf("bundled preview %d bounds = %v, want 128x128", documentID, bounds) + } + visible := false + transparent := false + for y := img.Bounds().Min.Y; y < img.Bounds().Max.Y; y++ { + for x := img.Bounds().Min.X; x < img.Bounds().Max.X; x++ { + _, _, _, alpha := img.At(x, y).RGBA() + visible = visible || alpha != 0 + transparent = transparent || alpha != 0xffff + } + } + if !visible || !transparent { + t.Fatalf("bundled preview %d visible=%v transparent=%v", documentID, visible, transparent) + } + } +} + +func TestSeedMediaDoesNotInventPreviewForUnknownTGS(t *testing.T) { ctx := context.Background() seedDir := t.TempDir() const sourceID int64 = 5555555 @@ -586,15 +618,15 @@ func TestSeedMediaRepairsCustomEmojiTGSWithoutThumb(t *testing.T) { if err != nil { t.Fatalf("repair seed: %v", err) } - if stats.StickerSets != 1 || stats.Documents != 1 || stats.Blobs != 2 || stats.Skipped { - t.Fatalf("repair stats = %+v, want forced reimport", stats) + if stats.StickerSets != 1 || stats.Documents != 1 || stats.Blobs != 1 || stats.Skipped { + t.Fatalf("reimport stats = %+v, want main document blob only", stats) } doc, ok, err := media.GetDocument(ctx, sourceID) if err != nil || !ok { t.Fatalf("repaired document ok=%v err=%v", ok, err) } - if _, ok := findCachedThumb(doc.Thumbs); !ok { - t.Fatalf("repaired document thumbs = %+v, want synthetic cached preview", doc.Thumbs) + if len(doc.Thumbs) != 0 { + t.Fatalf("document thumbs = %+v, want no invented preview for unknown TGS", doc.Thumbs) } } @@ -614,8 +646,8 @@ func TestSeedMediaSkipsUnchangedEffectsDocuments(t *testing.T) { if err != nil { t.Fatalf("first seed: %v", err) } - if first.Effects != 1 || first.Documents != 1 || first.Blobs != 2 { - t.Fatalf("first stats = %+v, want one imported effect document with main plus synthetic preview blobs", first) + if first.Effects != 1 || first.Documents != 1 || first.Blobs != 1 { + t.Fatalf("first stats = %+v, want one imported effect document with its main blob", first) } second, err := svc.SeedMedia(ctx, seedDir, 0) @@ -665,7 +697,7 @@ func TestSeedEffectsDoesNotDowngradeSharedStickerPreview(t *testing.T) { if !ok { t.Fatalf("shared document thumbs = %+v, want real cached preview", doc.Thumbs) } - if thumb.W != 128 || thumb.H != 128 || !bytes.Equal(thumb.Bytes, realThumb) || seedSyntheticTGStickerPreviewThumb(thumb) { + if thumb.W != 128 || thumb.H != 128 || !bytes.Equal(thumb.Bytes, realThumb) { t.Fatalf("shared preview = %+v, want original 128x128 catalog thumbnail", thumb) } blob, ok, err := media.GetFileBlob(ctx, fmt.Sprintf("doc:%d:m", sourceID)) @@ -692,55 +724,6 @@ func TestSeedEffectsDoesNotDowngradeSharedStickerPreview(t *testing.T) { } } -func TestSeedMediaMigratesSyntheticStickerPreviewToExportedThumbnail(t *testing.T) { - ctx := context.Background() - seedDir := t.TempDir() - const sourceID int64 = 8888888 - realThumb := writeStatusPackWithThumbSeed(t, seedDir, sourceID, 31) - - media := newFakeMediaStore() - if err := media.PutDocument(ctx, domain.Document{ - ID: sourceID, - MimeType: "application/x-tgsticker", - Thumbs: []domain.PhotoSize{{ - Kind: domain.PhotoSizeKindCached, Type: seedSyntheticDocumentThumbType, - W: 1, H: 1, Bytes: append([]byte(nil), seedSyntheticTGStickerPreviewThumbPNG...), - }}, - }); err != nil { - t.Fatalf("put stale document: %v", err) - } - if err := media.PutStickerSet(ctx, domain.StickerSet{ - ID: 773947703670341676, AccessHash: 1, ShortName: "StatusPack", Title: "Status Pack", - Hash: 31, Kind: domain.StickerSetKindEmoji, Emojis: true, DocumentIDs: []int64{sourceID}, - }); err != nil { - t.Fatalf("put stale sticker set: %v", err) - } - - blobs, err := NewLocalFS(t.TempDir()) - if err != nil { - t.Fatalf("local fs: %v", err) - } - svc := NewService(media, blobs, 2) - stats, err := svc.SeedMedia(ctx, seedDir, 0) - if err != nil { - t.Fatalf("migration seed: %v", err) - } - if stats.StickerSets != 1 || stats.Documents != 1 { - t.Fatalf("migration stats = %+v, want forced sticker document rebuild", stats) - } - doc, ok, err := media.GetDocument(ctx, sourceID) - if err != nil || !ok { - t.Fatalf("migrated document ok=%v err=%v", ok, err) - } - thumb, ok := findCachedThumb(doc.Thumbs) - if !ok || thumb.W != 128 || thumb.H != 128 || !bytes.Equal(thumb.Bytes, realThumb) { - t.Fatalf("migrated thumbs = %+v, want exported 128x128 preview", doc.Thumbs) - } - if state, ok, err := media.GetSeedState(ctx, seedStickerPreviewStateKey); err != nil || !ok || state == "" { - t.Fatalf("preview migration state = %q ok=%v err=%v", state, ok, err) - } -} - func TestSeedMediaFromRealExport(t *testing.T) { seedDir := os.Getenv("TELESRV_REAL_STICKER_SEED_DIR") if seedDir == "" { @@ -841,7 +824,7 @@ func TestSeedMediaFromRealExport(t *testing.T) { t.Fatalf("sample sticker thumb mime = %q, want %q", blob.MimeType, want) } if !hasPathThumb(doc.Thumbs) { - t.Logf("sample sticker document has no exported PhotoPathSize placeholder; synthetic cached preview is present: %+v", doc.Thumbs) + t.Logf("sample sticker document has no exported PhotoPathSize placeholder; cached preview is present: %+v", doc.Thumbs) } } } diff --git a/internal/app/files/statuspack_previews.go b/internal/app/files/statuspack_previews.go new file mode 100644 index 00000000..6429f463 --- /dev/null +++ b/internal/app/files/statuspack_previews.go @@ -0,0 +1,46 @@ +package files + +import ( + "embed" + "fmt" +) + +const seedBundledDocumentThumbType = "m" + +// StatusPack is exported without document thumbnails, while Android uses a +// non-empty thumbs vector to recognize application/x-tgsticker documents as +// animated custom emoji. Keep real, visible first-frame previews with the +// server's default media assets instead of inventing transparent metadata. +// +//go:embed statuspack_previews/*.png +var statusPackPreviewFS embed.FS + +var seedBundledDocumentPreviews = map[int64][]byte{ + 5244508282231465075: mustReadStatusPackPreview(5244508282231465075), + 5246743378917334735: mustReadStatusPackPreview(5246743378917334735), + 5246772116543512028: mustReadStatusPackPreview(5246772116543512028), + 5246828303305678732: mustReadStatusPackPreview(5246828303305678732), + 5246842176050046092: mustReadStatusPackPreview(5246842176050046092), + 5246960163096632543: mustReadStatusPackPreview(5246960163096632543), + 5247100325059370738: mustReadStatusPackPreview(5247100325059370738), + 5247133031235329609: mustReadStatusPackPreview(5247133031235329609), + 5247176827016847212: mustReadStatusPackPreview(5247176827016847212), + 5247209275494769660: mustReadStatusPackPreview(5247209275494769660), + 5249273776079640466: mustReadStatusPackPreview(5249273776079640466), +} + +func mustReadStatusPackPreview(documentID int64) []byte { + data, err := statusPackPreviewFS.ReadFile(fmt.Sprintf("statuspack_previews/%d.png", documentID)) + if err != nil { + panic(fmt.Sprintf("read bundled StatusPack preview %d: %v", documentID, err)) + } + return data +} + +func seedBundledDocumentPreview(documentID int64) ([]byte, bool) { + data, ok := seedBundledDocumentPreviews[documentID] + if !ok { + return nil, false + } + return append([]byte(nil), data...), true +} diff --git a/internal/app/files/statuspack_previews/5244508282231465075.png b/internal/app/files/statuspack_previews/5244508282231465075.png new file mode 100644 index 00000000..1c0784a7 Binary files /dev/null and b/internal/app/files/statuspack_previews/5244508282231465075.png differ diff --git a/internal/app/files/statuspack_previews/5246743378917334735.png b/internal/app/files/statuspack_previews/5246743378917334735.png new file mode 100644 index 00000000..6b3d5814 Binary files /dev/null and b/internal/app/files/statuspack_previews/5246743378917334735.png differ diff --git a/internal/app/files/statuspack_previews/5246772116543512028.png b/internal/app/files/statuspack_previews/5246772116543512028.png new file mode 100644 index 00000000..6438e5de Binary files /dev/null and b/internal/app/files/statuspack_previews/5246772116543512028.png differ diff --git a/internal/app/files/statuspack_previews/5246828303305678732.png b/internal/app/files/statuspack_previews/5246828303305678732.png new file mode 100644 index 00000000..bb88bc94 Binary files /dev/null and b/internal/app/files/statuspack_previews/5246828303305678732.png differ diff --git a/internal/app/files/statuspack_previews/5246842176050046092.png b/internal/app/files/statuspack_previews/5246842176050046092.png new file mode 100644 index 00000000..3b57ccfa Binary files /dev/null and b/internal/app/files/statuspack_previews/5246842176050046092.png differ diff --git a/internal/app/files/statuspack_previews/5246960163096632543.png b/internal/app/files/statuspack_previews/5246960163096632543.png new file mode 100644 index 00000000..0c275142 Binary files /dev/null and b/internal/app/files/statuspack_previews/5246960163096632543.png differ diff --git a/internal/app/files/statuspack_previews/5247100325059370738.png b/internal/app/files/statuspack_previews/5247100325059370738.png new file mode 100644 index 00000000..d9bfa15d Binary files /dev/null and b/internal/app/files/statuspack_previews/5247100325059370738.png differ diff --git a/internal/app/files/statuspack_previews/5247133031235329609.png b/internal/app/files/statuspack_previews/5247133031235329609.png new file mode 100644 index 00000000..cdd5fb59 Binary files /dev/null and b/internal/app/files/statuspack_previews/5247133031235329609.png differ diff --git a/internal/app/files/statuspack_previews/5247176827016847212.png b/internal/app/files/statuspack_previews/5247176827016847212.png new file mode 100644 index 00000000..58de1d24 Binary files /dev/null and b/internal/app/files/statuspack_previews/5247176827016847212.png differ diff --git a/internal/app/files/statuspack_previews/5247209275494769660.png b/internal/app/files/statuspack_previews/5247209275494769660.png new file mode 100644 index 00000000..a378f28c Binary files /dev/null and b/internal/app/files/statuspack_previews/5247209275494769660.png differ diff --git a/internal/app/files/statuspack_previews/5249273776079640466.png b/internal/app/files/statuspack_previews/5249273776079640466.png new file mode 100644 index 00000000..389cedc3 Binary files /dev/null and b/internal/app/files/statuspack_previews/5249273776079640466.png differ diff --git a/internal/app/files/sticker_admin.go b/internal/app/files/sticker_admin.go index e8868437..c22cad3e 100644 --- a/internal/app/files/sticker_admin.go +++ b/internal/app/files/sticker_admin.go @@ -94,6 +94,47 @@ func isWebPData(data []byte) bool { return len(data) >= 12 && string(data[0:4]) == "RIFF" && string(data[8:12]) == "WEBP" } +// ValidateAdminAddStickerToSet is a pure check (no store writes), used by a +// dry-run preview before AdminAddStickerToSet actually mutates the pack. +func (s *Service) ValidateAdminAddStickerToSet(ctx context.Context, setID int64, emoji string) error { + set, _, found, err := s.ResolveStickerSet(ctx, domain.StickerSetRef{Kind: domain.StickerSetRefByID, ID: setID}) + if err != nil { + return err + } + if !found || set.ID == 0 || set.Deleted || set.Kind == domain.StickerSetKindSystem { + return domain.ErrStickerSetInvalid + } + if len(set.DocumentIDs) >= domain.MaxStickerSetItems { + return domain.ErrStickerSetTooMuch + } + return validateStickerEmoji(strings.TrimSpace(emoji)) +} + +// ValidateAdminCreateStickerSet is a pure check (no store writes), used by a +// dry-run preview before AdminCreateStickerSet actually creates the pack. +func (s *Service) ValidateAdminCreateStickerSet(ctx context.Context, title, shortName, emoji string, kind domain.StickerSetKind) error { + if err := validateStickerSetTitle(strings.TrimSpace(title)); err != nil { + return err + } + if kind != domain.StickerSetKindEmoji && kind != domain.StickerSetKindMasks && kind != "" { + return domain.ErrStickerSetTypeInvalid + } + normalizedShortName := normalizeStickerSetShortName(shortName) + if normalizedShortName != "" { + if err := validateStickerSetShortName(normalizedShortName); err != nil { + return err + } + available, err := s.media.StickerSetShortNameAvailable(ctx, normalizedShortName) + if err != nil { + return err + } + if !available { + return domain.ErrStickerSetShortNameOccupied + } + } + return validateStickerEmoji(strings.TrimSpace(emoji)) +} + // AdminAddStickerToSet appends an already-materialized document (from // AdminUploadStickerMaterial) to an existing pack with no ownership check — // same convention as AdminSetStickerSetArchived and friends. diff --git a/internal/app/files/sticker_management.go b/internal/app/files/sticker_management.go index c9962edf..d8e65a92 100644 --- a/internal/app/files/sticker_management.go +++ b/internal/app/files/sticker_management.go @@ -142,7 +142,7 @@ func (s *Service) AdminSetStickerSetArchived(ctx context.Context, setID int64, a if err != nil { return false, err } - if !found { + if !found || set.Deleted { return false, domain.ErrStickerSetInvalid } if set.Archived == archived { @@ -163,7 +163,7 @@ func (s *Service) AdminSetStickerSetSortOrder(ctx context.Context, setID int64, if err != nil { return false, err } - if !found { + if !found || set.Deleted { return false, domain.ErrStickerSetInvalid } if set.SortOrder == order { @@ -188,7 +188,7 @@ func (s *Service) AdminRenameStickerSet(ctx context.Context, setID int64, title if err != nil { return domain.StickerSet{}, err } - if !found { + if !found || set.Deleted { return domain.StickerSet{}, domain.ErrStickerSetInvalid } set.Title = title @@ -203,15 +203,15 @@ func (s *Service) AdminRenameStickerSet(ctx context.Context, setID int64, title // AdminDeleteStickerSet deletes (soft-delete) a set with no ownership check; // see AdminSetStickerSetArchived for why that's needed here. Safe to bypass // ownership for: sticker_sets has no incoming foreign keys, so there's no -// cascade to worry about (unlike star gifts, which have ~15 dependent -// tables). Seed-imported sets will reappear on next restart if their source -// files are still under data/sticker-seed — this only removes the DB row. +// cascade to worry about. Seed-imported sets will reappear on next restart +// if their source files are still under data/sticker-seed — this only +// removes the DB row. func (s *Service) AdminDeleteStickerSet(ctx context.Context, setID int64) (domain.StickerSetKind, error) { set, found, err := s.media.GetStickerSetByID(ctx, setID) if err != nil { return "", err } - if !found { + if !found || set.Deleted { return "", domain.ErrStickerSetInvalid } if err := s.media.AdminDeleteStickerSet(ctx, setID); err != nil { diff --git a/internal/app/files/sticker_management_test.go b/internal/app/files/sticker_management_test.go index 6d931eb3..c7d5e4df 100644 --- a/internal/app/files/sticker_management_test.go +++ b/internal/app/files/sticker_management_test.go @@ -138,6 +138,50 @@ func TestManageStickerSetRejectsNonCreator(t *testing.T) { } } +func TestValidateAdminStickerSetUploadPreconditions(t *testing.T) { + ctx := context.Background() + fullIDs := make([]int64, domain.MaxStickerSetItems) + for i := range fullIDs { + fullIDs[i] = int64(i + 1) + } + media := &fakeMediaStore{ + docs: map[int64]domain.Document{}, + sets: map[int64]domain.StickerSet{ + 10: {ID: 10, Kind: domain.StickerSetKindEmoji, DocumentIDs: fullIDs}, + 20: {ID: 20, Kind: domain.StickerSetKindSystem, DocumentIDs: []int64{1}}, + 30: {ID: 30, Kind: domain.StickerSetKindEmoji, DocumentIDs: []int64{1}}, + 40: {ID: 40, Kind: domain.StickerSetKindEmoji, Deleted: true, DocumentIDs: []int64{1}}, + }, + } + svc := NewService(media, nil, 2) + + if err := svc.ValidateAdminAddStickerToSet(ctx, 10, "🙂"); !errors.Is(err, domain.ErrStickerSetTooMuch) { + t.Fatalf("full pack validation err = %v, want ErrStickerSetTooMuch", err) + } + for _, setID := range []int64{20, 40, 999} { + if err := svc.ValidateAdminAddStickerToSet(ctx, setID, "🙂"); !errors.Is(err, domain.ErrStickerSetInvalid) { + t.Fatalf("set %d validation err = %v, want ErrStickerSetInvalid", setID, err) + } + } + if err := svc.ValidateAdminAddStickerToSet(ctx, 30, ""); !errors.Is(err, domain.ErrStickerSetEmojiInvalid) { + t.Fatalf("empty emoji validation err = %v, want ErrStickerSetEmojiInvalid", err) + } + if err := svc.ValidateAdminAddStickerToSet(ctx, 30, "🙂"); err != nil { + t.Fatalf("editable pack validation: %v", err) + } + + if err := svc.ValidateAdminCreateStickerSet(ctx, "New Emoji", "new_emoji", "🙂", domain.StickerSetKindEmoji); err != nil { + t.Fatalf("create validation: %v", err) + } + if err := svc.ValidateAdminCreateStickerSet(ctx, "New Emoji", "new_emoji", "🙂", domain.StickerSetKindSystem); !errors.Is(err, domain.ErrStickerSetTypeInvalid) { + t.Fatalf("system create validation err = %v, want ErrStickerSetTypeInvalid", err) + } + media.sets[50] = domain.StickerSet{ID: 50, ShortName: "occupied_name"} + if err := svc.ValidateAdminCreateStickerSet(ctx, "New Emoji", "occupied_name", "🙂", domain.StickerSetKindEmoji); !errors.Is(err, domain.ErrStickerSetShortNameOccupied) { + t.Fatalf("occupied name validation err = %v, want ErrStickerSetShortNameOccupied", err) + } +} + func TestAddStickerToSetAcceptsUploadedMaterial(t *testing.T) { ctx := context.Background() media := &fakeMediaStore{ diff --git a/internal/app/files/webpage.go b/internal/app/files/webpage.go index 2ec465c0..963d7df3 100644 --- a/internal/app/files/webpage.go +++ b/internal/app/files/webpage.go @@ -176,7 +176,7 @@ func (f *webpageFetcher) fetch(ctx context.Context, rawURL, accept string) ([]by if err != nil { // SSRF 拦截（dial Control 返回的 terminal）经 url.Error 传上来，errors.Is 仍能识别； // 其余 dial/超时错误是瞬时。 - return nil, "", fmt.Errorf("%w: %v", ErrWebPagePreviewInvalid, err) + return nil, "", fmt.Errorf("%w: %w", ErrWebPagePreviewInvalid, err) } defer resp.Body.Close() if resp.StatusCode != http.StatusOK { @@ -293,7 +293,7 @@ func (f *webpageFetcher) resolve(ctx context.Context, s *Service, normalizedURL if err != nil { // 终态失败（SSRF/4xx/非法 URL）→ 负缓存为空预览，避免重复按键/发送重打 PG+外网。 // 瞬时失败（5xx/超时/dial/限速）→ 上抛 error，GetOrLoad 不缓存、可重试。 - if errors.Is(err, errWebPageTerminal) { + if isTerminalWebPageFetchError(err) { return emptyWebPage(normalizedURL, urlHash), nil } return domain.MessageWebPage{}, err @@ -316,6 +316,14 @@ func (f *webpageFetcher) resolve(ctx context.Context, s *Service, normalizedURL return page, nil } +func isTerminalWebPageFetchError(err error) bool { + if errors.Is(err, errWebPageTerminal) { + return true + } + var dnsErr *net.DNSError + return errors.As(err, &dnsErr) && dnsErr.IsNotFound +} + // fetchImage 抓取并铸造预览图（best-effort）。解码前按尺寸拦截解压炸弹；非图片/失败丢弃。 func (f *webpageFetcher) fetchImage(ctx context.Context, s *Service, imageURL string) (domain.Photo, bool) { data, _, err := f.fetch(ctx, imageURL, acceptImage) diff --git a/internal/app/files/webpage_test.go b/internal/app/files/webpage_test.go index c157926d..bf89d2cc 100644 --- a/internal/app/files/webpage_test.go +++ b/internal/app/files/webpage_test.go @@ -201,7 +201,8 @@ func TestResolveWebPageNonHTMLIsEmpty(t *testing.T) { } } -// TestResolveWebPageSSRFBlocksLoopback 验证生产配置（allowPrivate=false）拦截指向 loopback 的 URL。 +// TestResolveWebPageSSRFBlocksLoopback 验证生产配置（allowPrivate=false）拦截指向 loopback 的 URL， +// 并把该确定性失败收敛为空预览。 func TestResolveWebPageSSRFBlocksLoopback(t *testing.T) { srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { w.Header().Set("Content-Type", "text/html") @@ -210,8 +211,12 @@ func TestResolveWebPageSSRFBlocksLoopback(t *testing.T) { defer srv.Close() svc := newWebpageTestService(t, false) // 生产口径：禁 loopback - if _, err := svc.ResolveWebPage(context.Background(), srv.URL+"/x"); err == nil { - t.Fatalf("expected SSRF guard to block loopback fetch") + page, err := svc.ResolveWebPage(context.Background(), srv.URL+"/x") + if err != nil { + t.Fatalf("SSRF guard should resolve as terminal-empty: %v", err) + } + if page.State != domain.MessageWebPageStateEmpty { + t.Fatalf("state = %q, want empty", page.State) } } diff --git a/internal/app/help/service.go b/internal/app/help/service.go index 6bcb960b..4299d4a1 100644 --- a/internal/app/help/service.go +++ b/internal/app/help/service.go @@ -64,10 +64,10 @@ const tdesktopClient = "tdesktop" // // WebK directly calls Array.some on fragment_prefixes while rendering user profiles, // so this compatibility key must always remain an array, even when it is empty. -const tdesktopDefaultAppConfigBase = `{"chat_read_mark_expire_period":604800,"chat_read_mark_size_threshold":50,"pm_read_date_expire_period":604800,"quote_length_max":1024,"telegram_antispam_group_size_min":200,"telegram_antispam_user_id":"5434988373","fragment_prefixes":["888"],"forum_upgrade_participants_min":2,"reactions_default":{"_":"reactionEmoji","emoticon":"👍"},"reactions_uniq_max":11,"reactions_user_max_default":1,"reactions_user_max_premium":3,"reactions_in_chat_max":3,"boosts_channel_level_max":100,"rich_message_posting":"enabled","upload_markup_video":true,"emojies_send_dice":["🎲","🎯","🏀","⚽","⚽️","🎳","🎰"],"premium_purchase_blocked":false,"stars_purchase_blocked":false,"stargifts_blocked":false,"stargifts_pinned_to_top_limit":6,"giveaway_gifts_purchase_available":true,"giveaway_boosts_per_premium":4,"giveaway_countries_max":10,"giveaway_add_peers_max":10,"giveaway_period_max":604800,"stories_stealth_future_period":1500,"stories_stealth_past_period":300,"stories_stealth_cooldown_period":10800,"quick_replies_limit":100,"quick_reply_messages_limit":20,"business_chat_links_limit":100,"dialog_filters_enabled":true,"chatlist_update_period":3600,"chatlist_invites_limit_default":3,"chatlist_invites_limit_premium":20,"chatlists_joined_limit_default":2,"chatlists_joined_limit_premium":20,"about_length_limit_default":70,"about_length_limit_premium":140,"bot_verification_description_length_limit":70,"caption_length_limit_default":1024,"caption_length_limit_premium":4096,"channels_limit_default":500,"channels_limit_premium":1000,"channels_public_limit_default":10,"channels_public_limit_premium":20,"dialog_filters_limit_default":10,"dialog_filters_limit_premium":20,"dialog_filters_chats_limit_default":100,"dialog_filters_chats_limit_premium":200,"dialogs_pinned_limit_default":5,"dialogs_pinned_limit_premium":10,"dialogs_folder_pinned_limit_default":100,"dialogs_folder_pinned_limit_premium":200,"saved_dialogs_pinned_limit_default":5,"saved_dialogs_pinned_limit_premium":100,"saved_gifs_limit_default":200,"saved_gifs_limit_premium":400,"stickers_faved_limit_default":5,"stickers_faved_limit_premium":10,"recommended_channels_limit_default":10,"recommended_channels_limit_premium":100,"aicompose_tone_examples_num":3,"aicompose_tone_title_length_max":12,"aicompose_tone_prompt_length_max":1024,"aicompose_tone_saved_limit_default":5,"aicompose_tone_saved_limit_premium":20,"upload_max_fileparts_default":4000,"upload_max_fileparts_premium":8000,"gif_search_username":"gif"` +const tdesktopDefaultAppConfigBase = `{"chat_read_mark_expire_period":604800,"chat_read_mark_size_threshold":50,"pm_read_date_expire_period":604800,"quote_length_max":1024,"telegram_antispam_group_size_min":200,"telegram_antispam_user_id":"5434988373","fragment_prefixes":["888"],"forum_upgrade_participants_min":2,"reactions_default":{"_":"reactionEmoji","emoticon":"👍"},"reactions_uniq_max":11,"reactions_user_max_default":1,"reactions_user_max_premium":3,"reactions_in_chat_max":3,"boosts_channel_level_max":100,"rich_message_posting":"enabled","ephemeral_welcome_messages_max":5,"upload_markup_video":true,"emojies_send_dice":["🎲","🎯","🏀","⚽","⚽️","🎳","🎰"],"premium_purchase_blocked":false,"stars_purchase_blocked":false,"stargifts_blocked":false,"stargifts_pinned_to_top_limit":6,"giveaway_gifts_purchase_available":true,"giveaway_boosts_per_premium":4,"giveaway_countries_max":10,"giveaway_add_peers_max":10,"giveaway_period_max":604800,"stories_stealth_future_period":1500,"stories_stealth_past_period":300,"stories_stealth_cooldown_period":10800,"quick_replies_limit":100,"quick_reply_messages_limit":20,"business_chat_links_limit":100,"dialog_filters_enabled":true,"chatlist_update_period":3600,"chatlist_invites_limit_default":3,"chatlist_invites_limit_premium":20,"chatlists_joined_limit_default":2,"chatlists_joined_limit_premium":20,"about_length_limit_default":70,"about_length_limit_premium":140,"bot_verification_description_length_limit":128,"caption_length_limit_default":1024,"caption_length_limit_premium":4096,"channels_limit_default":500,"channels_limit_premium":1000,"channels_public_limit_default":10,"channels_public_limit_premium":20,"dialog_filters_limit_default":10,"dialog_filters_limit_premium":20,"dialog_filters_chats_limit_default":100,"dialog_filters_chats_limit_premium":200,"dialogs_pinned_limit_default":5,"dialogs_pinned_limit_premium":10,"dialogs_folder_pinned_limit_default":100,"dialogs_folder_pinned_limit_premium":200,"saved_dialogs_pinned_limit_default":5,"saved_dialogs_pinned_limit_premium":100,"saved_gifs_limit_default":200,"saved_gifs_limit_premium":400,"stickers_faved_limit_default":5,"stickers_faved_limit_premium":10,"recommended_channels_limit_default":10,"recommended_channels_limit_premium":100,"aicompose_tone_examples_num":3,"aicompose_tone_title_length_max":12,"aicompose_tone_prompt_length_max":1024,"aicompose_tone_saved_limit_default":5,"aicompose_tone_saved_limit_premium":20,"upload_max_fileparts_default":4000,"upload_max_fileparts_premium":8000,"gif_search_username":"gif"` const tdesktopNoForwardsAppConfig = `,"no_forwards_request_expire_period":86400` -const defaultAppConfigHash = 28 // 默认 app config 内容变更时必须递增，否则缓存端只会收到 notModified。 +const defaultAppConfigHash = 30 // 默认 app config 内容变更时必须递增，否则缓存端只会收到 notModified。 // Service 提供客户端启动配置与国家区号目录。 // @@ -131,7 +131,10 @@ func WithEmailSignupPhonePrefixes(prefixes []string) Option { // NewService 创建 help 服务。 func NewService(appConfigs store.AppConfigStore, countries store.CountryStore, opts ...Option) *Service { - s := &Service{appConfigs: appConfigs, countries: countries} + s := &Service{ + appConfigs: appConfigs, + countries: countries, + } for _, opt := range opts { if opt != nil { opt(s) diff --git a/internal/app/messages/business_automation.go b/internal/app/messages/business_automation.go index f52de789..81736bdb 100644 --- a/internal/app/messages/business_automation.go +++ b/internal/app/messages/business_automation.go @@ -72,6 +72,10 @@ func (s *Service) prepareBusinessAutomation(ctx context.Context, req domain.Send if !s.shouldConsiderBusinessAutomation(req) { return businessAutomationContext{}, false } + hasAutomation, err := s.business.store.HasBusinessAutomation(ctx, req.RecipientUserID) + if err != nil || !hasAutomation { + return businessAutomationContext{}, false + } out := businessAutomationContext{ ownerUserID: req.RecipientUserID, customerUserID: req.SenderUserID, diff --git a/internal/app/messages/service.go b/internal/app/messages/service.go index c3db6bb0..ba05fef7 100644 --- a/internal/app/messages/service.go +++ b/internal/app/messages/service.go @@ -11,17 +11,22 @@ import ( // Service 提供消息历史、搜索与已读业务。 type Service struct { - messages store.MessageStore - dialogs store.DialogStore - contacts store.ContactStore - photos userprojection.ProfilePhotoProvider - privacy userprojection.PrivacyEvaluator - freezes userprojection.AccountFreezeProvider - versions store.ReadModelVersionStore - projector *userprojection.Projector - botResponder BotResponder - sendGate SendPermissionChecker - business *businessAutomationConfig + messages store.MessageStore + dialogs store.DialogStore + contacts store.ContactStore + photos userprojection.ProfilePhotoProvider + privacy userprojection.PrivacyEvaluator + freezes userprojection.AccountFreezeProvider + versions store.ReadModelVersionStore + projector *userprojection.Projector + // viewerProjectionComplete is true only when every viewer-scoped user + // overlay used by the shared RPC Users service is configured here too. + // A partially configured service may still project the dependencies it has, + // but RPC must not trust that partial envelope as authoritative. + viewerProjectionComplete bool + botResponder BotResponder + sendGate SendPermissionChecker + business *businessAutomationConfig privateMediaCountCache *privateMediaCountReadModelCache } @@ -37,7 +42,7 @@ type BotResponder interface { // HandlesBot 报告 botUserID 是否为该 responder 负责的内置 bot。 HandlesBot(botUserID int64) bool // OnPrivateMessage 处理一条投递给内置 bot 的消息；msg 为 bot 视角收件 box 行。 - OnPrivateMessage(ctx context.Context, botUserID int64, msg domain.Message) + OnPrivateMessage(ctx context.Context, botUserID int64, msg domain.Message, session domain.ClientSessionMetadata) } // Option adjusts optional message service dependencies. @@ -92,9 +97,18 @@ func NewService(messages store.MessageStore, dialogs store.DialogStore, opts ... userprojection.WithPrivacyEvaluator(s.privacy), userprojection.WithAccountFreezeProvider(s.freezes), ) + s.viewerProjectionComplete = s.contacts != nil && s.photos != nil && s.privacy != nil && s.freezes != nil return s } +// ProjectsMessageUsersForViewer reports that history/search results returned by +// this service have already passed through the viewer-specific user projection +// boundary. RPC may reuse that envelope and resolve only nested message refs; +// raw stores and test doubles do not implicitly gain this trust marker. +func (s *Service) ProjectsMessageUsersForViewer() bool { + return s != nil && s.viewerProjectionComplete +} + // SendPrivateText 发送一条私聊文本消息。 func (s *Service) SendPrivateText(ctx context.Context, userID int64, req domain.SendPrivateTextRequest) (domain.SendPrivateTextResult, error) { if s == nil || s.messages == nil || userID == 0 { @@ -140,7 +154,7 @@ func (s *Service) SendPrivateText(ctx context.Context, userID int64, req domain. // 兜错，不回传失败。bot 自己发出的消息不触发（SenderUserID 不会是内置 bot // 的对话对象集合里关心的方向——hook 只看收件人）。 if err == nil && !res.Duplicate && req.BusinessAutomationKind == "" && s.botResponder != nil && s.botResponder.HandlesBot(req.RecipientUserID) { - s.botResponder.OnPrivateMessage(ctx, req.RecipientUserID, res.RecipientMessage) + s.botResponder.OnPrivateMessage(ctx, req.RecipientUserID, res.RecipientMessage, req.OriginClientSession) } return res, err } @@ -349,7 +363,11 @@ func (s *Service) SearchPrivateMedia(ctx context.Context, userID, peerID int64, if s == nil || s.messages == nil || userID == 0 || peerID == 0 { return domain.MessageList{}, nil } - return s.messages.SearchPrivateMedia(ctx, userID, peerID, req) + list, err := s.messages.SearchPrivateMedia(ctx, userID, peerID, req) + if err != nil { + return domain.MessageList{}, err + } + return s.projectMessageUsers(ctx, userID, list) } // CountPrivateMediaCategories 返回某私聊会话按基础媒体类别聚合的精确计数。 diff --git a/internal/app/messages/service_test.go b/internal/app/messages/service_test.go index feb5dc6b..a4cf0e61 100644 --- a/internal/app/messages/service_test.go +++ b/internal/app/messages/service_test.go @@ -104,6 +104,9 @@ func TestServiceProjectsMessageUsersForViewerContacts(t *testing.T) { friendID: {PhotoID: 9101, DCID: 2, Stripped: []byte{5, 6}}, strangerID: {PhotoID: 9102, DCID: 4}, })) + if svc.ProjectsMessageUsersForViewer() { + t.Fatal("partially configured message projector must not claim a complete viewer envelope") + } list, err := svc.GetHistory(ctx, ownerID, domain.MessageFilter{Limit: 10}) if err != nil { @@ -127,6 +130,62 @@ func TestServiceProjectsMessageUsersForViewerContacts(t *testing.T) { if self.Phone != "15550000001" { t.Fatalf("self phone = %q, want preserved", self.Phone) } + + media, err := svc.SearchPrivateMedia(ctx, ownerID, friendID, domain.MediaSearchRequest{Limit: 10}) + if err != nil { + t.Fatalf("SearchPrivateMedia: %v", err) + } + mediaFriend := findUser(t, media.Users, friendID) + if !mediaFriend.Contact || mediaFriend.FirstName != "Remark" || mediaFriend.Phone != "15550000002" || mediaFriend.PhotoID != 9101 { + t.Fatalf("shared-media friend projection = %+v, want the same viewer projection as history", mediaFriend) + } +} + +func TestServiceMarksOnlyFullyConfiguredViewerProjectionComplete(t *testing.T) { + store := projectionMessageStore{} + svc := NewService(store, nil, + WithContactStore(memory.NewContactStore()), + WithPhotoProvider(messageProfilePhotos{}), + WithPrivacyEvaluator(messageProjectionPrivacy{}), + WithAccountFreezeProvider(messageProjectionFreezes{}), + ) + if !svc.ProjectsMessageUsersForViewer() { + t.Fatal("fully configured message projector must advertise a complete viewer envelope") + } +} + +func TestSendPrivateTextWithoutBusinessAutomationSkipsDialogAndContactReads(t *testing.T) { + ctx := context.Background() + const ownerID int64 = 2001 + const customerID int64 = 2002 + + dialogs := memory.NewDialogStore() + messages := memory.NewMessageStore(dialogs) + business := &countingBusinessAutomationStore{BusinessAutomationStore: memory.NewPasswordStore()} + countingDialogs := &countingBusinessDialogStore{DialogStore: dialogs} + countingContacts := &countingBusinessContactStore{ContactStore: memory.NewContactStore()} + svc := NewService( + messages, + countingDialogs, + WithBusinessAutomation(business), + WithContactStore(countingContacts), + ) + + if _, err := svc.SendPrivateText(ctx, customerID, domain.SendPrivateTextRequest{ + SenderUserID: customerID, + RecipientUserID: ownerID, + RandomID: 9001, + Message: "ordinary message", + Date: 1_700_000_000, + }); err != nil { + t.Fatalf("SendPrivateText: %v", err) + } + if business.hasCalls != 1 { + t.Fatalf("HasBusinessAutomation calls = %d, want one lightweight gate", business.hasCalls) + } + if countingDialogs.listByPeersCalls != 0 || countingContacts.getCalls != 0 { + t.Fatalf("business detail reads dialogs/contacts = %d/%d, want 0/0 without automation", countingDialogs.listByPeersCalls, countingContacts.getCalls) + } } func TestBusinessAutomationGreetingSendsQuickReplyWithoutLoop(t *testing.T) { @@ -567,6 +626,36 @@ type staticBusinessAutomationProvider struct { message string } +type countingBusinessAutomationStore struct { + store.BusinessAutomationStore + hasCalls int +} + +func (s *countingBusinessAutomationStore) HasBusinessAutomation(ctx context.Context, userID int64) (bool, error) { + s.hasCalls++ + return s.BusinessAutomationStore.HasBusinessAutomation(ctx, userID) +} + +type countingBusinessDialogStore struct { + store.DialogStore + listByPeersCalls int +} + +func (s *countingBusinessDialogStore) ListByPeers(ctx context.Context, userID int64, peers []domain.Peer) (domain.DialogList, error) { + s.listByPeersCalls++ + return s.DialogStore.ListByPeers(ctx, userID, peers) +} + +type countingBusinessContactStore struct { + store.ContactStore + getCalls int +} + +func (s *countingBusinessContactStore) Get(ctx context.Context, userID, contactUserID int64) (domain.Contact, bool, error) { + s.getCalls++ + return s.ContactStore.Get(ctx, userID, contactUserID) +} + func (p staticBusinessAutomationProvider) BusinessAutomationReplies(context.Context, BusinessAutomationReplyInput) ([]domain.QuickReplyMessage, error) { return []domain.QuickReplyMessage{{ID: 1, Message: p.message}}, nil } @@ -751,9 +840,21 @@ func (s projectionMessageStore) ListByUser(context.Context, int64, domain.Messag } func (s projectionMessageStore) SearchPrivateMedia(context.Context, int64, int64, domain.MediaSearchRequest) (domain.MessageList, error) { - return domain.MessageList{}, nil + return s.list, nil } func (s projectionMessageStore) CountPrivateMediaCategories(context.Context, int64, int64) (domain.MediaCategoryCounts, error) { return domain.MediaCategoryCounts{}, nil } + +type messageProjectionPrivacy struct{} + +func (messageProjectionPrivacy) CanSee(context.Context, int64, int64, domain.PrivacyKey) (bool, error) { + return true, nil +} + +type messageProjectionFreezes struct{} + +func (messageProjectionFreezes) AccountFreezes(context.Context, []int64) (map[int64]domain.AccountFreeze, error) { + return map[int64]domain.AccountFreeze{}, nil +} diff --git a/internal/app/moderation/actions.go b/internal/app/moderation/actions.go index 9ca9cbd8..595fef59 100644 --- a/internal/app/moderation/actions.go +++ b/internal/app/moderation/actions.go @@ -35,6 +35,10 @@ type moderationAccountDeleter interface { ExecuteAccountDeletion(ctx context.Context, userID int64, source domain.AccountDeletionSource, reason string, now time.Time) (domain.AccountDeletionResult, error) } +type moderationAccountDeletionNotifier interface { + NotifyModerationAccountDeletion(ctx context.Context, result domain.AccountDeletionResult) +} + type moderationAppealLinkIssuer interface { IssueAppealLink(ctx context.Context, caseID, appellantUserID int64, expiresAt, now time.Time) (string, error) } @@ -44,6 +48,7 @@ type ActionExecutor struct { channels moderationChannelDeleter channelNotifier moderationChannelDeleteNotifier accounts moderationAccountDeleter + accountNotifier moderationAccountDeletionNotifier appealLinks moderationAppealLinkIssuer publicBaseURL string now func() time.Time @@ -51,6 +56,15 @@ type ActionExecutor struct { type ActionExecutorOption func(*ActionExecutor) +// WithAccountDeletionNotifier installs the post-commit runtime boundary for a +// moderation deletion. The deleter owns the durable tombstone transaction; the +// notifier retires the returned authorizations from live RPC sessions/caches. +func WithAccountDeletionNotifier(notifier moderationAccountDeletionNotifier) ActionExecutorOption { + return func(executor *ActionExecutor) { + executor.accountNotifier = notifier + } +} + func WithAppealLinks(issuer moderationAppealLinkIssuer, publicBaseURL string) ActionExecutorOption { return func(executor *ActionExecutor) { executor.appealLinks = issuer @@ -206,17 +220,26 @@ func (e *ActionExecutor) Execute(ctx context.Context, detail domain.ModerationCa } return nil case domain.ModerationActionDeleteAccount: - if e.accounts == nil || detail.Case.Target.Type != domain.PeerTypeUser { + // The tombstone and live-session revocation are one application-level + // outcome. Refuse to commit the durable half if this process cannot run the + // post-commit half; otherwise an already-bound session keeps its cached user. + if e.accounts == nil || e.accountNotifier == nil || detail.Case.Target.Type != domain.PeerTypeUser { return domain.ErrModerationActionInvalid } if err := decodeStrictActionPayload(action.Payload, &struct{}{}); err != nil { return err } - _, err := e.accounts.ExecuteAccountDeletion( + result, err := e.accounts.ExecuteAccountDeletion( ctx, detail.Case.Target.ID, domain.AccountDeletionManual, fmt.Sprintf("moderation case %d", detail.Case.ID), e.now().UTC(), ) - return err + if err != nil { + return err + } + if result.Changed && e.accountNotifier != nil { + e.accountNotifier.NotifyModerationAccountDeletion(ctx, result) + } + return nil default: return domain.ErrModerationActionInvalid } diff --git a/internal/app/moderation/actions_test.go b/internal/app/moderation/actions_test.go index 1939e9fe..86d0365b 100644 --- a/internal/app/moderation/actions_test.go +++ b/internal/app/moderation/actions_test.go @@ -18,6 +18,25 @@ type captureModerationAdmin struct { frozen []admin.SetAccountFrozenRequest } +type captureModerationAccountDeleter struct { + result domain.AccountDeletionResult + err error + calls int +} + +func (d *captureModerationAccountDeleter) ExecuteAccountDeletion(context.Context, int64, domain.AccountDeletionSource, string, time.Time) (domain.AccountDeletionResult, error) { + d.calls++ + return d.result, d.err +} + +type captureModerationAccountDeletionNotifier struct { + results []domain.AccountDeletionResult +} + +func (n *captureModerationAccountDeletionNotifier) NotifyModerationAccountDeletion(_ context.Context, result domain.AccountDeletionResult) { + n.results = append(n.results, result) +} + func (a *captureModerationAdmin) SetAccountFrozen(_ context.Context, req admin.SetAccountFrozenRequest) (admin.CommandResult, error) { a.frozen = append(a.frozen, req) return admin.CommandResult{}, nil @@ -323,3 +342,46 @@ func TestActionExecutorFreezeDefaultsAndBoundsAppealLink(t *testing.T) { t.Fatalf("link expiry=%v want=%v", issuer.expiresAt, want) } } + +func TestActionExecutorNotifiesCommittedAccountDeletion(t *testing.T) { + revoked := domain.Authorization{AuthKeyID: [8]byte{7}, UserID: 20} + result := domain.AccountDeletionResult{ + User: domain.User{ID: 20, Deleted: true}, + Changed: true, + RevokedAuthorizations: []domain.Authorization{revoked}, + } + accounts := &captureModerationAccountDeleter{result: result} + notifier := &captureModerationAccountDeletionNotifier{} + executor := NewActionExecutor(nil, nil, nil, accounts, WithAccountDeletionNotifier(notifier)) + detail := domain.ModerationCaseDetail{ + Case: domain.ModerationCase{ID: 10, Target: domain.Peer{Type: domain.PeerTypeUser, ID: 20}}, + Decisions: []domain.ModerationDecision{{ID: 30, Actor: "reviewer"}}, + } + action := domain.ModerationAction{ + CaseID: 10, DecisionID: 30, Kind: domain.ModerationActionDeleteAccount, + Payload: []byte(`{}`), CommandID: "delete-account:000", + } + if err := executor.Execute(context.Background(), detail, action); err != nil { + t.Fatal(err) + } + if accounts.calls != 1 || len(notifier.results) != 1 { + t.Fatalf("delete calls=%d notifications=%d, want 1/1", accounts.calls, len(notifier.results)) + } + got := notifier.results[0] + if !got.Changed || got.User.ID != result.User.ID || len(got.RevokedAuthorizations) != 1 || got.RevokedAuthorizations[0].AuthKeyID != revoked.AuthKeyID { + t.Fatalf("notification result=%+v, want committed deletion", got) + } + + accounts.result = domain.AccountDeletionResult{User: result.User, Changed: false} + if err := executor.Execute(context.Background(), detail, action); err != nil { + t.Fatal(err) + } + if len(notifier.results) != 1 { + t.Fatalf("notifications after unchanged deletion=%d, want 1", len(notifier.results)) + } + + withoutNotifier := NewActionExecutor(nil, nil, nil, accounts) + if err := withoutNotifier.Execute(context.Background(), detail, action); !errors.Is(err, domain.ErrModerationActionInvalid) { + t.Fatalf("delete without runtime notifier err=%v, want ErrModerationActionInvalid", err) + } +} diff --git a/internal/app/peerview/cache.go b/internal/app/peerview/cache.go index 76cd7ec5..a845768d 100644 --- a/internal/app/peerview/cache.go +++ b/internal/app/peerview/cache.go @@ -103,6 +103,29 @@ func (c *BatchCache) Prime(viewerUserID int64, users []domain.User) { } } +// PrimeExpected preheats one viewer with the complete result of a bounded batch +// projection. IDs omitted by the resolver are negative-cached as missing, so a +// later fan-out builder cannot silently fall back to a per-viewer ByIDs query. +// System users remain locally synthesised even when the resolver omits them. +func (c *BatchCache) PrimeExpected(viewerUserID int64, expectedIDs []int64, users []domain.User) { + if c == nil || viewerUserID == 0 { + return + } + c.Prime(viewerUserID, users) + byID := c.viewerUsers(viewerUserID) + missing := c.viewerMissing(viewerUserID) + for _, id := range uniqueIDs(expectedIDs) { + if _, ok := byID[id]; ok { + continue + } + if system, ok := domain.SystemUserByID(id); ok { + byID[id] = system + continue + } + missing[id] = struct{}{} + } +} + func (c *BatchCache) viewerUsers(viewerUserID int64) map[int64]domain.User { if byID, ok := c.byViewer[viewerUserID]; ok { return byID diff --git a/internal/app/peerview/cache_test.go b/internal/app/peerview/cache_test.go index e9789663..d07eb142 100644 --- a/internal/app/peerview/cache_test.go +++ b/internal/app/peerview/cache_test.go @@ -86,6 +86,42 @@ func TestBatchCachePrimeServesWithoutResolver(t *testing.T) { } } +func TestBatchCachePrimeExpectedNegativeCachesOmittedUsers(t *testing.T) { + resolver := &captureUserResolver{ + users: map[int64]domain.User{ + 1000000002: {ID: 1000000002, FirstName: "must not be loaded"}, + }, + } + cache := NewBatchCache(resolver) + const viewer = int64(1000000003) + cache.PrimeExpected(viewer, + []int64{1000000001, 1000000002, domain.OfficialSystemUserID}, + []domain.User{{ID: 1000000001, FirstName: "Primed"}}, + ) + + got, err := cache.UsersForView(context.Background(), viewer, + []int64{1000000001, 1000000002, domain.OfficialSystemUserID}) + if err != nil { + t.Fatalf("UsersForView: %v", err) + } + if len(resolver.calls) != 0 { + t.Fatalf("resolver calls = %+v, want none after complete batch preheat", resolver.calls) + } + byID := make(map[int64]domain.User, len(got)) + for _, user := range got { + byID[user.ID] = user + } + if byID[1000000001].FirstName != "Primed" { + t.Fatalf("primed user = %+v", byID[1000000001]) + } + if _, ok := byID[1000000002]; ok { + t.Fatalf("omitted user unexpectedly resolved: %+v", byID[1000000002]) + } + if _, ok := byID[domain.OfficialSystemUserID]; !ok { + t.Fatalf("system user missing from local synthesis: %+v", got) + } +} + type resolverCall struct { viewerUserID int64 ids []int64 diff --git a/internal/app/phone/dh.go b/internal/app/phone/dh.go index ef0fcbd1..2beda466 100644 --- a/internal/app/phone/dh.go +++ b/internal/app/phone/dh.go @@ -11,7 +11,7 @@ import ( "fmt" ) -// DHConfigVersion 是 messages.getDhConfig 的静态版本号。p/g 是编译期常量， +// DHConfigVersion 是 messages.getDhConfig 的服务端配置版本。p/g 是编译期常量， // 客户端缓存命中（请求 version 相同）时只回 dhConfigNotModified{random}。 // // ⚠ 提高此值会让所有客户端在下一次 messages.getDhConfig（每次拨打/接听通话都会调用） diff --git a/internal/app/privacy/facts.go b/internal/app/privacy/facts.go index 32c0a930..a808e754 100644 --- a/internal/app/privacy/facts.go +++ b/internal/app/privacy/facts.go @@ -2,11 +2,13 @@ package privacy import ( "context" + "fmt" "strconv" "time" "telesrv/internal/domain" "telesrv/internal/readmodelcache" + "telesrv/internal/store" ) const ( @@ -15,6 +17,10 @@ const ( privacyViewerFactsMaxEntries = 8192 privacyMembershipMaxEntries = 65536 + // A single legal cold batch must not replace the complete long-lived pair + // cache. Large projections still use one exact store batch, but bypass LRU + // admission and return the loaded facts directly. + privacyMembershipBatchAdmissionMaxPairs = privacyMembershipMaxEntries / 4 ) // baseUserProvider returns viewer-independent user facts through the users read @@ -24,10 +30,11 @@ type baseUserProvider interface { PrivacyBaseUsers(ctx context.Context, userIDs []int64) ([]domain.User, error) } -// channelMembershipProvider is the cold loader behind the bounded membership -// read model. Privacy evaluation never calls it for a warm (chat,user) pair. +// channelMembershipProvider is the exact-pair cold loader behind the bounded +// membership read model. Cache-admitted batches load only misses; oversized +// non-admitted batches reload once without polluting the long-lived LRU. type channelMembershipProvider interface { - FilterActiveChannelMemberIDs(ctx context.Context, channelID int64, userIDs []int64) ([]int64, error) + FilterActiveChannelMemberPairs(ctx context.Context, userIDsByChannel map[int64][]int64) (map[int64][]int64, error) } type viewerFacts struct { @@ -153,40 +160,30 @@ func (s *Service) loadMembershipFacts(ctx context.Context, chatIDs, viewerUserID if len(chats) == 0 || len(viewers) == 0 { return map[membershipKey]bool{}, nil } + if !activeChannelMembershipPairsAllowed(0, len(chats), len(viewers)) { + return nil, activeChannelMembershipPairLimitError() + } keys := make([]membershipKey, 0, len(chats)*len(viewers)) for _, chatID := range chats { for _, viewerID := range viewers { keys = append(keys, membershipKey{ChatID: chatID, UserID: viewerID}) } } - loadMissing := func(ctx context.Context, missing []membershipKey) (map[membershipKey]bool, error) { - out := make(map[membershipKey]bool, len(missing)) - byChat := make(map[int64][]int64) - for _, key := range missing { - out[key] = false // negative cache: not an active member. - byChat[key.ChatID] = append(byChat[key.ChatID], key.UserID) - } - if s == nil || s.memberships == nil { - return out, nil - } - for chatID, userIDs := range byChat { - active, err := s.memberships.FilterActiveChannelMemberIDs(ctx, chatID, userIDs) - if err != nil { - return nil, err - } - for _, userID := range active { - out[membershipKey{ChatID: chatID, UserID: userID}] = true - } - } - return out, nil + return s.loadMembershipFactsForKeys(ctx, keys) +} + +func activeChannelMembershipPairsAllowed(current, channelCount, userCount int) bool { + if current < 0 || channelCount < 0 || userCount < 0 || current > store.MaxActiveChannelMemberPairs { + return false } - if s == nil || s.membershipFacts == nil { - return loadMissing(ctx, keys) + if channelCount == 0 || userCount == 0 { + return true } - return s.membershipFacts.GetOrLoadBatch(ctx, keys, - func(membershipKey) (int64, bool) { return 0, true }, - loadMissing, - ) + return channelCount <= (store.MaxActiveChannelMemberPairs-current)/userCount +} + +func activeChannelMembershipPairLimitError() error { + return fmt.Errorf("%w: maximum %d", store.ErrActiveChannelMemberPairsLimit, store.MaxActiveChannelMemberPairs) } func applyViewerFacts(ctx *domain.PrivacyContext, facts viewerFacts, now int64) { diff --git a/internal/app/privacy/service.go b/internal/app/privacy/service.go index 7cd914f8..af20d574 100644 --- a/internal/app/privacy/service.go +++ b/internal/app/privacy/service.go @@ -346,8 +346,8 @@ func (s *Service) ViewerIsPremium(ctx context.Context, viewerUserID int64) (bool } // CanSeeMatrix 批量评估 owners × viewers × keys 的可见性矩阵，结果等价于逐 (owner,viewer,key) -// 调 CanSee，但只用一次 ListPrivacyRules + 每 owner 一次 GetMany(owner,viewers) + 内存 Evaluate -// （把 fan-out 投影从 O(viewer) 次 privacy 查询降到 O(owner)）。返回 map[owner]map[viewer]map[key]bool。 +// 调 CanSee。生产 contact store 通过一次 exact owner->viewer pair batch 读取联系人关系；仅不支持 +// sparse projection 的测试/替代实现按 owner 回退 GetMany。返回 map[owner]map[viewer]map[key]bool。 func (s *Service) CanSeeMatrix(ctx context.Context, ownerUserIDs, viewerUserIDs []int64, keys []domain.PrivacyKey) (map[int64]map[int64]map[domain.PrivacyKey]bool, error) { out := make(map[int64]map[int64]map[domain.PrivacyKey]bool, len(ownerUserIDs)) if len(ownerUserIDs) == 0 || len(viewerUserIDs) == 0 || len(keys) == 0 { @@ -408,11 +408,29 @@ func (s *Service) CanSeeMatrix(ctx context.Context, ownerUserIDs, viewerUserIDs return nil, err } } + var contactsByOwner map[int64]map[int64]domain.Contact + useSparseContacts := false + if s != nil && s.contacts != nil { + if loader, ok := s.contacts.(store.SparseContactProjectionStore); ok { + requested := make(map[int64][]int64, len(owners)) + for _, owner := range owners { + requested[owner] = viewers + } + batch, err := loader.ContactProjectionForViewerUserIDs(ctx, requested) + if err != nil { + return nil, err + } + contactsByOwner = batch.Contacts + useSparseContacts = true + } + } now := s.now().Unix() for _, owner := range owners { // owner 的联系人中哪些是本批 viewer（= privacy 的 ViewerIsContact，对应 contacts.Get(owner,viewer)）。 var ownerContacts map[int64]domain.Contact - if s != nil && s.contacts != nil { + if useSparseContacts { + ownerContacts = contactsByOwner[owner] + } else if s != nil && s.contacts != nil { var err error ownerContacts, err = s.contacts.GetMany(ctx, owner, viewers) if err != nil { diff --git a/internal/app/privacy/service_sparse.go b/internal/app/privacy/service_sparse.go new file mode 100644 index 00000000..b2390ccc --- /dev/null +++ b/internal/app/privacy/service_sparse.go @@ -0,0 +1,232 @@ +package privacy + +import ( + "context" + "fmt" + + "telesrv/internal/domain" + "telesrv/internal/store" +) + +// CanSeeForViewerUserIDs evaluates only the requested viewer->owner pairs. +// contactsByOwner must contain the inverse owner->viewer contact rows prefetched +// by the caller; accepting them here lets user projection share one sparse +// contact read for contact overlays, personal photos, and privacy relations. +func (s *Service) CanSeeForViewerUserIDs( + ctx context.Context, + ownerUserIDsByViewer map[int64][]int64, + keys []domain.PrivacyKey, + contactsByOwner map[int64]map[int64]domain.Contact, +) (map[int64]map[int64]map[domain.PrivacyKey]bool, error) { + out := make(map[int64]map[int64]map[domain.PrivacyKey]bool) + if len(ownerUserIDsByViewer) == 0 || len(keys) == 0 { + return out, nil + } + for _, key := range keys { + if !ValidKey(key) { + return nil, domain.ErrPrivacyKeyInvalid + } + } + viewersByOwner := make(map[int64][]int64) + viewerSet := make(map[int64]struct{}) + for viewerID, ownerIDs := range ownerUserIDsByViewer { + if viewerID == 0 { + continue + } + seenOwners := make(map[int64]struct{}, len(ownerIDs)) + for _, ownerID := range ownerIDs { + if ownerID == 0 { + continue + } + if _, ok := seenOwners[ownerID]; ok { + continue + } + seenOwners[ownerID] = struct{}{} + viewersByOwner[ownerID] = append(viewersByOwner[ownerID], viewerID) + viewerSet[viewerID] = struct{}{} + } + } + if len(viewersByOwner) == 0 { + return out, nil + } + if contactsByOwner == nil && s != nil && s.contacts != nil { + loader, ok := s.contacts.(store.SparseContactProjectionStore) + if !ok { + return nil, fmt.Errorf("privacy contact store does not support sparse projection") + } + batch, err := loader.ContactProjectionForViewerUserIDs(ctx, viewersByOwner) + if err != nil { + return nil, err + } + contactsByOwner = batch.Contacts + } + owners := make([]int64, 0, len(viewersByOwner)) + for ownerID := range viewersByOwner { + owners = append(owners, ownerID) + } + rulesByOwner := make(map[int64]map[domain.PrivacyKey]domain.PrivacyRules, len(owners)) + if s != nil && s.rules != nil { + list, err := s.rules.ListPrivacyRules(ctx, owners, keys) + if err != nil { + return nil, err + } + for _, rules := range list { + if !ValidKey(rules.Key) { + continue + } + if len(rules.Rules) == 0 { + rules.Rules = domain.DefaultPrivacyRules(rules.Key) + } + if rulesByOwner[rules.OwnerUserID] == nil { + rulesByOwner[rules.OwnerUserID] = make(map[domain.PrivacyKey]domain.PrivacyRules, len(keys)) + } + rulesByOwner[rules.OwnerUserID][rules.Key] = cloneRules(rules) + } + } + + needsByOwner := make(map[int64]evaluationNeeds, len(owners)) + needsViewerFacts := false + membershipPairCount := 0 + for _, ownerID := range owners { + var needs evaluationNeeds + for _, key := range keys { + rules, ok := rulesByOwner[ownerID][key] + if !ok { + rules = defaultRules(ownerID, key) + } + mergeNeeds(&needs, needsForRules(rules)) + } + needsByOwner[ownerID] = needs + needsViewerFacts = needsViewerFacts || needs.viewerBase + viewerCount := len(viewersByOwner[ownerID]) + if !activeChannelMembershipPairsAllowed(membershipPairCount, len(needs.chatIDs), viewerCount) { + return nil, activeChannelMembershipPairLimitError() + } + membershipPairCount += len(needs.chatIDs) * viewerCount + } + membershipKeys := make([]membershipKey, 0, membershipPairCount) + for _, ownerID := range owners { + needs := needsByOwner[ownerID] + for _, chatID := range needs.chatIDs { + for _, viewerID := range viewersByOwner[ownerID] { + membershipKeys = append(membershipKeys, membershipKey{ChatID: chatID, UserID: viewerID}) + } + } + } + viewers := make([]int64, 0, len(viewerSet)) + for viewerID := range viewerSet { + viewers = append(viewers, viewerID) + } + var baseFacts map[int64]viewerFacts + if needsViewerFacts { + var err error + baseFacts, err = s.loadViewerFacts(ctx, viewers) + if err != nil { + return nil, err + } + } + membershipFacts, err := s.loadMembershipFactsForKeys(ctx, membershipKeys) + if err != nil { + return nil, err + } + now := s.now().Unix() + for _, ownerID := range owners { + perViewer := make(map[int64]map[domain.PrivacyKey]bool, len(viewersByOwner[ownerID])) + for _, viewerID := range viewersByOwner[ownerID] { + visibility := make(map[domain.PrivacyKey]bool, len(keys)) + if ownerID == viewerID { + for _, key := range keys { + visibility[key] = true + } + perViewer[viewerID] = visibility + continue + } + contact, isContact := contactsByOwner[ownerID][viewerID] + for _, key := range keys { + rules, ok := rulesByOwner[ownerID][key] + if !ok { + rules = defaultRules(ownerID, key) + } + evalCtx := domain.PrivacyContext{ + OwnerUserID: ownerID, ViewerUserID: viewerID, + ViewerIsContact: isContact, ViewerCloseFriend: isContact && contact.CloseFriend, + } + applyViewerFacts(&evalCtx, baseFacts[viewerID], now) + applyMembershipFacts(&evalCtx, needsByOwner[ownerID].chatIDs, membershipFacts) + visibility[key] = Evaluate(rules, evalCtx) + } + perViewer[viewerID] = visibility + } + out[ownerID] = perViewer + } + return out, nil +} + +func (s *Service) loadMembershipFactsForKeys(ctx context.Context, input []membershipKey) (map[membershipKey]bool, error) { + capacity := len(input) + if capacity > store.MaxActiveChannelMemberPairs { + capacity = store.MaxActiveChannelMemberPairs + } + seen := make(map[membershipKey]struct{}, capacity) + keys := make([]membershipKey, 0, capacity) + for _, key := range input { + if key.ChatID == 0 || key.UserID == 0 { + continue + } + if _, ok := seen[key]; ok { + continue + } + if len(keys) >= store.MaxActiveChannelMemberPairs { + return nil, activeChannelMembershipPairLimitError() + } + seen[key] = struct{}{} + keys = append(keys, key) + } + if len(keys) == 0 { + return map[membershipKey]bool{}, nil + } + loadMissing := func(ctx context.Context, missing []membershipKey) (map[membershipKey]bool, error) { + out := make(map[membershipKey]bool, len(missing)) + byChat := make(map[int64][]int64) + for _, key := range missing { + out[key] = false + byChat[key.ChatID] = append(byChat[key.ChatID], key.UserID) + } + if s == nil || s.memberships == nil { + return out, nil + } + activeByChat, err := s.memberships.FilterActiveChannelMemberPairs(ctx, byChat) + if err != nil { + return nil, err + } + for chatID, userIDs := range activeByChat { + for _, userID := range userIDs { + key := membershipKey{ChatID: chatID, UserID: userID} + if _, requested := out[key]; requested { + out[key] = true + } + } + } + return out, nil + } + if s == nil || s.membershipFacts == nil { + return loadMissing(ctx, keys) + } + if len(keys) > privacyMembershipBatchAdmissionMaxPairs { + for { + loadEpoch := s.membershipFacts.LoadEpoch() + loaded, err := loadMissing(ctx, keys) + if err != nil { + return nil, err + } + if s.membershipFacts.LoadEpoch() == loadEpoch { + return loaded, nil + } + if err := ctx.Err(); err != nil { + return nil, err + } + } + } + return s.membershipFacts.GetOrLoadBatch(ctx, keys, + func(membershipKey) (int64, bool) { return 0, true }, loadMissing) +} diff --git a/internal/app/privacy/service_test.go b/internal/app/privacy/service_test.go index b74d62c3..1d86efe5 100644 --- a/internal/app/privacy/service_test.go +++ b/internal/app/privacy/service_test.go @@ -2,10 +2,12 @@ package privacy import ( "context" + "errors" "testing" "time" "telesrv/internal/domain" + "telesrv/internal/store" "telesrv/internal/store/memory" ) @@ -26,8 +28,47 @@ func (p *countingBaseUsers) PrivacyBaseUsers(_ context.Context, userIDs []int64) } type countingMemberships struct { - calls int - active map[int64]map[int64]bool + calls int + batchCalls int + batchRequests []map[int64][]int64 + active map[int64]map[int64]bool +} + +type countingSparseContacts struct { + store.ContactStore + sparseCalls int + getMany int + requested map[int64][]int64 +} + +func (c *countingSparseContacts) GetMany(ctx context.Context, ownerUserID int64, viewerUserIDs []int64) (map[int64]domain.Contact, error) { + c.getMany++ + return c.ContactStore.GetMany(ctx, ownerUserID, viewerUserIDs) +} + +func (c *countingSparseContacts) ContactProjectionForViewerUserIDs(ctx context.Context, requested map[int64][]int64) (domain.ContactProjectionBatch, error) { + c.sparseCalls++ + c.requested = make(map[int64][]int64, len(requested)) + for viewerID, targetIDs := range requested { + c.requested[viewerID] = append([]int64(nil), targetIDs...) + } + return c.ContactStore.(store.SparseContactProjectionStore).ContactProjectionForViewerUserIDs(ctx, requested) +} + +func (p *countingMemberships) FilterActiveChannelMemberPairs(_ context.Context, requested map[int64][]int64) (map[int64][]int64, error) { + p.batchCalls++ + cloned := make(map[int64][]int64, len(requested)) + out := make(map[int64][]int64, len(requested)) + for channelID, userIDs := range requested { + cloned[channelID] = append([]int64(nil), userIDs...) + for _, userID := range userIDs { + if p.active[channelID][userID] { + out[channelID] = append(out[channelID], userID) + } + } + } + p.batchRequests = append(p.batchRequests, cloned) + return out, nil } func (p *countingMemberships) FilterActiveChannelMemberIDs(_ context.Context, channelID int64, userIDs []int64) ([]int64, error) { @@ -226,6 +267,47 @@ func TestCanSeeMatrixEquivalentToCanSee(t *testing.T) { } } +func TestCanSeeMatrixLoadsOwnerViewerContactsInOneSparseBatch(t *testing.T) { + ctx := context.Background() + inner := memory.NewContactStore() + contacts := &countingSparseContacts{ContactStore: inner} + svc := NewService(memory.NewPrivacyStore(), contacts) + owners := []int64{6101, 6102} + viewers := []int64{7101, 7102} + for _, owner := range owners { + if _, err := svc.SetRules(ctx, owner, domain.PrivacyKeyPhoneNumber, []domain.PrivacyRule{ + {Kind: domain.PrivacyRuleAllowContacts}, + {Kind: domain.PrivacyRuleDisallowAll}, + }); err != nil { + t.Fatalf("set owner %d rules: %v", owner, err) + } + } + if _, err := inner.Upsert(ctx, owners[0], domain.ContactInput{ContactUserID: viewers[0]}); err != nil { + t.Fatalf("upsert contact: %v", err) + } + + matrix, err := svc.CanSeeMatrix(ctx, owners, viewers, []domain.PrivacyKey{domain.PrivacyKeyPhoneNumber}) + if err != nil { + t.Fatalf("CanSeeMatrix: %v", err) + } + if contacts.sparseCalls != 1 || contacts.getMany != 0 { + t.Fatalf("contact reads = sparse %d / GetMany %d, want 1 / 0", contacts.sparseCalls, contacts.getMany) + } + for _, owner := range owners { + if got := len(contacts.requested[owner]); got != len(viewers) { + t.Fatalf("requested owner %d viewers = %v, want %v", owner, contacts.requested[owner], viewers) + } + } + if !matrix[owners[0]][viewers[0]][domain.PrivacyKeyPhoneNumber] { + t.Fatal("owner contact relation was not applied") + } + if matrix[owners[0]][viewers[1]][domain.PrivacyKeyPhoneNumber] || + matrix[owners[1]][viewers[0]][domain.PrivacyKeyPhoneNumber] || + matrix[owners[1]][viewers[1]][domain.PrivacyKeyPhoneNumber] { + t.Fatalf("unexpected non-contact visibility: %+v", matrix) + } +} + func TestViewerFactsReadModelBatchesCachesAndInvalidates(t *testing.T) { ctx := context.Background() rules := memory.NewPrivacyStore() @@ -313,15 +395,15 @@ func TestMembershipReadModelCachesNegativeFactsAndInvalidatesPair(t *testing.T) got[1001][2002][domain.PrivacyKeyChatInvite] { t.Fatalf("unexpected membership visibility matrix: %+v", got) } - if memberships.calls != 2 { - t.Fatalf("membership cold loads = %d, want one batch per referenced chat", memberships.calls) + if memberships.batchCalls != 1 || memberships.calls != 0 { + t.Fatalf("membership cold loads = batch %d scalar %d, want batch=1 scalar=0", memberships.batchCalls, memberships.calls) } if allowed, err := svc.CanSee(ctx, 1001, 2002, domain.PrivacyKeyChatInvite); err != nil || allowed { t.Fatalf("warm negative membership = %v, err=%v; want false", allowed, err) } - if memberships.calls != 2 { - t.Fatalf("negative cache missed: calls=%d", memberships.calls) + if memberships.batchCalls != 1 || memberships.calls != 0 { + t.Fatalf("negative cache missed: batch=%d scalar=%d", memberships.batchCalls, memberships.calls) } memberships.active[9002][2002] = true @@ -329,7 +411,127 @@ func TestMembershipReadModelCachesNegativeFactsAndInvalidatesPair(t *testing.T) if allowed, err := svc.CanSee(ctx, 1001, 2002, domain.PrivacyKeyChatInvite); err != nil || !allowed { t.Fatalf("invalidated membership = %v, err=%v; want true", allowed, err) } - if memberships.calls != 3 { - t.Fatalf("pair invalidation reloads = %d, want 3", memberships.calls) + if memberships.batchCalls != 2 || memberships.calls != 0 { + t.Fatalf("pair invalidation reloads = batch %d scalar %d, want batch=2 scalar=0", memberships.batchCalls, memberships.calls) + } +} + +func TestSparsePrivacyMembershipUsesOneExactPairBatch(t *testing.T) { + ctx := context.Background() + const ( + ownerA = int64(1001) + ownerB = int64(1002) + viewerA = int64(2001) + viewerB = int64(2002) + chatA = int64(9001) + chatB = int64(9002) + ) + rules := memory.NewPrivacyStore() + memberships := &countingMemberships{active: map[int64]map[int64]bool{ + chatA: {viewerA: true, viewerB: true}, + chatB: {viewerA: true, viewerB: true}, + }} + svc := NewService(rules, memory.NewContactStore()).ConfigureReadModels(nil, memberships) + for ownerID, chatID := range map[int64]int64{ownerA: chatA, ownerB: chatB} { + if _, err := svc.SetRules(ctx, ownerID, domain.PrivacyKeyProfilePhoto, []domain.PrivacyRule{ + {Kind: domain.PrivacyRuleAllowChatParticipants, ChatIDs: []int64{chatID}}, + {Kind: domain.PrivacyRuleDisallowAll}, + }); err != nil { + t.Fatalf("SetRules(%d): %v", ownerID, err) + } + } + got, err := svc.CanSeeForViewerUserIDs(ctx, map[int64][]int64{ + viewerA: {ownerA}, + viewerB: {ownerB}, + }, []domain.PrivacyKey{domain.PrivacyKeyProfilePhoto}, map[int64]map[int64]domain.Contact{}) + if err != nil { + t.Fatalf("CanSeeForViewerUserIDs: %v", err) + } + if !got[ownerA][viewerA][domain.PrivacyKeyProfilePhoto] || !got[ownerB][viewerB][domain.PrivacyKeyProfilePhoto] { + t.Fatalf("visibility = %+v, want both exact pairs visible", got) + } + if memberships.batchCalls != 1 || memberships.calls != 0 { + t.Fatalf("membership loads = batch %d scalar %d, want batch=1 scalar=0", memberships.batchCalls, memberships.calls) + } + requested := memberships.batchRequests[0] + if len(requested) != 2 || len(requested[chatA]) != 1 || requested[chatA][0] != viewerA || len(requested[chatB]) != 1 || requested[chatB][0] != viewerB { + t.Fatalf("membership request = %+v, want only (%d,%d) and (%d,%d)", requested, chatA, viewerA, chatB, viewerB) + } +} + +func TestSparsePrivacyMembershipRejectsDerivedPairOverflowBeforeLoad(t *testing.T) { + ctx := context.Background() + rules := memory.NewPrivacyStore() + memberships := &countingMemberships{active: map[int64]map[int64]bool{}} + svc := NewService(rules, memory.NewContactStore()).ConfigureReadModels(nil, memberships) + owners := []int64{1001, 1002, 1003, 1004, 1005} + for ownerIndex, ownerID := range owners { + chatIDs := make([]int64, 5000) + for i := range chatIDs { + chatIDs[i] = int64(100000 + ownerIndex*10000 + i) + } + if _, err := svc.SetRules(ctx, ownerID, domain.PrivacyKeyProfilePhoto, []domain.PrivacyRule{ + {Kind: domain.PrivacyRuleAllowChatParticipants, ChatIDs: chatIDs}, + {Kind: domain.PrivacyRuleDisallowAll}, + }); err != nil { + t.Fatalf("SetRules(%d): %v", ownerID, err) + } + } + _, err := svc.CanSeeForViewerUserIDs(ctx, map[int64][]int64{ + 2001: owners, + 2002: owners, + 2003: owners, + }, []domain.PrivacyKey{domain.PrivacyKeyProfilePhoto}, map[int64]map[int64]domain.Contact{}) + if !errors.Is(err, store.ErrActiveChannelMemberPairsLimit) { + t.Fatalf("CanSeeForViewerUserIDs error = %v, want ErrActiveChannelMemberPairsLimit", err) + } + if memberships.batchCalls != 0 || memberships.calls != 0 { + t.Fatalf("membership loads = batch %d scalar %d, want fail before load", memberships.batchCalls, memberships.calls) + } +} + +func TestDensePrivacyMembershipRejectsDerivedPairOverflowBeforeLoad(t *testing.T) { + memberships := &countingMemberships{active: map[int64]map[int64]bool{}} + svc := NewService(memory.NewPrivacyStore(), memory.NewContactStore()).ConfigureReadModels(nil, memberships) + chatIDs := make([]int64, 257) + viewerIDs := make([]int64, 256) + for i := range chatIDs { + chatIDs[i] = int64(i + 1) + } + for i := range viewerIDs { + viewerIDs[i] = int64(1000 + i) + } + _, err := svc.loadMembershipFacts(context.Background(), chatIDs, viewerIDs) + if !errors.Is(err, store.ErrActiveChannelMemberPairsLimit) { + t.Fatalf("loadMembershipFacts error = %v, want ErrActiveChannelMemberPairsLimit", err) + } + if memberships.batchCalls != 0 || memberships.calls != 0 { + t.Fatalf("membership loads = batch %d scalar %d, want fail before load", memberships.batchCalls, memberships.calls) + } +} + +func TestLargeMembershipBatchBypassesLRUAdmissionWithoutEvictingHotPair(t *testing.T) { + ctx := context.Background() + memberships := &countingMemberships{active: map[int64]map[int64]bool{}} + svc := NewService(memory.NewPrivacyStore(), memory.NewContactStore()).ConfigureReadModels(nil, memberships) + hot := membershipKey{ChatID: 9001, UserID: 2001} + if _, err := svc.loadMembershipFactsForKeys(ctx, []membershipKey{hot}); err != nil { + t.Fatalf("warm hot membership pair: %v", err) + } + large := make([]membershipKey, store.MaxActiveChannelMemberPairs) + for i := range large { + large[i] = membershipKey{ChatID: 9002, UserID: int64(100000 + i)} + } + if _, err := svc.loadMembershipFactsForKeys(ctx, large); err != nil { + t.Fatalf("load large membership batch: %v", err) + } + if memberships.batchCalls != 2 || memberships.calls != 0 { + t.Fatalf("loads after large batch = batch %d scalar %d, want batch=2 scalar=0", memberships.batchCalls, memberships.calls) + } + if _, err := svc.loadMembershipFactsForKeys(ctx, []membershipKey{hot}); err != nil { + t.Fatalf("reload hot membership pair: %v", err) + } + if memberships.batchCalls != 2 || memberships.calls != 0 { + t.Fatalf("hot pair was evicted by non-admitted batch: batch=%d scalar=%d", memberships.batchCalls, memberships.calls) } } diff --git a/internal/app/readmodel/hash.go b/internal/app/readmodel/hash.go index 17c000f2..8ec7bfde 100644 --- a/internal/app/readmodel/hash.go +++ b/internal/app/readmodel/hash.go @@ -7,6 +7,7 @@ import ( const ( ModelDialogLight = "dialog_light" + ModelDialogOwner = "dialog_owner" ModelContactAccount = "contact_account" ModelChannelBase = "channel_base" ModelChannelMember = "channel_member" @@ -15,6 +16,9 @@ const ( ModelPrivateMediaCounts = "private_media_counts" ModelChannelParticipants = "channel_participants" ModelChannelSelfBoosts = "channel_self_boosts" + ModelUserVisibility = "user_visibility" + ModelStoryPeer = "story_peer" + ModelStoryHiddenList = "story_hidden_list" ) func MixHashes(values ...int64) int64 { diff --git a/internal/app/secretchat/service.go b/internal/app/secretchat/service.go index ee3782e9..747aef51 100644 --- a/internal/app/secretchat/service.go +++ b/internal/app/secretchat/service.go @@ -1,6 +1,7 @@ package secretchat import ( + "bytes" "context" "crypto/rand" "encoding/binary" @@ -11,39 +12,44 @@ import ( "telesrv/internal/store" ) -// idAllocRetries 是 chat_id 撞键自愈的有界重试次数。 -const idAllocRetries = 4 - // Service 实现密聊握手状态机 + qts 消息投递。所有返回的 domain.SecretChat 都是当时快照。 -// 访问校验（self/bot/拉黑/隐私）在 rpc 层先行；本层做 DH 校验、id/access_hash 分配、 +// 访问校验（self/bot/拉黑/隐私）在 rpc 层先行；本层做 DH 校验、chat_id wire 不变量、access_hash 分配、 // 状态机迁移与 qts 队列写入。绑定维度是设备级 perm auth_key（int64）。 type Service struct { store store.SecretChatStore queue store.EncryptedQueueStore - ids store.SecretChatIDAllocator } // NewService 创建密聊服务。 -func NewService(st store.SecretChatStore, queue store.EncryptedQueueStore, ids store.SecretChatIDAllocator) *Service { - return &Service{store: st, queue: queue, ids: ids} +func NewService(st store.SecretChatStore, queue store.EncryptedQueueStore) *Service { + return &Service{store: st, queue: queue} } -// RequestEncryption 受理 requestEncryption：校验 g_a → 幂等去重 → 分配 chat_id + 双 +// RequestEncryption 受理 requestEncryption：校验 g_a → 校验 random_id/chat_id 全局唯一性 → 分配双 // access_hash → 盲存 g_a → 落 requested 态。返回的密聊由 rpc 层投影为 admin 视角 // encryptedChatWaiting（同步响应）与 participant 视角 encryptedChatRequested（推送）。 func (s *Service) RequestEncryption(ctx context.Context, req domain.SecretChatRequest) (domain.SecretChat, error) { if req.AdminUserID == 0 || req.ParticipantUserID == 0 || req.AdminAuthKeyID == 0 { return domain.SecretChat{}, ErrGAInvalid } + if req.RandomID == 0 { + return domain.SecretChat{}, domain.ErrSecretChatRandomIDDuplicate + } ga, err := validateDHParam(req.GA) if err != nil { return domain.SecretChat{}, err } - // 幂等：同发起设备 + random_id 重发返回既有 chat（DISCARDED 视为新请求）。 - if existing, ok, err := s.store.GetByAdminRandom(ctx, req.AdminAuthKeyID, req.RandomID); err != nil { + // Telegram wire 契约：requestEncryption.random_id 同时就是 chat_id。TDLib 会先以 + // random_id 创建本地 SecretChatActor，并在消费响应时强校验 response.id 相等；禁止 + // 用服务端序列替换。全局主键碰撞只允许相同意图的网络重放，其余显式 duplicate。 + chatID := int(req.RandomID) + if existing, ok, err := s.store.GetSecretChat(ctx, chatID); err != nil { return domain.SecretChat{}, err - } else if ok && !existing.Terminal() { - return existing, nil + } else if ok { + if sameSecretChatRequest(existing, req, ga) && !existing.Terminal() { + return existing, nil + } + return domain.SecretChat{}, domain.ErrSecretChatRandomIDDuplicate } adminAH, err := randomAccessHash() if err != nil { @@ -54,6 +60,7 @@ func (s *Service) RequestEncryption(ctx context.Context, req domain.SecretChatRe return domain.SecretChat{}, err } chat := domain.SecretChat{ + ID: chatID, AdminAccessHash: adminAH, ParticipantAccessHash: participantAH, AdminUserID: req.AdminUserID, @@ -64,46 +71,27 @@ func (s *Service) RequestEncryption(ctx context.Context, req domain.SecretChatRe RandomID: req.RandomID, Date: req.Date, } - for attempt := 0; ; attempt++ { - chatID, err := s.nextChatID(ctx, attempt) - if err != nil { - return domain.SecretChat{}, err - } - chat.ID = chatID - err = s.store.CreateSecretChat(ctx, chat) - if err == nil { - return chat, nil - } - if errors.Is(err, domain.ErrSecretChatIDConflict) && attempt < idAllocRetries { - continue - } + if err := s.store.CreateSecretChat(ctx, chat); err == nil { + return chat, nil + } else if !errors.Is(err, domain.ErrSecretChatRandomIDDuplicate) { return domain.SecretChat{}, err } + // 并发相同请求可能在预查后由另一 goroutine 插入；只在重新读取后仍证明 + // 是完全相同意图时收敛为幂等成功。 + existing, ok, getErr := s.store.GetSecretChat(ctx, chatID) + if getErr != nil { + return domain.SecretChat{}, getErr + } + if ok && sameSecretChatRequest(existing, req, ga) && !existing.Terminal() { + return existing, nil + } + return domain.SecretChat{}, domain.ErrSecretChatRandomIDDuplicate } -// nextChatID 分配下一个 chat_id；撞键后用 AtLeast(MaxSecretChatID) 顶起计数器自愈。 -// 校验 int32 正区间上界（EncryptedChat.ID 是 int32 量级）。 -func (s *Service) nextChatID(ctx context.Context, attempt int) (int, error) { - var ( - id int - err error - ) - if attempt == 0 { - id, err = s.ids.NextSecretChatID(ctx) - } else { - floor, ferr := s.store.MaxSecretChatID(ctx) - if ferr != nil { - return 0, ferr - } - id, err = s.ids.NextSecretChatIDAtLeast(ctx, floor) - } - if err != nil { - return 0, err - } - if id <= 0 || id > 0x7fffffff { - return 0, fmt.Errorf("secretchat: chat id out of int32 range: %d", id) - } - return id, nil +func sameSecretChatRequest(chat domain.SecretChat, req domain.SecretChatRequest, normalizedGA []byte) bool { + return chat.ID == int(req.RandomID) && chat.RandomID == req.RandomID && + chat.AdminUserID == req.AdminUserID && chat.AdminAuthKeyID == req.AdminAuthKeyID && + chat.ParticipantUserID == req.ParticipantUserID && bytes.Equal(chat.GA, normalizedGA) } // AcceptEncryption 受理 acceptEncryption：定位 + participant 视角 access_hash 校验 → @@ -132,15 +120,24 @@ func (s *Service) AcceptEncryption(ctx context.Context, chatID int, viewerUserID return s.store.AcceptSecretChat(ctx, chatID, participantAuthKeyID, gbPadded, keyFingerprint) } -// DiscardEncryption 受理 discardEncryption：定位 + 参与者校验 → 迁移到 discarded。 +// DiscardEncryption 受理 discardEncryption：定位 + 参与者/绑定设备校验 → 迁移到 discarded。 // already=true 表示已是终态（幂等成功）。返回的密聊由 rpc 层投影为对端 // encryptedChatDiscarded 推送。 -func (s *Service) DiscardEncryption(ctx context.Context, chatID int, viewerUserID int64, deleteHistory bool) (domain.SecretChat, bool, error) { +func (s *Service) DiscardEncryption(ctx context.Context, chatID int, viewerUserID, viewerAuthKeyID int64, deleteHistory bool) (domain.SecretChat, bool, error) { chat, ok, err := s.store.GetSecretChat(ctx, chatID) if err != nil { return domain.SecretChat{}, false, err } - if !ok || !chat.HasParticipant(viewerUserID) { + if !ok || !chat.HasParticipant(viewerUserID) || viewerAuthKeyID == 0 { + return domain.SecretChat{}, false, domain.ErrSecretChatNotFound + } + // Admin 从 request 起即绑定；participant 在 accept 前尚无绑定，任一收到账号级邀请的 + // participant 设备都可拒绝。accept 一旦完成，双方所有操作都必须来自各自绑定设备。 + boundAuthKeyID := chat.AuthKeyOf(viewerUserID) + if boundAuthKeyID != 0 && boundAuthKeyID != viewerAuthKeyID { + return domain.SecretChat{}, false, domain.ErrSecretChatNotFound + } + if boundAuthKeyID == 0 && viewerUserID != chat.ParticipantUserID { return domain.SecretChat{}, false, domain.ErrSecretChatNotFound } return s.store.DiscardSecretChat(ctx, chatID, deleteHistory) @@ -180,16 +177,17 @@ func (s *Service) DiscardForAuthKey(ctx context.Context, authKeyID int64) ([]dom return discarded, nil } -// SendEncrypted 受理 sendEncrypted*：定位 + 发送方视角 access_hash 校验 + 态须 normal → +// SendEncrypted 受理 sendEncrypted*：定位 + 发送方绑定设备/access_hash 校验 + 态须 normal → // 给【对端绑定设备】分配 qts 并把不透明 bytes 写入投递队列（幂等：同 chat+random_id 返既有 // qts/date）。返回密聊快照 + 已落库消息（携 qts/date，rpc 层据此推 updateNewEncryptedMessage // 并回 SentEncryptedMessage{date}）。盲中継：不解密 bytes。 -func (s *Service) SendEncrypted(ctx context.Context, chatID int, viewerUserID, accessHash int64, delivery domain.SecretMessageDelivery) (domain.SecretChat, domain.SecretChatMessage, error) { +func (s *Service) SendEncrypted(ctx context.Context, chatID int, viewerUserID, viewerAuthKeyID, accessHash int64, delivery domain.SecretMessageDelivery) (domain.SecretChat, domain.SecretChatMessage, error) { chat, ok, err := s.store.GetSecretChat(ctx, chatID) if err != nil { return domain.SecretChat{}, domain.SecretChatMessage{}, err } - if !ok || !chat.HasParticipant(viewerUserID) || chat.AccessHashFor(viewerUserID) != accessHash { + if !ok || !chat.HasParticipant(viewerUserID) || viewerAuthKeyID == 0 || + chat.AuthKeyOf(viewerUserID) != viewerAuthKeyID || chat.AccessHashFor(viewerUserID) != accessHash { return domain.SecretChat{}, domain.SecretChatMessage{}, domain.ErrSecretChatNotFound } if chat.State != domain.SecretChatStateNormal { diff --git a/internal/app/secretchat/service_test.go b/internal/app/secretchat/service_test.go index 126c2f4d..eb52d067 100644 --- a/internal/app/secretchat/service_test.go +++ b/internal/app/secretchat/service_test.go @@ -3,30 +3,13 @@ package secretchat import ( "context" "errors" + "sync" "testing" "telesrv/internal/domain" "telesrv/internal/store/memory" ) -// fakeChatIDAllocator 是单调自增的测试分配器（无 Redis）。 -type fakeChatIDAllocator struct{ n int } - -func (a *fakeChatIDAllocator) NextSecretChatID(context.Context) (int, error) { - a.n++ - return a.n, nil -} - -func (a *fakeChatIDAllocator) NextSecretChatIDAtLeast(_ context.Context, floor int) (int, error) { - if a.n < floor { - a.n = floor - } - a.n++ - return a.n, nil -} - -func (a *fakeChatIDAllocator) CurrentSecretChatID(context.Context) (int, error) { return a.n, nil } - // validGA 返回一个落在合法 DH 区间的 256 字节 g_a（首字节 0x55 ≈ 2^2046， // 既 > 2^1984 又 < p≈0xc7..）。 func validGA() []byte { @@ -40,7 +23,7 @@ func validGA() []byte { func newTestService() (*Service, *memory.SecretChatStore) { st := memory.NewSecretChatStore() - return NewService(st, memory.NewEncryptedQueueStore(), &fakeChatIDAllocator{}), st + return NewService(st, memory.NewEncryptedQueueStore()), st } const ( @@ -48,6 +31,7 @@ const ( partUser = int64(2002) adminAuthKey = int64(0x1111) partAuthKey = int64(0x2222) + otherAuthKey = int64(0x3333) keyFP = int64(0x0123456789abcdef) ) @@ -69,8 +53,8 @@ func TestRequestEncryption(t *testing.T) { if err != nil { t.Fatalf("RequestEncryption: %v", err) } - if chat.ID <= 0 || chat.ID > 0x7fffffff { - t.Fatalf("chat id out of int32 range: %d", chat.ID) + if chat.ID != int(requestFixture().RandomID) { + t.Fatalf("chat id = %d, want request random_id %d", chat.ID, requestFixture().RandomID) } if chat.State != domain.SecretChatStateRequested { t.Fatalf("state = %q, want requested", chat.State) @@ -105,6 +89,94 @@ func TestRequestEncryptionIdempotent(t *testing.T) { } } +func TestRequestEncryptionConcurrentExactRetry(t *testing.T) { + svc, _ := newTestService() + ctx := context.Background() + results := make([]domain.SecretChat, 2) + errs := make([]error, 2) + var wg sync.WaitGroup + for i := range results { + wg.Add(1) + go func(i int) { + defer wg.Done() + results[i], errs[i] = svc.RequestEncryption(ctx, requestFixture()) + }(i) + } + wg.Wait() + for i, err := range errs { + if err != nil { + t.Fatalf("concurrent request %d: %v", i, err) + } + } + if results[0].ID != int(requestFixture().RandomID) || results[1].ID != results[0].ID || + results[1].AdminAccessHash != results[0].AdminAccessHash || + results[1].ParticipantAccessHash != results[0].ParticipantAccessHash { + t.Fatalf("concurrent exact retry diverged: first=%+v second=%+v", results[0], results[1]) + } +} + +func TestRequestEncryptionPreservesNegativeRandomID(t *testing.T) { + svc, _ := newTestService() + req := requestFixture() + req.RandomID = -12345 + chat, err := svc.RequestEncryption(context.Background(), req) + if err != nil { + t.Fatalf("request negative random_id: %v", err) + } + if chat.ID != int(req.RandomID) || chat.RandomID != req.RandomID { + t.Fatalf("chat id/random_id = %d/%d, want %d", chat.ID, chat.RandomID, req.RandomID) + } +} + +func TestRequestEncryptionRejectsChangedIntentAndGlobalCollision(t *testing.T) { + svc, _ := newTestService() + ctx := context.Background() + if _, err := svc.RequestEncryption(ctx, requestFixture()); err != nil { + t.Fatalf("first request: %v", err) + } + + changedPeer := requestFixture() + changedPeer.ParticipantUserID++ + if _, err := svc.RequestEncryption(ctx, changedPeer); !errors.Is(err, domain.ErrSecretChatRandomIDDuplicate) { + t.Fatalf("changed peer err = %v, want ErrSecretChatRandomIDDuplicate", err) + } + + changedGA := requestFixture() + changedGA.GA = validGA() + changedGA.GA[1] ^= 0x01 + if _, err := svc.RequestEncryption(ctx, changedGA); !errors.Is(err, domain.ErrSecretChatRandomIDDuplicate) { + t.Fatalf("changed g_a err = %v, want ErrSecretChatRandomIDDuplicate", err) + } + + otherAuthKey := requestFixture() + otherAuthKey.AdminUserID++ + otherAuthKey.AdminAuthKeyID++ + if _, err := svc.RequestEncryption(ctx, otherAuthKey); !errors.Is(err, domain.ErrSecretChatRandomIDDuplicate) { + t.Fatalf("global collision err = %v, want ErrSecretChatRandomIDDuplicate", err) + } +} + +func TestRequestEncryptionRejectsZeroAndDiscardedReuse(t *testing.T) { + svc, _ := newTestService() + ctx := context.Background() + zero := requestFixture() + zero.RandomID = 0 + if _, err := svc.RequestEncryption(ctx, zero); !errors.Is(err, domain.ErrSecretChatRandomIDDuplicate) { + t.Fatalf("zero random_id err = %v, want ErrSecretChatRandomIDDuplicate", err) + } + + chat, err := svc.RequestEncryption(ctx, requestFixture()) + if err != nil { + t.Fatalf("request: %v", err) + } + if _, _, err := svc.DiscardEncryption(ctx, chat.ID, adminUser, adminAuthKey, true); err != nil { + t.Fatalf("discard: %v", err) + } + if _, err := svc.RequestEncryption(ctx, requestFixture()); !errors.Is(err, domain.ErrSecretChatRandomIDDuplicate) { + t.Fatalf("discarded reuse err = %v, want ErrSecretChatRandomIDDuplicate", err) + } +} + func TestRequestEncryptionInvalidGA(t *testing.T) { svc, _ := newTestService() req := requestFixture() @@ -174,6 +246,63 @@ func TestAcceptEncryptionDoubleAccept(t *testing.T) { } } +func TestAcceptEncryptionConcurrentDevicesSingleWinner(t *testing.T) { + svc, st := newTestService() + ctx := context.Background() + chat, err := svc.RequestEncryption(ctx, requestFixture()) + if err != nil { + t.Fatalf("request: %v", err) + } + + authKeys := []int64{partAuthKey, otherAuthKey} + errs := make([]error, len(authKeys)) + var wg sync.WaitGroup + for i, authKeyID := range authKeys { + wg.Add(1) + go func(i int, authKeyID int64) { + defer wg.Done() + _, errs[i] = svc.AcceptEncryption(ctx, chat.ID, partUser, authKeyID, chat.ParticipantAccessHash, validGA(), keyFP) + }(i, authKeyID) + } + wg.Wait() + + winners := 0 + losers := 0 + for _, err := range errs { + switch { + case err == nil: + winners++ + case errors.Is(err, domain.ErrSecretChatAlreadyAccepted): + losers++ + default: + t.Fatalf("concurrent accept err = %v", err) + } + } + if winners != 1 || losers != 1 { + t.Fatalf("concurrent accepts winners=%d losers=%d, want 1/1", winners, losers) + } + + stored, ok, err := st.GetSecretChat(ctx, chat.ID) + if err != nil || !ok { + t.Fatalf("get accepted chat: ok=%v err=%v", ok, err) + } + if stored.State != domain.SecretChatStateNormal || + (stored.ParticipantAuthKeyID != partAuthKey && stored.ParticipantAuthKeyID != otherAuthKey) { + t.Fatalf("accepted chat = %+v, want normal bound to one participant device", stored) + } + loserAuthKeyID := partAuthKey + if stored.ParticipantAuthKeyID == partAuthKey { + loserAuthKeyID = otherAuthKey + } + if _, _, err := svc.DiscardEncryption(ctx, chat.ID, partUser, loserAuthKeyID, true); !errors.Is(err, domain.ErrSecretChatNotFound) { + t.Fatalf("loser discard err = %v, want ErrSecretChatNotFound", err) + } + stored, ok, err = st.GetSecretChat(ctx, chat.ID) + if err != nil || !ok || stored.State != domain.SecretChatStateNormal { + t.Fatalf("chat after loser discard = %+v ok=%v err=%v, want normal", stored, ok, err) + } +} + func TestAcceptEncryptionInvalidGB(t *testing.T) { svc, _ := newTestService() ctx := context.Background() @@ -188,7 +317,7 @@ func TestDiscardEncryption(t *testing.T) { svc, _ := newTestService() ctx := context.Background() chat, _ := svc.RequestEncryption(ctx, requestFixture()) - got, already, err := svc.DiscardEncryption(ctx, chat.ID, adminUser, true) + got, already, err := svc.DiscardEncryption(ctx, chat.ID, adminUser, adminAuthKey, true) if err != nil { t.Fatalf("discard: %v", err) } @@ -199,7 +328,7 @@ func TestDiscardEncryption(t *testing.T) { t.Fatalf("discarded chat = %+v", got) } // 幂等：再 discard 返回 already=true。 - _, already, err = svc.DiscardEncryption(ctx, chat.ID, partUser, false) + _, already, err = svc.DiscardEncryption(ctx, chat.ID, partUser, partAuthKey, false) if err != nil || !already { t.Fatalf("idempotent discard: already=%v err=%v", already, err) } @@ -209,7 +338,7 @@ func TestDiscardEncryptionNonParticipant(t *testing.T) { svc, _ := newTestService() ctx := context.Background() chat, _ := svc.RequestEncryption(ctx, requestFixture()) - _, _, err := svc.DiscardEncryption(ctx, chat.ID, int64(9999), false) + _, _, err := svc.DiscardEncryption(ctx, chat.ID, int64(9999), int64(9999), false) if !errors.Is(err, domain.ErrSecretChatNotFound) { t.Fatalf("err = %v, want ErrSecretChatNotFound", err) } @@ -245,20 +374,20 @@ func TestSendEncryptedQtsAllocation(t *testing.T) { chat := acceptedChat(t, svc) // admin 发 → 投给 participant 设备（partAuthKey），qts 从 1 起。 - _, m1, err := svc.SendEncrypted(ctx, chat.ID, adminUser, chat.AdminAccessHash, domain.SecretMessageDelivery{RandomID: 111, Bytes: []byte{1, 2, 3}, Date: 2000}) + _, m1, err := svc.SendEncrypted(ctx, chat.ID, adminUser, adminAuthKey, chat.AdminAccessHash, domain.SecretMessageDelivery{RandomID: 111, Bytes: []byte{1, 2, 3}, Date: 2000}) if err != nil { t.Fatalf("send 1: %v", err) } if m1.Qts != 1 || m1.ReceiverAuthKeyID != partAuthKey || m1.ReceiverUserID != partUser { t.Fatalf("msg1 = %+v (want qts=1, receiver=participant device)", m1) } - _, m2, err := svc.SendEncrypted(ctx, chat.ID, adminUser, chat.AdminAccessHash, domain.SecretMessageDelivery{RandomID: 222, Bytes: []byte{4}, Date: 2001}) + _, m2, err := svc.SendEncrypted(ctx, chat.ID, adminUser, adminAuthKey, chat.AdminAccessHash, domain.SecretMessageDelivery{RandomID: 222, Bytes: []byte{4}, Date: 2001}) if err != nil || m2.Qts != 2 { t.Fatalf("msg2 qts = %d err=%v, want 2", m2.Qts, err) } // 幂等重发同 random_id → 返回首次 qts/date，不分配新 qts。 - _, dup, err := svc.SendEncrypted(ctx, chat.ID, adminUser, chat.AdminAccessHash, domain.SecretMessageDelivery{RandomID: 111, Bytes: []byte{1, 2, 3}, Date: 9999}) + _, dup, err := svc.SendEncrypted(ctx, chat.ID, adminUser, adminAuthKey, chat.AdminAccessHash, domain.SecretMessageDelivery{RandomID: 111, Bytes: []byte{1, 2, 3}, Date: 9999}) if err != nil { t.Fatalf("dup send: %v", err) } @@ -267,7 +396,7 @@ func TestSendEncryptedQtsAllocation(t *testing.T) { } // participant 发 → 投给 admin 设备（adminAuthKey），独立 qts 序列从 1 起。 - _, pm, err := svc.SendEncrypted(ctx, chat.ID, partUser, chat.ParticipantAccessHash, domain.SecretMessageDelivery{RandomID: 333, Bytes: []byte{9}, Date: 2002}) + _, pm, err := svc.SendEncrypted(ctx, chat.ID, partUser, partAuthKey, chat.ParticipantAccessHash, domain.SecretMessageDelivery{RandomID: 333, Bytes: []byte{9}, Date: 2002}) if err != nil { t.Fatalf("participant send: %v", err) } @@ -280,17 +409,55 @@ func TestSendEncryptedWrongAccessHash(t *testing.T) { svc, _ := newTestService() ctx := context.Background() chat := acceptedChat(t, svc) - _, _, err := svc.SendEncrypted(ctx, chat.ID, adminUser, chat.AdminAccessHash+1, domain.SecretMessageDelivery{RandomID: 1, Bytes: []byte{1}, Date: 2000}) + _, _, err := svc.SendEncrypted(ctx, chat.ID, adminUser, adminAuthKey, chat.AdminAccessHash+1, domain.SecretMessageDelivery{RandomID: 1, Bytes: []byte{1}, Date: 2000}) if !errors.Is(err, domain.ErrSecretChatNotFound) { t.Fatalf("err = %v, want ErrSecretChatNotFound", err) } } +func TestSendEncryptedRejectsUnboundAccountDevice(t *testing.T) { + svc, _ := newTestService() + ctx := context.Background() + chat := acceptedChat(t, svc) + + for _, tc := range []struct { + name string + userID int64 + accessHash int64 + }{ + {name: "admin", userID: adminUser, accessHash: chat.AdminAccessHash}, + {name: "participant", userID: partUser, accessHash: chat.ParticipantAccessHash}, + } { + t.Run(tc.name, func(t *testing.T) { + _, _, err := svc.SendEncrypted(ctx, chat.ID, tc.userID, otherAuthKey, tc.accessHash, domain.SecretMessageDelivery{ + RandomID: 991, Bytes: []byte{1}, Date: 2000, + }) + if !errors.Is(err, domain.ErrSecretChatNotFound) { + t.Fatalf("err = %v, want ErrSecretChatNotFound", err) + } + }) + } +} + +func TestDiscardEncryptionRejectsUnboundAccountDeviceAfterAccept(t *testing.T) { + svc, st := newTestService() + ctx := context.Background() + chat := acceptedChat(t, svc) + + if _, _, err := svc.DiscardEncryption(ctx, chat.ID, partUser, otherAuthKey, true); !errors.Is(err, domain.ErrSecretChatNotFound) { + t.Fatalf("unbound discard err = %v, want ErrSecretChatNotFound", err) + } + stored, ok, err := st.GetSecretChat(ctx, chat.ID) + if err != nil || !ok || stored.State != domain.SecretChatStateNormal { + t.Fatalf("chat after rejected discard = %+v ok=%v err=%v", stored, ok, err) + } +} + func TestSendEncryptedNonNormal(t *testing.T) { svc, _ := newTestService() ctx := context.Background() chat, _ := svc.RequestEncryption(ctx, requestFixture()) // requested, 未 accept - _, _, err := svc.SendEncrypted(ctx, chat.ID, adminUser, chat.AdminAccessHash, domain.SecretMessageDelivery{RandomID: 1, Bytes: []byte{1}, Date: 2000}) + _, _, err := svc.SendEncrypted(ctx, chat.ID, adminUser, adminAuthKey, chat.AdminAccessHash, domain.SecretMessageDelivery{RandomID: 1, Bytes: []byte{1}, Date: 2000}) if !errors.Is(err, domain.ErrSecretChatNotFound) { t.Fatalf("err = %v, want ErrSecretChatNotFound (未成型不能发)", err) } @@ -301,7 +468,7 @@ func TestListNewMessagesAndAck(t *testing.T) { ctx := context.Background() chat := acceptedChat(t, svc) for i := 0; i < 3; i++ { - if _, _, err := svc.SendEncrypted(ctx, chat.ID, adminUser, chat.AdminAccessHash, domain.SecretMessageDelivery{RandomID: int64(1000 + i), Bytes: []byte{byte(i)}, Date: 2000 + i}); err != nil { + if _, _, err := svc.SendEncrypted(ctx, chat.ID, adminUser, adminAuthKey, chat.AdminAccessHash, domain.SecretMessageDelivery{RandomID: int64(1000 + i), Bytes: []byte{byte(i)}, Date: 2000 + i}); err != nil { t.Fatalf("send %d: %v", i, err) } } @@ -336,7 +503,7 @@ func TestAcceptAfterDiscard(t *testing.T) { svc, _ := newTestService() ctx := context.Background() chat, _ := svc.RequestEncryption(ctx, requestFixture()) - if _, _, err := svc.DiscardEncryption(ctx, chat.ID, adminUser, false); err != nil { + if _, _, err := svc.DiscardEncryption(ctx, chat.ID, adminUser, adminAuthKey, false); err != nil { t.Fatalf("discard: %v", err) } _, err := svc.AcceptEncryption(ctx, chat.ID, partUser, partAuthKey, chat.ParticipantAccessHash, validGA(), keyFP) diff --git a/internal/app/stories/service.go b/internal/app/stories/service.go index ecfa824d..c34d5849 100644 --- a/internal/app/stories/service.go +++ b/internal/app/stories/service.go @@ -190,6 +190,28 @@ func (s *Service) GetPeerStoryProjections(ctx context.Context, viewerUserID int6 return s.stories.GetPeerStoryProjections(ctx, viewerUserID, peers, now) } +// ActiveStoryPeerExpirations returns the viewer-independent active-story gate +// used before the privacy-sensitive peer projection. A missing peer is a +// durable negative fact until its story_peer token advances. +func (s *Service) ActiveStoryPeerExpirations(ctx context.Context, peers []domain.Peer, now int) (map[domain.Peer]int, error) { + if len(peers) > domain.MaxStoryIDs { + return nil, domain.ErrStoryIDInvalid + } + if s == nil || s.stories == nil || len(peers) == 0 { + return map[domain.Peer]int{}, nil + } + return s.stories.ActiveStoryPeerExpirations(ctx, peers, now) +} + +// ListHiddenStoryPeers returns one sparse viewer-owned preference snapshot. +// It is intentionally separate from active-story visibility and may be empty. +func (s *Service) ListHiddenStoryPeers(ctx context.Context, viewerUserID int64) ([]domain.Peer, error) { + if s == nil || s.stories == nil || viewerUserID == 0 { + return nil, nil + } + return s.stories.ListHiddenStoryPeers(ctx, viewerUserID) +} + func (s *Service) ReadStories(ctx context.Context, viewerUserID int64, peer domain.Peer, maxID, date int) (domain.StoryReadResult, error) { if maxID <= 0 || maxID > domain.MaxStoryID { return domain.StoryReadResult{}, domain.ErrStoryIDInvalid diff --git a/internal/app/telegramlogin/service.go b/internal/app/telegramlogin/service.go index 70a60fdb..e049b3b0 100644 --- a/internal/app/telegramlogin/service.go +++ b/internal/app/telegramlogin/service.go @@ -282,6 +282,41 @@ func (s *Service) DeleteAllowedURL(ctx context.Context, botUserID int64, kind do return s.store.DeleteTelegramLoginAllowedURL(ctx, botUserID, kind, normalized) } +type WidgetClientResolution struct { + ClientID string + Origin string +} + +// ResolveWidgetClient verifies the public compatibility shim's username +// resolution result against the authoritative Login client and registered Web +// origin. The username lookup itself stays outside this aggregate; callers +// must resolve it to a current bot user before entering this method. +func (s *Service) ResolveWidgetClient(ctx context.Context, botUserID int64, rawOrigin string) (WidgetClientResolution, error) { + if botUserID <= 0 { + return WidgetClientResolution{}, domain.ErrTelegramLoginClientInvalid + } + origin, err := NormalizeWebOrigin(rawOrigin, s.allowHTTP) + if err != nil { + return WidgetClientResolution{}, domain.ErrTelegramLoginOriginNotAllowed + } + client, found, err := s.store.GetTelegramLoginClientByBot(ctx, botUserID) + if err != nil { + return WidgetClientResolution{}, err + } + if !found || !client.Enabled || !s.signingAlgorithmSupported(client.SigningAlgorithm) || + client.BotUserID != botUserID || client.ClientID != strconv.FormatInt(botUserID, 10) { + return WidgetClientResolution{}, domain.ErrTelegramLoginClientDisabled + } + allowed, err := s.store.IsTelegramLoginURLAllowed(ctx, botUserID, domain.TelegramLoginAllowedWebOrigin, origin) + if err != nil { + return WidgetClientResolution{}, err + } + if !allowed { + return WidgetClientResolution{}, domain.ErrTelegramLoginOriginNotAllowed + } + return WidgetClientResolution{ClientID: client.ClientID, Origin: origin}, nil +} + func (s *Service) SetClientEnabled(ctx context.Context, botUserID int64, enabled bool) error { if enabled { client, found, err := s.store.GetTelegramLoginClientByBot(ctx, botUserID) diff --git a/internal/app/userprojection/contact_cache.go b/internal/app/userprojection/contact_cache.go index 438e9b12..6d8da45c 100644 --- a/internal/app/userprojection/contact_cache.go +++ b/internal/app/userprojection/contact_cache.go @@ -19,12 +19,21 @@ const ( // Normal correctness relies on write-path invalidation, not natural expiry. DefaultContactProjectionCacheTTL = 24 * time.Hour - contactSnapshotMaxViewers = 4096 - contactReversePairMaxEntries = 262144 - contactPersonalPhotoSnapshotCap = 4096 + // DefaultContactSnapshotMaxViewers covers the 10k online target plus bounded + // reconnect overlap. Eviction is exact LRU; reaching the limit must never + // clear every viewer snapshot at once. + DefaultContactSnapshotMaxViewers = 16_384 + contactReversePairMaxEntries = 262144 + contactProjectionPairMaxEntries = 262144 + // One dense request must not monopolize the pair LRU or hold the global + // cache lock while inserting and evicting hundreds of thousands of cells. + // Larger results are still returned; they simply are not admitted per pair. + contactProjectionDenseAdmissionMaxCells = contactProjectionPairMaxEntries / 16 ) type contactAccountSnapshot struct { + // contacts and ordered are immutable after the snapshot is published in + // CachedContactStore.contacts. Readers intentionally retain shallow copies. contacts map[int64]domain.Contact ordered []domain.Contact hash int64 @@ -32,6 +41,7 @@ type contactAccountSnapshot struct { } type personalPhotoSnapshot struct { + // refs is immutable after the snapshot is published in personalPhotos. refs map[int64]domain.ProfilePhotoRef expireAt time.Time } @@ -42,8 +52,8 @@ type reverseContactKey struct { } type reverseContactSnapshot struct { - contact domain.Contact - found bool + // contact is an immutable cached clone. nil is the negative-cache value. + contact *domain.Contact expireAt time.Time } @@ -52,6 +62,79 @@ type reverseContactEntry struct { snapshot reverseContactSnapshot } +type contactProjectionKey struct { + viewerUserID int64 + contactUserID int64 +} + +// cachedContactProjectionOverlay is the viewer-owned part of a contact row. +// Base user data is loaded and cached independently, so retaining domain.User +// here would multiply a large, viewer-independent value across every pair. +// Values are immutable after publication; noteEntities is cloned on both sides +// of the cache boundary. +type cachedContactProjectionOverlay struct { + firstName string + lastName string + phone string + note string + noteEntities []domain.MessageEntity + mutual bool + closeFriend bool +} + +func newCachedContactProjectionOverlay(contact domain.Contact) *cachedContactProjectionOverlay { + return &cachedContactProjectionOverlay{ + firstName: contact.FirstName, + lastName: contact.LastName, + phone: contact.Phone, + note: contact.Note, + noteEntities: append([]domain.MessageEntity(nil), contact.NoteEntities...), + mutual: contact.Mutual || contact.User.Mutual, + closeFriend: contact.CloseFriend || contact.User.CloseFriend, + } +} + +func (o *cachedContactProjectionOverlay) domainContact(contactUserID int64) domain.Contact { + if o == nil { + return domain.Contact{} + } + return domain.Contact{ + User: domain.User{ID: contactUserID}, + FirstName: o.firstName, + LastName: o.lastName, + Phone: o.phone, + Note: o.note, + NoteEntities: append([]domain.MessageEntity(nil), o.noteEntities...), + Mutual: o.mutual, + CloseFriend: o.closeFriend, + } +} + +type contactProjectionSnapshot struct { + // Positive values point at immutable cached clones; nil is negative. Keeping + // the compact viewer-owned overlay outside the entry makes negative pairs + // consume only two pointers plus their expiry and avoids duplicating a full + // base User for every positive pair. + contact *cachedContactProjectionOverlay + personalPhoto *domain.ProfilePhotoRef + expireAt time.Time +} + +// contactProjectionLookup is a transient, caller-owned copy. It deliberately +// retains the old value+found shape so no mutable slice from a cached pointer is +// exposed after the cache lock is released. +type contactProjectionLookup struct { + contact domain.Contact + contactFound bool + personalPhoto domain.ProfilePhotoRef + personalPhotoFound bool +} + +type contactProjectionEntry struct { + key contactProjectionKey + snapshot contactProjectionSnapshot +} + type contactSnapshotLoadResult struct { snap contactAccountSnapshot stored bool @@ -67,6 +150,21 @@ type personalPhotoSnapshotLoadResult struct { stored bool } +type contactProjectionLoadResult struct { + batch domain.ContactProjectionBatch + current bool +} + +type contactCacheViewerFence struct { + userID int64 + generation uint64 +} + +type contactCacheFence struct { + flushGeneration uint64 + viewers []contactCacheViewerFence +} + // CachedContactStore wraps ContactStore with account-level read model snapshots. // // Contact data is low-churn and high-read: TDesktop repeatedly asks for the same @@ -79,34 +177,65 @@ type CachedContactStore struct { ttl time.Duration now func() time.Time - mu sync.RWMutex - contacts map[int64]contactAccountSnapshot - personalPhotos map[int64]personalPhotoSnapshot - reverse map[reverseContactKey]*list.Element - reverseLRU *list.List - reverseByOwner map[int64]map[int64]struct{} - reverseCap int - epoch uint64 - sf singleflight.Group + mu sync.RWMutex + contacts map[int64]contactAccountSnapshot + contactLRU *list.List + contactElements map[int64]*list.Element + contactCap int + personalPhotos map[int64]personalPhotoSnapshot + personalPhotoLRU *list.List + personalElements map[int64]*list.Element + personalPhotoCap int + reverse map[reverseContactKey]*list.Element + reverseLRU *list.List + reverseByOwner map[int64]map[int64]struct{} + reverseCap int + projection map[contactProjectionKey]*list.Element + projectionLRU *list.List + projectionByViewer map[int64]map[int64]struct{} + projectionByTarget map[int64]map[int64]struct{} + projectionCap int + flushGeneration uint64 + viewerGenerations map[int64]uint64 + sf singleflight.Group } func NewCachedContactStore(inner store.ContactStore, ttl time.Duration) *CachedContactStore { + return NewCachedContactStoreWithMaxViewers(inner, ttl, DefaultContactSnapshotMaxViewers) +} + +func NewCachedContactStoreWithMaxViewers(inner store.ContactStore, ttl time.Duration, maxViewers int) *CachedContactStore { if inner == nil { return nil } if ttl <= 0 { ttl = DefaultContactProjectionCacheTTL } + if maxViewers <= 0 { + maxViewers = DefaultContactSnapshotMaxViewers + } return &CachedContactStore{ - inner: inner, - ttl: ttl, - now: time.Now, - contacts: make(map[int64]contactAccountSnapshot, 1024), - personalPhotos: make(map[int64]personalPhotoSnapshot, 1024), - reverse: make(map[reverseContactKey]*list.Element, 4096), - reverseLRU: list.New(), - reverseByOwner: make(map[int64]map[int64]struct{}, 1024), - reverseCap: contactReversePairMaxEntries, + inner: inner, + ttl: ttl, + now: time.Now, + contacts: make(map[int64]contactAccountSnapshot, 1024), + contactLRU: list.New(), + contactElements: make(map[int64]*list.Element, 1024), + contactCap: maxViewers, + personalPhotos: make(map[int64]personalPhotoSnapshot, 1024), + personalPhotoLRU: list.New(), + personalElements: make(map[int64]*list.Element, 1024), + personalPhotoCap: maxViewers, + reverse: make(map[reverseContactKey]*list.Element, 4096), + reverseLRU: list.New(), + reverseByOwner: make(map[int64]map[int64]struct{}, 1024), + reverseCap: contactReversePairMaxEntries, + projection: make(map[contactProjectionKey]*list.Element, 4096), + projectionLRU: list.New(), + projectionByViewer: make(map[int64]map[int64]struct{}, 1024), + projectionByTarget: make(map[int64]map[int64]struct{}, 1024), + projectionCap: contactProjectionPairMaxEntries, + viewerGenerations: make(map[int64]uint64, 1024), } } @@ -197,6 +326,157 @@ func (c *CachedContactStore) GetReverseContacts(ctx context.Context, userID int6 return out, nil } +func (c *CachedContactStore) ContactProjectionForViewers(ctx context.Context, viewerUserIDs, contactUserIDs []int64) (domain.ContactProjectionBatch, error) { + viewers := dedupContactIDs(viewerUserIDs) + targets := dedupContactIDs(contactUserIDs) + if len(viewers) == 0 || len(targets) == 0 { + return domain.ContactProjectionBatch{ + Contacts: map[int64]map[int64]domain.Contact{}, + PersonalPhotos: map[int64]map[int64]domain.ProfilePhotoRef{}, + }, nil + } + + for { + out := domain.ContactProjectionBatch{ + Contacts: make(map[int64]map[int64]domain.Contact, len(viewers)), + PersonalPhotos: make(map[int64]map[int64]domain.ProfilePhotoRef, len(viewers)), + } + readFence := c.captureCacheFenceSlices(viewers, targets) + now := c.now() + coldViewers := make(map[int64]struct{}, len(viewers)) + coldTargets := make(map[int64]struct{}, len(targets)) + for _, viewerID := range viewers { + var contactSnap contactAccountSnapshot + contactsWarm := false + if snap, ok := c.lookupContactSnapshot(viewerID, now); ok { + contactsWarm = true + contactSnap = snap + for _, targetID := range targets { + if contact, found := snap.contacts[targetID]; found { + putContactProjectionContact(&out, viewerID, targetID, contact) + } + } + } + personalPhotosWarm := false + if snap, ok := c.lookupPersonalPhotoSnapshot(viewerID, now); ok { + personalPhotosWarm = true + for _, targetID := range targets { + if ref, found := snap.refs[targetID]; found { + putContactProjectionPersonalPhoto(&out, viewerID, targetID, ref) + } + } + } + for _, targetID := range targets { + if contactsWarm && personalPhotosWarm { + continue + } + if contactsWarm { + if _, found := contactSnap.contacts[targetID]; !found { + continue + } + } + if snap, ok := c.lookupContactProjectionPair(viewerID, targetID, now); ok { + if !contactsWarm && snap.contactFound { + putContactProjectionContact(&out, viewerID, targetID, snap.contact) + } + if !personalPhotosWarm && snap.personalPhotoFound { + putContactProjectionPersonalPhoto(&out, viewerID, targetID, snap.personalPhoto) + } + continue + } + coldViewers[viewerID] = struct{}{} + coldTargets[targetID] = struct{}{} + } + } + if !c.cacheFenceCurrent(readFence) { + if err := ctx.Err(); err != nil { + return domain.ContactProjectionBatch{}, err + } + continue + } + if len(coldViewers) == 0 || len(coldTargets) == 0 { + return out, nil + } + cold := make([]int64, 0, len(coldViewers)) + for viewerID := range coldViewers { + cold = append(cold, viewerID) + } + coldIDs := make([]int64, 0, len(coldTargets)) + for targetID := range coldTargets { + coldIDs = append(coldIDs, targetID) + } + loaded, err := c.loadContactProjectionForViewers(ctx, cold, coldIDs) + if err != nil { + return domain.ContactProjectionBatch{}, err + } + if !c.cacheFenceCurrent(readFence) { + if err := ctx.Err(); err != nil { + return domain.ContactProjectionBatch{}, err + } + continue + } + mergeContactProjectionBatch(&out, loaded) + return out, nil + } +} + +func (c *CachedContactStore) loadContactProjectionForViewers(ctx context.Context, viewerUserIDs, contactUserIDs []int64) (domain.ContactProjectionBatch, error) { + viewers := append([]int64(nil), viewerUserIDs...) + targets := append([]int64(nil), contactUserIDs...) + sort.Slice(viewers, func(i, j int) bool { return viewers[i] < viewers[j] }) + sort.Slice(targets, func(i, j int) bool { return targets[i] < targets[j] }) + sfKey := fmt.Sprintf("contact-projection:%v:%v", viewers, targets) + for { + v, err, _ := c.sf.Do(sfKey, func() (any, error) { + loadFence := c.captureCacheFenceSlices(viewers, targets) + batch, err := c.inner.ContactProjectionForViewers(ctx, viewers, targets) + if err != nil { + return contactProjectionLoadResult{}, err + } + now := c.now() + expireAt := now.Add(c.ttl) + admitPairs := admitDenseContactProjectionPairs(len(viewers), len(targets)) + c.mu.Lock() + current := c.cacheFenceCurrentLocked(loadFence) + if current && admitPairs { + for _, viewerID := range viewers { + for _, targetID := range targets { + contact, contactFound := batch.Contacts[viewerID][targetID] + ref, personalPhotoFound := batch.PersonalPhotos[viewerID][targetID] + c.storeContactProjectionPairLocked( + contactProjectionKey{viewerUserID: viewerID, contactUserID: targetID}, + contact, contactFound, ref, personalPhotoFound, expireAt, + ) + } + } + } + c.mu.Unlock() + return contactProjectionLoadResult{ + batch: cloneContactProjectionBatch(batch), + current: current, + }, nil + }) + if err != nil { + return domain.ContactProjectionBatch{}, err + } + result := v.(contactProjectionLoadResult) + if result.current { + return result.batch, nil + } + if err := ctx.Err(); err != nil { + return domain.ContactProjectionBatch{}, err + } + } +} + +func admitDenseContactProjectionPairs(viewerCount, targetCount int) bool { + if viewerCount <= 0 || targetCount <= 0 || targetCount > contactProjectionDenseAdmissionMaxCells { + return false + } + // Division avoids overflowing int for attacker-controlled vector lengths. + return viewerCount <= contactProjectionDenseAdmissionMaxCells/targetCount +} + // loadReverseContacts performs at most one batched cold-store read for all // missing owner→viewer pairs, then caches both hits and misses. Privacy // projection therefore stays memory-only after warm-up instead of repeating a @@ -207,7 +487,7 @@ func (c *CachedContactStore) loadReverseContacts(ctx context.Context, userID int sfKey := fmt.Sprintf("contact-reverse:%d:%v", userID, owners) for { v, err, _ := c.sf.Do(sfKey, func() (any, error) { - loadEpoch := c.cacheEpoch() + loadFence := c.captureCacheFenceSlices(owners, []int64{userID}) contacts, err := c.inner.GetReverseContacts(ctx, userID, owners) if err != nil { return reverseContactLoadResult{}, err @@ -215,16 +495,12 @@ func (c *CachedContactStore) loadReverseContacts(ctx context.Context, userID int now := c.now() expireAt := now.Add(c.ttl) c.mu.Lock() - stored := c.epoch == loadEpoch + stored := c.cacheFenceCurrentLocked(loadFence) if stored { for _, ownerID := range owners { key := reverseContactKey{ownerUserID: ownerID, contactUserID: userID} contact, found := contacts[ownerID] - c.storeReverseContactLocked(key, reverseContactSnapshot{ - contact: cloneCachedContact(contact), - found: found, - expireAt: expireAt, - }) + c.storeReverseContactLocked(key, contact, found, expireAt) } } c.mu.Unlock() @@ -249,6 +525,9 @@ func (c *CachedContactStore) loadReverseContacts(ctx context.Context, userID int func (c *CachedContactStore) Upsert(ctx context.Context, userID int64, input domain.ContactInput) (domain.Contact, error) { contact, err := c.inner.Upsert(ctx, userID, input) if err == nil { + // Published account snapshots are immutable. Invalidate instead of + // modifying their inner maps/slices in place or publishing a mutation + // payload whose cache-write order may differ from its DB commit order. c.InvalidateViewers(userID, input.ContactUserID) } return contact, err @@ -257,12 +536,11 @@ func (c *CachedContactStore) Upsert(ctx context.Context, userID int64, input dom func (c *CachedContactStore) UpsertMany(ctx context.Context, userID int64, inputs []domain.ContactInput) ([]domain.Contact, error) { contacts, err := c.inner.UpsertMany(ctx, userID, inputs) if err == nil { - ids := make([]int64, 0, len(inputs)+1) - ids = append(ids, userID) + ids := make([]int64, 0, len(inputs)) for _, input := range inputs { ids = append(ids, input.ContactUserID) } - c.InvalidateViewers(ids...) + c.InvalidateViewers(append([]int64{userID}, ids...)...) } return contacts, err } @@ -270,7 +548,9 @@ func (c *CachedContactStore) UpsertMany(ctx context.Context, userID int64, input func (c *CachedContactStore) UpdateNote(ctx context.Context, userID, contactUserID int64, note string, entities []domain.MessageEntity) (domain.Contact, bool, error) { contact, found, err := c.inner.UpdateNote(ctx, userID, contactUserID, note, entities) if err == nil { - c.InvalidateViewers(userID) + if found { + c.InvalidateViewers(userID) + } } return contact, found, err } @@ -285,7 +565,10 @@ func (c *CachedContactStore) SetCloseFriends(ctx context.Context, userID int64, func (c *CachedContactStore) SetPersonalPhoto(ctx context.Context, userID, contactUserID int64, photoID int64, date int) (domain.Contact, bool, error) { contact, found, err := c.inner.SetPersonalPhoto(ctx, userID, contactUserID, photoID, date) - if err == nil { + if err == nil && found { + // Do not perform a post-commit read followed by write-through: two + // concurrent mutations can complete their cache writes in the opposite + // order and reinsert a stale pair after a newer NOTIFY invalidation. c.InvalidateViewers(userID) } return contact, found, err @@ -314,10 +597,7 @@ func (c *CachedContactStore) PersonalPhotos(ctx context.Context, userID int64, c func (c *CachedContactStore) Delete(ctx context.Context, userID int64, contactUserIDs []int64) (int, error) { count, err := c.inner.Delete(ctx, userID, contactUserIDs) if err == nil { - ids := make([]int64, 0, len(contactUserIDs)+1) - ids = append(ids, userID) - ids = append(ids, contactUserIDs...) - c.InvalidateViewers(ids...) + c.InvalidateViewers(append([]int64{userID}, contactUserIDs...)...) } return count, err } @@ -356,20 +636,16 @@ func (c *CachedContactStore) contactSnapshot(ctx context.Context, userID int64) if snap, ok := c.lookupContactSnapshot(userID, now); ok { return contactSnapshotLoadResult{snap: snap, stored: true}, nil } - loadEpoch := c.cacheEpoch() + loadFence := c.captureCacheFence(userID) list, err := c.inner.ListByUser(ctx, userID) if err != nil { return contactSnapshotLoadResult{}, err } snap := buildContactAccountSnapshot(list, now.Add(c.ttl)) c.mu.Lock() - stored := c.epoch == loadEpoch + stored := c.cacheFenceCurrentLocked(loadFence) if stored { - if len(c.contacts) >= contactSnapshotMaxViewers { - c.contacts = make(map[int64]contactAccountSnapshot, 1024) - c.personalPhotos = make(map[int64]personalPhotoSnapshot, 1024) - } - c.contacts[userID] = snap + c.storeContactSnapshotLocked(userID, snap) } c.mu.Unlock() return contactSnapshotLoadResult{snap: snap, stored: stored}, nil @@ -388,18 +664,45 @@ func (c *CachedContactStore) contactSnapshot(ctx context.Context, userID int64) } func (c *CachedContactStore) lookupContactSnapshot(userID int64, now time.Time) (contactAccountSnapshot, bool) { - c.mu.RLock() + c.mu.Lock() snap, ok := c.contacts[userID] - c.mu.RUnlock() - if !ok || !snap.expireAt.After(now) { - if ok { - c.InvalidateViewers(userID) - } + if !ok { + c.mu.Unlock() return contactAccountSnapshot{}, false } + if !snap.expireAt.After(now) { + c.advanceViewerGenerationLocked(userID) + c.invalidateViewerLocked(userID) + c.mu.Unlock() + return contactAccountSnapshot{}, false + } + if element := c.contactElements[userID]; element != nil { + c.contactLRU.MoveToFront(element) + } + c.mu.Unlock() return snap, true } +func (c *CachedContactStore) storeContactSnapshotLocked(userID int64, snap contactAccountSnapshot) { + if element := c.contactElements[userID]; element != nil { + c.contacts[userID] = snap + c.contactLRU.MoveToFront(element) + return + } + c.contacts[userID] = snap + c.contactElements[userID] = c.contactLRU.PushFront(userID) + for c.contactLRU.Len() > c.contactCap { + oldest := c.contactLRU.Back() + if oldest == nil { + break + } + oldestUserID := oldest.Value.(int64) + delete(c.contacts, oldestUserID) + delete(c.contactElements, oldestUserID) + c.contactLRU.Remove(oldest) + } +} + func (c *CachedContactStore) personalPhotoSnapshot(ctx context.Context, userID int64) (personalPhotoSnapshot, error) { for { if snap, ok := c.lookupPersonalPhotoSnapshot(userID, c.now()); ok { @@ -410,7 +713,7 @@ func (c *CachedContactStore) personalPhotoSnapshot(ctx context.Context, userID i if snap, ok := c.lookupPersonalPhotoSnapshot(userID, now); ok { return personalPhotoSnapshotLoadResult{snap: snap, stored: true}, nil } - loadEpoch := c.cacheEpoch() + loadFence := c.captureCacheFence(userID) contacts, err := c.contactSnapshot(ctx, userID) if err != nil { return personalPhotoSnapshotLoadResult{}, err @@ -428,12 +731,9 @@ func (c *CachedContactStore) personalPhotoSnapshot(ctx context.Context, userID i } snap := personalPhotoSnapshot{refs: cloneCachedProfilePhotoRefs(refs), expireAt: now.Add(c.ttl)} c.mu.Lock() - stored := c.epoch == loadEpoch + stored := c.cacheFenceCurrentLocked(loadFence) if stored { - if len(c.personalPhotos) >= contactPersonalPhotoSnapshotCap { - c.personalPhotos = make(map[int64]personalPhotoSnapshot, 1024) - } - c.personalPhotos[userID] = snap + c.storePersonalPhotoSnapshotLocked(userID, snap) } c.mu.Unlock() return personalPhotoSnapshotLoadResult{snap: snap, stored: stored}, nil @@ -452,18 +752,45 @@ func (c *CachedContactStore) personalPhotoSnapshot(ctx context.Context, userID i } func (c *CachedContactStore) lookupPersonalPhotoSnapshot(userID int64, now time.Time) (personalPhotoSnapshot, bool) { - c.mu.RLock() + c.mu.Lock() snap, ok := c.personalPhotos[userID] - c.mu.RUnlock() - if !ok || !snap.expireAt.After(now) { - if ok { - c.InvalidateViewers(userID) - } + if !ok { + c.mu.Unlock() return personalPhotoSnapshot{}, false } + if !snap.expireAt.After(now) { + c.advanceViewerGenerationLocked(userID) + c.invalidateViewerLocked(userID) + c.mu.Unlock() + return personalPhotoSnapshot{}, false + } + if element := c.personalElements[userID]; element != nil { + c.personalPhotoLRU.MoveToFront(element) + } + c.mu.Unlock() return snap, true } +func (c *CachedContactStore) storePersonalPhotoSnapshotLocked(userID int64, snap personalPhotoSnapshot) { + if element := c.personalElements[userID]; element != nil { + c.personalPhotos[userID] = snap + c.personalPhotoLRU.MoveToFront(element) + return + } + c.personalPhotos[userID] = snap + c.personalElements[userID] = c.personalPhotoLRU.PushFront(userID) + for c.personalPhotoLRU.Len() > c.personalPhotoCap { + oldest := c.personalPhotoLRU.Back() + if oldest == nil { + break + } + oldestUserID := oldest.Value.(int64) + delete(c.personalPhotos, oldestUserID) + delete(c.personalElements, oldestUserID) + c.personalPhotoLRU.Remove(oldest) + } +} + func (c *CachedContactStore) lookupReverseContact(ownerUserID, contactUserID int64, now time.Time) (domain.Contact, bool, bool) { key := reverseContactKey{ownerUserID: ownerUserID, contactUserID: contactUserID} c.mu.Lock() @@ -481,10 +808,19 @@ func (c *CachedContactStore) lookupReverseContact(ownerUserID, contactUserID int } c.reverseLRU.MoveToFront(element) c.mu.Unlock() - return cloneCachedContact(snap.contact), snap.found, true + if snap.contact == nil { + return domain.Contact{}, false, true + } + return cloneCachedContact(*snap.contact), true, true } -func (c *CachedContactStore) storeReverseContactLocked(key reverseContactKey, snapshot reverseContactSnapshot) { +func (c *CachedContactStore) storeReverseContactLocked(key reverseContactKey, contact domain.Contact, found bool, expireAt time.Time) { + var cached *domain.Contact + if found { + clone := cloneCachedContact(contact) + cached = &clone + } + snapshot := reverseContactSnapshot{contact: cached, expireAt: expireAt} if element, ok := c.reverse[key]; ok { entry := element.Value.(*reverseContactEntry) entry.snapshot = snapshot @@ -517,46 +853,222 @@ func (c *CachedContactStore) removeReverseElementLocked(element *list.Element) { c.reverseLRU.Remove(element) } +func (c *CachedContactStore) lookupContactProjectionPair(viewerUserID, contactUserID int64, now time.Time) (contactProjectionLookup, bool) { + key := contactProjectionKey{viewerUserID: viewerUserID, contactUserID: contactUserID} + c.mu.Lock() + element, ok := c.projection[key] + if !ok { + c.mu.Unlock() + return contactProjectionLookup{}, false + } + entry := element.Value.(*contactProjectionEntry) + snap := entry.snapshot + if !snap.expireAt.After(now) { + c.removeContactProjectionElementLocked(element) + c.mu.Unlock() + return contactProjectionLookup{}, false + } + c.projectionLRU.MoveToFront(element) + c.mu.Unlock() + result := contactProjectionLookup{} + if snap.contact != nil { + result.contact = snap.contact.domainContact(contactUserID) + result.contactFound = true + } + if snap.personalPhoto != nil { + result.personalPhoto = cloneCachedProfilePhotoRef(*snap.personalPhoto) + result.personalPhotoFound = true + } + return result, true +} + +func (c *CachedContactStore) storeContactProjectionPairLocked( + key contactProjectionKey, + contact domain.Contact, + contactFound bool, + personalPhoto domain.ProfilePhotoRef, + personalPhotoFound bool, + expireAt time.Time, +) { + var cachedContact *cachedContactProjectionOverlay + if contactFound { + cachedContact = newCachedContactProjectionOverlay(contact) + } + var cachedPersonalPhoto *domain.ProfilePhotoRef + if personalPhotoFound { + clone := cloneCachedProfilePhotoRef(personalPhoto) + cachedPersonalPhoto = &clone + } + snapshot := contactProjectionSnapshot{ + contact: cachedContact, + personalPhoto: cachedPersonalPhoto, + expireAt: expireAt, + } + if element, ok := c.projection[key]; ok { + entry := element.Value.(*contactProjectionEntry) + entry.snapshot = snapshot + c.projectionLRU.MoveToFront(element) + return + } + element := c.projectionLRU.PushFront(&contactProjectionEntry{key: key, snapshot: snapshot}) + c.projection[key] = element + if c.projectionByViewer[key.viewerUserID] == nil { + c.projectionByViewer[key.viewerUserID] = make(map[int64]struct{}) + } + c.projectionByViewer[key.viewerUserID][key.contactUserID] = struct{}{} + if c.projectionByTarget[key.contactUserID] == nil { + c.projectionByTarget[key.contactUserID] = make(map[int64]struct{}) + } + c.projectionByTarget[key.contactUserID][key.viewerUserID] = struct{}{} + for c.projectionLRU.Len() > c.projectionCap { + c.removeContactProjectionElementLocked(c.projectionLRU.Back()) + } +} + +func (c *CachedContactStore) removeContactProjectionElementLocked(element *list.Element) { + if element == nil { + return + } + entry := element.Value.(*contactProjectionEntry) + delete(c.projection, entry.key) + if targets := c.projectionByViewer[entry.key.viewerUserID]; targets != nil { + delete(targets, entry.key.contactUserID) + if len(targets) == 0 { + delete(c.projectionByViewer, entry.key.viewerUserID) + } + } + if viewers := c.projectionByTarget[entry.key.contactUserID]; viewers != nil { + delete(viewers, entry.key.viewerUserID) + if len(viewers) == 0 { + delete(c.projectionByTarget, entry.key.contactUserID) + } + } + c.projectionLRU.Remove(element) +} + func (c *CachedContactStore) InvalidateViewers(ids ...int64) { if c == nil || len(ids) == 0 { return } c.mu.Lock() - c.epoch++ + seen := make(map[int64]struct{}, len(ids)) for _, id := range ids { if id == 0 { continue } - delete(c.contacts, id) - delete(c.personalPhotos, id) - for contactUserID := range c.reverseByOwner[id] { - if element, ok := c.reverse[reverseContactKey{ownerUserID: id, contactUserID: contactUserID}]; ok { - c.removeReverseElementLocked(element) - } + if _, ok := seen[id]; ok { + continue } + seen[id] = struct{}{} + c.advanceViewerGenerationLocked(id) + c.invalidateViewerLocked(id) } c.mu.Unlock() } +func (c *CachedContactStore) invalidateViewerLocked(id int64) { + delete(c.contacts, id) + if element := c.contactElements[id]; element != nil { + delete(c.contactElements, id) + c.contactLRU.Remove(element) + } + delete(c.personalPhotos, id) + if element := c.personalElements[id]; element != nil { + delete(c.personalElements, id) + c.personalPhotoLRU.Remove(element) + } + for contactUserID := range c.reverseByOwner[id] { + c.removeReverseKeyLocked(reverseContactKey{ownerUserID: id, contactUserID: contactUserID}) + } + for contactUserID := range c.projectionByViewer[id] { + c.removeContactProjectionKeyLocked(contactProjectionKey{viewerUserID: id, contactUserID: contactUserID}) + } + for viewerUserID := range c.projectionByTarget[id] { + c.removeContactProjectionKeyLocked(contactProjectionKey{viewerUserID: viewerUserID, contactUserID: id}) + } +} + +func (c *CachedContactStore) removeReverseKeyLocked(key reverseContactKey) { + if element, ok := c.reverse[key]; ok { + c.removeReverseElementLocked(element) + } +} + +func (c *CachedContactStore) removeContactProjectionKeyLocked(key contactProjectionKey) { + if element, ok := c.projection[key]; ok { + c.removeContactProjectionElementLocked(element) + } +} + func (c *CachedContactStore) FlushReadModelCache() { if c == nil { return } c.mu.Lock() - c.epoch++ + c.flushGeneration++ + c.viewerGenerations = make(map[int64]uint64, 1024) c.contacts = make(map[int64]contactAccountSnapshot, 1024) + c.contactElements = make(map[int64]*list.Element, 1024) + c.contactLRU.Init() c.personalPhotos = make(map[int64]personalPhotoSnapshot, 1024) + c.personalElements = make(map[int64]*list.Element, 1024) + c.personalPhotoLRU.Init() c.reverse = make(map[reverseContactKey]*list.Element, 4096) c.reverseLRU.Init() c.reverseByOwner = make(map[int64]map[int64]struct{}, 1024) + c.projection = make(map[contactProjectionKey]*list.Element, 4096) + c.projectionLRU.Init() + c.projectionByViewer = make(map[int64]map[int64]struct{}, 1024) + c.projectionByTarget = make(map[int64]map[int64]struct{}, 1024) c.mu.Unlock() } -func (c *CachedContactStore) cacheEpoch() uint64 { +func (c *CachedContactStore) captureCacheFence(userIDs ...int64) contactCacheFence { + return c.captureCacheFenceSlices(userIDs, nil) +} + +func (c *CachedContactStore) captureCacheFenceSlices(first, second []int64) contactCacheFence { c.mu.RLock() - epoch := c.epoch + fence := contactCacheFence{ + flushGeneration: c.flushGeneration, + viewers: make([]contactCacheViewerFence, 0, len(first)+len(second)), + } + for _, userIDs := range [][]int64{first, second} { + for _, userID := range userIDs { + if userID == 0 { + continue + } + fence.viewers = append(fence.viewers, contactCacheViewerFence{ + userID: userID, + generation: c.viewerGenerations[userID], + }) + } + } c.mu.RUnlock() - return epoch + return fence +} + +func (c *CachedContactStore) cacheFenceCurrent(fence contactCacheFence) bool { + c.mu.RLock() + current := c.cacheFenceCurrentLocked(fence) + c.mu.RUnlock() + return current +} + +func (c *CachedContactStore) cacheFenceCurrentLocked(fence contactCacheFence) bool { + if c.flushGeneration != fence.flushGeneration { + return false + } + for _, viewer := range fence.viewers { + if c.viewerGenerations[viewer.userID] != viewer.generation { + return false + } + } + return true +} + +func (c *CachedContactStore) advanceViewerGenerationLocked(userID int64) { + c.viewerGenerations[userID]++ } func buildContactAccountSnapshot(list domain.ContactList, expireAt time.Time) contactAccountSnapshot { @@ -581,6 +1093,48 @@ func cloneCachedContactMap(in map[int64]domain.Contact) map[int64]domain.Contact return out } +func cloneContactProjectionBatch(in domain.ContactProjectionBatch) domain.ContactProjectionBatch { + out := domain.ContactProjectionBatch{ + Contacts: make(map[int64]map[int64]domain.Contact, len(in.Contacts)), + PersonalPhotos: make(map[int64]map[int64]domain.ProfilePhotoRef, len(in.PersonalPhotos)), + } + mergeContactProjectionBatch(&out, in) + return out +} + +func mergeContactProjectionBatch(dst *domain.ContactProjectionBatch, src domain.ContactProjectionBatch) { + for viewerID, contacts := range src.Contacts { + for targetID, contact := range contacts { + putContactProjectionContact(dst, viewerID, targetID, contact) + } + } + for viewerID, refs := range src.PersonalPhotos { + for targetID, ref := range refs { + putContactProjectionPersonalPhoto(dst, viewerID, targetID, ref) + } + } +} + +func putContactProjectionContact(batch *domain.ContactProjectionBatch, viewerID, targetID int64, contact domain.Contact) { + if batch.Contacts == nil { + batch.Contacts = map[int64]map[int64]domain.Contact{} + } + if batch.Contacts[viewerID] == nil { + batch.Contacts[viewerID] = map[int64]domain.Contact{} + } + batch.Contacts[viewerID][targetID] = cloneCachedContact(contact) +} + +func putContactProjectionPersonalPhoto(batch *domain.ContactProjectionBatch, viewerID, targetID int64, ref domain.ProfilePhotoRef) { + if batch.PersonalPhotos == nil { + batch.PersonalPhotos = map[int64]map[int64]domain.ProfilePhotoRef{} + } + if batch.PersonalPhotos[viewerID] == nil { + batch.PersonalPhotos[viewerID] = map[int64]domain.ProfilePhotoRef{} + } + batch.PersonalPhotos[viewerID][targetID] = cloneCachedProfilePhotoRef(ref) +} + func dedupContactIDs(ids []int64) []int64 { seen := make(map[int64]struct{}, len(ids)) out := make([]int64, 0, len(ids)) diff --git a/internal/app/userprojection/contact_cache_sparse.go b/internal/app/userprojection/contact_cache_sparse.go new file mode 100644 index 00000000..69ef1009 --- /dev/null +++ b/internal/app/userprojection/contact_cache_sparse.go @@ -0,0 +1,174 @@ +package userprojection + +import ( + "context" + "fmt" + "sort" + + "telesrv/internal/domain" + "telesrv/internal/store" +) + +var _ store.SparseContactProjectionStore = (*CachedContactStore)(nil) + +// ContactProjectionForViewerUserIDs keeps the pair cache useful for sparse +// outbox projection without ever broadening a cold read into viewers x targets. +func (c *CachedContactStore) ContactProjectionForViewerUserIDs(ctx context.Context, requested map[int64][]int64) (domain.ContactProjectionBatch, error) { + pairs := canonicalContactProjectionPairs(requested) + if len(pairs) == 0 { + return emptyContactProjectionBatch(), nil + } + for { + out := emptyContactProjectionBatch() + readFence := c.captureCacheFence(sparseContactProjectionFenceIDs(pairs)...) + now := c.now() + cold := make(map[int64][]int64) + for _, pair := range pairs { + contactKnown := false + if snap, ok := c.lookupContactSnapshot(pair.viewerUserID, now); ok { + contactKnown = true + if contact, found := snap.contacts[pair.contactUserID]; found { + putContactProjectionContact(&out, pair.viewerUserID, pair.contactUserID, contact) + } else { + // Personal photos are rows on contacts and cannot exist when the + // viewer has no contact row for this target. + continue + } + } + photoKnown := false + if snap, ok := c.lookupPersonalPhotoSnapshot(pair.viewerUserID, now); ok { + photoKnown = true + if ref, found := snap.refs[pair.contactUserID]; found { + putContactProjectionPersonalPhoto(&out, pair.viewerUserID, pair.contactUserID, ref) + } + } + if contactKnown && photoKnown { + continue + } + if snap, ok := c.lookupContactProjectionPair(pair.viewerUserID, pair.contactUserID, now); ok { + if !contactKnown && snap.contactFound { + putContactProjectionContact(&out, pair.viewerUserID, pair.contactUserID, snap.contact) + } + if !photoKnown && snap.personalPhotoFound { + putContactProjectionPersonalPhoto(&out, pair.viewerUserID, pair.contactUserID, snap.personalPhoto) + } + continue + } + cold[pair.viewerUserID] = append(cold[pair.viewerUserID], pair.contactUserID) + } + if !c.cacheFenceCurrent(readFence) { + if err := ctx.Err(); err != nil { + return domain.ContactProjectionBatch{}, err + } + continue + } + if len(cold) == 0 { + return out, nil + } + loaded, err := c.loadSparseContactProjection(ctx, cold) + if err != nil { + return domain.ContactProjectionBatch{}, err + } + if !c.cacheFenceCurrent(readFence) { + if err := ctx.Err(); err != nil { + return domain.ContactProjectionBatch{}, err + } + continue + } + mergeContactProjectionBatch(&out, loaded) + return out, nil + } +} + +type sparseContactProjectionPair struct { + viewerUserID int64 + contactUserID int64 +} + +func canonicalContactProjectionPairs(requested map[int64][]int64) []sparseContactProjectionPair { + seen := make(map[sparseContactProjectionPair]struct{}) + for viewerID, ids := range requested { + if viewerID == 0 { + continue + } + for _, id := range ids { + if id != 0 { + seen[sparseContactProjectionPair{viewerUserID: viewerID, contactUserID: id}] = struct{}{} + } + } + } + out := make([]sparseContactProjectionPair, 0, len(seen)) + for pair := range seen { + out = append(out, pair) + } + sort.Slice(out, func(i, j int) bool { + if out[i].viewerUserID == out[j].viewerUserID { + return out[i].contactUserID < out[j].contactUserID + } + return out[i].viewerUserID < out[j].viewerUserID + }) + return out +} + +func (c *CachedContactStore) loadSparseContactProjection(ctx context.Context, requested map[int64][]int64) (domain.ContactProjectionBatch, error) { + pairs := canonicalContactProjectionPairs(requested) + canonical := make(map[int64][]int64) + for _, pair := range pairs { + canonical[pair.viewerUserID] = append(canonical[pair.viewerUserID], pair.contactUserID) + } + sfKey := fmt.Sprintf("contact-projection-sparse:%v", pairs) + for { + v, err, _ := c.sf.Do(sfKey, func() (any, error) { + loader, ok := c.inner.(store.SparseContactProjectionStore) + if !ok { + return contactProjectionLoadResult{}, fmt.Errorf("contact store does not support sparse projection") + } + loadFence := c.captureCacheFence(sparseContactProjectionFenceIDs(pairs)...) + batch, err := loader.ContactProjectionForViewerUserIDs(ctx, canonical) + if err != nil { + return contactProjectionLoadResult{}, err + } + expireAt := c.now().Add(c.ttl) + admitPairs := len(pairs) <= contactProjectionDenseAdmissionMaxCells + c.mu.Lock() + current := c.cacheFenceCurrentLocked(loadFence) + if current && admitPairs { + for _, pair := range pairs { + contact, contactFound := batch.Contacts[pair.viewerUserID][pair.contactUserID] + ref, photoFound := batch.PersonalPhotos[pair.viewerUserID][pair.contactUserID] + c.storeContactProjectionPairLocked( + contactProjectionKey{viewerUserID: pair.viewerUserID, contactUserID: pair.contactUserID}, + contact, contactFound, ref, photoFound, expireAt, + ) + } + } + c.mu.Unlock() + return contactProjectionLoadResult{batch: cloneContactProjectionBatch(batch), current: current}, nil + }) + if err != nil { + return domain.ContactProjectionBatch{}, err + } + result := v.(contactProjectionLoadResult) + if result.current { + return result.batch, nil + } + if err := ctx.Err(); err != nil { + return domain.ContactProjectionBatch{}, err + } + } +} + +func sparseContactProjectionFenceIDs(pairs []sparseContactProjectionPair) []int64 { + ids := make([]int64, 0, len(pairs)*2) + for _, pair := range pairs { + ids = append(ids, pair.viewerUserID, pair.contactUserID) + } + return ids +} + +func emptyContactProjectionBatch() domain.ContactProjectionBatch { + return domain.ContactProjectionBatch{ + Contacts: map[int64]map[int64]domain.Contact{}, + PersonalPhotos: map[int64]map[int64]domain.ProfilePhotoRef{}, + } +} diff --git a/internal/app/userprojection/contact_cache_test.go b/internal/app/userprojection/contact_cache_test.go index 8cf02499..51f2ab0f 100644 --- a/internal/app/userprojection/contact_cache_test.go +++ b/internal/app/userprojection/contact_cache_test.go @@ -2,9 +2,12 @@ package userprojection import ( "context" + "fmt" + "reflect" "sync" "testing" "time" + "unsafe" "telesrv/internal/domain" "telesrv/internal/store" @@ -19,6 +22,7 @@ type blockingFirstListContactStore struct { mu sync.Mutex firstUsed bool + listCalls int } type blockingFirstPersonalPhotoStore struct { @@ -31,8 +35,56 @@ type blockingFirstPersonalPhotoStore struct { firstUsed bool } +type stalePersonalPhotoWritebackContextKey struct{} + +// stalePersonalPhotoWritebackStore deterministically models an older mutation +// that commits first but returns to the cache wrapper after a newer mutation. +// The old implementation performed a post-commit PersonalPhotos read and could +// publish this captured old value after the newer mutation had completed. +type stalePersonalPhotoWritebackStore struct { + store.ContactStore + started chan struct{} + release chan struct{} + + mu sync.Mutex + staleReadCalls int +} + +func (s *stalePersonalPhotoWritebackStore) SetPersonalPhoto(ctx context.Context, userID, contactUserID int64, photoID int64, date int) (domain.Contact, bool, error) { + contact, found, err := s.ContactStore.SetPersonalPhoto(ctx, userID, contactUserID, photoID, date) + if err != nil || !found || ctx.Value(stalePersonalPhotoWritebackContextKey{}) != true { + return contact, found, err + } + close(s.started) + select { + case <-s.release: + case <-ctx.Done(): + return domain.Contact{}, false, ctx.Err() + } + return contact, found, nil +} + +func (s *stalePersonalPhotoWritebackStore) PersonalPhotos(ctx context.Context, userID int64, contactUserIDs []int64) (map[int64]domain.ProfilePhotoRef, error) { + if len(contactUserIDs) > 0 && ctx.Value(stalePersonalPhotoWritebackContextKey{}) == true { + s.mu.Lock() + s.staleReadCalls++ + s.mu.Unlock() + return map[int64]domain.ProfilePhotoRef{ + contactUserIDs[0]: {PhotoID: 9001, Personal: true}, + }, nil + } + return s.ContactStore.PersonalPhotos(ctx, userID, contactUserIDs) +} + +func (s *stalePersonalPhotoWritebackStore) staleReads() int { + s.mu.Lock() + defer s.mu.Unlock() + return s.staleReadCalls +} + func (s *blockingFirstListContactStore) ListByUser(ctx context.Context, userID int64) (domain.ContactList, error) { s.mu.Lock() + s.listCalls++ if !s.firstUsed { s.firstUsed = true s.mu.Unlock() @@ -48,6 +100,12 @@ func (s *blockingFirstListContactStore) ListByUser(ctx context.Context, userID i return s.ContactStore.ListByUser(ctx, userID) } +func (s *blockingFirstListContactStore) callCount() int { + s.mu.Lock() + defer s.mu.Unlock() + return s.listCalls +} + func (s *blockingFirstPersonalPhotoStore) PersonalPhotos(ctx context.Context, userID int64, contactUserIDs []int64) (map[int64]domain.ProfilePhotoRef, error) { s.mu.Lock() if !s.firstUsed { @@ -84,6 +142,7 @@ type countingContactStore struct { listCalls int getManyCalls int reverseCalls int + projectionCalls int personalPhotoCalls int setPersonalPhotoHit int } @@ -103,6 +162,11 @@ func (s *countingContactStore) GetReverseContacts(ctx context.Context, userID in return s.ContactStore.GetReverseContacts(ctx, userID, ownerUserIDs) } +func (s *countingContactStore) ContactProjectionForViewers(ctx context.Context, viewerUserIDs, contactUserIDs []int64) (domain.ContactProjectionBatch, error) { + s.projectionCalls++ + return s.ContactStore.ContactProjectionForViewers(ctx, viewerUserIDs, contactUserIDs) +} + func (s *countingContactStore) PersonalPhotos(ctx context.Context, userID int64, contactUserIDs []int64) (map[int64]domain.ProfilePhotoRef, error) { s.personalPhotoCalls++ return s.ContactStore.PersonalPhotos(ctx, userID, contactUserIDs) @@ -162,6 +226,413 @@ func TestCachedContactStoreCachesProjectionReads(t *testing.T) { } } +func TestCachedContactStoreContactSnapshotLRUEvictsOnlyOldestViewer(t *testing.T) { + ctx := context.Background() + base := memory.NewContactStore() + for viewerID := int64(1); viewerID <= 3; viewerID++ { + if _, err := base.Upsert(ctx, viewerID, domain.ContactInput{ + ContactUserID: 100 + viewerID, + FirstName: fmt.Sprintf("viewer-%d", viewerID), + }); err != nil { + t.Fatalf("seed viewer %d: %v", viewerID, err) + } + } + counting := &countingContactStore{ContactStore: base} + cached := NewCachedContactStoreWithMaxViewers(counting, time.Hour, 2) + + for _, viewerID := range []int64{1, 2, 1, 3} { + if _, err := cached.ListByUser(ctx, viewerID); err != nil { + t.Fatalf("list viewer %d: %v", viewerID, err) + } + } + if counting.listCalls != 3 { + t.Fatalf("ListByUser calls = %d, want 3 before evicted viewer is read", counting.listCalls) + } + cached.mu.RLock() + _, hasOne := cached.contacts[1] + _, hasTwo := cached.contacts[2] + _, hasThree := cached.contacts[3] + contactEntries := cached.contactLRU.Len() + cached.mu.RUnlock() + if !hasOne || hasTwo || !hasThree || contactEntries != 2 { + t.Fatalf("contact LRU state = one:%v two:%v three:%v len:%d, want one+three only", hasOne, hasTwo, hasThree, contactEntries) + } + + if _, err := cached.ListByUser(ctx, 1); err != nil { + t.Fatalf("list retained viewer 1: %v", err) + } + if counting.listCalls != 3 { + t.Fatalf("retained viewer caused cold load: calls=%d, want 3", counting.listCalls) + } + if _, err := cached.ListByUser(ctx, 2); err != nil { + t.Fatalf("list evicted viewer 2: %v", err) + } + if counting.listCalls != 4 { + t.Fatalf("evicted viewer did not cold load exactly once: calls=%d, want 4", counting.listCalls) + } +} + +func TestCachedContactStoreContactAndPersonalPhotoLRUsAreIndependent(t *testing.T) { + cached := NewCachedContactStoreWithMaxViewers(memory.NewContactStore(), time.Hour, 2) + expireAt := time.Now().Add(time.Hour) + contactSnap := func(userID int64) contactAccountSnapshot { + return buildContactAccountSnapshot(domain.ContactList{Contacts: []domain.Contact{{ + User: domain.User{ID: 100 + userID}, + }}}, expireAt) + } + photoSnap := func(userID int64) personalPhotoSnapshot { + return personalPhotoSnapshot{ + refs: map[int64]domain.ProfilePhotoRef{100 + userID: {PhotoID: 9000 + userID}}, + expireAt: expireAt, + } + } + + cached.mu.Lock() + cached.storeContactSnapshotLocked(1, contactSnap(1)) + cached.storeContactSnapshotLocked(2, contactSnap(2)) + cached.storePersonalPhotoSnapshotLocked(1, photoSnap(1)) + cached.storePersonalPhotoSnapshotLocked(2, photoSnap(2)) + cached.mu.Unlock() + if _, ok := cached.lookupContactSnapshot(1, time.Now()); !ok { + t.Fatal("contact viewer 1 missing before LRU touch") + } + cached.mu.Lock() + cached.storeContactSnapshotLocked(3, contactSnap(3)) + cached.mu.Unlock() + + cached.mu.RLock() + _, contactOne := cached.contacts[1] + _, contactTwo := cached.contacts[2] + _, contactThree := cached.contacts[3] + _, photoOne := cached.personalPhotos[1] + _, photoTwo := cached.personalPhotos[2] + cached.mu.RUnlock() + if !contactOne || contactTwo || !contactThree { + t.Fatalf("contact LRU = one:%v two:%v three:%v, want one+three", contactOne, contactTwo, contactThree) + } + if !photoOne || !photoTwo { + t.Fatalf("contact eviction crossed into personal-photo LRU: one:%v two:%v", photoOne, photoTwo) + } + + if _, ok := cached.lookupPersonalPhotoSnapshot(2, time.Now()); !ok { + t.Fatal("personal-photo viewer 2 missing before LRU touch") + } + cached.mu.Lock() + cached.storePersonalPhotoSnapshotLocked(3, photoSnap(3)) + cached.mu.Unlock() + cached.mu.RLock() + _, photoOne = cached.personalPhotos[1] + _, photoTwo = cached.personalPhotos[2] + _, photoThree := cached.personalPhotos[3] + _, contactOne = cached.contacts[1] + _, contactThree = cached.contacts[3] + cached.mu.RUnlock() + if photoOne || !photoTwo || !photoThree { + t.Fatalf("personal-photo LRU = one:%v two:%v three:%v, want two+three", photoOne, photoTwo, photoThree) + } + if !contactOne || !contactThree { + t.Fatalf("personal-photo eviction crossed into contact LRU: one:%v three:%v", contactOne, contactThree) + } + + cached.InvalidateViewers(3) + cached.mu.RLock() + _, contactThree = cached.contacts[3] + _, photoThree = cached.personalPhotos[3] + _, contactElement := cached.contactElements[3] + _, photoElement := cached.personalElements[3] + cached.mu.RUnlock() + if contactThree || photoThree || contactElement || photoElement { + t.Fatalf("viewer invalidation left LRU state: contact=%v photo=%v contactElement=%v photoElement=%v", + contactThree, photoThree, contactElement, photoElement) + } +} + +func TestCachedContactStoreUnrelatedViewerInvalidationDoesNotRejectRefill(t *testing.T) { + ctx := context.Background() + base := memory.NewContactStore() + if _, err := base.Upsert(ctx, 2, domain.ContactInput{ContactUserID: 20, FirstName: "current"}); err != nil { + t.Fatalf("seed current contact: %v", err) + } + blocking := &blockingFirstListContactStore{ + ContactStore: base, + started: make(chan struct{}), + release: make(chan struct{}), + first: domain.ContactList{Contacts: []domain.Contact{{ + User: domain.User{ID: 20}, + FirstName: "captured", + }}}, + } + cached := NewCachedContactStore(blocking, time.Hour) + + type readResult struct { + contacts map[int64]domain.Contact + err error + } + resultCh := make(chan readResult, 1) + go func() { + contacts, err := cached.GetMany(ctx, 2, []int64{20}) + resultCh <- readResult{contacts: contacts, err: err} + }() + waitForCacheTestSignal(t, blocking.started) + cached.InvalidateViewers(1) + close(blocking.release) + + select { + case result := <-resultCh: + if result.err != nil { + t.Fatalf("contact read: %v", result.err) + } + if got := result.contacts[20].FirstName; got != "captured" { + t.Fatalf("unrelated invalidation rejected captured refill: got %q", got) + } + case <-time.After(2 * time.Second): + t.Fatal("timed out waiting for contact read") + } + if calls := blocking.callCount(); calls != 1 { + t.Fatalf("ListByUser calls = %d, want 1 after unrelated invalidation", calls) + } +} + +func TestCachedContactStoreContactProjectionForViewersUsesViewerOwnedPairCache(t *testing.T) { + ctx := context.Background() + base := memory.NewContactStore() + if _, err := base.Upsert(ctx, 1, domain.ContactInput{ContactUserID: 2, FirstName: "Alice"}); err != nil { + t.Fatalf("seed viewer 1 contact: %v", err) + } + if _, _, err := base.SetPersonalPhoto(ctx, 1, 2, 9101, 100); err != nil { + t.Fatalf("seed viewer 1 personal photo: %v", err) + } + if _, err := base.Upsert(ctx, 3, domain.ContactInput{ContactUserID: 2, FirstName: "Bob"}); err != nil { + t.Fatalf("seed viewer 3 contact: %v", err) + } + if _, _, err := base.SetPersonalPhoto(ctx, 3, 2, 9103, 100); err != nil { + t.Fatalf("seed viewer 3 personal photo: %v", err) + } + counting := &countingContactStore{ContactStore: base} + cached := NewCachedContactStore(counting, 0) + + if _, err := cached.GetMany(ctx, 1, []int64{2}); err != nil { + t.Fatalf("prime viewer 1 contacts: %v", err) + } + if _, err := cached.PersonalPhotos(ctx, 1, []int64{2}); err != nil { + t.Fatalf("prime viewer 1 photos: %v", err) + } + + first, err := cached.ContactProjectionForViewers(ctx, []int64{1, 3}, []int64{2}) + if err != nil { + t.Fatalf("first projection: %v", err) + } + if first.Contacts[1][2].FirstName != "Alice" || first.PersonalPhotos[1][2].PhotoID != 9101 { + t.Fatalf("viewer 1 projection = %+v %+v, want warm Alice/9101", first.Contacts[1][2], first.PersonalPhotos[1][2]) + } + if first.Contacts[3][2].FirstName != "Bob" || first.PersonalPhotos[3][2].PhotoID != 9103 { + t.Fatalf("viewer 3 projection = %+v %+v, want cold Bob/9103", first.Contacts[3][2], first.PersonalPhotos[3][2]) + } + if counting.projectionCalls != 1 { + t.Fatalf("projection calls after first = %d, want 1", counting.projectionCalls) + } + + second, err := cached.ContactProjectionForViewers(ctx, []int64{3}, []int64{2}) + if err != nil { + t.Fatalf("second projection: %v", err) + } + if second.Contacts[3][2].FirstName != "Bob" || second.PersonalPhotos[3][2].PhotoID != 9103 { + t.Fatalf("cached viewer 3 projection = %+v %+v, want Bob/9103", second.Contacts[3][2], second.PersonalPhotos[3][2]) + } + if counting.projectionCalls != 1 { + t.Fatalf("projection calls after cached read = %d, want 1", counting.projectionCalls) + } + + cached.InvalidateViewers(3) + if _, err := cached.ContactProjectionForViewers(ctx, []int64{3}, []int64{2}); err != nil { + t.Fatalf("projection after invalidation: %v", err) + } + if counting.projectionCalls != 2 { + t.Fatalf("projection calls after invalidation = %d, want 2", counting.projectionCalls) + } +} + +func TestCachedContactStorePairSnapshotsAreCompact(t *testing.T) { + pointerSize := unsafe.Sizeof(uintptr(0)) + timeSize := unsafe.Sizeof(time.Time{}) + if got, max := unsafe.Sizeof(reverseContactSnapshot{}), timeSize+2*pointerSize; got > max { + t.Fatalf("reverseContactSnapshot size = %d, want <= %d (one value pointer plus expiry)", got, max) + } + if got, max := unsafe.Sizeof(contactProjectionSnapshot{}), timeSize+3*pointerSize; got > max { + t.Fatalf("contactProjectionSnapshot size = %d, want <= %d (two value pointers plus expiry)", got, max) + } + if got, large := unsafe.Sizeof(reverseContactSnapshot{}), unsafe.Sizeof(domain.Contact{}); got >= large { + t.Fatalf("reverseContactSnapshot size = %d, must not embed %d-byte domain.Contact", got, large) + } + if got, large := unsafe.Sizeof(contactProjectionSnapshot{}), unsafe.Sizeof(domain.Contact{}); got >= large { + t.Fatalf("contactProjectionSnapshot size = %d, must not embed %d-byte domain.Contact", got, large) + } + if got, max := unsafe.Sizeof(cachedContactProjectionOverlay{}), uintptr(128); got > max { + t.Fatalf("cachedContactProjectionOverlay size = %d, want <= %d bytes", got, max) + } + if got, large := unsafe.Sizeof(cachedContactProjectionOverlay{}), unsafe.Sizeof(domain.Contact{}); got >= large { + t.Fatalf("cachedContactProjectionOverlay size = %d, must be smaller than %d-byte domain.Contact", got, large) + } +} + +func TestCachedContactStorePairSnapshotsUseNilForNegativeAndClonePositiveValues(t *testing.T) { + cached := NewCachedContactStore(memory.NewContactStore(), time.Hour) + now := time.Unix(1000, 0) + expireAt := now.Add(time.Hour) + contact := domain.Contact{ + User: domain.User{ + ID: 2, AccessHash: 2002, Phone: "global-phone", FirstName: "Global", LastName: "User", + Username: "global_user", Mutual: true, PhotoStripped: []byte{1, 2, 3}, + }, + FirstName: "Local", + LastName: "Name", + Phone: "known-phone", + Note: "private note", + NoteEntities: []domain.MessageEntity{{ + Type: domain.MessageEntityBold, Offset: 0, Length: 3, + }}, + CloseFriend: true, + } + photo := domain.ProfilePhotoRef{PhotoID: 9001, Stripped: []byte{4, 5, 6}, Personal: true} + positiveReverseKey := reverseContactKey{ownerUserID: 1, contactUserID: 2} + negativeReverseKey := reverseContactKey{ownerUserID: 3, contactUserID: 2} + positiveProjectionKey := contactProjectionKey{viewerUserID: 1, contactUserID: 2} + negativeProjectionKey := contactProjectionKey{viewerUserID: 1, contactUserID: 99} + + cached.mu.Lock() + cached.storeReverseContactLocked(positiveReverseKey, contact, true, expireAt) + cached.storeReverseContactLocked(negativeReverseKey, contact, false, expireAt) + cached.storeContactProjectionPairLocked(positiveProjectionKey, contact, true, photo, true, expireAt) + cached.storeContactProjectionPairLocked(negativeProjectionKey, contact, false, photo, false, expireAt) + positiveReverse := cached.reverse[positiveReverseKey].Value.(*reverseContactEntry).snapshot + negativeReverse := cached.reverse[negativeReverseKey].Value.(*reverseContactEntry).snapshot + positiveProjection := cached.projection[positiveProjectionKey].Value.(*contactProjectionEntry).snapshot + negativeProjection := cached.projection[negativeProjectionKey].Value.(*contactProjectionEntry).snapshot + cached.mu.Unlock() + + if positiveReverse.contact == nil || positiveProjection.contact == nil || positiveProjection.personalPhoto == nil { + t.Fatalf("positive snapshots lost values: reverse=%+v projection=%+v", positiveReverse, positiveProjection) + } + if negativeReverse.contact != nil || negativeProjection.contact != nil || negativeProjection.personalPhoto != nil { + t.Fatalf("negative snapshots retained value allocations: reverse=%+v projection=%+v", negativeReverse, negativeProjection) + } + + // Publication clones inputs; subsequent caller mutation cannot alter cache. + contact.User.PhotoStripped[0] = 10 + contact.NoteEntities[0].Length = 10 + photo.Stripped[0] = 10 + + reverse, found, hit := cached.lookupReverseContact(1, 2, now) + if !hit || !found || reverse.User.PhotoStripped[0] != 1 || reverse.NoteEntities[0].Length != 3 { + t.Fatalf("positive reverse lookup = %+v found=%v hit=%v", reverse, found, hit) + } + reverse.User.PhotoStripped[0] = 11 + reverse.NoteEntities[0].Length = 11 + reverseAgain, found, hit := cached.lookupReverseContact(1, 2, now) + if !hit || !found || reverseAgain.User.PhotoStripped[0] != 1 || reverseAgain.NoteEntities[0].Length != 3 { + t.Fatalf("reverse lookup shared mutable slices: %+v found=%v hit=%v", reverseAgain, found, hit) + } + if _, found, hit := cached.lookupReverseContact(3, 2, now); !hit || found { + t.Fatalf("negative reverse lookup found=%v hit=%v, want false/true", found, hit) + } + + pair, hit := cached.lookupContactProjectionPair(1, 2, now) + if !hit || !pair.contactFound || !pair.personalPhotoFound || pair.personalPhoto.Stripped[0] != 4 { + t.Fatalf("positive projection lookup = %+v hit=%v", pair, hit) + } + if !reflect.DeepEqual(pair.contact.User, domain.User{ID: 2}) { + t.Fatalf("projection pair retained base user data: %+v", pair.contact.User) + } + if pair.contact.FirstName != "Local" || pair.contact.LastName != "Name" || pair.contact.Phone != "known-phone" || + pair.contact.Note != "private note" || !pair.contact.Mutual || !pair.contact.CloseFriend { + t.Fatalf("projection pair lost viewer-owned overlay: %+v", pair.contact) + } + pair.contact.NoteEntities[0].Length = 12 + pair.personalPhoto.Stripped[0] = 12 + pairAgain, hit := cached.lookupContactProjectionPair(1, 2, now) + if !hit || !reflect.DeepEqual(pairAgain.contact.User, domain.User{ID: 2}) || pairAgain.contact.NoteEntities[0].Length != 3 || pairAgain.personalPhoto.Stripped[0] != 4 { + t.Fatalf("projection lookup shared mutable slices: %+v hit=%v", pairAgain, hit) + } + negative, hit := cached.lookupContactProjectionPair(1, 99, now) + if !hit || negative.contactFound || negative.personalPhotoFound { + t.Fatalf("negative projection lookup = %+v hit=%v, want cached miss", negative, hit) + } +} + +func TestCachedContactStoreLargeDenseProjectionDoesNotPollutePairCache(t *testing.T) { + if !admitDenseContactProjectionPairs(1, contactProjectionDenseAdmissionMaxCells) { + t.Fatal("admission rejected the documented cell limit") + } + if admitDenseContactProjectionPairs(1, contactProjectionDenseAdmissionMaxCells+1) { + t.Fatal("admission accepted a batch above the documented cell limit") + } + + counting := &countingContactStore{ContactStore: memory.NewContactStore()} + cached := NewCachedContactStore(counting, time.Hour) + seedKey := contactProjectionKey{viewerUserID: 1, contactUserID: 2} + cached.mu.Lock() + cached.storeContactProjectionPairLocked( + seedKey, + domain.Contact{User: domain.User{ID: 2}, FirstName: "seed"}, true, + domain.ProfilePhotoRef{}, false, + cached.now().Add(time.Hour), + ) + cached.mu.Unlock() + + viewers := []int64{1001, 1002} + targets := make([]int64, contactProjectionDenseAdmissionMaxCells/len(viewers)+1) + for i := range targets { + targets[i] = int64(100000 + i) + } + for call := 1; call <= 2; call++ { + got, err := cached.ContactProjectionForViewers(context.Background(), viewers, targets) + if err != nil { + t.Fatalf("large dense projection call %d: %v", call, err) + } + if len(got.Contacts) != 0 || len(got.PersonalPhotos) != 0 { + t.Fatalf("large empty projection call %d = %+v", call, got) + } + cached.mu.Lock() + _, seedPresent := cached.projection[seedKey] + pairCount := len(cached.projection) + lruCount := cached.projectionLRU.Len() + cached.mu.Unlock() + if !seedPresent || pairCount != 1 || lruCount != 1 { + t.Fatalf("large dense load polluted pair cache: seed=%v pairs=%d lru=%d", seedPresent, pairCount, lruCount) + } + } + if counting.projectionCalls != 2 { + t.Fatalf("projection calls = %d, want 2 because oversized results are returned but not admitted", counting.projectionCalls) + } +} + +func TestCachedContactStoreContactProjectionSkipsColdReadForKnownNonContact(t *testing.T) { + ctx := context.Background() + base := memory.NewContactStore() + if _, err := base.Upsert(ctx, 1, domain.ContactInput{ContactUserID: 2, FirstName: "Alice"}); err != nil { + t.Fatalf("seed contact: %v", err) + } + counting := &countingContactStore{ContactStore: base} + cached := NewCachedContactStore(counting, 0) + + if _, err := cached.GetMany(ctx, 1, []int64{99}); err != nil { + t.Fatalf("prime viewer contact snapshot: %v", err) + } + got, err := cached.ContactProjectionForViewers(ctx, []int64{1}, []int64{99}) + if err != nil { + t.Fatalf("projection: %v", err) + } + if len(got.Contacts[1]) != 0 || len(got.PersonalPhotos[1]) != 0 { + t.Fatalf("known non-contact projection = %+v", got) + } + if counting.projectionCalls != 0 { + t.Fatalf("projection calls = %d, want 0 for known non-contact", counting.projectionCalls) + } + if counting.personalPhotoCalls != 0 { + t.Fatalf("personal photo calls = %d, want 0 for known non-contact", counting.personalPhotoCalls) + } +} + func TestCachedContactStoreCachesLargeReverseContactBatch(t *testing.T) { ctx := context.Background() base := memory.NewContactStore() @@ -237,7 +708,7 @@ func TestCachedContactStoreReversePairsUsePerEntryLRU(t *testing.T) { } } -func TestCachedContactStoreInvalidatesAccountSnapshot(t *testing.T) { +func TestCachedContactStoreInvalidatesAccountSnapshotAfterMutation(t *testing.T) { ctx := context.Background() base := memory.NewContactStore() if _, err := base.Upsert(ctx, 1, domain.ContactInput{ContactUserID: 2, FirstName: "Alice"}); err != nil { @@ -264,7 +735,123 @@ func TestCachedContactStoreInvalidatesAccountSnapshot(t *testing.T) { t.Fatalf("second = %+v, want Alicia after invalidation", second[2]) } if counting.listCalls != 2 { - t.Fatalf("ListByUser calls = %d, want 2 after write invalidation", counting.listCalls) + t.Fatalf("ListByUser calls = %d, want 2 after safe invalidation and reload", counting.listCalls) + } +} + +func TestCachedContactStorePublishedSnapshotsStayImmutableDuringMutations(t *testing.T) { + tests := []struct { + name string + mutate func(context.Context, *CachedContactStore) error + }{ + { + name: "upsert", + mutate: func(ctx context.Context, cached *CachedContactStore) error { + _, err := cached.Upsert(ctx, 1, domain.ContactInput{ContactUserID: 2, FirstName: "After"}) + return err + }, + }, + { + name: "delete", + mutate: func(ctx context.Context, cached *CachedContactStore) error { + _, err := cached.Delete(ctx, 1, []int64{2}) + return err + }, + }, + { + name: "close_friends", + mutate: func(ctx context.Context, cached *CachedContactStore) error { + _, err := cached.SetCloseFriends(ctx, 1, []int64{2}) + return err + }, + }, + { + name: "personal_photo", + mutate: func(ctx context.Context, cached *CachedContactStore) error { + _, found, err := cached.SetPersonalPhoto(ctx, 1, 2, 9002, 101) + if err == nil && !found { + return fmt.Errorf("contact not found") + } + return err + }, + }, + } + + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + ctx := context.Background() + base := memory.NewContactStore() + if _, err := base.Upsert(ctx, 1, domain.ContactInput{ContactUserID: 2, FirstName: "Before"}); err != nil { + t.Fatalf("seed contact: %v", err) + } + if _, found, err := base.SetPersonalPhoto(ctx, 1, 2, 9001, 100); err != nil || !found { + t.Fatalf("seed personal photo: %v found=%v", err, found) + } + cached := NewCachedContactStore(base, 0) + if _, err := cached.GetMany(ctx, 1, []int64{2}); err != nil { + t.Fatalf("warm contacts: %v", err) + } + if _, err := cached.PersonalPhotos(ctx, 1, []int64{2}); err != nil { + t.Fatalf("warm personal photos: %v", err) + } + + cached.mu.RLock() + contactSnap, contactsWarm := cached.contacts[1] + photoSnap, photosWarm := cached.personalPhotos[1] + cached.mu.RUnlock() + if !contactsWarm || !photosWarm { + t.Fatal("snapshots were not warm before mutation") + } + + started := make(chan struct{}) + stop := make(chan struct{}) + done := make(chan struct{}) + go func() { + defer close(done) + signaled := false + for { + contact := contactSnap.contacts[2] + for i := range contactSnap.ordered { + _ = contactSnap.ordered[i].User.ID + } + ref := photoSnap.refs[2] + _, _ = contact.FirstName, ref.PhotoID + if !signaled { + close(started) + signaled = true + } + select { + case <-stop: + return + default: + } + } + }() + waitForCacheTestSignal(t, started) + if err := tc.mutate(ctx, cached); err != nil { + close(stop) + <-done + t.Fatalf("mutation: %v", err) + } + close(stop) + <-done + + // A snapshot obtained before invalidation remains a valid immutable + // value for an in-flight reader; only the outer cache entry is removed. + if got := contactSnap.contacts[2]; got.FirstName != "Before" || got.CloseFriend { + t.Fatalf("published contact snapshot mutated in place: %+v", got) + } + if got := photoSnap.refs[2]; got.PhotoID != 9001 { + t.Fatalf("published photo snapshot mutated in place: %+v", got) + } + cached.mu.RLock() + _, contactsWarm = cached.contacts[1] + _, photosWarm = cached.personalPhotos[1] + cached.mu.RUnlock() + if contactsWarm || photosWarm { + t.Fatalf("mutation left stale snapshots published: contacts=%v photos=%v", contactsWarm, photosWarm) + } + }) } } @@ -363,6 +950,59 @@ func TestCachedContactStoreDoesNotRefillStaleSnapshotAfterInvalidation(t *testin if cachedHit[2].FirstName != "Alicia" { t.Fatalf("cached value after stale load retry = %+v, want Alicia", cachedHit[2]) } + if calls := blocking.callCount(); calls != 2 { + t.Fatalf("ListByUser calls = %d, want stale load plus exact-viewer retry", calls) + } +} + +func TestCachedContactStoreFlushRejectsEveryInFlightRefill(t *testing.T) { + ctx := context.Background() + base := memory.NewContactStore() + if _, err := base.Upsert(ctx, 1, domain.ContactInput{ContactUserID: 2, FirstName: "Alice"}); err != nil { + t.Fatalf("seed contact: %v", err) + } + first, err := base.ListByUser(ctx, 1) + if err != nil { + t.Fatalf("snapshot first contact list: %v", err) + } + blocking := &blockingFirstListContactStore{ + ContactStore: base, + started: make(chan struct{}), + release: make(chan struct{}), + first: first, + } + cached := NewCachedContactStore(blocking, time.Hour) + + type readResult struct { + contacts map[int64]domain.Contact + err error + } + resultCh := make(chan readResult, 1) + go func() { + contacts, err := cached.GetMany(ctx, 1, []int64{2}) + resultCh <- readResult{contacts: contacts, err: err} + }() + waitForCacheTestSignal(t, blocking.started) + if _, err := base.Upsert(ctx, 1, domain.ContactInput{ContactUserID: 2, FirstName: "Alicia"}); err != nil { + t.Fatalf("update contact while first load is blocked: %v", err) + } + cached.FlushReadModelCache() + close(blocking.release) + + select { + case result := <-resultCh: + if result.err != nil { + t.Fatalf("contact read: %v", result.err) + } + if got := result.contacts[2].FirstName; got != "Alicia" { + t.Fatalf("flush allowed stale refill: got %q", got) + } + case <-time.After(2 * time.Second): + t.Fatal("timed out waiting for contact read") + } + if calls := blocking.callCount(); calls != 2 { + t.Fatalf("ListByUser calls = %d, want stale load plus post-flush retry", calls) + } } func TestCachedContactStoreInvalidatesPersonalPhoto(t *testing.T) { @@ -412,7 +1052,10 @@ func TestCachedContactStoreInvalidatesPersonalPhoto(t *testing.T) { t.Fatalf("PersonalPhotos calls after invalidation = %d, want 2", counting.personalPhotoCalls) } if counting.listCalls != 2 { - t.Fatalf("ListByUser calls after invalidation = %d, want 2", counting.listCalls) + t.Fatalf("ListByUser calls after mutation = %d, want 2 after safe invalidation and reload", counting.listCalls) + } + if counting.setPersonalPhotoHit != 1 { + t.Fatalf("SetPersonalPhoto calls = %d, want 1", counting.setPersonalPhotoHit) } } @@ -466,3 +1109,68 @@ func TestCachedContactStoreDoesNotRefillStalePersonalPhotoAfterInvalidation(t *t t.Fatalf("personal photo after concurrent invalidation = %+v, want 9002", result.refs[2]) } } + +func TestCachedContactStoreOlderPersonalPhotoMutationCannotReinsertStalePair(t *testing.T) { + ctx := context.Background() + base := memory.NewContactStore() + if _, err := base.Upsert(ctx, 1, domain.ContactInput{ContactUserID: 2, FirstName: "Alice"}); err != nil { + t.Fatalf("seed contact: %v", err) + } + if _, found, err := base.SetPersonalPhoto(ctx, 1, 2, 9000, 99); err != nil || !found { + t.Fatalf("seed personal photo: %v found=%v", err, found) + } + inner := &stalePersonalPhotoWritebackStore{ + ContactStore: base, + started: make(chan struct{}), + release: make(chan struct{}), + } + cached := NewCachedContactStore(inner, 0) + if refs, err := cached.PersonalPhotos(ctx, 1, []int64{2}); err != nil || refs[2].PhotoID != 9000 { + t.Fatalf("warm personal photo = %+v err=%v, want 9000", refs[2], err) + } + + olderCtx := context.WithValue(ctx, stalePersonalPhotoWritebackContextKey{}, true) + type setResult struct { + found bool + err error + } + olderResult := make(chan setResult, 1) + go func() { + _, found, err := cached.SetPersonalPhoto(olderCtx, 1, 2, 9001, 100) + olderResult <- setResult{found: found, err: err} + }() + waitForCacheTestSignal(t, inner.started) + + // The newer DB commit completes and invalidates the warm snapshot first. + if _, found, err := cached.SetPersonalPhoto(ctx, 1, 2, 9002, 101); err != nil || !found { + t.Fatalf("newer personal photo mutation: %v found=%v", err, found) + } + close(inner.release) + select { + case result := <-olderResult: + if result.err != nil || !result.found { + t.Fatalf("older personal photo mutation: %v found=%v", result.err, result.found) + } + case <-time.After(2 * time.Second): + t.Fatal("timed out waiting for older personal photo mutation") + } + + if calls := inner.staleReads(); calls != 0 { + t.Fatalf("post-commit stale PersonalPhotos reads = %d, want 0", calls) + } + cached.mu.RLock() + _, contactsWarm := cached.contacts[1] + _, photosWarm := cached.personalPhotos[1] + _, pairWarm := cached.projection[contactProjectionKey{viewerUserID: 1, contactUserID: 2}] + cached.mu.RUnlock() + if contactsWarm || photosWarm || pairWarm { + t.Fatalf("older mutation reinserted stale cache state: contacts=%v photos=%v pair=%v", contactsWarm, photosWarm, pairWarm) + } + refs, err := cached.PersonalPhotos(ctx, 1, []int64{2}) + if err != nil { + t.Fatalf("reload current personal photo: %v", err) + } + if got := refs[2].PhotoID; got != 9002 { + t.Fatalf("personal photo after out-of-order completions = %d, want 9002", got) + } +} diff --git a/internal/app/userprojection/durable_user_facts.go b/internal/app/userprojection/durable_user_facts.go new file mode 100644 index 00000000..1f0a9dc6 --- /dev/null +++ b/internal/app/userprojection/durable_user_facts.go @@ -0,0 +1,142 @@ +package userprojection + +import ( + "context" + + "telesrv/internal/app/readmodel" + "telesrv/internal/domain" + "telesrv/internal/readmodelcache" + "telesrv/internal/store" +) + +type accountFreezeFact struct { + value domain.AccountFreeze + found bool +} + +// DurableUserProjectionFacts caches only viewer-independent durable overlays. +// Contact/privacy/presence decisions remain outside and are evaluated after +// these facts are loaded. +type DurableUserProjectionFacts struct { + freezes AccountFreezeProvider + versions store.ReadModelVersionStore + + freezeCache *readmodelcache.Cache[int64, accountFreezeFact] +} + +func NewDurableUserProjectionFacts( + freezes AccountFreezeProvider, + versions store.ReadModelVersionStore, + maxEntries int, +) *DurableUserProjectionFacts { + return &DurableUserProjectionFacts{ + freezes: freezes, + versions: versions, + freezeCache: readmodelcache.New[int64, accountFreezeFact](readmodelcache.Config[int64, accountFreezeFact]{ + MaxEntries: maxEntries, + }), + } +} + +func (f *DurableUserProjectionFacts) AccountFreezes(ctx context.Context, userIDs []int64) (map[int64]domain.AccountFreeze, error) { + out := make(map[int64]domain.AccountFreeze) + ids := uniqueDurableFactUserIDs(userIDs) + if f == nil || f.freezes == nil || len(ids) == 0 { + return out, nil + } + hashes, err := f.factHashes(ctx, readmodel.ModelUserVisibility, ids) + if err != nil { + return nil, err + } + loaded, err := f.freezeCache.GetOrLoadBatch(ctx, ids, + func(userID int64) (int64, bool) { + hash := hashes[userID] + return hash, f.versions != nil && hash != 0 + }, + func(ctx context.Context, missing []int64) (map[int64]accountFreezeFact, error) { + values, err := f.freezes.AccountFreezes(ctx, missing) + if err != nil { + return nil, err + } + entries := make(map[int64]accountFreezeFact, len(missing)) + for _, userID := range missing { + entry := accountFreezeFact{} + if value, ok := values[userID]; ok { + entry = accountFreezeFact{value: value, found: true} + } + entries[userID] = entry + } + return entries, nil + }) + if err != nil { + return nil, err + } + for userID, entry := range loaded { + if entry.found { + out[userID] = entry.value + } + } + return out, nil +} + +// AccountFreeze exposes the same versioned positive/negative cache to scalar +// RPC gates. It deliberately delegates to the batch path so gate reads and +// user/dialog projection cannot drift into separate cache semantics. +func (f *DurableUserProjectionFacts) AccountFreeze(ctx context.Context, userID int64) (domain.AccountFreeze, bool, error) { + if userID == 0 { + return domain.AccountFreeze{}, false, nil + } + items, err := f.AccountFreezes(ctx, []int64{userID}) + if err != nil { + return domain.AccountFreeze{}, false, err + } + value, found := items[userID] + return value, found, nil +} + +func (f *DurableUserProjectionFacts) factHashes(ctx context.Context, model string, userIDs []int64) (map[int64]int64, error) { + out := make(map[int64]int64, len(userIDs)) + if f == nil || f.versions == nil { + return out, nil + } + keys := make([]store.ReadModelKey, 0, len(userIDs)) + for _, userID := range userIDs { + keys = append(keys, store.ReadModelKey{Model: model, OwnerUserID: 0, PeerType: domain.PeerTypeUser, PeerID: userID}) + } + rows, err := f.versions.ReadModelHashes(ctx, keys) + if err != nil { + return nil, err + } + for _, key := range keys { + out[key.PeerID] = rows[key] + } + return out, nil +} + +func (f *DurableUserProjectionFacts) InvalidateAccountFreezeFact(userID int64) { + if f != nil && userID != 0 { + f.freezeCache.Invalidate(userID) + } +} + +func (f *DurableUserProjectionFacts) FlushUserProjectionFactReadModel() { + if f != nil { + f.freezeCache.Flush() + } +} + +func uniqueDurableFactUserIDs(ids []int64) []int64 { + out := make([]int64, 0, len(ids)) + seen := make(map[int64]struct{}, len(ids)) + for _, id := range ids { + if id == 0 { + continue + } + if _, ok := seen[id]; ok { + continue + } + seen[id] = struct{}{} + out = append(out, id) + } + return out +} diff --git a/internal/app/userprojection/durable_user_facts_test.go b/internal/app/userprojection/durable_user_facts_test.go new file mode 100644 index 00000000..2908f816 --- /dev/null +++ b/internal/app/userprojection/durable_user_facts_test.go @@ -0,0 +1,153 @@ +package userprojection + +import ( + "context" + "errors" + "sync" + "testing" + + "telesrv/internal/app/readmodel" + "telesrv/internal/domain" + "telesrv/internal/store" +) + +type durableFactVersions struct { + mu sync.Mutex + hashes map[store.ReadModelKey]int64 +} + +func (v *durableFactVersions) ReadModelHash(_ context.Context, model string, ownerUserID int64, peerType domain.PeerType, peerID int64) (int64, bool, error) { + v.mu.Lock() + defer v.mu.Unlock() + hash := v.hashes[store.ReadModelKey{Model: model, OwnerUserID: ownerUserID, PeerType: peerType, PeerID: peerID}] + return hash, hash != 0, nil +} + +func (v *durableFactVersions) ReadModelHashes(_ context.Context, keys []store.ReadModelKey) (map[store.ReadModelKey]int64, error) { + v.mu.Lock() + defer v.mu.Unlock() + out := make(map[store.ReadModelKey]int64, len(keys)) + for _, key := range keys { + if hash := v.hashes[key]; hash != 0 { + out[key] = hash + } + } + return out, nil +} + +func (v *durableFactVersions) set(model string, userID, hash int64) { + v.mu.Lock() + v.hashes[store.ReadModelKey{Model: model, OwnerUserID: 0, PeerType: domain.PeerTypeUser, PeerID: userID}] = hash + v.mu.Unlock() +} + +type countingDurableFreezeFacts struct { + mu sync.Mutex + calls int + values map[int64]domain.AccountFreeze + err error +} + +func (f *countingDurableFreezeFacts) AccountFreezes(_ context.Context, ids []int64) (map[int64]domain.AccountFreeze, error) { + f.mu.Lock() + defer f.mu.Unlock() + f.calls++ + if f.err != nil { + return nil, f.err + } + out := make(map[int64]domain.AccountFreeze) + for _, id := range ids { + if value, ok := f.values[id]; ok { + out[id] = value + } + } + return out, nil +} + +func TestDurableUserProjectionFactsCachesPositiveAndNegativeByVersion(t *testing.T) { + ctx := context.Background() + versions := &durableFactVersions{hashes: make(map[store.ReadModelKey]int64)} + for _, id := range []int64{1, 2} { + versions.set(readmodel.ModelUserVisibility, id, 10+id) + } + freezes := &countingDurableFreezeFacts{values: map[int64]domain.AccountFreeze{1: {UserID: 1, Frozen: true}}} + facts := NewDurableUserProjectionFacts(freezes, versions, 10) + + for i := 0; i < 2; i++ { + gotFreezes, err := facts.AccountFreezes(ctx, []int64{1, 2, 1}) + if err != nil || len(gotFreezes) != 1 || !gotFreezes[1].Frozen { + t.Fatalf("AccountFreezes(%d) = %+v err=%v", i, gotFreezes, err) + } + } + if freezes.calls != 1 { + t.Fatalf("backend calls freezes = %d, want 1 including negative hits", freezes.calls) + } + + versions.set(readmodel.ModelUserVisibility, 2, 32) + freezes.values[2] = domain.AccountFreeze{UserID: 2, Frozen: true} + gotFreezes, err := facts.AccountFreezes(ctx, []int64{1, 2}) + if err != nil || !gotFreezes[2].Frozen { + t.Fatalf("AccountFreezes after version bump = %+v err=%v", gotFreezes, err) + } + if freezes.calls != 2 { + t.Fatalf("backend calls after one-key bumps freezes = %d, want 2", freezes.calls) + } +} + +func TestDurableUserProjectionFactsScalarFreezeGateReusesVersionedFact(t *testing.T) { + ctx := context.Background() + versions := &durableFactVersions{hashes: make(map[store.ReadModelKey]int64)} + versions.set(readmodel.ModelUserVisibility, 1, 11) + versions.set(readmodel.ModelUserVisibility, 2, 12) + freezes := &countingDurableFreezeFacts{values: map[int64]domain.AccountFreeze{ + 1: {UserID: 1, Frozen: true}, + }} + facts := NewDurableUserProjectionFacts(freezes, versions, 10) + + for i := 0; i < 3; i++ { + freeze, found, err := facts.AccountFreeze(ctx, 1) + if err != nil || !found || !freeze.Frozen { + t.Fatalf("positive scalar gate %d = %+v found=%v err=%v", i, freeze, found, err) + } + freeze, found, err = facts.AccountFreeze(ctx, 2) + if err != nil || found || freeze.Frozen { + t.Fatalf("negative scalar gate %d = %+v found=%v err=%v", i, freeze, found, err) + } + } + if freezes.calls != 2 { + t.Fatalf("backend calls = %d, want one positive and one negative fill", freezes.calls) + } +} + +func TestDurableUserProjectionFactErrorsAreNotNegativeCached(t *testing.T) { + ctx := context.Background() + versions := &durableFactVersions{hashes: make(map[store.ReadModelKey]int64)} + versions.set(readmodel.ModelUserVisibility, 1, 11) + freezes := &countingDurableFreezeFacts{values: map[int64]domain.AccountFreeze{}, err: errors.New("freeze unavailable")} + facts := NewDurableUserProjectionFacts(freezes, versions, 10) + + if _, err := facts.AccountFreezes(ctx, []int64{1}); err == nil { + t.Fatal("AccountFreezes error = nil") + } + freezes.err = nil + if _, err := facts.AccountFreezes(ctx, []int64{1}); err != nil { + t.Fatalf("recovered AccountFreezes: %v", err) + } + if freezes.calls != 2 { + t.Fatalf("backend calls freezes = %d, want retry", freezes.calls) + } +} + +func TestDurableUserProjectionFactExplicitInvalidation(t *testing.T) { + ctx := context.Background() + versions := &durableFactVersions{hashes: make(map[store.ReadModelKey]int64)} + versions.set(readmodel.ModelUserVisibility, 1, 11) + freezes := &countingDurableFreezeFacts{values: map[int64]domain.AccountFreeze{}} + facts := NewDurableUserProjectionFacts(freezes, versions, 10) + _, _ = facts.AccountFreezes(ctx, []int64{1}) + facts.InvalidateAccountFreezeFact(1) + _, _ = facts.AccountFreezes(ctx, []int64{1}) + if freezes.calls != 2 { + t.Fatalf("backend calls after invalidation freezes = %d, want 2", freezes.calls) + } +} diff --git a/internal/app/userprojection/photo_cache.go b/internal/app/userprojection/photo_cache.go index f16a6753..804850d5 100644 --- a/internal/app/userprojection/photo_cache.go +++ b/internal/app/userprojection/photo_cache.go @@ -8,11 +8,16 @@ import ( "telesrv/internal/readmodelcache" ) -// DefaultPhotoCacheTTL 是头像投影缓存的兜底有效期；正常正确性依赖写入侧触发 -// read_model_versions/NOTIFY 后显式失效，TTL 只负责覆盖进程外漏通知或手工改库。 -const DefaultPhotoCacheTTL = 10 * time.Second +const ( + // DefaultPhotoCacheTTL 是头像投影缓存的兜底有效期；正常正确性依赖写入侧触发 + // read_model_versions/NOTIFY 后显式失效，TTL 只负责覆盖漏通知或手工改库。 + // 10s 会让 60s 的 10k 登录突发反复丢失稳定负结果，不能作为正常新鲜度机制。 + DefaultPhotoCacheTTL = 24 * time.Hour -const photoCacheMaxEntries = 200000 + // DefaultPhotoCacheMaxEntries 覆盖 10k owner 的 profile/fallback 两种 key， + // 并为共享对话引用保留余量。底层是逐项 LRU，不允许整表清空。 + DefaultPhotoCacheMaxEntries = 200_000 +) // combinedPhotoProvider 是同时具备 batch 与 kind 两种头像查询能力的底层 provider（postgres // MediaStore 即满足）。 @@ -50,21 +55,32 @@ type CachedPhotoProvider struct { // NewCachedPhotoProvider 包装底层 provider；ttl<=0 用 DefaultPhotoCacheTTL。 func NewCachedPhotoProvider(inner combinedPhotoProvider, ttl time.Duration) *CachedPhotoProvider { - return newCachedPhotoProviderWithClock(inner, ttl, nil) + return NewCachedPhotoProviderWithMaxEntries(inner, ttl, DefaultPhotoCacheMaxEntries) +} + +func NewCachedPhotoProviderWithMaxEntries(inner combinedPhotoProvider, ttl time.Duration, maxEntries int) *CachedPhotoProvider { + return newCachedPhotoProvider(inner, ttl, maxEntries, nil) } // newCachedPhotoProviderWithClock 允许注入时钟,仅供测试确定地推进 TTL;now=nil 用真实时钟。 func newCachedPhotoProviderWithClock(inner combinedPhotoProvider, ttl time.Duration, now func() time.Time) *CachedPhotoProvider { + return newCachedPhotoProvider(inner, ttl, DefaultPhotoCacheMaxEntries, now) +} + +func newCachedPhotoProvider(inner combinedPhotoProvider, ttl time.Duration, maxEntries int, now func() time.Time) *CachedPhotoProvider { if inner == nil { return nil } if ttl <= 0 { ttl = DefaultPhotoCacheTTL } + if maxEntries <= 0 { + maxEntries = DefaultPhotoCacheMaxEntries + } return &CachedPhotoProvider{ inner: inner, cache: readmodelcache.New[photoCacheKey, photoCacheValue](readmodelcache.Config[photoCacheKey, photoCacheValue]{ - MaxEntries: photoCacheMaxEntries, + MaxEntries: maxEntries, TTL: ttl, Now: now, Clone: clonePhotoCacheValue, diff --git a/internal/app/userprojection/photo_cache_test.go b/internal/app/userprojection/photo_cache_test.go index 99c681ab..604a836a 100644 --- a/internal/app/userprojection/photo_cache_test.go +++ b/internal/app/userprojection/photo_cache_test.go @@ -133,6 +133,55 @@ func TestCachedPhotoProviderCachesHitsAndMisses(t *testing.T) { } } +func TestCachedPhotoProviderDefaultTTLRetainsLoginRampWorkingSet(t *testing.T) { + inner := &countingPhotoProvider{refs: map[int64]domain.ProfilePhotoRef{}} + now := time.Unix(1000, 0) + c := newCachedPhotoProvider(inner, 0, DefaultPhotoCacheMaxEntries, func() time.Time { return now }) + ctx := context.Background() + + if _, err := c.CurrentProfilePhotosKind(ctx, domain.PeerTypeUser, []int64{1}, domain.ProfilePhotoKindProfile); err != nil { + t.Fatalf("first: %v", err) + } + now = now.Add(time.Minute) + if _, err := c.CurrentProfilePhotosKind(ctx, domain.PeerTypeUser, []int64{1}, domain.ProfilePhotoKindProfile); err != nil { + t.Fatalf("within login ramp: %v", err) + } + if inner.kindCalls != 1 { + t.Fatalf("default TTL expired inside 60s login ramp: calls=%d, want 1", inner.kindCalls) + } + + now = now.Add(DefaultPhotoCacheTTL) + if _, err := c.CurrentProfilePhotosKind(ctx, domain.PeerTypeUser, []int64{1}, domain.ProfilePhotoKindProfile); err != nil { + t.Fatalf("after safety TTL: %v", err) + } + if inner.kindCalls != 2 { + t.Fatalf("safety TTL did not reload: calls=%d, want 2", inner.kindCalls) + } +} + +func TestCachedPhotoProviderConfiguredCapacityEvictsOneLRUKey(t *testing.T) { + inner := &countingPhotoProvider{refs: map[int64]domain.ProfilePhotoRef{}} + now := time.Unix(1000, 0) + c := newCachedPhotoProvider(inner, time.Hour, 2, func() time.Time { return now }) + ctx := context.Background() + read := func(ownerID int64) { + t.Helper() + if _, err := c.CurrentProfilePhotosKind(ctx, domain.PeerTypeUser, []int64{ownerID}, domain.ProfilePhotoKindProfile); err != nil { + t.Fatalf("owner %d: %v", ownerID, err) + } + } + + for _, ownerID := range []int64{1, 2, 1, 3, 1, 2} { + read(ownerID) + } + if inner.kindCalls != 4 { + t.Fatalf("kind calls = %d, want 4 with owner 1 touched and only owner 2 evicted", inner.kindCalls) + } + if c.cache.Len() != 2 { + t.Fatalf("cache entries = %d, want configured capacity 2", c.cache.Len()) + } +} + func TestCachedPhotoProviderInvalidatesOwnerAndFlushes(t *testing.T) { inner := &countingPhotoProvider{refs: map[int64]domain.ProfilePhotoRef{1: {PhotoID: 111}}} now := time.Unix(1000, 0) diff --git a/internal/app/userprojection/projection.go b/internal/app/userprojection/projection.go index 30ec967d..e8b2aa8e 100644 --- a/internal/app/userprojection/projection.go +++ b/internal/app/userprojection/projection.go @@ -118,12 +118,10 @@ func (p *Projector) One(ctx context.Context, viewerUserID int64, user domain.Use // ForViewers 跨多个 viewer 批量投影同一组 owner 用户（fan-out 模板化）。它把 per-viewer 各跑 // 一遍 ForViewer(=projectBatch) 的成本（O(viewer)×(photos+contacts+privacy) 查询）压成： // - 一次 profile/fallback 头像批量（跨 viewer 复用） -// - O(owner) 次 GetReverseContacts（改名/电话覆盖，按 owner 反查 viewer） +// - 一次 viewer-owned contact projection（联系人改名/电话覆盖 + personal photo overlay） // - O(owner) 次 GetMany + 一次 ListPrivacyRules（CanSeeMatrix 内做） // -// 返回 map[viewerID][]domain.User，每个切片与对应 viewer 的 ForViewer(viewer, users) **字节等价， -// 唯一例外是 personal photo overlay**：v1 简化为 fan-out 模板不做 per-viewer personal photo -// （无 O(owner) 反查接口），客户端下次 getChannelDifference/getHistory 会走 projectBatch 完整投影自愈。 +// 返回 map[viewerID][]domain.User，每个切片与对应 viewer 的 ForViewer(viewer, users) 字节等价。 // 调用方传入的 users 不被修改（内部复制）。 func (p *Projector) ForViewers(ctx context.Context, viewerUserIDs []int64, users []domain.User) (map[int64][]domain.User, error) { users = sanitizeDeletedUsers(users) @@ -143,26 +141,34 @@ func (p *Projector) ForViewers(ctx context.Context, viewerUserIDs []int64, users } ids := uniqueUserIDs(users) - // 三组预取互不依赖（共享头像、反向联系人覆盖、privacy 矩阵），并发执行收敛成一波。 + // 三组预取互不依赖（共享头像、viewer-owned 联系人投影、privacy 矩阵），并发执行收敛成一波。 var ( - profileRefs map[int64]domain.ProfilePhotoRef - fallbackRefs map[int64]domain.ProfilePhotoRef - contactsByViewer map[int64]map[int64]domain.Contact - matrix map[int64]map[int64]map[domain.PrivacyKey]bool - freezes map[int64]domain.AccountFreeze + profileRefs map[int64]domain.ProfilePhotoRef + fallbackRefs map[int64]domain.ProfilePhotoRef + contactsByViewer map[int64]map[int64]domain.Contact + personalRefsByViewer map[int64]map[int64]domain.ProfilePhotoRef + matrix map[int64]map[int64]map[domain.PrivacyKey]bool + freezes map[int64]domain.AccountFreeze ) g, gctx := errgroup.WithContext(ctx) - // 1) 共享头像：profile/fallback 一次批量，跨全部 viewer 复用；personal photo v1 跳过（见 doc）。 + // 1) 共享头像：profile/fallback 一次批量，跨全部 viewer 复用。 g.Go(func() error { var err error profileRefs, fallbackRefs, err = p.batchProfileFallbackPhotos(gctx, ids) return err }) - // 2) 改名/电话覆盖：O(owner) 次 GetReverseContacts(owner, viewers) 重组为 [viewer][owner]Contact， - // 与 projectBatch 的 GetMany(viewer, owners) 命中同一条联系人记录（方向对称）。 + // 2) 改名/电话覆盖 + personal photo：按 viewer 拥有的联系人行批量读取， + // 与 projectBatch 的 GetMany/PersonalPhotos(viewer, owners) 命中同一语义。 g.Go(func() error { - var err error - contactsByViewer, err = p.reverseContactsByViewer(gctx, ids, viewers) + if p.contacts == nil || len(ids) == 0 || len(viewers) == 0 { + return nil + } + batch, err := p.contacts.ContactProjectionForViewers(gctx, viewers, ids) + if err != nil { + return err + } + contactsByViewer = batch.Contacts + personalRefsByViewer = batch.PersonalPhotos return err }) // 3) privacy 可见性矩阵：O(owner) 查询；nil（无 MatrixPrivacyEvaluator）时 applyPrivacy 回退逐 CanSee。 @@ -183,10 +189,10 @@ func (p *Projector) ForViewers(ctx context.Context, viewerUserIDs []int64, users if err := g.Wait(); err != nil { return nil, err } - // 4) 逐 viewer 组装，复用与 projectBatch 完全相同的 apply* 链（personalRefs 传 nil）。 + // 4) 逐 viewer 组装，复用与 projectBatch 完全相同的 apply* 链。 for _, viewer := range viewers { - projected := make([]domain.User, len(users)) - copy(projected, users) + personalRefs := personalRefsByViewer[viewer] + projected := cloneUsers(users) cache := make(map[int64]domain.User, len(projected)) for i := range projected { u := projected[i] @@ -201,7 +207,7 @@ func (p *Projector) ForViewers(ctx context.Context, viewerUserIDs []int64, users projected[i] = pj continue } - pj := applyBasePhotos(u, profileRefs, fallbackRefs, nil, viewer) + pj := applyBasePhotos(u, profileRefs, fallbackRefs, personalRefs, viewer) if viewer != 0 && u.ID != viewer && u.ID != domain.OfficialSystemUserID && !u.Bot { contact, found := contactsByViewer[viewer][u.ID] pj = applyContactProjection(pj, contact, found) @@ -211,7 +217,7 @@ func (p *Projector) ForViewers(ctx context.Context, viewerUserIDs []int64, users } var perr error hasKnownContactPhone := found && contact.Phone != "" - pj, perr = applyPrivacy(ctx, p.privacy, viewer, pj, hasKnownContactPhone, vis, profileRefs, fallbackRefs, nil) + pj, perr = applyPrivacy(ctx, p.privacy, viewer, pj, hasKnownContactPhone, vis, profileRefs, fallbackRefs, personalRefs) if perr != nil { return nil, perr } @@ -225,8 +231,8 @@ func (p *Projector) ForViewers(ctx context.Context, viewerUserIDs []int64, users return out, nil } -// batchProfileFallbackPhotos 取 owner 的 profile/fallback 头像（与 projectBatch 同逻辑），personal -// 头像不取（ForViewers v1 跳过）。photos 为 nil 时返回空 map（applyBasePhotos 视为无头像查询）。 +// batchProfileFallbackPhotos 取 owner 的 profile/fallback 头像（与 projectBatch 同逻辑）。 +// photos 为 nil 时返回空 map（applyBasePhotos 视为无头像查询）。 func (p *Projector) batchProfileFallbackPhotos(ctx context.Context, ids []int64) (profileRefs, fallbackRefs map[int64]domain.ProfilePhotoRef, err error) { profileRefs = map[int64]domain.ProfilePhotoRef{} fallbackRefs = map[int64]domain.ProfilePhotoRef{} @@ -253,30 +259,6 @@ func (p *Projector) batchProfileFallbackPhotos(ctx context.Context, ids []int64) return refs, fallbackRefs, nil } -// reverseContactsByViewer 以 O(owner) 次 GetReverseContacts(owner, viewers) 取「每个 viewer 对各 -// owner 的联系人记录」并重组为 map[viewer]map[owner]Contact。该记录与 projectBatch 的 -// GetMany(viewer, owners)[owner] 是同一条（contacts 表上 (user_id=viewer, contact_user_id=owner) -// 的同一行，两端 store 均如此），用于 applyContactProjection 的改名/电话覆盖与 isContact 判定。 -func (p *Projector) reverseContactsByViewer(ctx context.Context, ownerIDs, viewers []int64) (map[int64]map[int64]domain.Contact, error) { - out := make(map[int64]map[int64]domain.Contact, len(viewers)) - if p.contacts == nil || len(ownerIDs) == 0 || len(viewers) == 0 { - return out, nil - } - for _, owner := range ownerIDs { - byViewer, err := p.contacts.GetReverseContacts(ctx, owner, viewers) - if err != nil { - return nil, err - } - for viewer, contact := range byViewer { - if out[viewer] == nil { - out[viewer] = make(map[int64]domain.Contact, len(ownerIDs)) - } - out[viewer][owner] = contact - } - } - return out, nil -} - func cloneUsers(users []domain.User) []domain.User { if len(users) == 0 { return nil @@ -284,6 +266,7 @@ func cloneUsers(users []domain.User) []domain.User { out := make([]domain.User, len(users)) copy(out, users) for i := range out { + out[i].PhotoStripped = append([]byte(nil), out[i].PhotoStripped...) out[i].ContactNoteEntities = append([]domain.MessageEntity(nil), out[i].ContactNoteEntities...) out[i].RestrictionReasons = append([]domain.UserRestrictionReason(nil), out[i].RestrictionReasons...) } @@ -332,8 +315,7 @@ func WithProfilePhotos(ctx context.Context, photos ProfilePhotoProvider, users [ if err != nil || len(refs) == 0 { return users } - out := make([]domain.User, len(users)) - copy(out, users) + out := cloneUsers(users) for i := range out { if ref, ok := refs[out[i].ID]; ok { applyPhotoRef(&out[i], ref) @@ -351,8 +333,7 @@ func ForViewer(ctx context.Context, contacts store.ContactStore, viewerUserID in if contacts == nil || viewerUserID == 0 || len(users) == 0 { return users, nil } - out := make([]domain.User, len(users)) - copy(out, users) + out := cloneUsers(users) cache := make(map[int64]domain.User, len(users)) for i := range out { u := out[i] @@ -386,8 +367,7 @@ func projectBatch(ctx context.Context, contacts store.ContactStore, photos Profi if len(users) == 0 { return users, nil } - out := make([]domain.User, len(users)) - copy(out, users) + out := cloneUsers(users) out = sanitizeDeletedUsers(out) ids := uniqueUserIDs(out) var ( @@ -619,12 +599,20 @@ func applyContactProjection(user domain.User, contact domain.Contact, found bool if contact.Phone != "" { user.Phone = contact.Phone } - if contact.User.FirstName != "" || contact.User.LastName != "" { + if contact.FirstName != "" || contact.LastName != "" { + // FirstName uses NULLIF at the durable read boundary while LastName is an + // explicit owner-local value. Preserve the base first name when only a + // local last name exists; setting a local first name with an empty last + // name intentionally clears the base last name. + if contact.FirstName != "" { + user.FirstName = contact.FirstName + user.LastName = contact.LastName + } else { + user.LastName = contact.LastName + } + } else if contact.User.FirstName != "" || contact.User.LastName != "" { user.FirstName = contact.User.FirstName user.LastName = contact.User.LastName - } else if contact.FirstName != "" || contact.LastName != "" { - user.FirstName = contact.FirstName - user.LastName = contact.LastName } return user } diff --git a/internal/app/userprojection/projection_sparse.go b/internal/app/userprojection/projection_sparse.go new file mode 100644 index 00000000..c4fabbe6 --- /dev/null +++ b/internal/app/userprojection/projection_sparse.go @@ -0,0 +1,179 @@ +package userprojection + +import ( + "context" + "errors" + + "golang.org/x/sync/errgroup" + + "telesrv/internal/domain" + "telesrv/internal/store" +) + +var ( + ErrSparseContactProjectionUnsupported = errors.New("sparse contact projection is not supported") + ErrSparsePrivacyProjectionUnsupported = errors.New("sparse privacy projection is not supported") +) + +// SparsePrivacyEvaluator evaluates only the supplied viewer->owner pairs. The +// inverse contact rows are supplied from the projector's shared sparse contact +// read so privacy does not issue another contact query. +type SparsePrivacyEvaluator interface { + CanSeeForViewerUserIDs( + ctx context.Context, + ownerUserIDsByViewer map[int64][]int64, + keys []domain.PrivacyKey, + contactsByOwner map[int64]map[int64]domain.Contact, + ) (map[int64]map[int64]map[domain.PrivacyKey]bool, error) +} + +// ForViewerUserIDs projects a sparse viewer->owner graph. Viewer-independent +// facts are loaded for the union once; viewer-specific facts are read only for +// graph edges that occur in the request (plus their inverse contact edge needed +// by privacy evaluation). +func (p *Projector) ForViewerUserIDs(ctx context.Context, userIDsByViewer map[int64][]int64, baseUsers []domain.User) (map[int64][]domain.User, error) { + requested := normalizeSparseUserIDs(userIDsByViewer) + out := make(map[int64][]domain.User, len(requested)) + if len(requested) == 0 { + return out, nil + } + baseUsers = sanitizeDeletedUsers(baseUsers) + baseByID := make(map[int64]domain.User, len(baseUsers)) + for _, user := range baseUsers { + if user.ID != 0 { + baseByID[user.ID] = user + } + } + if p == nil { + for viewerID, ids := range requested { + out[viewerID] = sparseBaseUsers(ids, baseByID) + } + return out, nil + } + unionIDs := make([]int64, 0, len(baseByID)) + seenUnion := make(map[int64]struct{}, len(baseByID)) + contactPairs := make(map[int64][]int64) + privacyPairs := make(map[int64][]int64) + for viewerID, ids := range requested { + for _, ownerID := range ids { + user, found := baseByID[ownerID] + if !found { + continue + } + if _, ok := seenUnion[ownerID]; !ok && !user.Deleted { + seenUnion[ownerID] = struct{}{} + unionIDs = append(unionIDs, ownerID) + } + if user.Deleted || ownerID == viewerID { + continue + } + // Personal-photo overlay applies independently of contact/privacy + // exemptions, so retain every real viewer->owner edge here. + contactPairs[viewerID] = append(contactPairs[viewerID], ownerID) + if ownerID == domain.OfficialSystemUserID || user.Bot { + continue + } + privacyPairs[viewerID] = append(privacyPairs[viewerID], ownerID) + // Privacy's ViewerIsContact is the inverse owner->viewer row. Merge it + // into the same exact-pair store call. + contactPairs[ownerID] = append(contactPairs[ownerID], viewerID) + } + } + + var ( + profileRefs map[int64]domain.ProfilePhotoRef + fallbackRefs map[int64]domain.ProfilePhotoRef + contactBatch domain.ContactProjectionBatch + visibility map[int64]map[int64]map[domain.PrivacyKey]bool + freezes map[int64]domain.AccountFreeze + ) + g, gctx := errgroup.WithContext(ctx) + g.Go(func() error { + var err error + profileRefs, fallbackRefs, err = p.batchProfileFallbackPhotos(gctx, unionIDs) + return err + }) + if p.contacts != nil && len(contactPairs) > 0 { + g.Go(func() error { + loader, ok := p.contacts.(store.SparseContactProjectionStore) + if !ok { + return ErrSparseContactProjectionUnsupported + } + var err error + contactBatch, err = loader.ContactProjectionForViewerUserIDs(gctx, contactPairs) + return err + }) + } + if p.freezes != nil && len(unionIDs) > 0 { + g.Go(func() error { + var err error + freezes, err = p.freezes.AccountFreezes(gctx, unionIDs) + return err + }) + } + if err := g.Wait(); err != nil { + return nil, err + } + if p.privacy != nil && len(privacyPairs) > 0 { + evaluator, ok := p.privacy.(SparsePrivacyEvaluator) + if !ok { + return nil, ErrSparsePrivacyProjectionUnsupported + } + var err error + visibility, err = evaluator.CanSeeForViewerUserIDs(ctx, privacyPairs, privacyProjectionKeys, contactBatch.Contacts) + if err != nil { + return nil, err + } + } + + for viewerID, ids := range requested { + projected := sparseBaseUsers(ids, baseByID) + personalRefs := contactBatch.PersonalPhotos[viewerID] + for i := range projected { + user := projected[i] + if user.Deleted { + projected[i] = user.DeletedTombstone() + continue + } + user = applyBasePhotos(user, profileRefs, fallbackRefs, personalRefs, viewerID) + if viewerID != 0 && user.ID != viewerID && user.ID != domain.OfficialSystemUserID && !user.Bot { + contact, found := contactBatch.Contacts[viewerID][user.ID] + user = applyContactProjection(user, contact, found) + var vis map[domain.PrivacyKey]bool + if visibility != nil { + vis = visibility[user.ID][viewerID] + } + var err error + user, err = applyPrivacy(ctx, p.privacy, viewerID, user, found && contact.Phone != "", vis, profileRefs, fallbackRefs, personalRefs) + if err != nil { + return nil, err + } + } + user = applyAccountFreezeProjection(user, viewerID, freezes[user.ID]) + projected[i] = user + } + out[viewerID] = projected + } + return out, nil +} + +func normalizeSparseUserIDs(in map[int64][]int64) map[int64][]int64 { + out := make(map[int64][]int64, len(in)) + for viewerID, ids := range in { + if viewerID == 0 { + continue + } + out[viewerID] = dedupNonZeroInt64(ids) + } + return out +} + +func sparseBaseUsers(ids []int64, baseByID map[int64]domain.User) []domain.User { + users := make([]domain.User, 0, len(ids)) + for _, id := range ids { + if user, ok := baseByID[id]; ok { + users = append(users, user) + } + } + return cloneUsers(users) +} diff --git a/internal/app/userprojection/projection_sparse_test.go b/internal/app/userprojection/projection_sparse_test.go new file mode 100644 index 00000000..c027a4f0 --- /dev/null +++ b/internal/app/userprojection/projection_sparse_test.go @@ -0,0 +1,115 @@ +package userprojection + +import ( + "context" + "reflect" + "testing" + + privacyapp "telesrv/internal/app/privacy" + "telesrv/internal/domain" + "telesrv/internal/store" + "telesrv/internal/store/memory" +) + +type recordingSparseContactStore struct { + store.ContactStore + sparseCalls int + denseCalls int + requested map[int64][]int64 +} + +func (s *recordingSparseContactStore) ContactProjectionForViewers(ctx context.Context, viewers, owners []int64) (domain.ContactProjectionBatch, error) { + s.denseCalls++ + return s.ContactStore.ContactProjectionForViewers(ctx, viewers, owners) +} + +func (s *recordingSparseContactStore) ContactProjectionForViewerUserIDs(ctx context.Context, requested map[int64][]int64) (domain.ContactProjectionBatch, error) { + s.sparseCalls++ + s.requested = make(map[int64][]int64, len(requested)) + for viewerID, ids := range requested { + s.requested[viewerID] = append([]int64(nil), ids...) + } + return s.ContactStore.(store.SparseContactProjectionStore).ContactProjectionForViewerUserIDs(ctx, requested) +} + +func TestForViewerUserIDsUsesActualPairsAndMatchesScalarProjection(t *testing.T) { + ctx := context.Background() + const ( + viewerA = int64(1101) + viewerB = int64(1102) + ownerA = int64(2101) + ownerB = int64(2102) + ) + contacts := memory.NewContactStore() + // Seed both requested and cross-viewer rows. A dense matrix would expose the + // cross aliases/photos; the sparse request must never ask for those pairs. + for _, input := range []struct { + viewer int64 + owner int64 + name string + photo int64 + }{ + {viewerA, ownerA, "A for viewer A", 9101}, + {viewerA, ownerB, "B cross leak", 9191}, + {viewerB, ownerB, "B for viewer B", 9102}, + {viewerB, ownerA, "A cross leak", 9192}, + // Reverse rows are the privacy ViewerIsContact facts. + {ownerA, viewerA, "viewer A", 0}, + {ownerB, viewerB, "viewer B", 0}, + } { + if _, err := contacts.Upsert(ctx, input.viewer, domain.ContactInput{ContactUserID: input.owner, FirstName: input.name}); err != nil { + t.Fatalf("upsert %d->%d: %v", input.viewer, input.owner, err) + } + if input.photo != 0 { + if _, _, err := contacts.SetPersonalPhoto(ctx, input.viewer, input.owner, input.photo, 100); err != nil { + t.Fatalf("personal photo %d->%d: %v", input.viewer, input.owner, err) + } + } + } + recording := &recordingSparseContactStore{ContactStore: contacts} + privacy := privacyapp.NewService(memory.NewPrivacyStore(), recording) + projector := New(WithContactStore(recording), WithPrivacyEvaluator(privacy)) + base := []domain.User{ + {ID: ownerA, AccessHash: 31, Phone: "15552101", FirstName: "Owner A"}, + {ID: ownerB, AccessHash: 32, Phone: "15552102", FirstName: "Owner B"}, + } + wantA, err := projector.ForViewer(ctx, viewerA, base[:1]) + if err != nil { + t.Fatalf("scalar viewer A: %v", err) + } + wantB, err := projector.ForViewer(ctx, viewerB, base[1:]) + if err != nil { + t.Fatalf("scalar viewer B: %v", err) + } + recording.sparseCalls = 0 + recording.denseCalls = 0 + recording.requested = nil + + got, err := projector.ForViewerUserIDs(ctx, map[int64][]int64{ + viewerA: {ownerA}, + viewerB: {ownerB}, + }, base) + if err != nil { + t.Fatalf("ForViewerUserIDs: %v", err) + } + if !reflect.DeepEqual(got[viewerA], wantA) || !reflect.DeepEqual(got[viewerB], wantB) { + t.Fatalf("sparse projection = %+v, want scalar A=%+v B=%+v", got, wantA, wantB) + } + if recording.sparseCalls != 1 || recording.denseCalls != 0 { + t.Fatalf("contact projection calls = sparse %d dense %d, want 1/0", recording.sparseCalls, recording.denseCalls) + } + wantPairs := map[int64][]int64{ + viewerA: {ownerA}, + viewerB: {ownerB}, + ownerA: {viewerA}, + ownerB: {viewerB}, + } + for viewerID, ids := range wantPairs { + if !reflect.DeepEqual(recording.requested[viewerID], ids) { + t.Fatalf("requested[%d] = %v, want %v (all=%+v)", viewerID, recording.requested[viewerID], ids, recording.requested) + } + } + if len(recording.requested) != len(wantPairs) { + t.Fatalf("requested pairs = %+v, contains unexpected cross-viewer edges", recording.requested) + } +} diff --git a/internal/app/userprojection/projection_test.go b/internal/app/userprojection/projection_test.go index e2ae6189..3e20bd37 100644 --- a/internal/app/userprojection/projection_test.go +++ b/internal/app/userprojection/projection_test.go @@ -10,6 +10,15 @@ import ( "telesrv/internal/store/memory" ) +func TestCloneUsersDoesNotSharePhotoStripped(t *testing.T) { + source := []domain.User{{ID: 1, PhotoStripped: []byte{1, 2, 3}}} + cloned := cloneUsers(source) + cloned[0].PhotoStripped[0] = 9 + if source[0].PhotoStripped[0] != 1 { + t.Fatalf("cloneUsers shared PhotoStripped backing storage: source=%v clone=%v", source[0].PhotoStripped, cloned[0].PhotoStripped) + } +} + func TestProjectorCombinesProfilePhotosAndViewerContacts(t *testing.T) { ctx := context.Background() const viewerID int64 = 1001 @@ -224,10 +233,8 @@ func TestProjectorAccountFreezeIsViewerScopedAndReversible(t *testing.T) { // TestForViewersEquivalentToForViewer 锁定 fan-out 模板化的核心安全网：ForViewers(viewers, users) // 的每个 viewer 切片必须与逐 viewer 的 ForViewer(viewer, users) 字节等价（隐私/改名/头像投影 -// 不能因 O(owner) 模板化而漂移泄漏）。**唯一允许的差异是 personal photo overlay**：v1 模板不做 -// per-viewer personal photo，故对「该 viewer 给该 owner 设过 personal photo」的对，比较前 mask 掉 -// 5 个头像字段；其余对做完整字节比较。覆盖：默认规则陌生人/联系人改名+电话/status 隐藏/profile -// 头像隐藏走 fallback/self/bot/系统账号/viewer 自身也作为 owner 出现。 +// 不能因批量模板化而漂移泄漏）。覆盖：默认规则陌生人/联系人改名+电话/personal photo/status +// 隐藏/profile 头像隐藏走 fallback/self/bot/系统账号/viewer 自身也作为 owner 出现。 func TestForViewersEquivalentToForViewer(t *testing.T) { ctx := context.Background() const ( @@ -248,7 +255,7 @@ func TestForViewersEquivalentToForViewer(t *testing.T) { if _, err := contacts.Upsert(ctx, v1, domain.ContactInput{ContactUserID: o2, Phone: "1111", FirstName: "Alice", LastName: "Friend"}); err != nil { t.Fatalf("upsert contact: %v", err) } - // v1 给 o2 设 personal photo（仅 v1 视角生效 → ForViewer 会带它，ForViewers v1 跳过 → 该对需 mask）。 + // v1 给 o2 设 personal photo：ForViewers 必须与 ForViewer 一样带出 viewer-specific 头像。 if _, _, err := contacts.SetPersonalPhoto(ctx, v1, o2, 9300, 300); err != nil { t.Fatalf("set personal photo: %v", err) } @@ -287,13 +294,13 @@ func TestForViewersEquivalentToForViewer(t *testing.T) { {ID: v1, AccessHash: 16, Phone: "15550000016", FirstName: "Viewer1"}, // viewer 自身也作为 owner 出现 } - // 哪些 (viewer, owner) 对存在 personal photo —— 比较时需 mask 头像字段（v1 模板有意跳过）。 - personalPairs := map[[2]int64]bool{{v1, o2}: true} - batch, err := projector.ForViewers(ctx, viewers, users) if err != nil { t.Fatalf("ForViewers: %v", err) } + if got := projectionUser(t, batch[v1], o2); got.PhotoID != 9300 || !got.PhotoPersonal { + t.Fatalf("fanout personal photo = id %d personal %v, want personal 9300", got.PhotoID, got.PhotoPersonal) + } for _, viewer := range viewers { want, err := projector.ForViewer(ctx, viewer, users) if err != nil { @@ -311,10 +318,6 @@ func TestForViewersEquivalentToForViewer(t *testing.T) { if w.ID != g.ID { t.Fatalf("viewer %d idx %d id mismatch got=%d want=%d", viewer, i, g.ID, w.ID) } - if personalPairs[[2]int64{viewer, w.ID}] { - maskPhoto(&w) - maskPhoto(&g) - } if !reflect.DeepEqual(w, g) { t.Fatalf("viewer %d owner %d: ForViewers != ForViewer\n got=%+v\nwant=%+v", viewer, w.ID, g, w) } @@ -322,14 +325,6 @@ func TestForViewersEquivalentToForViewer(t *testing.T) { } } -func maskPhoto(u *domain.User) { - u.PhotoID = 0 - u.PhotoDCID = 0 - u.PhotoStripped = nil - u.PhotoPersonal = false - u.PhotoHasVideo = false -} - func projectionUser(t *testing.T, users []domain.User, id int64) domain.User { t.Helper() for _, user := range users { diff --git a/internal/app/users/service.go b/internal/app/users/service.go index 54ac25ea..5df14e56 100644 --- a/internal/app/users/service.go +++ b/internal/app/users/service.go @@ -3,6 +3,7 @@ package users import ( "context" "errors" + "fmt" "strings" "time" "unicode/utf8" @@ -13,7 +14,14 @@ import ( ) // ErrNotAuthorized 表示当前 auth_key 尚未登录。 -var ErrNotAuthorized = errors.New("not authorized") +var ( + ErrNotAuthorized = errors.New("not authorized") + ErrSystemUserImmutable = errors.New("system user identity is immutable") + ErrBatchUsersLimit = errors.New("batch users limit exceeded") + ErrBatchViewerCells = errors.New("batch viewer projection cell limit exceeded") + ErrBatchUserMissing = errors.New("batch user projection source is incomplete") + ErrLastSeenBatchUnsupported = errors.New("last seen batch store unsupported") +) // ProfilePhotoProvider 批量返回用户当前头像（用于把 PhotoID/DCID/Stripped 富化到 domain.User）。 type ProfilePhotoProvider = userprojection.ProfilePhotoProvider @@ -93,6 +101,9 @@ const ( maxProfileAboutRunes = 70 maxProfileAboutRunesPremium = 140 maxBatchUsers = 1000 + // A dense fan-out materializes one complete domain.User per viewer/owner + // cell in both the result and the batch cache. Bound the retained graph. + maxBatchViewerProjectionCells = 131072 ) // NewService 创建用户服务。 @@ -161,6 +172,19 @@ func (s *Service) AdminUser(ctx context.Context, userID int64) (domain.User, boo return s.loadBaseUserByID(ctx, userID) } +// BotStatus returns only the immutable viewer-independent bot fact. Presence +// classification must not pay for contact/privacy/photo projection. +func (s *Service) BotStatus(ctx context.Context, userID int64) (bool, bool, error) { + if userID == 0 { + return false, false, nil + } + u, found, err := s.loadBaseUserByID(ctx, userID) + if err != nil || !found { + return false, found, err + } + return u.Bot, true, nil +} + // PrivacyBaseUsers returns viewer-independent bot/premium facts through the // shared base-user read model. Privacy uses this as a batched cold loader behind // its bounded process cache; no viewer projection is performed, avoiding a @@ -186,11 +210,11 @@ func (s *Service) ByIDs(ctx context.Context, currentUserID int64, userIDs []int6 if _, ok := seen[id]; ok { continue } + if len(ids) >= maxBatchUsers { + return nil, fmt.Errorf("%w: more than %d unique owners", ErrBatchUsersLimit, maxBatchUsers) + } seen[id] = struct{}{} ids = append(ids, id) - if len(ids) >= maxBatchUsers { - break - } } users, err := s.loadBaseUsersByIDs(ctx, ids) if err != nil { @@ -200,22 +224,68 @@ func (s *Service) ByIDs(ctx context.Context, currentUserID int64, userIDs []int6 } // ByIDsForViewers 跨多个 viewer 批量投影同一组 user（fan-out 模板化）：base user 只加载一次， -// 隐私/改名/头像投影经 userprojection.ForViewers 压成 O(owner) 查询。返回 map[viewerID][]User， -// 每个切片与 ByIDs(viewer, ids) 字节等价——**唯一例外是 personal photo overlay**（ForViewers v1 -// 跳过，客户端下次 getChannelDifference/getHistory 自愈）。供 channel fan-out 预热每 viewer 投影， +// 隐私/改名/头像投影经 userprojection.ForViewers 收敛成批量查询。返回 map[viewerID][]User， +// 每个切片与 ByIDs(viewer, ids) 字节等价，包含 viewer-specific personal photo overlay。 +// 供 channel fan-out 预热每 viewer 投影， // 把 per-recipient 的 ByIDs(=ForViewer) 折叠成一次跨 viewer 投影。不做 ByIDs 的单 caller 鉴权 // （viewer 是 fan-out 收件人集合，非 RPC 调用方）。 func (s *Service) ByIDsForViewers(ctx context.Context, viewerUserIDs []int64, userIDs []int64) (map[int64][]domain.User, error) { if len(viewerUserIDs) == 0 || len(userIDs) == 0 { return map[int64][]domain.User{}, nil } - ids := uniqueUserIDs(userIDs, maxBatchUsers) + ids := uniqueUserIDs(userIDs, 0) + if len(ids) > maxBatchUsers { + return nil, fmt.Errorf("%w: got %d unique owners, maximum %d", ErrBatchUsersLimit, len(ids), maxBatchUsers) + } + viewers := uniqueUserIDs(viewerUserIDs, 0) + if !batchViewerProjectionCellsAllowed(len(viewers), len(ids)) { + return nil, fmt.Errorf("%w: got %d viewers x %d owners, maximum %d cells", ErrBatchViewerCells, len(viewers), len(ids), maxBatchViewerProjectionCells) + } base, err := s.loadBaseUsersByIDs(ctx, ids) if err != nil { return nil, err } + base, err = requireBatchBaseUsers(ids, base) + if err != nil { + return nil, err + } // projector 为 nil 时 ForViewers 返回各 viewer 的原始 base 副本（与 projectUsers 的 nil 分支一致）。 - return s.projector.ForViewers(ctx, viewerUserIDs, base) + return s.projector.ForViewers(ctx, viewers, base) +} + +func batchViewerProjectionCellsAllowed(viewers, owners int) bool { + if viewers <= 0 || owners <= 0 { + return true + } + // Division avoids overflow from viewers*owners on hostile inputs. + return viewers <= maxBatchViewerProjectionCells/owners +} + +// requireBatchBaseUsers turns the fan-out projection API into a complete +// envelope contract. Deleted users remain durable tombstones and therefore +// still appear in base; a truly missing referenced user must fail closed rather +// than produce a message whose sender cannot be resolved. System users are +// protocol-local constants and do not require a backing users row. +func requireBatchBaseUsers(ids []int64, base []domain.User) ([]domain.User, error) { + byID := make(map[int64]domain.User, len(base)) + for _, user := range base { + if user.ID != 0 { + byID[user.ID] = user + } + } + out := make([]domain.User, 0, len(ids)) + for _, id := range ids { + if user, ok := byID[id]; ok { + out = append(out, user) + continue + } + if system, ok := domain.SystemUserByID(id); ok { + out = append(out, system) + continue + } + return nil, fmt.Errorf("%w: user_id=%d", ErrBatchUserMissing, id) + } + return out, nil } // CheckUsername 校验当前用户是否可以占用 username。 @@ -277,35 +347,6 @@ func (s *Service) UpdateUsername(ctx context.Context, userID int64, username str return s.projectOne(ctx, self.ID, u) } -// SetPhone force-sets a user's phone number (admin use -- no code -// verification, unlike the user-facing verified change-phone flow in -// internal/app/account). Pre-checks availability via ByPhone before writing, -// on top of the store's own unique-constraint backstop. -func (s *Service) SetPhone(ctx context.Context, userID int64, phone string) (domain.User, error) { - self, err := s.loadSelf(ctx, userID) - if err != nil { - return domain.User{}, err - } - phone = domain.NormalizePhone(strings.TrimSpace(phone)) - if !domain.ValidPhone(phone) { - return domain.User{}, domain.ErrPhoneNumberInvalid - } - if phone == self.Phone { - return s.projectOne(ctx, self.ID, self) - } - if existing, found, err := s.users.ByPhone(ctx, phone); err != nil { - return domain.User{}, err - } else if found && existing.ID != self.ID { - return domain.User{}, domain.ErrPhoneNumberOccupied - } - u, err := s.users.UpdatePhone(ctx, self.ID, phone) - if err != nil { - return domain.User{}, err - } - s.refreshCachedUsers(ctx, u) - return s.projectOne(ctx, self.ID, u) -} - // UpdateProfile 修改当前用户的基础资料。未设置的字段保持原值。 func (s *Service) UpdateProfile(ctx context.Context, userID int64, update domain.UserProfileUpdate) (domain.User, error) { self, err := s.loadSelf(ctx, userID) @@ -345,6 +386,37 @@ func (s *Service) UpdateProfile(ctx context.Context, userID int64, update domain return s.projectOne(ctx, self.ID, u) } +// SetPhone force-sets the authoritative phone for the trusted admin path. It +// remains a non-PTS profile mutation because updateUserPhone and updateUser +// carry no pts/pts_count in every admitted exact layer. +func (s *Service) SetPhone(ctx context.Context, userID int64, phone string) (domain.User, error) { + self, err := s.loadSelf(ctx, userID) + if err != nil { + return domain.User{}, err + } + if self.Bot || domain.IsSystemUserID(self.ID) { + return domain.User{}, domain.ErrPhoneChangeForbidden + } + phone = domain.NormalizePhone(strings.TrimSpace(phone)) + if !domain.ValidPhone(phone) { + return domain.User{}, domain.ErrPhoneNumberInvalid + } + if phone == self.Phone { + return s.projectOne(ctx, self.ID, self) + } + if existing, found, err := s.users.ByPhone(ctx, phone); err != nil { + return domain.User{}, err + } else if found && existing.ID != self.ID { + return domain.User{}, domain.ErrPhoneNumberOccupied + } + u, err := s.users.UpdatePhone(ctx, self.ID, phone) + if err != nil { + return domain.User{}, err + } + s.refreshCachedUsers(ctx, u) + return s.projectOne(ctx, self.ID, u) +} + // UpdateLastSeen records the latest visible account activity time. func (s *Service) UpdateLastSeen(ctx context.Context, userID int64, lastSeenAt int) error { if userID == 0 { @@ -360,6 +432,45 @@ func (s *Service) UpdateLastSeen(ctx context.Context, userID int64, lastSeenAt i return nil } +// UpdateLastSeenBatch is the production lifecycle-presence write boundary. It +// requires a real batch-capable store: silently looping over UpdateLastSeen +// would recreate the exact per-account transaction fan-out this API exists to +// remove. The cache delete is part of batch completion; callers may retry the +// whole idempotent batch when Redis is temporarily unavailable. +func (s *Service) UpdateLastSeenBatch(ctx context.Context, updates []store.UserLastSeenUpdate) error { + batch, ok := s.users.(store.UserLastSeenBatchStore) + if !ok { + return ErrLastSeenBatchUnsupported + } + latest := make(map[int64]int, len(updates)) + for _, update := range updates { + if update.UserID == 0 || update.LastSeenAt <= 0 { + continue + } + if current := latest[update.UserID]; update.LastSeenAt > current { + latest[update.UserID] = update.LastSeenAt + } + } + if len(latest) == 0 { + return nil + } + merged := make([]store.UserLastSeenUpdate, 0, len(latest)) + userIDs := make([]int64, 0, len(latest)) + for userID, lastSeenAt := range latest { + merged = append(merged, store.UserLastSeenUpdate{UserID: userID, LastSeenAt: lastSeenAt}) + userIDs = append(userIDs, userID) + } + if err := batch.UpdateLastSeenBatch(ctx, merged); err != nil { + return err + } + if s.cache != nil { + if err := s.cache.Delete(ctx, userIDs); err != nil { + return fmt.Errorf("invalidate last seen batch user cache: %w", err) + } + } + return nil +} + // PremiumActive 报告用户当前是否有效会员。走基础用户缓存路径、不做 viewer // 投影，供限额双档判断（pin 上限、reaction 上限、bio 长度等）低成本调用。 func (s *Service) PremiumActive(ctx context.Context, userID int64) bool { @@ -412,6 +523,9 @@ func (s *Service) SetVerified(ctx context.Context, userID int64, verified bool) if userID == 0 { return domain.User{}, ErrNotAuthorized } + if domain.IsSystemUserID(userID) && !verified { + return domain.User{}, ErrSystemUserImmutable + } u, found, err := s.users.ByID(ctx, userID) if err != nil { return domain.User{}, err @@ -630,6 +744,7 @@ func (s *Service) ResolveUsername(ctx context.Context, currentUserID int64, user return domain.User{}, false, err } username = normalizeUsername(username) + _, reservedSystemUsername := domain.SystemUserByUsername(username) // Resolution covers both the editable username slot (5..32) and // Fragment-style collectible usernames (4..32). Keep the stricter // validUsername check on create/update paths; only lookup accepts the @@ -638,8 +753,7 @@ func (s *Service) ResolveUsername(ctx context.Context, currentUserID int64, user // server-controlled handles, not user input -- but still resolve through // the normal DB-backed path below, so caching/projection/hidden-bot // handling stay exactly as for any other account. - _, isSystemUsername := domain.SystemUserByUsername(username) - if !isSystemUsername && !domain.ValidCollectibleUsername(username) { + if !reservedSystemUsername && !domain.ValidCollectibleUsername(username) { return domain.User{}, false, domain.ErrUsernameInvalid } u, found, err := s.users.ByUsername(ctx, username) @@ -664,7 +778,7 @@ func (s *Service) ResolvePhone(ctx context.Context, currentUserID int64, phone s if _, err := s.loadSelf(ctx, currentUserID); err != nil { return domain.User{}, false, err } - phone = normalizePhone(phone) + phone = domain.NormalizePhone(phone) if phone == "" { return domain.User{}, false, domain.ErrPhoneNotOccupied } @@ -721,7 +835,10 @@ func (s *Service) loadBaseUserByID(ctx context.Context, userID int64) (domain.Us } func (s *Service) loadBaseUsersByIDs(ctx context.Context, userIDs []int64) ([]domain.User, error) { - ids := uniqueUserIDs(userIDs, maxBatchUsers) + ids := uniqueUserIDs(userIDs, maxBatchUsers+1) + if len(ids) > maxBatchUsers { + return nil, fmt.Errorf("%w: more than %d unique owners", ErrBatchUsersLimit, maxBatchUsers) + } if len(ids) == 0 { return nil, nil } @@ -799,6 +916,15 @@ func (s *Service) dropCachedUsers(ctx context.Context, userIDs ...int64) { _ = s.cache.Delete(ctx, userIDs) } +// InvalidateUsers drops viewer-independent user snapshots after an aggregate +// transaction updates users without passing through this service. +func (s *Service) InvalidateUsers(ctx context.Context, userIDs ...int64) { + if s == nil { + return + } + s.dropCachedUsers(ctx, userIDs...) +} + func uniqueUserIDs(ids []int64, limit int) []int64 { if len(ids) == 0 { return nil @@ -857,18 +983,3 @@ func validUsername(username string) bool { } return true } - -func normalizePhone(phone string) string { - phone = strings.TrimSpace(phone) - if phone == "" { - return "" - } - var b strings.Builder - b.Grow(len(phone)) - for _, r := range phone { - if r >= '0' && r <= '9' { - b.WriteRune(r) - } - } - return b.String() -} diff --git a/internal/app/users/service_sparse.go b/internal/app/users/service_sparse.go new file mode 100644 index 00000000..876453c9 --- /dev/null +++ b/internal/app/users/service_sparse.go @@ -0,0 +1,58 @@ +package users + +import ( + "context" + "fmt" + + "telesrv/internal/domain" +) + +// ByIDsForViewerUserIDs projects an actual sparse viewer->owner graph. Base +// users are loaded once for the union; unlike ByIDsForViewers, owners belonging +// to one viewer are never implicitly projected for every other viewer. +func (s *Service) ByIDsForViewerUserIDs(ctx context.Context, userIDsByViewer map[int64][]int64) (map[int64][]domain.User, error) { + requested := make(map[int64][]int64, len(userIDsByViewer)) + union := make([]int64, 0) + seenUnion := make(map[int64]struct{}) + pairs := 0 + for viewerID, userIDs := range userIDsByViewer { + if viewerID == 0 { + continue + } + ids := uniqueUserIDs(userIDs, 0) + if !sparseViewerProjectionPairsAllowed(pairs, len(ids)) { + return nil, fmt.Errorf("%w: got more than %d sparse pairs", ErrBatchViewerCells, maxBatchViewerProjectionCells) + } + pairs += len(ids) + requested[viewerID] = ids + for _, id := range ids { + if _, ok := seenUnion[id]; ok { + continue + } + seenUnion[id] = struct{}{} + union = append(union, id) + if len(union) > maxBatchUsers { + return nil, ErrBatchUsersLimit + } + } + } + if len(requested) == 0 || len(union) == 0 { + return map[int64][]domain.User{}, nil + } + base, err := s.loadBaseUsersByIDs(ctx, union) + if err != nil { + return nil, err + } + base, err = requireBatchBaseUsers(union, base) + if err != nil { + return nil, err + } + return s.projector.ForViewerUserIDs(ctx, requested, base) +} + +func sparseViewerProjectionPairsAllowed(current, additional int) bool { + if current < 0 || additional < 0 || current > maxBatchViewerProjectionCells { + return false + } + return additional <= maxBatchViewerProjectionCells-current +} diff --git a/internal/app/users/service_sparse_test.go b/internal/app/users/service_sparse_test.go new file mode 100644 index 00000000..e500c236 --- /dev/null +++ b/internal/app/users/service_sparse_test.go @@ -0,0 +1,138 @@ +package users + +import ( + "context" + "errors" + "sort" + "testing" + + privacyapp "telesrv/internal/app/privacy" + "telesrv/internal/domain" + "telesrv/internal/store" + "telesrv/internal/store/memory" +) + +type countingSparseBaseUserStore struct { + store.UserStore + byIDsCalls int + byIDs []int64 +} + +func (s *countingSparseBaseUserStore) ByIDs(ctx context.Context, ids []int64) ([]domain.User, error) { + s.byIDsCalls++ + s.byIDs = append([]int64(nil), ids...) + return s.UserStore.ByIDs(ctx, ids) +} + +type countingSparsePhotoProvider struct { + profile map[int64]domain.ProfilePhotoRef + profileCalls int + fallbackCalls int +} + +func (p *countingSparsePhotoProvider) CurrentProfilePhotos(ctx context.Context, ownerType domain.PeerType, ids []int64) (map[int64]domain.ProfilePhotoRef, error) { + return p.CurrentProfilePhotosKind(ctx, ownerType, ids, domain.ProfilePhotoKindProfile) +} + +func (p *countingSparsePhotoProvider) CurrentProfilePhotosKind(_ context.Context, _ domain.PeerType, ids []int64, kind domain.ProfilePhotoKind) (map[int64]domain.ProfilePhotoRef, error) { + if kind == domain.ProfilePhotoKindFallback { + p.fallbackCalls++ + return map[int64]domain.ProfilePhotoRef{}, nil + } + p.profileCalls++ + out := make(map[int64]domain.ProfilePhotoRef, len(ids)) + for _, id := range ids { + if ref, ok := p.profile[id]; ok { + out[id] = ref + } + } + return out, nil +} + +func TestByIDsForViewerUserIDsLoadsUnionOnceAndPreservesViewerSemantics(t *testing.T) { + ctx := context.Background() + base := memory.NewUserStore() + viewerA, _ := base.Create(ctx, domain.User{Phone: "15550001", FirstName: "Viewer A"}) + viewerB, _ := base.Create(ctx, domain.User{Phone: "15550002", FirstName: "Viewer B"}) + ownerA, _ := base.Create(ctx, domain.User{Phone: "15550101", FirstName: "Owner A"}) + ownerB, _ := base.Create(ctx, domain.User{Phone: "15550102", FirstName: "Owner B"}) + contacts := memory.NewContactStore() + if _, err := contacts.Upsert(ctx, viewerA.ID, domain.ContactInput{ContactUserID: ownerA.ID, FirstName: "Alias A", Phone: "local-a"}); err != nil { + t.Fatal(err) + } + if _, err := contacts.Upsert(ctx, viewerB.ID, domain.ContactInput{ContactUserID: ownerB.ID, FirstName: "Alias B"}); err != nil { + t.Fatal(err) + } + if _, found, err := contacts.SetPersonalPhoto(ctx, viewerA.ID, ownerA.ID, 9901, 1); err != nil || !found { + t.Fatalf("SetPersonalPhoto: found=%v err=%v", found, err) + } + rules := memory.NewPrivacyStore() + privacy := privacyapp.NewService(rules, contacts) + if _, err := privacy.SetRules(ctx, ownerA.ID, domain.PrivacyKeyPhoneNumber, []domain.PrivacyRule{{Kind: domain.PrivacyRuleDisallowAll}}); err != nil { + t.Fatal(err) + } + if _, err := privacy.SetRules(ctx, ownerB.ID, domain.PrivacyKeyPhoneNumber, []domain.PrivacyRule{{Kind: domain.PrivacyRuleAllowAll}}); err != nil { + t.Fatal(err) + } + countingUsers := &countingSparseBaseUserStore{UserStore: base} + photos := &countingSparsePhotoProvider{profile: map[int64]domain.ProfilePhotoRef{ + viewerA.ID: {PhotoID: 9801, DCID: 2}, viewerB.ID: {PhotoID: 9802, DCID: 2}, + ownerA.ID: {PhotoID: 9811, DCID: 2}, ownerB.ID: {PhotoID: 9812, DCID: 2}, + }} + svc := NewService(countingUsers, WithContactStore(contacts), WithPrivacyEvaluator(privacy), WithPhotoProvider(photos)) + got, err := svc.ByIDsForViewerUserIDs(ctx, map[int64][]int64{ + viewerA.ID: {ownerA.ID, viewerA.ID}, + viewerB.ID: {ownerB.ID, viewerB.ID}, + }) + if err != nil { + t.Fatalf("ByIDsForViewerUserIDs: %v", err) + } + if countingUsers.byIDsCalls != 1 { + t.Fatalf("base ByIDs calls = %d, want one union load", countingUsers.byIDsCalls) + } + sort.Slice(countingUsers.byIDs, func(i, j int) bool { return countingUsers.byIDs[i] < countingUsers.byIDs[j] }) + wantIDs := []int64{viewerA.ID, viewerB.ID, ownerA.ID, ownerB.ID} + sort.Slice(wantIDs, func(i, j int) bool { return wantIDs[i] < wantIDs[j] }) + if len(countingUsers.byIDs) != len(wantIDs) { + t.Fatalf("base ids = %v, want %v", countingUsers.byIDs, wantIDs) + } + for i := range wantIDs { + if countingUsers.byIDs[i] != wantIDs[i] { + t.Fatalf("base ids = %v, want %v", countingUsers.byIDs, wantIDs) + } + } + if photos.profileCalls != 1 || photos.fallbackCalls != 1 { + t.Fatalf("photo reads = profile %d fallback %d, want one each", photos.profileCalls, photos.fallbackCalls) + } + a := got[viewerA.ID][0] + if a.ID != ownerA.ID || a.FirstName != "Alias A" || a.Phone != "local-a" || a.PhotoID != 9901 || !a.PhotoPersonal { + t.Fatalf("viewer A owner projection = %+v", a) + } + selfA := got[viewerA.ID][1] + if selfA.ID != viewerA.ID || selfA.FirstName != "Viewer A" || selfA.Phone != "15550001" || selfA.PhotoID != 9801 { + t.Fatalf("viewer A self projection = %+v", selfA) + } + b := got[viewerB.ID][0] + if b.ID != ownerB.ID || b.FirstName != "Alias B" || b.Phone != "15550102" || b.PhotoID != 9812 || b.PhotoPersonal { + t.Fatalf("viewer B owner projection = %+v", b) + } + selfB := got[viewerB.ID][1] + if selfB.ID != viewerB.ID || selfB.FirstName != "Viewer B" || selfB.Phone != "15550002" || selfB.PhotoID != 9802 { + t.Fatalf("viewer B self projection = %+v", selfB) + } +} + +func TestByIDsForViewerUserIDsRejectsMissingReferencedUserAndPairOverflow(t *testing.T) { + svc := NewService(memory.NewUserStore()) + if _, err := svc.ByIDsForViewerUserIDs(context.Background(), map[int64][]int64{ + 1001: {2001}, + }); !errors.Is(err, ErrBatchUserMissing) { + t.Fatalf("missing referenced user err = %v, want ErrBatchUserMissing", err) + } + if !sparseViewerProjectionPairsAllowed(maxBatchViewerProjectionCells-1, 1) { + t.Fatal("sparse pair admission rejected the exact boundary") + } + if sparseViewerProjectionPairsAllowed(maxBatchViewerProjectionCells, 1) { + t.Fatal("sparse pair admission accepted a batch above the boundary") + } +} diff --git a/internal/app/users/service_test.go b/internal/app/users/service_test.go index cb33b6e6..1f26680a 100644 --- a/internal/app/users/service_test.go +++ b/internal/app/users/service_test.go @@ -8,6 +8,7 @@ import ( privacyapp "telesrv/internal/app/privacy" "telesrv/internal/domain" + "telesrv/internal/store" "telesrv/internal/store/memory" ) @@ -160,6 +161,84 @@ func TestResolveUsernameHidesMarksbotWhenThirdPartyVerificationHidden(t *testing } } +func TestByIDsForViewersRejectsOwnerSetAboveBound(t *testing.T) { + svc := NewService(memory.NewUserStore()) + ids := make([]int64, maxBatchUsers+1) + for i := range ids { + ids[i] = int64(i + 1) + } + if _, err := svc.ByIDsForViewers(context.Background(), []int64{1}, ids); !errors.Is(err, ErrBatchUsersLimit) { + t.Fatalf("ByIDsForViewers err = %v, want ErrBatchUsersLimit", err) + } +} + +func TestByIDsRejectsOwnerSetAboveBoundInsteadOfTruncating(t *testing.T) { + svc := NewService(memory.NewUserStore()) + ids := make([]int64, maxBatchUsers+1) + for i := range ids { + ids[i] = int64(i + 1) + } + if _, err := svc.ByIDs(context.Background(), 1, ids); !errors.Is(err, ErrBatchUsersLimit) { + t.Fatalf("ByIDs err = %v, want ErrBatchUsersLimit", err) + } +} + +func TestBotStatusReadsViewerIndependentBaseFact(t *testing.T) { + ctx := context.Background() + base := memory.NewUserStore() + bot, err := base.Create(ctx, domain.User{AccessHash: 1, Phone: "15550000077", FirstName: "Bot", Bot: true}) + if err != nil { + t.Fatal(err) + } + svc := NewService(base) + got, found, err := svc.BotStatus(ctx, bot.ID) + if err != nil || !found || !got { + t.Fatalf("BotStatus = %v, found=%v, err=%v", got, found, err) + } + if got, found, err := svc.BotStatus(ctx, bot.ID+1000); err != nil || found || got { + t.Fatalf("missing BotStatus = %v, found=%v, err=%v", got, found, err) + } +} + +func TestPrivacyBaseUsersRejectsViewerSetAboveBoundInsteadOfNegativeCachingTruncation(t *testing.T) { + svc := NewService(memory.NewUserStore()) + ids := make([]int64, maxBatchUsers+1) + for i := range ids { + ids[i] = int64(i + 1) + } + if _, err := svc.PrivacyBaseUsers(context.Background(), ids); !errors.Is(err, ErrBatchUsersLimit) { + t.Fatalf("PrivacyBaseUsers err = %v, want ErrBatchUsersLimit", err) + } +} + +func TestByIDsForViewersRejectsDenseCellSetAboveBound(t *testing.T) { + svc := NewService(memory.NewUserStore()) + owners := make([]int64, maxBatchUsers) + for i := range owners { + owners[i] = int64(i + 1) + } + viewers := make([]int64, maxBatchViewerProjectionCells/maxBatchUsers+1) + for i := range viewers { + viewers[i] = int64(10_000 + i) + } + if _, err := svc.ByIDsForViewers(context.Background(), viewers, owners); !errors.Is(err, ErrBatchViewerCells) { + t.Fatalf("ByIDsForViewers err = %v, want ErrBatchViewerCells", err) + } + if !batchViewerProjectionCellsAllowed(1, maxBatchViewerProjectionCells) { + t.Fatal("cell limit rejected exact boundary") + } + if batchViewerProjectionCellsAllowed(2, maxBatchViewerProjectionCells) { + t.Fatal("cell limit accepted overflow boundary") + } +} + +func TestByIDsForViewersRejectsMissingReferencedUser(t *testing.T) { + svc := NewService(memory.NewUserStore()) + if _, err := svc.ByIDsForViewers(context.Background(), []int64{1001}, []int64{2001}); !errors.Is(err, ErrBatchUserMissing) { + t.Fatalf("ByIDsForViewers err = %v, want ErrBatchUserMissing", err) + } +} + func TestResolvePhoneHonorsAddedByPhone(t *testing.T) { ctx := context.Background() users := memory.NewUserStore() @@ -434,6 +513,48 @@ func TestServiceUsesBaseCacheWithoutCachingViewerOverlay(t *testing.T) { } } +func TestServiceUpdateLastSeenBatchIsMonotonicAndInvalidatesOnce(t *testing.T) { + ctx := context.Background() + base := memory.NewUserStore() + first, err := base.Create(ctx, domain.User{AccessHash: 1, Phone: "15550000881", FirstName: "First"}) + if err != nil { + t.Fatalf("create first: %v", err) + } + second, err := base.Create(ctx, domain.User{AccessHash: 2, Phone: "15550000882", FirstName: "Second"}) + if err != nil { + t.Fatalf("create second: %v", err) + } + cache := newMemoryBaseUserCache() + if err := cache.PutMany(ctx, []domain.User{first, second}); err != nil { + t.Fatalf("prime cache: %v", err) + } + svc := NewService(base, WithBaseUserCache(cache)) + if err := svc.UpdateLastSeenBatch(ctx, []store.UserLastSeenUpdate{ + {UserID: second.ID, LastSeenAt: 20}, + {UserID: first.ID, LastSeenAt: 9}, + {UserID: first.ID, LastSeenAt: 17}, + }); err != nil { + t.Fatalf("UpdateLastSeenBatch: %v", err) + } + loadedFirst, found, err := base.ByID(ctx, first.ID) + if err != nil || !found || loadedFirst.LastSeenAt != 17 { + t.Fatalf("first last seen = %d found=%v err=%v, want 17", loadedFirst.LastSeenAt, found, err) + } + loadedSecond, found, err := base.ByID(ctx, second.ID) + if err != nil || !found || loadedSecond.LastSeenAt != 20 { + t.Fatalf("second last seen = %d found=%v err=%v, want 20", loadedSecond.LastSeenAt, found, err) + } + if cache.deleteCalls != 1 { + t.Fatalf("cache delete calls = %d, want one batch invalidation", cache.deleteCalls) + } + if _, ok := cache.users[first.ID]; ok { + t.Fatal("first user remained cached") + } + if _, ok := cache.users[second.ID]; ok { + t.Fatal("second user remained cached") + } +} + func TestServiceRefreshesBaseCacheAfterProfileUpdate(t *testing.T) { ctx := context.Background() base := memory.NewUserStore() @@ -507,6 +628,9 @@ func TestServiceSetVerifiedRefreshesBaseCache(t *testing.T) { if cleared.Verified { t.Fatalf("cleared verified = true, want false") } + if _, err := svc.SetVerified(ctx, domain.OfficialSystemUserID, false); !errors.Is(err, ErrSystemUserImmutable) { + t.Fatalf("clear system user verified err=%v, want ErrSystemUserImmutable", err) + } } func TestServiceRefreshesBaseCacheAfterColorUpdate(t *testing.T) { @@ -612,7 +736,8 @@ func (s *countingUserStore) ByIDs(ctx context.Context, ids []int64) ([]domain.Us } type memoryBaseUserCache struct { - users map[int64]domain.User + users map[int64]domain.User + deleteCalls int } func newMemoryBaseUserCache() *memoryBaseUserCache { @@ -639,6 +764,7 @@ func (c *memoryBaseUserCache) PutMany(_ context.Context, users []domain.User) er } func (c *memoryBaseUserCache) Delete(_ context.Context, ids []int64) error { + c.deleteCalls++ for _, id := range ids { delete(c.users, id) } diff --git a/internal/app/welcomemessages/service.go b/internal/app/welcomemessages/service.go new file mode 100644 index 00000000..d5be5480 --- /dev/null +++ b/internal/app/welcomemessages/service.go @@ -0,0 +1,121 @@ +package welcomemessages + +import ( + "context" + "time" + + "telesrv/internal/domain" + "telesrv/internal/store" +) + +type ChannelAccess interface { + ResolveChannel(ctx context.Context, userID, channelID int64) (domain.ChannelView, error) +} + +type Option func(*Service) + +func WithClock(now func() time.Time) Option { + return func(s *Service) { + if now != nil { + s.now = now + } + } +} + +type Service struct { + messages store.WelcomeMessageStore + channels ChannelAccess + now func() time.Time +} + +func NewService(messages store.WelcomeMessageStore, channels ChannelAccess, options ...Option) *Service { + s := &Service{messages: messages, channels: channels, now: time.Now} + for _, option := range options { + if option != nil { + option(s) + } + } + return s +} + +// Authorize is the cheap gate RPC uses before resolving upload/media/rich +// content. Mutations call authorize again immediately before the store write so +// a concurrent demotion cannot turn this preflight into a stale capability. +func (s *Service) Authorize(ctx context.Context, userID int64, peer domain.Peer) error { + return s.authorize(ctx, userID, peer) +} + +func (s *Service) Create(ctx context.Context, userID int64, peer domain.Peer, randomID int64, content domain.WelcomeMessageContent) (domain.WelcomeMessage, bool, error) { + if err := s.authorize(ctx, userID, peer); err != nil { + return domain.WelcomeMessage{}, false, err + } + if err := content.Validate(); err != nil { + return domain.WelcomeMessage{}, false, err + } + fingerprint, err := domain.WelcomeCreateFingerprint(peer, userID, randomID, content) + if err != nil { + return domain.WelcomeMessage{}, false, domain.ErrWelcomeMessageInvalid + } + return s.messages.CreateWelcomeMessage(ctx, domain.CreateWelcomeMessageRequest{ + Peer: peer, CreatorUserID: userID, Date: int(s.now().Unix()), RandomID: randomID, + Content: content, CreateFingerprint: fingerprint, + }) +} + +func (s *Service) Edit(ctx context.Context, userID int64, peer domain.Peer, id int, fields domain.WelcomeMessageEditFields) (domain.WelcomeMessage, error) { + if err := s.authorize(ctx, userID, peer); err != nil { + return domain.WelcomeMessage{}, err + } + return s.messages.EditWelcomeMessage(ctx, domain.EditWelcomeMessageRequest{ + Peer: peer, ID: id, EditDate: int(s.now().Unix()), Fields: fields, + }) +} + +func (s *Service) List(ctx context.Context, userID int64, peer domain.Peer, hash int64) (domain.WelcomeMessageList, error) { + if err := s.authorize(ctx, userID, peer); err != nil { + return domain.WelcomeMessageList{}, err + } + return s.messages.ListWelcomeMessages(ctx, peer, hash) +} + +func (s *Service) Delete(ctx context.Context, userID int64, peer domain.Peer, id int) (bool, error) { + if err := s.authorize(ctx, userID, peer); err != nil { + return false, err + } + return s.messages.DeleteWelcomeMessage(ctx, peer, id) +} + +func (s *Service) DeleteAll(ctx context.Context, userID int64, peer domain.Peer) (bool, error) { + if err := s.authorize(ctx, userID, peer); err != nil { + return false, err + } + return s.messages.DeleteAllWelcomeMessages(ctx, peer) +} + +// HasAny is used only after the ordinary full-chat access check has succeeded. +// It deliberately does not require manage_welcome_messages so non-admin members +// receive the same has_welcome_messages projection as official clients. +func (s *Service) HasAny(ctx context.Context, peer domain.Peer) (bool, error) { + if s == nil || s.messages == nil || peer.Type != domain.PeerTypeChannel || peer.ID <= 0 { + return false, domain.ErrWelcomeMessageInvalid + } + return s.messages.HasWelcomeMessages(ctx, peer) +} + +func (s *Service) authorize(ctx context.Context, userID int64, peer domain.Peer) error { + if s == nil || s.messages == nil || s.channels == nil || userID <= 0 || + peer.Type != domain.PeerTypeChannel || peer.ID <= 0 { + return domain.ErrWelcomeMessageInvalid + } + view, err := s.channels.ResolveChannel(ctx, userID, peer.ID) + if err != nil { + return err + } + if view.Channel.Monoforum { + return domain.ErrWelcomeMessagePeerInvalid + } + if !view.Self.CanManageWelcomeMessages() { + return domain.ErrWelcomeMessageForbidden + } + return nil +} diff --git a/internal/app/welcomemessages/service_test.go b/internal/app/welcomemessages/service_test.go new file mode 100644 index 00000000..004aad7a --- /dev/null +++ b/internal/app/welcomemessages/service_test.go @@ -0,0 +1,96 @@ +package welcomemessages + +import ( + "context" + "errors" + "testing" + "time" + + "telesrv/internal/domain" +) + +type welcomeStoreSpy struct { + creates int +} + +func (s *welcomeStoreSpy) CreateWelcomeMessage(_ context.Context, req domain.CreateWelcomeMessageRequest) (domain.WelcomeMessage, bool, error) { + s.creates++ + return domain.WelcomeMessage{ + ID: 1, Peer: req.Peer, CreatorUserID: req.CreatorUserID, Date: req.Date, + RandomID: req.RandomID, Content: req.Content, CreateFingerprint: req.CreateFingerprint, Version: 1, + }, true, nil +} +func (*welcomeStoreSpy) EditWelcomeMessage(context.Context, domain.EditWelcomeMessageRequest) (domain.WelcomeMessage, error) { + return domain.WelcomeMessage{}, nil +} +func (*welcomeStoreSpy) ListWelcomeMessages(context.Context, domain.Peer, int64) (domain.WelcomeMessageList, error) { + return domain.WelcomeMessageList{Hash: 1}, nil +} +func (*welcomeStoreSpy) DeleteWelcomeMessage(context.Context, domain.Peer, int) (bool, error) { + return true, nil +} +func (*welcomeStoreSpy) DeleteAllWelcomeMessages(context.Context, domain.Peer) (bool, error) { + return true, nil +} +func (*welcomeStoreSpy) HasWelcomeMessages(context.Context, domain.Peer) (bool, error) { + return true, nil +} + +type welcomeChannelAccess struct { + view domain.ChannelView + err error +} + +func (a *welcomeChannelAccess) ResolveChannel(context.Context, int64, int64) (domain.ChannelView, error) { + return a.view, a.err +} + +func TestServiceRechecksManageWelcomeMessagesPermission(t *testing.T) { + peer := domain.Peer{Type: domain.PeerTypeChannel, ID: 77} + store := &welcomeStoreSpy{} + channels := &welcomeChannelAccess{view: domain.ChannelView{ + Channel: domain.Channel{ID: peer.ID, Megagroup: true}, + Self: domain.ChannelMember{ + ChannelID: peer.ID, UserID: 9, Role: domain.ChannelRoleAdmin, + Status: domain.ChannelMemberActive, + AdminRights: domain.ChannelAdminRights{ManageWelcomeMessages: true}, + }, + }} + service := NewService(store, channels, WithClock(func() time.Time { return time.Unix(1700000000, 0) })) + message, created, err := service.Create(context.Background(), 9, peer, 1001, domain.WelcomeMessageContent{Message: "hello"}) + if err != nil || !created || message.Date != 1700000000 || store.creates != 1 { + t.Fatalf("authorized create = %+v created=%v calls=%d err=%v", message, created, store.creates, err) + } + + channels.view.Self.Status = domain.ChannelMemberLeft + if _, _, err := service.Create(context.Background(), 9, peer, 1002, domain.WelcomeMessageContent{Message: "blocked"}); !errors.Is(err, domain.ErrWelcomeMessageForbidden) || store.creates != 1 { + t.Fatalf("inactive admin create err=%v calls=%d", err, store.creates) + } + + channels.view.Self = domain.ChannelMember{UserID: 9, Role: domain.ChannelRoleCreator, Status: domain.ChannelMemberActive} + if _, err := service.List(context.Background(), 9, peer, 0); err != nil { + t.Fatalf("creator list: %v", err) + } + channels.view.Channel.Monoforum = true + if _, err := service.List(context.Background(), 9, peer, 0); !errors.Is(err, domain.ErrWelcomeMessagePeerInvalid) { + t.Fatalf("monoforum list err=%v", err) + } +} + +func TestServiceRejectsOrdinaryMemberAndAllowsJoinedBroadcastAdmin(t *testing.T) { + peer := domain.Peer{Type: domain.PeerTypeChannel, ID: 88} + store := &welcomeStoreSpy{} + channels := &welcomeChannelAccess{view: domain.ChannelView{ + Channel: domain.Channel{ID: peer.ID, Broadcast: true}, + Self: domain.ChannelMember{UserID: 10, Role: domain.ChannelRoleMember, Status: domain.ChannelMemberActive}, + }} + service := NewService(store, channels) + if _, err := service.DeleteAll(context.Background(), 10, peer); !errors.Is(err, domain.ErrWelcomeMessageForbidden) { + t.Fatalf("ordinary member delete-all err=%v", err) + } + channels.view.Self.Role = domain.ChannelRoleAdmin + channels.view.Self.AdminRights.ManageWelcomeMessages = true + if ok, err := service.DeleteAll(context.Background(), 10, peer); err != nil || !ok { + t.Fatalf("joined broadcast admin delete-all=%v,%v", ok, err) + } +} diff --git a/internal/compat/tdesktop/config.go b/internal/compat/tdesktop/config.go index 32010171..0642b545 100644 --- a/internal/compat/tdesktop/config.go +++ b/internal/compat/tdesktop/config.go @@ -13,7 +13,7 @@ import ( // // 字段值取 Telegram 常见默认；TDesktop 联调阶段按客户端实际需要微调 // （记录于 docs/compatibility-matrix.md）。 -func BuildConfig(dc int, ip string, port int, now time.Time, publicBaseURL string) *tg.Config { +func BuildConfig(dc int, ip string, port int, now time.Time, publicBaseURL, updateBaseURL string) *tg.Config { // TELESRV_ADVERTISE_IP is validated during config loading. Parse again here // only to derive the wire ipv6 flag and to render IPv4-mapped addresses in // their canonical form. Keeping the advertised route in help.getConfig is a @@ -65,13 +65,10 @@ func BuildConfig(dc int, ip string, port int, now time.Time, publicBaseURL strin MessageLengthMax: 4096, WebfileDCID: dc, } - config.SetReactionsDefault(&tg.ReactionEmoji{Emoticon: DefaultReactionEmoticon}) - // The GIF picker's trending/search panel reads this from help.getConfig's - // typed Config (gifs_list_widget.cpp: session().serverConfig().gifSearchUsername) - // -- NOT from help.getAppConfig's loose JSON blob, which is a separate RPC/ - // response entirely. Must match the built-in @gif system bot's username - // (domain.GifBotUser().Username), whose inline results are served - // synchronously in-process (see rpc.ServiceBotInlineResults). config.SetGifSearchUsername("gif") + config.SetReactionsDefault(&tg.ReactionEmoji{Emoticon: DefaultReactionEmoticon}) + if updateBaseURL != "" { + config.SetAutoupdateURLPrefix(links.NormalizeBaseURL(updateBaseURL)) + } return config } diff --git a/internal/compat/tdesktop/config_test.go b/internal/compat/tdesktop/config_test.go index cd28f012..c029b2ab 100644 --- a/internal/compat/tdesktop/config_test.go +++ b/internal/compat/tdesktop/config_test.go @@ -8,7 +8,7 @@ import ( ) func TestBuildConfigIncludesDefaultReaction(t *testing.T) { - config := BuildConfig(2, "127.0.0.1", 2398, time.Unix(1, 0), "https://telesrv.net") + config := BuildConfig(2, "127.0.0.1", 2398, time.Unix(1, 0), "https://telesrv.net", "https://updates.example.test/root/") reaction, ok := config.GetReactionsDefault() if !ok { t.Fatal("reactions_default is absent") @@ -17,6 +17,9 @@ func TestBuildConfigIncludesDefaultReaction(t *testing.T) { if !ok || emoji.Emoticon != DefaultReactionEmoticon { t.Fatalf("reactions_default = %#v, want %q emoji", reaction, DefaultReactionEmoticon) } + if got, ok := config.GetAutoupdateURLPrefix(); !ok || got != "https://updates.example.test/root" { + t.Fatalf("autoupdate_url_prefix = %q, %v", got, ok) + } } func TestBuildConfigAdvertisesCanonicalPrimaryDC(t *testing.T) { @@ -32,7 +35,7 @@ func TestBuildConfigAdvertisesCanonicalPrimaryDC(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - config := BuildConfig(2, tt.ip, 2398, time.Unix(1, 0), "https://telesrv.net") + config := BuildConfig(2, tt.ip, 2398, time.Unix(1, 0), "https://telesrv.net", "") if len(config.DCOptions) != 1 { t.Fatalf("len(DCOptions) = %d, want 1", len(config.DCOptions)) } diff --git a/internal/compat/tdesktop/defaults.go b/internal/compat/tdesktop/defaults.go index 7913cae8..e97998c7 100644 --- a/internal/compat/tdesktop/defaults.go +++ b/internal/compat/tdesktop/defaults.go @@ -4,11 +4,12 @@ import ( "github.com/iamxvbaba/td/tg" compatandroid "telesrv/internal/compat/android" + "telesrv/internal/domain" "telesrv/internal/seed/catalog" ) const ( - appConfigHash = 18 // app config 内容变更时必须递增，否则缓存端只会收到 notModified。 + appConfigHash = 19 // app config 内容变更时必须递增，否则缓存端只会收到 notModified。 countriesListHash = 1 timezonesListHash = 1 ) @@ -53,6 +54,7 @@ func readMarkAppConfig(mapboxToken string) *tg.JSONObject { {Key: "boosts_channel_level_max", Value: &tg.JSONNumber{Value: 100}}, // TDesktop 富文本编辑入口：官方默认缺省 disabled，显式 enabled 才显示/允许进入编辑器。 {Key: "rich_message_posting", Value: &tg.JSONString{Value: "enabled"}}, + {Key: "ephemeral_welcome_messages_max", Value: &tg.JSONNumber{Value: float64(domain.MaxWelcomeMessagesPerPeer)}}, // dialog_filters_enabled=true：TDesktop 据此(或已有文件夹)才显示 Settings→Folders 入口。 {Key: "dialog_filters_enabled", Value: &tg.JSONBool{Value: true}}, {Key: "chatlist_update_period", Value: &tg.JSONNumber{Value: 3600}}, diff --git a/internal/compat/tdesktop/startup_stubs.go b/internal/compat/tdesktop/startup_stubs.go index 7ec93033..66dcbeb1 100644 --- a/internal/compat/tdesktop/startup_stubs.go +++ b/internal/compat/tdesktop/startup_stubs.go @@ -5,6 +5,7 @@ import ( "github.com/iamxvbaba/td/tg" + "telesrv/internal/branding" "telesrv/internal/seed/appearance" "telesrv/internal/seed/catalog" ) @@ -348,7 +349,7 @@ func StickerSet(req *tg.MessagesGetStickerSetRequest) tg.MessagesStickerSetClass if req != nil && req.Hash == emptyStickerSetHash { return &tg.MessagesStickerSetNotModified{} } - title, shortName := "OwpenGram Empty Sticker Set", "owpengram_empty" + title, shortName := branding.ProductName+" Empty Sticker Set", "owpengram_empty" if req != nil { switch set := req.Stickerset.(type) { case *tg.InputStickerSetAnimatedEmoji: diff --git a/internal/compat/tdesktop/startup_stubs_test.go b/internal/compat/tdesktop/startup_stubs_test.go index 14e56e70..f4fd78b7 100644 --- a/internal/compat/tdesktop/startup_stubs_test.go +++ b/internal/compat/tdesktop/startup_stubs_test.go @@ -6,6 +6,7 @@ import ( "github.com/iamxvbaba/td/tg" + "telesrv/internal/domain" "telesrv/internal/seed/appearance" ) @@ -79,6 +80,9 @@ func TestAppConfigIncludesStoryStealthPeriods(t *testing.T) { if strings["rich_message_posting"] != "enabled" { t.Fatalf("AppConfig[rich_message_posting] = %q, want enabled", strings["rich_message_posting"]) } + if values["ephemeral_welcome_messages_max"] != float64(domain.MaxWelcomeMessagesPerPeer) { + t.Fatalf("AppConfig[ephemeral_welcome_messages_max] = %v, want %d", values["ephemeral_welcome_messages_max"], domain.MaxWelcomeMessagesPerPeer) + } if !boolSeen["stars_purchase_blocked"] || bools["stars_purchase_blocked"] || !boolSeen["giveaway_gifts_purchase_available"] || !bools["giveaway_gifts_purchase_available"] { t.Fatalf("AppConfig purchase flags = stars_blocked:%v giveaway_available:%v", bools["stars_purchase_blocked"], bools["giveaway_gifts_purchase_available"]) diff --git a/internal/config/config.go b/internal/config/config.go index 7c8ea3a3..3cc98d3f 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -13,6 +13,7 @@ import ( "golang.org/x/text/language" + "telesrv/internal/branding" "telesrv/internal/domain" "telesrv/internal/links" ) @@ -62,6 +63,10 @@ type Config struct { MTProtoRPCGlobalWorkers int MTProtoRPCGlobalMaxTasks int MTProtoRPCGlobalMaxBytes int64 + // Delivery-hook workers execute post-response correctness transitions. The + // separate pending budget covers reserved + queued + running hooks. + MTProtoRPCDeliveryHookWorkers int + MTProtoRPCDeliveryHookMaxPending int // Pending ownership and compact completed receipts share three-level // global/raw-auth/session entry accounting. Result bodies are never cached // here; the logical-session outbox owns unacknowledged wire bytes. @@ -93,6 +98,13 @@ type Config struct { // PublicBaseURL 是所有客户端可见 telesrv 链接的公开根 URL。 // 生产默认 https://telesrv.net；本地可设为 http://127.0.0.1:2401。 PublicBaseURL string + // UpdatePublicURL is advertised to native clients through + // help.getConfig.autoupdate_url_prefix. Empty disables desktop updates. + UpdatePublicURL string + // UpdateServiceURL is the internal HTTP endpoint used to resolve + // help.getAppUpdate responses. It defaults to UpdatePublicURL when enabled. + UpdateServiceURL string + UpdateRequestTimeout time.Duration // PublicAppScheme 是公开落地页自动唤起自建客户端时使用的 URL scheme。 // 必须与 TDesktop/Android 客户端构建时注册的 scheme 一致，且不能占用 tg/http/https。 PublicAppScheme string @@ -255,15 +267,15 @@ type Config struct { WebPagePreviewRatePerMin int // LangPackSeedDir 是 TDesktop 语言包 .strings 种子目录。 LangPackSeedDir string - // BlobDir 是本地磁盘 blob backend 根目录（媒体文件字节内容）。 - BlobDir string - // BlobBackendKind selects the blob storage backend: "localfs" (default) - // or "s3". Transient upload parts always stay on local disk (BlobDir) - // regardless of this setting -- only the permanent blob store moves. + // BlobBackendKind 选择唯一永久 blob backend：localfs（默认）或 s3。 BlobBackendKind string - // S3Endpoint/S3Region/S3Bucket/S3AccessKeyID/S3SecretAccessKey/S3UseSSL/ - // S3PathStyle configure the s3 blob backend; only used when - // BlobBackendKind == "s3". Works against self-hosted MinIO or AWS S3. + // BlobDir 是 localfs 永久媒体根目录。s3 模式不从这里回退读取。 + BlobDir string + // BlobStagingDir 是 s3 模式的本地临时上传分片与写入 spool 根目录； + // 它不是永久 backend，成功组装后的媒体只存在 S3。 + BlobStagingDir string + // S3* 配置 MinIO/AWS S3 兼容永久 backend。endpoint 不含 URL scheme； + // access key/secret 没有默认值，CreateBucket 默认关闭。 S3Endpoint string S3Region string S3Bucket string @@ -271,6 +283,7 @@ type Config struct { S3SecretAccessKey string S3UseSSL bool S3PathStyle bool + S3CreateBucket bool // StorageLowSpaceGuardEnable turns on the pre-upload free-space check. StorageLowSpaceGuardEnable bool // StorageMinFreeBytes: for the localfs backend, reject new uploads once @@ -338,19 +351,117 @@ type Config struct { TranslationRateWindow time.Duration // TempKeyResolveCacheMaxEntries 是 Router temp→perm 解析缓存容量。 TempKeyResolveCacheMaxEntries int - // TempKeyResolveCacheTTL 是 temp→perm 绑定的进程内复核周期。绑定/revoke 有精确 - // 失效，TTL 作为跨进程或异常路径兜底；默认 30m 避免大连接数下每 5s 全量打 PG。 + // TempKeyResolveCacheTTL 是 temp→perm 正绑定的进程内复核周期。bind 成功投影已提交 + // 映射，revoke/destroy 精确失效；TTL 作为跨进程或异常路径兜底。 TempKeyResolveCacheTTL time.Duration + // ReadModelVersionCacheMaxEntries 是 durable read-model hash 的进程内 LRU + // 容量。它由统一 NOTIFY 流更新/失效；达到上限只逐项驱逐，禁止整表清空。 + ReadModelVersionCacheMaxEntries int + // ReadModelVersionBatch* bounds synchronous cross-request batching for exact + // cache misses. Each caller still waits for its complete durable hash set; + // errors never fall back to independent PostgreSQL reads. + ReadModelVersionBatchMaxKeys int + ReadModelVersionBatchWait time.Duration + ReadModelVersionBatchQueue int + ReadModelVersionBatchTimeout time.Duration + // AuthKeyGetBatch* bounds synchronous first-frame auth-key lookup/touch + // batching. Every accepted connection waits for its durable activity lease; + // queue/query failures close that connection rather than bypassing the batcher. + AuthKeyGetBatchMax int + AuthKeyGetBatchWait time.Duration + AuthKeyGetBatchQueue int + AuthKeyGetBatchTimeout time.Duration + // ContactReverseBatch* bounds synchronous exact owner->viewer relationship + // batching for privacy projection. It never broadens pairs or falls back to + // per-request PostgreSQL reads when overloaded. + ContactReverseBatchMaxPairs int + ContactReverseBatchWait time.Duration + ContactReverseBatchQueue int + ContactReverseBatchTimeout time.Duration + // ContactSnapshotCacheMaxViewers bounds owner contact-list and personal-photo + // snapshots independently. Both use exact-viewer LRU eviction. + ContactSnapshotCacheMaxViewers int + // ProfilePhotoCache* bounds the owner-only profile/fallback ref LRU. Exact + // profile_photo NOTIFY is primary freshness; TTL is only a missed-event guard. + ProfilePhotoCacheMaxEntries int + ProfilePhotoCacheTTL time.Duration + // PeerIdentityCacheMaxEntries 是合并后的 peer username/third-party + // verification viewer-independent 版本化 LRU 容量。 + PeerIdentityCacheMaxEntries int + // DialogPrivatePeerCache* 控制 private getPeerDialogs 结构事实缓存；频道 + // projection 由独立 ChannelDialogCache 承载，禁止在 Service 复制。 + DialogPrivatePeerCacheMaxEntries int + DialogPrivatePeerCacheMaxBytes int64 + // DialogDraftCache* 控制按 dialog_light 版本校验的 cloud-draft 正/负缓存。 + DialogDraftCacheMaxEntries int + DialogDraftCacheMaxBytes int64 + // UserProjectionFactCacheMaxEntries 是 freeze 与 collectible-phone + // viewer-independent durable fact 两个 LRU 各自的条目上限。 + UserProjectionFactCacheMaxEntries int + // StoryActivePeerCacheMaxEntries 控制共享 active-story candidate；hidden + // preference 按 viewer 稀疏集合缓存，并同时受条目与估算字节上限约束。 + StoryActivePeerCacheMaxEntries int + StoryHiddenListCacheMaxEntries int + StoryHiddenListCacheMaxBytes int64 + // DialogListSnapshotCache* 控制 materialized owner dialog 工作集。条目数与 + // header-equivalent 总权重同时受限，避免 10k owner 或单个超大账号把 heap 推成无界。 + DialogListSnapshotCacheMaxEntries int + DialogListSnapshotCacheMaxHeaders int64 + DialogListSnapshotCacheTTL time.Duration + // DialogListSnapshotRedisTTL controls the cross-process, version-addressed + // materialized owner snapshot lifetime. Correctness comes from durable read-model + // generations rather than this TTL. + DialogListSnapshotRedisTTL time.Duration + // ActiveChannelIDs* controls the session-readiness owner membership page. + // L1 and Redis share the exact durable-generation/page identity; Redis miss + // uses a bounded synchronous multi-owner PostgreSQL batch. + ActiveChannelIDsCacheMaxEntries int + ActiveChannelIDsCacheTTL time.Duration + ActiveChannelIDsRedisTTL time.Duration + ActiveChannelIDsBatchMax int + ActiveChannelIDsBatchWait time.Duration + ActiveChannelIDsBatchQueue int + ActiveChannelIDsBatchTimeout time.Duration + // LayerAdvanceBatch* bounds synchronous PostgreSQL batching of distinct + // raw-session same-Layer watermark advances. Every selector remains an + // independent durable input and waits for its batch result before admission. + LayerAdvanceBatchMax int + LayerAdvanceBatchWait time.Duration + LayerAdvanceBatchQueue int + LayerAdvanceBatchTimeout time.Duration + // BootstrapReadyBatch* bounds synchronous post-response readiness marking. + // Every accepted selector waits for the shared PostgreSQL result; this is + // not an asynchronous or best-effort delivery path. + BootstrapReadyBatchMax int + BootstrapReadyBatchWait time.Duration + BootstrapReadyBatchQueue int + BootstrapReadyBatchTimeout time.Duration + // PresenceLastSeenBatch* bounds the coalescing asynchronous lifecycle + // presence writer. Explicit account.updateStatus is not batched. + PresenceLastSeenBatchMax int + PresenceLastSeenBatchWait time.Duration + PresenceLastSeenBatchQueue int + PresenceLastSeenBatchTimeout time.Duration + PresenceLastSeenDrainTimeout time.Duration // ChannelRowCacheMaxEntries 是「共享频道行」进程内缓存容量(channelID→domain.Channel)。 // 由 channels 表 LISTEN/NOTIFY 触发器实时失效(强一致、零 TTL)。<=0 禁用缓存与监听。 ChannelRowCacheMaxEntries int + // ChannelTopMessageCacheMaxEntries 是 dialog 顶部频道消息共享缓存容量。 + // viewer 的 read/reaction overlay 不入缓存；channel_base 事件按频道失效。 + ChannelTopMessageCacheMaxEntries int // ChannelMemberCacheMaxEntries 是频道成员/访问态 read-model 缓存容量((channelID,userID)→member)。 // 由 read_model_versions 统一通知实时失效。<=0 禁用缓存。 ChannelMemberCacheMaxEntries int // ChannelDialogCacheMaxEntries 是频道 dialog 读投影缓存容量((viewerUserID,channelID)→dialog)。 // 由 channel_base/channel_member/dialog_light 统一通知实时失效。<=0 禁用缓存。 ChannelDialogCacheMaxEntries int + // ChannelDifferenceCache* 控制 viewer-independent difference 基础页工作集。 + // entry/估算 bytes 双重有界；TTL 只是带外写安全兜底，正常正确性由 + // channel_base/channel_difference_base 通知与稳定切面 key 保证。 + ChannelDifferenceCacheMaxEntries int + ChannelDifferenceCacheMaxBytes int64 + ChannelDifferenceCacheTTL time.Duration // ChannelBoostCacheMaxEntries 是频道 boost read-model 缓存容量，覆盖当前用户 // SelfBoostsApplied 与频道总 active boost 数两类投影。写入 channel_boost_slots // 时精确失效，TTL 兜底自然过期。<=0 禁用缓存。 @@ -626,6 +737,20 @@ func Load() (Config, error) { if err != nil { return Config{}, fmt.Errorf("TELESRV_PUBLIC_BASE_URL: %w", err) } + updatePublicURL := strings.TrimSpace(envAllowEmptyOr("TELESRV_UPDATE_PUBLIC_URL", "")) + if updatePublicURL != "" { + updatePublicURL, err = links.ValidateBaseURL(updatePublicURL) + if err != nil { + return Config{}, fmt.Errorf("TELESRV_UPDATE_PUBLIC_URL: %w", err) + } + } + updateServiceURL := strings.TrimSpace(envOr("TELESRV_UPDATE_SERVICE_URL", updatePublicURL)) + if updateServiceURL != "" { + updateServiceURL, err = links.ValidateBaseURL(updateServiceURL) + if err != nil { + return Config{}, fmt.Errorf("TELESRV_UPDATE_SERVICE_URL: %w", err) + } + } publicAppScheme, err := links.ValidateAppScheme(envOr("TELESRV_PUBLIC_APP_SCHEME", links.DefaultAppScheme)) if err != nil { return Config{}, fmt.Errorf("TELESRV_PUBLIC_APP_SCHEME: %w", err) @@ -663,7 +788,6 @@ func Load() (Config, error) { if err != nil { return Config{}, err } - cfg := Config{ ListenAddr: envOr("TELESRV_LISTEN", "0.0.0.0:2398"), WebSocketEnable: envBoolOr("TELESRV_WEBSOCKET_ENABLE", true), @@ -685,8 +809,10 @@ func Load() (Config, error) { MTProtoRPCQueueSize: envIntOr("TELESRV_MTPROTO_RPC_QUEUE_SIZE", 64), MTProtoRPCTimeout: envDurationOr("TELESRV_MTPROTO_RPC_TIMEOUT", 30*time.Second), MTProtoRPCGlobalWorkers: envIntOr("TELESRV_MTPROTO_RPC_GLOBAL_WORKERS", 256), - MTProtoRPCGlobalMaxTasks: envIntOr("TELESRV_MTPROTO_RPC_GLOBAL_MAX_TASKS", 8192), + MTProtoRPCGlobalMaxTasks: envIntOr("TELESRV_MTPROTO_RPC_GLOBAL_MAX_TASKS", 32768), MTProtoRPCGlobalMaxBytes: envInt64Or("TELESRV_MTPROTO_RPC_GLOBAL_MAX_BYTES", 512<<20), + MTProtoRPCDeliveryHookWorkers: envIntOr("TELESRV_MTPROTO_RPC_DELIVERY_HOOK_WORKERS", 32), + MTProtoRPCDeliveryHookMaxPending: envIntOr("TELESRV_MTPROTO_RPC_DELIVERY_HOOK_MAX_PENDING", 16_384), MTProtoRPCExecutionMaxEntries: envIntOr("TELESRV_MTPROTO_RPC_EXECUTION_MAX_ENTRIES", 1<<18), MTProtoRPCExecutionAuthMaxEntries: envIntOr("TELESRV_MTPROTO_RPC_EXECUTION_AUTH_MAX_ENTRIES", 1<<15), MTProtoRPCExecutionSessionMaxEntries: envIntOr( @@ -703,6 +829,9 @@ func Load() (Config, error) { AdminAPIAddr: envAllowEmptyOr("TELESRV_ADMIN_API_ADDR", ""), AdminAPIToken: envOr("TELESRV_ADMIN_API_TOKEN", ""), PublicBaseURL: publicBaseURL, + UpdatePublicURL: updatePublicURL, + UpdateServiceURL: updateServiceURL, + UpdateRequestTimeout: envDurationOr("TELESRV_UPDATE_REQUEST_TIMEOUT", 2*time.Second), PublicAppScheme: publicAppScheme, PublicAppLinkBase: publicAppLinkBase, PublicWebBaseURL: publicWebBaseURL, @@ -713,32 +842,32 @@ func Load() (Config, error) { ReservedUsernames: envListOr("TELESRV_RESERVED_USERNAMES", []string{ "owpengram", "admin", "administrator", "support", "staff", "moderator", "official", "root", "owner", }), - PublicLinkWebAddr: envAllowEmptyOr("TELESRV_PUBLIC_LINK_WEB_ADDR", ""), - TelegramLoginEnabled: envBoolOr("TELESRV_TELEGRAM_LOGIN_ENABLE", false), - TelegramLoginIssuer: strings.TrimSuffix(envOr("TELESRV_TELEGRAM_LOGIN_ISSUER", publicBaseURL), "/"), - TelegramLoginAllowHTTP: envBoolOr("TELESRV_TELEGRAM_LOGIN_ALLOW_HTTP", false), - TelegramLoginSigningKeysFile: envOr("TELESRV_TELEGRAM_LOGIN_SIGNING_KEYS_FILE", "data/telegram-login/signing-keys.json"), - TelegramLoginCodeKeysFile: envOr("TELESRV_TELEGRAM_LOGIN_CODE_KEYS_FILE", "data/telegram-login/code-keys.json"), - TelegramLoginSecretPepperFile: envOr("TELESRV_TELEGRAM_LOGIN_SECRET_PEPPER_FILE", "data/telegram-login/client-secret-pepper"), - TelegramLoginRequestTTL: envDurationOr("TELESRV_TELEGRAM_LOGIN_REQUEST_TTL", 5*time.Minute), - TelegramLoginCodeTTL: envDurationOr("TELESRV_TELEGRAM_LOGIN_CODE_TTL", 2*time.Minute), - TelegramLoginIDTokenTTL: envDurationOr("TELESRV_TELEGRAM_LOGIN_ID_TOKEN_TTL", time.Hour), - TelegramLoginTrustedProxyCIDRs: envListOr("TELESRV_TELEGRAM_LOGIN_TRUSTED_PROXY_CIDRS", nil), - TelegramLoginRetention: envDurationOr("TELESRV_TELEGRAM_LOGIN_RETENTION", 7*24*time.Hour), - TelegramLoginSweepInterval: envDurationOr("TELESRV_TELEGRAM_LOGIN_SWEEP_INTERVAL", 5*time.Minute), - TelegramLoginSweepBatch: envIntOr("TELESRV_TELEGRAM_LOGIN_SWEEP_BATCH", 500), - AdminUIPermissions: envListOr("TELESRV_ADMIN_UI_PERMISSIONS", []string{adminPermissionAll}), - AdminScopedTokens: adminScopedTokens, - AdminUIAddr: envOr("TELESRV_ADMIN_UI_ADDR", "127.0.0.1:2600"), - AdminUIPassword: envOr("TELESRV_ADMIN_UI_PASSWORD", ""), - AdminUIToken: envOr("TELESRV_ADMIN_UI_TOKEN", ""), - AdminSessionKey: envOr("TELESRV_ADMIN_SESSION_KEY", ""), + PublicLinkWebAddr: envAllowEmptyOr("TELESRV_PUBLIC_LINK_WEB_ADDR", ""), + TelegramLoginEnabled: envBoolOr("TELESRV_TELEGRAM_LOGIN_ENABLE", false), + TelegramLoginIssuer: strings.TrimSuffix(envOr("TELESRV_TELEGRAM_LOGIN_ISSUER", publicBaseURL), "/"), + TelegramLoginAllowHTTP: envBoolOr("TELESRV_TELEGRAM_LOGIN_ALLOW_HTTP", false), + TelegramLoginSigningKeysFile: envOr("TELESRV_TELEGRAM_LOGIN_SIGNING_KEYS_FILE", "data/telegram-login/signing-keys.json"), + TelegramLoginCodeKeysFile: envOr("TELESRV_TELEGRAM_LOGIN_CODE_KEYS_FILE", "data/telegram-login/code-keys.json"), + TelegramLoginSecretPepperFile: envOr("TELESRV_TELEGRAM_LOGIN_SECRET_PEPPER_FILE", "data/telegram-login/client-secret-pepper"), + TelegramLoginRequestTTL: envDurationOr("TELESRV_TELEGRAM_LOGIN_REQUEST_TTL", 5*time.Minute), + TelegramLoginCodeTTL: envDurationOr("TELESRV_TELEGRAM_LOGIN_CODE_TTL", 2*time.Minute), + TelegramLoginIDTokenTTL: envDurationOr("TELESRV_TELEGRAM_LOGIN_ID_TOKEN_TTL", time.Hour), + TelegramLoginTrustedProxyCIDRs: envListOr("TELESRV_TELEGRAM_LOGIN_TRUSTED_PROXY_CIDRS", nil), + TelegramLoginRetention: envDurationOr("TELESRV_TELEGRAM_LOGIN_RETENTION", 7*24*time.Hour), + TelegramLoginSweepInterval: envDurationOr("TELESRV_TELEGRAM_LOGIN_SWEEP_INTERVAL", 5*time.Minute), + TelegramLoginSweepBatch: envIntOr("TELESRV_TELEGRAM_LOGIN_SWEEP_BATCH", 500), + AdminUIPermissions: envListOr("TELESRV_ADMIN_UI_PERMISSIONS", []string{adminPermissionAll}), + AdminScopedTokens: adminScopedTokens, + AdminUIAddr: envOr("TELESRV_ADMIN_UI_ADDR", "127.0.0.1:2600"), + AdminUIPassword: envOr("TELESRV_ADMIN_UI_PASSWORD", ""), + AdminUIToken: envOr("TELESRV_ADMIN_UI_TOKEN", ""), + AdminSessionKey: envOr("TELESRV_ADMIN_SESSION_KEY", ""), // 用 127.0.0.1 而非 localhost：localhost 在 Windows 上会先解析到 IPv6 ::1，而 Docker // Desktop 的端口转发只在 IPv4 监听，IPv6 连接要等 ~1s 超时才回退 IPv4（实测 localhost // 建连 1.0s vs 127.0.0.1 6ms）。冷连接洪峰下池扩容的新连接各等 1s → pre-handler 惊群卡顿。 // 生产由 TELESRV_POSTGRES_DSN 覆盖；该默认值仅作用于本地开发。 - PostgresDSN: envOr("TELESRV_POSTGRES_DSN", "postgres://telesrv:telesrv@127.0.0.1:5432/telesrv?sslmode=disable"), + PostgresDSN: envOr("TELESRV_POSTGRES_DSN", "postgres://telesrv:telesrv@127.0.0.1:5432/telesrv_main?sslmode=disable"), PostgresMaxConns: envIntOr("TELESRV_POSTGRES_MAX_CONNS", 50), PostgresMinConns: envIntOr("TELESRV_POSTGRES_MIN_CONNS", 16), RedisAddr: envOr("TELESRV_REDIS_ADDR", "127.0.0.1:6399"), // 同理避开 localhost→IPv6 回退延迟 @@ -767,63 +896,118 @@ func Load() (Config, error) { SMTPUsername: envOr("TELESRV_SMTP_USERNAME", ""), SMTPPassword: envOr("TELESRV_SMTP_PASSWORD", ""), SMTPFrom: envOr("TELESRV_SMTP_FROM", ""), - SMTPFromName: envOr("TELESRV_SMTP_FROM_NAME", "OwpenGram"), + SMTPFromName: envOr("TELESRV_SMTP_FROM_NAME", branding.ProductName), SMTPTLSMode: strings.ToLower(strings.TrimSpace(envOr("TELESRV_SMTP_TLS", "starttls"))), SMTPTimeout: envDurationOr("TELESRV_SMTP_TIMEOUT", 10*time.Second), LangPackSeedDir: envOr("TELESRV_LANGPACK_SEED_DIR", "data/langpack"), - BlobDir: envOr("TELESRV_BLOB_DIR", "data/blobs"), // s3 (MinIO by default, see deploy/docker-compose.yml's minio service) is // the default blob backend; localfs remains fully supported as an // explicit opt-in (TELESRV_BLOB_BACKEND=localfs). - BlobBackendKind: strings.ToLower(strings.TrimSpace(envOr("TELESRV_BLOB_BACKEND", "s3"))), - S3Endpoint: envOr("TELESRV_S3_ENDPOINT", "127.0.0.1:9000"), // 同理避开 localhost→IPv6 回退延迟 - S3Region: envOr("TELESRV_S3_REGION", "us-east-1"), - S3Bucket: envOr("TELESRV_S3_BUCKET", "owpengram-media"), - S3AccessKeyID: envOr("TELESRV_S3_ACCESS_KEY_ID", "owpengram"), - S3SecretAccessKey: envOr("TELESRV_S3_SECRET_ACCESS_KEY", "owpengram123"), - S3UseSSL: envBoolOr("TELESRV_S3_USE_SSL", false), - S3PathStyle: envBoolOr("TELESRV_S3_PATH_STYLE", true), - StorageLowSpaceGuardEnable: envBoolOr("TELESRV_STORAGE_LOW_SPACE_GUARD_ENABLE", true), - StorageMinFreeBytes: envInt64Or("TELESRV_STORAGE_MIN_FREE_BYTES", 1<<30), - StorageMaxTotalBytes: envInt64Or("TELESRV_STORAGE_MAX_TOTAL_BYTES", 0), - StorageUsageRefreshInterval: envDurationOr("TELESRV_STORAGE_USAGE_REFRESH_INTERVAL", time.Minute), - StorageRetentionEnable: envBoolOr("TELESRV_STORAGE_RETENTION_ENABLE", false), - StorageRetentionMaxAge: envDurationOr("TELESRV_STORAGE_RETENTION_MAX_AGE", 30*24*time.Hour), - StickerSeedDir: envOr("TELESRV_STICKER_SEED_DIR", "data/sticker-seed"), - StickerSeedMaxSets: envIntOr("TELESRV_STICKER_SEED_MAX_SETS", 300), - PremiumPromoSeedDir: envOr("TELESRV_PREMIUM_PROMO_SEED_DIR", "data/premium-promo"), - GifSeedDir: envOr("TELESRV_GIF_SEED_DIR", "data/gifs"), - IdentityDir: envOr("TELESRV_IDENTITY_DIR", "data/identity"), - MapboxToken: envOr("TELESRV_MAPBOX_TOKEN", ""), - MapTileCacheDir: envOr("TELESRV_MAPTILE_CACHE_DIR", "data/maptiles"), - ExternalMediaEnable: envBoolOr("TELESRV_EXTERNAL_MEDIA_ENABLE", true), - ExternalMediaMaxBytes: int64(envIntOr("TELESRV_EXTERNAL_MEDIA_MAX_BYTES", 10<<20)), - ExternalMediaRatePerMin: envIntOr("TELESRV_EXTERNAL_MEDIA_RATE_PER_MIN", 60), - WebPagePreviewEnable: envBoolOr("TELESRV_WEBPAGE_PREVIEW_ENABLE", true), - WebPagePreviewMaxBytes: int64(envIntOr("TELESRV_WEBPAGE_PREVIEW_MAX_BYTES", 5<<20)), - WebPagePreviewRatePerMin: envIntOr("TELESRV_WEBPAGE_PREVIEW_RATE_PER_MIN", 300), - BusinessAIProvider: envOr("TELESRV_BUSINESS_AI_PROVIDER", "echo"), - AIEnabled: envBoolOr("TELESRV_AI_ENABLED", true), - AIProviders: loadAIProviders(fileEnv), - AITimeout: envDurationOr("TELESRV_AI_TIMEOUT", 15*time.Second), - AIRateLimit: envIntOr("TELESRV_AI_RATE_LIMIT", 20), - AIRateWindow: envDurationOr("TELESRV_AI_RATE_WINDOW", time.Minute), - AIPrivacyLogContent: envBoolOr("TELESRV_AI_LOG_CONTENT", false), - TranslationEnabled: envBoolOr("TELESRV_TRANSLATION_ENABLED", true), - TranslationProviders: envListOr("TELESRV_TRANSLATION_PROVIDERS", []string{}), - TranslationTimeout: envDurationOr("TELESRV_TRANSLATION_TIMEOUT", 15*time.Second), - TranslationRateLimit: envIntOr("TELESRV_TRANSLATION_RATE_LIMIT", 60), - TranslationRateWindow: envDurationOr("TELESRV_TRANSLATION_RATE_WINDOW", time.Minute), - TempKeyResolveCacheMaxEntries: envIntOr("TELESRV_TEMP_KEY_CACHE_MAX_ENTRIES", 262144), - TempKeyResolveCacheTTL: envDurationOr("TELESRV_TEMP_KEY_CACHE_TTL", 30*time.Minute), - ChannelRowCacheMaxEntries: envIntOr("TELESRV_CHANNEL_ROW_CACHE_MAX", 50000), - ChannelMemberCacheMaxEntries: envIntOr("TELESRV_CHANNEL_MEMBER_CACHE_MAX", 100000), - ChannelDialogCacheMaxEntries: envIntOr("TELESRV_CHANNEL_DIALOG_CACHE_MAX", 100000), - ChannelBoostCacheMaxEntries: envIntOr("TELESRV_CHANNEL_BOOST_CACHE_MAX", 100000), - ChannelBoostCacheTTL: envDurationOr("TELESRV_CHANNEL_BOOST_CACHE_TTL", 10*time.Second), + BlobBackendKind: strings.ToLower(strings.TrimSpace(envOr("TELESRV_BLOB_BACKEND", "s3"))), + BlobDir: envOr("TELESRV_BLOB_DIR", "data/blobs"), + BlobStagingDir: envOr("TELESRV_BLOB_STAGING_DIR", "data/blob-staging"), + S3Endpoint: envOr("TELESRV_S3_ENDPOINT", "127.0.0.1:9000"), // 同理避开 localhost→IPv6 回退延迟 + S3Region: envOr("TELESRV_S3_REGION", "us-east-1"), + S3Bucket: envOr("TELESRV_S3_BUCKET", "owpengram-media"), + S3AccessKeyID: envOr("TELESRV_S3_ACCESS_KEY_ID", "owpengram"), + S3SecretAccessKey: envOr("TELESRV_S3_SECRET_ACCESS_KEY", "owpengram123"), + S3UseSSL: envBoolOr("TELESRV_S3_USE_SSL", false), + S3PathStyle: envBoolOr("TELESRV_S3_PATH_STYLE", true), + S3CreateBucket: envBoolOr("TELESRV_S3_CREATE_BUCKET", false), + StorageLowSpaceGuardEnable: envBoolOr("TELESRV_STORAGE_LOW_SPACE_GUARD_ENABLE", true), + StorageMinFreeBytes: envInt64Or("TELESRV_STORAGE_MIN_FREE_BYTES", 1<<30), + StorageMaxTotalBytes: envInt64Or("TELESRV_STORAGE_MAX_TOTAL_BYTES", 0), + StorageUsageRefreshInterval: envDurationOr("TELESRV_STORAGE_USAGE_REFRESH_INTERVAL", time.Minute), + StorageRetentionEnable: envBoolOr("TELESRV_STORAGE_RETENTION_ENABLE", false), + StorageRetentionMaxAge: envDurationOr("TELESRV_STORAGE_RETENTION_MAX_AGE", 30*24*time.Hour), + StickerSeedDir: envOr("TELESRV_STICKER_SEED_DIR", "data/sticker-seed"), + StickerSeedMaxSets: envIntOr("TELESRV_STICKER_SEED_MAX_SETS", 300), + PremiumPromoSeedDir: envOr("TELESRV_PREMIUM_PROMO_SEED_DIR", "data/premium-promo"), + GifSeedDir: envOr("TELESRV_GIF_SEED_DIR", "data/gifs"), + IdentityDir: envOr("TELESRV_IDENTITY_DIR", "data/identity"), + MapboxToken: envOr("TELESRV_MAPBOX_TOKEN", ""), + MapTileCacheDir: envOr("TELESRV_MAPTILE_CACHE_DIR", "data/maptiles"), + ExternalMediaEnable: envBoolOr("TELESRV_EXTERNAL_MEDIA_ENABLE", true), + ExternalMediaMaxBytes: int64(envIntOr("TELESRV_EXTERNAL_MEDIA_MAX_BYTES", 10<<20)), + ExternalMediaRatePerMin: envIntOr("TELESRV_EXTERNAL_MEDIA_RATE_PER_MIN", 60), + WebPagePreviewEnable: envBoolOr("TELESRV_WEBPAGE_PREVIEW_ENABLE", true), + WebPagePreviewMaxBytes: int64(envIntOr("TELESRV_WEBPAGE_PREVIEW_MAX_BYTES", 5<<20)), + WebPagePreviewRatePerMin: envIntOr("TELESRV_WEBPAGE_PREVIEW_RATE_PER_MIN", 300), + BusinessAIProvider: envOr("TELESRV_BUSINESS_AI_PROVIDER", "echo"), + AIEnabled: envBoolOr("TELESRV_AI_ENABLED", true), + AIProviders: loadAIProviders(fileEnv), + AITimeout: envDurationOr("TELESRV_AI_TIMEOUT", 15*time.Second), + AIRateLimit: envIntOr("TELESRV_AI_RATE_LIMIT", 20), + AIRateWindow: envDurationOr("TELESRV_AI_RATE_WINDOW", time.Minute), + AIPrivacyLogContent: envBoolOr("TELESRV_AI_LOG_CONTENT", false), + TranslationEnabled: envBoolOr("TELESRV_TRANSLATION_ENABLED", true), + TranslationProviders: envListOr("TELESRV_TRANSLATION_PROVIDERS", []string{}), + TranslationTimeout: envDurationOr("TELESRV_TRANSLATION_TIMEOUT", 15*time.Second), + TranslationRateLimit: envIntOr("TELESRV_TRANSLATION_RATE_LIMIT", 60), + TranslationRateWindow: envDurationOr("TELESRV_TRANSLATION_RATE_WINDOW", time.Minute), + TempKeyResolveCacheMaxEntries: envIntOr("TELESRV_TEMP_KEY_CACHE_MAX_ENTRIES", 262144), + TempKeyResolveCacheTTL: envDurationOr("TELESRV_TEMP_KEY_CACHE_TTL", 30*time.Minute), + ReadModelVersionCacheMaxEntries: envIntOr("TELESRV_READ_MODEL_VERSION_CACHE_MAX", 1000000), + ReadModelVersionBatchMaxKeys: envIntOr("TELESRV_READ_MODEL_VERSION_BATCH_MAX_KEYS", 4096), + ReadModelVersionBatchWait: envDurationOr("TELESRV_READ_MODEL_VERSION_BATCH_WAIT", 250*time.Microsecond), + ReadModelVersionBatchQueue: envIntOr("TELESRV_READ_MODEL_VERSION_BATCH_QUEUE", 16_384), + ReadModelVersionBatchTimeout: envDurationOr("TELESRV_READ_MODEL_VERSION_BATCH_TIMEOUT", 5*time.Second), + AuthKeyGetBatchMax: envIntOr("TELESRV_AUTH_KEY_GET_BATCH_MAX", 256), + AuthKeyGetBatchWait: envDurationOr("TELESRV_AUTH_KEY_GET_BATCH_WAIT", 250*time.Microsecond), + AuthKeyGetBatchQueue: envIntOr("TELESRV_AUTH_KEY_GET_BATCH_QUEUE", 16_384), + AuthKeyGetBatchTimeout: envDurationOr("TELESRV_AUTH_KEY_GET_BATCH_TIMEOUT", 5*time.Second), + ContactReverseBatchMaxPairs: envIntOr("TELESRV_CONTACT_REVERSE_BATCH_MAX_PAIRS", 4096), + ContactReverseBatchWait: envDurationOr("TELESRV_CONTACT_REVERSE_BATCH_WAIT", 2*time.Millisecond), + ContactReverseBatchQueue: envIntOr("TELESRV_CONTACT_REVERSE_BATCH_QUEUE", 16_384), + ContactReverseBatchTimeout: envDurationOr("TELESRV_CONTACT_REVERSE_BATCH_TIMEOUT", 5*time.Second), + ContactSnapshotCacheMaxViewers: envIntOr("TELESRV_CONTACT_SNAPSHOT_CACHE_MAX_VIEWERS", 16_384), + ProfilePhotoCacheMaxEntries: envIntOr("TELESRV_PROFILE_PHOTO_CACHE_MAX", 200_000), + ProfilePhotoCacheTTL: envDurationOr("TELESRV_PROFILE_PHOTO_CACHE_TTL", 24*time.Hour), + PeerIdentityCacheMaxEntries: envIntOr("TELESRV_PEER_IDENTITY_CACHE_MAX", 1000000), + DialogPrivatePeerCacheMaxEntries: envIntOr("TELESRV_DIALOG_PRIVATE_PEER_CACHE_MAX", 500000), + DialogPrivatePeerCacheMaxBytes: int64(envIntOr("TELESRV_DIALOG_PRIVATE_PEER_CACHE_BYTES_MAX", 256<<20)), + DialogDraftCacheMaxEntries: envIntOr("TELESRV_DIALOG_DRAFT_CACHE_MAX", 1000000), + DialogDraftCacheMaxBytes: int64(envIntOr("TELESRV_DIALOG_DRAFT_CACHE_BYTES_MAX", 256<<20)), + UserProjectionFactCacheMaxEntries: envIntOr("TELESRV_USER_PROJECTION_FACT_CACHE_MAX", 1000000), + StoryActivePeerCacheMaxEntries: envIntOr("TELESRV_STORY_ACTIVE_PEER_CACHE_MAX", 1000000), + StoryHiddenListCacheMaxEntries: envIntOr("TELESRV_STORY_HIDDEN_LIST_CACHE_MAX", 100000), + StoryHiddenListCacheMaxBytes: int64(envIntOr("TELESRV_STORY_HIDDEN_LIST_CACHE_BYTES_MAX", 64<<20)), + DialogListSnapshotCacheMaxEntries: envIntOr("TELESRV_DIALOG_LIST_SNAPSHOT_CACHE_MAX", 10000), + DialogListSnapshotCacheMaxHeaders: int64(envIntOr("TELESRV_DIALOG_LIST_SNAPSHOT_HEADERS_MAX", 1000000)), + DialogListSnapshotCacheTTL: envDurationOr("TELESRV_DIALOG_LIST_SNAPSHOT_CACHE_TTL", 5*time.Minute), + DialogListSnapshotRedisTTL: envDurationOr("TELESRV_DIALOG_LIST_SNAPSHOT_REDIS_TTL", time.Hour), + ActiveChannelIDsCacheMaxEntries: envIntOr("TELESRV_ACTIVE_CHANNEL_IDS_CACHE_MAX", 32_768), + ActiveChannelIDsCacheTTL: envDurationOr("TELESRV_ACTIVE_CHANNEL_IDS_CACHE_TTL", 24*time.Hour), + ActiveChannelIDsRedisTTL: envDurationOr("TELESRV_ACTIVE_CHANNEL_IDS_REDIS_TTL", 24*time.Hour), + ActiveChannelIDsBatchMax: envIntOr("TELESRV_ACTIVE_CHANNEL_IDS_BATCH_MAX", 128), + ActiveChannelIDsBatchWait: envDurationOr("TELESRV_ACTIVE_CHANNEL_IDS_BATCH_WAIT", 100*time.Millisecond), + ActiveChannelIDsBatchQueue: envIntOr("TELESRV_ACTIVE_CHANNEL_IDS_BATCH_QUEUE", 16_384), + ActiveChannelIDsBatchTimeout: envDurationOr("TELESRV_ACTIVE_CHANNEL_IDS_BATCH_TIMEOUT", 5*time.Second), + LayerAdvanceBatchMax: envIntOr("TELESRV_LAYER_ADVANCE_BATCH_MAX", 256), + LayerAdvanceBatchWait: envDurationOr("TELESRV_LAYER_ADVANCE_BATCH_WAIT", 250*time.Microsecond), + LayerAdvanceBatchQueue: envIntOr("TELESRV_LAYER_ADVANCE_BATCH_QUEUE", 8192), + LayerAdvanceBatchTimeout: envDurationOr("TELESRV_LAYER_ADVANCE_BATCH_TIMEOUT", 5*time.Second), + BootstrapReadyBatchMax: envIntOr("TELESRV_BOOTSTRAP_READY_BATCH_MAX", 32), + BootstrapReadyBatchWait: envDurationOr("TELESRV_BOOTSTRAP_READY_BATCH_WAIT", 100*time.Millisecond), + BootstrapReadyBatchQueue: envIntOr("TELESRV_BOOTSTRAP_READY_BATCH_QUEUE", 16_384), + BootstrapReadyBatchTimeout: envDurationOr("TELESRV_BOOTSTRAP_READY_BATCH_TIMEOUT", 5*time.Second), + PresenceLastSeenBatchMax: envIntOr("TELESRV_PRESENCE_LAST_SEEN_BATCH_MAX", 512), + PresenceLastSeenBatchWait: envDurationOr("TELESRV_PRESENCE_LAST_SEEN_BATCH_WAIT", time.Second), + PresenceLastSeenBatchQueue: envIntOr("TELESRV_PRESENCE_LAST_SEEN_BATCH_QUEUE", 65_536), + PresenceLastSeenBatchTimeout: envDurationOr("TELESRV_PRESENCE_LAST_SEEN_BATCH_TIMEOUT", 5*time.Second), + PresenceLastSeenDrainTimeout: envDurationOr("TELESRV_PRESENCE_LAST_SEEN_DRAIN_TIMEOUT", 10*time.Second), + ChannelRowCacheMaxEntries: envIntOr("TELESRV_CHANNEL_ROW_CACHE_MAX", 50000), + ChannelTopMessageCacheMaxEntries: envIntOr("TELESRV_CHANNEL_TOP_MESSAGE_CACHE_MAX", 100000), + ChannelMemberCacheMaxEntries: envIntOr("TELESRV_CHANNEL_MEMBER_CACHE_MAX", 1000000), + ChannelDialogCacheMaxEntries: envIntOr("TELESRV_CHANNEL_DIALOG_CACHE_MAX", 1000000), + ChannelDifferenceCacheMaxEntries: envIntOr("TELESRV_CHANNEL_DIFFERENCE_CACHE_MAX", 8192), + ChannelDifferenceCacheMaxBytes: int64(envIntOr("TELESRV_CHANNEL_DIFFERENCE_CACHE_BYTES_MAX", 256<<20)), + ChannelDifferenceCacheTTL: envDurationOr("TELESRV_CHANNEL_DIFFERENCE_CACHE_TTL", 5*time.Minute), + ChannelBoostCacheMaxEntries: envIntOr("TELESRV_CHANNEL_BOOST_CACHE_MAX", 100000), + ChannelBoostCacheTTL: envDurationOr("TELESRV_CHANNEL_BOOST_CACHE_TTL", 10*time.Second), OutboxWorkers: envIntOr("TELESRV_OUTBOX_WORKERS", 4), - OutboxBatch: envIntOr("TELESRV_OUTBOX_BATCH", 100), + OutboxBatch: envIntOr("TELESRV_OUTBOX_BATCH", 10), OutboxInterval: envDurationOr("TELESRV_OUTBOX_INTERVAL", 200*time.Millisecond), OutboxLeaseTimeout: envDurationOr("TELESRV_OUTBOX_LEASE_TIMEOUT", 30*time.Second), OutboxPoisonRetention: envDurationOr("TELESRV_OUTBOX_POISON_RETENTION", time.Minute), @@ -856,12 +1040,13 @@ func Load() (Config, error) { CallSignalingRate: envIntOr("TELESRV_CALL_SIGNALING_RATE", 50), CallExpiryInterval: envDurationOr("TELESRV_CALL_EXPIRY_INTERVAL", time.Second), - PremiumGrantMonths: envIntOr("TELESRV_PREMIUM_GRANT_MONTHS", 3), - DefaultStickerSetID: envInt64Or("TELESRV_DEFAULT_STICKER_SET_ID", 0), - PasskeyRPID: envOr("TELESRV_PASSKEY_RP_ID", "telesrv.net"), - PasskeyAllowedOrigins: envListOr("TELESRV_PASSKEY_ALLOWED_ORIGINS", nil), - PremiumSweepInterval: envDurationOr("TELESRV_PREMIUM_SWEEP_INTERVAL", time.Minute), - PremiumSweepBatch: envIntOr("TELESRV_PREMIUM_SWEEP_BATCH", 500), + PremiumGrantMonths: envIntOr("TELESRV_PREMIUM_GRANT_MONTHS", 3), + DefaultStickerSetID: envInt64Or("TELESRV_DEFAULT_STICKER_SET_ID", 0), + PasskeyRPID: envOr("TELESRV_PASSKEY_RP_ID", "telesrv.net"), + PasskeyAllowedOrigins: envListOr("TELESRV_PASSKEY_ALLOWED_ORIGINS", nil), + PremiumSweepInterval: envDurationOr("TELESRV_PREMIUM_SWEEP_INTERVAL", time.Minute), + PremiumSweepBatch: envIntOr("TELESRV_PREMIUM_SWEEP_BATCH", 500), + CollectibleUsernameURLTemplate: strings.TrimSpace(envAllowEmptyOr("TELESRV_COLLECTIBLE_USERNAME_URL_TEMPLATE", "")), // Official verification defaults ship the feature on with the official bar @@ -920,6 +1105,15 @@ func Load() (Config, error) { if err := validateRPCExecutionConfig(cfg); err != nil { return Config{}, err } + if cfg.ContactSnapshotCacheMaxViewers <= 0 { + return Config{}, fmt.Errorf("TELESRV_CONTACT_SNAPSHOT_CACHE_MAX_VIEWERS must be positive") + } + if cfg.ProfilePhotoCacheMaxEntries <= 0 { + return Config{}, fmt.Errorf("TELESRV_PROFILE_PHOTO_CACHE_MAX must be positive") + } + if cfg.ProfilePhotoCacheTTL <= 0 || cfg.ProfilePhotoCacheTTL > 7*24*time.Hour { + return Config{}, fmt.Errorf("TELESRV_PROFILE_PHOTO_CACHE_TTL must be greater than zero and at most 168h") + } if err := validateCollectibleUsernameConfig(cfg); err != nil { return Config{}, err } @@ -935,9 +1129,159 @@ func Load() (Config, error) { if err := validateStorageConfig(cfg); err != nil { return Config{}, err } + if err := validateBlobStorageConfig(cfg); err != nil { + return Config{}, err + } + if cfg.DC <= 0 || int64(cfg.DC) > int64(1<<31-1) { + return Config{}, fmt.Errorf("TELESRV_DC must be a positive TL int32") + } + if cfg.UpdateRequestTimeout <= 0 || cfg.UpdateRequestTimeout > 30*time.Second { + return Config{}, fmt.Errorf("TELESRV_UPDATE_REQUEST_TIMEOUT must be greater than zero and at most 30s") + } + if cfg.DialogListSnapshotRedisTTL <= 0 { + return Config{}, fmt.Errorf("TELESRV_DIALOG_LIST_SNAPSHOT_REDIS_TTL must be greater than zero") + } + if cfg.ActiveChannelIDsCacheMaxEntries <= 0 || cfg.ActiveChannelIDsCacheMaxEntries > 1_000_000 { + return Config{}, fmt.Errorf("TELESRV_ACTIVE_CHANNEL_IDS_CACHE_MAX must be in [1,1000000]") + } + if cfg.ActiveChannelIDsCacheTTL <= 0 || cfg.ActiveChannelIDsCacheTTL > 7*24*time.Hour { + return Config{}, fmt.Errorf("TELESRV_ACTIVE_CHANNEL_IDS_CACHE_TTL must be greater than zero and at most 168h") + } + if cfg.ActiveChannelIDsRedisTTL <= 0 || cfg.ActiveChannelIDsRedisTTL > 30*24*time.Hour { + return Config{}, fmt.Errorf("TELESRV_ACTIVE_CHANNEL_IDS_REDIS_TTL must be greater than zero and at most 720h") + } + if cfg.ActiveChannelIDsBatchMax <= 0 || cfg.ActiveChannelIDsBatchMax > 4096 { + return Config{}, fmt.Errorf("TELESRV_ACTIVE_CHANNEL_IDS_BATCH_MAX must be in [1,4096]") + } + if cfg.ActiveChannelIDsBatchWait <= 0 || cfg.ActiveChannelIDsBatchWait > time.Second { + return Config{}, fmt.Errorf("TELESRV_ACTIVE_CHANNEL_IDS_BATCH_WAIT must be greater than zero and at most 1s") + } + if cfg.ActiveChannelIDsBatchQueue < cfg.ActiveChannelIDsBatchMax || cfg.ActiveChannelIDsBatchQueue > 1<<20 { + return Config{}, fmt.Errorf("TELESRV_ACTIVE_CHANNEL_IDS_BATCH_QUEUE must be in [TELESRV_ACTIVE_CHANNEL_IDS_BATCH_MAX,1048576]") + } + if cfg.ActiveChannelIDsBatchTimeout <= 0 || cfg.ActiveChannelIDsBatchTimeout > 30*time.Second { + return Config{}, fmt.Errorf("TELESRV_ACTIVE_CHANNEL_IDS_BATCH_TIMEOUT must be greater than zero and at most 30s") + } + if cfg.ReadModelVersionBatchMaxKeys <= 0 || cfg.ReadModelVersionBatchMaxKeys > 1<<16 { + return Config{}, fmt.Errorf("TELESRV_READ_MODEL_VERSION_BATCH_MAX_KEYS must be in [1,65536]") + } + if cfg.ReadModelVersionBatchWait <= 0 || cfg.ReadModelVersionBatchWait > 10*time.Millisecond { + return Config{}, fmt.Errorf("TELESRV_READ_MODEL_VERSION_BATCH_WAIT must be greater than zero and at most 10ms") + } + if cfg.ReadModelVersionBatchQueue <= 0 || cfg.ReadModelVersionBatchQueue > 1<<20 { + return Config{}, fmt.Errorf("TELESRV_READ_MODEL_VERSION_BATCH_QUEUE must be in [1,1048576]") + } + if cfg.ReadModelVersionBatchTimeout <= 0 || cfg.ReadModelVersionBatchTimeout > 30*time.Second { + return Config{}, fmt.Errorf("TELESRV_READ_MODEL_VERSION_BATCH_TIMEOUT must be greater than zero and at most 30s") + } + if cfg.AuthKeyGetBatchMax <= 0 || cfg.AuthKeyGetBatchMax > 4096 { + return Config{}, fmt.Errorf("TELESRV_AUTH_KEY_GET_BATCH_MAX must be in [1,4096]") + } + if cfg.AuthKeyGetBatchWait <= 0 || cfg.AuthKeyGetBatchWait > 10*time.Millisecond { + return Config{}, fmt.Errorf("TELESRV_AUTH_KEY_GET_BATCH_WAIT must be greater than zero and at most 10ms") + } + if cfg.AuthKeyGetBatchQueue < cfg.AuthKeyGetBatchMax || cfg.AuthKeyGetBatchQueue > 1<<20 { + return Config{}, fmt.Errorf("TELESRV_AUTH_KEY_GET_BATCH_QUEUE must be in [TELESRV_AUTH_KEY_GET_BATCH_MAX,1048576]") + } + if cfg.AuthKeyGetBatchTimeout <= 0 || cfg.AuthKeyGetBatchTimeout > 30*time.Second { + return Config{}, fmt.Errorf("TELESRV_AUTH_KEY_GET_BATCH_TIMEOUT must be greater than zero and at most 30s") + } + if cfg.ContactReverseBatchMaxPairs <= 0 || cfg.ContactReverseBatchMaxPairs > 1<<16 { + return Config{}, fmt.Errorf("TELESRV_CONTACT_REVERSE_BATCH_MAX_PAIRS must be in [1,65536]") + } + if cfg.ContactReverseBatchWait <= 0 || cfg.ContactReverseBatchWait > 10*time.Millisecond { + return Config{}, fmt.Errorf("TELESRV_CONTACT_REVERSE_BATCH_WAIT must be greater than zero and at most 10ms") + } + if cfg.ContactReverseBatchQueue <= 0 || cfg.ContactReverseBatchQueue > 1<<20 { + return Config{}, fmt.Errorf("TELESRV_CONTACT_REVERSE_BATCH_QUEUE must be in [1,1048576]") + } + if cfg.ContactReverseBatchTimeout <= 0 || cfg.ContactReverseBatchTimeout > 30*time.Second { + return Config{}, fmt.Errorf("TELESRV_CONTACT_REVERSE_BATCH_TIMEOUT must be greater than zero and at most 30s") + } + if cfg.ChannelDifferenceCacheMaxEntries > 0 { + if cfg.ChannelDifferenceCacheMaxBytes <= 0 { + return Config{}, fmt.Errorf("TELESRV_CHANNEL_DIFFERENCE_CACHE_BYTES_MAX must be greater than zero when the cache is enabled") + } + if cfg.ChannelDifferenceCacheTTL <= 0 || cfg.ChannelDifferenceCacheTTL > 24*time.Hour { + return Config{}, fmt.Errorf("TELESRV_CHANNEL_DIFFERENCE_CACHE_TTL must be greater than zero and at most 24h when the cache is enabled") + } + } + if cfg.LayerAdvanceBatchMax <= 0 || cfg.LayerAdvanceBatchMax > 4096 { + return Config{}, fmt.Errorf("TELESRV_LAYER_ADVANCE_BATCH_MAX must be in [1,4096]") + } + if cfg.LayerAdvanceBatchWait <= 0 || cfg.LayerAdvanceBatchWait > 10*time.Millisecond { + return Config{}, fmt.Errorf("TELESRV_LAYER_ADVANCE_BATCH_WAIT must be greater than zero and at most 10ms") + } + if cfg.LayerAdvanceBatchQueue < cfg.LayerAdvanceBatchMax || cfg.LayerAdvanceBatchQueue > 1<<20 { + return Config{}, fmt.Errorf("TELESRV_LAYER_ADVANCE_BATCH_QUEUE must be in [TELESRV_LAYER_ADVANCE_BATCH_MAX,1048576]") + } + if cfg.LayerAdvanceBatchTimeout <= 0 || cfg.LayerAdvanceBatchTimeout > 30*time.Second { + return Config{}, fmt.Errorf("TELESRV_LAYER_ADVANCE_BATCH_TIMEOUT must be greater than zero and at most 30s") + } + if cfg.BootstrapReadyBatchMax <= 0 || cfg.BootstrapReadyBatchMax > 4096 { + return Config{}, fmt.Errorf("TELESRV_BOOTSTRAP_READY_BATCH_MAX must be in [1,4096]") + } + if cfg.BootstrapReadyBatchWait <= 0 || cfg.BootstrapReadyBatchWait > time.Second { + return Config{}, fmt.Errorf("TELESRV_BOOTSTRAP_READY_BATCH_WAIT must be greater than zero and at most 1s") + } + if cfg.BootstrapReadyBatchQueue < cfg.BootstrapReadyBatchMax || cfg.BootstrapReadyBatchQueue > 1<<20 { + return Config{}, fmt.Errorf("TELESRV_BOOTSTRAP_READY_BATCH_QUEUE must be in [TELESRV_BOOTSTRAP_READY_BATCH_MAX,1048576]") + } + if cfg.BootstrapReadyBatchTimeout <= 0 || cfg.BootstrapReadyBatchTimeout > 30*time.Second { + return Config{}, fmt.Errorf("TELESRV_BOOTSTRAP_READY_BATCH_TIMEOUT must be greater than zero and at most 30s") + } + if cfg.PresenceLastSeenBatchMax <= 0 || cfg.PresenceLastSeenBatchMax > 4096 { + return Config{}, fmt.Errorf("TELESRV_PRESENCE_LAST_SEEN_BATCH_MAX must be in [1,4096]") + } + if cfg.PresenceLastSeenBatchWait <= 0 || cfg.PresenceLastSeenBatchWait > 5*time.Second { + return Config{}, fmt.Errorf("TELESRV_PRESENCE_LAST_SEEN_BATCH_WAIT must be greater than zero and at most 5s") + } + if cfg.PresenceLastSeenBatchQueue < cfg.PresenceLastSeenBatchMax || cfg.PresenceLastSeenBatchQueue > 1<<20 { + return Config{}, fmt.Errorf("TELESRV_PRESENCE_LAST_SEEN_BATCH_QUEUE must be in [TELESRV_PRESENCE_LAST_SEEN_BATCH_MAX,1048576]") + } + if cfg.PresenceLastSeenBatchTimeout <= 0 || cfg.PresenceLastSeenBatchTimeout > 30*time.Second { + return Config{}, fmt.Errorf("TELESRV_PRESENCE_LAST_SEEN_BATCH_TIMEOUT must be greater than zero and at most 30s") + } + if cfg.PresenceLastSeenDrainTimeout <= 0 || cfg.PresenceLastSeenDrainTimeout > time.Minute { + return Config{}, fmt.Errorf("TELESRV_PRESENCE_LAST_SEEN_DRAIN_TIMEOUT must be greater than zero and at most 1m") + } return cfg, nil } +func validateBlobStorageConfig(cfg Config) error { + if cfg.StorageMinFreeBytes < 0 { + return fmt.Errorf("TELESRV_STORAGE_MIN_FREE_BYTES must be non-negative") + } + if cfg.StorageMaxTotalBytes < 0 { + return fmt.Errorf("TELESRV_STORAGE_MAX_TOTAL_BYTES must be non-negative") + } + if cfg.StorageLowSpaceGuardEnable && cfg.StorageUsageRefreshInterval <= 0 { + return fmt.Errorf("TELESRV_STORAGE_USAGE_REFRESH_INTERVAL must be positive when storage capacity guard is enabled") + } + switch cfg.BlobBackendKind { + case string(domain.MediaBackendLocalFS): + if strings.TrimSpace(cfg.BlobDir) == "" { + return fmt.Errorf("TELESRV_BLOB_DIR is required when TELESRV_BLOB_BACKEND=localfs") + } + case string(domain.MediaBackendS3): + if strings.TrimSpace(cfg.BlobStagingDir) == "" { + return fmt.Errorf("TELESRV_BLOB_STAGING_DIR is required when TELESRV_BLOB_BACKEND=s3") + } + if cfg.S3Endpoint == "" || strings.Contains(cfg.S3Endpoint, "://") { + return fmt.Errorf("TELESRV_S3_ENDPOINT must be host[:port] without a URL scheme when TELESRV_BLOB_BACKEND=s3") + } + if cfg.S3Bucket == "" { + return fmt.Errorf("TELESRV_S3_BUCKET is required when TELESRV_BLOB_BACKEND=s3") + } + if strings.TrimSpace(cfg.S3AccessKeyID) == "" || strings.TrimSpace(cfg.S3SecretAccessKey) == "" { + return fmt.Errorf("TELESRV_S3_ACCESS_KEY_ID and TELESRV_S3_SECRET_ACCESS_KEY are required when TELESRV_BLOB_BACKEND=s3") + } + default: + return fmt.Errorf("TELESRV_BLOB_BACKEND must be localfs or s3, got %q", cfg.BlobBackendKind) + } + return nil +} + func normalizeDefaultCountryCode(raw string) (string, error) { code := strings.ToUpper(strings.TrimSpace(raw)) if len(code) != 2 || code[0] < 'A' || code[0] > 'Z' || code[1] < 'A' || code[1] > 'Z' { @@ -1040,6 +1384,9 @@ func validateVerificationConfig(cfg Config) error { if cfg.VerificationNotifyBatch <= 0 || cfg.VerificationNotifyBatch > 500 { return fmt.Errorf("TELESRV_VERIFICATION_NOTIFY_BATCH must be 1..500") } + if cfg.BroadcastWorkerInterval <= 0 { + return fmt.Errorf("TELESRV_BROADCAST_WORKER_INTERVAL must be positive") + } if cfg.VerificationMaxActivePerUser < 0 || cfg.VerificationMaxActivePerUser > 50 { return fmt.Errorf("TELESRV_VERIFICATION_MAX_ACTIVE_PER_USER must be 0..50") } @@ -1237,6 +1584,11 @@ func validateCollectibleUsernameConfig(cfg Config) error { } func validateRPCExecutionConfig(cfg Config) error { + if cfg.MTProtoRPCDeliveryHookWorkers <= 0 || + cfg.MTProtoRPCDeliveryHookMaxPending < cfg.MTProtoRPCDeliveryHookWorkers { + return fmt.Errorf("MTProto rpc delivery hook capacity must satisfy pending >= workers > 0: %d/%d", + cfg.MTProtoRPCDeliveryHookMaxPending, cfg.MTProtoRPCDeliveryHookWorkers) + } if cfg.MTProtoRPCExecutionMaxEntries <= 0 || cfg.MTProtoRPCExecutionAuthMaxEntries <= 0 || cfg.MTProtoRPCExecutionSessionMaxEntries <= 0 { return fmt.Errorf("MTProto rpc execution entry limits must be positive") @@ -1572,12 +1924,18 @@ func validateStrictMTProtoCapacityEnv(e envSource) error { "TELESRV_MTPROTO_RPC_QUEUE_SIZE", "TELESRV_MTPROTO_RPC_GLOBAL_WORKERS", "TELESRV_MTPROTO_RPC_GLOBAL_MAX_TASKS", + "TELESRV_MTPROTO_RPC_DELIVERY_HOOK_WORKERS", + "TELESRV_MTPROTO_RPC_DELIVERY_HOOK_MAX_PENDING", "TELESRV_MTPROTO_RPC_EXECUTION_MAX_ENTRIES", "TELESRV_MTPROTO_RPC_EXECUTION_AUTH_MAX_ENTRIES", "TELESRV_MTPROTO_RPC_EXECUTION_SESSION_MAX_ENTRIES", "TELESRV_MTPROTO_RPC_EXECUTION_PENDING_PER_AUTH", "TELESRV_MTPROTO_OUTBOUND_QUEUE_SIZE", "TELESRV_MTPROTO_OUTBOUND_CONTROL_QUEUE_SIZE", + "TELESRV_CONTACT_REVERSE_BATCH_MAX_PAIRS", + "TELESRV_CONTACT_REVERSE_BATCH_QUEUE", + "TELESRV_CONTACT_SNAPSHOT_CACHE_MAX_VIEWERS", + "TELESRV_PROFILE_PHOTO_CACHE_MAX", } { if raw := e.envOr(key, ""); raw != "" { if _, err := strconv.Atoi(raw); err != nil { diff --git a/internal/config/config_test.go b/internal/config/config_test.go index 009b6bbb..6a64a97a 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -33,8 +33,8 @@ func TestLoadDefaultsAdvertiseIPToLoopback(t *testing.T) { if cfg.PublicWebBaseURL != "https://weba.telesrv.net" { t.Fatalf("PublicWebBaseURL = %q, want https://weba.telesrv.net", cfg.PublicWebBaseURL) } - if cfg.PublicAppName != "telesrv" { - t.Fatalf("PublicAppName = %q, want telesrv", cfg.PublicAppName) + if cfg.PublicAppName != "Telesrv" { + t.Fatalf("PublicAppName = %q, want Telesrv", cfg.PublicAppName) } if cfg.CallRegistryMaxEntries != 10_000 { t.Fatalf("CallRegistryMaxEntries = %d, want 10000", cfg.CallRegistryMaxEntries) @@ -42,6 +42,468 @@ func TestLoadDefaultsAdvertiseIPToLoopback(t *testing.T) { if cfg.PremiumPromoSeedDir != "data/premium-promo" { t.Fatalf("PremiumPromoSeedDir = %q, want data/premium-promo", cfg.PremiumPromoSeedDir) } + if cfg.BlobBackendKind != string(domain.MediaBackendLocalFS) { + t.Fatalf("BlobBackendKind = %q, want localfs", cfg.BlobBackendKind) + } + if cfg.BlobDir != "data/blobs" { + t.Fatalf("BlobDir = %q, want data/blobs", cfg.BlobDir) + } + if !cfg.StorageLowSpaceGuardEnable || cfg.StorageMinFreeBytes != 1<<30 || cfg.StorageMaxTotalBytes != 0 || cfg.StorageUsageRefreshInterval != time.Minute { + t.Fatalf("unexpected storage capacity defaults: enabled=%v min=%d max=%d interval=%v", cfg.StorageLowSpaceGuardEnable, cfg.StorageMinFreeBytes, cfg.StorageMaxTotalBytes, cfg.StorageUsageRefreshInterval) + } + if cfg.MTProtoRPCGlobalMaxTasks != 32768 { + t.Fatalf("MTProtoRPCGlobalMaxTasks = %d, want 32768", cfg.MTProtoRPCGlobalMaxTasks) + } +} + +func TestLoadDialogListSnapshotRedisTTL(t *testing.T) { + disableDefaultConfigFile(t) + t.Setenv("TELESRV_DIALOG_LIST_SNAPSHOT_REDIS_TTL", "37m") + + cfg, err := Load() + if err != nil { + t.Fatalf("Load: %v", err) + } + if cfg.DialogListSnapshotRedisTTL != 37*time.Minute { + t.Fatalf("DialogListSnapshotRedisTTL = %v, want 37m", cfg.DialogListSnapshotRedisTTL) + } +} + +func TestLoadRejectsInvalidDialogListSnapshotRedisTTL(t *testing.T) { + disableDefaultConfigFile(t) + t.Setenv("TELESRV_DIALOG_LIST_SNAPSHOT_REDIS_TTL", "0s") + if _, err := Load(); err == nil { + t.Fatal("zero dialog list snapshot Redis TTL accepted") + } +} + +func TestLoadActiveChannelIDsReadModel(t *testing.T) { + disableDefaultConfigFile(t) + t.Setenv("TELESRV_ACTIVE_CHANNEL_IDS_CACHE_MAX", "45678") + t.Setenv("TELESRV_ACTIVE_CHANNEL_IDS_CACHE_TTL", "9h") + t.Setenv("TELESRV_ACTIVE_CHANNEL_IDS_REDIS_TTL", "27h") + t.Setenv("TELESRV_ACTIVE_CHANNEL_IDS_BATCH_MAX", "73") + t.Setenv("TELESRV_ACTIVE_CHANNEL_IDS_BATCH_WAIT", "37ms") + t.Setenv("TELESRV_ACTIVE_CHANNEL_IDS_BATCH_QUEUE", "901") + t.Setenv("TELESRV_ACTIVE_CHANNEL_IDS_BATCH_TIMEOUT", "3s") + cfg, err := Load() + if err != nil { + t.Fatalf("Load: %v", err) + } + if cfg.ActiveChannelIDsCacheMaxEntries != 45678 || cfg.ActiveChannelIDsCacheTTL != 9*time.Hour || + cfg.ActiveChannelIDsRedisTTL != 27*time.Hour || cfg.ActiveChannelIDsBatchMax != 73 || + cfg.ActiveChannelIDsBatchWait != 37*time.Millisecond || cfg.ActiveChannelIDsBatchQueue != 901 || + cfg.ActiveChannelIDsBatchTimeout != 3*time.Second { + t.Fatalf("active channel IDs config = max=%d l1=%v redis=%v batch=%d/%v/%d/%v", + cfg.ActiveChannelIDsCacheMaxEntries, cfg.ActiveChannelIDsCacheTTL, cfg.ActiveChannelIDsRedisTTL, + cfg.ActiveChannelIDsBatchMax, cfg.ActiveChannelIDsBatchWait, cfg.ActiveChannelIDsBatchQueue, + cfg.ActiveChannelIDsBatchTimeout) + } +} + +func TestLoadRejectsInvalidActiveChannelIDsReadModel(t *testing.T) { + for _, test := range []struct{ key, value string }{ + {key: "TELESRV_ACTIVE_CHANNEL_IDS_CACHE_MAX", value: "0"}, + {key: "TELESRV_ACTIVE_CHANNEL_IDS_CACHE_TTL", value: "0s"}, + {key: "TELESRV_ACTIVE_CHANNEL_IDS_REDIS_TTL", value: "0s"}, + {key: "TELESRV_ACTIVE_CHANNEL_IDS_BATCH_MAX", value: "0"}, + {key: "TELESRV_ACTIVE_CHANNEL_IDS_BATCH_WAIT", value: "0s"}, + {key: "TELESRV_ACTIVE_CHANNEL_IDS_BATCH_QUEUE", value: "1"}, + {key: "TELESRV_ACTIVE_CHANNEL_IDS_BATCH_TIMEOUT", value: "0s"}, + } { + t.Run(test.key+"="+test.value, func(t *testing.T) { + disableDefaultConfigFile(t) + t.Setenv(test.key, test.value) + if _, err := Load(); err == nil { + t.Fatalf("invalid %s=%s accepted", test.key, test.value) + } + }) + } +} + +func TestLoadChannelDifferenceCache(t *testing.T) { + disableDefaultConfigFile(t) + t.Setenv("TELESRV_CHANNEL_DIFFERENCE_CACHE_MAX", "123") + t.Setenv("TELESRV_CHANNEL_DIFFERENCE_CACHE_BYTES_MAX", "456789") + t.Setenv("TELESRV_CHANNEL_DIFFERENCE_CACHE_TTL", "7m") + cfg, err := Load() + if err != nil { + t.Fatalf("Load: %v", err) + } + if cfg.ChannelDifferenceCacheMaxEntries != 123 || cfg.ChannelDifferenceCacheMaxBytes != 456789 || cfg.ChannelDifferenceCacheTTL != 7*time.Minute { + t.Fatalf("channel difference cache = %d/%d/%v", + cfg.ChannelDifferenceCacheMaxEntries, cfg.ChannelDifferenceCacheMaxBytes, cfg.ChannelDifferenceCacheTTL) + } +} + +func TestLoadRejectsInvalidChannelDifferenceCache(t *testing.T) { + for _, test := range []struct{ key, value string }{ + {key: "TELESRV_CHANNEL_DIFFERENCE_CACHE_BYTES_MAX", value: "0"}, + {key: "TELESRV_CHANNEL_DIFFERENCE_CACHE_TTL", value: "0s"}, + {key: "TELESRV_CHANNEL_DIFFERENCE_CACHE_TTL", value: "25h"}, + } { + t.Run(test.key+"="+test.value, func(t *testing.T) { + disableDefaultConfigFile(t) + t.Setenv(test.key, test.value) + if _, err := Load(); err == nil { + t.Fatalf("invalid %s=%s accepted", test.key, test.value) + } + }) + } +} + +func TestLoadLayerAdvanceBatch(t *testing.T) { + disableDefaultConfigFile(t) + t.Setenv("TELESRV_LAYER_ADVANCE_BATCH_MAX", "73") + t.Setenv("TELESRV_LAYER_ADVANCE_BATCH_WAIT", "400us") + t.Setenv("TELESRV_LAYER_ADVANCE_BATCH_QUEUE", "901") + t.Setenv("TELESRV_LAYER_ADVANCE_BATCH_TIMEOUT", "3s") + + cfg, err := Load() + if err != nil { + t.Fatalf("Load: %v", err) + } + if cfg.LayerAdvanceBatchMax != 73 || cfg.LayerAdvanceBatchWait != 400*time.Microsecond || + cfg.LayerAdvanceBatchQueue != 901 || cfg.LayerAdvanceBatchTimeout != 3*time.Second { + t.Fatalf("layer advance batch = %d/%v/%d/%v", + cfg.LayerAdvanceBatchMax, cfg.LayerAdvanceBatchWait, + cfg.LayerAdvanceBatchQueue, cfg.LayerAdvanceBatchTimeout) + } +} + +func TestLoadReadModelVersionBatch(t *testing.T) { + disableDefaultConfigFile(t) + t.Setenv("TELESRV_READ_MODEL_VERSION_BATCH_MAX_KEYS", "3072") + t.Setenv("TELESRV_READ_MODEL_VERSION_BATCH_WAIT", "350us") + t.Setenv("TELESRV_READ_MODEL_VERSION_BATCH_QUEUE", "777") + t.Setenv("TELESRV_READ_MODEL_VERSION_BATCH_TIMEOUT", "4s") + + cfg, err := Load() + if err != nil { + t.Fatalf("Load: %v", err) + } + if cfg.ReadModelVersionBatchMaxKeys != 3072 || cfg.ReadModelVersionBatchWait != 350*time.Microsecond || + cfg.ReadModelVersionBatchQueue != 777 || cfg.ReadModelVersionBatchTimeout != 4*time.Second { + t.Fatalf("read-model version batch = %d/%v/%d/%v", + cfg.ReadModelVersionBatchMaxKeys, cfg.ReadModelVersionBatchWait, + cfg.ReadModelVersionBatchQueue, cfg.ReadModelVersionBatchTimeout) + } +} + +func TestLoadRejectsInvalidReadModelVersionBatch(t *testing.T) { + for _, test := range []struct { + name string + key string + value string + }{ + {name: "zero max keys", key: "TELESRV_READ_MODEL_VERSION_BATCH_MAX_KEYS", value: "0"}, + {name: "wait too large", key: "TELESRV_READ_MODEL_VERSION_BATCH_WAIT", value: "11ms"}, + {name: "zero queue", key: "TELESRV_READ_MODEL_VERSION_BATCH_QUEUE", value: "0"}, + {name: "timeout too large", key: "TELESRV_READ_MODEL_VERSION_BATCH_TIMEOUT", value: "31s"}, + } { + t.Run(test.name, func(t *testing.T) { + disableDefaultConfigFile(t) + t.Setenv(test.key, test.value) + if _, err := Load(); err == nil { + t.Fatalf("invalid %s=%s accepted", test.key, test.value) + } + }) + } +} + +func TestLoadAuthKeyGetBatch(t *testing.T) { + disableDefaultConfigFile(t) + t.Setenv("TELESRV_AUTH_KEY_GET_BATCH_MAX", "97") + t.Setenv("TELESRV_AUTH_KEY_GET_BATCH_WAIT", "425us") + t.Setenv("TELESRV_AUTH_KEY_GET_BATCH_QUEUE", "997") + t.Setenv("TELESRV_AUTH_KEY_GET_BATCH_TIMEOUT", "4s") + + cfg, err := Load() + if err != nil { + t.Fatalf("Load: %v", err) + } + if cfg.AuthKeyGetBatchMax != 97 || cfg.AuthKeyGetBatchWait != 425*time.Microsecond || + cfg.AuthKeyGetBatchQueue != 997 || cfg.AuthKeyGetBatchTimeout != 4*time.Second { + t.Fatalf("auth-key get batch = %d/%v/%d/%v", + cfg.AuthKeyGetBatchMax, cfg.AuthKeyGetBatchWait, + cfg.AuthKeyGetBatchQueue, cfg.AuthKeyGetBatchTimeout) + } +} + +func TestLoadRejectsInvalidAuthKeyGetBatch(t *testing.T) { + for _, test := range []struct { + name string + key string + value string + }{ + {name: "zero max", key: "TELESRV_AUTH_KEY_GET_BATCH_MAX", value: "0"}, + {name: "wait too large", key: "TELESRV_AUTH_KEY_GET_BATCH_WAIT", value: "11ms"}, + {name: "queue below max", key: "TELESRV_AUTH_KEY_GET_BATCH_QUEUE", value: "1"}, + {name: "timeout too large", key: "TELESRV_AUTH_KEY_GET_BATCH_TIMEOUT", value: "31s"}, + } { + t.Run(test.name, func(t *testing.T) { + disableDefaultConfigFile(t) + t.Setenv(test.key, test.value) + if _, err := Load(); err == nil { + t.Fatalf("invalid %s=%s accepted", test.key, test.value) + } + }) + } +} + +func TestLoadContactReverseBatch(t *testing.T) { + disableDefaultConfigFile(t) + t.Setenv("TELESRV_CONTACT_REVERSE_BATCH_MAX_PAIRS", "3073") + t.Setenv("TELESRV_CONTACT_REVERSE_BATCH_WAIT", "375us") + t.Setenv("TELESRV_CONTACT_REVERSE_BATCH_QUEUE", "778") + t.Setenv("TELESRV_CONTACT_REVERSE_BATCH_TIMEOUT", "4s") + + cfg, err := Load() + if err != nil { + t.Fatalf("Load: %v", err) + } + if cfg.ContactReverseBatchMaxPairs != 3073 || cfg.ContactReverseBatchWait != 375*time.Microsecond || + cfg.ContactReverseBatchQueue != 778 || cfg.ContactReverseBatchTimeout != 4*time.Second { + t.Fatalf("contact reverse batch = %d/%v/%d/%v", + cfg.ContactReverseBatchMaxPairs, cfg.ContactReverseBatchWait, + cfg.ContactReverseBatchQueue, cfg.ContactReverseBatchTimeout) + } +} + +func TestLoadRejectsInvalidContactReverseBatch(t *testing.T) { + for _, test := range []struct { + name string + key string + value string + }{ + {name: "zero max pairs", key: "TELESRV_CONTACT_REVERSE_BATCH_MAX_PAIRS", value: "0"}, + {name: "wait too large", key: "TELESRV_CONTACT_REVERSE_BATCH_WAIT", value: "11ms"}, + {name: "zero queue", key: "TELESRV_CONTACT_REVERSE_BATCH_QUEUE", value: "0"}, + {name: "timeout too large", key: "TELESRV_CONTACT_REVERSE_BATCH_TIMEOUT", value: "31s"}, + } { + t.Run(test.name, func(t *testing.T) { + disableDefaultConfigFile(t) + t.Setenv(test.key, test.value) + if _, err := Load(); err == nil { + t.Fatalf("invalid %s=%s accepted", test.key, test.value) + } + }) + } +} + +func TestLoadRejectsInvalidLayerAdvanceBatch(t *testing.T) { + for _, test := range []struct { + name string + key string + value string + }{ + {name: "zero max", key: "TELESRV_LAYER_ADVANCE_BATCH_MAX", value: "0"}, + {name: "wait too large", key: "TELESRV_LAYER_ADVANCE_BATCH_WAIT", value: "11ms"}, + {name: "queue below max", key: "TELESRV_LAYER_ADVANCE_BATCH_QUEUE", value: "1"}, + {name: "timeout too large", key: "TELESRV_LAYER_ADVANCE_BATCH_TIMEOUT", value: "31s"}, + } { + t.Run(test.name, func(t *testing.T) { + disableDefaultConfigFile(t) + t.Setenv(test.key, test.value) + if _, err := Load(); err == nil { + t.Fatalf("invalid %s=%s accepted", test.key, test.value) + } + }) + } +} + +func TestLoadBootstrapReadyBatch(t *testing.T) { + disableDefaultConfigFile(t) + t.Setenv("TELESRV_BOOTSTRAP_READY_BATCH_MAX", "41") + t.Setenv("TELESRV_BOOTSTRAP_READY_BATCH_WAIT", "37ms") + t.Setenv("TELESRV_BOOTSTRAP_READY_BATCH_QUEUE", "917") + t.Setenv("TELESRV_BOOTSTRAP_READY_BATCH_TIMEOUT", "4s") + + cfg, err := Load() + if err != nil { + t.Fatalf("Load: %v", err) + } + if cfg.BootstrapReadyBatchMax != 41 || cfg.BootstrapReadyBatchWait != 37*time.Millisecond || + cfg.BootstrapReadyBatchQueue != 917 || cfg.BootstrapReadyBatchTimeout != 4*time.Second { + t.Fatalf("bootstrap readiness batch = %d/%v/%d/%v", + cfg.BootstrapReadyBatchMax, cfg.BootstrapReadyBatchWait, + cfg.BootstrapReadyBatchQueue, cfg.BootstrapReadyBatchTimeout) + } +} + +func TestLoadRejectsInvalidBootstrapReadyBatch(t *testing.T) { + for _, test := range []struct { + name string + key string + value string + }{ + {name: "zero max", key: "TELESRV_BOOTSTRAP_READY_BATCH_MAX", value: "0"}, + {name: "wait too large", key: "TELESRV_BOOTSTRAP_READY_BATCH_WAIT", value: "1001ms"}, + {name: "queue below max", key: "TELESRV_BOOTSTRAP_READY_BATCH_QUEUE", value: "1"}, + {name: "timeout too large", key: "TELESRV_BOOTSTRAP_READY_BATCH_TIMEOUT", value: "31s"}, + } { + t.Run(test.name, func(t *testing.T) { + disableDefaultConfigFile(t) + t.Setenv(test.key, test.value) + if _, err := Load(); err == nil { + t.Fatalf("invalid %s=%s accepted", test.key, test.value) + } + }) + } +} + +func TestLoadPresenceLastSeenBatch(t *testing.T) { + disableDefaultConfigFile(t) + t.Setenv("TELESRV_PRESENCE_LAST_SEEN_BATCH_MAX", "73") + t.Setenv("TELESRV_PRESENCE_LAST_SEEN_BATCH_WAIT", "12ms") + t.Setenv("TELESRV_PRESENCE_LAST_SEEN_BATCH_QUEUE", "901") + t.Setenv("TELESRV_PRESENCE_LAST_SEEN_BATCH_TIMEOUT", "3s") + t.Setenv("TELESRV_PRESENCE_LAST_SEEN_DRAIN_TIMEOUT", "17s") + + cfg, err := Load() + if err != nil { + t.Fatalf("Load: %v", err) + } + if cfg.PresenceLastSeenBatchMax != 73 || cfg.PresenceLastSeenBatchWait != 12*time.Millisecond || + cfg.PresenceLastSeenBatchQueue != 901 || cfg.PresenceLastSeenBatchTimeout != 3*time.Second || + cfg.PresenceLastSeenDrainTimeout != 17*time.Second { + t.Fatalf("presence last-seen batch = %d/%v/%d/%v/%v", + cfg.PresenceLastSeenBatchMax, cfg.PresenceLastSeenBatchWait, + cfg.PresenceLastSeenBatchQueue, cfg.PresenceLastSeenBatchTimeout, + cfg.PresenceLastSeenDrainTimeout) + } +} + +func TestLoadRejectsInvalidPresenceLastSeenBatch(t *testing.T) { + for _, test := range []struct { + name string + key string + value string + }{ + {name: "zero max", key: "TELESRV_PRESENCE_LAST_SEEN_BATCH_MAX", value: "0"}, + {name: "wait too large", key: "TELESRV_PRESENCE_LAST_SEEN_BATCH_WAIT", value: "6s"}, + {name: "queue below max", key: "TELESRV_PRESENCE_LAST_SEEN_BATCH_QUEUE", value: "1"}, + {name: "timeout too large", key: "TELESRV_PRESENCE_LAST_SEEN_BATCH_TIMEOUT", value: "31s"}, + {name: "drain too large", key: "TELESRV_PRESENCE_LAST_SEEN_DRAIN_TIMEOUT", value: "61s"}, + } { + t.Run(test.name, func(t *testing.T) { + disableDefaultConfigFile(t) + t.Setenv(test.key, test.value) + if _, err := Load(); err == nil { + t.Fatalf("invalid %s=%s accepted", test.key, test.value) + } + }) + } +} + +func TestLoadS3BlobStorageConfig(t *testing.T) { + disableDefaultConfigFile(t) + t.Setenv("TELESRV_BLOB_BACKEND", "s3") + t.Setenv("TELESRV_BLOB_STAGING_DIR", `D:\staging\telesrv`) + t.Setenv("TELESRV_S3_ENDPOINT", "minio.example.test:9000") + t.Setenv("TELESRV_S3_BUCKET", "telesrv-media") + t.Setenv("TELESRV_S3_ACCESS_KEY_ID", "access") + t.Setenv("TELESRV_S3_SECRET_ACCESS_KEY", "secret") + t.Setenv("TELESRV_S3_USE_SSL", "false") + t.Setenv("TELESRV_S3_PATH_STYLE", "true") + t.Setenv("TELESRV_S3_CREATE_BUCKET", "true") + + cfg, err := Load() + if err != nil { + t.Fatalf("Load: %v", err) + } + if cfg.BlobBackendKind != "s3" || cfg.S3Endpoint != "minio.example.test:9000" || cfg.S3Bucket != "telesrv-media" { + t.Fatalf("unexpected s3 config: backend=%q endpoint=%q bucket=%q", cfg.BlobBackendKind, cfg.S3Endpoint, cfg.S3Bucket) + } + if cfg.S3UseSSL || !cfg.S3PathStyle || !cfg.S3CreateBucket { + t.Fatalf("unexpected s3 flags: ssl=%v path_style=%v create=%v", cfg.S3UseSSL, cfg.S3PathStyle, cfg.S3CreateBucket) + } +} + +func TestLoadRejectsInvalidBlobStorageConfig(t *testing.T) { + tests := []struct { + name string + backend string + endpoint string + bucket string + access string + secret string + }{ + {name: "unknown backend", backend: "mirror"}, + {name: "missing s3 endpoint", backend: "s3", bucket: "media", access: "access", secret: "secret"}, + {name: "endpoint has scheme", backend: "s3", endpoint: "http://minio:9000", bucket: "media", access: "access", secret: "secret"}, + {name: "missing s3 bucket", backend: "s3", endpoint: "minio:9000", access: "access", secret: "secret"}, + {name: "missing s3 credentials", backend: "s3", endpoint: "minio:9000", bucket: "media"}, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + disableDefaultConfigFile(t) + t.Setenv("TELESRV_BLOB_BACKEND", tt.backend) + t.Setenv("TELESRV_S3_ENDPOINT", tt.endpoint) + t.Setenv("TELESRV_S3_BUCKET", tt.bucket) + t.Setenv("TELESRV_S3_ACCESS_KEY_ID", tt.access) + t.Setenv("TELESRV_S3_SECRET_ACCESS_KEY", tt.secret) + if _, err := Load(); err == nil { + t.Fatal("invalid blob storage config accepted") + } + }) + } +} + +func TestLoadRejectsInvalidStorageCapacityConfig(t *testing.T) { + for _, item := range []struct{ key, value string }{ + {"TELESRV_STORAGE_MIN_FREE_BYTES", "-1"}, + {"TELESRV_STORAGE_MAX_TOTAL_BYTES", "-1"}, + {"TELESRV_STORAGE_USAGE_REFRESH_INTERVAL", "0s"}, + {"TELESRV_STORAGE_USAGE_REFRESH_INTERVAL", "-1s"}, + } { + t.Run(item.key+"="+item.value, func(t *testing.T) { + disableDefaultConfigFile(t) + t.Setenv(item.key, item.value) + if _, err := Load(); err == nil { + t.Fatalf("Load accepted invalid %s=%s", item.key, item.value) + } + }) + } +} + +func TestLoadUpdateServiceConfig(t *testing.T) { + disableDefaultConfigFile(t) + t.Setenv("TELESRV_UPDATE_PUBLIC_URL", "https://updates.example.test/root/") + t.Setenv("TELESRV_UPDATE_SERVICE_URL", "http://127.0.0.1:2402/") + t.Setenv("TELESRV_UPDATE_REQUEST_TIMEOUT", "3s") + + cfg, err := Load() + if err != nil { + t.Fatalf("Load: %v", err) + } + if cfg.UpdatePublicURL != "https://updates.example.test/root" || cfg.UpdateServiceURL != "http://127.0.0.1:2402" { + t.Fatalf("update URLs = %q / %q", cfg.UpdatePublicURL, cfg.UpdateServiceURL) + } + if cfg.UpdateRequestTimeout != 3*time.Second { + t.Fatalf("UpdateRequestTimeout = %v", cfg.UpdateRequestTimeout) + } +} + +func TestLoadUpdateServiceDefaultsInternalURLToPublic(t *testing.T) { + disableDefaultConfigFile(t) + t.Setenv("TELESRV_UPDATE_PUBLIC_URL", "https://updates.example.test") + + cfg, err := Load() + if err != nil { + t.Fatalf("Load: %v", err) + } + if cfg.UpdateServiceURL != cfg.UpdatePublicURL { + t.Fatalf("UpdateServiceURL = %q, want %q", cfg.UpdateServiceURL, cfg.UpdatePublicURL) + } +} + +func TestLoadRejectsInvalidUpdateServiceConfig(t *testing.T) { + disableDefaultConfigFile(t) + t.Setenv("TELESRV_UPDATE_PUBLIC_URL", "file:///updates") + if _, err := Load(); err == nil { + t.Fatal("invalid update public URL accepted") + } } func TestLoadPremiumPromoSeedDirOverride(t *testing.T) { @@ -165,6 +627,18 @@ func TestLoadStrictDCCheck(t *testing.T) { }) } +func TestLoadRejectsNonPositiveCanonicalDC(t *testing.T) { + for _, value := range []string{"0", "-2", "2147483648"} { + t.Run(value, func(t *testing.T) { + disableDefaultConfigFile(t) + t.Setenv("TELESRV_DC", value) + if _, err := Load(); err == nil { + t.Fatalf("Load accepted TELESRV_DC=%s", value) + } + }) + } +} + func TestLoadMTProtoAdmissionAndRPCBudgets(t *testing.T) { disableDefaultConfigFile(t) t.Setenv("TELESRV_MTPROTO_MAX_CONNECTIONS", "12345") @@ -176,6 +650,8 @@ func TestLoadMTProtoAdmissionAndRPCBudgets(t *testing.T) { t.Setenv("TELESRV_MTPROTO_RPC_GLOBAL_WORKERS", "33") t.Setenv("TELESRV_MTPROTO_RPC_GLOBAL_MAX_TASKS", "444") t.Setenv("TELESRV_MTPROTO_RPC_GLOBAL_MAX_BYTES", "555555") + t.Setenv("TELESRV_MTPROTO_RPC_DELIVERY_HOOK_WORKERS", "17") + t.Setenv("TELESRV_MTPROTO_RPC_DELIVERY_HOOK_MAX_PENDING", "777") t.Setenv("TELESRV_MTPROTO_RPC_EXECUTION_MAX_ENTRIES", "555") t.Setenv("TELESRV_MTPROTO_RPC_EXECUTION_AUTH_MAX_ENTRIES", "444") t.Setenv("TELESRV_MTPROTO_RPC_EXECUTION_SESSION_MAX_ENTRIES", "333") @@ -188,6 +664,9 @@ func TestLoadMTProtoAdmissionAndRPCBudgets(t *testing.T) { t.Setenv("TELESRV_TEMP_KEY_CACHE_MAX_ENTRIES", "666") t.Setenv("TELESRV_TEMP_KEY_CACHE_TTL", "17m") t.Setenv("TELESRV_ORPHAN_AUTH_KEY_RETENTION", "36h") + t.Setenv("TELESRV_CONTACT_SNAPSHOT_CACHE_MAX_VIEWERS", "1234") + t.Setenv("TELESRV_PROFILE_PHOTO_CACHE_MAX", "2345") + t.Setenv("TELESRV_PROFILE_PHOTO_CACHE_TTL", "36h") cfg, err := Load() if err != nil { @@ -200,6 +679,9 @@ func TestLoadMTProtoAdmissionAndRPCBudgets(t *testing.T) { cfg.MTProtoRPCGlobalWorkers != 33 || cfg.MTProtoRPCGlobalMaxTasks != 444 || cfg.MTProtoRPCGlobalMaxBytes != 555555 { t.Fatalf("rpc budget config = %d/%d/%v/%d/%d/%d", cfg.MTProtoRPCMaxInflight, cfg.MTProtoRPCQueueSize, cfg.MTProtoRPCTimeout, cfg.MTProtoRPCGlobalWorkers, cfg.MTProtoRPCGlobalMaxTasks, cfg.MTProtoRPCGlobalMaxBytes) } + if cfg.MTProtoRPCDeliveryHookWorkers != 17 || cfg.MTProtoRPCDeliveryHookMaxPending != 777 { + t.Fatalf("rpc delivery hook config = %d/%d", cfg.MTProtoRPCDeliveryHookWorkers, cfg.MTProtoRPCDeliveryHookMaxPending) + } if cfg.MTProtoRPCExecutionMaxEntries != 555 || cfg.MTProtoRPCExecutionAuthMaxEntries != 444 || cfg.MTProtoRPCExecutionSessionMaxEntries != 333 || @@ -219,6 +701,12 @@ func TestLoadMTProtoAdmissionAndRPCBudgets(t *testing.T) { if cfg.TempKeyResolveCacheMaxEntries != 666 || cfg.TempKeyResolveCacheTTL != 17*time.Minute || cfg.OrphanAuthKeyRetention != 36*time.Hour { t.Fatalf("auth key resource config = %d/%v/%v", cfg.TempKeyResolveCacheMaxEntries, cfg.TempKeyResolveCacheTTL, cfg.OrphanAuthKeyRetention) } + if cfg.ContactSnapshotCacheMaxViewers != 1234 { + t.Fatalf("contact snapshot cache viewers = %d", cfg.ContactSnapshotCacheMaxViewers) + } + if cfg.ProfilePhotoCacheMaxEntries != 2345 || cfg.ProfilePhotoCacheTTL != 36*time.Hour { + t.Fatalf("profile photo cache = %d/%v", cfg.ProfilePhotoCacheMaxEntries, cfg.ProfilePhotoCacheTTL) + } } func TestLoadRPCExecutionFairBudgetDefaults(t *testing.T) { @@ -237,6 +725,15 @@ func TestLoadRPCExecutionFairBudgetDefaults(t *testing.T) { cfg.MTProtoRPCExecutionSessionMaxEntries, cfg.MTProtoRPCExecutionPendingPerAuth) } + if cfg.MTProtoRPCDeliveryHookWorkers != 32 || cfg.MTProtoRPCDeliveryHookMaxPending != 16_384 { + t.Fatalf("rpc delivery hook defaults = %d/%d", cfg.MTProtoRPCDeliveryHookWorkers, cfg.MTProtoRPCDeliveryHookMaxPending) + } + if cfg.ContactSnapshotCacheMaxViewers != 16_384 { + t.Fatalf("contact snapshot cache default = %d", cfg.ContactSnapshotCacheMaxViewers) + } + if cfg.ProfilePhotoCacheMaxEntries != 200_000 || cfg.ProfilePhotoCacheTTL != 24*time.Hour { + t.Fatalf("profile photo cache defaults = %d/%v", cfg.ProfilePhotoCacheMaxEntries, cfg.ProfilePhotoCacheTTL) + } } func TestLoadRejectsInvalidRPCExecutionFairBudgets(t *testing.T) { @@ -246,7 +743,9 @@ func TestLoadRejectsInvalidRPCExecutionFairBudgets(t *testing.T) { value string }{ {name: "entry hierarchy", key: "TELESRV_MTPROTO_RPC_EXECUTION_MAX_ENTRIES", value: "1024"}, - {name: "pending hierarchy", key: "TELESRV_MTPROTO_RPC_EXECUTION_PENDING_PER_AUTH", value: "9000"}, + {name: "pending hierarchy", key: "TELESRV_MTPROTO_RPC_EXECUTION_PENDING_PER_AUTH", value: "33000"}, + {name: "delivery workers", key: "TELESRV_MTPROTO_RPC_DELIVERY_HOOK_WORKERS", value: "0"}, + {name: "delivery pending hierarchy", key: "TELESRV_MTPROTO_RPC_DELIVERY_HOOK_MAX_PENDING", value: "16"}, } for _, test := range tests { t.Run(test.name, func(t *testing.T) { @@ -259,6 +758,38 @@ func TestLoadRejectsInvalidRPCExecutionFairBudgets(t *testing.T) { } } +func TestLoadRejectsNonPositiveContactSnapshotCache(t *testing.T) { + for _, value := range []string{"0", "-1"} { + t.Run(value, func(t *testing.T) { + disableDefaultConfigFile(t) + t.Setenv("TELESRV_CONTACT_SNAPSHOT_CACHE_MAX_VIEWERS", value) + if _, err := Load(); err == nil { + t.Fatalf("Load accepted contact snapshot cache capacity %s", value) + } + }) + } +} + +func TestLoadRejectsInvalidProfilePhotoCache(t *testing.T) { + for _, test := range []struct { + key string + value string + }{ + {key: "TELESRV_PROFILE_PHOTO_CACHE_MAX", value: "0"}, + {key: "TELESRV_PROFILE_PHOTO_CACHE_MAX", value: "-1"}, + {key: "TELESRV_PROFILE_PHOTO_CACHE_TTL", value: "0s"}, + {key: "TELESRV_PROFILE_PHOTO_CACHE_TTL", value: "169h"}, + } { + t.Run(test.key+"="+test.value, func(t *testing.T) { + disableDefaultConfigFile(t) + t.Setenv(test.key, test.value) + if _, err := Load(); err == nil { + t.Fatalf("Load accepted invalid %s=%s", test.key, test.value) + } + }) + } +} + func TestLoadRejectsMalformedMTProtoCapacity(t *testing.T) { for _, test := range []struct { name string @@ -269,6 +800,7 @@ func TestLoadRejectsMalformedMTProtoCapacity(t *testing.T) { {name: "receipt entries overflow", key: "TELESRV_MTPROTO_RPC_EXECUTION_MAX_ENTRIES", value: "999999999999999999999999"}, {name: "tracked bytes overflow", key: "TELESRV_MTPROTO_OUTBOUND_TRACKED_GLOBAL_MAX_BYTES", value: "999999999999999999999999"}, {name: "outbound queue malformed", key: "TELESRV_MTPROTO_OUTBOUND_QUEUE_SIZE", value: "many"}, + {name: "profile photo entries malformed", key: "TELESRV_PROFILE_PHOTO_CACHE_MAX", value: "many"}, } { t.Run(test.name, func(t *testing.T) { disableDefaultConfigFile(t) @@ -539,6 +1071,21 @@ func TestLoadTranslationConfig(t *testing.T) { } } +func TestLoadStorySparseProjectionCacheConfig(t *testing.T) { + t.Setenv("TELESRV_CONFIG", "") + t.Setenv("TELESRV_STORY_ACTIVE_PEER_CACHE_MAX", "1234") + t.Setenv("TELESRV_STORY_HIDDEN_LIST_CACHE_MAX", "2345") + t.Setenv("TELESRV_STORY_HIDDEN_LIST_CACHE_BYTES_MAX", "3456") + cfg, err := Load() + if err != nil { + t.Fatalf("Load: %v", err) + } + if cfg.StoryActivePeerCacheMaxEntries != 1234 || cfg.StoryHiddenListCacheMaxEntries != 2345 || cfg.StoryHiddenListCacheMaxBytes != 3456 { + t.Fatalf("story sparse cache config = %d/%d/%d, want 1234/2345/3456", + cfg.StoryActivePeerCacheMaxEntries, cfg.StoryHiddenListCacheMaxEntries, cfg.StoryHiddenListCacheMaxBytes) + } +} + func TestLoadReadsEnvStyleConfigFile(t *testing.T) { path := filepath.Join(t.TempDir(), "telesrv.env") writeConfigFile(t, path, ` diff --git a/internal/domain/account.go b/internal/domain/account.go index 77369673..fca65d27 100644 --- a/internal/domain/account.go +++ b/internal/domain/account.go @@ -3,6 +3,7 @@ package domain import ( "errors" "strings" + "time" ) var ( @@ -120,6 +121,13 @@ type PasswordSettings struct { SRPBSecret []byte } +// RevenueWithdrawalPasswordState carries only the durable 2FA facts required +// by high-risk payout admission. It intentionally excludes password material. +type RevenueWithdrawalPasswordState struct { + HasPassword bool + PasswordChangedAt time.Time +} + // ReactionNotifyFrom stores one account-level reaction notification scope. type ReactionNotifyFrom string @@ -181,8 +189,21 @@ const ( MaxAccountTTLDays = 3650 ) +// DisallowedGifts stores the Layer 228 global gift-reception switches. +type DisallowedGifts struct { + UnlimitedStargifts bool + LimitedStargifts bool + UniqueStargifts bool + PremiumGifts bool + StargiftsFromChannel bool +} + +func (g DisallowedGifts) Zero() bool { + return !g.UnlimitedStargifts && !g.LimitedStargifts && !g.UniqueStargifts && + !g.PremiumGifts && !g.StargiftsFromChannel +} + // GlobalPrivacy 是 globalPrivacySettings 的业务层表达（账号级隐私开关）。 -// DisallowedGifts 依赖礼物资产模型（当前未实现），故不建模、保持默认。 type GlobalPrivacy struct { ArchiveAndMuteNewNoncontactPeers bool KeepArchivedUnmuted bool @@ -190,6 +211,7 @@ type GlobalPrivacy struct { HideReadMarks bool NewNoncontactPeersRequirePremium bool DisplayGiftsButton bool + DisallowedGifts DisallowedGifts // NoncontactPeersPaidStars：非联系人给本人发消息所需 Stars 数。Stars 账本尚未实现， // 此处仅做忠实持久化（往返不丢值），不参与计费逻辑。 NoncontactPeersPaidStars int64 diff --git a/internal/domain/account_deletion.go b/internal/domain/account_deletion.go index 282b8593..f5a5868e 100644 --- a/internal/domain/account_deletion.go +++ b/internal/domain/account_deletion.go @@ -90,10 +90,3 @@ type AccountDeletionCandidate struct { Source AccountDeletionSource DueAt time.Time } - -type AccountDeletionNotification struct { - ID int64 - TargetUserID int64 - DeletedUserID int64 - Attempts int -} diff --git a/internal/domain/authorization.go b/internal/domain/authorization.go index ae52b504..2594853d 100644 --- a/internal/domain/authorization.go +++ b/internal/domain/authorization.go @@ -21,8 +21,11 @@ type Authorization struct { // PasswordPending 表示该 auth_key 已通过短信验证码、但账号开启了两步验证且尚未通过 // auth.checkPassword。此状态下业务鉴权须视其为未登录，仅允许继续完成两步验证。 PasswordPending bool - CreatedAt time.Time - ActiveAt time.Time + // CreatedAt is the start of the current fully-authorized login session. Bind + // refreshes it for every login, and completing password_pending refreshes it + // again so time spent waiting for 2FA never satisfies payout freshness. + CreatedAt time.Time + ActiveAt time.Time } // AuthKeyClientInfo 是未登录 auth_key 也需要保留的客户端协商元数据。 diff --git a/internal/domain/bot_verification.go b/internal/domain/bot_verification.go index b23da94a..fe14d054 100644 --- a/internal/domain/bot_verification.go +++ b/internal/domain/bot_verification.go @@ -39,7 +39,7 @@ const ( MaxVerifierCompanyLength = 128 // MaxCustomVerificationDescriptionLength is the app-configured limit for text // supplied by a verifier (bot_verification_description_length_limit). - MaxCustomVerificationDescriptionLength = 70 + MaxCustomVerificationDescriptionLength = 128 // MaxBotVerificationDescriptionLength bounds the final wire description. It // may exceed the custom-input limit because the server-generated fallback // includes the organization name. diff --git a/internal/domain/bot_verification_test.go b/internal/domain/bot_verification_test.go new file mode 100644 index 00000000..c5963c8f --- /dev/null +++ b/internal/domain/bot_verification_test.go @@ -0,0 +1,27 @@ +package domain + +import ( + "testing" + "unicode/utf8" +) + +func TestBotVerifierSettingsAcceptsDescriptionLongerThan70Runes(t *testing.T) { + description := "This account is verified as official by the representatives of Telegram" + if got := utf8.RuneCountInString(description); got != 71 { + t.Fatalf("fixture length = %d, want 71", got) + } + + settings := BotVerifierSettings{ + BotID: 1, + IconDocumentID: 2, + CompanyName: "Example Trust", + DefaultDescription: description, + CanModifyCustomDescription: true, + } + if err := settings.Validate(); err != nil { + t.Fatalf("Validate() rejected 71-rune default description: %v", err) + } + if got, err := settings.DescriptionFor(description); err != nil || got != description { + t.Fatalf("DescriptionFor() = %q, %v; want fixture, nil", got, err) + } +} diff --git a/internal/domain/botapi_update.go b/internal/domain/botapi_update.go index 9f2599c4..37d0c15c 100644 --- a/internal/domain/botapi_update.go +++ b/internal/domain/botapi_update.go @@ -22,6 +22,9 @@ type BotCallbackQuery struct { ChatInstance int64 Data []byte InlineMessage *BotInlineMessageID + // ClientSession is available only to an in-process service bot. It must not + // become part of a durable/public Bot API CallbackQuery payload. + ClientSession ClientSessionMetadata `json:"-"` } // BotAPIEphemeralPayload is a self-contained 24-hour Bot API queue snapshot. diff --git a/internal/domain/channel.go b/internal/domain/channel.go index c531c048..d782bf4d 100644 --- a/internal/domain/channel.go +++ b/internal/domain/channel.go @@ -7,6 +7,11 @@ import ( ) const ( + // InitialChannelPts is the empty message-box state used by official clients + // before the first real channel event. The first event therefore has PTS 2. + InitialChannelPts = 1 + // FirstChannelEventPts is the PTS after the first single-count channel event. + FirstChannelEventPts = InitialChannelPts + 1 // MaxChannelDifferenceLimit limits a single updates.getChannelDifference page. MaxChannelDifferenceLimit = 100 // MaxChannelDifferenceTooLongMessages limits the latest message snapshot returned by channelDifferenceTooLong. @@ -188,23 +193,24 @@ const ( // ChannelAdminRights is a domain-only representation of Telegram admin rights. type ChannelAdminRights struct { - ChangeInfo bool - PostMessages bool - EditMessages bool - DeleteMessages bool - PostStories bool - EditStories bool - DeleteStories bool - BanUsers bool - InviteUsers bool - PinMessages bool - AddAdmins bool - ManageCall bool - ManageChat bool - ManageTopics bool - Anonymous bool - ManageRanks bool - ManageLinkedPeers bool + ChangeInfo bool + PostMessages bool + EditMessages bool + DeleteMessages bool + PostStories bool + EditStories bool + DeleteStories bool + BanUsers bool + InviteUsers bool + PinMessages bool + AddAdmins bool + ManageCall bool + ManageChat bool + ManageTopics bool + Anonymous bool + ManageRanks bool + ManageLinkedPeers bool + ManageWelcomeMessages bool // ManageDirectMessages 对应 TL ChatAdminRights.manage_direct_messages(flags.17)。母广播频道的 // 管理员据此被客户端授予 monoforum(频道私信)容器的 MonoforumAdmin 身份;creator 走 amCreator 旁路。 ManageDirectMessages bool @@ -213,22 +219,23 @@ type ChannelAdminRights struct { // CreatorChannelAdminRights returns the full rights set clients expect on creator projections. func CreatorChannelAdminRights() ChannelAdminRights { return ChannelAdminRights{ - ChangeInfo: true, - PostMessages: true, - EditMessages: true, - DeleteMessages: true, - PostStories: true, - EditStories: true, - DeleteStories: true, - BanUsers: true, - InviteUsers: true, - PinMessages: true, - AddAdmins: true, - ManageCall: true, - ManageChat: true, - ManageTopics: true, - ManageRanks: true, - ManageLinkedPeers: true, + ChangeInfo: true, + PostMessages: true, + EditMessages: true, + DeleteMessages: true, + PostStories: true, + EditStories: true, + DeleteStories: true, + BanUsers: true, + InviteUsers: true, + PinMessages: true, + AddAdmins: true, + ManageCall: true, + ManageChat: true, + ManageTopics: true, + ManageRanks: true, + ManageLinkedPeers: true, + ManageWelcomeMessages: true, } } @@ -540,6 +547,14 @@ func (m ChannelMember) CanManageDirectMessages() bool { (m.Role == ChannelRoleAdmin && m.AdminRights.ManageDirectMessages)) } +// CanManageWelcomeMessages is the Layer 229 creator/admin capability. Active +// membership is mandatory even if stale admin rights remain in persisted JSON. +func (m ChannelMember) CanManageWelcomeMessages() bool { + return m.Status == ChannelMemberActive && + (m.Role == ChannelRoleCreator || + (m.Role == ChannelRoleAdmin && m.AdminRights.ManageWelcomeMessages)) +} + // CanPostChannelMessages reports whether this active member may publish a post // to a broadcast channel. Suggested-post managers need this in addition to // CanManageDirectMessages when approving a subscriber-authored suggestion. diff --git a/internal/domain/client_session.go b/internal/domain/client_session.go new file mode 100644 index 00000000..28017e54 --- /dev/null +++ b/internal/domain/client_session.go @@ -0,0 +1,28 @@ +package domain + +import "strings" + +// ClientSessionMetadata is request-scoped initConnection/session context for +// in-process features such as localized service bots. It is deliberately not a +// durable message field and must never be exposed through the public Bot API. +type ClientSessionMetadata struct { + AuthKeyID [8]byte + SessionID int64 + SystemLangCode string + LangPack string + LangCode string +} + +// PreferredLanguage returns a normalized BCP-47 primary language subtag. +// Telegram clients normally send lang_code, with system_lang_code as fallback. +func (m ClientSessionMetadata) PreferredLanguage() string { + value := strings.TrimSpace(m.LangCode) + if value == "" { + value = strings.TrimSpace(m.SystemLangCode) + } + value = strings.ToLower(strings.ReplaceAll(value, "_", "-")) + if at := strings.IndexByte(value, '-'); at >= 0 { + value = value[:at] + } + return value +} diff --git a/internal/domain/client_session_test.go b/internal/domain/client_session_test.go new file mode 100644 index 00000000..c0c2fc35 --- /dev/null +++ b/internal/domain/client_session_test.go @@ -0,0 +1,21 @@ +package domain + +import "testing" + +func TestClientSessionMetadataPreferredLanguage(t *testing.T) { + for _, test := range []struct { + name string + in ClientSessionMetadata + want string + }{ + {name: "lang code wins", in: ClientSessionMetadata{LangCode: "RU-ru", SystemLangCode: "en-US"}, want: "ru"}, + {name: "system fallback", in: ClientSessionMetadata{SystemLangCode: "pt_BR"}, want: "pt"}, + {name: "empty", in: ClientSessionMetadata{}, want: ""}, + } { + t.Run(test.name, func(t *testing.T) { + if got := test.in.PreferredLanguage(); got != test.want { + t.Fatalf("PreferredLanguage() = %q, want %q", got, test.want) + } + }) + } +} diff --git a/internal/domain/contact.go b/internal/domain/contact.go index 38403299..3584910f 100644 --- a/internal/domain/contact.go +++ b/internal/domain/contact.go @@ -21,6 +21,15 @@ type ContactList struct { Hash int64 } +// ContactProjectionBatch is a viewer-owned contact read model for fan-out +// projection. Contacts[viewerID][targetUserID] is the same row GetMany(viewer) +// would return; PersonalPhotos carries that viewer's personal photo overrides +// for the same target set. +type ContactProjectionBatch struct { + Contacts map[int64]map[int64]Contact + PersonalPhotos map[int64]map[int64]ProfilePhotoRef +} + // CloseFriendsEditResult describes a full close-friends list replacement. type CloseFriendsEditResult struct { AddedUserIDs []int64 diff --git a/internal/domain/dialog.go b/internal/domain/dialog.go index cc6607c9..4ffb4267 100644 --- a/internal/domain/dialog.go +++ b/internal/domain/dialog.go @@ -92,6 +92,21 @@ type Dialog struct { UnreadMark bool ViewForumAsMessages bool PeerSettingsBarHidden bool + // TopMessageMentioned/MediaUnread/UnreadProjected are internal owner-view + // facts for materialized channel dialog snapshots. They are not TL dialog + // fields; response assembly applies them to the shared top-message payload. + TopMessageMentioned bool + TopMessageMediaUnread bool + TopMessageUnreadProjected bool + // DefaultSendAs is internal owner-view channel dialog metadata. It is kept + // in the materialized owner snapshot so warming the exact viewer/channel + // projection cannot erase channels.setDefaultSendAs state. + DefaultSendAs *Peer + // ChannelMember is the internal exact access/read projection captured with + // a materialized channel dialog. It is never a TL dialog field. Keeping it + // under the same dialog_owner generation lets startup warm permission reads + // before channel difference without a per-channel PostgreSQL lookup. + ChannelMember *ChannelMember // Pts 是 channel peer 当前 channel pts；客户端用 dialog.pts 初始化本地 // channel 序列并决定 getChannelDifference 起点，channel dialog 必填。 Pts int @@ -168,6 +183,10 @@ type DialogArchiveSummary struct { // TopPeer/TopMessage 是归档内最新会话及其 top 消息（dialogFolder.peer/top_message）。 TopPeer Peer TopMessage int + // TopDialog retains the owner projection needed to hydrate a channel archive + // top payload without re-reading channel_members/channel_dialogs. It is an + // internal read-model field and is never converted into a second TL dialog. + TopDialog *Dialog // UnreadPeersCount 是归档内有未读（或手动标记未读）的会话数； // UnreadMessagesCount 是归档未读消息总数。当前未接 per-peer mute // 状态，全部计入 unmuted 桶。 diff --git a/internal/domain/gif_catalog.go b/internal/domain/gif_catalog.go index 7a098392..cfac7483 100644 --- a/internal/domain/gif_catalog.go +++ b/internal/domain/gif_catalog.go @@ -18,6 +18,9 @@ var ( // ErrGifCatalogEntryNotFound is returned by an update/delete against an id // that doesn't exist. ErrGifCatalogEntryNotFound = errors.New("gif catalog entry not found") + // ErrGifCatalogFull is returned when a create would push the catalog past + // MaxGifCatalogEntries. + ErrGifCatalogFull = errors.New("gif catalog is full") ) const ( diff --git a/internal/domain/login_code_delivery.go b/internal/domain/login_code_delivery.go index 6f4ff134..517fa20a 100644 --- a/internal/domain/login_code_delivery.go +++ b/internal/domain/login_code_delivery.go @@ -8,11 +8,13 @@ import ( "telesrv/internal/branding" ) -const officialLoginCodeMessageTemplate = `Login code: %s. Do not give this code to anyone, even if they say they are from ` + branding.ProductName + `! +func officialLoginCodeMessageTemplate() string { + return `Login code: %s. Do not give this code to anyone, even if they say they are from ` + branding.ProductName + `! This code can be used to log in to your ` + branding.ProductName + ` account. We never ask it for anything else. If you didn't request this code by trying to log in on another device, simply ignore this message.` +} // LoginCodeDeliveryRequest describes one durable 777000 login-code delivery. // PhoneCodeHash is an opaque idempotency token and must never be persisted in @@ -41,7 +43,7 @@ func OfficialLoginCodeMessage(userID int64, code string, date int) (Message, err if userID <= 0 || IsSystemUserID(userID) || strings.TrimSpace(code) == "" || len(code) > 64 || date < 0 || date > math.MaxInt32 { return Message{}, fmt.Errorf("%w: user=%d code_length=%d date=%d", ErrLoginCodeDeliveryInvalid, userID, len(code), date) } - body := fmt.Sprintf(officialLoginCodeMessageTemplate, code) + body := fmt.Sprintf(officialLoginCodeMessageTemplate(), code) codeOffset := len("Login code: ") return Message{ OwnerUserID: userID, diff --git a/internal/domain/media.go b/internal/domain/media.go index 8bfd5018..b610898b 100644 --- a/internal/domain/media.go +++ b/internal/domain/media.go @@ -12,7 +12,7 @@ import ( // 字段带 json tag 是为了 store 层可直接 json.Marshal 落 JSONB（消息 media 快照、 // 文档/照片元数据）。它们是协议无关的纯数据，不是 tg 生成类型。 -// MediaBackend 标识 blob 字节实际存放后端。第一阶段只有本地磁盘。 +// MediaBackend 标识 blob 字节实际存放的唯一永久后端。 type MediaBackend string const ( @@ -664,15 +664,15 @@ type MessageNoForwardsAction struct { // MessageServiceAction 是私聊服务消息动作的协议中立表示。 type MessageServiceAction struct { - Kind MessageServiceActionKind `json:"kind"` - Photo *Photo `json:"photo,omitempty"` - Call *MessagePhoneCallAction `json:"call,omitempty"` - ConferenceCall *MessageConferenceCallAction `json:"conference_call,omitempty"` - BotAllowed *MessageBotAllowedAction `json:"bot_allowed,omitempty"` - WebViewData *MessageWebViewDataAction `json:"web_view_data,omitempty"` - RequestedPeer *MessageRequestedPeerAction `json:"requested_peer,omitempty"` - ChatThemeEmoticon string `json:"chat_theme_emoticon,omitempty"` - NoForwards *MessageNoForwardsAction `json:"no_forwards,omitempty"` + Kind MessageServiceActionKind `json:"kind"` + Photo *Photo `json:"photo,omitempty"` + Call *MessagePhoneCallAction `json:"call,omitempty"` + ConferenceCall *MessageConferenceCallAction `json:"conference_call,omitempty"` + BotAllowed *MessageBotAllowedAction `json:"bot_allowed,omitempty"` + WebViewData *MessageWebViewDataAction `json:"web_view_data,omitempty"` + RequestedPeer *MessageRequestedPeerAction `json:"requested_peer,omitempty"` + ChatThemeEmoticon string `json:"chat_theme_emoticon,omitempty"` + NoForwards *MessageNoForwardsAction `json:"no_forwards,omitempty"` } // MessageMedia 是一条消息媒体载荷的业务表示（落库为消息行上的 JSONB 快照）。 diff --git a/internal/domain/media_category.go b/internal/domain/media_category.go index e2098816..ff7adefa 100644 --- a/internal/domain/media_category.go +++ b/internal/domain/media_category.go @@ -51,14 +51,21 @@ func (c MediaCategoryCounts) CountAny(categories []MediaCategory) int { // Categories 是该标签页映射到的基础类别并集（PhotoVideo→[Photo,Video]、RoundVoice→[Voice,RoundVideo]）。 // 分页对齐历史语义：OffsetID 为游标（返回 id 严格小于它）、AddOffset 为额外偏移、MaxID/MinID 为闭区间。 type MediaSearchRequest struct { - Categories []MediaCategory - OffsetID int - AddOffset int - Limit int - MaxID int - MinID int - KnownCount int - HasKnownCount bool + Categories []MediaCategory + Query string + SenderUserID int64 + MinDate int + MaxDate int + TopMsgID int + SavedPeer Peer + SavedReactions []MessageReaction + OffsetID int + AddOffset int + Limit int + MaxID int + MinID int + KnownCount int + HasKnownCount bool } // ClassifyMediaCategories 返回一条消息所属的全部共享媒体类别（可为空：无媒体且无链接， diff --git a/internal/domain/media_errors.go b/internal/domain/media_errors.go index 0c424344..5974c6cd 100644 --- a/internal/domain/media_errors.go +++ b/internal/domain/media_errors.go @@ -9,8 +9,8 @@ var ( ErrFilePartsInvalid = errors.New("file parts invalid") ErrFilePartTooBig = errors.New("file part too big") ErrUploadQuotaExceeded = errors.New("upload quota exceeded") - ErrPhotoInvalid = errors.New("photo invalid") - ErrDocumentInvalid = errors.New("document invalid") + ErrPhotoInvalid = errors.New("photo invalid") + ErrDocumentInvalid = errors.New("document invalid") // ErrStorageFull is returned when the configured low-space guard rejects a // write: local disk free bytes (or, on the s3 backend, the configured // total-bytes budget) has fallen below the configured threshold. diff --git a/internal/domain/message.go b/internal/domain/message.go index 4be181e0..f48cf3ab 100644 --- a/internal/domain/message.go +++ b/internal/domain/message.go @@ -159,6 +159,9 @@ type Message struct { // Pinned 是 owner 视角的置顶标志（官方私聊多置顶语义：双方各自 // 的 box 行独立持有，非 pm_oneside 操作两侧同步翻转）。 Pinned bool + // Deleted 是 owner 视角的软删除可见性标记。它只用于更新重放/差分恢复 + // 判断是否还能下发消息快照；普通历史查询应在 store 层直接过滤 deleted box。 + Deleted bool // SavedPeer 是 Saved Messages 分会话分组键（message.saved_peer_id）。 // 仅 self-chat box 行非零：直发笔记 = self；转发进收藏夹 = 源会话 peer； // 存量回填兜底 hidden author 占位 user 2666000。非 self-chat 行恒零值。 @@ -196,7 +199,9 @@ func IsHistoryClearServiceMessage(msg Message) bool { msg.Media.ServiceAction.Kind == MessageServiceActionHistoryClear } -// MessageRichMessage 是 Layer 228 富文本消息（richMessage）的协议中立快照：一组 IV +const MessageRichBlocksLegacyLayer = 228 + +// MessageRichMessage 是富文本消息（richMessage）的协议中立快照：一组 IV // PageBlock（Blocks）+ 内嵌已解析的 Photos/Documents。 // // Blocks 存 gotd TL 序列化后的 []tg.PageBlockClass 不透明字节——PageBlock 体系庞大且 @@ -205,20 +210,32 @@ func IsHistoryClearServiceMessage(msg Message) bool { // 与 message media 同理，Photos/Documents 存已解析快照（含 viewer 无关的 access_hash）， // 投影复用 tgPhoto/tgDocument。HTML/Markdown 输入也会在 RPC 边界归一为同一组 Blocks。 // -// 已知局限：Blocks 是 gotd 线格式不透明字节，跨 gotd 版本（PageBlock 构造器变更）可能 -// 失效——富文本消息为全新实验特性、无存量数据，Phase 1 接受该耦合。 +// BlocksLayer 是这份持久化字节的 exact TL profile，而不是发送客户端的 Layer。历史记录 +// 没有该字段；0 是正式的 storage-v1 标记，固定解释为 Layer 228。新写入必须显式保存 +// 编码时的 profile，读取不得靠 constructor 试解或失败后回退。 type MessageRichMessage struct { - Rtl bool `json:"rtl,omitempty"` - Part bool `json:"part,omitempty"` - Blocks []byte `json:"blocks,omitempty"` - Photos []Photo `json:"photos,omitempty"` - Documents []Document `json:"documents,omitempty"` + Rtl bool `json:"rtl,omitempty"` + Part bool `json:"part,omitempty"` + BlocksLayer int `json:"blocks_layer,omitempty"` + Blocks []byte `json:"blocks,omitempty"` + Photos []Photo `json:"photos,omitempty"` + Documents []Document `json:"documents,omitempty"` // BotAPIProjection 是由 RPC 边界从同一组已校验 PageBlock 派生出的 // Bot API RichMessage JSON。它不是第二事实源：写入边界只允许从 Blocks // 生成，HTTP Bot API 投影只读，避免 botapi 包反向依赖 tg 类型。 BotAPIProjection []byte `json:"bot_api_projection,omitempty"` } +// EffectiveBlocksLayer returns the deterministic storage grammar for Blocks. +// A missing JSON field is the original storage-v1 format and therefore Layer +// 228; it is not an adaptive decode fallback. +func (m *MessageRichMessage) EffectiveBlocksLayer() int { + if m == nil || m.BlocksLayer == 0 { + return MessageRichBlocksLegacyLayer + } + return m.BlocksLayer +} + // IsZero 表示无富文本载荷（落库时跳过空快照、投影时不下发 rich_message）。 func (m *MessageRichMessage) IsZero() bool { return m == nil || (len(m.Blocks) == 0 && len(m.Photos) == 0 && len(m.Documents) == 0) @@ -274,7 +291,11 @@ type MessageFilter struct { // userFull.pinned_msg_id 的查询路径）。 PinnedOnly bool MusicOnly bool - NeedTotalCount bool + PhoneCallsOnly bool + // MissedPhoneCallsOnly narrows PhoneCallsOnly to incoming calls that ended + // with the protocol-level "missed" reason. + MissedPhoneCallsOnly bool + NeedTotalCount bool // SavedPeer 非零时仅返回 self-chat 中该 saved 子会话的消息 // （messages.getSavedHistory）；Peer 必须同时是 self。 SavedPeer Peer @@ -302,6 +323,10 @@ type SendPrivateTextRequest struct { Date int OriginAuthKeyID [8]byte OriginSessionID int64 + // OriginClientSession carries the exact request's initConnection language + // into an in-process bot responder. Stores and idempotency fingerprints + // intentionally ignore this ephemeral metadata. + OriginClientSession ClientSessionMetadata // OriginUserID identifies the authenticated initiator when a server-generated // service message is authored by another user. Zero preserves the ordinary // send path where the sender is the initiator. diff --git a/internal/domain/message_entity_autodetect.go b/internal/domain/message_entity_autodetect.go new file mode 100644 index 00000000..8bd98768 --- /dev/null +++ b/internal/domain/message_entity_autodetect.go @@ -0,0 +1,250 @@ +package domain + +import ( + "strings" + "unicode" + "unicode/utf8" +) + +// MessageEntitySpan describes an already occupied UTF-16 range while deriving +// automatic entities. It deliberately carries no TL or entity-type semantics. +type MessageEntitySpan struct { + Offset int + Length int +} + +// DetectAutomaticMessageEntities derives the server-recognized lexical +// entities that do not require user intent: mentions, hashtags, cashtags and +// bot commands. Offsets and lengths use Telegram's UTF-16 code-unit indexing. +// +// occupied ranges win over derived entities. URL-like tokens are also treated +// as occupied for lexical triggers, so strings such as https://t.me/@name do +// not become misleading mention entities even when URL projection is handled +// by a different boundary. +func DetectAutomaticMessageEntities(message string, occupied []MessageEntitySpan) []MessageEntity { + if message == "" || !strings.ContainsAny(message, "@#$/") { + return nil + } + type interval struct{ start, end int } + blocked := make([]interval, 0, len(occupied)+8) + for _, span := range occupied { + if span.Offset >= 0 && span.Length > 0 { + blocked = append(blocked, interval{start: span.Offset, end: span.Offset + span.Length}) + } + } + overlaps := func(start, end int) bool { + for _, span := range blocked { + if start < span.end && span.start < end { + return true + } + } + return false + } + var out []MessageEntity + accept := func(entity MessageEntity) { + if entity.Length <= 0 || len(out) >= MaxMessageEntityCount { + return + } + end := entity.Offset + entity.Length + if overlaps(entity.Offset, end) { + return + } + out = append(out, entity) + blocked = append(blocked, interval{start: entity.Offset, end: end}) + } + + for _, entity := range detectMentionMessageEntities(message) { + accept(entity) + } + for _, entity := range detectHashtagMessageEntities(message) { + accept(entity) + } + for _, entity := range detectCashtagMessageEntities(message) { + accept(entity) + } + for _, entity := range detectBotCommandMessageEntities(message) { + accept(entity) + } + return out +} + +func detectMentionMessageEntities(message string) []MessageEntity { + var out []MessageEntity + for i := 0; i < len(message); i++ { + if message[i] != '@' || automaticEntityInsideURLLikeToken(message, i) { + continue + } + if r, ok := previousRune(message, i); ok && (automaticEntityWordRune(r) || r == '@') { + continue + } + end := i + 1 + for end < len(message) && automaticEntityUsernameByte(message[end]) { + end++ + } + if length := end - i - 1; length < 1 || length > 32 { + continue + } + out = append(out, MessageEntity{ + Type: MessageEntityMention, + Offset: automaticEntityUTF16Length(message[:i]), + Length: automaticEntityUTF16Length(message[i:end]), + }) + i = end - 1 + } + return out +} + +func detectBotCommandMessageEntities(message string) []MessageEntity { + var out []MessageEntity + for i := 0; i < len(message); i++ { + if message[i] != '/' || automaticEntityInsideURLLikeToken(message, i) { + continue + } + if r, ok := previousRune(message, i); ok && (automaticEntityWordRune(r) || r == '/' || r == '@' || r == '<') { + continue + } + end := i + 1 + for end < len(message) && automaticEntityUsernameByte(message[end]) { + end++ + } + if length := end - i - 1; length < 1 || length > 64 { + continue + } + if end < len(message) && message[end] == '@' { + botEnd := end + 1 + for botEnd < len(message) && automaticEntityUsernameByte(message[botEnd]) { + botEnd++ + } + if length := botEnd - end - 1; length >= 1 && length <= 32 { + end = botEnd + } + } + out = append(out, MessageEntity{ + Type: MessageEntityBotCommand, + Offset: automaticEntityUTF16Length(message[:i]), + Length: automaticEntityUTF16Length(message[i:end]), + }) + i = end - 1 + } + return out +} + +func detectHashtagMessageEntities(message string) []MessageEntity { + var out []MessageEntity + for i := 0; i < len(message); i++ { + if message[i] != '#' || automaticEntityInsideURLLikeToken(message, i) { + continue + } + if r, ok := previousRune(message, i); ok && (automaticEntityWordRune(r) || r == '#' || r == '@') { + continue + } + end := i + 1 + var first rune + count := 0 + for end < len(message) { + r, size := utf8.DecodeRuneInString(message[end:]) + if size <= 0 || !automaticEntityHashtagRune(r) { + break + } + if count == 0 { + first = r + } + count++ + end += size + } + if count >= 1 && count <= 256 && !unicode.IsDigit(first) { + out = append(out, MessageEntity{ + Type: MessageEntityHashtag, + Offset: automaticEntityUTF16Length(message[:i]), + Length: automaticEntityUTF16Length(message[i:end]), + }) + i = end - 1 + } + } + return out +} + +func detectCashtagMessageEntities(message string) []MessageEntity { + var out []MessageEntity + for i := 0; i < len(message); i++ { + if message[i] != '$' || automaticEntityInsideURLLikeToken(message, i) { + continue + } + if r, ok := previousRune(message, i); ok && (automaticEntityWordRune(r) || r == '$') { + continue + } + end := i + 1 + for end < len(message) && message[end] >= 'A' && message[end] <= 'Z' { + end++ + } + if length := end - i - 1; length < 1 || length > 8 { + continue + } + if r, size := utf8.DecodeRuneInString(message[end:]); size > 0 && automaticEntityWordRune(r) { + continue + } + out = append(out, MessageEntity{ + Type: MessageEntityCashtag, + Offset: automaticEntityUTF16Length(message[:i]), + Length: automaticEntityUTF16Length(message[i:end]), + }) + i = end - 1 + } + return out +} + +func automaticEntityInsideURLLikeToken(message string, byteIndex int) bool { + start := byteIndex + for start > 0 { + r, size := utf8.DecodeLastRuneInString(message[:start]) + if size <= 0 || automaticEntityURLBoundary(r) { + break + } + start -= size + } + prefix := strings.TrimLeft(message[start:byteIndex], "([{（【") + if strings.Contains(prefix, "://") { + return true + } + separator := strings.IndexAny(prefix, "/?#") + if separator <= 0 { + return false + } + host := prefix[:separator] + return strings.Contains(host, ".") && !strings.Contains(host, "@") +} + +func automaticEntityURLBoundary(r rune) bool { + return unicode.IsSpace(r) || strings.ContainsRune("<>\"'）】", r) +} + +func previousRune(message string, byteIndex int) (rune, bool) { + if byteIndex <= 0 || byteIndex > len(message) { + return 0, false + } + r, size := utf8.DecodeLastRuneInString(message[:byteIndex]) + return r, size > 0 +} + +func automaticEntityWordRune(r rune) bool { + return r == '_' || unicode.IsLetter(r) || unicode.IsDigit(r) +} + +func automaticEntityHashtagRune(r rune) bool { + return automaticEntityWordRune(r) +} + +func automaticEntityUsernameByte(b byte) bool { + return b == '_' || b >= 'a' && b <= 'z' || b >= 'A' && b <= 'Z' || b >= '0' && b <= '9' +} + +func automaticEntityUTF16Length(text string) int { + length := 0 + for _, r := range text { + length++ + if r > 0xffff { + length++ + } + } + return length +} diff --git a/internal/domain/message_entity_autodetect_test.go b/internal/domain/message_entity_autodetect_test.go new file mode 100644 index 00000000..0f9fe5e2 --- /dev/null +++ b/internal/domain/message_entity_autodetect_test.go @@ -0,0 +1,82 @@ +package domain + +import ( + "reflect" + "strings" + "testing" +) + +func TestDetectAutomaticMessageEntitiesUsesUTF16AndWhitespaceBoundaries(t *testing.T) { + message := "اعلان 🚀\n\n@matrixG" + want := []MessageEntity{{Type: MessageEntityMention, Offset: 10, Length: 8}} + if got := DetectAutomaticMessageEntities(message, nil); !reflect.DeepEqual(got, want) { + t.Fatalf("entities = %+v, want %+v", got, want) + } +} + +func TestDetectAutomaticMessageEntitiesCoversLexicalTypes(t *testing.T) { + message := "@alice #golang $USD /help@matrix_bot" + want := []MessageEntity{ + {Type: MessageEntityMention, Offset: 0, Length: 6}, + {Type: MessageEntityHashtag, Offset: 7, Length: 7}, + {Type: MessageEntityCashtag, Offset: 15, Length: 4}, + {Type: MessageEntityBotCommand, Offset: 20, Length: 16}, + } + if got := DetectAutomaticMessageEntities(message, nil); !reflect.DeepEqual(got, want) { + t.Fatalf("entities = %+v, want %+v", got, want) + } +} + +func TestDetectAutomaticMessageEntitiesSkipsEmailURLsAndOccupiedRanges(t *testing.T) { + message := "mail bob@example.com https://t.me/@scam github.com/@other @real" + got := DetectAutomaticMessageEntities(message, []MessageEntitySpan{{Offset: 58, Length: 5}}) + if len(got) != 0 { + t.Fatalf("entities = %+v, want no email, URL-path or occupied mention", got) + } +} + +func TestDetectAutomaticMessageEntitiesMentionBoundaries(t *testing.T) { + tests := []struct { + name string + message string + want []MessageEntity + }{ + { + name: "maximum username length", + message: "\n@" + strings.Repeat("a", 32), + want: []MessageEntity{{Type: MessageEntityMention, Offset: 1, Length: 33}}, + }, + { + name: "username too long", + message: "@" + strings.Repeat("a", 33), + }, + { + name: "unicode word prefix", + message: "نام@matrixG", + }, + { + name: "duplicate at prefix", + message: "@@matrixG", + }, + { + name: "punctuation boundary", + message: "(@matrixG)", + want: []MessageEntity{{Type: MessageEntityMention, Offset: 1, Length: 8}}, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + if got := DetectAutomaticMessageEntities(tt.message, nil); !reflect.DeepEqual(got, tt.want) { + t.Fatalf("entities = %+v, want %+v", got, tt.want) + } + }) + } +} + +func TestDetectAutomaticMessageEntitiesCapsDerivedEntities(t *testing.T) { + message := strings.Repeat("@a ", MaxMessageEntityCount+1) + got := DetectAutomaticMessageEntities(message, nil) + if len(got) != MaxMessageEntityCount { + t.Fatalf("entity count = %d, want %d", len(got), MaxMessageEntityCount) + } +} diff --git a/internal/domain/message_markup.go b/internal/domain/message_markup.go index da638c88..0e152c4d 100644 --- a/internal/domain/message_markup.go +++ b/internal/domain/message_markup.go @@ -65,6 +65,9 @@ const ( MarkupButtonSimpleWebView MarkupButtonType = "simple_webview" MarkupButtonSwitchInline MarkupButtonType = "switch_inline" MarkupButtonCopy MarkupButtonType = "copy" + // MarkupButtonBuy is keyboardButtonBuy. It is valid only on an inline + // keyboard attached to invoice media. + MarkupButtonBuy MarkupButtonType = "buy" ) // MarkupButtonStyle is the protocol-neutral semantic button color. Telegram @@ -375,6 +378,11 @@ func validateMarkupButton(b MarkupButton, replyKeyboard bool) error { if b.CopyText == "" || utf8.RuneCountInString(b.CopyText) > 256 { return ErrButtonInvalid } + case MarkupButtonBuy: + if len(b.Data) != 0 || b.URL != "" || b.Query != "" || b.CopyText != "" || + b.RequiresPassword || b.LoginBotUserID != 0 || b.ButtonID != 0 { + return ErrButtonInvalid + } default: // webview/game/url_auth/request_* 等 P3 未实现类型：拒绝，绝不半实现下发。 return ErrButtonTypeInvalid diff --git a/internal/domain/message_test.go b/internal/domain/message_test.go index 5e0093b4..fcc403f2 100644 --- a/internal/domain/message_test.go +++ b/internal/domain/message_test.go @@ -1,10 +1,32 @@ package domain import ( + "encoding/json" "errors" "testing" ) +func TestMessageRichMessageMissingBlocksLayerIsLegacy228(t *testing.T) { + var rich MessageRichMessage + if err := json.Unmarshal([]byte(`{"blocks":"FQ=="}`), &rich); err != nil { + t.Fatal(err) + } + if got := rich.EffectiveBlocksLayer(); got != MessageRichBlocksLegacyLayer { + t.Fatalf("effective blocks layer = %d, want %d", got, MessageRichBlocksLegacyLayer) + } + if rich.BlocksLayer != 0 { + t.Fatalf("legacy JSON mutated stored blocks layer to %d", rich.BlocksLayer) + } +} + +func TestMessageRichMessageExplicitBlocksLayer(t *testing.T) { + const storedLayer = 230 + rich := MessageRichMessage{BlocksLayer: storedLayer} + if got := rich.EffectiveBlocksLayer(); got != storedLayer { + t.Fatalf("effective blocks layer = %d, want %d", got, storedLayer) + } +} + func TestValidateMessageReplyBoundsRejectsQuoteOffsetAsTextOffset(t *testing.T) { reply := &MessageReply{ MessageID: 1, diff --git a/internal/domain/phone_change.go b/internal/domain/phone_change.go index 4ab69297..a1402ed4 100644 --- a/internal/domain/phone_change.go +++ b/internal/domain/phone_change.go @@ -1,8 +1,8 @@ package domain -// PhoneChangeRequest 是账号改号的持久化命令。PG 实现必须把 User、Event 与 -// dispatch outbox 放在同一事务；Exclude* 精确排除发起设备，因为当前设备从 -// account.changePhone 的 User 返回值更新本地状态。 +// PhoneChangeRequest 是账号改号的持久化命令。updateUserPhone 不携带 PTS， +// 因此该命令只维护号码事实；Exclude* 保留在 DTO 中用于兼容调用边界，在线 +// 非 PTS 通知由 RPC 层按发起设备排除。 type PhoneChangeRequest struct { UserID int64 Phone string @@ -18,6 +18,5 @@ type PhoneChangeRequest struct { type PhoneChangeResult struct { User User - Event UpdateEvent Changed bool } diff --git a/internal/domain/secretchat.go b/internal/domain/secretchat.go index ed30644c..15104264 100644 --- a/internal/domain/secretchat.go +++ b/internal/domain/secretchat.go @@ -25,15 +25,16 @@ var ( ErrSecretChatAlreadyAccepted = errors.New("secretchat: already accepted") // ErrSecretChatAlreadyDeclined：accept 一个已销毁的密聊 → ENCRYPTION_ALREADY_DECLINED。 ErrSecretChatAlreadyDeclined = errors.New("secretchat: already declined") - // ErrSecretChatIDConflict：chat_id 主键撞键（计数器回退）；调用方按 AtLeast 重分配重试。 - ErrSecretChatIDConflict = errors.New("secretchat: chat id conflict") + // ErrSecretChatRandomIDDuplicate：requestEncryption.random_id 已被不同意图或其它 + // auth key 占用。random_id 同时就是 chat_id，禁止另分配 ID 规避碰撞。 + ErrSecretChatRandomIDDuplicate = errors.New("secretchat: random id duplicate") ) // SecretChat 是一通私聊密聊的服务端权威态（durable，跨重启存活）。 // 字段命名对齐 TL encryptedChat*；ID 是 int32 量级，access_hash/admin_id/ // participant_id/key_fingerprint 是 int64。绑定维度是设备级（perm auth_key 的 int64 值）。 type SecretChat struct { - // ID 是 chat_id，全局单调 int32 序列；双方共享同一 id。 + // ID 是 chat_id，必须逐位等于 requestEncryption.random_id（非零 int32）；双方共享同一 id。 ID int // AdminAccessHash / ParticipantAccessHash 双视角不同（TL "check sum depending on user ID"）。 AdminAccessHash int64 @@ -108,6 +109,19 @@ func (c SecretChat) PeerAuthKeyOf(userID int64) int64 { } } +// AuthKeyOf 返回 userID 自身绑定的 permanent auth key；非参与者或尚未绑定返回 0。 +// 已建立密聊的所有读写授权必须同时匹配 user 与该 auth key，不能只依赖账号身份。 +func (c SecretChat) AuthKeyOf(userID int64) int64 { + switch userID { + case c.AdminUserID: + return c.AdminAuthKeyID + case c.ParticipantUserID: + return c.ParticipantAuthKeyID + default: + return 0 + } +} + // AccessHashFor 返回 userID 视角的 access_hash（双方不同）；非参与者返回 0。 func (c SecretChat) AccessHashFor(userID int64) int64 { switch userID { @@ -177,6 +191,12 @@ type SecretMessageDelivery struct { Date int } +// MaxSecretMessageDataBytes bounds the opaque encrypted DecryptedMessage payload persisted in +// the device queue. Secret-chat media bytes travel through the file service, so a 1 MiB metadata +// envelope is already well above the payload emitted by the supported clients while keeping one +// request independent from the process-wide MTProto admission budget. +const MaxSecretMessageDataBytes = 1 << 20 + // SecretChatRequest 是 requestEncryption 受理入参（隐私/拉黑/self/bot 校验在 rpc 层先行）。 type SecretChatRequest struct { AdminUserID int64 diff --git a/internal/domain/stats.go b/internal/domain/stats.go new file mode 100644 index 00000000..66164adf --- /dev/null +++ b/internal/domain/stats.go @@ -0,0 +1,169 @@ +package domain + +import ( + "errors" + "fmt" + "strconv" + "strings" +) + +const ( + // MaxChannelStatsDays bounds every aggregate query independently of the + // client request. The RPC currently requests seven days, while keeping a + // small domain ceiling makes future callers safe by construction. + MaxChannelStatsDays = 31 + // MaxChannelStatsTopPosters bounds the user hydration work at the RPC edge. + MaxChannelStatsTopPosters = 10 + // MaxChannelStatsRecentPosts bounds correlated interaction aggregation. + MaxChannelStatsRecentPosts = 10 + // MaxChannelMessagePublicForwards is Telegram's public-forwards page cap. + MaxChannelMessagePublicForwards = 100 +) + +var ErrStatsOffsetInvalid = errors.New("stats offset invalid") + +// StatsPeriod is a half-open Unix-second range [MinDate, MaxDate). Previous +// values always use the equally sized range immediately before MinDate. +type StatsPeriod struct { + MinDate int + MaxDate int +} + +func (p StatsPeriod) Valid() bool { + return p.MinDate > 0 && p.MaxDate > p.MinDate && + p.MaxDate-p.MinDate <= MaxChannelStatsDays*86400 +} + +func (p StatsPeriod) PreviousMinDate() int { + return p.MinDate - (p.MaxDate - p.MinDate) +} + +// StatsValueAndPrev is one current-period value and its previous-period peer. +type StatsValueAndPrev struct { + Current float64 + Previous float64 +} + +// StatsReactionCount is one protocol-neutral reaction series value. +type StatsReactionCount struct { + Reaction MessageReaction + Count int +} + +// ChannelStatsDay is a UTC-day bucket. Date is the bucket start. +type ChannelStatsDay struct { + Date int + Members int + NewMembers int + Messages int + Viewers int + Posters int + Views int + Shares int + Reactions int + ByReaction []StatsReactionCount +} + +type ChannelStatsTopPoster struct { + UserID int64 + Messages int + AvgChars int +} + +type ChannelStatsRecentPost struct { + MessageID int + Views int + Forwards int + Reactions int +} + +// ChannelStats is the durable minimum needed by broadcast/megagroup stats. +// Unsupported Telegram dimensions (language, notification mute, IV sources) +// are deliberately absent so the RPC edge can return statsGraphError instead +// of manufacturing zero-valued facts. +type ChannelStats struct { + Channel Channel + Period StatsPeriod + Members StatsValueAndPrev + Messages StatsValueAndPrev + Viewers StatsValueAndPrev + Posters StatsValueAndPrev + ViewsPerPost StatsValueAndPrev + SharesPerPost StatsValueAndPrev + ReactionsPerPost StatsValueAndPrev + Days []ChannelStatsDay + TopPosters []ChannelStatsTopPoster + RecentPosts []ChannelStatsRecentPost +} + +type ChannelStatsRequest struct { + ViewerUserID int64 + ChannelID int64 + Period StatsPeriod +} + +// ChannelMessageStats contains event-time view and reaction buckets for one +// existing channel message. +type ChannelMessageStats struct { + Channel Channel + Message ChannelMessage + Period StatsPeriod + Days []ChannelStatsDay +} + +type ChannelMessageStatsRequest struct { + ViewerUserID int64 + ChannelID int64 + MessageID int + Period StatsPeriod +} + +// ChannelMessagePublicForwardListRequest pages public channel/supergroup +// messages whose forward header identifies one exact source channel post. +type ChannelMessagePublicForwardListRequest struct { + ViewerUserID int64 + ChannelID int64 + MessageID int + Offset string + Limit int +} + +type ChannelMessagePublicForwardList struct { + Count int + Messages []ChannelMessage + NextOffset string +} + +// ChannelMessagePublicForwardCursor is ordered by date DESC, destination +// channel ASC, message id DESC. A versioned textual form is intentionally +// opaque to clients while staying easy to validate and log. +type ChannelMessagePublicForwardCursor struct { + Date int + ChannelID int64 + MessageID int +} + +func ParseChannelMessagePublicForwardCursor(offset string) (ChannelMessagePublicForwardCursor, error) { + if offset == "" { + return ChannelMessagePublicForwardCursor{}, nil + } + parts := strings.Split(offset, ":") + if len(parts) != 4 || parts[0] != "cmf1" { + return ChannelMessagePublicForwardCursor{}, ErrStatsOffsetInvalid + } + date, err1 := strconv.Atoi(parts[1]) + channelID, err2 := strconv.ParseInt(parts[2], 10, 64) + messageID, err3 := strconv.Atoi(parts[3]) + if err1 != nil || err2 != nil || err3 != nil || date <= 0 || channelID <= 0 || + messageID <= 0 || messageID > MaxMessageBoxID { + return ChannelMessagePublicForwardCursor{}, ErrStatsOffsetInvalid + } + return ChannelMessagePublicForwardCursor{Date: date, ChannelID: channelID, MessageID: messageID}, nil +} + +func FormatChannelMessagePublicForwardCursor(message ChannelMessage) string { + if message.Date <= 0 || message.ChannelID <= 0 || message.ID <= 0 { + return "" + } + return fmt.Sprintf("cmf1:%d:%d:%d", message.Date, message.ChannelID, message.ID) +} diff --git a/internal/domain/system.go b/internal/domain/system.go index 91c6103b..11f1c4aa 100644 --- a/internal/domain/system.go +++ b/internal/domain/system.go @@ -209,6 +209,18 @@ func OfficialSystemUser() User { return u } +// ChatBotDescription and StickersBotDescription are the shared branded seed +// text for both user.about and bots.description. PostgreSQL migrations contain +// only the default snapshot; startup reconciliation and the memory backend use +// these helpers so custom deployments do not expose stale "telesrv" text. +func ChatBotDescription() string { + return "Chat with the configured " + branding.ProductName + " AI provider." +} + +func StickersBotDescription() string { + return "Create custom sticker and emoji packs for " + branding.ProductName + "." +} + // BotFatherUser 返回内置 BotFather 账号。username 不以 bot 结尾属种子例外（与官方一致）。 func BotFatherUser() User { u := User{ @@ -235,6 +247,7 @@ func StickersBotUser() User { AccessHash: StickersBotAccessHash, FirstName: "Stickers", Username: "Stickers", + About: StickersBotDescription(), Verified: true, Bot: true, BotInfoVersion: 2, @@ -254,6 +267,7 @@ func ChatBotUser() User { AccessHash: ChatBotAccessHash, FirstName: "ChatBot", Username: "ChatBot", + About: ChatBotDescription(), Verified: true, Bot: true, BotInfoVersion: 1, diff --git a/internal/domain/temp_auth_key.go b/internal/domain/temp_auth_key.go index a5da0e10..b4833972 100644 --- a/internal/domain/temp_auth_key.go +++ b/internal/domain/temp_auth_key.go @@ -9,3 +9,11 @@ type TempAuthKeyBinding struct { ExpiresAt int EncryptedMessage []byte } + +// TempAuthKeyBindingResult is the exact auth-key default committed by the +// temp-to-permanent binding transaction. LayerObservationID is the durable +// ordering token; zero denotes the legacy unordered default. +type TempAuthKeyBindingResult struct { + Layer int + LayerObservationID int64 +} diff --git a/internal/domain/update_event.go b/internal/domain/update_event.go index 5398e809..c3621fa8 100644 --- a/internal/domain/update_event.go +++ b/internal/domain/update_event.go @@ -29,8 +29,8 @@ const ( UpdateEventDialogUnreadMark UpdateEventType = "dialog_unread_mark" UpdateEventPeerSettings UpdateEventType = "peer_settings" UpdateEventPeerStoryBlocked UpdateEventType = "peer_story_blocked" - // UpdateEventUserPhone 映射 updateUserPhone。它是账号绝对状态更新，TL - // 构造器不携 pts；事件仍占账号 pts，以便其它设备在线/离线保持同一水位。 + // UpdateEventUserPhone 只用于读取历史版本已落库的 updateUserPhone 事件。 + // TL 构造器不携 pts，当前写路径禁止再产生该 event。 UpdateEventUserPhone UpdateEventType = "user_phone" // UpdateEventUserEmojiStatus carries the exact immutable status snapshot. // It consumes account pts even though updateUserEmojiStatus has no pts. diff --git a/internal/domain/welcome_message.go b/internal/domain/welcome_message.go index a398d778..c4bd09da 100644 --- a/internal/domain/welcome_message.go +++ b/internal/domain/welcome_message.go @@ -1,9 +1,13 @@ package domain import ( + "crypto/sha256" + "encoding/json" + "errors" "fmt" "math" "strings" + "time" ) const officialWelcomeMessageTemplate = "👋 Welcome to OwpenGram!\n\nYou just signed in via %s.\n\nIf this wasn't you, revoke this session from \"Settings > Privacy and Security > Active sessions\" immediately." @@ -40,3 +44,202 @@ func SignInMethodLabel(u User) string { } return "phone number" } + +const ( + MaxWelcomeMessagesPerPeer = 5 + MaxWelcomeMessageContentBytes = 4 << 20 + InitialWelcomeRevision = int64(1) + WelcomeMessageDeliveryTTL = 24 * time.Hour +) + +var ( + ErrWelcomeMessageInvalid = errors.New("welcome message invalid") + ErrWelcomeMessagePeerInvalid = errors.New("welcome message peer invalid") + ErrWelcomeMessageForbidden = errors.New("welcome message forbidden") + ErrWelcomeMessageNotFound = errors.New("welcome message not found") + ErrWelcomeMessageNotModified = errors.New("welcome message not modified") + ErrWelcomeMessageLimit = errors.New("welcome message limit exceeded") + ErrWelcomeMessageRandomIDConflict = errors.New("welcome message random id conflict") + ErrWelcomeMessageRevisionOverflow = errors.New("welcome message revision overflow") +) + +// WelcomeMessageContent is a durable peer template. It intentionally does not +// contain transient receiver, device, callback, report, TTL or reply fields. +type WelcomeMessageContent struct { + Message string + Entities []MessageEntity + Media *MessageMedia + ReplyMarkup *MessageReplyMarkup + RichMessage *MessageRichMessage + InvertMedia bool + NoForwards bool +} + +func (c WelcomeMessageContent) Validate() error { + if err := ValidateEphemeralContent(EphemeralContent{ + Message: c.Message, Entities: c.Entities, Media: c.Media, + ReplyMarkup: c.ReplyMarkup, RichMessage: c.RichMessage, + }); err != nil { + return ErrWelcomeMessageInvalid + } + if c.InvertMedia && c.Media == nil { + return ErrWelcomeMessageInvalid + } + raw, err := json.Marshal(c) + if err != nil || len(raw) > MaxWelcomeMessageContentBytes { + return ErrWelcomeMessageInvalid + } + return nil +} + +type WelcomeMessage struct { + ID int + Peer Peer + CreatorUserID int64 + Date int + EditDate int + RandomID int64 + Content WelcomeMessageContent + CreateFingerprint [32]byte + Version uint64 +} + +func (m WelcomeMessage) ValidateStored() error { + if m.ID <= 0 || m.ID > MaxMessageBoxID || m.Peer.Type != PeerTypeChannel || m.Peer.ID <= 0 || + m.CreatorUserID <= 0 || m.Date <= 0 || m.RandomID == 0 || m.Version == 0 || + (m.EditDate != 0 && m.EditDate < m.Date) || m.CreateFingerprint == ([32]byte{}) { + return ErrWelcomeMessageInvalid + } + return m.Content.Validate() +} + +type CreateWelcomeMessageRequest struct { + Peer Peer + CreatorUserID int64 + Date int + RandomID int64 + Content WelcomeMessageContent + CreateFingerprint [32]byte +} + +func (r CreateWelcomeMessageRequest) Validate() error { + if r.Peer.Type != PeerTypeChannel || r.Peer.ID <= 0 || r.CreatorUserID <= 0 || + r.Date <= 0 || r.RandomID == 0 || r.CreateFingerprint == ([32]byte{}) { + return ErrWelcomeMessageInvalid + } + return r.Content.Validate() +} + +type WelcomeMessageEditFields struct { + SetMessage bool + Message string + SetEntities bool + Entities []MessageEntity + SetMedia bool + Media *MessageMedia + SetReplyMarkup bool + ReplyMarkup *MessageReplyMarkup + SetRichMessage bool + RichMessage *MessageRichMessage + SetInvertMedia bool + InvertMedia bool +} + +func (f WelcomeMessageEditFields) Empty() bool { + return !f.SetMessage && !f.SetEntities && !f.SetMedia && !f.SetReplyMarkup && + !f.SetRichMessage && !f.SetInvertMedia +} + +func (f WelcomeMessageEditFields) Apply(current WelcomeMessageContent) (WelcomeMessageContent, error) { + if f.Empty() { + return WelcomeMessageContent{}, ErrWelcomeMessageInvalid + } + if f.SetMessage { + current.Message = f.Message + } + if f.SetEntities { + current.Entities = f.Entities + } + if f.SetMedia { + current.Media = f.Media + } + if f.SetReplyMarkup { + current.ReplyMarkup = f.ReplyMarkup + } + if f.SetRichMessage { + current.RichMessage = f.RichMessage + } + if f.SetInvertMedia { + current.InvertMedia = f.InvertMedia + } + if err := current.Validate(); err != nil { + return WelcomeMessageContent{}, err + } + return current, nil +} + +type EditWelcomeMessageRequest struct { + Peer Peer + ID int + EditDate int + Fields WelcomeMessageEditFields +} + +func (r EditWelcomeMessageRequest) Validate() error { + if r.Peer.Type != PeerTypeChannel || r.Peer.ID <= 0 || r.ID <= 0 || + r.ID > MaxMessageBoxID || r.EditDate <= 0 || r.Fields.Empty() { + return ErrWelcomeMessageInvalid + } + return nil +} + +type WelcomeMessageList struct { + Hash int64 + Messages []WelcomeMessage + NotModified bool +} + +// WelcomeMessageDelivery is a short-lived, non-PTS snapshot created in the +// same transaction as one inactive->active membership transition. It is not a +// message-history row and must be physically removed no later than ExpiresAt. +type WelcomeMessageDelivery struct { + ID int64 + JoinEventID int64 + ChannelID int64 + TargetUserID int64 + TemplateID int + EphemeralID int + JoinedAt int + Content WelcomeMessageContent + AttemptCount int + ExpiresAt time.Time +} + +func (d WelcomeMessageDelivery) ValidateStored(now time.Time) error { + if d.ID <= 0 || d.JoinEventID <= 0 || d.ChannelID <= 0 || d.TargetUserID <= 0 || + d.TemplateID <= 0 || d.EphemeralID <= 0 || d.EphemeralID > MaxMessageBoxID || + d.JoinedAt <= 0 || d.AttemptCount <= 0 || d.ExpiresAt.IsZero() || !d.ExpiresAt.After(now) { + return ErrWelcomeMessageInvalid + } + return d.Content.Validate() +} + +func WelcomeCreateFingerprint(peer Peer, creatorUserID, randomID int64, content WelcomeMessageContent) ([32]byte, error) { + raw, err := json.Marshal(struct { + Peer Peer + CreatorUserID int64 + RandomID int64 + Content WelcomeMessageContent + }{peer, creatorUserID, randomID, content}) + if err != nil { + return [32]byte{}, err + } + return sha256.Sum256(raw), nil +} + +func NextWelcomeRevision(current int64) (int64, error) { + if current < InitialWelcomeRevision || current == math.MaxInt64 { + return 0, ErrWelcomeMessageRevisionOverflow + } + return current + 1, nil +} diff --git a/internal/domain/welcome_message_test.go b/internal/domain/welcome_message_test.go new file mode 100644 index 00000000..0f688ca7 --- /dev/null +++ b/internal/domain/welcome_message_test.go @@ -0,0 +1,54 @@ +package domain + +import ( + "errors" + "testing" +) + +func TestWelcomeMessageContentAndFingerprint(t *testing.T) { + peer := Peer{Type: PeerTypeChannel, ID: 42} + content := WelcomeMessageContent{Message: "Welcome 👋"} + if err := content.Validate(); err != nil { + t.Fatalf("valid content: %v", err) + } + first, err := WelcomeCreateFingerprint(peer, 7, 99, content) + if err != nil { + t.Fatal(err) + } + second, err := WelcomeCreateFingerprint(peer, 7, 99, content) + if err != nil || first != second || first == ([32]byte{}) { + t.Fatalf("deterministic fingerprint = %x/%x err=%v", first, second, err) + } + changed, err := WelcomeCreateFingerprint(peer, 7, 99, WelcomeMessageContent{Message: "Different"}) + if err != nil || changed == first { + t.Fatalf("changed fingerprint = %x err=%v", changed, err) + } + if err := (WelcomeMessageContent{Message: "text", InvertMedia: true}).Validate(); !errors.Is(err, ErrWelcomeMessageInvalid) { + t.Fatalf("invert without media err = %v", err) + } +} + +func TestWelcomeMessageEditFields(t *testing.T) { + current := WelcomeMessageContent{Message: "before", NoForwards: true} + updated, err := (WelcomeMessageEditFields{ + SetMessage: true, Message: "after", SetEntities: true, + }).Apply(current) + if err != nil { + t.Fatal(err) + } + if updated.Message != "after" || !updated.NoForwards || len(updated.Entities) != 0 { + t.Fatalf("updated content = %+v", updated) + } + if _, err := (WelcomeMessageEditFields{}).Apply(current); !errors.Is(err, ErrWelcomeMessageInvalid) { + t.Fatalf("empty edit err = %v", err) + } +} + +func TestNextWelcomeRevision(t *testing.T) { + if next, err := NextWelcomeRevision(InitialWelcomeRevision); err != nil || next != 2 { + t.Fatalf("next revision = %d,%v", next, err) + } + if _, err := NextWelcomeRevision(0); !errors.Is(err, ErrWelcomeMessageRevisionOverflow) { + t.Fatalf("zero revision err = %v", err) + } +} diff --git a/internal/loadharness/client.go b/internal/loadharness/client.go index 26e156a6..8d4c5f17 100644 --- a/internal/loadharness/client.go +++ b/internal/loadharness/client.go @@ -12,8 +12,12 @@ import ( "path/filepath" "strconv" "strings" + "sync" + "time" "github.com/iamxvbaba/td/exchange" + "github.com/iamxvbaba/td/mtproto" + "github.com/iamxvbaba/td/proto" "github.com/iamxvbaba/td/telegram" "github.com/iamxvbaba/td/telegram/dcs" "github.com/iamxvbaba/td/tg" @@ -24,6 +28,40 @@ type clientHooks struct { Update telegram.UpdateHandler ConnectionState func(telegram.ConnectionState) Dead func(error) + Device *telegram.DeviceConfig +} + +// loadMessageIDSource keeps the load generator on the same MTProto message-id +// rules as a production client even when the host clock lands exactly on an +// integral second. The underlying gotd generator can emit a client id whose +// lower 32 bits are zero in that narrow window; Telegram explicitly forbids +// that value as replay protection. Retrying also fences any encoded duplicate +// caused by a very low-resolution clock without weakening the DUT validator. +type loadMessageIDSource struct { + mu sync.Mutex + source mtproto.MessageIDSource + last int64 +} + +func newLoadMessageIDSource(now func() time.Time) *loadMessageIDSource { + return &loadMessageIDSource{source: proto.NewMessageIDGen(now)} +} + +func (s *loadMessageIDSource) New(messageType proto.MessageType) int64 { + s.mu.Lock() + defer s.mu.Unlock() + + for { + messageID := s.source.New(messageType) + if messageID <= s.last { + continue + } + if messageType == proto.MessageFromClient && uint32(messageID) == 0 { + continue + } + s.last = messageID + return messageID + } } func newClient(endpoint Endpoint, publicKey *rsa.PublicKey, storage telegram.SessionStorage, hooks clientHooks) (*telegram.Client, error) { @@ -44,6 +82,10 @@ func newClient(endpoint Endpoint, publicKey *rsa.PublicKey, storage telegram.Ses if updateHandler == nil { updateHandler = telegram.UpdateHandlerFunc(func(context.Context, tg.UpdatesClass) error { return nil }) } + device := telegram.DeviceTDesktopWindows() + if hooks.Device != nil { + device = *hooks.Device + } return telegram.NewClient(endpoint.APIID, endpoint.APIHash, telegram.Options{ PublicKeys: []exchange.PublicKey{{RSA: publicKey}}, DC: endpoint.DC, @@ -55,7 +97,8 @@ func newClient(endpoint Endpoint, publicKey *rsa.PublicKey, storage telegram.Ses UpdateHandler: updateHandler, EnablePFS: endpoint.PFS, TempKeyTTL: endpoint.TempKeyTTL, - Device: telegram.DeviceTDesktopWindows(), + Device: device, + MessageID: newLoadMessageIDSource(time.Now), OnConnectionState: hooks.ConnectionState, OnDead: hooks.Dead, }), nil diff --git a/internal/loadharness/client_test.go b/internal/loadharness/client_test.go new file mode 100644 index 00000000..5e8af2bb --- /dev/null +++ b/internal/loadharness/client_test.go @@ -0,0 +1,60 @@ +package loadharness + +import ( + "sync" + "testing" + "time" + + "github.com/iamxvbaba/td/proto" +) + +func TestLoadMessageIDSourceSkipsEmptyClientFraction(t *testing.T) { + second := time.Unix(1_800_000_000, 0) + source := newLoadMessageIDSource(func() time.Time { return second }) + + first := source.New(proto.MessageFromClient) + secondID := source.New(proto.MessageFromClient) + for index, messageID := range []int64{first, secondID} { + if uint32(messageID) == 0 { + t.Fatalf("message id %d lower 32 bits are empty", index) + } + if proto.MessageID(messageID).Type() != proto.MessageFromClient { + t.Fatalf("message id %d type = %v, want client", index, proto.MessageID(messageID).Type()) + } + } + if secondID <= first { + t.Fatalf("message ids are not strictly increasing: %d then %d", first, secondID) + } +} + +func TestLoadMessageIDSourceConcurrentMonotonicUnique(t *testing.T) { + second := time.Unix(1_800_000_000, 0) + source := newLoadMessageIDSource(func() time.Time { return second }) + + const calls = 1_000 + ids := make(chan int64, calls) + var workers sync.WaitGroup + workers.Add(calls) + for range calls { + go func() { + defer workers.Done() + ids <- source.New(proto.MessageFromClient) + }() + } + workers.Wait() + close(ids) + + seen := make(map[int64]struct{}, calls) + for messageID := range ids { + if uint32(messageID) == 0 || proto.MessageID(messageID).Type() != proto.MessageFromClient { + t.Fatalf("invalid client message id %d", messageID) + } + if _, duplicate := seen[messageID]; duplicate { + t.Fatalf("duplicate client message id %d", messageID) + } + seen[messageID] = struct{}{} + } + if len(seen) != calls { + t.Fatalf("unique message ids = %d, want %d", len(seen), calls) + } +} diff --git a/internal/loadharness/dataset.go b/internal/loadharness/dataset.go new file mode 100644 index 00000000..2418ebb7 --- /dev/null +++ b/internal/loadharness/dataset.go @@ -0,0 +1,446 @@ +package loadharness + +import ( + "crypto/sha256" + "encoding/binary" + "encoding/hex" + "encoding/json" + "errors" + "fmt" + "os" + "sort" + "strings" + "time" +) + +const ( + DatasetVersion = 1 + maxDatasetGroups = 10000 + maxDatasetMembership = 2_000_000 + maxDatasetMessages = 2_000_000 +) + +// DatasetConfig describes a deterministic social graph whose durable facts are +// later materialized exclusively through real MTProto RPCs. Planning does not +// contact the server and never embeds auth/session material. +type DatasetConfig struct { + Accounts int `json:"accounts"` + Seed int64 `json:"seed"` + PrivateFanout int `json:"private_fanout"` + HotGroups int `json:"hot_groups"` + HotMembers int `json:"hot_members"` + HotHistory int `json:"hot_history"` + MediumGroups int `json:"medium_groups"` + MediumMembers int `json:"medium_members"` + MediumHistory int `json:"medium_history"` + SmallGroups int `json:"small_groups"` + SmallMembers int `json:"small_members"` + SmallHistory int `json:"small_history"` + HeavyGroups int `json:"heavy_groups"` + HeavyAccounts int `json:"heavy_accounts"` + HeavyHistory int `json:"heavy_history"` +} + +func DefaultDatasetConfig(accounts int) DatasetConfig { + return DatasetConfig{ + Accounts: accounts, Seed: 20260827, PrivateFanout: min(10, max(accounts-1, 0)), + HotGroups: 10, HotMembers: accounts, HotHistory: 100, + MediumGroups: 100, MediumMembers: min(100, accounts), MediumHistory: 30, + SmallGroups: 200, SmallMembers: min(20, accounts), SmallHistory: 10, + HeavyGroups: 200, HeavyAccounts: min(100, accounts), HeavyHistory: 30, + } +} + +type DatasetPrivateEdge struct { + SenderAccount int `json:"sender_account"` + RecipientAccount int `json:"recipient_account"` + RandomID int64 `json:"random_id"` + Marker string `json:"marker"` +} + +type DatasetGroup struct { + Index int `json:"index"` + Tier string `json:"tier"` + Title string `json:"title"` + About string `json:"about"` + CreatorAccount int `json:"creator_account"` + MemberAccounts []int `json:"member_accounts"` + HistoryMessages int `json:"history_messages"` +} + +// Dataset is the immutable plan. Real server identities and resumable progress +// live in the separate compact DatasetSeedState so a large plan is not rewritten +// after every reconciled RPC batch. +type Dataset struct { + Version int `json:"version"` + CreatedAt time.Time `json:"created_at"` + RunID string `json:"run_id"` + Config DatasetConfig `json:"config"` + PlanSHA256 string `json:"plan_sha256"` + PrivateEdges []DatasetPrivateEdge `json:"private_edges"` + Groups []DatasetGroup `json:"groups"` +} + +type DatasetSeedGroupState struct { + GroupIndex int `json:"group_index"` + ChannelID int64 `json:"channel_id,omitempty"` + AccessHash int64 `json:"access_hash,omitempty"` + CreatePending bool `json:"create_pending,omitempty"` + InviteCursor int `json:"invite_cursor,omitempty"` + InvitePendingEnd int `json:"invite_pending_end,omitempty"` +} + +type DatasetSeedState struct { + Version int `json:"version"` + PlanSHA256 string `json:"plan_sha256"` + UpdatedAt time.Time `json:"updated_at"` + PrivateSentByAccount []int `json:"private_sent_by_account"` + HistorySentByAccount []int `json:"history_sent_by_account"` + RichStateByAccount []bool `json:"rich_state_by_account,omitempty"` + Groups []DatasetSeedGroupState `json:"groups"` +} + +func PlanDataset(cfg DatasetConfig) (*Dataset, error) { + if err := cfg.validate(); err != nil { + return nil, err + } + runID := fmt.Sprintf("rpc-startup-%d-%016x", cfg.Accounts, uint64(cfg.Seed)) + dataset := &Dataset{ + Version: DatasetVersion, CreatedAt: time.Now().UTC(), + RunID: runID, Config: cfg, + PrivateEdges: make([]DatasetPrivateEdge, 0, cfg.Accounts*cfg.PrivateFanout), + } + for account := 0; account < cfg.Accounts; account++ { + for offset := 1; offset <= cfg.PrivateFanout; offset++ { + recipient := (account + offset) % cfg.Accounts + dataset.PrivateEdges = append(dataset.PrivateEdges, DatasetPrivateEdge{ + SenderAccount: account, RecipientAccount: recipient, + RandomID: stableDatasetID(cfg.Seed, "private", cfg.Accounts, account, offset), + Marker: fmt.Sprintf("[%s private %04d/%02d]", runID, account, offset), + }) + } + } + groupIndex := 0 + appendTier := func(tier string, count, members, history int, memberSet func(int) []int) { + for i := 0; i < count; i++ { + groupMembers := memberSet(i) + creator := groupMembers[i%len(groupMembers)] + dataset.Groups = append(dataset.Groups, DatasetGroup{ + Index: groupIndex, Tier: tier, + Title: fmt.Sprintf("%s %s %04d", runID, tier, i+1), + About: fmt.Sprintf("telesrv real-RPC load dataset %s group %d", tier, i+1), + CreatorAccount: creator, MemberAccounts: groupMembers, HistoryMessages: history, + }) + groupIndex++ + } + } + appendTier("hot", cfg.HotGroups, cfg.HotMembers, cfg.HotHistory, func(i int) []int { + return cyclicMembers(cfg.Accounts, i*max(cfg.HotMembers, 1), cfg.HotMembers) + }) + appendTier("medium", cfg.MediumGroups, cfg.MediumMembers, cfg.MediumHistory, func(i int) []int { + return cyclicMembers(cfg.Accounts, i*max(cfg.MediumMembers, 1), cfg.MediumMembers) + }) + appendTier("small", cfg.SmallGroups, cfg.SmallMembers, cfg.SmallHistory, func(i int) []int { + return cyclicMembers(cfg.Accounts, i*max(cfg.SmallMembers, 1), cfg.SmallMembers) + }) + appendTier("heavy", cfg.HeavyGroups, cfg.HeavyAccounts, cfg.HeavyHistory, func(int) []int { + members := make([]int, cfg.HeavyAccounts) + for i := range members { + members[i] = i + } + return members + }) + planHash, err := dataset.planHash() + if err != nil { + return nil, err + } + dataset.PlanSHA256 = planHash + if err := dataset.Validate(); err != nil { + return nil, err + } + return dataset, nil +} + +func (c DatasetConfig) validate() error { + if c.Accounts < 2 || c.Accounts > 100000 { + return errors.New("dataset accounts must be between 2 and 100000") + } + if c.PrivateFanout < 0 || c.PrivateFanout >= c.Accounts { + return errors.New("private fanout must be non-negative and smaller than accounts") + } + groups := c.HotGroups + c.MediumGroups + c.SmallGroups + c.HeavyGroups + if groups <= 0 || groups > maxDatasetGroups { + return fmt.Errorf("dataset group count must be between 1 and %d", maxDatasetGroups) + } + tiers := []struct { + name string + groups, members, history int + }{ + {"hot", c.HotGroups, c.HotMembers, c.HotHistory}, + {"medium", c.MediumGroups, c.MediumMembers, c.MediumHistory}, + {"small", c.SmallGroups, c.SmallMembers, c.SmallHistory}, + {"heavy", c.HeavyGroups, c.HeavyAccounts, c.HeavyHistory}, + } + memberships := 0 + messages := c.Accounts * c.PrivateFanout + for _, tier := range tiers { + if tier.groups < 0 || tier.members < 0 || tier.members > c.Accounts || tier.history < 0 { + return fmt.Errorf("invalid %s dataset tier", tier.name) + } + if tier.groups > 0 && tier.members == 0 { + return fmt.Errorf("%s dataset tier has groups without members", tier.name) + } + memberships += tier.groups * tier.members + messages += tier.groups * tier.history + } + if memberships > maxDatasetMembership { + return fmt.Errorf("dataset memberships %d exceed hard limit %d", memberships, maxDatasetMembership) + } + if messages > maxDatasetMessages { + return fmt.Errorf("dataset messages %d exceed hard limit %d", messages, maxDatasetMessages) + } + return nil +} + +func (d *Dataset) Validate() error { + if d == nil || d.Version != DatasetVersion { + return errors.New("invalid dataset version") + } + if strings.TrimSpace(d.RunID) == "" || strings.TrimSpace(d.PlanSHA256) == "" { + return errors.New("dataset is missing run id or plan hash") + } + if err := d.Config.validate(); err != nil { + return err + } + if len(d.PrivateEdges) != d.Config.Accounts*d.Config.PrivateFanout { + return errors.New("dataset private graph size does not match config") + } + seenGroups := make(map[int]struct{}, len(d.Groups)) + for _, group := range d.Groups { + if group.Index < 0 || group.CreatorAccount < 0 || group.CreatorAccount >= d.Config.Accounts || group.HistoryMessages < 0 { + return fmt.Errorf("invalid group %d", group.Index) + } + if _, exists := seenGroups[group.Index]; exists { + return fmt.Errorf("duplicate group index %d", group.Index) + } + seenGroups[group.Index] = struct{}{} + members := make(map[int]struct{}, len(group.MemberAccounts)) + for _, account := range group.MemberAccounts { + if account < 0 || account >= d.Config.Accounts { + return fmt.Errorf("group %d has invalid account %d", group.Index, account) + } + if _, exists := members[account]; exists { + return fmt.Errorf("group %d has duplicate account %d", group.Index, account) + } + members[account] = struct{}{} + } + if _, ok := members[group.CreatorAccount]; !ok { + return fmt.Errorf("group %d creator is not a member", group.Index) + } + } + wantHash, err := d.planHash() + if err != nil { + return err + } + if wantHash != d.PlanSHA256 { + return errors.New("dataset immutable plan hash mismatch") + } + return nil +} + +func WriteDataset(path string, dataset *Dataset) error { + if err := dataset.Validate(); err != nil { + return err + } + data, err := json.MarshalIndent(dataset, "", " ") + if err != nil { + return fmt.Errorf("encode dataset: %w", err) + } + return writeFileAtomic(path, append(data, '\n'), 0o600) +} + +func NewDatasetSeedState(dataset *Dataset) (*DatasetSeedState, error) { + if err := dataset.Validate(); err != nil { + return nil, err + } + state := &DatasetSeedState{ + Version: DatasetVersion, PlanSHA256: dataset.PlanSHA256, UpdatedAt: time.Now().UTC(), + PrivateSentByAccount: make([]int, dataset.Config.Accounts), + HistorySentByAccount: make([]int, dataset.Config.Accounts), + RichStateByAccount: make([]bool, dataset.Config.Accounts), + Groups: make([]DatasetSeedGroupState, len(dataset.Groups)), + } + for i, group := range dataset.Groups { + state.Groups[i].GroupIndex = group.Index + } + return state, nil +} + +func (s *DatasetSeedState) Validate(dataset *Dataset) error { + if s == nil || s.Version != DatasetVersion || dataset == nil || s.PlanSHA256 != dataset.PlanSHA256 { + return errors.New("seed state does not match dataset plan") + } + if len(s.PrivateSentByAccount) != dataset.Config.Accounts || len(s.HistorySentByAccount) != dataset.Config.Accounts || len(s.Groups) != len(dataset.Groups) { + return errors.New("seed state dimensions do not match dataset plan") + } + // A nil rich-state vector is accepted only for seed journals created before + // the comprehensive startup workload added this phase. New journals always + // allocate the full vector and therefore cannot silently skip it. + if len(s.RichStateByAccount) != 0 && len(s.RichStateByAccount) != dataset.Config.Accounts { + return errors.New("seed rich-state dimensions do not match dataset plan") + } + historyTasks := datasetHistoryTaskCounts(dataset) + for account := 0; account < dataset.Config.Accounts; account++ { + if s.PrivateSentByAccount[account] < 0 || s.PrivateSentByAccount[account] > dataset.Config.PrivateFanout { + return fmt.Errorf("invalid private seed progress for account %d", account) + } + if s.HistorySentByAccount[account] < 0 || s.HistorySentByAccount[account] > historyTasks[account] { + return fmt.Errorf("invalid history seed progress for account %d", account) + } + } + for i, groupState := range s.Groups { + group := dataset.Groups[i] + invitees := len(group.MemberAccounts) - 1 + if groupState.GroupIndex != group.Index || groupState.InviteCursor < 0 || groupState.InviteCursor > invitees { + return fmt.Errorf("invalid seed state for group %d", group.Index) + } + if (groupState.ChannelID == 0) != (groupState.AccessHash == 0) { + return fmt.Errorf("group %d has partial channel identity", group.Index) + } + if groupState.ChannelID != 0 && groupState.CreatePending { + return fmt.Errorf("group %d has both channel identity and pending create", group.Index) + } + if groupState.InvitePendingEnd < groupState.InviteCursor || groupState.InvitePendingEnd > invitees { + return fmt.Errorf("group %d has invalid pending invite range", group.Index) + } + if groupState.ChannelID == 0 && (groupState.InviteCursor != 0 || groupState.InvitePendingEnd != 0) { + return fmt.Errorf("group %d has invite progress without a channel identity", group.Index) + } + } + return nil +} + +func WriteDatasetSeedState(path string, dataset *Dataset, state *DatasetSeedState) error { + if err := state.Validate(dataset); err != nil { + return err + } + state.UpdatedAt = time.Now().UTC() + data, err := json.MarshalIndent(state, "", " ") + if err != nil { + return fmt.Errorf("encode dataset seed state: %w", err) + } + return writeFileAtomic(path, append(data, '\n'), 0o600) +} + +func LoadDatasetSeedState(path string, dataset *Dataset) (*DatasetSeedState, error) { + data, err := os.ReadFile(path) + if os.IsNotExist(err) { + return NewDatasetSeedState(dataset) + } + if err != nil { + return nil, fmt.Errorf("read dataset seed state: %w", err) + } + var state DatasetSeedState + decoder := json.NewDecoder(strings.NewReader(string(data))) + decoder.DisallowUnknownFields() + if err := decoder.Decode(&state); err != nil { + return nil, fmt.Errorf("decode dataset seed state: %w", err) + } + if err := state.Validate(dataset); err != nil { + return nil, err + } + return &state, nil +} + +func datasetHistoryTaskCounts(dataset *Dataset) []int { + counts := make([]int, dataset.Config.Accounts) + for _, group := range dataset.Groups { + for message := 0; message < group.HistoryMessages; message++ { + counts[group.MemberAccounts[message%len(group.MemberAccounts)]]++ + } + } + return counts +} + +func LoadDataset(path string) (*Dataset, error) { + data, err := os.ReadFile(path) + if err != nil { + return nil, fmt.Errorf("read dataset: %w", err) + } + var dataset Dataset + decoder := json.NewDecoder(strings.NewReader(string(data))) + decoder.DisallowUnknownFields() + if err := decoder.Decode(&dataset); err != nil { + return nil, fmt.Errorf("decode dataset: %w", err) + } + if err := dataset.Validate(); err != nil { + return nil, err + } + return &dataset, nil +} + +func (d *Dataset) planHash() (string, error) { + type immutableDataset struct { + Version int `json:"version"` + RunID string `json:"run_id"` + Config DatasetConfig `json:"config"` + PrivateEdges []DatasetPrivateEdge `json:"private_edges"` + Groups []struct { + Index int `json:"index"` + Tier string `json:"tier"` + Title string `json:"title"` + About string `json:"about"` + CreatorAccount int `json:"creator_account"` + MemberAccounts []int `json:"member_accounts"` + HistoryMessages int `json:"history_messages"` + } `json:"groups"` + } + immutable := immutableDataset{Version: d.Version, RunID: d.RunID, Config: d.Config, PrivateEdges: d.PrivateEdges} + for _, group := range d.Groups { + immutable.Groups = append(immutable.Groups, struct { + Index int `json:"index"` + Tier string `json:"tier"` + Title string `json:"title"` + About string `json:"about"` + CreatorAccount int `json:"creator_account"` + MemberAccounts []int `json:"member_accounts"` + HistoryMessages int `json:"history_messages"` + }{group.Index, group.Tier, group.Title, group.About, group.CreatorAccount, group.MemberAccounts, group.HistoryMessages}) + } + data, err := json.Marshal(immutable) + if err != nil { + return "", err + } + sum := sha256.Sum256(data) + return hex.EncodeToString(sum[:]), nil +} + +func cyclicMembers(accounts, start, count int) []int { + if count <= 0 { + return nil + } + members := make([]int, count) + for i := range members { + members[i] = (start + i) % accounts + } + sort.Ints(members) + return members +} + +func stableDatasetID(seed int64, namespace string, values ...int) int64 { + h := sha256.New() + var buf [8]byte + binary.LittleEndian.PutUint64(buf[:], uint64(seed)) + _, _ = h.Write(buf[:]) + _, _ = h.Write([]byte(namespace)) + for _, value := range values { + binary.LittleEndian.PutUint64(buf[:], uint64(value)) + _, _ = h.Write(buf[:]) + } + sum := h.Sum(nil) + id := int64(binary.LittleEndian.Uint64(sum[:8]) & ^(uint64(1) << 63)) + if id == 0 { + return 1 + } + return id +} diff --git a/internal/loadharness/dataset_test.go b/internal/loadharness/dataset_test.go new file mode 100644 index 00000000..c08d2486 --- /dev/null +++ b/internal/loadharness/dataset_test.go @@ -0,0 +1,179 @@ +package loadharness + +import ( + "path/filepath" + "testing" +) + +func TestPlanDatasetDefaultTopology(t *testing.T) { + dataset, err := PlanDataset(DefaultDatasetConfig(1000)) + if err != nil { + t.Fatal(err) + } + if got, want := len(dataset.PrivateEdges), 10000; got != want { + t.Fatalf("private edges = %d, want %d", got, want) + } + if got, want := len(dataset.Groups), 510; got != want { + t.Fatalf("groups = %d, want %d", got, want) + } + memberships := make([]int, dataset.Config.Accounts) + totalMemberships := 0 + for _, group := range dataset.Groups { + totalMemberships += len(group.MemberAccounts) + for _, account := range group.MemberAccounts { + memberships[account]++ + } + } + if totalMemberships != 44000 { + t.Fatalf("memberships = %d, want 44000", totalMemberships) + } + if got, want := memberships[999]+20, 44; got != want { + t.Fatalf("regular account dialogs = %d, want %d", got, want) + } + if got, want := memberships[0]+20, 244; got != want { + t.Fatalf("heavy account dialogs = %d, want %d", got, want) + } + if dataset.PlanSHA256 == "" || dataset.PrivateEdges[0].RandomID == 0 { + t.Fatal("dataset is missing stable identity") + } +} + +func TestPlanDatasetIsDeterministic(t *testing.T) { + cfg := DefaultDatasetConfig(100) + first, err := PlanDataset(cfg) + if err != nil { + t.Fatal(err) + } + second, err := PlanDataset(cfg) + if err != nil { + t.Fatal(err) + } + if first.PlanSHA256 != second.PlanSHA256 { + t.Fatalf("plan hash changed: %s != %s", first.PlanSHA256, second.PlanSHA256) + } + if first.PrivateEdges[37] != second.PrivateEdges[37] { + t.Fatal("private edge plan changed") + } +} + +func TestDatasetRandomIDsAreNamespacedByScale(t *testing.T) { + ten, err := PlanDataset(DefaultDatasetConfig(10)) + if err != nil { + t.Fatal(err) + } + hundred, err := PlanDataset(DefaultDatasetConfig(100)) + if err != nil { + t.Fatal(err) + } + if ten.PrivateEdges[0].RandomID == hundred.PrivateEdges[0].RandomID { + t.Fatal("private random_id collided across dataset scales") + } + if stableDatasetID(7, "offline", 10, 0) == stableDatasetID(7, "offline", 100, 0) { + t.Fatal("offline random_id collided across dataset scales") + } +} + +func TestDatasetRoundTripAndImmutableHash(t *testing.T) { + dataset, err := PlanDataset(DefaultDatasetConfig(20)) + if err != nil { + t.Fatal(err) + } + path := filepath.Join(t.TempDir(), "dataset.json") + if err := WriteDataset(path, dataset); err != nil { + t.Fatal(err) + } + loaded, err := LoadDataset(path) + if err != nil { + t.Fatal(err) + } + if loaded.PlanSHA256 != dataset.PlanSHA256 || len(loaded.Groups) != len(dataset.Groups) { + t.Fatal("dataset round trip changed the plan") + } + loaded.Groups[0].Title += " changed" + if err := loaded.Validate(); err == nil { + t.Fatal("mutated immutable plan passed validation") + } +} + +func TestDatasetSeedStateRoundTrip(t *testing.T) { + dataset, err := PlanDataset(DefaultDatasetConfig(20)) + if err != nil { + t.Fatal(err) + } + state, err := NewDatasetSeedState(dataset) + if err != nil { + t.Fatal(err) + } + state.PrivateSentByAccount[0] = 2 + state.Groups[0].ChannelID = 11 + state.Groups[0].AccessHash = 22 + state.Groups[0].InviteCursor = 3 + state.Groups[0].InvitePendingEnd = 7 + path := filepath.Join(t.TempDir(), "seed-state.json") + if err := WriteDatasetSeedState(path, dataset, state); err != nil { + t.Fatal(err) + } + loaded, err := LoadDatasetSeedState(path, dataset) + if err != nil { + t.Fatal(err) + } + if loaded.PrivateSentByAccount[0] != 2 || loaded.Groups[0].ChannelID != 11 || loaded.Groups[0].InviteCursor != 3 || loaded.Groups[0].InvitePendingEnd != 7 { + t.Fatal("seed state round trip changed progress") + } +} + +func TestDatasetSeedStateAcceptsLegacyMissingRichVector(t *testing.T) { + dataset, err := PlanDataset(DefaultDatasetConfig(20)) + if err != nil { + t.Fatal(err) + } + state, err := NewDatasetSeedState(dataset) + if err != nil { + t.Fatal(err) + } + state.RichStateByAccount = nil + if err := state.Validate(dataset); err != nil { + t.Fatal(err) + } + state.RichStateByAccount = []bool{true} + if err := state.Validate(dataset); err == nil { + t.Fatal("partial rich-state vector passed validation") + } +} + +func TestDatasetSeedStateRejectsImpossiblePendingOperation(t *testing.T) { + dataset, err := PlanDataset(DefaultDatasetConfig(20)) + if err != nil { + t.Fatal(err) + } + state, err := NewDatasetSeedState(dataset) + if err != nil { + t.Fatal(err) + } + state.Groups[0].CreatePending = true + state.Groups[0].ChannelID = 11 + state.Groups[0].AccessHash = 22 + if err := state.Validate(dataset); err == nil { + t.Fatal("channel identity plus pending create passed validation") + } + state.Groups[0].CreatePending = false + state.Groups[0].ChannelID = 0 + state.Groups[0].AccessHash = 0 + state.Groups[0].InvitePendingEnd = 1 + if err := state.Validate(dataset); err == nil { + t.Fatal("invite progress without channel identity passed validation") + } +} + +func TestDatasetConfigRejectsUnsafeScale(t *testing.T) { + cfg := DefaultDatasetConfig(1000) + cfg.HotGroups = maxDatasetGroups + 1 + if _, err := PlanDataset(cfg); err == nil { + t.Fatal("oversized dataset passed validation") + } + cfg = DefaultDatasetConfig(10) + cfg.PrivateFanout = 10 + if _, err := PlanDataset(cfg); err == nil { + t.Fatal("self-wrapping private fanout passed validation") + } +} diff --git a/internal/loadharness/delivery.go b/internal/loadharness/delivery.go new file mode 100644 index 00000000..a05586f1 --- /dev/null +++ b/internal/loadharness/delivery.go @@ -0,0 +1,230 @@ +package loadharness + +import ( + "fmt" + "math" + "sort" + "strconv" + "strings" + "sync" + "time" + + "github.com/iamxvbaba/td/tg" +) + +const deliveryMarkerPrefix = "telesrv-load-v3" + +type deliverySource uint8 + +const ( + deliveryLive deliverySource = 1 << iota + deliveryDifference +) + +type deliveryExpectation struct { + senderUserID int64 + targetUserID int64 + startedAt time.Time + committed bool +} + +type deliveryObservation struct { + sources deliverySource + repeats uint64 + firstAt time.Time +} + +type deliveryTracker struct { + mu sync.Mutex + runID string + expected map[string]deliveryExpectation + observations map[string]map[int64]deliveryObservation +} + +type DeliveryReport struct { + RunID string `json:"run_id"` + Expected uint64 `json:"expected"` + Delivered uint64 `json:"delivered"` + Missing uint64 `json:"missing"` + LiveDelivered uint64 `json:"live_delivered"` + DifferenceRecovered uint64 `json:"difference_recovered"` + DuplicateObservations uint64 `json:"duplicate_observations"` + WrongAccountObserved uint64 `json:"wrong_account_observed"` + UnmatchedMarkers uint64 `json:"unmatched_markers"` + E2EP50MS float64 `json:"e2e_p50_ms"` + E2EP95MS float64 `json:"e2e_p95_ms"` + E2EP99MS float64 `json:"e2e_p99_ms"` + E2EMaxMS float64 `json:"e2e_max_ms"` +} + +func newDeliveryTracker(runID string) *deliveryTracker { + return &deliveryTracker{ + runID: runID, + expected: make(map[string]deliveryExpectation), + observations: make(map[string]map[int64]deliveryObservation), + } +} + +func (t *deliveryTracker) marker(senderIndex int, sequence uint64) string { + return fmt.Sprintf("%s/%s/%d/%d", deliveryMarkerPrefix, t.runID, senderIndex, sequence) +} + +func (t *deliveryTracker) expect(marker string, senderUserID, targetUserID int64) { + t.begin(marker, senderUserID, targetUserID, time.Now()) + t.finish(marker, true) +} + +func (t *deliveryTracker) begin(marker string, senderUserID, targetUserID int64, startedAt time.Time) { + if t == nil || !t.matches(marker) { + return + } + t.mu.Lock() + t.expected[marker] = deliveryExpectation{senderUserID: senderUserID, targetUserID: targetUserID, startedAt: startedAt} + t.mu.Unlock() +} + +func (t *deliveryTracker) finish(marker string, success bool) { + if t == nil { + return + } + t.mu.Lock() + expectation, ok := t.expected[marker] + if ok && success { + expectation.committed = true + t.expected[marker] = expectation + } else if ok { + delete(t.expected, marker) + } + t.mu.Unlock() +} + +func (t *deliveryTracker) observe(marker string, accountUserID int64, source deliverySource) { + if t == nil || accountUserID <= 0 || !t.matches(marker) { + return + } + t.mu.Lock() + byAccount := t.observations[marker] + if byAccount == nil { + byAccount = make(map[int64]deliveryObservation) + t.observations[marker] = byAccount + } + observation := byAccount[accountUserID] + if observation.firstAt.IsZero() { + observation.firstAt = time.Now() + } + if observation.sources&source != 0 { + observation.repeats++ + } + observation.sources |= source + byAccount[accountUserID] = observation + t.mu.Unlock() +} + +func (t *deliveryTracker) matches(marker string) bool { + parts := strings.Split(marker, "/") + if len(parts) != 4 || parts[0] != deliveryMarkerPrefix || parts[1] != t.runID { + return false + } + if _, err := strconv.Atoi(parts[2]); err != nil { + return false + } + sequence, err := strconv.ParseUint(parts[3], 10, 64) + return err == nil && sequence > 0 +} + +func (t *deliveryTracker) report() DeliveryReport { + t.mu.Lock() + defer t.mu.Unlock() + report := DeliveryReport{RunID: t.runID} + latencies := make([]time.Duration, 0, len(t.expected)) + for marker, expectation := range t.expected { + if !expectation.committed { + continue + } + report.Expected++ + byAccount := t.observations[marker] + observation, delivered := byAccount[expectation.targetUserID] + if delivered { + report.Delivered++ + switch { + case observation.sources&deliveryLive != 0: + report.LiveDelivered++ + case observation.sources&deliveryDifference != 0: + report.DifferenceRecovered++ + } + report.DuplicateObservations += observation.repeats + if !expectation.startedAt.IsZero() && !observation.firstAt.Before(expectation.startedAt) { + latencies = append(latencies, observation.firstAt.Sub(expectation.startedAt)) + } + } else { + report.Missing++ + } + for accountUserID, other := range byAccount { + if accountUserID == expectation.targetUserID || accountUserID == expectation.senderUserID { + continue + } + report.WrongAccountObserved++ + report.DuplicateObservations += other.repeats + } + } + for marker := range t.observations { + if expectation, ok := t.expected[marker]; !ok || !expectation.committed { + report.UnmatchedMarkers++ + } + } + if len(latencies) > 0 { + report.E2EP50MS = deliveryQuantileMS(latencies, 0.50) + report.E2EP95MS = deliveryQuantileMS(latencies, 0.95) + report.E2EP99MS = deliveryQuantileMS(latencies, 0.99) + report.E2EMaxMS = deliveryQuantileMS(latencies, 1) + } + return report +} + +func deliveryQuantileMS(values []time.Duration, quantile float64) float64 { + sorted := append([]time.Duration(nil), values...) + sort.Slice(sorted, func(i, j int) bool { return sorted[i] < sorted[j] }) + index := int(math.Ceil(float64(len(sorted))*quantile)) - 1 + index = max(0, min(index, len(sorted)-1)) + return durationMS(sorted[index]) +} + +func observeUpdatesClass(tracker *deliveryTracker, accountUserID int64, updates tg.UpdatesClass, source deliverySource) { + switch value := updates.(type) { + case *tg.Updates: + observeUpdateClasses(tracker, accountUserID, value.Updates, source) + case *tg.UpdatesCombined: + observeUpdateClasses(tracker, accountUserID, value.Updates, source) + case *tg.UpdateShort: + observeUpdateClass(tracker, accountUserID, value.Update, source) + case *tg.UpdateShortMessage: + tracker.observe(value.Message, accountUserID, source) + } +} + +func observeUpdateClasses(tracker *deliveryTracker, accountUserID int64, updates []tg.UpdateClass, source deliverySource) { + for _, update := range updates { + observeUpdateClass(tracker, accountUserID, update, source) + } +} + +func observeUpdateClass(tracker *deliveryTracker, accountUserID int64, update tg.UpdateClass, source deliverySource) { + switch value := update.(type) { + case *tg.UpdateNewMessage: + observeMessageClass(tracker, accountUserID, value.Message, source) + case *tg.UpdateNewChannelMessage: + observeMessageClass(tracker, accountUserID, value.Message, source) + } +} + +func observeMessageClasses(tracker *deliveryTracker, accountUserID int64, messages []tg.MessageClass, source deliverySource) { + for _, message := range messages { + observeMessageClass(tracker, accountUserID, message, source) + } +} + +func observeMessageClass(tracker *deliveryTracker, accountUserID int64, message tg.MessageClass, source deliverySource) { + if value, ok := message.(*tg.Message); ok { + tracker.observe(value.Message, accountUserID, source) + } +} diff --git a/internal/loadharness/delivery_test.go b/internal/loadharness/delivery_test.go new file mode 100644 index 00000000..2b71d4f8 --- /dev/null +++ b/internal/loadharness/delivery_test.go @@ -0,0 +1,83 @@ +package loadharness + +import ( + "testing" + "time" + + "github.com/iamxvbaba/td/tg" +) + +func TestDeliveryTrackerReconcilesObservationBeforeSendReturn(t *testing.T) { + tracker := newDeliveryTracker("run") + marker := tracker.marker(7, 9) + + tracker.observe(marker, 200, deliveryLive) + tracker.expect(marker, 100, 200) + + report := tracker.report() + if report.Expected != 1 || report.Delivered != 1 || report.LiveDelivered != 1 || report.Missing != 0 { + t.Fatalf("unexpected report: %+v", report) + } +} + +func TestDeliveryTrackerMeasuresFromSendStart(t *testing.T) { + tracker := newDeliveryTracker("run") + marker := tracker.marker(1, 1) + tracker.begin(marker, 100, 200, time.Now().Add(-25*time.Millisecond)) + tracker.observe(marker, 200, deliveryLive) + tracker.finish(marker, true) + + report := tracker.report() + if report.E2EP50MS < 20 || report.E2EP99MS < report.E2EP50MS || report.E2EMaxMS < report.E2EP99MS { + t.Fatalf("unexpected e2e latency report: %+v", report) + } +} + +func TestDeliveryTrackerSeparatesDifferenceRecoveryAndDuplicates(t *testing.T) { + tracker := newDeliveryTracker("run") + liveMarker := tracker.marker(1, 1) + differenceMarker := tracker.marker(2, 1) + tracker.expect(liveMarker, 100, 200) + tracker.expect(differenceMarker, 200, 300) + + tracker.observe(liveMarker, 200, deliveryLive) + tracker.observe(liveMarker, 200, deliveryLive) + tracker.observe(liveMarker, 200, deliveryDifference) + tracker.observe(differenceMarker, 300, deliveryDifference) + + report := tracker.report() + if report.Delivered != 2 || report.LiveDelivered != 1 || report.DifferenceRecovered != 1 { + t.Fatalf("unexpected delivery sources: %+v", report) + } + if report.DuplicateObservations != 1 { + t.Fatalf("duplicate observations = %d, want 1", report.DuplicateObservations) + } +} + +func TestObserveUpdatesClassExtractsPrivateMessages(t *testing.T) { + tracker := newDeliveryTracker("run") + shortMarker := tracker.marker(1, 1) + fullMarker := tracker.marker(2, 1) + tracker.expect(shortMarker, 100, 200) + tracker.expect(fullMarker, 300, 200) + + observeUpdatesClass(tracker, 200, &tg.UpdateShortMessage{Message: shortMarker}, deliveryLive) + observeUpdatesClass(tracker, 200, &tg.Updates{Updates: []tg.UpdateClass{ + &tg.UpdateNewMessage{Message: &tg.Message{Message: fullMarker}}, + }}, deliveryLive) + + report := tracker.report() + if report.Delivered != 2 || report.Missing != 0 { + t.Fatalf("unexpected report: %+v", report) + } +} + +func TestDeliveryTrackerRejectsForeignAndMalformedMarkers(t *testing.T) { + tracker := newDeliveryTracker("run") + tracker.observe("telesrv-load-v3/other/1/1", 200, deliveryLive) + tracker.observe("telesrv-load-v3/run/not-an-index/1", 200, deliveryLive) + + if report := tracker.report(); report.UnmatchedMarkers != 0 { + t.Fatalf("foreign marker entered report: %+v", report) + } +} diff --git a/internal/loadharness/mutate.go b/internal/loadharness/mutate.go new file mode 100644 index 00000000..355bd4f7 --- /dev/null +++ b/internal/loadharness/mutate.go @@ -0,0 +1,778 @@ +package loadharness + +import ( + "context" + "crypto/sha256" + "encoding/json" + "errors" + "fmt" + "os" + "sort" + "strings" + "sync" + "time" + + "github.com/iamxvbaba/td/tg" + "github.com/iamxvbaba/td/tgerr" +) + +const OfflineMutationVersion = 1 + +type OfflineMutationChannelPlan struct { + GroupPosition int + Messages int +} + +type OfflineMutationChannelState struct { + GroupIndex int `json:"group_index"` + MessageIDs []int `json:"message_ids"` + LatestPts int `json:"latest_pts,omitempty"` + EditPending bool `json:"edit_pending,omitempty"` + EditDone bool `json:"edit_done,omitempty"` + DeletePending bool `json:"delete_pending,omitempty"` + DeleteDone bool `json:"delete_done,omitempty"` + PinPending bool `json:"pin_pending,omitempty"` + PinDone bool `json:"pin_done,omitempty"` +} + +type OfflineMutationState struct { + Version int `json:"version"` + DatasetSHA256 string `json:"dataset_sha256"` + SeedIdentitySHA string `json:"seed_identity_sha256"` + BaselineStateSHA string `json:"baseline_state_sha256"` + UpdatedAt time.Time `json:"updated_at"` + PrivateMessageIDs []int `json:"private_message_ids"` + AccountObservedPts []int `json:"account_observed_pts"` + Channels []OfflineMutationChannelState `json:"channels"` +} + +type MutateOfflineConfig struct { + ManifestPath string + SessionKeyPath string + RSAKeyOverride string + DatasetPath string + SeedStatePath string + ClientStatePath string + MutationStatePath string + Concurrency int + OperationTimeout time.Duration +} + +type MutationEvent struct { + Phase string + Completed int + Total int + Account int + Err error +} + +type MutationResult struct { + PrivateMessages int + ChannelMessages int + DirtyChannels int + Edited int + Deleted int + Pinned int +} + +func (c MutateOfflineConfig) validate() error { + if c.ManifestPath == "" || c.SessionKeyPath == "" || c.DatasetPath == "" || c.SeedStatePath == "" || c.ClientStatePath == "" || c.MutationStatePath == "" { + return errors.New("manifest, session-key, dataset, seed-state, client-state and mutation-state paths are required") + } + if c.Concurrency <= 0 || c.Concurrency > 64 { + return errors.New("offline mutation concurrency must be between 1 and 64") + } + if c.OperationTimeout <= 0 { + return errors.New("offline mutation operation timeout must be positive") + } + return nil +} + +// MutateOffline creates gaps only after a complete baseline has been locked. +// Message sends use stable random_id values. Mutable channel operations use a +// pending journal and public read-back reconciliation before a resumed run can +// declare them complete. +func MutateOffline(ctx context.Context, cfg MutateOfflineConfig, progress func(MutationEvent)) (*MutationResult, error) { + if err := cfg.validate(); err != nil { + return nil, err + } + manifest, err := LoadManifest(cfg.ManifestPath) + if err != nil { + return nil, err + } + dataset, err := LoadDataset(cfg.DatasetPath) + if err != nil { + return nil, err + } + targets, err := seedPrimaryTargets(manifest, dataset.Config.Accounts) + if err != nil { + return nil, err + } + seedState, err := LoadDatasetSeedState(cfg.SeedStatePath, dataset) + if err != nil { + return nil, err + } + seedJournal := &seedJournal{dataset: dataset, state: seedState} + if err := seedJournal.assertComplete(); err != nil { + return nil, fmt.Errorf("offline mutation requires a complete seed: %w", err) + } + clientState, err := LoadClientState(cfg.ClientStatePath) + if err != nil { + return nil, err + } + if err := clientState.Validate(dataset, seedState, targets); err != nil { + return nil, err + } + baselineSHA, err := fileSHA256(cfg.ClientStatePath) + if err != nil { + return nil, err + } + seedIdentity, err := seedIdentitySHA256(seedState) + if err != nil { + return nil, err + } + plan := planOfflineMutation(dataset) + state, err := loadOrCreateOfflineMutationState(cfg.MutationStatePath, dataset, seedIdentity, baselineSHA, plan) + if err != nil { + return nil, err + } + journal := &mutationJournal{path: cfg.MutationStatePath, dataset: dataset, plan: plan, state: state} + if err := journal.persist(); err != nil { + return nil, err + } + key, err := LoadSessionKey(cfg.SessionKeyPath) + if err != nil { + return nil, err + } + publicKey, err := loadManifestPublicKey(cfg.ManifestPath, manifest.Endpoint, cfg.RSAKeyOverride) + if err != nil { + return nil, err + } + accounts := make([]int, dataset.Config.Accounts) + for account := range accounts { + accounts[account] = account + } + + if err := runSeedAccountPhase(ctx, "mutate-private", accounts, cfg.Concurrency, mutationProgressAdapter("private", progress), func(ctx context.Context, account int) error { + if journal.privateMessageID(account) != 0 { + return nil + } + return withAuthorizedSeedSession(ctx, SeedConfig{ManifestPath: cfg.ManifestPath, OperationTimeout: cfg.OperationTimeout}, manifest, targets[account], key, publicKey, func(ctx context.Context, raw *tg.Client) error { + recipient := (account + 1) % dataset.Config.Accounts + marker := offlinePrivateMarker(dataset, account, recipient) + updates, err := rpcWithFloodWaitRetry(ctx, cfg.OperationTimeout, func(rpcCtx context.Context) (tg.UpdatesClass, error) { + return raw.MessagesSendMessage(rpcCtx, &tg.MessagesSendMessageRequest{ + Peer: &tg.InputPeerUser{UserID: targets[recipient].UserID, AccessHash: targets[recipient].AccessHash}, + Message: marker, RandomID: stableDatasetID(dataset.Config.Seed, "offline-private", dataset.Config.Accounts, account, recipient), + }) + }) + if err != nil { + return fmt.Errorf("messages.sendMessage: %w", err) + } + observation, err := sentMessageObservation(updates, clientPeerKey{typ: "user", id: targets[recipient].UserID}, marker) + if err != nil { + return err + } + return journal.commitPrivate(account, observation.ID, observation.Pts) + }) + }); err != nil { + return nil, err + } + + channelTasks := offlineChannelTasks(dataset, plan) + channelAccounts := make([]int, 0, len(channelTasks)) + for account := range channelTasks { + channelAccounts = append(channelAccounts, account) + } + sort.Ints(channelAccounts) + if err := runSeedAccountPhase(ctx, "mutate-channel", channelAccounts, cfg.Concurrency, mutationProgressAdapter("channel", progress), func(ctx context.Context, account int) error { + return withAuthorizedSeedSession(ctx, SeedConfig{ManifestPath: cfg.ManifestPath, OperationTimeout: cfg.OperationTimeout}, manifest, targets[account], key, publicKey, func(ctx context.Context, raw *tg.Client) error { + for _, task := range channelTasks[account] { + if journal.channelMessageID(task.PlanPosition, task.MessageIndex) != 0 { + continue + } + channelPlan := plan[task.PlanPosition] + group := dataset.Groups[channelPlan.GroupPosition] + channel := seedState.Groups[channelPlan.GroupPosition] + marker := offlineChannelMarker(dataset, group, task.MessageIndex) + updates, err := rpcWithFloodWaitRetry(ctx, cfg.OperationTimeout, func(rpcCtx context.Context) (tg.UpdatesClass, error) { + return raw.MessagesSendMessage(rpcCtx, &tg.MessagesSendMessageRequest{ + Peer: &tg.InputPeerChannel{ChannelID: channel.ChannelID, AccessHash: channel.AccessHash}, + Message: marker, RandomID: stableDatasetID(dataset.Config.Seed, "offline-channel", dataset.Config.Accounts, group.Index, task.MessageIndex), + }) + }) + if err != nil { + return fmt.Errorf("group %d message %d: %w", group.Index, task.MessageIndex, err) + } + observation, err := sentMessageObservation(updates, clientPeerKey{typ: "channel", id: channel.ChannelID}, marker) + if err != nil { + return fmt.Errorf("group %d message %d: %w", group.Index, task.MessageIndex, err) + } + if err := journal.commitChannelMessage(task.PlanPosition, task.MessageIndex, observation.ID, observation.Pts); err != nil { + return err + } + } + return nil + }) + }); err != nil { + return nil, err + } + + // The first dirty channel deliberately exceeds the page limit and owns the + // edit, delete and pin events. The creator authors the edited message and can + // administratively delete/pin the two newest messages in one session. + if len(plan) == 0 || plan[0].Messages < 120 { + return nil, errors.New("offline mutation plan has no multi-page channel") + } + actionGroup := dataset.Groups[plan[0].GroupPosition] + if err := runSeedAccountPhase(ctx, "mutate-actions", []int{actionGroup.CreatorAccount}, 1, mutationProgressAdapter("actions", progress), func(ctx context.Context, account int) error { + return withAuthorizedSeedSession(ctx, SeedConfig{ManifestPath: cfg.ManifestPath, OperationTimeout: cfg.OperationTimeout}, manifest, targets[account], key, publicKey, func(ctx context.Context, raw *tg.Client) error { + return applyOfflineChannelActions(ctx, cfg.OperationTimeout, dataset, seedState, plan, journal, raw) + }) + }); err != nil { + return nil, err + } + if err := journal.assertComplete(); err != nil { + return nil, err + } + return offlineMutationResult(plan, state), nil +} + +func planOfflineMutation(dataset *Dataset) []OfflineMutationChannelPlan { + plan := make([]OfflineMutationChannelPlan, 0, 40) + counts := map[string]int{"hot": 10, "medium": 10, "small": 10, "heavy": 10} + messages := map[string]int{"hot": 3, "medium": 2, "small": 1, "heavy": 3} + seen := make(map[string]int) + for position, group := range dataset.Groups { + if seen[group.Tier] >= counts[group.Tier] { + continue + } + count := messages[group.Tier] + switch len(plan) { + case 0: + count = 120 + case 1: + // Exactly one full page complements the first channel's >limit + // channelDifferenceTooLong snapshot path. + count = 100 + } + plan = append(plan, OfflineMutationChannelPlan{GroupPosition: position, Messages: count}) + seen[group.Tier]++ + } + if len(plan) == 0 && len(dataset.Groups) != 0 { + plan = append(plan, OfflineMutationChannelPlan{GroupPosition: 0, Messages: 120}) + } + return plan +} + +type offlineChannelTask struct { + PlanPosition int + MessageIndex int +} + +func offlineChannelTasks(dataset *Dataset, plan []OfflineMutationChannelPlan) map[int][]offlineChannelTask { + tasks := make(map[int][]offlineChannelTask) + for planPosition, channelPlan := range plan { + group := dataset.Groups[channelPlan.GroupPosition] + for message := 0; message < channelPlan.Messages; message++ { + account := offlineMutationSender(group, message) + tasks[account] = append(tasks[account], offlineChannelTask{PlanPosition: planPosition, MessageIndex: message}) + } + } + return tasks +} + +func offlineMutationSender(group DatasetGroup, message int) int { + if message < 3 { + return group.CreatorAccount + } + return group.MemberAccounts[message%len(group.MemberAccounts)] +} + +func offlinePrivateMarker(dataset *Dataset, sender, recipient int) string { + return fmt.Sprintf("[%s offline private %04d->%04d]", dataset.RunID, sender, recipient) +} + +func offlineChannelMarker(dataset *Dataset, group DatasetGroup, message int) string { + return fmt.Sprintf("[%s offline channel %04d message %04d]", dataset.RunID, group.Index, message+1) +} + +type messageObservation struct { + ID int + Pts int +} + +func sentMessageObservation(updates tg.UpdatesClass, peer clientPeerKey, marker string) (messageObservation, error) { + switch value := updates.(type) { + case *tg.UpdateShortSentMessage: + if value.ID > 0 { + return messageObservation{ID: value.ID, Pts: value.Pts}, nil + } + case *tg.UpdateShortMessage: + if value.ID > 0 && value.Message == marker { + return messageObservation{ID: value.ID, Pts: value.Pts}, nil + } + case *tg.Updates: + return sentMessageObservationFromUpdates(value.Updates, peer, marker) + case *tg.UpdatesCombined: + return sentMessageObservationFromUpdates(value.Updates, peer, marker) + } + return messageObservation{}, fmt.Errorf("messages.sendMessage returned %T without marker", updates) +} + +func sentMessageObservationFromUpdates(updates []tg.UpdateClass, peer clientPeerKey, marker string) (messageObservation, error) { + for _, update := range updates { + var message tg.MessageClass + pts := 0 + switch value := update.(type) { + case *tg.UpdateNewMessage: + message, pts = value.Message, value.Pts + case *tg.UpdateNewChannelMessage: + message, pts = value.Message, value.Pts + default: + continue + } + full, ok := message.(*tg.Message) + if !ok || full.Message != marker { + continue + } + messagePeer, ok := clientPeerFromTG(full.PeerID) + if ok && messagePeer == peer && full.ID > 0 { + return messageObservation{ID: full.ID, Pts: pts}, nil + } + } + return messageObservation{}, errors.New("messages.sendMessage updates omitted expected marker") +} + +func applyOfflineChannelActions( + ctx context.Context, + timeout time.Duration, + dataset *Dataset, + seedState *DatasetSeedState, + plan []OfflineMutationChannelPlan, + journal *mutationJournal, + raw *tg.Client, +) error { + channelPlan := plan[0] + group := dataset.Groups[channelPlan.GroupPosition] + channel := seedState.Groups[channelPlan.GroupPosition] + state := journal.channel(0) + deleteIndex, pinIndex := channelPlan.Messages-2, channelPlan.Messages-1 + if state.MessageIDs[0] == 0 || state.MessageIDs[deleteIndex] == 0 || state.MessageIDs[pinIndex] == 0 { + return errors.New("channel action messages are incomplete") + } + peer := &tg.InputPeerChannel{ChannelID: channel.ChannelID, AccessHash: channel.AccessHash} + inputChannel := &tg.InputChannel{ChannelID: channel.ChannelID, AccessHash: channel.AccessHash} + + if !state.EditDone { + if !state.EditPending { + if err := journal.beginAction(0, "edit"); err != nil { + return err + } + } + editedMarker := offlineChannelMarker(dataset, group, 0) + " edited" + updates, err := rpcWithFloodWaitRetry(ctx, timeout, func(rpcCtx context.Context) (tg.UpdatesClass, error) { + return raw.MessagesEditMessage(rpcCtx, &tg.MessagesEditMessageRequest{Peer: peer, ID: state.MessageIDs[0], Message: editedMarker}) + }) + pts := maxPtsFromUpdates(updates) + if err != nil { + if !tgerr.Is(err, "MESSAGE_NOT_MODIFIED") { + return fmt.Errorf("messages.editMessage pending reconciliation: %w", err) + } + matches, verifyErr := channelMessageMatches(ctx, timeout, raw, inputChannel, state.MessageIDs[0], editedMarker) + if verifyErr != nil || !matches { + return fmt.Errorf("reconcile messages.editMessage: matched=%v err=%w", matches, verifyErr) + } + } + if err := journal.commitAction(0, "edit", pts); err != nil { + return err + } + state = journal.channel(0) + } + if !state.DeleteDone { + if !state.DeletePending { + if err := journal.beginAction(0, "delete"); err != nil { + return err + } + } + affected, err := rpcWithFloodWaitRetry(ctx, timeout, func(rpcCtx context.Context) (*tg.MessagesAffectedMessages, error) { + return raw.ChannelsDeleteMessages(rpcCtx, &tg.ChannelsDeleteMessagesRequest{Channel: inputChannel, ID: []int{state.MessageIDs[deleteIndex]}}) + }) + pts := 0 + if affected != nil { + pts = affected.Pts + } + if err != nil { + deleted, verifyErr := channelMessageDeleted(ctx, timeout, raw, inputChannel, state.MessageIDs[deleteIndex]) + if verifyErr != nil || !deleted { + return fmt.Errorf("reconcile channels.deleteMessages: deleted=%v err=%w (rpc %v)", deleted, verifyErr, err) + } + } + if err := journal.commitAction(0, "delete", pts); err != nil { + return err + } + state = journal.channel(0) + } + if !state.PinDone { + if !state.PinPending { + if err := journal.beginAction(0, "pin"); err != nil { + return err + } + } + updates, err := rpcWithFloodWaitRetry(ctx, timeout, func(rpcCtx context.Context) (tg.UpdatesClass, error) { + return raw.MessagesUpdatePinnedMessage(rpcCtx, &tg.MessagesUpdatePinnedMessageRequest{Silent: true, Peer: peer, ID: state.MessageIDs[pinIndex]}) + }) + pts := maxPtsFromUpdates(updates) + if err != nil { + pinned, verifyErr := channelMessagePinned(ctx, timeout, raw, inputChannel, state.MessageIDs[pinIndex]) + if verifyErr != nil || !pinned { + return fmt.Errorf("reconcile messages.updatePinnedMessage: pinned=%v err=%w (rpc %v)", pinned, verifyErr, err) + } + } + if err := journal.commitAction(0, "pin", pts); err != nil { + return err + } + } + return nil +} + +func channelMessageMatches(ctx context.Context, timeout time.Duration, raw *tg.Client, channel *tg.InputChannel, messageID int, text string) (bool, error) { + messages, err := getChannelMessages(ctx, timeout, raw, channel, messageID) + if err != nil { + return false, err + } + for _, message := range messages { + if full, ok := message.(*tg.Message); ok && full.ID == messageID { + return full.Message == text, nil + } + } + return false, nil +} + +func channelMessageDeleted(ctx context.Context, timeout time.Duration, raw *tg.Client, channel *tg.InputChannel, messageID int) (bool, error) { + messages, err := getChannelMessages(ctx, timeout, raw, channel, messageID) + if err != nil { + return false, err + } + for _, message := range messages { + if full, ok := message.(*tg.Message); ok && full.ID == messageID { + return false, nil + } + } + return true, nil +} + +func getChannelMessages(ctx context.Context, timeout time.Duration, raw *tg.Client, channel *tg.InputChannel, messageID int) ([]tg.MessageClass, error) { + rpcCtx, cancel := context.WithTimeout(ctx, timeout) + response, err := raw.ChannelsGetMessages(rpcCtx, &tg.ChannelsGetMessagesRequest{ + Channel: channel, ID: []tg.InputMessageClass{&tg.InputMessageID{ID: messageID}}, + }) + cancel() + if err != nil { + return nil, err + } + modified, ok := response.AsModified() + if !ok { + return nil, fmt.Errorf("channels.getMessages returned %T", response) + } + return modified.GetMessages(), nil +} + +func channelMessagePinned(ctx context.Context, timeout time.Duration, raw *tg.Client, channel *tg.InputChannel, messageID int) (bool, error) { + rpcCtx, cancel := context.WithTimeout(ctx, timeout) + response, err := raw.ChannelsGetFullChannel(rpcCtx, channel) + cancel() + if err != nil { + return false, err + } + full, ok := response.FullChat.(*tg.ChannelFull) + if !ok { + return false, fmt.Errorf("channels.getFullChannel returned %T", response.FullChat) + } + pinned, ok := full.GetPinnedMsgID() + return ok && pinned == messageID, nil +} + +func maxPtsFromUpdates(updates tg.UpdatesClass) int { + if updates == nil { + return 0 + } + maxPts := 0 + var classes []tg.UpdateClass + switch value := updates.(type) { + case *tg.UpdateShortSentMessage: + return value.Pts + case *tg.UpdateShortMessage: + return value.Pts + case *tg.Updates: + classes = value.Updates + case *tg.UpdatesCombined: + classes = value.Updates + } + for _, class := range classes { + switch value := class.(type) { + case *tg.UpdateNewMessage: + maxPts = max(maxPts, value.Pts) + case *tg.UpdateNewChannelMessage: + maxPts = max(maxPts, value.Pts) + case *tg.UpdateEditChannelMessage: + maxPts = max(maxPts, value.Pts) + case *tg.UpdateDeleteChannelMessages: + maxPts = max(maxPts, value.Pts) + case *tg.UpdatePinnedChannelMessages: + maxPts = max(maxPts, value.Pts) + } + } + return maxPts +} + +func mutationProgressAdapter(phase string, progress func(MutationEvent)) func(SeedEvent) { + if progress == nil { + return nil + } + return func(event SeedEvent) { + progress(MutationEvent{Phase: phase, Completed: event.Completed, Total: event.Total, Account: event.Account, Err: event.Err}) + } +} + +func fileSHA256(path string) (string, error) { + data, err := os.ReadFile(path) + if err != nil { + return "", err + } + sum := sha256.Sum256(data) + return fmt.Sprintf("%x", sum[:]), nil +} + +func loadOrCreateOfflineMutationState( + path string, + dataset *Dataset, + seedIdentity, baselineSHA string, + plan []OfflineMutationChannelPlan, +) (*OfflineMutationState, error) { + data, err := os.ReadFile(path) + if os.IsNotExist(err) { + state := &OfflineMutationState{ + Version: OfflineMutationVersion, DatasetSHA256: dataset.PlanSHA256, + SeedIdentitySHA: seedIdentity, BaselineStateSHA: baselineSHA, + PrivateMessageIDs: make([]int, dataset.Config.Accounts), AccountObservedPts: make([]int, dataset.Config.Accounts), + Channels: make([]OfflineMutationChannelState, len(plan)), + } + for i, channelPlan := range plan { + state.Channels[i] = OfflineMutationChannelState{ + GroupIndex: dataset.Groups[channelPlan.GroupPosition].Index, + MessageIDs: make([]int, channelPlan.Messages), + } + } + return state, nil + } + if err != nil { + return nil, err + } + var state OfflineMutationState + decoder := json.NewDecoder(strings.NewReader(string(data))) + decoder.DisallowUnknownFields() + if err := decoder.Decode(&state); err != nil { + return nil, fmt.Errorf("decode offline mutation state: %w", err) + } + if err := state.Validate(dataset, seedIdentity, baselineSHA, plan); err != nil { + return nil, err + } + return &state, nil +} + +func (s *OfflineMutationState) Validate(dataset *Dataset, seedIdentity, baselineSHA string, plan []OfflineMutationChannelPlan) error { + if s == nil || s.Version != OfflineMutationVersion || s.DatasetSHA256 != dataset.PlanSHA256 || s.SeedIdentitySHA != seedIdentity || s.BaselineStateSHA != baselineSHA { + return errors.New("offline mutation state does not match baseline dataset") + } + if len(s.PrivateMessageIDs) != dataset.Config.Accounts || len(s.AccountObservedPts) != dataset.Config.Accounts || len(s.Channels) != len(plan) { + return errors.New("offline mutation state dimensions do not match plan") + } + for account := range s.PrivateMessageIDs { + if s.PrivateMessageIDs[account] < 0 || s.AccountObservedPts[account] < 0 { + return fmt.Errorf("invalid offline private mutation account %d", account) + } + } + for i, channel := range s.Channels { + if channel.GroupIndex != dataset.Groups[plan[i].GroupPosition].Index || len(channel.MessageIDs) != plan[i].Messages || channel.LatestPts < 0 { + return fmt.Errorf("invalid offline mutation channel %d", channel.GroupIndex) + } + for _, messageID := range channel.MessageIDs { + if messageID < 0 { + return fmt.Errorf("offline mutation channel %d has invalid message id", channel.GroupIndex) + } + } + if (channel.EditDone && channel.EditPending) || (channel.DeleteDone && channel.DeletePending) || (channel.PinDone && channel.PinPending) { + return fmt.Errorf("offline mutation channel %d has completed pending action", channel.GroupIndex) + } + } + return nil +} + +type mutationJournal struct { + mu sync.Mutex + path string + dataset *Dataset + plan []OfflineMutationChannelPlan + state *OfflineMutationState +} + +func (j *mutationJournal) persistLocked() error { + if err := j.state.Validate(j.dataset, j.state.SeedIdentitySHA, j.state.BaselineStateSHA, j.plan); err != nil { + return err + } + j.state.UpdatedAt = time.Now().UTC() + data, err := json.MarshalIndent(j.state, "", " ") + if err != nil { + return err + } + return writeFileAtomic(j.path, append(data, '\n'), 0o600) +} + +func (j *mutationJournal) persist() error { + j.mu.Lock() + defer j.mu.Unlock() + return j.persistLocked() +} + +func (j *mutationJournal) privateMessageID(account int) int { + j.mu.Lock() + defer j.mu.Unlock() + return j.state.PrivateMessageIDs[account] +} + +func (j *mutationJournal) channelMessageID(planPosition, message int) int { + j.mu.Lock() + defer j.mu.Unlock() + return j.state.Channels[planPosition].MessageIDs[message] +} + +func (j *mutationJournal) channel(planPosition int) OfflineMutationChannelState { + j.mu.Lock() + defer j.mu.Unlock() + state := j.state.Channels[planPosition] + state.MessageIDs = append([]int(nil), state.MessageIDs...) + return state +} + +func (j *mutationJournal) commitPrivate(account, messageID, pts int) error { + if messageID <= 0 || pts < 0 { + return errors.New("invalid private mutation observation") + } + j.mu.Lock() + defer j.mu.Unlock() + oldID, oldPts := j.state.PrivateMessageIDs[account], j.state.AccountObservedPts[account] + j.state.PrivateMessageIDs[account] = messageID + j.state.AccountObservedPts[account] = max(oldPts, pts) + if err := j.persistLocked(); err != nil { + j.state.PrivateMessageIDs[account], j.state.AccountObservedPts[account] = oldID, oldPts + return err + } + return nil +} + +func (j *mutationJournal) commitChannelMessage(planPosition, message, messageID, pts int) error { + if messageID <= 0 || pts <= 0 { + return errors.New("invalid channel mutation observation") + } + j.mu.Lock() + defer j.mu.Unlock() + channel := &j.state.Channels[planPosition] + oldID, oldPts := channel.MessageIDs[message], channel.LatestPts + channel.MessageIDs[message] = messageID + channel.LatestPts = max(channel.LatestPts, pts) + if err := j.persistLocked(); err != nil { + channel.MessageIDs[message], channel.LatestPts = oldID, oldPts + return err + } + return nil +} + +func (j *mutationJournal) beginAction(planPosition int, action string) error { + j.mu.Lock() + defer j.mu.Unlock() + channel := &j.state.Channels[planPosition] + old := *channel + switch action { + case "edit": + channel.EditPending = true + case "delete": + channel.DeletePending = true + case "pin": + channel.PinPending = true + default: + return fmt.Errorf("unknown mutation action %q", action) + } + if err := j.persistLocked(); err != nil { + *channel = old + return err + } + return nil +} + +func (j *mutationJournal) commitAction(planPosition int, action string, pts int) error { + j.mu.Lock() + defer j.mu.Unlock() + channel := &j.state.Channels[planPosition] + old := *channel + switch action { + case "edit": + channel.EditPending, channel.EditDone = false, true + case "delete": + channel.DeletePending, channel.DeleteDone = false, true + case "pin": + channel.PinPending, channel.PinDone = false, true + default: + return fmt.Errorf("unknown mutation action %q", action) + } + channel.LatestPts = max(channel.LatestPts, pts) + if err := j.persistLocked(); err != nil { + *channel = old + return err + } + return nil +} + +func (j *mutationJournal) assertComplete() error { + j.mu.Lock() + defer j.mu.Unlock() + if err := j.state.Validate(j.dataset, j.state.SeedIdentitySHA, j.state.BaselineStateSHA, j.plan); err != nil { + return err + } + for account, messageID := range j.state.PrivateMessageIDs { + if messageID <= 0 { + return fmt.Errorf("offline private mutation account %d is incomplete", account) + } + } + for i, channel := range j.state.Channels { + for message, messageID := range channel.MessageIDs { + if messageID <= 0 { + return fmt.Errorf("offline channel %d message %d is incomplete", channel.GroupIndex, message) + } + } + if channel.LatestPts <= 0 { + return fmt.Errorf("offline channel %d has no observed pts", channel.GroupIndex) + } + if i == 0 && (!channel.EditDone || !channel.DeleteDone || !channel.PinDone) { + return fmt.Errorf("offline channel %d actions are incomplete", channel.GroupIndex) + } + } + return nil +} + +func offlineMutationResult(plan []OfflineMutationChannelPlan, state *OfflineMutationState) *MutationResult { + result := &MutationResult{PrivateMessages: len(state.PrivateMessageIDs), DirtyChannels: len(plan)} + for _, channel := range state.Channels { + result.ChannelMessages += len(channel.MessageIDs) + if channel.EditDone { + result.Edited++ + } + if channel.DeleteDone { + result.Deleted++ + } + if channel.PinDone { + result.Pinned++ + } + } + return result +} diff --git a/internal/loadharness/mutate_test.go b/internal/loadharness/mutate_test.go new file mode 100644 index 00000000..37b2f2a1 --- /dev/null +++ b/internal/loadharness/mutate_test.go @@ -0,0 +1,123 @@ +package loadharness + +import ( + "os" + "path/filepath" + "testing" + + "github.com/iamxvbaba/td/tg" +) + +func TestPlanOfflineMutationDefaultTopology(t *testing.T) { + dataset, err := PlanDataset(DefaultDatasetConfig(1000)) + if err != nil { + t.Fatal(err) + } + plan := planOfflineMutation(dataset) + if got, want := len(plan), 40; got != want { + t.Fatalf("dirty channels = %d, want %d", got, want) + } + total := 0 + for _, channel := range plan { + total += channel.Messages + } + if got, want := total, 304; got != want { + t.Fatalf("channel mutations = %d, want %d", got, want) + } + if plan[0].Messages != 120 || dataset.Groups[plan[0].GroupPosition].Tier != "hot" { + t.Fatalf("multi-page channel plan = %+v", plan[0]) + } + if plan[1].Messages != 100 { + t.Fatalf("full-page boundary channel plan = %+v", plan[1]) + } + group := dataset.Groups[plan[0].GroupPosition] + for message := 0; message < 3; message++ { + if got := offlineMutationSender(group, message); got != group.CreatorAccount { + t.Fatalf("action message %d sender = %d, want creator %d", message, got, group.CreatorAccount) + } + } +} + +func TestSentMessageObservation(t *testing.T) { + peer := clientPeerKey{typ: "channel", id: 22} + marker := "marker" + observation, err := sentMessageObservation(&tg.Updates{Updates: []tg.UpdateClass{ + &tg.UpdateNewChannelMessage{ + Message: &tg.Message{ID: 7, PeerID: &tg.PeerChannel{ChannelID: 22}, Message: marker}, + Pts: 12, PtsCount: 1, + }, + }}, peer, marker) + if err != nil { + t.Fatal(err) + } + if observation.ID != 7 || observation.Pts != 12 { + t.Fatalf("observation = %+v", observation) + } + short, err := sentMessageObservation(&tg.UpdateShortSentMessage{ID: 8, Pts: 13}, clientPeerKey{typ: "user", id: 1}, "private") + if err != nil || short.ID != 8 || short.Pts != 13 { + t.Fatalf("short observation = %+v err=%v", short, err) + } + if _, err := sentMessageObservation(&tg.Updates{}, peer, marker); err == nil { + t.Fatal("updates without marker passed validation") + } +} + +func TestOfflineMutationJournalPersistsMessagesAndActions(t *testing.T) { + dataset, seedState, _ := snapshotFixture(t) + seedIdentity, err := seedIdentitySHA256(seedState) + if err != nil { + t.Fatal(err) + } + plan := planOfflineMutation(dataset) + path := filepath.Join(t.TempDir(), "mutation-state.json") + state, err := loadOrCreateOfflineMutationState(path, dataset, seedIdentity, "baseline", plan) + if err != nil { + t.Fatal(err) + } + journal := &mutationJournal{path: path, dataset: dataset, plan: plan, state: state} + if err := journal.persist(); err != nil { + t.Fatal(err) + } + if err := journal.commitPrivate(0, 10, 20); err != nil { + t.Fatal(err) + } + if err := journal.commitChannelMessage(0, 0, 30, 40); err != nil { + t.Fatal(err) + } + if err := journal.beginAction(0, "edit"); err != nil { + t.Fatal(err) + } + if err := journal.commitAction(0, "edit", 41); err != nil { + t.Fatal(err) + } + loaded, err := loadOrCreateOfflineMutationState(path, dataset, seedIdentity, "baseline", plan) + if err != nil { + t.Fatal(err) + } + if loaded.PrivateMessageIDs[0] != 10 || loaded.AccountObservedPts[0] != 20 || loaded.Channels[0].MessageIDs[0] != 30 || loaded.Channels[0].LatestPts != 41 || !loaded.Channels[0].EditDone || loaded.Channels[0].EditPending { + t.Fatalf("persisted mutation state = %+v", loaded) + } + info, err := os.Stat(path) + if err != nil { + t.Fatal(err) + } + if info.Mode().Perm() != 0o600 { + t.Fatalf("mutation state mode = %o, want 600", info.Mode().Perm()) + } +} + +func TestOfflineMutationStateRejectsDifferentBaseline(t *testing.T) { + dataset, seedState, _ := snapshotFixture(t) + seedIdentity, err := seedIdentitySHA256(seedState) + if err != nil { + t.Fatal(err) + } + plan := planOfflineMutation(dataset) + state, err := loadOrCreateOfflineMutationState(filepath.Join(t.TempDir(), "missing.json"), dataset, seedIdentity, "baseline-a", plan) + if err != nil { + t.Fatal(err) + } + if err := state.Validate(dataset, seedIdentity, "baseline-b", plan); err == nil { + t.Fatal("mutation state accepted different baseline snapshot") + } +} diff --git a/internal/loadharness/provision.go b/internal/loadharness/provision.go index c87f1df0..476473e8 100644 --- a/internal/loadharness/provision.go +++ b/internal/loadharness/provision.go @@ -29,6 +29,10 @@ type ProvisionConfig struct { FirstNamePrefix string } +// DefaultPhonePrefix plus the six-digit account index produces the repository's +// structurally possible reserved NANP range (for example +1 555 000 0001). +const DefaultPhonePrefix = "+15550" + type ProvisionEvent struct { Completed int Total int diff --git a/internal/loadharness/provision_test.go b/internal/loadharness/provision_test.go index 42faa466..11bdb5db 100644 --- a/internal/loadharness/provision_test.go +++ b/internal/loadharness/provision_test.go @@ -3,6 +3,8 @@ package loadharness import ( "path/filepath" "testing" + + "telesrv/internal/domain" ) func TestSessionDirectoryForManifestIsolatesNamedBundles(t *testing.T) { @@ -23,6 +25,14 @@ func TestSessionDirectoryForManifestIsolatesNamedBundles(t *testing.T) { } } +func TestDefaultProvisionPhonePrefixProducesCanonicalPossibleNumber(t *testing.T) { + cfg := ProvisionConfig{PhonePrefix: DefaultPhonePrefix, FirstNamePrefix: "Load"} + record := desiredSessionRecord(0, 0, 0, cfg) + if got, want := domain.NormalizePhone(record.Phone), "15550000001"; got != want { + t.Fatalf("normalized default phone = %q, want %q (wire %q)", got, want, record.Phone) + } +} + func TestDesiredSessionRecordUsesManifestNamespace(t *testing.T) { cfg := ProvisionConfig{ManifestPath: filepath.Join("data", "manifest-500.json"), PhonePrefix: "+155500", FirstNamePrefix: "Load"} record := desiredSessionRecord(12, 12, 1, cfg) diff --git a/internal/loadharness/report.go b/internal/loadharness/report.go index 0c639c9f..8357b94c 100644 --- a/internal/loadharness/report.go +++ b/internal/loadharness/report.go @@ -111,8 +111,9 @@ func durationMS(d time.Duration) float64 { } type metricSet struct { - mu sync.RWMutex - ops map[string]*operationMetrics + mu sync.RWMutex + ops map[string]*operationMetrics + frozen bool } func newMetricSet(names ...string) *metricSet { @@ -124,29 +125,56 @@ func newMetricSet(names ...string) *metricSet { } func (m *metricSet) observe(name string, start time.Time, err error) { - debugOperationError(name, err) m.mu.RLock() + if m.frozen { + m.mu.RUnlock() + return + } op := m.ops[name] + if op != nil { + debugOperationError(name, err) + op.observe(start, err) + m.mu.RUnlock() + return + } m.mu.RUnlock() - if op == nil { + { // Operation names are code-owned and finite, but retain a lock-protected // fallback for optional scenarios added by the harness. m.mu.Lock() + defer m.mu.Unlock() + if m.frozen { + return + } op = m.ops[name] if op == nil && len(m.ops) < 32 { op = &operationMetrics{} m.ops[name] = op } - m.mu.Unlock() - } - if op != nil { - op.observe(start, err) + if op != nil { + debugOperationError(name, err) + op.observe(start, err) + } } } func (m *metricSet) report() map[string]OperationReport { m.mu.RLock() defer m.mu.RUnlock() + return m.reportLocked() +} + +// freeze returns the immutable pre-teardown operation cut. Holding the write +// lock waits for any observer already publishing its complete metric tuple and +// prevents later coordinated-cancel outcomes from entering the business report. +func (m *metricSet) freeze() map[string]OperationReport { + m.mu.Lock() + defer m.mu.Unlock() + m.frozen = true + return m.reportLocked() +} + +func (m *metricSet) reportLocked() map[string]OperationReport { out := make(map[string]OperationReport, len(m.ops)) for name, op := range m.ops { out[name] = op.report() @@ -155,31 +183,46 @@ func (m *metricSet) report() map[string]OperationReport { } type RunReport struct { - Version int `json:"version"` - StartedAt time.Time `json:"started_at"` - LoadEndedAt time.Time `json:"load_ended_at"` - FinishedAt time.Time `json:"finished_at"` - RequestedDuration string `json:"requested_duration"` - RecoveryDuration string `json:"recovery_duration"` - ExpectedSessions int `json:"expected_sessions"` - PeakReadySessions int `json:"peak_ready_sessions"` - FinalReadySessions int `json:"final_ready_sessions"` - SteadySamples int `json:"steady_samples"` - SteadyReadyRatio float64 `json:"steady_ready_ratio"` - MinSteadyReadySessions int `json:"min_steady_ready_sessions"` - ConnectionAttempts uint64 `json:"connection_attempts"` - Reconnects uint64 `json:"reconnects"` - Disconnects uint64 `json:"disconnects"` - UpdatesReceived uint64 `json:"updates_received"` - DownloadedBytes uint64 `json:"downloaded_bytes"` - WorkerFatalErrors uint64 `json:"worker_fatal_errors"` - Operations map[string]OperationReport `json:"operations"` - BaselineServerMetrics map[string]float64 `json:"baseline_server_metrics,omitempty"` - FinalServerMetrics map[string]float64 `json:"final_server_metrics,omitempty"` - ServerMetricsScrapes uint64 `json:"server_metrics_scrapes"` - ServerMetricsErrors uint64 `json:"server_metrics_errors"` - Pass bool `json:"pass"` - Failures []string `json:"failures,omitempty"` + Version int `json:"version"` + StartOrder string `json:"start_order,omitempty"` + StartOrderSeed int64 `json:"start_order_seed,omitempty"` + StartedAt time.Time `json:"started_at"` + LoadEndedAt time.Time `json:"load_ended_at"` + FinishedAt time.Time `json:"finished_at"` + RequestedDuration string `json:"requested_duration"` + RecoveryDuration string `json:"recovery_duration"` + ExpectedSessions int `json:"expected_sessions"` + PeakReadySessions int `json:"peak_ready_sessions"` + FinalReadySessions int `json:"final_ready_sessions"` + SteadySamples int `json:"steady_samples"` + SteadyReadyRatio float64 `json:"steady_ready_ratio"` + MinSteadyReadySessions int `json:"min_steady_ready_sessions"` + ConnectionAttempts uint64 `json:"connection_attempts"` + Reconnects uint64 `json:"reconnects"` + Disconnects uint64 `json:"disconnects"` + UpdatesReceived uint64 `json:"updates_received"` + DownloadedBytes uint64 `json:"downloaded_bytes"` + WorkerFatalErrors uint64 `json:"worker_fatal_errors"` + MessageRatePerSecond float64 `json:"message_rate_per_second"` + MessageScheduled uint64 `json:"message_scheduled"` + MessageEnqueued uint64 `json:"message_enqueued"` + MessageCompleted uint64 `json:"message_completed"` + MessageQueueFull uint64 `json:"message_queue_full"` + MessageNotReady uint64 `json:"message_not_ready"` + Delivery DeliveryReport `json:"delivery"` + Operations map[string]OperationReport `json:"operations"` + ResponseBytes map[string]StartupResponseBytes `json:"response_bytes,omitempty"` + RPCDeliveryOutcomes map[string]map[string]uint64 `json:"rpc_delivery_outcomes,omitempty"` + DatabaseWork map[string]StartupDatabaseWork `json:"database_work,omitempty"` + BaselineServerMetrics map[string]float64 `json:"baseline_server_metrics,omitempty"` + WorkloadEndServerMetrics map[string]float64 `json:"workload_end_server_metrics,omitempty"` + FinalServerMetrics map[string]float64 `json:"final_server_metrics,omitempty"` + ServerMetricsScrapes uint64 `json:"server_metrics_scrapes"` + ServerMetricsErrors uint64 `json:"server_metrics_errors"` + EventsWritten uint64 `json:"events_written"` + EventsDropped uint64 `json:"events_dropped"` + Pass bool `json:"pass"` + Failures []string `json:"failures,omitempty"` } func WriteReport(path string, report *RunReport) error { @@ -191,12 +234,18 @@ func WriteReport(path string, report *RunReport) error { } type eventWriter struct { - mu sync.Mutex - f *os.File - written uint64 - dropped uint64 + mu sync.Mutex + f *os.File + written uint64 + dropped uint64 + connectionDeadWritten uint64 } +const ( + maxEventLines = 100000 + maxConnectionDeadEventLines = 5000 +) + func newEventWriter(path string) (*eventWriter, error) { if path == "" { return &eventWriter{}, nil @@ -220,7 +269,15 @@ func (w *eventWriter) write(value any) { return } w.mu.Lock() - if w.written >= 10000 { + if event, ok := value.(map[string]any); ok && event["type"] == "connection_dead" { + if w.connectionDeadWritten >= maxConnectionDeadEventLines { + w.dropped++ + w.mu.Unlock() + return + } + w.connectionDeadWritten++ + } + if w.written >= maxEventLines { w.dropped++ w.mu.Unlock() return @@ -230,6 +287,16 @@ func (w *eventWriter) write(value any) { w.mu.Unlock() } +func (w *eventWriter) counts() (written, dropped uint64) { + if w == nil { + return 0, 0 + } + w.mu.Lock() + written, dropped = w.written, w.dropped + w.mu.Unlock() + return written, dropped +} + func (w *eventWriter) close() error { if w == nil || w.f == nil { return nil diff --git a/internal/loadharness/report_test.go b/internal/loadharness/report_test.go index d6d98a9b..f0656010 100644 --- a/internal/loadharness/report_test.go +++ b/internal/loadharness/report_test.go @@ -5,6 +5,8 @@ import ( "errors" "fmt" "net" + "path/filepath" + "sync/atomic" "testing" "time" @@ -12,6 +14,43 @@ import ( tdrpc "github.com/iamxvbaba/td/rpc" ) +func TestMarkClientReadyAvoidsDuplicateInitialCatchUp(t *testing.T) { + var everReady atomic.Bool + var firstClient atomic.Bool + if markClientReady(&everReady, &firstClient) { + t.Fatal("first Ready transition requested a catch-up") + } + if !markClientReady(&everReady, &firstClient) { + t.Fatal("transport reconnect did not request a catch-up") + } + + var replacementClient atomic.Bool + if markClientReady(&everReady, &replacementClient) { + t.Fatal("replacement Client duplicated its callback-owned initial catch-up") + } + if !markClientReady(&everReady, &replacementClient) { + t.Fatal("replacement Client transport reconnect did not request a catch-up") + } +} + +func TestEventWriterCapsConnectionDetailsWithoutDroppingSamples(t *testing.T) { + w, err := newEventWriter(filepath.Join(t.TempDir(), "events.ndjson")) + if err != nil { + t.Fatal(err) + } + for i := 0; i < maxConnectionDeadEventLines+1; i++ { + w.write(map[string]any{"type": "connection_dead", "class": "connection"}) + } + w.write(map[string]any{"type": "sample", "ready": 0}) + written, dropped := w.counts() + if written != maxConnectionDeadEventLines+1 || dropped != 1 { + t.Fatalf("event counts = %d/%d", written, dropped) + } + if err := w.close(); err != nil { + t.Fatal(err) + } +} + func TestOperationMetricsUsesBoundedHistogramAndFixedErrorClasses(t *testing.T) { metrics := &operationMetrics{} metrics.observe(time.Now().Add(-20*time.Millisecond), nil) @@ -33,6 +72,7 @@ func TestClassifyErrorReasonUsesFiniteRedactedVocabulary(t *testing.T) { {errors.New("dial tcp 10.0.0.1:2398: socket: too many open files"), "file_descriptor_limit"}, {errors.New("read: temporary auth key not found: pfs reconnect required"), "pfs_reconnect"}, {errors.New("read tcp: EOF auth_key_id=secret"), "eof"}, + {errors.New("startup session ended before business readiness"), "business_readiness_incomplete"}, } for _, test := range tests { if got := classifyErrorReason(test.err); got != test.want { @@ -64,6 +104,34 @@ func TestOperationMetricsSeparatesHarnessCancellation(t *testing.T) { } } +func TestMetricSetFreezeExcludesCoordinatedTeardown(t *testing.T) { + metrics := newMetricSet("ping") + metrics.observe("ping", time.Now(), nil) + cut := metrics.freeze() + metrics.observe("ping", time.Now(), fmt.Errorf("engine forcibly closed: %w", context.Canceled)) + + if got := cut["ping"]; got.Count != 1 || got.Errors != 0 || got.Canceled != 0 { + t.Fatalf("workload cut = %#v", got) + } + if got := metrics.report()["ping"]; got != cut["ping"] { + t.Fatalf("post-freeze metrics changed: got %#v want %#v", got, cut["ping"]) + } +} + +func TestEvaluateReportRejectsFixedRateDeliveryLoss(t *testing.T) { + report := &RunReport{ + ExpectedSessions: 1, PeakReadySessions: 1, + SteadySamples: 1, SteadyReadyRatio: 1, MinSteadyReadySessions: 1, + MessageScheduled: 2, MessageEnqueued: 2, MessageCompleted: 2, + Delivery: DeliveryReport{Expected: 2, Delivered: 1, Missing: 1}, + Operations: map[string]OperationReport{}, + } + evaluateReport(report, RunConfig{MinimumReadyRatio: 1, MessageRate: 1}) + if report.Pass { + t.Fatal("fixed-rate report with a missing recipient delivery passed") + } +} + func TestEvaluateReportAllowsOnlyConnectionErrorsForExpectedRestart(t *testing.T) { report := &RunReport{ ExpectedSessions: 2, PeakReadySessions: 2, Reconnects: 2, @@ -84,6 +152,24 @@ func TestEvaluateReportAllowsOnlyConnectionErrorsForExpectedRestart(t *testing.T } } +func TestEvaluateReportRejectsServerDeliveryAndDatabaseErrors(t *testing.T) { + report := &RunReport{ + ExpectedSessions: 1, PeakReadySessions: 1, + SteadySamples: 1, SteadyReadyRatio: 1, MinSteadyReadySessions: 1, + Operations: map[string]OperationReport{}, + RPCDeliveryOutcomes: map[string]map[string]uint64{ + "updates.getState": {"ok": 1, "edge_overload": 2}, + }, + DatabaseWork: map[string]StartupDatabaseWork{ + "messages.getDialogs": {Errors: 3}, + }, + } + evaluateReport(report, RunConfig{MinimumReadyRatio: 1}) + if report.Pass || len(report.Failures) != 2 { + t.Fatalf("report = %#v", report) + } +} + func TestEvaluateReportRequiresReclamationAndNoFloodWait(t *testing.T) { report := &RunReport{ ExpectedSessions: 10, PeakReadySessions: 10, ServerMetricsScrapes: 1, @@ -97,6 +183,7 @@ func TestEvaluateReportRequiresReclamationAndNoFloodWait(t *testing.T) { "telesrv_mtproto_raw_connections": 2, "telesrv_mtproto_logical_outbox_bytes": 4, }, + WorkloadEndServerMetrics: map[string]float64{}, } evaluateReport(report, RunConfig{MinimumReadyRatio: 1, RecoveryDuration: time.Minute, ServerMetricsURL: "http://metrics"}) if report.Pass || len(report.Failures) != 1 { @@ -119,6 +206,7 @@ func TestEvaluateReportAcceptsReturnToNonZeroSharedServerBaseline(t *testing.T) "telesrv_mtproto_logical_sessions": 2, "telesrv_mtproto_logical_outbox_bytes": 1024, }, + WorkloadEndServerMetrics: map[string]float64{}, } evaluateReport(report, RunConfig{MinimumReadyRatio: 1, RecoveryDuration: time.Minute, ServerMetricsURL: "http://metrics"}) if !report.Pass || len(report.Failures) != 0 { diff --git a/internal/loadharness/rich_state.go b/internal/loadharness/rich_state.go new file mode 100644 index 00000000..5a5c0106 --- /dev/null +++ b/internal/loadharness/rich_state.go @@ -0,0 +1,232 @@ +package loadharness + +import ( + "context" + "crypto/rsa" + "errors" + "fmt" + "time" + + "github.com/iamxvbaba/td/tg" +) + +type richAccountStatePlan struct { + PinnedPeerAccount int + ReadPeerAccount int + ReadGroupPosition int + DraftMarker string +} + +func planRichAccountState(dataset *Dataset, account int) (richAccountStatePlan, error) { + if dataset == nil || account < 0 || account >= dataset.Config.Accounts { + return richAccountStatePlan{}, errors.New("invalid rich-state account") + } + if dataset.Config.PrivateFanout < 1 { + return richAccountStatePlan{}, errors.New("rich startup dataset requires at least one private peer per account") + } + groupPosition := -1 + for position, group := range dataset.Groups { + if group.HistoryMessages > 0 && datasetGroupHasAccount(group, account) { + groupPosition = position + break + } + } + if groupPosition < 0 { + return richAccountStatePlan{}, errors.New("rich startup dataset requires a non-empty supergroup per account") + } + return richAccountStatePlan{ + PinnedPeerAccount: (account + 1) % dataset.Config.Accounts, + ReadPeerAccount: (account - 1 + dataset.Config.Accounts) % dataset.Config.Accounts, + ReadGroupPosition: groupPosition, + DraftMarker: fmt.Sprintf("[%s draft account %04d]", dataset.RunID, account), + }, nil +} + +// seedRichAccountState creates synchronized dialog state exclusively through +// public MTProto RPCs. Every mutation is absolute and then read back through +// messages.getPeerDialogs before the resumable journal is committed. +func seedRichAccountState( + ctx context.Context, + cfg SeedConfig, + manifest *Manifest, + dataset *Dataset, + journal *seedJournal, + targets []SessionRecord, + key [32]byte, + publicKey *rsa.PublicKey, + account int, +) error { + if journal.richStateComplete(account) { + return nil + } + plan, err := planRichAccountState(dataset, account) + if err != nil { + return err + } + return withAuthorizedSeedSession(ctx, cfg, manifest, targets[account], key, publicKey, func(ctx context.Context, raw *tg.Client) error { + pinnedTarget := targets[plan.PinnedPeerAccount] + readTarget := targets[plan.ReadPeerAccount] + pinnedPeer := &tg.InputPeerUser{UserID: pinnedTarget.UserID, AccessHash: pinnedTarget.AccessHash} + readPeer := &tg.InputPeerUser{UserID: readTarget.UserID, AccessHash: readTarget.AccessHash} + groupIdentity := journal.group(plan.ReadGroupPosition) + if groupIdentity.ChannelID <= 0 || groupIdentity.AccessHash == 0 { + return errors.New("rich-state group identity is incomplete") + } + channelPeer := &tg.InputPeerChannel{ChannelID: groupIdentity.ChannelID, AccessHash: groupIdentity.AccessHash} + + before, err := getRichStateDialogs(ctx, cfg.OperationTimeout, raw, pinnedPeer, readPeer, channelPeer) + if err != nil { + return fmt.Errorf("read rich-state cursors: %w", err) + } + readPrivate, ok := before[clientPeerKey{typ: "user", id: readTarget.UserID}] + if !ok || readPrivate.TopMessage <= 0 { + return errors.New("read private peer omitted its top message") + } + readChannel, ok := before[clientPeerKey{typ: "channel", id: groupIdentity.ChannelID}] + if !ok || readChannel.TopMessage <= 0 { + return errors.New("read channel omitted its top message") + } + + pinned, err := rpcWithFloodWaitRetry(ctx, cfg.OperationTimeout, func(rpcCtx context.Context) (bool, error) { + return raw.MessagesToggleDialogPin(rpcCtx, &tg.MessagesToggleDialogPinRequest{ + Pinned: true, Peer: &tg.InputDialogPeer{Peer: pinnedPeer}, + }) + }) + if err != nil || !pinned { + return rpcBooleanError("messages.toggleDialogPin", pinned, err) + } + saved, err := rpcWithFloodWaitRetry(ctx, cfg.OperationTimeout, func(rpcCtx context.Context) (bool, error) { + return raw.MessagesSaveDraft(rpcCtx, &tg.MessagesSaveDraftRequest{Peer: pinnedPeer, Message: plan.DraftMarker}) + }) + if err != nil || !saved { + return rpcBooleanError("messages.saveDraft", saved, err) + } + if _, err := rpcWithFloodWaitRetry(ctx, cfg.OperationTimeout, func(rpcCtx context.Context) (*tg.MessagesAffectedMessages, error) { + return raw.MessagesReadHistory(rpcCtx, &tg.MessagesReadHistoryRequest{Peer: readPeer, MaxID: readPrivate.TopMessage}) + }); err != nil { + return fmt.Errorf("messages.readHistory: %w", err) + } + channelRead, err := rpcWithFloodWaitRetry(ctx, cfg.OperationTimeout, func(rpcCtx context.Context) (bool, error) { + return raw.ChannelsReadHistory(rpcCtx, &tg.ChannelsReadHistoryRequest{ + Channel: &tg.InputChannel{ChannelID: groupIdentity.ChannelID, AccessHash: groupIdentity.AccessHash}, + MaxID: readChannel.TopMessage, + }) + }) + if err != nil || !channelRead { + return rpcBooleanError("channels.readHistory", channelRead, err) + } + + after, err := getRichStateDialogs(ctx, cfg.OperationTimeout, raw, pinnedPeer, readPeer, channelPeer) + if err != nil { + return fmt.Errorf("verify rich-state dialogs: %w", err) + } + pinnedDialog, ok := after[clientPeerKey{typ: "user", id: pinnedTarget.UserID}] + if !ok || !pinnedDialog.Pinned || !pinnedDialog.HasDraft || pinnedDialog.DraftText != plan.DraftMarker { + return errors.New("pinned private dialog or exact draft was not persisted") + } + readPrivate = after[clientPeerKey{typ: "user", id: readTarget.UserID}] + if readPrivate.ReadInboxMaxID < before[clientPeerKey{typ: "user", id: readTarget.UserID}].TopMessage || readPrivate.UnreadCount != 0 { + return errors.New("private read boundary did not converge") + } + readChannel = after[clientPeerKey{typ: "channel", id: groupIdentity.ChannelID}] + if readChannel.ReadInboxMaxID < before[clientPeerKey{typ: "channel", id: groupIdentity.ChannelID}].TopMessage || readChannel.UnreadCount != 0 { + return errors.New("channel read boundary did not converge") + } + return journal.setRichStateComplete(account) + }) +} + +func rpcBooleanError(operation string, result bool, err error) error { + if err != nil { + return fmt.Errorf("%s result=%v: %w", operation, result, err) + } + return fmt.Errorf("%s returned false", operation) +} + +func getRichStateDialogs( + ctx context.Context, + timeout time.Duration, + raw *tg.Client, + peers ...tg.InputPeerClass, +) (map[clientPeerKey]ClientDialogState, error) { + requests := make([]tg.InputDialogPeerClass, 0, len(peers)) + seen := make(map[clientPeerKey]struct{}, len(peers)) + for _, peer := range peers { + key, ok := clientPeerFromInput(peer) + if !ok { + return nil, errors.New("invalid rich-state input peer") + } + if _, exists := seen[key]; exists { + continue + } + seen[key] = struct{}{} + requests = append(requests, &tg.InputDialogPeer{Peer: peer}) + } + response, err := rpcWithFloodWaitRetry(ctx, timeout, func(rpcCtx context.Context) (*tg.MessagesPeerDialogs, error) { + return raw.MessagesGetPeerDialogs(rpcCtx, requests) + }) + if err != nil { + return nil, err + } + dialogs := make(map[clientPeerKey]ClientDialogState, len(response.Dialogs)) + if _, err := mergeDialogPage(dialogs, response.Dialogs, response.Messages, response.Chats, response.Users, false); err != nil { + return nil, err + } + if len(dialogs) != len(requests) { + return nil, fmt.Errorf("messages.getPeerDialogs returned %d/%d dialogs", len(dialogs), len(requests)) + } + return dialogs, nil +} + +func clientPeerFromInput(peer tg.InputPeerClass) (clientPeerKey, bool) { + switch value := peer.(type) { + case *tg.InputPeerUser: + return clientPeerKey{typ: "user", id: value.UserID}, value.UserID > 0 && value.AccessHash != 0 + case *tg.InputPeerChannel: + return clientPeerKey{typ: "channel", id: value.ChannelID}, value.ChannelID > 0 && value.AccessHash != 0 + default: + return clientPeerKey{}, false + } +} + +func validateSeededRichDialogs( + dataset *Dataset, + seedState *DatasetSeedState, + targets []SessionRecord, + account int, + dialogs []ClientDialogState, + requireReadBoundaries bool, +) error { + if len(seedState.RichStateByAccount) == 0 { + return nil + } + if len(seedState.RichStateByAccount) != dataset.Config.Accounts || !seedState.RichStateByAccount[account] { + return errors.New("rich-state seed is incomplete") + } + plan, err := planRichAccountState(dataset, account) + if err != nil { + return err + } + byPeer := make(map[clientPeerKey]ClientDialogState, len(dialogs)) + for _, dialog := range dialogs { + byPeer[clientPeerKey{typ: dialog.PeerType, id: dialog.PeerID}] = dialog + } + pinned := byPeer[clientPeerKey{typ: "user", id: targets[plan.PinnedPeerAccount].UserID}] + if !pinned.Pinned || !pinned.HasDraft || pinned.DraftText != plan.DraftMarker { + return fmt.Errorf("seeded pinned dialog state mismatch: present=%v pinned=%v has_draft=%v draft_matches=%v got_draft=%q want_draft=%q", + pinned.PeerID != 0, pinned.Pinned, pinned.HasDraft, pinned.DraftText == plan.DraftMarker, pinned.DraftText, plan.DraftMarker) + } + if !requireReadBoundaries { + return nil + } + readPrivate := byPeer[clientPeerKey{typ: "user", id: targets[plan.ReadPeerAccount].UserID}] + if readPrivate.TopMessage <= 0 || readPrivate.ReadInboxMaxID < readPrivate.TopMessage || readPrivate.UnreadCount != 0 { + return errors.New("seeded private read boundary is stale") + } + group := seedState.Groups[plan.ReadGroupPosition] + readChannel := byPeer[clientPeerKey{typ: "channel", id: group.ChannelID}] + if readChannel.TopMessage <= 0 || readChannel.ReadInboxMaxID < readChannel.TopMessage || readChannel.UnreadCount != 0 { + return errors.New("seeded channel read boundary is stale") + } + return nil +} diff --git a/internal/loadharness/rpc_retry.go b/internal/loadharness/rpc_retry.go new file mode 100644 index 00000000..8bcacd22 --- /dev/null +++ b/internal/loadharness/rpc_retry.go @@ -0,0 +1,89 @@ +package loadharness + +import ( + "context" + "fmt" + "time" + + "github.com/iamxvbaba/td/tgerr" +) + +const ( + maxDatasetFloodWaitRetries = 16 + maxDatasetFloodWait = 2 * time.Minute + datasetFloodWaitPadding = time.Second +) + +type floodWaitPolicy struct { + maxRetries int + maxWait time.Duration + padding time.Duration + wait func(context.Context, time.Duration) error +} + +func defaultFloodWaitPolicy() floodWaitPolicy { + return floodWaitPolicy{ + maxRetries: maxDatasetFloodWaitRetries, + maxWait: maxDatasetFloodWait, + padding: datasetFloodWaitPadding, + wait: waitForContext, + } +} + +// rpcWithFloodWaitRetry is reserved for dataset preparation. Startup-run must +// observe FLOOD_WAIT as a measured failure instead of hiding it behind a retry. +func rpcWithFloodWaitRetry[T any]( + ctx context.Context, + timeout time.Duration, + call func(context.Context) (T, error), +) (T, error) { + return rpcWithFloodWaitPolicy(ctx, timeout, defaultFloodWaitPolicy(), call) +} + +func rpcWithFloodWaitPolicy[T any]( + ctx context.Context, + timeout time.Duration, + policy floodWaitPolicy, + call func(context.Context) (T, error), +) (T, error) { + var zero T + if timeout <= 0 { + return zero, fmt.Errorf("RPC timeout must be positive") + } + if policy.maxRetries < 0 || policy.maxWait < 0 || policy.padding < 0 || policy.wait == nil { + return zero, fmt.Errorf("invalid FLOOD_WAIT retry policy") + } + for retry := 0; ; retry++ { + rpcCtx, cancel := context.WithTimeout(ctx, timeout) + result, err := call(rpcCtx) + cancel() + if err == nil { + return result, nil + } + wait, ok := tgerr.AsFloodWait(err) + if !ok { + return zero, err + } + if retry >= policy.maxRetries { + return zero, fmt.Errorf("FLOOD_WAIT retry limit %d exhausted: %w", policy.maxRetries, err) + } + wait += policy.padding + if wait > policy.maxWait { + return zero, fmt.Errorf("FLOOD_WAIT %s exceeds dataset preparation limit %s: %w", wait, policy.maxWait, err) + } + if err := policy.wait(ctx, wait); err != nil { + return zero, err + } + } +} + +func waitForContext(ctx context.Context, delay time.Duration) error { + timer := time.NewTimer(delay) + defer timer.Stop() + select { + case <-timer.C: + return nil + case <-ctx.Done(): + return ctx.Err() + } +} diff --git a/internal/loadharness/rpc_retry_test.go b/internal/loadharness/rpc_retry_test.go new file mode 100644 index 00000000..a1997a8e --- /dev/null +++ b/internal/loadharness/rpc_retry_test.go @@ -0,0 +1,63 @@ +package loadharness + +import ( + "context" + "errors" + "testing" + "time" + + "github.com/iamxvbaba/td/tgerr" +) + +func TestRPCWithFloodWaitPolicyRetriesTheSameCall(t *testing.T) { + attempts := 0 + waits := make([]time.Duration, 0, 1) + policy := floodWaitPolicy{ + maxRetries: 2, + maxWait: 5 * time.Second, + padding: 100 * time.Millisecond, + wait: func(_ context.Context, delay time.Duration) error { + waits = append(waits, delay) + return nil + }, + } + result, err := rpcWithFloodWaitPolicy(context.Background(), time.Second, policy, func(context.Context) (int, error) { + attempts++ + if attempts == 1 { + return 0, tgerr.New(420, "FLOOD_WAIT_2") + } + return 42, nil + }) + if err != nil { + t.Fatal(err) + } + if result != 42 || attempts != 2 { + t.Fatalf("result=%d attempts=%d", result, attempts) + } + if len(waits) != 1 || waits[0] != 2100*time.Millisecond { + t.Fatalf("waits=%v", waits) + } +} + +func TestRPCWithFloodWaitPolicyDoesNotRetryOrdinaryError(t *testing.T) { + want := errors.New("boom") + attempts := 0 + policy := floodWaitPolicy{maxRetries: 2, maxWait: time.Second, wait: waitForContext} + _, err := rpcWithFloodWaitPolicy(context.Background(), time.Second, policy, func(context.Context) (int, error) { + attempts++ + return 0, want + }) + if !errors.Is(err, want) || attempts != 1 { + t.Fatalf("err=%v attempts=%d", err, attempts) + } +} + +func TestRPCWithFloodWaitPolicyRejectsExcessiveWait(t *testing.T) { + policy := floodWaitPolicy{maxRetries: 2, maxWait: time.Second, wait: waitForContext} + _, err := rpcWithFloodWaitPolicy(context.Background(), time.Second, policy, func(context.Context) (int, error) { + return 0, tgerr.New(420, "FLOOD_WAIT_2") + }) + if err == nil { + t.Fatal("excessive FLOOD_WAIT unexpectedly retried") + } +} diff --git a/internal/loadharness/run.go b/internal/loadharness/run.go index 08a5b7e0..849d45a9 100644 --- a/internal/loadharness/run.go +++ b/internal/loadharness/run.go @@ -14,6 +14,7 @@ import ( "net" "os" "runtime" + "sort" "strings" "sync" "sync/atomic" @@ -43,12 +44,17 @@ type RunConfig struct { EventsPath string FileFixturePath string ServerMetricsURL string + StartOrder string + StartOrderSeed int64 SessionLimit int Duration time.Duration RecoveryDuration time.Duration RampDuration time.Duration RPCInterval time.Duration MessageInterval time.Duration + MessageRate float64 + MessageQueueDepth int + DeliverySettle time.Duration FileInterval time.Duration FileSizeBytes int FileChunkBytes int @@ -62,6 +68,8 @@ type RunConfig struct { ExpectServerRestart bool } +const RunReportVersion = 7 + func (c RunConfig) validate() error { if c.ManifestPath == "" || c.SessionKeyPath == "" || c.ReportPath == "" { return errors.New("manifest, session-key and report paths are required") @@ -69,6 +77,15 @@ func (c RunConfig) validate() error { if c.Duration <= 0 || c.RecoveryDuration < 0 || c.RampDuration < 0 || c.RPCInterval <= 0 || c.OperationTimeout <= 0 || c.SampleInterval <= 0 { return errors.New("run durations and intervals are invalid") } + if c.MessageRate < 0 || c.MessageRate > 100000 || c.MessageQueueDepth < 0 || c.MessageQueueDepth > 1024 || c.DeliverySettle < 0 { + return errors.New("message rate, queue depth or delivery settle is invalid") + } + if c.MessageRate > 0 && c.MessageInterval > 0 { + return errors.New("message-rate and message-interval workloads are mutually exclusive") + } + if c.MessageRate > 0 && (c.MessageQueueDepth == 0 || c.RampDuration >= c.Duration) { + return errors.New("fixed-rate workload requires a queue depth and load duration beyond the connection ramp") + } if c.FileSizeBytes < 0 || c.FileChunkBytes < 0 || c.FileChunkBytes > 1<<20 || c.FileSizeBytes > 64<<20 { return errors.New("file size must be <=64MiB and chunk size must be <=1MiB") } @@ -84,6 +101,9 @@ func (c RunConfig) validate() error { if c.OfflineFraction > 0 && (c.OfflineAt <= 0 || c.OfflineFor <= 0 || c.OfflineAt+c.OfflineFor >= c.Duration) { return errors.New("offline window must be positive and fit inside load duration") } + if c.StartOrder != "" && c.StartOrder != StartupOrderShuffled && c.StartOrder != StartupOrderAccountIndex { + return fmt.Errorf("unknown run start order %q", c.StartOrder) + } return nil } @@ -113,6 +133,11 @@ type harnessCounters struct { updates atomic.Uint64 fatalErrors atomic.Uint64 downloadBytes atomic.Uint64 + messageScheduled atomic.Uint64 + messageEnqueued atomic.Uint64 + messageCompleted atomic.Uint64 + messageQueueFull atomic.Uint64 + messageNotReady atomic.Uint64 } var debugConnectionErrors atomic.Uint64 @@ -159,21 +184,26 @@ type loadWorker struct { fileInterval time.Duration operationTimeout time.Duration fileFixture *downloadFixture + delivery *deliveryTracker - desired atomic.Bool - state atomic.Int32 - everReady atomic.Bool - signal chan struct{} - lastUpdate updateState - messageSeq atomic.Uint64 + desired atomic.Bool + state atomic.Int32 + everReady atomic.Bool + signal chan struct{} + lastUpdate updateState + deliveryState updateState + messageSeq atomic.Uint64 + sendQueue chan struct{} + reconcile chan chan struct{} } -func newLoadWorker(record, target SessionRecord, endpoint Endpoint, publicKey *rsa.PublicKey, storage *EncryptedFileStorage, metrics *metricSet, counters *harnessCounters, events *eventWriter, rpcInterval, messageInterval, fileInterval, operationTimeout time.Duration, fixture *downloadFixture) *loadWorker { +func newLoadWorker(record, target SessionRecord, endpoint Endpoint, publicKey *rsa.PublicKey, storage *EncryptedFileStorage, metrics *metricSet, counters *harnessCounters, events *eventWriter, rpcInterval, messageInterval, fileInterval, operationTimeout time.Duration, fixture *downloadFixture, delivery *deliveryTracker, messageQueueDepth int) *loadWorker { w := &loadWorker{ record: record, target: target, endpoint: endpoint, publicKey: publicKey, storage: storage, metrics: metrics, counters: counters, events: events, rpcInterval: rpcInterval, msgInterval: messageInterval, fileInterval: fileInterval, operationTimeout: operationTimeout, fileFixture: fixture, - signal: make(chan struct{}, 1), + delivery: delivery, signal: make(chan struct{}, 1), sendQueue: make(chan struct{}, messageQueueDepth), + reconcile: make(chan chan struct{}), } w.state.Store(workerStopped) return w @@ -259,9 +289,11 @@ func (w *loadWorker) supervise(ctx context.Context, wg *sync.WaitGroup) { func (w *loadWorker) runClient(ctx context.Context) error { reconnectSignal := make(chan struct{}, 1) + var readySeen atomic.Bool client, err := newClient(w.endpoint, w.publicKey, w.storage, clientHooks{ - Update: telegram.UpdateHandlerFunc(func(context.Context, tg.UpdatesClass) error { + Update: telegram.UpdateHandlerFunc(func(_ context.Context, updates tg.UpdatesClass) error { w.counters.updates.Add(1) + observeUpdatesClass(w.delivery, w.record.UserID, updates, deliveryLive) return nil }), ConnectionState: func(state telegram.ConnectionState) { @@ -273,9 +305,9 @@ func (w *loadWorker) runClient(ctx context.Context) error { w.counters.reconnects.Add(1) } case telegram.ConnectionStateReady: - wasReady := w.everReady.Swap(true) + needsCatchUp := markClientReady(&w.everReady, &readySeen) w.state.Store(workerReady) - if wasReady { + if needsCatchUp { select { case reconnectSignal <- struct{}{}: default: @@ -316,6 +348,9 @@ func (w *loadWorker) runClient(ctx context.Context) error { } else { w.refreshUpdateState(ctx, raw) } + if _, valid := w.deliveryState.load(); !valid { + w.refreshDeliveryState(ctx, raw) + } rpcTicker := time.NewTicker(w.rpcInterval) defer rpcTicker.Stop() @@ -345,6 +380,11 @@ func (w *loadWorker) runClient(ctx context.Context) error { cycle++ case <-messageC: w.sendMessage(ctx, raw) + case <-w.sendQueue: + w.sendMessage(ctx, raw) + case done := <-w.reconcile: + w.catchUpDelivery(ctx, raw) + close(done) case <-fileC: w.downloadFileChunk(ctx, raw) } @@ -352,6 +392,19 @@ func (w *loadWorker) runClient(ctx context.Context) error { }) } +// markClientReady distinguishes a transport reconnect inside one live gotd +// Client from the first Ready transition of a newly constructed Client. The +// client.Run callback already performs one cursor catch-up when it starts, so +// enqueueing a second catch-up for that first transition would duplicate every +// explicit offline->online getDifference request. Later Ready transitions do +// need the signal because the callback remains running across transport-level +// reconnects. +func markClientReady(everReady, readySeen *atomic.Bool) bool { + firstForClient := !readySeen.Swap(true) + wasReady := everReady.Swap(true) + return wasReady && !firstForClient +} + func (w *loadWorker) runRPC(ctx context.Context, client *telegram.Client, raw *tg.Client, cycle int) { start := time.Now() operationCtx, cancel := w.operationContext(ctx) @@ -385,6 +438,20 @@ func (w *loadWorker) refreshUpdateState(ctx context.Context, raw *tg.Client) { w.metrics.observe("updates.getState", start, err) if err == nil { w.lastUpdate.store(*state) + if _, valid := w.deliveryState.load(); !valid { + w.deliveryState.store(*state) + } + } +} + +func (w *loadWorker) refreshDeliveryState(ctx context.Context, raw *tg.Client) { + start := time.Now() + operationCtx, cancel := w.operationContext(ctx) + state, err := raw.UpdatesGetState(operationCtx) + cancel() + w.metrics.observe("updates.getState.delivery", start, err) + if err == nil { + w.deliveryState.store(*state) } } @@ -427,7 +494,49 @@ func (w *loadWorker) catchUp(ctx context.Context, raw *tg.Client) { } } +func (w *loadWorker) catchUpDelivery(ctx context.Context, raw *tg.Client) { + state, valid := w.deliveryState.load() + if !valid { + w.refreshDeliveryState(ctx, raw) + return + } + for page := 0; page < 256; page++ { + start := time.Now() + operationCtx, cancel := w.operationContext(ctx) + difference, err := raw.UpdatesGetDifference(operationCtx, &tg.UpdatesGetDifferenceRequest{Pts: state.Pts, Date: state.Date, Qts: state.Qts}) + cancel() + w.metrics.observe("updates.getDifference.delivery", start, err) + if err != nil { + return + } + switch value := difference.(type) { + case *tg.UpdatesDifferenceEmpty: + state.Date, state.Seq = value.Date, value.Seq + w.deliveryState.store(state) + return + case *tg.UpdatesDifference: + observeMessageClasses(w.delivery, w.record.UserID, value.NewMessages, deliveryDifference) + observeUpdateClasses(w.delivery, w.record.UserID, value.OtherUpdates, deliveryDifference) + state = value.State + w.deliveryState.store(state) + return + case *tg.UpdatesDifferenceSlice: + observeMessageClasses(w.delivery, w.record.UserID, value.NewMessages, deliveryDifference) + observeUpdateClasses(w.delivery, w.record.UserID, value.OtherUpdates, deliveryDifference) + state = value.IntermediateState + w.deliveryState.store(state) + case *tg.UpdatesDifferenceTooLong: + state.Pts = value.Pts + w.deliveryState.store(state) + return + default: + return + } + } +} + func (w *loadWorker) sendMessage(ctx context.Context, raw *tg.Client) { + defer w.counters.messageCompleted.Add(1) sequence := w.messageSeq.Add(1) var randomBytes [8]byte if _, err := cryptorand.Read(randomBytes[:]); err != nil { @@ -438,13 +547,16 @@ func (w *loadWorker) sendMessage(ctx context.Context, raw *tg.Client) { randomID = int64(sequence) } start := time.Now() + marker := w.delivery.marker(w.record.Index, sequence) + w.delivery.begin(marker, w.record.UserID, w.target.UserID, start) operationCtx, cancel := w.operationContext(ctx) _, err := raw.MessagesSendMessage(operationCtx, &tg.MessagesSendMessageRequest{ Peer: &tg.InputPeerUser{UserID: w.target.UserID, AccessHash: w.target.AccessHash}, - Message: fmt.Sprintf("load/%d/%d", w.record.Index, sequence), RandomID: randomID, + Message: marker, RandomID: randomID, }) cancel() w.metrics.observe("messages.sendMessage", start, err) + w.delivery.finish(marker, err == nil) } func (w *loadWorker) downloadFileChunk(ctx context.Context, raw *tg.Client) { @@ -654,8 +766,13 @@ func Run(ctx context.Context, cfg RunConfig) (*RunReport, error) { return nil, err } defer events.close() - metrics := newMetricSet("auth.status", "connection.dead", "ping", "updates.getState", "updates.getDifference", "messages.getDialogs", "help.getConfig", "messages.sendMessage", "upload.saveFilePart", "messages.uploadMedia", "upload.getFile") + metrics := newMetricSet("auth.status", "connection.dead", "ping", "updates.getState", "updates.getDifference", "updates.getState.delivery", "updates.getDifference.delivery", "messages.getDialogs", "help.getConfig", "messages.sendMessage", "upload.saveFilePart", "messages.uploadMedia", "upload.getFile") counters := &harnessCounters{} + runID, err := newLoadRunID() + if err != nil { + return nil, fmt.Errorf("create load run id: %w", err) + } + delivery := newDeliveryTracker(runID) serverMetrics := newServerMetricsClient(cfg.ServerMetricsURL) var baselineServerMetrics map[string]float64 if serverMetrics != nil { @@ -681,8 +798,10 @@ func Run(ctx context.Context, cfg RunConfig) (*RunReport, error) { record, target, manifest.Endpoint, publicKey, &EncryptedFileStorage{Path: resolveSessionPath(cfg.ManifestPath, record), Key: key}, metrics, counters, events, cfg.RPCInterval, cfg.MessageInterval, cfg.FileInterval, cfg.OperationTimeout, fixture, + delivery, cfg.MessageQueueDepth, )) } + messageWorkers := primaryWorkers(workers) startedAt := time.Now().UTC() loadCtx, stopLoad := context.WithCancel(ctx) @@ -691,10 +810,20 @@ func Run(ctx context.Context, cfg RunConfig) (*RunReport, error) { workerWG.Add(1) go worker.supervise(loadCtx, &workerWG) } - for i, worker := range workers { + startOrder := cfg.StartOrder + if startOrder == "" { + startOrder = StartupOrderAccountIndex + } + startOrderSeed := cfg.StartOrderSeed + if startOrderSeed == 0 { + startOrderSeed = 20260827 + } + launchOrder := startupAccountOrder(len(workers), startOrder, startOrderSeed) + for position, workerIndex := range launchOrder { + worker := workers[workerIndex] delay := time.Duration(0) if len(workers) > 1 { - delay = time.Duration(i) * cfg.RampDuration / time.Duration(len(workers)-1) + delay = time.Duration(position) * cfg.RampDuration / time.Duration(len(workers)-1) } go func(w *loadWorker, d time.Duration) { timer := time.NewTimer(d) @@ -710,6 +839,13 @@ func Run(ctx context.Context, cfg RunConfig) (*RunReport, error) { if cfg.OfflineFraction > 0 { go runOfflineWindow(loadCtx, workers, cfg.OfflineFraction, cfg.OfflineAt, cfg.OfflineFor, events) } + messageCtx, stopMessages := context.WithCancel(loadCtx) + defer stopMessages() + var messageWG sync.WaitGroup + if cfg.MessageRate > 0 { + messageWG.Add(1) + go runFixedMessageSchedule(messageCtx, &messageWG, cfg.RampDuration, cfg.MessageRate, messageWorkers, counters, events) + } loadTimer := time.NewTimer(cfg.Duration) sampleTicker := time.NewTicker(cfg.SampleInterval) peakReady := 0 @@ -741,11 +877,64 @@ func Run(ctx context.Context, cfg RunConfig) (*RunReport, error) { loadFinished: sampleTicker.Stop() + stopMessages() + messageWG.Wait() + loadEndedAt := time.Now().UTC() + if cfg.MessageRate > 0 { + drainCtx, cancelDrain := context.WithTimeout(ctx, cfg.OperationTimeout+time.Duration(cfg.MessageQueueDepth)*cfg.OperationTimeout) + waitMessageDrain(drainCtx, counters) + cancelDrain() + } + if cfg.DeliverySettle > 0 && delivery.report().Expected > delivery.report().Delivered { + settleTimer := time.NewTimer(cfg.DeliverySettle) + settleTicker := time.NewTicker(min(cfg.SampleInterval, time.Second)) + settling: + for { + select { + case <-ctx.Done(): + settleTimer.Stop() + settleTicker.Stop() + stopLoad() + workerWG.Wait() + return nil, ctx.Err() + case <-settleTicker.C: + if current := delivery.report(); current.Missing == 0 { + settleTimer.Stop() + settleTicker.Stop() + break settling + } + case <-settleTimer.C: + settleTicker.Stop() + break settling + } + } + } + if delivery.report().Missing > 0 { + reconcileCtx, cancelReconcile := context.WithTimeout(ctx, cfg.OperationTimeout*2) + reconcileDeliveries(reconcileCtx, workers) + cancelReconcile() + } + // Take the authoritative business-work cutoff before canceling clients. + // Coordinated teardown can cancel an RPC already in flight; both server + // outcome counters and client operation counters must therefore stop before + // that cancellation begins. FinalServerMetrics remains the post-recovery + // resource-reclamation snapshot. + var workloadEndServerMetrics map[string]float64 + if serverMetrics != nil { + if sample, scrapeErr := serverMetrics.scrape(ctx); scrapeErr == nil { + workloadEndServerMetrics = sample + finalServerMetrics = sample + events.write(map[string]any{"type": "server_workload_end", "at": time.Now().UTC(), "server_metrics": sample}) + } else { + events.write(map[string]any{"type": "server_workload_end_error", "at": time.Now().UTC(), "class": classifyError(scrapeErr)}) + } + } + workloadEndOperations := metrics.freeze() + finalReady := countWorkerState(workers, workerReady) stopLoad() workerWG.Wait() - loadEndedAt := time.Now().UTC() - if ready := countWorkerState(workers, workerReady); ready > peakReady { - peakReady = ready + if finalReady > peakReady { + peakReady = finalReady } if cfg.RecoveryDuration > 0 { @@ -779,16 +968,24 @@ recoveryFinished: steadyRatio = float64(steadyReadySum) / float64(steadySamples*len(workers)) } report := &RunReport{ - Version: 2, StartedAt: startedAt, LoadEndedAt: loadEndedAt, FinishedAt: time.Now().UTC(), + Version: RunReportVersion, StartedAt: startedAt, LoadEndedAt: loadEndedAt, FinishedAt: time.Now().UTC(), + StartOrder: startOrder, StartOrderSeed: startOrderSeed, RequestedDuration: cfg.Duration.String(), RecoveryDuration: cfg.RecoveryDuration.String(), - ExpectedSessions: len(workers), PeakReadySessions: peakReady, FinalReadySessions: countWorkerState(workers, workerReady), + ExpectedSessions: len(workers), PeakReadySessions: peakReady, FinalReadySessions: finalReady, ConnectionAttempts: counters.connectionAttempts.Load(), Reconnects: counters.reconnects.Load(), Disconnects: counters.disconnects.Load(), UpdatesReceived: counters.updates.Load(), DownloadedBytes: counters.downloadBytes.Load(), - WorkerFatalErrors: counters.fatalErrors.Load(), Operations: metrics.report(), - BaselineServerMetrics: baselineServerMetrics, FinalServerMetrics: finalServerMetrics, + WorkerFatalErrors: counters.fatalErrors.Load(), Operations: workloadEndOperations, + BaselineServerMetrics: baselineServerMetrics, WorkloadEndServerMetrics: workloadEndServerMetrics, FinalServerMetrics: finalServerMetrics, ServerMetricsScrapes: serverMetrics.successes(), ServerMetricsErrors: serverMetrics.failures(), SteadySamples: steadySamples, SteadyReadyRatio: steadyRatio, MinSteadyReadySessions: steadyReadyMinimum, + MessageRatePerSecond: cfg.MessageRate, MessageScheduled: counters.messageScheduled.Load(), + MessageEnqueued: counters.messageEnqueued.Load(), MessageCompleted: counters.messageCompleted.Load(), MessageQueueFull: counters.messageQueueFull.Load(), + MessageNotReady: counters.messageNotReady.Load(), Delivery: delivery.report(), } + report.ResponseBytes = startupResponseBytes(baselineServerMetrics, workloadEndServerMetrics) + report.RPCDeliveryOutcomes = startupRPCDeliveryOutcomes(baselineServerMetrics, workloadEndServerMetrics) + report.DatabaseWork = startupDatabaseWork(baselineServerMetrics, workloadEndServerMetrics) + report.EventsWritten, report.EventsDropped = events.counts() evaluateReport(report, cfg) if err := WriteReport(cfg.ReportPath, report); err != nil { return nil, err @@ -814,6 +1011,119 @@ func primaryTargets(records []SessionRecord) []SessionRecord { return targets } +func newLoadRunID() (string, error) { + var value [8]byte + if _, err := cryptorand.Read(value[:]); err != nil { + return "", err + } + return hex.EncodeToString(value[:]), nil +} + +func primaryWorkers(workers []*loadWorker) []*loadWorker { + primary := make([]*loadWorker, 0, len(workers)) + for _, worker := range workers { + if worker.record.DeviceIndex == 0 && worker.target.UserID > 0 { + primary = append(primary, worker) + } + } + return primary +} + +func runFixedMessageSchedule(ctx context.Context, wg *sync.WaitGroup, startDelay time.Duration, rate float64, workers []*loadWorker, counters *harnessCounters, events *eventWriter) { + defer wg.Done() + if rate <= 0 || len(workers) == 0 { + return + } + startTimer := time.NewTimer(startDelay) + defer startTimer.Stop() + select { + case <-ctx.Done(): + return + case <-startTimer.C: + } + readyTicker := time.NewTicker(10 * time.Millisecond) + for countWorkerState(workers, workerReady) != len(workers) { + select { + case <-ctx.Done(): + readyTicker.Stop() + return + case <-readyTicker.C: + } + } + readyTicker.Stop() + interval := time.Duration(float64(time.Second) / rate) + if interval < time.Microsecond { + interval = time.Microsecond + } + events.write(map[string]any{"type": "fixed_message_rate_start", "at": time.Now().UTC(), "rate_per_second": rate, "senders": len(workers)}) + next := time.Now() + workerIndex := 0 + timer := time.NewTimer(0) + defer timer.Stop() + for { + select { + case <-ctx.Done(): + events.write(map[string]any{ + "type": "fixed_message_rate_stop", "at": time.Now().UTC(), + "scheduled": counters.messageScheduled.Load(), "enqueued": counters.messageEnqueued.Load(), + "queue_full": counters.messageQueueFull.Load(), "not_ready": counters.messageNotReady.Load(), + }) + return + case <-timer.C: + worker := workers[workerIndex] + workerIndex = (workerIndex + 1) % len(workers) + counters.messageScheduled.Add(1) + if worker.state.Load() != workerReady { + counters.messageNotReady.Add(1) + } else { + select { + case worker.sendQueue <- struct{}{}: + counters.messageEnqueued.Add(1) + default: + counters.messageQueueFull.Add(1) + } + } + next = next.Add(interval) + timer.Reset(max(time.Until(next), time.Duration(0))) + } + } +} + +func reconcileDeliveries(ctx context.Context, workers []*loadWorker) { + waits := make([]chan struct{}, 0, len(workers)) + for _, worker := range workers { + if worker.state.Load() != workerReady { + continue + } + done := make(chan struct{}) + select { + case <-ctx.Done(): + return + case worker.reconcile <- done: + waits = append(waits, done) + } + } + for _, done := range waits { + select { + case <-ctx.Done(): + return + case <-done: + } + } +} + +func waitMessageDrain(ctx context.Context, counters *harnessCounters) { + ticker := time.NewTicker(10 * time.Millisecond) + defer ticker.Stop() + for counters.messageCompleted.Load() < counters.messageEnqueued.Load() { + select { + case <-ctx.Done(): + return + case <-ticker.C: + } + } +} + func minimumOpenFiles(sessions int) int { if sessions < 0 { sessions = 0 @@ -901,6 +1211,46 @@ func evaluateReport(report *RunReport, cfg RunConfig) { if report.WorkerFatalErrors > 0 { report.Failures = append(report.Failures, fmt.Sprintf("worker fatal errors: %d", report.WorkerFatalErrors)) } + if cfg.MessageRate > 0 { + if report.MessageScheduled == 0 { + report.Failures = append(report.Failures, "fixed-rate message scheduler produced no arrivals") + } + if report.MessageNotReady > 0 { + report.Failures = append(report.Failures, fmt.Sprintf("fixed-rate arrivals rejected because sender was not ready: %d", report.MessageNotReady)) + } + if report.MessageQueueFull > 0 { + report.Failures = append(report.Failures, fmt.Sprintf("fixed-rate arrivals rejected by bounded sender queues: %d", report.MessageQueueFull)) + } + if report.MessageEnqueued != report.MessageScheduled { + report.Failures = append(report.Failures, fmt.Sprintf("fixed-rate scheduler enqueued %d of %d arrivals", report.MessageEnqueued, report.MessageScheduled)) + } + if report.MessageCompleted != report.MessageEnqueued { + report.Failures = append(report.Failures, fmt.Sprintf("message workers completed %d of %d enqueued sends", report.MessageCompleted, report.MessageEnqueued)) + } + sendOperation := report.Operations["messages.sendMessage"] + if sendOperation.Count != report.MessageCompleted { + report.Failures = append(report.Failures, fmt.Sprintf("messages.sendMessage recorded %d of %d completed jobs", sendOperation.Count, report.MessageCompleted)) + } + successfulSends := sendOperation.Count - min(sendOperation.Count, sendOperation.Errors+sendOperation.Canceled) + if report.Delivery.Expected != successfulSends { + report.Failures = append(report.Failures, fmt.Sprintf("delivery tracker committed %d of %d successful send RPCs", report.Delivery.Expected, successfulSends)) + } + if report.Delivery.Missing > 0 || report.Delivery.Delivered != report.Delivery.Expected { + report.Failures = append(report.Failures, fmt.Sprintf("recipient delivery incomplete: delivered %d of %d, missing %d", report.Delivery.Delivered, report.Delivery.Expected, report.Delivery.Missing)) + } + if cfg.OfflineFraction == 0 && report.Delivery.DifferenceRecovered > 0 { + report.Failures = append(report.Failures, fmt.Sprintf("online recipients recovered %d messages only through updates.getDifference", report.Delivery.DifferenceRecovered)) + } + if report.Delivery.DuplicateObservations > 0 { + report.Failures = append(report.Failures, fmt.Sprintf("recipient observed %d duplicate message updates", report.Delivery.DuplicateObservations)) + } + if report.Delivery.WrongAccountObserved > 0 { + report.Failures = append(report.Failures, fmt.Sprintf("load markers appeared on %d wrong recipient accounts", report.Delivery.WrongAccountObserved)) + } + if report.Delivery.UnmatchedMarkers > 0 { + report.Failures = append(report.Failures, fmt.Sprintf("observed %d load markers without a successful send RPC", report.Delivery.UnmatchedMarkers)) + } + } for name, operation := range report.Operations { if operation.FloodWaits > 0 { report.Failures = append(report.Failures, fmt.Sprintf("%s returned FLOOD_WAIT %d times", name, operation.FloodWaits)) @@ -913,6 +1263,34 @@ func evaluateReport(report *RunReport, cfg RunConfig) { report.Failures = append(report.Failures, fmt.Sprintf("%s returned %d unexpected non-cancel errors", name, unexpectedErrors)) } } + methods := make([]string, 0, len(report.RPCDeliveryOutcomes)) + for method := range report.RPCDeliveryOutcomes { + methods = append(methods, method) + } + sort.Strings(methods) + for _, method := range methods { + outcomes := report.RPCDeliveryOutcomes[method] + outcomeNames := make([]string, 0, len(outcomes)) + for outcome := range outcomes { + outcomeNames = append(outcomeNames, outcome) + } + sort.Strings(outcomeNames) + for _, outcome := range outcomeNames { + if count := outcomes[outcome]; outcome != "ok" && count > 0 { + report.Failures = append(report.Failures, fmt.Sprintf("%s rpc_result delivery outcome %s: %d", method, outcome, count)) + } + } + } + methods = methods[:0] + for method := range report.DatabaseWork { + methods = append(methods, method) + } + sort.Strings(methods) + for _, method := range methods { + if errors := report.DatabaseWork[method].Errors; errors > 0 { + report.Failures = append(report.Failures, fmt.Sprintf("%s database errors: %d", method, errors)) + } + } if cfg.ExpectServerRestart && report.Reconnects < uint64(requiredReady) { report.Failures = append(report.Failures, fmt.Sprintf("server restart expected at least %d reconnect attempts, observed %d", requiredReady, report.Reconnects)) } @@ -938,6 +1316,9 @@ func evaluateReport(report *RunReport, cfg RunConfig) { if strings.TrimSpace(cfg.ServerMetricsURL) != "" && report.FinalServerMetrics == nil { report.Failures = append(report.Failures, "final post-recovery server metrics scrape failed") } + if strings.TrimSpace(cfg.ServerMetricsURL) != "" && report.WorkloadEndServerMetrics == nil { + report.Failures = append(report.Failures, "pre-teardown workload-end server metrics scrape failed") + } if strings.TrimSpace(cfg.ServerMetricsURL) != "" && report.BaselineServerMetrics == nil { report.Failures = append(report.Failures, "pre-load server metrics baseline scrape failed") } @@ -945,9 +1326,16 @@ func evaluateReport(report *RunReport, cfg RunConfig) { } func metricValue(values map[string]float64, name string) float64 { + // The scraper always stores an aggregate family value in the bare key and + // may additionally retain bounded state/method label breakdowns. Prefer that + // aggregate; summing both would double-count every labeled family in resource + // recovery checks (for example retained/offline logical sessions). + if value, ok := values[name]; ok { + return value + } var total float64 for key, value := range values { - if key == name || strings.HasPrefix(key, name+"{") { + if strings.HasPrefix(key, name+"{") { total += value } } @@ -1032,6 +1420,8 @@ func classifyErrorReason(err error) string { return "dns" case strings.Contains(message, "BROKEN PIPE"): return "broken_pipe" + case strings.Contains(message, "ENDED BEFORE BUSINESS READINESS"): + return "business_readiness_incomplete" case strings.Contains(message, "EOF"): return "eof" case errors.Is(err, context.DeadlineExceeded): diff --git a/internal/loadharness/seed.go b/internal/loadharness/seed.go new file mode 100644 index 00000000..e88a8523 --- /dev/null +++ b/internal/loadharness/seed.go @@ -0,0 +1,714 @@ +package loadharness + +import ( + "context" + "crypto/rsa" + "errors" + "fmt" + "sort" + "sync" + "time" + + "github.com/iamxvbaba/td/tg" + "github.com/iamxvbaba/td/tgerr" +) + +const maxSeedInviteBatch = 200 + +type SeedConfig struct { + ManifestPath string + SessionKeyPath string + RSAKeyOverride string + DatasetPath string + SeedStatePath string + Concurrency int + OperationTimeout time.Duration +} + +type SeedEvent struct { + Phase string + Completed int + Total int + Account int + Err error +} + +type SeedResult struct { + PrivateMessages int + Groups int + InvitedMembers int + GroupMessages int + RichStateAccounts int +} + +func (c SeedConfig) validate() error { + if c.ManifestPath == "" || c.SessionKeyPath == "" || c.DatasetPath == "" || c.SeedStatePath == "" { + return errors.New("manifest, session-key, dataset and seed-state paths are required") + } + if c.Concurrency <= 0 || c.Concurrency > 64 { + return errors.New("seed concurrency must be between 1 and 64") + } + if c.OperationTimeout <= 0 { + return errors.New("seed operation timeout must be positive") + } + return nil +} + +// Seed materializes a Dataset only through authenticated MTProto RPCs. It never +// calls a server-internal handler or store. The journal is persisted before any +// non-idempotent channel operation, so an interrupted run can reconcile using +// the same account's public RPC view before it proceeds. +func Seed(ctx context.Context, cfg SeedConfig, progress func(SeedEvent)) (*SeedResult, error) { + if err := cfg.validate(); err != nil { + return nil, err + } + manifest, err := LoadManifest(cfg.ManifestPath) + if err != nil { + return nil, err + } + dataset, err := LoadDataset(cfg.DatasetPath) + if err != nil { + return nil, err + } + targets, err := seedPrimaryTargets(manifest, dataset.Config.Accounts) + if err != nil { + return nil, err + } + key, err := LoadSessionKey(cfg.SessionKeyPath) + if err != nil { + return nil, err + } + publicKey, err := loadManifestPublicKey(cfg.ManifestPath, manifest.Endpoint, cfg.RSAKeyOverride) + if err != nil { + return nil, err + } + state, err := LoadDatasetSeedState(cfg.SeedStatePath, dataset) + if err != nil { + return nil, err + } + journal := &seedJournal{path: cfg.SeedStatePath, dataset: dataset, state: state} + if err := journal.enableRichState(); err != nil { + return nil, err + } + if err := journal.persist(); err != nil { + return nil, err + } + + accounts := make([]int, dataset.Config.Accounts) + for account := range accounts { + accounts[account] = account + } + if err := runSeedAccountPhase(ctx, "private", accounts, cfg.Concurrency, progress, func(ctx context.Context, account int) error { + return seedPrivateMessages(ctx, cfg, manifest, dataset, journal, targets, key, publicKey, account) + }); err != nil { + return nil, err + } + + groupsByCreator := make(map[int][]int) + for position, group := range dataset.Groups { + groupsByCreator[group.CreatorAccount] = append(groupsByCreator[group.CreatorAccount], position) + } + creators := make([]int, 0, len(groupsByCreator)) + for account := range groupsByCreator { + creators = append(creators, account) + } + sort.Ints(creators) + if err := runSeedAccountPhase(ctx, "groups", creators, cfg.Concurrency, progress, func(ctx context.Context, account int) error { + return withAuthorizedSeedSession(ctx, cfg, manifest, targets[account], key, publicKey, func(ctx context.Context, raw *tg.Client) error { + for _, position := range groupsByCreator[account] { + if err := seedGroup(ctx, cfg, dataset, journal, targets, raw, position); err != nil { + return fmt.Errorf("group %d: %w", dataset.Groups[position].Index, err) + } + } + return nil + }) + }); err != nil { + return nil, err + } + + historyTasks := datasetHistoryTasks(dataset) + if err := runSeedAccountPhase(ctx, "group-history", accounts, cfg.Concurrency, progress, func(ctx context.Context, account int) error { + return seedGroupHistory(ctx, cfg, manifest, dataset, journal, targets, key, publicKey, account, historyTasks[account]) + }); err != nil { + return nil, err + } + if err := runSeedAccountPhase(ctx, "rich-state", accounts, cfg.Concurrency, progress, func(ctx context.Context, account int) error { + return seedRichAccountState(ctx, cfg, manifest, dataset, journal, targets, key, publicKey, account) + }); err != nil { + return nil, err + } + if err := journal.assertComplete(); err != nil { + return nil, err + } + + result := &SeedResult{PrivateMessages: len(dataset.PrivateEdges), Groups: len(dataset.Groups), RichStateAccounts: dataset.Config.Accounts} + for _, group := range dataset.Groups { + result.InvitedMembers += len(group.MemberAccounts) - 1 + result.GroupMessages += group.HistoryMessages + } + return result, nil +} + +func seedPrimaryTargets(manifest *Manifest, accounts int) ([]SessionRecord, error) { + targets := primaryTargets(manifest.Sessions) + if len(targets) < accounts { + return nil, fmt.Errorf("dataset requires %d primary accounts, manifest has account range 0..%d", accounts, len(targets)-1) + } + targets = targets[:accounts] + for account, target := range targets { + if target.AccountIndex != account || target.UserID <= 0 || target.AccessHash == 0 || target.SessionFile == "" { + return nil, fmt.Errorf("manifest has no complete primary session for account %d", account) + } + } + return targets, nil +} + +func seedPrivateMessages( + ctx context.Context, + cfg SeedConfig, + manifest *Manifest, + dataset *Dataset, + journal *seedJournal, + targets []SessionRecord, + key [32]byte, + publicKey *rsa.PublicKey, + account int, +) error { + cursor := journal.privateCursor(account) + if cursor == dataset.Config.PrivateFanout { + return nil + } + start := account * dataset.Config.PrivateFanout + edges := dataset.PrivateEdges[start : start+dataset.Config.PrivateFanout] + return withAuthorizedSeedSession(ctx, cfg, manifest, targets[account], key, publicKey, func(ctx context.Context, raw *tg.Client) error { + for i := cursor; i < len(edges); i++ { + edge := edges[i] + target := targets[edge.RecipientAccount] + _, err := rpcWithFloodWaitRetry(ctx, cfg.OperationTimeout, func(rpcCtx context.Context) (tg.UpdatesClass, error) { + return raw.MessagesSendMessage(rpcCtx, &tg.MessagesSendMessageRequest{ + Peer: &tg.InputPeerUser{UserID: target.UserID, AccessHash: target.AccessHash}, + Message: edge.Marker, RandomID: edge.RandomID, + }) + }) + if err != nil { + return fmt.Errorf("messages.sendMessage edge %d: %w", i, err) + } + } + return journal.setPrivateCursor(account, len(edges)) + }) +} + +func seedGroup( + ctx context.Context, + cfg SeedConfig, + dataset *Dataset, + journal *seedJournal, + targets []SessionRecord, + raw *tg.Client, + position int, +) error { + group := dataset.Groups[position] + groupState := journal.group(position) + if groupState.ChannelID == 0 && groupState.CreatePending { + channel, found, err := reconcilePendingChannelCreate(ctx, cfg.OperationTimeout, raw, group) + if err != nil { + return err + } + if found { + if err := journal.commitChannel(position, channel.ID, channel.AccessHash); err != nil { + return err + } + } else if err := journal.clearCreatePending(position); err != nil { + return err + } + groupState = journal.group(position) + } + if groupState.ChannelID == 0 { + if err := journal.beginCreate(position); err != nil { + return err + } + updates, err := rpcWithFloodWaitRetry(ctx, cfg.OperationTimeout, func(rpcCtx context.Context) (tg.UpdatesClass, error) { + return raw.ChannelsCreateChannel(rpcCtx, &tg.ChannelsCreateChannelRequest{ + Megagroup: true, Title: group.Title, About: group.About, + }) + }) + if err != nil { + return fmt.Errorf("channels.createChannel pending reconciliation: %w", err) + } + channel, err := createdChannelFromUpdates(updates, group.Title) + if err != nil { + return err + } + if err := journal.commitChannel(position, channel.ID, channel.AccessHash); err != nil { + return err + } + groupState = journal.group(position) + } + + invitees := groupInvitees(group) + for groupState.InviteCursor < len(invitees) { + if groupState.InvitePendingEnd > groupState.InviteCursor { + if err := reconcilePendingInvites(ctx, cfg.OperationTimeout, raw, groupState, invitees, targets); err != nil { + return err + } + if err := journal.commitInvite(position, groupState.InvitePendingEnd); err != nil { + return err + } + groupState = journal.group(position) + continue + } + end := min(groupState.InviteCursor+maxSeedInviteBatch, len(invitees)) + if err := journal.beginInvite(position, end); err != nil { + return err + } + if err := inviteAccounts(ctx, cfg.OperationTimeout, raw, groupState, invitees[groupState.InviteCursor:end], targets); err != nil { + return fmt.Errorf("channels.inviteToChannel pending reconciliation: %w", err) + } + if err := journal.commitInvite(position, end); err != nil { + return err + } + groupState = journal.group(position) + } + return nil +} + +func reconcilePendingChannelCreate(ctx context.Context, timeout time.Duration, raw *tg.Client, group DatasetGroup) (*tg.Channel, bool, error) { + rpcCtx, cancel := context.WithTimeout(ctx, timeout) + dialogs, err := raw.MessagesGetDialogs(rpcCtx, &tg.MessagesGetDialogsRequest{ + OffsetPeer: &tg.InputPeerEmpty{}, Limit: 500, + }) + cancel() + if err != nil { + return nil, false, fmt.Errorf("reconcile create with messages.getDialogs: %w", err) + } + var chats []tg.ChatClass + switch value := dialogs.(type) { + case *tg.MessagesDialogs: + chats = value.Chats + case *tg.MessagesDialogsSlice: + chats = value.Chats + case *tg.MessagesDialogsNotModified: + return nil, false, errors.New("reconcile create unexpectedly returned dialogsNotModified") + default: + return nil, false, fmt.Errorf("reconcile create messages.getDialogs returned %T", dialogs) + } + matches := make([]*tg.Channel, 0, 1) + for _, chat := range chats { + channel, ok := chat.(*tg.Channel) + if !ok || channel.Title != group.Title || !channel.Megagroup { + continue + } + if channel.ID <= 0 || channel.AccessHash == 0 { + return nil, false, fmt.Errorf("reconciled channel %q has incomplete identity", group.Title) + } + matches = append(matches, channel) + } + if len(matches) > 1 { + return nil, false, fmt.Errorf("ambiguous create produced %d channels named %q", len(matches), group.Title) + } + if len(matches) == 0 { + return nil, false, nil + } + return matches[0], true, nil +} + +func createdChannelFromUpdates(updates tg.UpdatesClass, title string) (*tg.Channel, error) { + var chats []tg.ChatClass + switch value := updates.(type) { + case *tg.Updates: + chats = value.Chats + case *tg.UpdatesCombined: + chats = value.Chats + default: + return nil, fmt.Errorf("channels.createChannel returned %T", updates) + } + for _, chat := range chats { + channel, ok := chat.(*tg.Channel) + if ok && channel.Title == title && channel.Megagroup && channel.ID > 0 && channel.AccessHash != 0 { + return channel, nil + } + } + return nil, fmt.Errorf("channels.createChannel response omitted supergroup %q", title) +} + +func groupInvitees(group DatasetGroup) []int { + invitees := make([]int, 0, len(group.MemberAccounts)-1) + for _, account := range group.MemberAccounts { + if account != group.CreatorAccount { + invitees = append(invitees, account) + } + } + return invitees +} + +func inviteAccounts( + ctx context.Context, + timeout time.Duration, + raw *tg.Client, + groupState DatasetSeedGroupState, + accounts []int, + targets []SessionRecord, +) error { + if len(accounts) == 0 || len(accounts) > maxSeedInviteBatch { + return fmt.Errorf("invalid invite batch size %d", len(accounts)) + } + users := make([]tg.InputUserClass, 0, len(accounts)) + for _, account := range accounts { + target := targets[account] + users = append(users, &tg.InputUser{UserID: target.UserID, AccessHash: target.AccessHash}) + } + result, err := rpcWithFloodWaitRetry(ctx, timeout, func(rpcCtx context.Context) (*tg.MessagesInvitedUsers, error) { + return raw.ChannelsInviteToChannel(rpcCtx, &tg.ChannelsInviteToChannelRequest{ + Channel: &tg.InputChannel{ChannelID: groupState.ChannelID, AccessHash: groupState.AccessHash}, + Users: users, + }) + }) + if err != nil { + return err + } + if len(result.MissingInvitees) != 0 { + return fmt.Errorf("server reported %d missing_invitees", len(result.MissingInvitees)) + } + return nil +} + +func reconcilePendingInvites( + ctx context.Context, + timeout time.Duration, + raw *tg.Client, + groupState DatasetSeedGroupState, + invitees []int, + targets []SessionRecord, +) error { + pending := invitees[groupState.InviteCursor:groupState.InvitePendingEnd] + missing := make([]int, 0, len(pending)) + for _, account := range pending { + target := targets[account] + rpcCtx, cancel := context.WithTimeout(ctx, timeout) + _, err := raw.ChannelsGetParticipant(rpcCtx, &tg.ChannelsGetParticipantRequest{ + Channel: &tg.InputChannel{ChannelID: groupState.ChannelID, AccessHash: groupState.AccessHash}, + Participant: &tg.InputPeerUser{UserID: target.UserID, AccessHash: target.AccessHash}, + }) + cancel() + switch { + case err == nil: + case tgerr.Is(err, "USER_NOT_PARTICIPANT"): + missing = append(missing, account) + default: + return fmt.Errorf("channels.getParticipant account %d: %w", account, err) + } + } + if len(missing) == 0 { + return nil + } + return inviteAccounts(ctx, timeout, raw, groupState, missing, targets) +} + +type datasetHistoryTask struct { + GroupPosition int + MessageIndex int +} + +func datasetHistoryTasks(dataset *Dataset) [][]datasetHistoryTask { + tasks := make([][]datasetHistoryTask, dataset.Config.Accounts) + for position, group := range dataset.Groups { + for message := 0; message < group.HistoryMessages; message++ { + account := group.MemberAccounts[message%len(group.MemberAccounts)] + tasks[account] = append(tasks[account], datasetHistoryTask{GroupPosition: position, MessageIndex: message}) + } + } + return tasks +} + +func seedGroupHistory( + ctx context.Context, + cfg SeedConfig, + manifest *Manifest, + dataset *Dataset, + journal *seedJournal, + targets []SessionRecord, + key [32]byte, + publicKey *rsa.PublicKey, + account int, + tasks []datasetHistoryTask, +) error { + cursor := journal.historyCursor(account) + if cursor == len(tasks) { + return nil + } + return withAuthorizedSeedSession(ctx, cfg, manifest, targets[account], key, publicKey, func(ctx context.Context, raw *tg.Client) error { + for i := cursor; i < len(tasks); i++ { + task := tasks[i] + group := dataset.Groups[task.GroupPosition] + groupState := journal.group(task.GroupPosition) + if groupState.ChannelID == 0 || groupState.InviteCursor != len(group.MemberAccounts)-1 { + return fmt.Errorf("group %d is not fully seeded", group.Index) + } + _, err := rpcWithFloodWaitRetry(ctx, cfg.OperationTimeout, func(rpcCtx context.Context) (tg.UpdatesClass, error) { + return raw.MessagesSendMessage(rpcCtx, &tg.MessagesSendMessageRequest{ + Peer: &tg.InputPeerChannel{ChannelID: groupState.ChannelID, AccessHash: groupState.AccessHash}, + Message: fmt.Sprintf("[%s group %04d message %04d sender %04d]", dataset.RunID, group.Index, task.MessageIndex+1, account), + RandomID: stableDatasetID(dataset.Config.Seed, "group-history", dataset.Config.Accounts, group.Index, task.MessageIndex), + }) + }) + if err != nil { + return fmt.Errorf("messages.sendMessage group %d message %d: %w", group.Index, task.MessageIndex, err) + } + } + return journal.setHistoryCursor(account, len(tasks)) + }) +} + +func withAuthorizedSeedSession( + ctx context.Context, + cfg SeedConfig, + manifest *Manifest, + record SessionRecord, + key [32]byte, + publicKey *rsa.PublicKey, + work func(context.Context, *tg.Client) error, +) error { + storage := &EncryptedFileStorage{Path: resolveSessionPath(cfg.ManifestPath, record), Key: key} + client, err := newClient(manifest.Endpoint, publicKey, storage, clientHooks{}) + if err != nil { + return err + } + return client.Run(ctx, func(ctx context.Context) error { + statusCtx, cancel := context.WithTimeout(ctx, cfg.OperationTimeout) + status, err := client.Auth().Status(statusCtx) + cancel() + if err != nil { + return fmt.Errorf("authorization status: %w", err) + } + if !status.Authorized || status.User == nil || status.User.ID != record.UserID { + return fmt.Errorf("session account %d is not authorized as expected user", record.AccountIndex) + } + return work(ctx, tg.NewClient(client)) + }) +} + +type seedAccountResult struct { + account int + err error +} + +func runSeedAccountPhase( + ctx context.Context, + phase string, + accounts []int, + concurrency int, + progress func(SeedEvent), + work func(context.Context, int) error, +) error { + phaseCtx, cancel := context.WithCancel(ctx) + defer cancel() + jobs := make(chan int) + results := make(chan seedAccountResult, len(accounts)) + workers := min(concurrency, len(accounts)) + var wg sync.WaitGroup + for i := 0; i < workers; i++ { + wg.Add(1) + go func() { + defer wg.Done() + for account := range jobs { + err := work(phaseCtx, account) + results <- seedAccountResult{account: account, err: err} + if err != nil { + return + } + } + }() + } + go func() { + defer close(jobs) + for _, account := range accounts { + select { + case jobs <- account: + case <-phaseCtx.Done(): + return + } + } + }() + go func() { + wg.Wait() + close(results) + }() + completed := 0 + var firstErr error + for result := range results { + if result.err == nil { + completed++ + } else if firstErr == nil { + firstErr = fmt.Errorf("%s account %d: %w", phase, result.account, result.err) + cancel() + } + if progress != nil { + progress(SeedEvent{Phase: phase, Completed: completed, Total: len(accounts), Account: result.account, Err: result.err}) + } + } + if firstErr != nil { + return firstErr + } + if completed != len(accounts) { + if ctx.Err() != nil { + return ctx.Err() + } + return fmt.Errorf("%s completed %d/%d accounts", phase, completed, len(accounts)) + } + return nil +} + +type seedJournal struct { + mu sync.Mutex + path string + dataset *Dataset + state *DatasetSeedState +} + +func (j *seedJournal) persist() error { + j.mu.Lock() + defer j.mu.Unlock() + return WriteDatasetSeedState(j.path, j.dataset, j.state) +} + +func (j *seedJournal) privateCursor(account int) int { + j.mu.Lock() + defer j.mu.Unlock() + return j.state.PrivateSentByAccount[account] +} + +func (j *seedJournal) historyCursor(account int) int { + j.mu.Lock() + defer j.mu.Unlock() + return j.state.HistorySentByAccount[account] +} + +func (j *seedJournal) richStateComplete(account int) bool { + j.mu.Lock() + defer j.mu.Unlock() + return len(j.state.RichStateByAccount) == j.dataset.Config.Accounts && j.state.RichStateByAccount[account] +} + +func (j *seedJournal) enableRichState() error { + j.mu.Lock() + defer j.mu.Unlock() + if len(j.state.RichStateByAccount) == j.dataset.Config.Accounts { + return nil + } + if len(j.state.RichStateByAccount) != 0 { + return errors.New("seed rich-state journal has invalid dimensions") + } + j.state.RichStateByAccount = make([]bool, j.dataset.Config.Accounts) + return WriteDatasetSeedState(j.path, j.dataset, j.state) +} + +func (j *seedJournal) group(position int) DatasetSeedGroupState { + j.mu.Lock() + defer j.mu.Unlock() + return j.state.Groups[position] +} + +func (j *seedJournal) setPrivateCursor(account, cursor int) error { + j.mu.Lock() + defer j.mu.Unlock() + old := j.state.PrivateSentByAccount[account] + j.state.PrivateSentByAccount[account] = cursor + if err := WriteDatasetSeedState(j.path, j.dataset, j.state); err != nil { + j.state.PrivateSentByAccount[account] = old + return err + } + return nil +} + +func (j *seedJournal) setHistoryCursor(account, cursor int) error { + j.mu.Lock() + defer j.mu.Unlock() + old := j.state.HistorySentByAccount[account] + j.state.HistorySentByAccount[account] = cursor + if err := WriteDatasetSeedState(j.path, j.dataset, j.state); err != nil { + j.state.HistorySentByAccount[account] = old + return err + } + return nil +} + +func (j *seedJournal) setRichStateComplete(account int) error { + j.mu.Lock() + defer j.mu.Unlock() + if len(j.state.RichStateByAccount) != j.dataset.Config.Accounts { + return errors.New("seed rich-state journal is not enabled") + } + old := j.state.RichStateByAccount[account] + j.state.RichStateByAccount[account] = true + if err := WriteDatasetSeedState(j.path, j.dataset, j.state); err != nil { + j.state.RichStateByAccount[account] = old + return err + } + return nil +} + +func (j *seedJournal) updateGroup(position int, update func(*DatasetSeedGroupState)) error { + j.mu.Lock() + defer j.mu.Unlock() + old := j.state.Groups[position] + update(&j.state.Groups[position]) + if err := WriteDatasetSeedState(j.path, j.dataset, j.state); err != nil { + j.state.Groups[position] = old + return err + } + return nil +} + +func (j *seedJournal) beginCreate(position int) error { + return j.updateGroup(position, func(state *DatasetSeedGroupState) { state.CreatePending = true }) +} + +func (j *seedJournal) clearCreatePending(position int) error { + return j.updateGroup(position, func(state *DatasetSeedGroupState) { state.CreatePending = false }) +} + +func (j *seedJournal) commitChannel(position int, channelID, accessHash int64) error { + if channelID <= 0 || accessHash == 0 { + return errors.New("cannot commit incomplete channel identity") + } + return j.updateGroup(position, func(state *DatasetSeedGroupState) { + state.ChannelID = channelID + state.AccessHash = accessHash + state.CreatePending = false + }) +} + +func (j *seedJournal) beginInvite(position, end int) error { + return j.updateGroup(position, func(state *DatasetSeedGroupState) { state.InvitePendingEnd = end }) +} + +func (j *seedJournal) commitInvite(position, end int) error { + return j.updateGroup(position, func(state *DatasetSeedGroupState) { + state.InviteCursor = end + state.InvitePendingEnd = end + }) +} + +func (j *seedJournal) assertComplete() error { + j.mu.Lock() + defer j.mu.Unlock() + if err := j.state.Validate(j.dataset); err != nil { + return err + } + historyCounts := datasetHistoryTaskCounts(j.dataset) + for account := 0; account < j.dataset.Config.Accounts; account++ { + if j.state.PrivateSentByAccount[account] != j.dataset.Config.PrivateFanout || j.state.HistorySentByAccount[account] != historyCounts[account] { + return fmt.Errorf("account %d seed is incomplete", account) + } + if len(j.state.RichStateByAccount) != 0 && !j.state.RichStateByAccount[account] { + return fmt.Errorf("account %d rich state is incomplete", account) + } + } + for position, group := range j.dataset.Groups { + state := j.state.Groups[position] + if state.ChannelID == 0 || state.CreatePending || state.InviteCursor != len(group.MemberAccounts)-1 || state.InvitePendingEnd != state.InviteCursor { + return fmt.Errorf("group %d seed is incomplete", group.Index) + } + } + return nil +} diff --git a/internal/loadharness/seed_test.go b/internal/loadharness/seed_test.go new file mode 100644 index 00000000..94927c5f --- /dev/null +++ b/internal/loadharness/seed_test.go @@ -0,0 +1,177 @@ +package loadharness + +import ( + "context" + "errors" + "path/filepath" + "reflect" + "testing" + + "github.com/iamxvbaba/td/tg" +) + +func TestSeedPrimaryTargetsSelectsPrimaryAndRejectsGap(t *testing.T) { + manifest := &Manifest{Sessions: []SessionRecord{ + {Index: 2, AccountIndex: 0, DeviceIndex: 1, SessionFile: "extra", UserID: 10, AccessHash: 100}, + {Index: 0, AccountIndex: 0, DeviceIndex: 0, SessionFile: "primary-0", UserID: 10, AccessHash: 100}, + {Index: 1, AccountIndex: 1, DeviceIndex: 0, SessionFile: "primary-1", UserID: 11, AccessHash: 101}, + }} + targets, err := seedPrimaryTargets(manifest, 2) + if err != nil { + t.Fatal(err) + } + if targets[0].SessionFile != "primary-0" || targets[1].SessionFile != "primary-1" { + t.Fatalf("primary targets = %+v", targets) + } + manifest.Sessions = append(manifest.Sessions, SessionRecord{ + Index: 3, AccountIndex: 2, DeviceIndex: 0, SessionFile: "primary-2", UserID: 12, AccessHash: 102, + }) + if targets, err := seedPrimaryTargets(manifest, 2); err != nil || len(targets) != 2 { + t.Fatalf("manifest superset targets=%d err=%v", len(targets), err) + } + manifest.Sessions = manifest.Sessions[:2] + if _, err := seedPrimaryTargets(manifest, 2); err == nil { + t.Fatal("manifest account gap passed validation") + } +} + +func TestPlanRichAccountStateUsesDeterministicPrivateAndGroupPeers(t *testing.T) { + dataset, _, _ := snapshotFixture(t) + plan, err := planRichAccountState(dataset, 0) + if err != nil { + t.Fatal(err) + } + if plan.PinnedPeerAccount != 1 || plan.ReadPeerAccount != 3 || plan.ReadGroupPosition != 0 || plan.DraftMarker == "" { + t.Fatalf("rich plan = %+v", plan) + } +} + +func TestValidateSeededRichDialogs(t *testing.T) { + dataset, seedState, targets := snapshotFixture(t) + seedState.RichStateByAccount = make([]bool, dataset.Config.Accounts) + seedState.RichStateByAccount[0] = true + plan, err := planRichAccountState(dataset, 0) + if err != nil { + t.Fatal(err) + } + dialogs := []ClientDialogState{ + {PeerType: "user", PeerID: targets[plan.PinnedPeerAccount].UserID, Pinned: true, HasDraft: true, DraftText: plan.DraftMarker}, + {PeerType: "user", PeerID: targets[plan.ReadPeerAccount].UserID, TopMessage: 8, ReadInboxMaxID: 8}, + {PeerType: "channel", PeerID: seedState.Groups[plan.ReadGroupPosition].ChannelID, TopMessage: 9, ReadInboxMaxID: 9}, + } + if err := validateSeededRichDialogs(dataset, seedState, targets, 0, dialogs, true); err != nil { + t.Fatal(err) + } + dialogs[0].DraftText = "wrong" + if err := validateSeededRichDialogs(dataset, seedState, targets, 0, dialogs, true); err == nil { + t.Fatal("wrong draft marker passed rich-state validation") + } +} + +func TestCreatedChannelFromUpdates(t *testing.T) { + channel := &tg.Channel{ID: 41, AccessHash: 42, Title: "target", Megagroup: true} + got, err := createdChannelFromUpdates(&tg.Updates{Chats: []tg.ChatClass{ + &tg.Chat{ID: 1, Title: "other"}, channel, + }}, "target") + if err != nil { + t.Fatal(err) + } + if got != channel { + t.Fatalf("created channel = %#v, want target", got) + } + if _, err := createdChannelFromUpdates(&tg.UpdateShort{}, "target"); err == nil { + t.Fatal("unexpected create response passed validation") + } + if _, err := createdChannelFromUpdates(&tg.UpdatesCombined{Chats: []tg.ChatClass{ + &tg.Channel{ID: 41, AccessHash: 42, Title: "target"}, + }}, "target"); err == nil { + t.Fatal("broadcast/non-megagroup response passed validation") + } +} + +func TestDatasetHistoryTasksRotateSenders(t *testing.T) { + cfg := DefaultDatasetConfig(20) + cfg.HotGroups, cfg.MediumGroups, cfg.HeavyGroups = 0, 0, 0 + cfg.SmallGroups, cfg.SmallMembers, cfg.SmallHistory = 1, 4, 9 + dataset, err := PlanDataset(cfg) + if err != nil { + t.Fatal(err) + } + tasks := datasetHistoryTasks(dataset) + wantCounts := datasetHistoryTaskCounts(dataset) + gotCounts := make([]int, len(tasks)) + for account := range tasks { + gotCounts[account] = len(tasks[account]) + for _, task := range tasks[account] { + group := dataset.Groups[task.GroupPosition] + if got := group.MemberAccounts[task.MessageIndex%len(group.MemberAccounts)]; got != account { + t.Fatalf("message %d sender = %d, task account %d", task.MessageIndex, got, account) + } + } + } + if !reflect.DeepEqual(gotCounts, wantCounts) { + t.Fatalf("history task counts = %v, want %v", gotCounts, wantCounts) + } +} + +func TestSeedJournalPersistsPendingBoundaries(t *testing.T) { + dataset, err := PlanDataset(DefaultDatasetConfig(20)) + if err != nil { + t.Fatal(err) + } + state, err := NewDatasetSeedState(dataset) + if err != nil { + t.Fatal(err) + } + path := filepath.Join(t.TempDir(), "seed-state.json") + journal := &seedJournal{path: path, dataset: dataset, state: state} + if err := journal.persist(); err != nil { + t.Fatal(err) + } + if err := journal.beginCreate(0); err != nil { + t.Fatal(err) + } + loaded, err := LoadDatasetSeedState(path, dataset) + if err != nil { + t.Fatal(err) + } + if !loaded.Groups[0].CreatePending || loaded.Groups[0].ChannelID != 0 { + t.Fatalf("pending create state = %+v", loaded.Groups[0]) + } + if err := journal.commitChannel(0, 101, 202); err != nil { + t.Fatal(err) + } + if err := journal.beginInvite(0, 7); err != nil { + t.Fatal(err) + } + loaded, err = LoadDatasetSeedState(path, dataset) + if err != nil { + t.Fatal(err) + } + if loaded.Groups[0].InviteCursor != 0 || loaded.Groups[0].InvitePendingEnd != 7 { + t.Fatalf("pending invite state = %+v", loaded.Groups[0]) + } + if err := journal.commitInvite(0, 7); err != nil { + t.Fatal(err) + } + loaded, err = LoadDatasetSeedState(path, dataset) + if err != nil { + t.Fatal(err) + } + if loaded.Groups[0].InviteCursor != 7 || loaded.Groups[0].InvitePendingEnd != 7 { + t.Fatalf("committed invite state = %+v", loaded.Groups[0]) + } +} + +func TestRunSeedAccountPhaseStopsAfterFailure(t *testing.T) { + want := errors.New("stop") + err := runSeedAccountPhase(context.Background(), "test", []int{0, 1, 2}, 1, nil, func(_ context.Context, account int) error { + if account == 1 { + return want + } + return nil + }) + if !errors.Is(err, want) { + t.Fatalf("phase error = %v, want wrapped stop", err) + } +} diff --git a/internal/loadharness/server_metrics.go b/internal/loadharness/server_metrics.go index 8d0ae83b..f152d394 100644 --- a/internal/loadharness/server_metrics.go +++ b/internal/loadharness/server_metrics.go @@ -16,43 +16,88 @@ import ( const maxServerMetricsBytes = 4 << 20 var selectedServerMetrics = map[string]struct{}{ - "telesrv_mtproto_raw_connections": {}, - "telesrv_mtproto_sessions": {}, - "telesrv_mtproto_logical_sessions": {}, - "telesrv_mtproto_logical_outbox_frames": {}, - "telesrv_mtproto_logical_outbox_bytes": {}, - "telesrv_mtproto_logical_outbox_acked_frames_total": {}, - "telesrv_mtproto_logical_outbox_acked_bytes_total": {}, - "telesrv_mtproto_logical_outbox_retained_seconds_count": {}, - "telesrv_mtproto_logical_outbox_retained_seconds_sum": {}, - "telesrv_mtproto_pending_push_bytes": {}, - "telesrv_mtproto_inbound_rpc_tasks": {}, - "telesrv_mtproto_inbound_rpc_bytes": {}, - "telesrv_mtproto_inbound_frame_bytes": {}, - "telesrv_mtproto_outbound_tracked_bytes": {}, - "telesrv_mtproto_outbound_write_bytes": {}, - "telesrv_mtproto_rpc_execution_owners": {}, - "telesrv_mtproto_rpc_execution_reserved_entries": {}, - "telesrv_mtproto_rpc_execution_receipts": {}, - "telesrv_mtproto_rpc_execution_receipt_budget_bytes": {}, - "telesrv_mtproto_rpc_execution_subscribers": {}, - "telesrv_mtproto_rpc_result_inner_bytes_total": {}, - "telesrv_mtproto_rpc_result_wire_bytes_total": {}, - "telesrv_mtproto_rpc_result_delivered_bytes_total": {}, - "telesrv_go_goroutines": {}, - "telesrv_go_heap_alloc_bytes": {}, - "telesrv_go_heap_inuse_bytes": {}, - "telesrv_go_heap_objects": {}, - "telesrv_go_sys_bytes": {}, - "telesrv_postgres_pool_connections": {}, - "telesrv_postgres_pool_acquire_wait_seconds": {}, - "telesrv_postgres_pool_empty_acquire_count": {}, - "telesrv_postgres_pool_canceled_acquire_count": {}, - "telesrv_redis_pool_connections": {}, - "telesrv_redis_pool_pending_requests": {}, - "telesrv_redis_pool_timeouts": {}, - "telesrv_redis_pool_wait_seconds": {}, - "telesrv_metrics_dropped_observations_total": {}, + "telesrv_mtproto_raw_connections": {}, + "telesrv_mtproto_connections_active": {}, + "telesrv_mtproto_sessions": {}, + "telesrv_mtproto_logical_sessions": {}, + "telesrv_mtproto_logical_outbox_frames": {}, + "telesrv_mtproto_logical_outbox_bytes": {}, + "telesrv_mtproto_logical_outbox_acked_frames_total": {}, + "telesrv_mtproto_logical_outbox_acked_bytes_total": {}, + "telesrv_mtproto_logical_outbox_retained_seconds_count": {}, + "telesrv_mtproto_logical_outbox_retained_seconds_sum": {}, + "telesrv_mtproto_pending_push_bytes": {}, + "telesrv_mtproto_inbound_rpc_tasks": {}, + "telesrv_mtproto_inbound_rpc_bytes": {}, + "telesrv_mtproto_rpc_delivery_hook_workers": {}, + "telesrv_mtproto_rpc_delivery_hook_capacity": {}, + "telesrv_mtproto_rpc_delivery_hook_reserved": {}, + "telesrv_mtproto_rpc_delivery_hook_queued": {}, + "telesrv_mtproto_rpc_delivery_hook_running": {}, + "telesrv_mtproto_rpc_delivery_hook_completed_total": {}, + "telesrv_mtproto_rpc_delivery_hook_rejected_total": {}, + "telesrv_mtproto_rpc_delivery_hook_panics_total": {}, + "telesrv_mtproto_rpc_delivery_hook_duration_seconds_total": {}, + "telesrv_mtproto_inbound_frame_bytes": {}, + "telesrv_mtproto_outbound_tracked_bytes": {}, + "telesrv_mtproto_outbound_write_bytes": {}, + "telesrv_mtproto_rpc_execution_owners": {}, + "telesrv_mtproto_rpc_execution_reserved_entries": {}, + "telesrv_mtproto_rpc_execution_receipts": {}, + "telesrv_mtproto_rpc_execution_receipt_budget_bytes": {}, + "telesrv_mtproto_rpc_execution_subscribers": {}, + "telesrv_mtproto_rpc_result_inner_bytes_total": {}, + "telesrv_mtproto_rpc_result_wire_bytes_total": {}, + "telesrv_mtproto_rpc_result_delivered_total": {}, + "telesrv_mtproto_rpc_result_delivered_bytes_total": {}, + "telesrv_go_goroutines": {}, + "telesrv_process_cpu_seconds": {}, + "telesrv_go_scheduler_busy_seconds": {}, + "telesrv_go_gc_cycles": {}, + "telesrv_go_gc_pause_seconds": {}, + "telesrv_go_heap_alloc_bytes": {}, + "telesrv_go_heap_inuse_bytes": {}, + "telesrv_go_heap_objects": {}, + "telesrv_go_stack_inuse_bytes": {}, + "telesrv_go_sys_bytes": {}, + "telesrv_postgres_pool_connections": {}, + "telesrv_postgres_pool_acquire_count": {}, + "telesrv_postgres_pool_acquire_wait_seconds": {}, + "telesrv_postgres_pool_empty_acquire_count": {}, + "telesrv_postgres_pool_canceled_acquire_count": {}, + "telesrv_postgres_pool_max_connections": {}, + "telesrv_redis_pool_connections": {}, + "telesrv_redis_pool_hits": {}, + "telesrv_redis_pool_misses": {}, + "telesrv_redis_pool_pending_requests": {}, + "telesrv_redis_pool_timeouts": {}, + "telesrv_redis_pool_wait_count": {}, + "telesrv_redis_pool_wait_seconds": {}, + "telesrv_rpc_db_queries_total": {}, + "telesrv_rpc_db_errors_total": {}, + "telesrv_rpc_db_time_seconds_sum": {}, + "telesrv_rpc_db_time_seconds_count": {}, + "telesrv_channel_difference_cache_entries": {}, + "telesrv_channel_difference_cache_weight_bytes": {}, + "telesrv_channel_difference_cache_hits": {}, + "telesrv_channel_difference_cache_misses": {}, + "telesrv_channel_difference_cache_loads": {}, + "telesrv_channel_difference_cache_load_errors": {}, + "telesrv_bootstrap_ready_batches_total": {}, + "telesrv_bootstrap_ready_selectors_total": {}, + "telesrv_bootstrap_ready_pending": {}, + "telesrv_active_channel_ids_cache_total": {}, + "telesrv_active_channel_ids_batches_total": {}, + "telesrv_active_channel_ids_selectors_total": {}, + "telesrv_active_channel_ids_rows_total": {}, + "telesrv_active_channel_ids_pending": {}, + "telesrv_presence_last_seen_batches_total": {}, + "telesrv_presence_last_seen_updates_total": {}, + "telesrv_presence_last_seen_submitted_total": {}, + "telesrv_presence_last_seen_pending": {}, + "telesrv_presence_last_seen_overflow_total": {}, + "telesrv_presence_last_seen_drain_dropped_total": {}, + "telesrv_metrics_dropped_observations_total": {}, } type serverMetricsClient struct { @@ -113,10 +158,31 @@ func (c *serverMetricsClient) scrape(ctx context.Context) (map[string]float64, e } // Reports need bounded, comparable capacity signals, not an unbounded copy // of Prometheus label series. Aggregate every selected family into one - // key so method/encoding cardinality can never starve later gauges (the - // endpoint orders counters before gauges). The source /metrics endpoint - // retains full labels for detailed diagnosis. + // key. Response-byte and DB-work families additionally retain only their + // code-owned method label; bounded pool/session families retain their state + // label. This supports attribution without copying auth/session/user + // cardinality. values[name] += value + if isPerMethodOutcomeServerMetric(name) { + method, methodOK := prometheusLabelValue(fields[0], "method") + outcome, outcomeOK := prometheusLabelValue(fields[0], "outcome") + if methodOK && outcomeOK { + values[name+`{method="`+method+`",outcome="`+outcome+`"}`] += value + } + } else if isPerMethodServerMetric(name) { + if method, ok := prometheusLabelValue(fields[0], "method"); ok { + values[name+`{method="`+method+`"}`] += value + } + } else if isOutcomeServerMetric(name) { + if outcome, ok := prometheusLabelValue(fields[0], "outcome"); ok { + values[name+`{outcome="`+outcome+`"}`] += value + } + } + if isStateServerMetric(name) { + if state, ok := prometheusLabelValue(fields[0], "state"); ok { + values[name+`{state="`+state+`"}`] += value + } + } } if err := reader.Err(); err != nil { c.errors.Add(1) @@ -126,6 +192,112 @@ func (c *serverMetricsClient) scrape(ctx context.Context) (map[string]float64, e return values, nil } +// waitForPresenceLastSeenSettlement waits until every expected lifecycle event +// has reached the server-owned batch queue and all accepted work has drained. +// It is report-only synchronization: it does not participate in RPC success or +// alter the server's presence semantics. +func (c *serverMetricsClient) waitForPresenceLastSeenSettlement( + ctx context.Context, + baselineSubmitted float64, + expectedSubmitted uint64, + timeout time.Duration, +) (map[string]float64, error) { + if c == nil { + return nil, nil + } + if timeout <= 0 { + timeout = 15 * time.Second + } + deadline := time.NewTimer(timeout) + defer deadline.Stop() + poll := time.NewTicker(100 * time.Millisecond) + defer poll.Stop() + var last map[string]float64 + for { + sample, err := c.scrape(ctx) + if err != nil { + return last, err + } + last = sample + submitted := metricValue(sample, "telesrv_presence_last_seen_submitted_total") - baselineSubmitted + pending := metricValue(sample, "telesrv_presence_last_seen_pending") + bootstrapPending := metricValue(sample, "telesrv_bootstrap_ready_pending") + activeChannelIDsPending := metricValue(sample, "telesrv_active_channel_ids_pending") + if submitted >= float64(expectedSubmitted) && pending == 0 && bootstrapPending == 0 && activeChannelIDsPending == 0 { + return sample, nil + } + select { + case <-ctx.Done(): + return last, ctx.Err() + case <-deadline.C: + return last, fmt.Errorf("startup settlement timeout: presence submitted=%.0f expected=%d pending=%.0f bootstrap_pending=%.0f active_channel_ids_pending=%.0f", submitted, expectedSubmitted, pending, bootstrapPending, activeChannelIDsPending) + case <-poll.C: + } + } +} + +func isOutcomeServerMetric(name string) bool { + switch name { + case "telesrv_presence_last_seen_batches_total", "telesrv_presence_last_seen_updates_total", + "telesrv_bootstrap_ready_batches_total", "telesrv_bootstrap_ready_selectors_total", + "telesrv_active_channel_ids_cache_total", "telesrv_active_channel_ids_batches_total", + "telesrv_active_channel_ids_selectors_total": + return true + default: + return false + } +} + +func isPerMethodServerMetric(name string) bool { + switch name { + case "telesrv_mtproto_rpc_result_inner_bytes_total", + "telesrv_mtproto_rpc_result_wire_bytes_total", + "telesrv_rpc_db_queries_total", + "telesrv_rpc_db_errors_total", + "telesrv_rpc_db_time_seconds_sum", + "telesrv_rpc_db_time_seconds_count": + return true + default: + return false + } +} + +func isPerMethodOutcomeServerMetric(name string) bool { + switch name { + case "telesrv_mtproto_rpc_result_delivered_total", "telesrv_mtproto_rpc_result_delivered_bytes_total": + return true + default: + return false + } +} + +func isStateServerMetric(name string) bool { + switch name { + case "telesrv_mtproto_sessions", "telesrv_mtproto_logical_sessions", + "telesrv_postgres_pool_connections", "telesrv_redis_pool_connections": + return true + default: + return false + } +} + +func prometheusLabelValue(series, label string) (string, bool) { + needle := label + `="` + start := strings.Index(series, needle) + if start < 0 { + return "", false + } + start += len(needle) + end := start + for end < len(series) { + if series[end] == '"' && (end == start || series[end-1] != '\\') { + return series[start:end], true + } + end++ + } + return "", false +} + func (c *serverMetricsClient) successes() uint64 { if c == nil { return 0 diff --git a/internal/loadharness/server_metrics_test.go b/internal/loadharness/server_metrics_test.go index 1c524155..66d1f07a 100644 --- a/internal/loadharness/server_metrics_test.go +++ b/internal/loadharness/server_metrics_test.go @@ -5,7 +5,9 @@ import ( "fmt" "net/http" "net/http/httptest" + "sync/atomic" "testing" + "time" ) func TestServerMetricsScrapeSelectsBoundedCapacitySignals(t *testing.T) { @@ -16,6 +18,24 @@ func TestServerMetricsScrapeSelectsBoundedCapacitySignals(t *testing.T) { for i := 0; i < 256; i++ { fmt.Fprintf(w, "telesrv_mtproto_rpc_result_wire_bytes_total{method=%q} 1\n", fmt.Sprintf("method-%d", i)) } + fmt.Fprintln(w, `telesrv_mtproto_rpc_result_delivered_total{method="users.getUsers",outcome="ok"} 7`) + fmt.Fprintln(w, `telesrv_mtproto_rpc_result_delivered_total{method="users.getUsers",outcome="edge_overload"} 3`) + fmt.Fprintln(w, `telesrv_mtproto_rpc_result_delivered_bytes_total{method="users.getUsers",outcome="ok"} 700`) + fmt.Fprintln(w, `telesrv_mtproto_rpc_result_delivered_bytes_total{method="users.getUsers",outcome="edge_overload"} 300`) + fmt.Fprintln(w, `telesrv_presence_last_seen_batches_total{outcome="ok"} 17`) + fmt.Fprintln(w, `telesrv_presence_last_seen_batches_total{outcome="error"} 2`) + fmt.Fprintln(w, `telesrv_presence_last_seen_updates_total{outcome="ok"} 900`) + fmt.Fprintln(w, `telesrv_presence_last_seen_updates_total{outcome="error"} 23`) + fmt.Fprintln(w, `telesrv_presence_last_seen_submitted_total 923`) + fmt.Fprintln(w, `telesrv_presence_last_seen_pending 11`) + fmt.Fprintln(w, `telesrv_presence_last_seen_overflow_total 1`) + fmt.Fprintln(w, `telesrv_presence_last_seen_drain_dropped_total 4`) + fmt.Fprintln(w, `telesrv_bootstrap_ready_batches_total{outcome="ok"} 10`) + fmt.Fprintln(w, `telesrv_bootstrap_ready_batches_total{outcome="error"} 1`) + fmt.Fprintln(w, `telesrv_bootstrap_ready_selectors_total{outcome="matched"} 2`) + fmt.Fprintln(w, `telesrv_bootstrap_ready_selectors_total{outcome="miss"} 800`) + fmt.Fprintln(w, `telesrv_bootstrap_ready_selectors_total{outcome="error"} 3`) + fmt.Fprintln(w, `telesrv_bootstrap_ready_pending 1`) fmt.Fprintln(w, `unrelated_high_cardinality{user_id="secret"} 1`) })) defer server.Close() @@ -27,7 +47,89 @@ func TestServerMetricsScrapeSelectsBoundedCapacitySignals(t *testing.T) { if values["telesrv_mtproto_raw_connections"] != 500 || values["telesrv_mtproto_sessions"] != 500 || values["telesrv_mtproto_rpc_result_wire_bytes_total"] != 256 { t.Fatalf("values = %#v", values) } - if len(values) != 3 || client.successes() != 1 || client.failures() != 0 { + if values[`telesrv_mtproto_rpc_result_wire_bytes_total{method="method-17"}`] != 1 { + t.Fatalf("method response bytes = %#v", values) + } + if values[`telesrv_mtproto_sessions{state="active"}`] != 499 || values[`telesrv_mtproto_sessions{state="provisional"}`] != 1 { + t.Fatalf("session state values = %#v", values) + } + if values[`telesrv_mtproto_rpc_result_delivered_total{method="users.getUsers",outcome="ok"}`] != 7 || + values[`telesrv_mtproto_rpc_result_delivered_total{method="users.getUsers",outcome="edge_overload"}`] != 3 { + t.Fatalf("delivery outcomes = %#v", values) + } + if values[`telesrv_presence_last_seen_batches_total{outcome="ok"}`] != 17 || + values[`telesrv_presence_last_seen_batches_total{outcome="error"}`] != 2 || + values[`telesrv_presence_last_seen_updates_total{outcome="ok"}`] != 900 || + values[`telesrv_presence_last_seen_updates_total{outcome="error"}`] != 23 || + values["telesrv_presence_last_seen_submitted_total"] != 923 || + values["telesrv_presence_last_seen_pending"] != 11 || + values["telesrv_presence_last_seen_overflow_total"] != 1 || + values["telesrv_presence_last_seen_drain_dropped_total"] != 4 { + t.Fatalf("presence batch values = %#v", values) + } + if values[`telesrv_bootstrap_ready_batches_total{outcome="ok"}`] != 10 || + values[`telesrv_bootstrap_ready_batches_total{outcome="error"}`] != 1 || + values[`telesrv_bootstrap_ready_selectors_total{outcome="matched"}`] != 2 || + values[`telesrv_bootstrap_ready_selectors_total{outcome="miss"}`] != 800 || + values[`telesrv_bootstrap_ready_selectors_total{outcome="error"}`] != 3 || + values["telesrv_bootstrap_ready_pending"] != 1 { + t.Fatalf("bootstrap readiness values = %#v", values) + } + if len(values) != 285 || client.successes() != 1 || client.failures() != 0 { t.Fatalf("bounded values/scrapes = %#v, %d/%d", values, client.successes(), client.failures()) } } + +func TestPrometheusLabelValue(t *testing.T) { + value, ok := prometheusLabelValue(`metric{encoding="gzip",method="messages.getDialogs",outcome="ok"}`, "method") + if !ok || value != "messages.getDialogs" { + t.Fatalf("method = %q, %v", value, ok) + } + if _, ok := prometheusLabelValue(`metric{encoding="gzip"}`, "method"); ok { + t.Fatal("missing method label was accepted") + } +} + +func TestServerMetricsWaitsForPresenceLastSeenSettlement(t *testing.T) { + var calls atomic.Int64 + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { + call := calls.Add(1) + if call < 3 { + fmt.Fprintln(w, `telesrv_presence_last_seen_submitted_total 1`) + fmt.Fprintln(w, `telesrv_presence_last_seen_pending 1`) + fmt.Fprintln(w, `telesrv_bootstrap_ready_pending 1`) + return + } + fmt.Fprintln(w, `telesrv_presence_last_seen_submitted_total 2`) + fmt.Fprintln(w, `telesrv_presence_last_seen_pending 0`) + fmt.Fprintln(w, `telesrv_bootstrap_ready_pending 0`) + })) + defer server.Close() + client := newServerMetricsClient(server.URL) + values, err := client.waitForPresenceLastSeenSettlement(context.Background(), 0, 2, time.Second) + if err != nil { + t.Fatalf("wait: %v", err) + } + if values["telesrv_presence_last_seen_submitted_total"] != 2 || values["telesrv_presence_last_seen_pending"] != 0 || + values["telesrv_bootstrap_ready_pending"] != 0 { + t.Fatalf("settled values = %#v", values) + } + if calls.Load() != 3 { + t.Fatalf("scrape calls = %d, want 3", calls.Load()) + } +} + +func TestMetricValueDoesNotDoubleCountAggregateAndStateBreakdown(t *testing.T) { + values := map[string]float64{ + "telesrv_mtproto_logical_sessions": 254, + `telesrv_mtproto_logical_sessions{state="retained"}`: 254, + `telesrv_mtproto_logical_sessions{state="offline"}`: 0, + } + if got := metricValue(values, "telesrv_mtproto_logical_sessions"); got != 254 { + t.Fatalf("logical sessions = %v, want aggregate 254", got) + } + delete(values, "telesrv_mtproto_logical_sessions") + if got := metricValue(values, "telesrv_mtproto_logical_sessions"); got != 254 { + t.Fatalf("legacy labeled-only logical sessions = %v, want 254", got) + } +} diff --git a/internal/loadharness/snapshot.go b/internal/loadharness/snapshot.go new file mode 100644 index 00000000..ea8aef38 --- /dev/null +++ b/internal/loadharness/snapshot.go @@ -0,0 +1,723 @@ +package loadharness + +import ( + "context" + "crypto/rsa" + "crypto/sha256" + "encoding/json" + "errors" + "fmt" + "os" + "path/filepath" + "sort" + "strings" + "time" + + "github.com/iamxvbaba/td/tg" +) + +const ClientStateVersion = 1 + +type ClientUpdateState struct { + Pts int `json:"pts"` + Qts int `json:"qts"` + Date int `json:"date"` + Seq int `json:"seq"` + UnreadCount int `json:"unread_count"` +} + +type ClientDialogState struct { + PeerType string `json:"peer_type"` + PeerID int64 `json:"peer_id"` + AccessHash int64 `json:"access_hash"` + TopMessage int `json:"top_message"` + TopMessageDate int `json:"top_message_date"` + Pts int `json:"pts,omitempty"` + HasPts bool `json:"has_pts,omitempty"` + ReadInboxMaxID int `json:"read_inbox_max_id"` + ReadOutboxMaxID int `json:"read_outbox_max_id"` + UnreadCount int `json:"unread_count"` + UnreadMentions int `json:"unread_mentions"` + UnreadReactions int `json:"unread_reactions"` + Pinned bool `json:"pinned,omitempty"` + HasDraft bool `json:"has_draft,omitempty"` + DraftText string `json:"draft_text,omitempty"` + DatasetExpected bool `json:"dataset_expected,omitempty"` +} + +type ClientAccountState struct { + AccountIndex int `json:"account_index"` + UserID int64 `json:"user_id"` + State ClientUpdateState `json:"state"` + Dialogs []ClientDialogState `json:"dialogs"` +} + +type ClientState struct { + Version int `json:"version"` + DatasetSHA256 string `json:"dataset_sha256"` + SeedIdentitySHA string `json:"seed_identity_sha256"` + CreatedAt time.Time `json:"created_at"` + Accounts []ClientAccountState `json:"accounts"` +} + +type SnapshotConfig struct { + ManifestPath string + SessionKeyPath string + RSAKeyOverride string + DatasetPath string + SeedStatePath string + ClientStatePath string + Concurrency int + OperationTimeout time.Duration +} + +type SnapshotEvent struct { + Completed int + Total int + Account int + Resumed bool + Err error +} + +type SnapshotResult struct { + Accounts int + Dialogs int + Channels int +} + +func (c SnapshotConfig) validate() error { + if c.ManifestPath == "" || c.SessionKeyPath == "" || c.DatasetPath == "" || c.SeedStatePath == "" || c.ClientStatePath == "" { + return errors.New("manifest, session-key, dataset, seed-state and client-state paths are required") + } + if c.Concurrency <= 0 || c.Concurrency > 64 { + return errors.New("snapshot concurrency must be between 1 and 64") + } + if c.OperationTimeout <= 0 { + return errors.New("snapshot operation timeout must be positive") + } + return nil +} + +// SnapshotClientState establishes the old client cursors that later offline +// mutations must advance from. Dialogs are read through public paginated RPCs; +// per-account part files make a 1,000-account snapshot safely resumable without +// rewriting the growing aggregate after every account. +func SnapshotClientState(ctx context.Context, cfg SnapshotConfig, progress func(SnapshotEvent)) (*SnapshotResult, error) { + if err := cfg.validate(); err != nil { + return nil, err + } + manifest, err := LoadManifest(cfg.ManifestPath) + if err != nil { + return nil, err + } + dataset, err := LoadDataset(cfg.DatasetPath) + if err != nil { + return nil, err + } + targets, err := seedPrimaryTargets(manifest, dataset.Config.Accounts) + if err != nil { + return nil, err + } + seedState, err := LoadDatasetSeedState(cfg.SeedStatePath, dataset) + if err != nil { + return nil, err + } + seedJournal := &seedJournal{dataset: dataset, state: seedState} + if err := seedJournal.assertComplete(); err != nil { + return nil, fmt.Errorf("snapshot requires a complete seed: %w", err) + } + seedIdentity, err := seedIdentitySHA256(seedState) + if err != nil { + return nil, err + } + if existing, loadErr := LoadClientState(cfg.ClientStatePath); loadErr == nil { + if err := existing.Validate(dataset, seedState, targets); err != nil { + return nil, fmt.Errorf("existing client state does not match requested dataset: %w", err) + } + return clientStateResult(existing), nil + } else if !os.IsNotExist(loadErr) { + return nil, loadErr + } + key, err := LoadSessionKey(cfg.SessionKeyPath) + if err != nil { + return nil, err + } + publicKey, err := loadManifestPublicKey(cfg.ManifestPath, manifest.Endpoint, cfg.RSAKeyOverride) + if err != nil { + return nil, err + } + + accounts := make([]int, dataset.Config.Accounts) + for account := range accounts { + accounts[account] = account + } + resumed := make([]bool, len(accounts)) + for _, account := range accounts { + if _, err := loadClientStatePart(clientStatePartPath(cfg.ClientStatePath, account), dataset, seedState, targets, account); err == nil { + resumed[account] = true + } else if !os.IsNotExist(err) { + return nil, err + } + } + completed := 0 + if err := runSeedAccountPhase(ctx, "snapshot", accounts, cfg.Concurrency, func(event SeedEvent) { + if event.Err == nil { + completed++ + } + if progress != nil { + progress(SnapshotEvent{Completed: completed, Total: len(accounts), Account: event.Account, Resumed: resumed[event.Account], Err: event.Err}) + } + }, func(ctx context.Context, account int) error { + if resumed[account] { + return nil + } + state, err := snapshotAccount(ctx, cfg, manifest, dataset, seedState, targets, key, publicKey, account) + if err != nil { + return err + } + return writeClientStatePart(clientStatePartPath(cfg.ClientStatePath, account), dataset.PlanSHA256, seedIdentity, state) + }); err != nil { + return nil, err + } + + clientState := &ClientState{ + Version: ClientStateVersion, DatasetSHA256: dataset.PlanSHA256, SeedIdentitySHA: seedIdentity, CreatedAt: time.Now().UTC(), + Accounts: make([]ClientAccountState, 0, len(accounts)), + } + for _, account := range accounts { + state, err := loadClientStatePart(clientStatePartPath(cfg.ClientStatePath, account), dataset, seedState, targets, account) + if err != nil { + return nil, err + } + clientState.Accounts = append(clientState.Accounts, *state) + } + if err := clientState.Validate(dataset, seedState, targets); err != nil { + return nil, err + } + if err := WriteClientState(cfg.ClientStatePath, clientState); err != nil { + return nil, err + } + return clientStateResult(clientState), nil +} + +func snapshotAccount( + ctx context.Context, + cfg SnapshotConfig, + manifest *Manifest, + dataset *Dataset, + seedState *DatasetSeedState, + targets []SessionRecord, + key [32]byte, + publicKey *rsa.PublicKey, + account int, +) (*ClientAccountState, error) { + var result *ClientAccountState + err := withAuthorizedSeedSession(ctx, SeedConfig{ + ManifestPath: cfg.ManifestPath, OperationTimeout: cfg.OperationTimeout, + }, manifest, targets[account], key, publicKey, func(ctx context.Context, raw *tg.Client) error { + dialogs, err := snapshotDialogs(ctx, cfg.OperationTimeout, raw) + if err != nil { + return err + } + expected := expectedDatasetPeers(dataset, seedState, targets, account) + for i := range dialogs { + _, dialogs[i].DatasetExpected = expected[clientPeerKey{typ: dialogs[i].PeerType, id: dialogs[i].PeerID}] + if dialogs[i].DatasetExpected { + delete(expected, clientPeerKey{typ: dialogs[i].PeerType, id: dialogs[i].PeerID}) + } + } + if len(expected) != 0 { + missing := make([]string, 0, min(len(expected), 5)) + for peer := range expected { + missing = append(missing, fmt.Sprintf("%s:%d", peer.typ, peer.id)) + if len(missing) == 5 { + break + } + } + sort.Strings(missing) + return fmt.Errorf("messages.getDialogs omitted %d expected dataset peers (sample %s)", len(expected), strings.Join(missing, ",")) + } + if err := validateSeededRichDialogs(dataset, seedState, targets, account, dialogs, true); err != nil { + return fmt.Errorf("rich dialog state: %w", err) + } + stateCtx, cancel := context.WithTimeout(ctx, cfg.OperationTimeout) + state, err := raw.UpdatesGetState(stateCtx) + cancel() + if err != nil { + return fmt.Errorf("updates.getState: %w", err) + } + result = &ClientAccountState{ + AccountIndex: account, UserID: targets[account].UserID, + State: ClientUpdateState{Pts: state.Pts, Qts: state.Qts, Date: state.Date, Seq: state.Seq, UnreadCount: state.UnreadCount}, + Dialogs: dialogs, + } + return nil + }) + if err == nil && result == nil { + return nil, errors.New("snapshot session ended without producing account state") + } + return result, err +} + +type clientPeerKey struct { + typ string + id int64 +} + +func snapshotDialogs(ctx context.Context, timeout time.Duration, raw *tg.Client) ([]ClientDialogState, error) { + dialogs, _, err := snapshotDialogsObserved(ctx, timeout, raw, snapshotPaginationProfile, nil) + return dialogs, err +} + +func snapshotDialogsObserved( + ctx context.Context, + timeout time.Duration, + raw *tg.Client, + profile dialogPaginationProfile, + observe func(string, time.Time, error), +) ([]ClientDialogState, StartupDialogsCounts, error) { + if profile.FirstLimit <= 0 || profile.SubsequentLimit <= 0 { + return nil, StartupDialogsCounts{}, errors.New("invalid dialogs pagination profile") + } + dialogsByPeer := make(map[clientPeerKey]ClientDialogState) + counts := StartupDialogsCounts{} + start := time.Now() + pinnedCtx, cancel := context.WithTimeout(ctx, timeout) + pinned, err := raw.MessagesGetPinnedDialogs(pinnedCtx, 0) + cancel() + if observe != nil { + observe("messages.getPinnedDialogs", start, err) + } + counts.PinnedCalls++ + if err != nil { + return nil, counts, fmt.Errorf("messages.getPinnedDialogs: %w", err) + } + if _, err := mergeDialogPage(dialogsByPeer, pinned.Dialogs, pinned.Messages, pinned.Chats, pinned.Users, true); err != nil { + return nil, counts, err + } + pinnedPeers := make(map[clientPeerKey]struct{}, len(dialogsByPeer)) + for peer := range dialogsByPeer { + pinnedPeers[peer] = struct{}{} + } + + request := &tg.MessagesGetDialogsRequest{ExcludePinned: true, OffsetPeer: &tg.InputPeerEmpty{}, Limit: profile.limit(0)} + for page := 0; page < 100; page++ { + request.Limit = profile.limit(page) + start := time.Now() + rpcCtx, cancel := context.WithTimeout(ctx, timeout) + response, err := raw.MessagesGetDialogs(rpcCtx, request) + cancel() + if observe != nil { + observe("messages.getDialogs", start, err) + if page == 0 { + observe("messages.getDialogs.first", start, err) + } else { + observe("messages.getDialogs.next", start, err) + } + } + counts.Calls++ + if err != nil { + return nil, counts, fmt.Errorf("messages.getDialogs page %d: %w", page+1, err) + } + var pageDialogs []tg.DialogClass + var messages []tg.MessageClass + var chats []tg.ChatClass + var users []tg.UserClass + complete := false + switch value := response.(type) { + case *tg.MessagesDialogs: + if observe != nil { + observe("messages.getDialogs.full", start, nil) + } + counts.Full++ + pageDialogs, messages, chats, users, complete = value.Dialogs, value.Messages, value.Chats, value.Users, true + case *tg.MessagesDialogsSlice: + if observe != nil { + observe("messages.getDialogs.slice", start, nil) + } + counts.Slice++ + pageDialogs, messages, chats, users = value.Dialogs, value.Messages, value.Chats, value.Users + case *tg.MessagesDialogsNotModified: + return nil, counts, errors.New("messages.getDialogs with hash=0 returned dialogsNotModified") + default: + return nil, counts, fmt.Errorf("messages.getDialogs returned %T", response) + } + last, overlap, err := mergeDialogPageKnownOverlap(dialogsByPeer, pageDialogs, messages, chats, users, false, pinnedPeers) + counts.PinnedOverlap += overlap + if err != nil { + return nil, counts, fmt.Errorf("messages.getDialogs page %d: %w", page+1, err) + } + // A dialogsSlice is explicitly non-final. The server may enforce a + // smaller per-page cap than the client-requested limit (TDesktop asks + // for 500 after its first page while telesrv currently returns at most + // 100). Only the full constructor or an empty slice proves completion; + // treating a short slice as EOF truncates the real TDesktop workload. + if dialogsPaginationDone(complete, len(pageDialogs)) { + break + } + if last.TopMessage <= 0 || last.TopMessageDate <= 0 { + return nil, counts, fmt.Errorf("messages.getDialogs page %d has no usable offset", page+1) + } + request.OffsetDate = last.TopMessageDate + request.OffsetID = last.TopMessage + request.OffsetPeer = clientDialogInputPeer(last) + if request.OffsetPeer == nil { + return nil, counts, fmt.Errorf("messages.getDialogs page %d has invalid offset peer", page+1) + } + if page == 99 { + return nil, counts, errors.New("messages.getDialogs exceeded 100 pages") + } + } + result := make([]ClientDialogState, 0, len(dialogsByPeer)) + for _, dialog := range dialogsByPeer { + result = append(result, dialog) + } + sort.Slice(result, func(i, j int) bool { + if result[i].PeerType != result[j].PeerType { + return result[i].PeerType < result[j].PeerType + } + return result[i].PeerID < result[j].PeerID + }) + counts.Dialogs = len(result) + return result, counts, nil +} + +func dialogsPaginationDone(complete bool, pageSize int) bool { + return complete || pageSize == 0 +} + +func mergeDialogPage( + destination map[clientPeerKey]ClientDialogState, + dialogClasses []tg.DialogClass, + messages []tg.MessageClass, + chats []tg.ChatClass, + users []tg.UserClass, + pinnedPage bool, +) (ClientDialogState, error) { + last, _, err := mergeDialogPageKnownOverlap(destination, dialogClasses, messages, chats, users, pinnedPage, nil) + return last, err +} + +func mergeDialogPageKnownOverlap( + destination map[clientPeerKey]ClientDialogState, + dialogClasses []tg.DialogClass, + messages []tg.MessageClass, + chats []tg.ChatClass, + users []tg.UserClass, + pinnedPage bool, + allowedOverlap map[clientPeerKey]struct{}, +) (ClientDialogState, int, error) { + accessHashes := make(map[clientPeerKey]int64, len(chats)+len(users)) + for _, chat := range chats { + channel, ok := chat.(*tg.Channel) + if !ok { + continue + } + hash, ok := channel.GetAccessHash() + if ok { + accessHashes[clientPeerKey{typ: "channel", id: channel.ID}] = hash + } + } + for _, userClass := range users { + user, ok := userClass.(*tg.User) + if !ok { + continue + } + hash, ok := user.GetAccessHash() + if ok { + accessHashes[clientPeerKey{typ: "user", id: user.ID}] = hash + } + } + messageDates := make(map[string]int, len(messages)) + for _, messageClass := range messages { + message, ok := messageClass.AsNotEmpty() + if !ok { + continue + } + peer, ok := clientPeerFromTG(message.GetPeerID()) + if !ok { + continue + } + messageDates[clientMessageKey(peer, message.GetID())] = message.GetDate() + } + var last ClientDialogState + overlaps := 0 + for _, dialogClass := range dialogClasses { + dialog, ok := dialogClass.(*tg.Dialog) + if !ok { + continue + } + peer, ok := clientPeerFromTG(dialog.Peer) + if !ok { + continue + } + hash := accessHashes[peer] + if hash == 0 { + return ClientDialogState{}, overlaps, fmt.Errorf("dialog %s:%d omitted access hash", peer.typ, peer.id) + } + pts, hasPts := dialog.GetPts() + if peer.typ == "channel" && (!hasPts || pts <= 0) { + return ClientDialogState{}, overlaps, fmt.Errorf("channel dialog %d omitted pts", peer.id) + } + date := messageDates[clientMessageKey(peer, dialog.TopMessage)] + if dialog.TopMessage <= 0 || date <= 0 { + return ClientDialogState{}, overlaps, fmt.Errorf("dialog %s:%d omitted top message payload", peer.typ, peer.id) + } + state := ClientDialogState{ + PeerType: peer.typ, PeerID: peer.id, AccessHash: hash, + TopMessage: dialog.TopMessage, TopMessageDate: date, Pts: pts, HasPts: hasPts, + ReadInboxMaxID: dialog.ReadInboxMaxID, ReadOutboxMaxID: dialog.ReadOutboxMaxID, + UnreadCount: dialog.UnreadCount, UnreadMentions: dialog.UnreadMentionsCount, + UnreadReactions: dialog.UnreadReactionsCount, Pinned: pinnedPage || dialog.Pinned, + } + if draftClass, ok := dialog.GetDraft(); ok { + if draft, ok := draftClass.(*tg.DraftMessage); ok && draft.Message != "" { + state.HasDraft, state.DraftText = true, draft.Message + } + } + if existing, exists := destination[peer]; exists { + if _, allowed := allowedOverlap[peer]; !allowed || !existing.Pinned || !state.Pinned || existing.TopMessage != state.TopMessage || existing.AccessHash != state.AccessHash { + return ClientDialogState{}, overlaps, fmt.Errorf("duplicate dialog %s:%d", peer.typ, peer.id) + } + delete(allowedOverlap, peer) + if !state.HasDraft && existing.HasDraft { + state.HasDraft, state.DraftText = existing.HasDraft, existing.DraftText + } + overlaps++ + } + destination[peer] = state + last = state + } + return last, overlaps, nil +} + +func clientPeerFromTG(peer tg.PeerClass) (clientPeerKey, bool) { + switch value := peer.(type) { + case *tg.PeerUser: + return clientPeerKey{typ: "user", id: value.UserID}, value.UserID > 0 + case *tg.PeerChannel: + return clientPeerKey{typ: "channel", id: value.ChannelID}, value.ChannelID > 0 + default: + return clientPeerKey{}, false + } +} + +func clientMessageKey(peer clientPeerKey, messageID int) string { + return fmt.Sprintf("%s:%d:%d", peer.typ, peer.id, messageID) +} + +func clientDialogInputPeer(dialog ClientDialogState) tg.InputPeerClass { + switch dialog.PeerType { + case "user": + return &tg.InputPeerUser{UserID: dialog.PeerID, AccessHash: dialog.AccessHash} + case "channel": + return &tg.InputPeerChannel{ChannelID: dialog.PeerID, AccessHash: dialog.AccessHash} + default: + return nil + } +} + +func expectedDatasetPeers(dataset *Dataset, seedState *DatasetSeedState, targets []SessionRecord, account int) map[clientPeerKey]struct{} { + expected := make(map[clientPeerKey]struct{}) + for _, edge := range dataset.PrivateEdges { + switch account { + case edge.SenderAccount: + expected[clientPeerKey{typ: "user", id: targets[edge.RecipientAccount].UserID}] = struct{}{} + case edge.RecipientAccount: + expected[clientPeerKey{typ: "user", id: targets[edge.SenderAccount].UserID}] = struct{}{} + } + } + for position, group := range dataset.Groups { + memberIndex := sort.SearchInts(group.MemberAccounts, account) + if memberIndex < len(group.MemberAccounts) && group.MemberAccounts[memberIndex] == account { + expected[clientPeerKey{typ: "channel", id: seedState.Groups[position].ChannelID}] = struct{}{} + } + } + return expected +} + +func clientStatePartPath(clientStatePath string, account int) string { + return filepath.Join(clientStatePath+".parts", fmt.Sprintf("account-%04d.json", account)) +} + +type clientStatePart struct { + Version int `json:"version"` + DatasetSHA256 string `json:"dataset_sha256"` + SeedIdentitySHA string `json:"seed_identity_sha256"` + Account ClientAccountState `json:"account"` +} + +func writeClientStatePart(path, datasetSHA, seedIdentity string, account *ClientAccountState) error { + if account == nil { + return errors.New("cannot write nil client account state") + } + part := clientStatePart{Version: ClientStateVersion, DatasetSHA256: datasetSHA, SeedIdentitySHA: seedIdentity, Account: *account} + data, err := json.MarshalIndent(part, "", " ") + if err != nil { + return err + } + return writeFileAtomic(path, append(data, '\n'), 0o600) +} + +func loadClientStatePart(path string, dataset *Dataset, seedState *DatasetSeedState, targets []SessionRecord, account int) (*ClientAccountState, error) { + data, err := os.ReadFile(path) + if err != nil { + return nil, err + } + var part clientStatePart + decoder := json.NewDecoder(strings.NewReader(string(data))) + decoder.DisallowUnknownFields() + if err := decoder.Decode(&part); err != nil { + return nil, fmt.Errorf("decode client state part: %w", err) + } + seedIdentity, err := seedIdentitySHA256(seedState) + if err != nil { + return nil, err + } + target := targets[account] + if part.Version != ClientStateVersion || part.DatasetSHA256 != dataset.PlanSHA256 || part.SeedIdentitySHA != seedIdentity || part.Account.AccountIndex != target.AccountIndex || part.Account.UserID != target.UserID { + return nil, errors.New("client state part does not match dataset or account") + } + if err := validateClientAccountState(&part.Account); err != nil { + return nil, err + } + if err := validateExpectedDatasetPeers(dataset, seedState, targets, &part.Account); err != nil { + return nil, err + } + return &part.Account, nil +} + +func (s *ClientState) Validate(dataset *Dataset, seedState *DatasetSeedState, targets []SessionRecord) error { + if s == nil || s.Version != ClientStateVersion || dataset == nil || s.DatasetSHA256 != dataset.PlanSHA256 { + return errors.New("client state does not match dataset") + } + seedIdentity, err := seedIdentitySHA256(seedState) + if err != nil { + return err + } + if s.SeedIdentitySHA != seedIdentity { + return errors.New("client state does not match seeded channel identities") + } + if len(s.Accounts) != dataset.Config.Accounts || len(targets) != dataset.Config.Accounts { + return errors.New("client state account count does not match dataset") + } + for account := range s.Accounts { + if s.Accounts[account].AccountIndex != account || s.Accounts[account].UserID != targets[account].UserID { + return fmt.Errorf("client state account %d has wrong identity", account) + } + if err := validateClientAccountState(&s.Accounts[account]); err != nil { + return fmt.Errorf("client state account %d: %w", account, err) + } + if err := validateExpectedDatasetPeers(dataset, seedState, targets, &s.Accounts[account]); err != nil { + return fmt.Errorf("client state account %d: %w", account, err) + } + } + return nil +} + +func validateExpectedDatasetPeers(dataset *Dataset, seedState *DatasetSeedState, targets []SessionRecord, account *ClientAccountState) error { + expected := expectedDatasetPeers(dataset, seedState, targets, account.AccountIndex) + for _, dialog := range account.Dialogs { + peer := clientPeerKey{typ: dialog.PeerType, id: dialog.PeerID} + _, shouldBeExpected := expected[peer] + if dialog.DatasetExpected != shouldBeExpected { + return fmt.Errorf("dialog %s:%d has incorrect dataset_expected marker", peer.typ, peer.id) + } + if shouldBeExpected { + delete(expected, peer) + } + } + if len(expected) != 0 { + return fmt.Errorf("client state omits %d expected dataset peers", len(expected)) + } + return nil +} + +func seedIdentitySHA256(state *DatasetSeedState) (string, error) { + if state == nil { + return "", errors.New("nil seed state") + } + type identity struct { + GroupIndex int `json:"group_index"` + ChannelID int64 `json:"channel_id"` + AccessHash int64 `json:"access_hash"` + } + identities := make([]identity, len(state.Groups)) + for i, group := range state.Groups { + if group.ChannelID <= 0 || group.AccessHash == 0 { + return "", fmt.Errorf("group %d has incomplete identity", group.GroupIndex) + } + identities[i] = identity{GroupIndex: group.GroupIndex, ChannelID: group.ChannelID, AccessHash: group.AccessHash} + } + data, err := json.Marshal(identities) + if err != nil { + return "", err + } + sum := sha256.Sum256(data) + return fmt.Sprintf("%x", sum[:]), nil +} + +func validateClientAccountState(account *ClientAccountState) error { + if account == nil || account.AccountIndex < 0 || account.UserID <= 0 || account.State.Pts < 0 || account.State.Qts < 0 || account.State.Date <= 0 || account.State.Seq < 0 { + return errors.New("invalid account state") + } + seen := make(map[clientPeerKey]struct{}, len(account.Dialogs)) + for _, dialog := range account.Dialogs { + peer := clientPeerKey{typ: dialog.PeerType, id: dialog.PeerID} + if (peer.typ != "user" && peer.typ != "channel") || peer.id <= 0 || dialog.AccessHash == 0 || dialog.TopMessage <= 0 || dialog.TopMessageDate <= 0 { + return fmt.Errorf("invalid dialog %s:%d", peer.typ, peer.id) + } + if peer.typ == "channel" && (!dialog.HasPts || dialog.Pts <= 0) { + return fmt.Errorf("invalid channel pts for %d", peer.id) + } + if dialog.HasDraft != (dialog.DraftText != "") { + return fmt.Errorf("invalid draft state for %s:%d", peer.typ, peer.id) + } + if _, exists := seen[peer]; exists { + return fmt.Errorf("duplicate dialog %s:%d", peer.typ, peer.id) + } + seen[peer] = struct{}{} + } + return nil +} + +func WriteClientState(path string, state *ClientState) error { + if state == nil || state.Version != ClientStateVersion || state.DatasetSHA256 == "" || state.SeedIdentitySHA == "" { + return errors.New("invalid client state") + } + data, err := json.MarshalIndent(state, "", " ") + if err != nil { + return err + } + return writeFileAtomic(path, append(data, '\n'), 0o600) +} + +func LoadClientState(path string) (*ClientState, error) { + data, err := os.ReadFile(path) + if err != nil { + return nil, err + } + var state ClientState + decoder := json.NewDecoder(strings.NewReader(string(data))) + decoder.DisallowUnknownFields() + if err := decoder.Decode(&state); err != nil { + return nil, fmt.Errorf("decode client state: %w", err) + } + if state.Version != ClientStateVersion || state.DatasetSHA256 == "" || state.SeedIdentitySHA == "" { + return nil, errors.New("invalid client state") + } + return &state, nil +} + +func clientStateResult(state *ClientState) *SnapshotResult { + result := &SnapshotResult{Accounts: len(state.Accounts)} + for _, account := range state.Accounts { + result.Dialogs += len(account.Dialogs) + for _, dialog := range account.Dialogs { + if dialog.PeerType == "channel" { + result.Channels++ + } + } + } + return result +} diff --git a/internal/loadharness/snapshot_test.go b/internal/loadharness/snapshot_test.go new file mode 100644 index 00000000..e90fc471 --- /dev/null +++ b/internal/loadharness/snapshot_test.go @@ -0,0 +1,189 @@ +package loadharness + +import ( + "os" + "path/filepath" + "testing" + + "github.com/iamxvbaba/td/tg" +) + +func TestMergeDialogPageCapturesChannelCursorAndOffset(t *testing.T) { + user := &tg.User{ID: 11} + user.SetAccessHash(111) + channel := &tg.Channel{ID: 22, Title: "group", Megagroup: true} + channel.SetAccessHash(222) + userDialog := &tg.Dialog{Peer: &tg.PeerUser{UserID: 11}, TopMessage: 7} + channelDialog := &tg.Dialog{Peer: &tg.PeerChannel{ChannelID: 22}, TopMessage: 8} + channelDialog.SetPts(12) + destination := make(map[clientPeerKey]ClientDialogState) + last, err := mergeDialogPage(destination, + []tg.DialogClass{userDialog, channelDialog}, + []tg.MessageClass{ + &tg.Message{ID: 7, PeerID: &tg.PeerUser{UserID: 11}, Date: 101}, + &tg.Message{ID: 8, PeerID: &tg.PeerChannel{ChannelID: 22}, Date: 102}, + }, + []tg.ChatClass{channel}, []tg.UserClass{user}, false, + ) + if err != nil { + t.Fatal(err) + } + if len(destination) != 2 || last.PeerType != "channel" || last.PeerID != 22 || last.Pts != 12 || !last.HasPts || last.TopMessageDate != 102 { + t.Fatalf("merged dialogs = %+v, last = %+v", destination, last) + } + if _, err := mergeDialogPage(destination, + []tg.DialogClass{channelDialog}, + []tg.MessageClass{&tg.Message{ID: 8, PeerID: &tg.PeerChannel{ChannelID: 22}, Date: 102}}, + []tg.ChatClass{channel}, nil, false, + ); err == nil { + t.Fatal("duplicate dialog page passed validation") + } + overlapDestination := make(map[clientPeerKey]ClientDialogState) + pinnedDialog := *channelDialog + pinnedDialog.Pinned = true + if _, err := mergeDialogPage(overlapDestination, + []tg.DialogClass{&pinnedDialog}, + []tg.MessageClass{&tg.Message{ID: 8, PeerID: &tg.PeerChannel{ChannelID: 22}, Date: 102}}, + []tg.ChatClass{channel}, nil, true, + ); err != nil { + t.Fatal(err) + } + allowed := map[clientPeerKey]struct{}{{typ: "channel", id: 22}: {}} + if _, overlaps, err := mergeDialogPageKnownOverlap(overlapDestination, + []tg.DialogClass{&pinnedDialog}, + []tg.MessageClass{&tg.Message{ID: 8, PeerID: &tg.PeerChannel{ChannelID: 22}, Date: 102}}, + []tg.ChatClass{channel}, nil, false, allowed, + ); err != nil || overlaps != 1 { + t.Fatalf("known pinned overlap count=%d err=%v", overlaps, err) + } + if _, _, err := mergeDialogPageKnownOverlap(overlapDestination, + []tg.DialogClass{&pinnedDialog}, + []tg.MessageClass{&tg.Message{ID: 8, PeerID: &tg.PeerChannel{ChannelID: 22}, Date: 102}}, + []tg.ChatClass{channel}, nil, false, allowed, + ); err == nil { + t.Fatal("second copy of a consumed pinned overlap passed validation") + } + channelWithoutPts := &tg.Dialog{Peer: &tg.PeerChannel{ChannelID: 22}, TopMessage: 8} + if _, err := mergeDialogPage(make(map[clientPeerKey]ClientDialogState), + []tg.DialogClass{channelWithoutPts}, + []tg.MessageClass{&tg.Message{ID: 8, PeerID: &tg.PeerChannel{ChannelID: 22}, Date: 102}}, + []tg.ChatClass{channel}, nil, false, + ); err == nil { + t.Fatal("channel dialog without pts passed validation") + } +} + +func TestClientStateRoundTripLocksSeededChannelIdentity(t *testing.T) { + dataset, seedState, targets := snapshotFixture(t) + seedIdentity, err := seedIdentitySHA256(seedState) + if err != nil { + t.Fatal(err) + } + state := &ClientState{ + Version: ClientStateVersion, DatasetSHA256: dataset.PlanSHA256, SeedIdentitySHA: seedIdentity, + Accounts: make([]ClientAccountState, dataset.Config.Accounts), + } + for account := range state.Accounts { + state.Accounts[account] = ClientAccountState{ + AccountIndex: account, UserID: targets[account].UserID, + State: ClientUpdateState{Pts: account + 1, Date: 100}, + } + expected := expectedDatasetPeers(dataset, seedState, targets, account) + for peer := range expected { + dialog := ClientDialogState{ + PeerType: peer.typ, PeerID: peer.id, AccessHash: 99, + TopMessage: 1, TopMessageDate: 100, DatasetExpected: true, + } + if peer.typ == "channel" { + dialog.HasPts, dialog.Pts = true, 5 + } + state.Accounts[account].Dialogs = append(state.Accounts[account].Dialogs, dialog) + } + } + if err := state.Validate(dataset, seedState, targets); err != nil { + t.Fatal(err) + } + path := filepath.Join(t.TempDir(), "client-state.json") + if err := WriteClientState(path, state); err != nil { + t.Fatal(err) + } + info, err := os.Stat(path) + if err != nil { + t.Fatal(err) + } + if info.Mode().Perm() != 0o600 { + t.Fatalf("client state mode = %o, want 600", info.Mode().Perm()) + } + loaded, err := LoadClientState(path) + if err != nil { + t.Fatal(err) + } + if err := loaded.Validate(dataset, seedState, targets); err != nil { + t.Fatal(err) + } + seedState.Groups[0].ChannelID++ + if err := loaded.Validate(dataset, seedState, targets); err == nil { + t.Fatal("client state accepted different seeded channel identity") + } +} + +func TestClientStateRejectsMissingExpectedPeer(t *testing.T) { + dataset, seedState, targets := snapshotFixture(t) + expected := expectedDatasetPeers(dataset, seedState, targets, 0) + account := ClientAccountState{AccountIndex: 0, UserID: targets[0].UserID, State: ClientUpdateState{Date: 100}} + for peer := range expected { + dialog := ClientDialogState{PeerType: peer.typ, PeerID: peer.id, AccessHash: 1, TopMessage: 1, TopMessageDate: 1, DatasetExpected: true} + if peer.typ == "channel" { + dialog.HasPts, dialog.Pts = true, 1 + } + account.Dialogs = append(account.Dialogs, dialog) + } + account.Dialogs = account.Dialogs[1:] + if err := validateExpectedDatasetPeers(dataset, seedState, targets, &account); err == nil { + t.Fatal("account with missing expected peer passed validation") + } +} + +func TestDialogsPaginationOnlyFinishesOnFullOrEmptyResponse(t *testing.T) { + if dialogsPaginationDone(false, 100) { + t.Fatal("non-empty dialogsSlice was treated as final when the client requested a larger page") + } + if !dialogsPaginationDone(false, 0) { + t.Fatal("empty dialogsSlice did not finish pagination") + } + if !dialogsPaginationDone(true, 100) { + t.Fatal("messages.dialogs full constructor did not finish pagination") + } +} + +func snapshotFixture(t *testing.T) (*Dataset, *DatasetSeedState, []SessionRecord) { + t.Helper() + cfg := DatasetConfig{ + Accounts: 4, Seed: 7, PrivateFanout: 1, + HotGroups: 1, HotMembers: 4, HotHistory: 1, + } + dataset, err := PlanDataset(cfg) + if err != nil { + t.Fatal(err) + } + seedState, err := NewDatasetSeedState(dataset) + if err != nil { + t.Fatal(err) + } + // This fixture models a pre-rich-state journal unless an individual test + // explicitly opts into the newer phase. + seedState.RichStateByAccount = nil + for account := 0; account < cfg.Accounts; account++ { + seedState.PrivateSentByAccount[account] = cfg.PrivateFanout + } + seedState.Groups[0].ChannelID = 500 + seedState.Groups[0].AccessHash = 600 + seedState.Groups[0].InviteCursor = 3 + seedState.Groups[0].InvitePendingEnd = 3 + seedState.HistorySentByAccount[dataset.Groups[0].MemberAccounts[0]] = 1 + targets := make([]SessionRecord, cfg.Accounts) + for account := range targets { + targets[account] = SessionRecord{AccountIndex: account, UserID: int64(100 + account), AccessHash: int64(200 + account), SessionFile: "session"} + } + return dataset, seedState, targets +} diff --git a/internal/loadharness/startup.go b/internal/loadharness/startup.go new file mode 100644 index 00000000..eb81f47c --- /dev/null +++ b/internal/loadharness/startup.go @@ -0,0 +1,1037 @@ +package loadharness + +import ( + "context" + "crypto/rsa" + "encoding/json" + "errors" + "fmt" + "math/rand" + "sort" + "strings" + "sync" + "sync/atomic" + "time" + + "github.com/iamxvbaba/td/telegram" + "github.com/iamxvbaba/td/tg" +) + +const StartupReportVersion = 3 + +const ( + StartupOrderShuffled = "shuffled" + StartupOrderAccountIndex = "account-index" +) + +type StartupRunConfig struct { + ManifestPath string + SessionKeyPath string + RSAKeyOverride string + DatasetPath string + SeedStatePath string + ClientStatePath string + MutationStatePath string + ReportPath string + EventsPath string + ServerMetricsURL string + Profile string + StartOrder string + StartOrderSeed int64 + AccountLimit int + RampDuration time.Duration + OperationTimeout time.Duration + SampleInterval time.Duration +} + +type StartupDifferenceCounts struct { + Empty int `json:"empty"` + Full int `json:"full"` + Slice int `json:"slice"` + TooLong int `json:"too_long"` + Calls int `json:"calls"` + Events int `json:"events"` +} + +type StartupDialogsCounts struct { + PinnedCalls int `json:"pinned_calls"` + PinnedOverlap int `json:"pinned_overlap"` + Calls int `json:"calls"` + Full int `json:"full"` + Slice int `json:"slice"` + Dialogs int `json:"dialogs"` +} + +type StartupResponseBytes struct { + Inner uint64 `json:"inner"` + Wire uint64 `json:"wire"` + Delivered uint64 `json:"delivered"` +} + +type StartupDatabaseWork struct { + Queries uint64 `json:"queries"` + Errors uint64 `json:"errors"` + RPCs uint64 `json:"rpcs"` + DurationSeconds float64 `json:"duration_seconds"` +} + +type StartupRunReport struct { + Version int `json:"version"` + StartedAt time.Time `json:"started_at"` + FinishedAt time.Time `json:"finished_at"` + Profile string `json:"profile"` + StartOrder string `json:"start_order"` + StartOrderSeed int64 `json:"start_order_seed"` + DatasetSHA256 string `json:"dataset_sha256"` + ExpectedAccounts int `json:"expected_accounts"` + BusinessReady int `json:"business_ready"` + AccountDifference StartupDifferenceCounts `json:"account_difference"` + ChannelDifference StartupDifferenceCounts `json:"channel_difference"` + DialogsWorkload StartupDialogsCounts `json:"dialogs_workload"` + DialogsObserved int `json:"dialogs_observed"` + ChannelDialogs int `json:"channel_dialogs_observed"` + Operations map[string]OperationReport `json:"operations"` + ResponseBytes map[string]StartupResponseBytes `json:"response_bytes,omitempty"` + RPCDeliveryOutcomes map[string]map[string]uint64 `json:"rpc_delivery_outcomes,omitempty"` + DatabaseWork map[string]StartupDatabaseWork `json:"database_work,omitempty"` + BaselineServerMetrics map[string]float64 `json:"baseline_server_metrics,omitempty"` + FinalServerMetrics map[string]float64 `json:"final_server_metrics,omitempty"` + PeakServerMetrics map[string]float64 `json:"peak_server_metrics,omitempty"` + ServerMetricsScrapes uint64 `json:"server_metrics_scrapes"` + ServerMetricsErrors uint64 `json:"server_metrics_errors"` + EventsWritten uint64 `json:"events_written"` + EventsDropped uint64 `json:"events_dropped"` + Pass bool `json:"pass"` + Failures []string `json:"failures,omitempty"` +} + +type startupAccountResult struct { + account int + stage string + err error + accountDifference StartupDifferenceCounts + channelDifference StartupDifferenceCounts + dialogsWorkload StartupDialogsCounts + dialogs int + channelDialogs int +} + +func (c StartupRunConfig) validate() error { + if c.ManifestPath == "" || c.SessionKeyPath == "" || c.DatasetPath == "" || c.SeedStatePath == "" || c.ClientStatePath == "" || c.MutationStatePath == "" || c.ReportPath == "" { + return errors.New("startup-run requires all input artifact paths and a report path") + } + if c.AccountLimit < 0 || c.RampDuration < 0 || c.OperationTimeout <= 0 || c.SampleInterval <= 0 { + return errors.New("invalid startup-run account limit, ramp or operation timeout") + } + if _, err := resolveStartupProfile(c.Profile); err != nil { + return err + } + if c.StartOrder != StartupOrderShuffled && c.StartOrder != StartupOrderAccountIndex { + return fmt.Errorf("unknown startup order %q", c.StartOrder) + } + return nil +} + +// StartupRun restores every permanent session, catches up from the immutable +// pre-mutation cursors, performs real paginated dialogs RPCs, then converges all +// dirty channel cursors. Socket readiness alone never counts as business ready. +func StartupRun(ctx context.Context, cfg StartupRunConfig) (*StartupRunReport, error) { + if err := cfg.validate(); err != nil { + return nil, err + } + profile, _ := resolveStartupProfile(cfg.Profile) + manifest, err := LoadManifest(cfg.ManifestPath) + if err != nil { + return nil, err + } + dataset, err := LoadDataset(cfg.DatasetPath) + if err != nil { + return nil, err + } + targets, err := seedPrimaryTargets(manifest, dataset.Config.Accounts) + if err != nil { + return nil, err + } + seedState, err := LoadDatasetSeedState(cfg.SeedStatePath, dataset) + if err != nil { + return nil, err + } + clientState, err := LoadClientState(cfg.ClientStatePath) + if err != nil { + return nil, err + } + if err := clientState.Validate(dataset, seedState, targets); err != nil { + return nil, err + } + baselineSHA, err := fileSHA256(cfg.ClientStatePath) + if err != nil { + return nil, err + } + seedIdentity, err := seedIdentitySHA256(seedState) + if err != nil { + return nil, err + } + mutationPlan := planOfflineMutation(dataset) + mutationState, err := loadOrCreateOfflineMutationState(cfg.MutationStatePath, dataset, seedIdentity, baselineSHA, mutationPlan) + if err != nil { + return nil, err + } + mutationJournal := &mutationJournal{dataset: dataset, plan: mutationPlan, state: mutationState} + if err := mutationJournal.assertComplete(); err != nil { + return nil, fmt.Errorf("startup-run requires complete offline mutations: %w", err) + } + key, err := LoadSessionKey(cfg.SessionKeyPath) + if err != nil { + return nil, err + } + publicKey, err := loadManifestPublicKey(cfg.ManifestPath, manifest.Endpoint, cfg.RSAKeyOverride) + if err != nil { + return nil, err + } + accounts := dataset.Config.Accounts + if cfg.AccountLimit > 0 { + accounts = min(accounts, cfg.AccountLimit) + } + startOrderSeed := cfg.StartOrderSeed + if startOrderSeed == 0 { + startOrderSeed = dataset.Config.Seed + } + accountOrder := startupAccountOrder(accounts, cfg.StartOrder, startOrderSeed) + metrics := newMetricSet( + "lifecycle.transport_ready", "lifecycle.dialogs_ready", "lifecycle.difference_converged", "lifecycle.business_ready", + "auth.status", "updates.getState", "updates.getDifference", "updates.getDifference.empty", "updates.getDifference.full", "updates.getDifference.slice", "updates.getDifference.too_long", + "messages.getPinnedDialogs", "messages.getDialogs", "messages.getDialogs.first", "messages.getDialogs.next", "messages.getDialogs.full", "messages.getDialogs.slice", + "updates.getChannelDifference", "updates.getChannelDifference.small", "updates.getChannelDifference.boundary", "updates.getChannelDifference.too_long", "updates.getChannelDifference.empty", + ) + events, err := newEventWriter(cfg.EventsPath) + if err != nil { + return nil, err + } + defer events.close() + serverMetrics := newServerMetricsClient(cfg.ServerMetricsURL) + var baselineServerMetrics map[string]float64 + peakServerMetrics := make(map[string]float64) + if serverMetrics != nil { + if sample, scrapeErr := serverMetrics.scrape(ctx); scrapeErr == nil { + baselineServerMetrics = sample + updateMetricPeaks(peakServerMetrics, sample) + events.write(map[string]any{"type": "startup_server_baseline", "at": time.Now().UTC(), "server_metrics": sample}) + } else { + events.write(map[string]any{"type": "startup_server_baseline_error", "at": time.Now().UTC(), "class": classifyError(scrapeErr)}) + } + } + startedAt := time.Now().UTC() + results := make(chan startupAccountResult, accounts) + var wg sync.WaitGroup + for position, account := range accountOrder { + account := account + delay := startupRampDelay(cfg.RampDuration, position, accounts) + wg.Add(1) + go func() { + defer wg.Done() + if delay > 0 { + timer := time.NewTimer(delay) + select { + case <-ctx.Done(): + if !timer.Stop() { + <-timer.C + } + results <- startupAccountResult{account: account, stage: "ramp", err: ctx.Err()} + return + case <-timer.C: + } + } + results <- runStartupAccount(ctx, cfg, profile, manifest, dataset, seedState, clientState, mutationPlan, mutationState, targets, key, publicKey, metrics, account) + }() + } + go func() { + wg.Wait() + close(results) + }() + report := &StartupRunReport{ + Version: StartupReportVersion, StartedAt: startedAt, Profile: profile.Name, + StartOrder: cfg.StartOrder, StartOrderSeed: startOrderSeed, + DatasetSHA256: dataset.PlanSHA256, ExpectedAccounts: accounts, + BaselineServerMetrics: baselineServerMetrics, + } + consumeResult := func(result startupAccountResult) { + if result.err == nil { + report.BusinessReady++ + } else if len(report.Failures) < 100 { + report.Failures = append(report.Failures, fmt.Sprintf("account=%d stage=%s class=%s reason=%s", + result.account, result.stage, classifyError(result.err), classifyErrorReason(result.err))) + } + addDifferenceCounts(&report.AccountDifference, result.accountDifference) + addDifferenceCounts(&report.ChannelDifference, result.channelDifference) + addDialogsCounts(&report.DialogsWorkload, result.dialogsWorkload) + report.DialogsObserved += result.dialogs + report.ChannelDialogs += result.channelDialogs + } + var sampleTicker *time.Ticker + var sampleC <-chan time.Time + if serverMetrics != nil { + sampleTicker = time.NewTicker(cfg.SampleInterval) + sampleC = sampleTicker.C + defer sampleTicker.Stop() + } + for results != nil { + select { + case result, ok := <-results: + if !ok { + results = nil + continue + } + consumeResult(result) + case sampledAt := <-sampleC: + sample, scrapeErr := serverMetrics.scrape(ctx) + if scrapeErr != nil { + events.write(map[string]any{"type": "startup_sample_error", "at": sampledAt.UTC(), "class": classifyError(scrapeErr)}) + continue + } + updateMetricPeaks(peakServerMetrics, sample) + events.write(map[string]any{ + "type": "startup_sample", "at": sampledAt.UTC(), "business_ready": report.BusinessReady, + "expected_accounts": accounts, "operations": metrics.report(), "server_metrics": sample, + }) + } + } + report.FinishedAt = time.Now().UTC() + report.Operations = metrics.report() + if serverMetrics != nil { + baselineSubmitted := metricValue(report.BaselineServerMetrics, "telesrv_presence_last_seen_submitted_total") + sample, settleErr := serverMetrics.waitForPresenceLastSeenSettlement( + ctx, baselineSubmitted, uint64(2*report.BusinessReady), 15*time.Second, + ) + if sample != nil { + report.FinalServerMetrics = sample + updateMetricPeaks(peakServerMetrics, sample) + } + if settleErr == nil { + events.write(map[string]any{"type": "startup_server_final", "at": time.Now().UTC(), "server_metrics": sample}) + } else { + report.Failures = append(report.Failures, "presence last-seen batch did not settle before final metrics") + events.write(map[string]any{"type": "startup_server_final_error", "at": time.Now().UTC(), "class": classifyError(settleErr)}) + } + report.ServerMetricsScrapes = serverMetrics.successes() + report.ServerMetricsErrors = serverMetrics.failures() + if report.BaselineServerMetrics == nil { + report.Failures = append(report.Failures, "pre-startup server metrics baseline scrape failed") + } + if report.FinalServerMetrics == nil { + report.Failures = append(report.Failures, "final startup server metrics scrape failed") + } + } + report.PeakServerMetrics = peakServerMetrics + report.ResponseBytes = startupResponseBytes(report.BaselineServerMetrics, report.FinalServerMetrics) + report.RPCDeliveryOutcomes = startupRPCDeliveryOutcomes(report.BaselineServerMetrics, report.FinalServerMetrics) + report.DatabaseWork = startupDatabaseWork(report.BaselineServerMetrics, report.FinalServerMetrics) + report.EventsWritten, report.EventsDropped = events.counts() + methods := make([]string, 0, len(report.RPCDeliveryOutcomes)) + for method := range report.RPCDeliveryOutcomes { + methods = append(methods, method) + } + sort.Strings(methods) + for _, method := range methods { + outcomes := report.RPCDeliveryOutcomes[method] + outcomeNames := make([]string, 0, len(outcomes)) + for outcome := range outcomes { + outcomeNames = append(outcomeNames, outcome) + } + sort.Strings(outcomeNames) + for _, outcome := range outcomeNames { + count := outcomes[outcome] + if outcome != "ok" && count > 0 { + report.Failures = append(report.Failures, fmt.Sprintf("%s rpc_result delivery outcome %s: %d", method, outcome, count)) + } + } + } + methods = methods[:0] + for method := range report.DatabaseWork { + methods = append(methods, method) + } + sort.Strings(methods) + for _, method := range methods { + work := report.DatabaseWork[method] + if work.Errors > 0 { + report.Failures = append(report.Failures, fmt.Sprintf("%s database errors: %d", method, work.Errors)) + } + } + if report.BaselineServerMetrics != nil && report.FinalServerMetrics != nil { + counterDelta := func(name string) float64 { + delta := metricValue(report.FinalServerMetrics, name) - metricValue(report.BaselineServerMetrics, name) + return max(delta, 0) + } + expectedSubmitted := float64(2 * report.BusinessReady) + if submitted := counterDelta("telesrv_presence_last_seen_submitted_total"); submitted < expectedSubmitted { + report.Failures = append(report.Failures, fmt.Sprintf("presence last-seen submitted %.0f, want at least %.0f", submitted, expectedSubmitted)) + } + if pending := metricValue(report.FinalServerMetrics, "telesrv_presence_last_seen_pending"); pending != 0 { + report.Failures = append(report.Failures, fmt.Sprintf("presence last-seen pending at final scrape: %.0f", pending)) + } + bootstrapSelectors := counterDelta(`telesrv_bootstrap_ready_selectors_total{outcome="matched"}`) + + counterDelta(`telesrv_bootstrap_ready_selectors_total{outcome="miss"}`) + + counterDelta(`telesrv_bootstrap_ready_selectors_total{outcome="error"}`) + if bootstrapSelectors < float64(report.BusinessReady) { + report.Failures = append(report.Failures, fmt.Sprintf("bootstrap readiness selectors %.0f, want at least %d", bootstrapSelectors, report.BusinessReady)) + } + if pending := metricValue(report.FinalServerMetrics, "telesrv_bootstrap_ready_pending"); pending != 0 { + report.Failures = append(report.Failures, fmt.Sprintf("bootstrap readiness pending at final scrape: %.0f", pending)) + } + if failures := counterDelta(`telesrv_bootstrap_ready_selectors_total{outcome="error"}`); failures > 0 { + report.Failures = append(report.Failures, fmt.Sprintf("bootstrap readiness selector errors: %.0f", failures)) + } + if served := counterDelta(`telesrv_active_channel_ids_cache_total{outcome="served"}`); served < float64(report.BusinessReady) { + report.Failures = append(report.Failures, fmt.Sprintf("active channel IDs pages served %.0f, want at least %d", served, report.BusinessReady)) + } + if pending := metricValue(report.FinalServerMetrics, "telesrv_active_channel_ids_pending"); pending != 0 { + report.Failures = append(report.Failures, fmt.Sprintf("active channel IDs cold-loader pending at final scrape: %.0f", pending)) + } + for _, check := range []struct { + name string + label string + }{ + {name: `telesrv_active_channel_ids_batches_total{outcome="error"}`, label: "batch errors"}, + {name: `telesrv_active_channel_ids_selectors_total{outcome="error"}`, label: "selector errors"}, + {name: `telesrv_active_channel_ids_cache_total{outcome="read_error"}`, label: "Redis read errors"}, + {name: `telesrv_active_channel_ids_cache_total{outcome="write_error"}`, label: "Redis write errors"}, + } { + if delta := counterDelta(check.name); delta > 0 { + report.Failures = append(report.Failures, fmt.Sprintf("active channel IDs %s: %.0f", check.label, delta)) + } + } + for _, check := range []struct { + name string + label string + }{ + {name: `telesrv_presence_last_seen_batches_total{outcome="error"}`, label: "batch errors"}, + {name: "telesrv_presence_last_seen_overflow_total", label: "queue overflow"}, + {name: "telesrv_presence_last_seen_drain_dropped_total", label: "shutdown drain dropped"}, + } { + if delta := counterDelta(check.name); delta > 0 { + report.Failures = append(report.Failures, fmt.Sprintf("presence last-seen %s: %.0f", check.label, delta)) + } + } + } + report.Pass = report.BusinessReady == report.ExpectedAccounts && len(report.Failures) == 0 + if err := WriteStartupReport(cfg.ReportPath, report); err != nil { + return nil, err + } + return report, nil +} + +func runStartupAccount( + ctx context.Context, + cfg StartupRunConfig, + profile startupWorkloadProfile, + manifest *Manifest, + dataset *Dataset, + seedState *DatasetSeedState, + clientState *ClientState, + mutationPlan []OfflineMutationChannelPlan, + mutationState *OfflineMutationState, + targets []SessionRecord, + key [32]byte, + publicKey *rsa.PublicKey, + metrics *metricSet, + account int, +) startupAccountResult { + result := startupAccountResult{account: account} + connectStart := time.Now() + var ready atomic.Bool + var businessReady atomic.Bool + var readyOnce sync.Once + storage := &EncryptedFileStorage{Path: resolveSessionPath(cfg.ManifestPath, targets[account]), Key: key} + device := profile.device() + client, err := newClient(manifest.Endpoint, publicKey, storage, clientHooks{ + Device: &device, + ConnectionState: func(state telegram.ConnectionState) { + if state == telegram.ConnectionStateReady { + readyOnce.Do(func() { + ready.Store(true) + metrics.observe("lifecycle.transport_ready", connectStart, nil) + }) + } + }, + }) + if err != nil { + result.stage, result.err = "client", err + metrics.observe("lifecycle.transport_ready", connectStart, err) + return result + } + err = client.Run(ctx, func(ctx context.Context) error { + statusStart := time.Now() + statusCtx, cancel := context.WithTimeout(ctx, cfg.OperationTimeout) + status, err := client.Auth().Status(statusCtx) + cancel() + metrics.observe("auth.status", statusStart, err) + if err != nil { + result.stage = "auth" + return err + } + if !status.Authorized || status.User == nil || status.User.ID != targets[account].UserID { + result.stage = "auth" + return errors.New("session is not authorized as the manifest user") + } + raw := tg.NewClient(client) + accountState := clientState.Accounts[account].State + if profile.GetStateBeforeDifference { + stateStart := time.Now() + stateCtx, cancel := context.WithTimeout(ctx, cfg.OperationTimeout) + current, stateErr := raw.UpdatesGetState(stateCtx) + cancel() + metrics.observe("updates.getState", stateStart, stateErr) + if stateErr != nil { + result.stage = "state" + return stateErr + } + if current.Pts < clientState.Accounts[account].State.Pts || current.Qts < clientState.Accounts[account].State.Qts { + result.stage = "state" + return errors.New("updates.getState moved behind the persisted startup cursor") + } + accountState = clientUpdateState(*current) + } + if profile.AccountDifference { + var counts StartupDifferenceCounts + accountState, counts, err = startupAccountDifference(ctx, cfg.OperationTimeout, raw, clientState.Accounts[account], dataset, metrics) + result.accountDifference = counts + if err != nil { + result.stage = "account_difference" + return err + } + } + dialogs, dialogCounts, err := snapshotDialogsObserved(ctx, cfg.OperationTimeout, raw, profile.Dialogs, metrics.observe) + result.dialogsWorkload = dialogCounts + if err != nil { + result.stage = "dialogs" + return err + } + result.dialogs = len(dialogs) + for _, dialog := range dialogs { + if dialog.PeerType == "channel" { + result.channelDialogs++ + } + } + if err := validateStartupDialogs(dataset, seedState, mutationPlan, mutationState, targets, account, dialogs); err != nil { + result.stage = "dialogs" + return err + } + metrics.observe("lifecycle.dialogs_ready", connectStart, nil) + channelCounts, err := startupChannelDifferences(ctx, cfg.OperationTimeout, raw, dataset, seedState, clientState.Accounts[account], mutationPlan, mutationState, account, profile.ForceChannelDifference, metrics) + result.channelDifference = channelCounts + if err != nil { + result.stage = "channel_difference" + return err + } + _ = accountState // retained separately from immutable baseline for future steady polling. + metrics.observe("lifecycle.difference_converged", connectStart, nil) + metrics.observe("lifecycle.business_ready", connectStart, nil) + businessReady.Store(true) + return nil + }) + if err == nil && !businessReady.Load() { + result.stage = "connection" + err = errors.New("startup session ended before business readiness") + } + if err != nil { + result.err = err + if result.stage == "" { + result.stage = "connection" + } + debugOperationError("startup."+result.stage, err) + if !ready.Load() { + readyOnce.Do(func() { metrics.observe("lifecycle.transport_ready", connectStart, err) }) + } + } + return result +} + +func startupAccountDifference( + ctx context.Context, + timeout time.Duration, + raw *tg.Client, + baseline ClientAccountState, + dataset *Dataset, + metrics *metricSet, +) (ClientUpdateState, StartupDifferenceCounts, error) { + state := baseline.State + counts := StartupDifferenceCounts{} + markers := make(map[string]int) + finished := false + for page := 0; page < 256; page++ { + start := time.Now() + rpcCtx, cancel := context.WithTimeout(ctx, timeout) + difference, err := raw.UpdatesGetDifference(rpcCtx, &tg.UpdatesGetDifferenceRequest{Pts: state.Pts, Date: state.Date, Qts: state.Qts}) + cancel() + metrics.observe("updates.getDifference", start, err) + counts.Calls++ + if err != nil { + return state, counts, fmt.Errorf("updates.getDifference page %d: %w", page+1, err) + } + switch value := difference.(type) { + case *tg.UpdatesDifferenceEmpty: + metrics.observe("updates.getDifference.empty", start, nil) + counts.Empty++ + state.Date, state.Seq = value.Date, value.Seq + finished = true + case *tg.UpdatesDifference: + metrics.observe("updates.getDifference.full", start, nil) + counts.Full++ + counts.Events += len(value.NewMessages) + len(value.NewEncryptedMessages) + len(value.OtherUpdates) + collectAccountDifferenceMarkers(markers, value.NewMessages, value.OtherUpdates, dataset.RunID) + state = clientUpdateState(value.State) + finished = true + case *tg.UpdatesDifferenceSlice: + metrics.observe("updates.getDifference.slice", start, nil) + counts.Slice++ + counts.Events += len(value.NewMessages) + len(value.NewEncryptedMessages) + len(value.OtherUpdates) + collectAccountDifferenceMarkers(markers, value.NewMessages, value.OtherUpdates, dataset.RunID) + state = clientUpdateState(value.IntermediateState) + case *tg.UpdatesDifferenceTooLong: + metrics.observe("updates.getDifference.too_long", start, nil) + counts.TooLong++ + state.Pts = value.Pts + return state, counts, errors.New("account difference returned updates.differenceTooLong") + default: + return state, counts, fmt.Errorf("updates.getDifference returned %T", difference) + } + if finished { + break + } + if page == 255 { + return state, counts, errors.New("updates.getDifference exceeded 256 pages") + } + } + account := baseline.AccountIndex + expected := []string{ + offlinePrivateMarker(dataset, account, (account+1)%dataset.Config.Accounts), + offlinePrivateMarker(dataset, (account-1+dataset.Config.Accounts)%dataset.Config.Accounts, account), + } + if err := requireExactMarkers(markers, expected); err != nil { + return state, counts, fmt.Errorf("account private markers: %w", err) + } + // A non-slice updates.difference is final for the cursor used by this + // request. Do not require a second account-level call to be empty: binding + // the startup temp key can legitimately append a new authorization update + // after the first result. Channel differences have the stricter repeat-empty + // assertion below because their PTS is isolated from account authorization. + return state, counts, nil +} + +func clientUpdateState(state tg.UpdatesState) ClientUpdateState { + return ClientUpdateState{Pts: state.Pts, Qts: state.Qts, Date: state.Date, Seq: state.Seq, UnreadCount: state.UnreadCount} +} + +func collectAccountDifferenceMarkers(destination map[string]int, messages []tg.MessageClass, updates []tg.UpdateClass, runID string) { + prefix := "[" + runID + " offline private " + for _, message := range messages { + collectMessageMarker(destination, message, prefix) + } + for _, update := range updates { + switch value := update.(type) { + case *tg.UpdateNewMessage: + collectMessageMarker(destination, value.Message, prefix) + } + } +} + +func collectMessageMarker(destination map[string]int, message tg.MessageClass, prefix string) { + full, ok := message.(*tg.Message) + if ok && strings.HasPrefix(full.Message, prefix) { + destination[full.Message]++ + } +} + +func requireExactMarkers(observed map[string]int, expected []string) error { + wanted := make(map[string]struct{}, len(expected)) + for _, marker := range expected { + wanted[marker] = struct{}{} + if observed[marker] != 1 { + return fmt.Errorf("marker count=%d want=1", observed[marker]) + } + } + for marker, count := range observed { + if _, ok := wanted[marker]; !ok || count != 1 { + return errors.New("difference contained duplicate or wrong-account marker") + } + } + return nil +} + +func validateStartupDialogs( + dataset *Dataset, + seedState *DatasetSeedState, + mutationPlan []OfflineMutationChannelPlan, + mutationState *OfflineMutationState, + targets []SessionRecord, + account int, + dialogs []ClientDialogState, +) error { + expected := expectedDatasetPeers(dataset, seedState, targets, account) + byPeer := make(map[clientPeerKey]ClientDialogState, len(dialogs)) + for _, dialog := range dialogs { + peer := clientPeerKey{typ: dialog.PeerType, id: dialog.PeerID} + byPeer[peer] = dialog + delete(expected, peer) + } + if len(expected) != 0 { + return fmt.Errorf("current dialogs omit %d expected dataset peers", len(expected)) + } + if err := validateSeededRichDialogs(dataset, seedState, targets, account, dialogs, false); err != nil { + return fmt.Errorf("rich dialog state: %w", err) + } + offlinePeer := clientPeerKey{typ: "user", id: targets[(account+1)%dataset.Config.Accounts].UserID} + offlineDialog, ok := byPeer[offlinePeer] + if !ok || mutationState.PrivateMessageIDs[account] <= 0 || offlineDialog.TopMessage != mutationState.PrivateMessageIDs[account] { + return errors.New("current dialogs omitted the account's exact offline private top message") + } + for planPosition, channelPlan := range mutationPlan { + group := dataset.Groups[channelPlan.GroupPosition] + if !datasetGroupHasAccount(group, account) { + continue + } + channelID := seedState.Groups[channelPlan.GroupPosition].ChannelID + dialog, ok := byPeer[clientPeerKey{typ: "channel", id: channelID}] + if !ok || !dialog.HasPts || dialog.Pts < mutationState.Channels[planPosition].LatestPts { + return fmt.Errorf("dirty channel group %d dialog pts is stale", group.Index) + } + } + return nil +} + +func datasetGroupHasAccount(group DatasetGroup, account int) bool { + index := sort.SearchInts(group.MemberAccounts, account) + return index < len(group.MemberAccounts) && group.MemberAccounts[index] == account +} + +func startupChannelDifferences( + ctx context.Context, + timeout time.Duration, + raw *tg.Client, + dataset *Dataset, + seedState *DatasetSeedState, + baseline ClientAccountState, + mutationPlan []OfflineMutationChannelPlan, + mutationState *OfflineMutationState, + account int, + force bool, + metrics *metricSet, +) (StartupDifferenceCounts, error) { + counts := StartupDifferenceCounts{} + baselineChannels := make(map[int64]ClientDialogState) + for _, dialog := range baseline.Dialogs { + if dialog.PeerType == "channel" { + baselineChannels[dialog.PeerID] = dialog + } + } + for planPosition, channelPlan := range mutationPlan { + group := dataset.Groups[channelPlan.GroupPosition] + if !datasetGroupHasAccount(group, account) { + continue + } + channelIdentity := seedState.Groups[channelPlan.GroupPosition] + old, ok := baselineChannels[channelIdentity.ChannelID] + if !ok || !old.HasPts { + return counts, fmt.Errorf("group %d has no old channel cursor", group.Index) + } + channelCounts, err := catchUpStartupChannel(ctx, timeout, raw, dataset, group, channelIdentity, old.Pts, channelPlan, mutationState.Channels[planPosition], planPosition == 0, force, metrics) + addDifferenceCounts(&counts, channelCounts) + if err != nil { + return counts, fmt.Errorf("group %d: %w", group.Index, err) + } + } + return counts, nil +} + +func catchUpStartupChannel( + ctx context.Context, + timeout time.Duration, + raw *tg.Client, + dataset *Dataset, + group DatasetGroup, + identity DatasetSeedGroupState, + oldPts int, + plan OfflineMutationChannelPlan, + state OfflineMutationChannelState, + expectTooLong bool, + force bool, + metrics *metricSet, +) (StartupDifferenceCounts, error) { + counts := StartupDifferenceCounts{} + pts := oldPts + markers := make(map[string]int) + tooLongSnapshot := false + for page := 0; page < 256; page++ { + start := time.Now() + rpcCtx, cancel := context.WithTimeout(ctx, timeout) + difference, err := raw.UpdatesGetChannelDifference(rpcCtx, &tg.UpdatesGetChannelDifferenceRequest{ + Force: force, + Channel: &tg.InputChannel{ChannelID: identity.ChannelID, AccessHash: identity.AccessHash}, + Filter: &tg.ChannelMessagesFilterEmpty{}, Pts: pts, Limit: 100, + }) + cancel() + metrics.observe("updates.getChannelDifference", start, err) + counts.Calls++ + if err != nil { + return counts, err + } + switch value := difference.(type) { + case *tg.UpdatesChannelDifferenceEmpty: + counts.Empty++ + if page == 0 { + return counts, errors.New("dirty channel returned empty difference") + } + if value.Pts < pts { + return counts, errors.New("channel empty difference moved pts backwards") + } + pts = value.Pts + case *tg.UpdatesChannelDifference: + if len(value.NewMessages)+len(value.OtherUpdates) >= 100 { + metrics.observe("updates.getChannelDifference.boundary", start, nil) + } else { + metrics.observe("updates.getChannelDifference.small", start, nil) + } + counts.Full++ + counts.Events += len(value.NewMessages) + len(value.OtherUpdates) + collectChannelMarkers(markers, value.NewMessages, value.OtherUpdates, dataset.RunID) + if value.Pts <= pts { + return counts, errors.New("channel full difference did not advance pts") + } + pts = value.Pts + if !value.Final { + continue + } + case *tg.UpdatesChannelDifferenceTooLong: + metrics.observe("updates.getChannelDifference.too_long", start, nil) + counts.TooLong++ + counts.Events += len(value.Messages) + collectChannelMarkers(markers, value.Messages, nil, dataset.RunID) + dialog, ok := value.Dialog.(*tg.Dialog) + if !ok { + return counts, fmt.Errorf("channelDifferenceTooLong dialog is %T", value.Dialog) + } + current, ok := dialog.GetPts() + if !ok || current <= pts || !value.Final { + return counts, errors.New("channelDifferenceTooLong has invalid final pts") + } + pts = current + tooLongSnapshot = true + default: + return counts, fmt.Errorf("updates.getChannelDifference returned %T", difference) + } + break + } + if pts < state.LatestPts { + return counts, fmt.Errorf("channel converged pts %d below observed %d", pts, state.LatestPts) + } + if expectTooLong != tooLongSnapshot { + return counts, fmt.Errorf("tooLong=%v want=%v", tooLongSnapshot, expectTooLong) + } + if tooLongSnapshot { + latest := offlineChannelMarker(dataset, group, plan.Messages-1) + if markers[latest] != 1 { + return counts, errors.New("tooLong snapshot omitted latest mutation marker") + } + deleted := offlineChannelMarker(dataset, group, plan.Messages-2) + if markers[deleted] != 0 { + return counts, errors.New("tooLong snapshot retained deleted mutation marker") + } + } else { + expected := make([]string, 0, plan.Messages) + for message := 0; message < plan.Messages; message++ { + expected = append(expected, offlineChannelMarker(dataset, group, message)) + } + if err := requireExactMarkers(markers, expected); err != nil { + return counts, fmt.Errorf("channel markers: %w", err) + } + } + start := time.Now() + rpcCtx, cancel := context.WithTimeout(ctx, timeout) + empty, err := raw.UpdatesGetChannelDifference(rpcCtx, &tg.UpdatesGetChannelDifferenceRequest{ + Channel: &tg.InputChannel{ChannelID: identity.ChannelID, AccessHash: identity.AccessHash}, + Filter: &tg.ChannelMessagesFilterEmpty{}, Pts: pts, Limit: 100, + }) + cancel() + metrics.observe("updates.getChannelDifference.empty", start, err) + counts.Calls++ + if err != nil { + return counts, err + } + emptyDifference, ok := empty.(*tg.UpdatesChannelDifferenceEmpty) + if !ok || !emptyDifference.Final || emptyDifference.Pts != pts { + return counts, fmt.Errorf("repeat channel difference returned %T at unexpected pts", empty) + } + counts.Empty++ + return counts, nil +} + +func collectChannelMarkers(destination map[string]int, messages []tg.MessageClass, updates []tg.UpdateClass, runID string) { + prefix := "[" + runID + " offline channel " + for _, message := range messages { + collectMessageMarker(destination, message, prefix) + } + for _, update := range updates { + switch value := update.(type) { + case *tg.UpdateNewChannelMessage: + collectMessageMarker(destination, value.Message, prefix) + case *tg.UpdateEditChannelMessage: + collectMessageMarker(destination, value.Message, prefix) + } + } +} + +func startupRampDelay(ramp time.Duration, account, accounts int) time.Duration { + if ramp <= 0 || accounts <= 1 || account <= 0 { + return 0 + } + return time.Duration(int64(ramp) * int64(account) / int64(accounts-1)) +} + +func startupAccountOrder(accounts int, order string, seed int64) []int { + result := make([]int, accounts) + for account := range result { + result[account] = account + } + if order == StartupOrderShuffled { + rand.New(rand.NewSource(seed)).Shuffle(len(result), func(i, j int) { + result[i], result[j] = result[j], result[i] + }) + } + return result +} + +func addDifferenceCounts(destination *StartupDifferenceCounts, value StartupDifferenceCounts) { + destination.Empty += value.Empty + destination.Full += value.Full + destination.Slice += value.Slice + destination.TooLong += value.TooLong + destination.Calls += value.Calls + destination.Events += value.Events +} + +func addDialogsCounts(destination *StartupDialogsCounts, value StartupDialogsCounts) { + destination.PinnedCalls += value.PinnedCalls + destination.PinnedOverlap += value.PinnedOverlap + destination.Calls += value.Calls + destination.Full += value.Full + destination.Slice += value.Slice + destination.Dialogs += value.Dialogs +} + +func updateMetricPeaks(peaks, sample map[string]float64) { + for name, value := range sample { + if current, ok := peaks[name]; !ok || value > current { + peaks[name] = value + } + } +} + +func startupResponseBytes(baseline, final map[string]float64) map[string]StartupResponseBytes { + if baseline == nil || final == nil { + return nil + } + result := make(map[string]StartupResponseBytes) + families := []struct { + name string + set func(*StartupResponseBytes, uint64) + }{ + {"telesrv_mtproto_rpc_result_inner_bytes_total", func(value *StartupResponseBytes, bytes uint64) { value.Inner = bytes }}, + {"telesrv_mtproto_rpc_result_wire_bytes_total", func(value *StartupResponseBytes, bytes uint64) { value.Wire = bytes }}, + {"telesrv_mtproto_rpc_result_delivered_bytes_total", func(value *StartupResponseBytes, bytes uint64) { value.Delivered = bytes }}, + } + for _, family := range families { + prefix := family.name + "{" + for key, finalValue := range final { + if !strings.HasPrefix(key, prefix) { + continue + } + method, ok := prometheusLabelValue(key, "method") + if !ok || method == "" { + continue + } + if family.name == "telesrv_mtproto_rpc_result_delivered_bytes_total" { + outcome, ok := prometheusLabelValue(key, "outcome") + if !ok || outcome != "ok" { + continue + } + } + delta := finalValue - baseline[key] + if delta < 0 { + delta = 0 + } + value := result[method] + family.set(&value, uint64(delta)) + result[method] = value + } + } + return result +} + +func startupDatabaseWork(baseline, final map[string]float64) map[string]StartupDatabaseWork { + if baseline == nil || final == nil { + return nil + } + result := make(map[string]StartupDatabaseWork) + for key, finalValue := range final { + method, ok := prometheusLabelValue(key, "method") + if !ok || method == "" { + continue + } + delta := finalValue - baseline[key] + if delta < 0 { + delta = 0 + } + value := result[method] + switch { + case strings.HasPrefix(key, "telesrv_rpc_db_queries_total{"): + value.Queries = uint64(delta) + case strings.HasPrefix(key, "telesrv_rpc_db_errors_total{"): + value.Errors = uint64(delta) + case strings.HasPrefix(key, "telesrv_rpc_db_time_seconds_count{"): + value.RPCs = uint64(delta) + case strings.HasPrefix(key, "telesrv_rpc_db_time_seconds_sum{"): + value.DurationSeconds = delta + default: + continue + } + result[method] = value + } + return result +} + +func startupRPCDeliveryOutcomes(baseline, final map[string]float64) map[string]map[string]uint64 { + if baseline == nil || final == nil { + return nil + } + const prefix = "telesrv_mtproto_rpc_result_delivered_total{" + result := make(map[string]map[string]uint64) + for key, finalValue := range final { + if !strings.HasPrefix(key, prefix) { + continue + } + method, methodOK := prometheusLabelValue(key, "method") + outcome, outcomeOK := prometheusLabelValue(key, "outcome") + if !methodOK || !outcomeOK || method == "" || outcome == "" { + continue + } + delta := finalValue - baseline[key] + if delta < 0 { + delta = 0 + } + if result[method] == nil { + result[method] = make(map[string]uint64) + } + result[method][outcome] = uint64(delta) + } + return result +} + +func WriteStartupReport(path string, report *StartupRunReport) error { + if report == nil || report.Version != StartupReportVersion { + return errors.New("invalid startup report") + } + data, err := json.MarshalIndent(report, "", " ") + if err != nil { + return err + } + return writeFileAtomic(path, append(data, '\n'), 0o600) +} diff --git a/internal/loadharness/startup_profile.go b/internal/loadharness/startup_profile.go new file mode 100644 index 00000000..6474859e --- /dev/null +++ b/internal/loadharness/startup_profile.go @@ -0,0 +1,67 @@ +package loadharness + +import ( + "fmt" + "strings" + "time" + + "github.com/iamxvbaba/td/telegram" +) + +const ( + StartupProfileTDesktopReturningV1 = "tdesktop-cold-returning-v1" + StartupProfileTDLibReturningV1 = "tdlib-returning-v1" +) + +type dialogPaginationProfile struct { + FirstLimit int + SubsequentLimit int +} + +type startupWorkloadProfile struct { + Name string + GetStateBeforeDifference bool + AccountDifference bool + Dialogs dialogPaginationProfile + ForceChannelDifference bool +} + +func resolveStartupProfile(name string) (startupWorkloadProfile, error) { + switch strings.TrimSpace(name) { + case "", StartupProfileTDesktopReturningV1: + return startupWorkloadProfile{ + Name: StartupProfileTDesktopReturningV1, GetStateBeforeDifference: true, + Dialogs: dialogPaginationProfile{FirstLimit: 20, SubsequentLimit: 500}, + ForceChannelDifference: true, + }, nil + case StartupProfileTDLibReturningV1: + return startupWorkloadProfile{ + Name: StartupProfileTDLibReturningV1, + AccountDifference: true, + Dialogs: dialogPaginationProfile{FirstLimit: 100, SubsequentLimit: 100}, + ForceChannelDifference: true, + }, nil + default: + return startupWorkloadProfile{}, fmt.Errorf("unknown startup profile %q", name) + } +} + +func (p dialogPaginationProfile) limit(page int) int { + if page == 0 { + return p.FirstLimit + } + return p.SubsequentLimit +} + +func (p startupWorkloadProfile) device() telegram.DeviceConfig { + if p.Name == StartupProfileTDLibReturningV1 { + return telegram.DeviceConfig{ + DeviceModel: "telesrv-flutter TDLib", SystemVersion: "Android SDK 36", AppVersion: "load-profile-v1", + SystemLangCode: "en-US", LangPack: "android", LangCode: "en", + Params: telegram.TimezoneParams(time.Local), + } + } + return telegram.DeviceTDesktopWindows() +} + +var snapshotPaginationProfile = dialogPaginationProfile{FirstLimit: 100, SubsequentLimit: 100} diff --git a/internal/loadharness/startup_test.go b/internal/loadharness/startup_test.go new file mode 100644 index 00000000..4e3c6c43 --- /dev/null +++ b/internal/loadharness/startup_test.go @@ -0,0 +1,197 @@ +package loadharness + +import ( + "os" + "path/filepath" + "slices" + "testing" + "time" + + "github.com/iamxvbaba/td/tg" +) + +func TestStartupRampDelay(t *testing.T) { + ramp := 30 * time.Second + if got := startupRampDelay(ramp, 0, 4); got != 0 { + t.Fatalf("first delay = %s", got) + } + if got := startupRampDelay(ramp, 1, 4); got != 10*time.Second { + t.Fatalf("second delay = %s", got) + } + if got := startupRampDelay(ramp, 3, 4); got != ramp { + t.Fatalf("last delay = %s", got) + } +} + +func TestStartupAccountOrder(t *testing.T) { + sequential := startupAccountOrder(6, StartupOrderAccountIndex, 7) + if !slices.Equal(sequential, []int{0, 1, 2, 3, 4, 5}) { + t.Fatalf("sequential order = %v", sequential) + } + first := startupAccountOrder(100, StartupOrderShuffled, 20260827) + second := startupAccountOrder(100, StartupOrderShuffled, 20260827) + if !slices.Equal(first, second) { + t.Fatal("shuffled startup order is not deterministic") + } + if slices.Equal(first, startupAccountOrder(100, StartupOrderShuffled, 20260828)) { + t.Fatal("different shuffled seeds produced identical order") + } + seen := make(map[int]bool, len(first)) + for _, account := range first { + if account < 0 || account >= len(first) || seen[account] { + t.Fatalf("invalid shuffled account %d in %v", account, first) + } + seen[account] = true + } +} + +func TestResolveStartupProfiles(t *testing.T) { + tdesktop, err := resolveStartupProfile(StartupProfileTDesktopReturningV1) + if err != nil { + t.Fatal(err) + } + if !tdesktop.GetStateBeforeDifference || tdesktop.AccountDifference || tdesktop.Dialogs.limit(0) != 20 || tdesktop.Dialogs.limit(1) != 500 || !tdesktop.ForceChannelDifference { + t.Fatalf("tdesktop profile = %+v", tdesktop) + } + tdlib, err := resolveStartupProfile(StartupProfileTDLibReturningV1) + if err != nil { + t.Fatal(err) + } + if tdlib.GetStateBeforeDifference || !tdlib.AccountDifference || tdlib.Dialogs.limit(0) != 100 || tdlib.Dialogs.limit(1) != 100 { + t.Fatalf("tdlib profile = %+v", tdlib) + } + if device := tdlib.device(); device.LangPack != "android" || device.SystemVersion != "Android SDK 36" { + t.Fatalf("tdlib device = %+v", device) + } + if _, err := resolveStartupProfile("unknown"); err == nil { + t.Fatal("unknown startup profile passed validation") + } +} + +func TestRequireExactMarkers(t *testing.T) { + if err := requireExactMarkers(map[string]int{"a": 1, "b": 1}, []string{"a", "b"}); err != nil { + t.Fatal(err) + } + if err := requireExactMarkers(map[string]int{"a": 2, "b": 1}, []string{"a", "b"}); err == nil { + t.Fatal("duplicate marker passed validation") + } + if err := requireExactMarkers(map[string]int{"a": 1, "b": 1, "wrong": 1}, []string{"a", "b"}); err == nil { + t.Fatal("wrong-account marker passed validation") + } +} + +func TestCollectChannelMarkersIncludesEdits(t *testing.T) { + runID := "run" + markers := make(map[string]int) + collectChannelMarkers(markers, + []tg.MessageClass{&tg.Message{Message: "[run offline channel 0000 message 0001]"}}, + []tg.UpdateClass{&tg.UpdateEditChannelMessage{Message: &tg.Message{Message: "[run offline channel 0000 message 0001] edited"}}}, + runID, + ) + if markers["[run offline channel 0000 message 0001]"] != 1 || markers["[run offline channel 0000 message 0001] edited"] != 1 { + t.Fatalf("collected markers = %v", markers) + } +} + +func TestValidateStartupDialogsRequiresCurrentDirtyChannelPts(t *testing.T) { + dataset, seedState, targets := snapshotFixture(t) + plan := planOfflineMutation(dataset) + mutation := &OfflineMutationState{ + PrivateMessageIDs: []int{1, 1, 1, 1}, + Channels: []OfflineMutationChannelState{{LatestPts: 50}}, + } + expected := expectedDatasetPeers(dataset, seedState, targets, 0) + dialogs := make([]ClientDialogState, 0, len(expected)) + for peer := range expected { + dialog := ClientDialogState{PeerType: peer.typ, PeerID: peer.id, AccessHash: 1, TopMessage: 1, TopMessageDate: 1} + if peer.typ == "channel" { + dialog.HasPts, dialog.Pts = true, 50 + } + dialogs = append(dialogs, dialog) + } + if err := validateStartupDialogs(dataset, seedState, plan, mutation, targets, 0, dialogs); err != nil { + t.Fatal(err) + } + for i := range dialogs { + if dialogs[i].PeerType == "channel" { + dialogs[i].Pts = 49 + } + } + if err := validateStartupDialogs(dataset, seedState, plan, mutation, targets, 0, dialogs); err == nil { + t.Fatal("stale current channel pts passed validation") + } +} + +func TestWriteStartupReportOwnerOnly(t *testing.T) { + path := filepath.Join(t.TempDir(), "startup-report.json") + report := &StartupRunReport{Version: StartupReportVersion, DatasetSHA256: "plan", ExpectedAccounts: 1, BusinessReady: 1, Pass: true} + if err := WriteStartupReport(path, report); err != nil { + t.Fatal(err) + } + info, err := os.Stat(path) + if err != nil { + t.Fatal(err) + } + if info.Mode().Perm() != 0o600 { + t.Fatalf("startup report mode = %o, want 600", info.Mode().Perm()) + } +} + +func TestStartupResponseBytesUsesPerMethodCounterDeltas(t *testing.T) { + baseline := map[string]float64{ + `telesrv_mtproto_rpc_result_inner_bytes_total{method="messages.getDialogs"}`: 100, + `telesrv_mtproto_rpc_result_wire_bytes_total{method="messages.getDialogs"}`: 50, + } + final := map[string]float64{ + `telesrv_mtproto_rpc_result_inner_bytes_total{method="messages.getDialogs"}`: 900, + `telesrv_mtproto_rpc_result_wire_bytes_total{method="messages.getDialogs"}`: 250, + `telesrv_mtproto_rpc_result_delivered_bytes_total{method="messages.getDialogs",outcome="ok"}`: 200, + `telesrv_mtproto_rpc_result_delivered_bytes_total{method="messages.getDialogs",outcome="edge_overload"}`: 40, + } + bytes := startupResponseBytes(baseline, final)["messages.getDialogs"] + if bytes.Inner != 800 || bytes.Wire != 200 || bytes.Delivered != 200 { + t.Fatalf("response bytes = %+v", bytes) + } +} + +func TestStartupDatabaseWorkUsesPerMethodCounterDeltas(t *testing.T) { + baseline := map[string]float64{ + `telesrv_rpc_db_queries_total{method="messages.getDialogs"}`: 10, + `telesrv_rpc_db_time_seconds_sum{method="messages.getDialogs"}`: 0.5, + `telesrv_rpc_db_time_seconds_count{method="messages.getDialogs"}`: 1, + `telesrv_rpc_db_errors_total{method="messages.getDialogs"}`: 1, + } + final := map[string]float64{ + `telesrv_rpc_db_queries_total{method="messages.getDialogs"}`: 210, + `telesrv_rpc_db_time_seconds_sum{method="messages.getDialogs"}`: 2.75, + `telesrv_rpc_db_time_seconds_count{method="messages.getDialogs"}`: 11, + `telesrv_rpc_db_errors_total{method="messages.getDialogs"}`: 1, + } + work := startupDatabaseWork(baseline, final)["messages.getDialogs"] + if work.Queries != 200 || work.RPCs != 10 || work.Errors != 0 || work.DurationSeconds != 2.25 { + t.Fatalf("database work = %+v", work) + } +} + +func TestStartupRPCDeliveryOutcomesUsesBoundedMethodAndOutcomeDeltas(t *testing.T) { + baseline := map[string]float64{ + `telesrv_mtproto_rpc_result_delivered_total{method="users.getUsers",outcome="ok"}`: 5, + } + final := map[string]float64{ + `telesrv_mtproto_rpc_result_delivered_total{method="users.getUsers",outcome="ok"}`: 12, + `telesrv_mtproto_rpc_result_delivered_total{method="users.getUsers",outcome="edge_overload"}`: 3, + } + outcomes := startupRPCDeliveryOutcomes(baseline, final) + if outcomes["users.getUsers"]["ok"] != 7 || outcomes["users.getUsers"]["edge_overload"] != 3 { + t.Fatalf("delivery outcomes = %#v", outcomes) + } +} + +func TestUpdateMetricPeaks(t *testing.T) { + peaks := map[string]float64{"heap": 10} + updateMetricPeaks(peaks, map[string]float64{"heap": 9, "connections": 5}) + updateMetricPeaks(peaks, map[string]float64{"heap": 12, "connections": 2}) + if peaks["heap"] != 12 || peaks["connections"] != 5 { + t.Fatalf("peaks = %v", peaks) + } +} diff --git a/internal/loadtest/send_load_test.go b/internal/loadtest/send_load_test.go index d909fa40..16f26f40 100644 --- a/internal/loadtest/send_load_test.go +++ b/internal/loadtest/send_load_test.go @@ -14,11 +14,13 @@ import ( "testing" "time" + "github.com/iamxvbaba/td/clock" "github.com/jackc/pgx/v5/pgxpool" "github.com/redis/go-redis/v9" "go.uber.org/zap" messageapp "telesrv/internal/app/messages" + appusers "telesrv/internal/app/users" "telesrv/internal/domain" "telesrv/internal/mtprotoedge" "telesrv/internal/rpc" @@ -104,11 +106,15 @@ func TestMessageSendBaseline(t *testing.T) { // 让 outbox 走完整 claim→ListAfter→MarkDelivered 的 PG 往返，测排空而非网络 fanout。 binder := mtprotoedge.NewSessionManager(zap.NewNop()) metrics := &loadMetrics{} + projectionRouter := rpc.New(rpc.Config{}, rpc.Deps{ + Users: appusers.NewService(userStore), + }, zap.NewNop(), clock.System) dispatcher := rpc.NewOutboxDispatcher(updateEventStore, dispatchOutboxStore, binder, zap.NewNop(), rpc.WithOutboxWorkers(workers), rpc.WithOutboxBatch(outboxBatch), rpc.WithOutboxInterval(outboxInterval), rpc.WithOutboxMetrics(metrics), + rpc.WithOutboxUpdateBuilder(projectionRouter.BuildOutboxUpdates), ) dispCtx, stopDispatcher := context.WithCancel(ctx) dispDone := make(chan struct{}) @@ -317,11 +323,16 @@ type loadMetrics struct { failed atomic.Int64 } -func (m *loadMetrics) MessageSend(time.Duration, bool, error) {} -func (m *loadMetrics) MessageRateLimited(int) {} -func (m *loadMetrics) OutboxClaimed(n int) { m.claimed.Add(int64(n)) } -func (m *loadMetrics) OutboxDelivered(time.Duration) { m.delivered.Add(1) } -func (m *loadMetrics) OutboxFailed(error) { m.failed.Add(1) } +func (m *loadMetrics) MessageSend(time.Duration, bool, error) {} +func (m *loadMetrics) MessageRateLimited(int) {} +func (m *loadMetrics) OutboxClaimed(n int) { m.claimed.Add(int64(n)) } +func (m *loadMetrics) OutboxDelivered(time.Duration) { m.delivered.Add(1) } +func (m *loadMetrics) OutboxFailed(error) { m.failed.Add(1) } +func (m *loadMetrics) PresenceLastSeenBatch(int, time.Duration, error) {} +func (m *loadMetrics) PresenceLastSeenSubmitted() {} +func (m *loadMetrics) PresenceLastSeenPending(int) {} +func (m *loadMetrics) PresenceLastSeenOverflow() {} +func (m *loadMetrics) PresenceLastSeenDrainDropped(int) {} func seedUsers(t *testing.T, ctx context.Context, store *postgres.UserStore, n int) []int64 { t.Helper() diff --git a/internal/mtprotoedge/admission_test.go b/internal/mtprotoedge/admission_test.go index 7dd96545..99cdaa7a 100644 --- a/internal/mtprotoedge/admission_test.go +++ b/internal/mtprotoedge/admission_test.go @@ -272,7 +272,8 @@ func TestServeMixedStopsAllComponentsWhenOneReturnsCleanly(t *testing.T) { type countingAuthKeyStore struct { store.AuthKeyStore - gets atomic.Int32 + gets atomic.Int32 + revalidates atomic.Int32 } func (s *countingAuthKeyStore) Get(ctx context.Context, id [8]byte) (store.AuthKeyData, bool, error) { @@ -280,6 +281,11 @@ func (s *countingAuthKeyStore) Get(ctx context.Context, id [8]byte) (store.AuthK return s.AuthKeyStore.Get(ctx, id) } +func (s *countingAuthKeyStore) Revalidate(ctx context.Context, id [8]byte) (store.AuthKeyData, bool, error) { + s.revalidates.Add(1) + return s.AuthKeyStore.Revalidate(ctx, id) +} + func TestUnknownAuthKeyRespondsOnceThenCloses(t *testing.T) { keys := &countingAuthKeyStore{AuthKeyStore: memory.NewAuthKeyStore()} addr, _, _ := startTestServer(t, Options{AuthKeys: keys}) diff --git a/internal/mtprotoedge/bot_callback_e2e_test.go b/internal/mtprotoedge/bot_callback_e2e_test.go index dcd34342..5af74790 100644 --- a/internal/mtprotoedge/bot_callback_e2e_test.go +++ b/internal/mtprotoedge/bot_callback_e2e_test.go @@ -230,9 +230,9 @@ func TestBotInlineKeyboardCallbackFlow(t *testing.T) { return fmt.Errorf("bot getUsers(owner) = %d, want 1", len(got)) } ownerSeen := got[0].(*tg.User) - markup := &tg.ReplyInlineMarkup{Rows: []tg.KeyboardButtonRow{{Buttons: []tg.KeyboardButtonClass{ - &tg.KeyboardButtonCallback{Text: "Press", Data: callbackData}, - &tg.KeyboardButtonURL{Text: "Site", URL: "https://example.com/x"}, + markup := &tg.ReplyInlineMarkup{Rows: []tg.KeyboardInlineButtonRow{{Buttons: []tg.KeyboardInlineButton{ + {Text: "Press", Type: &tg.InlineButtonTypeCallback{Data: callbackData}}, + {Text: "Site", Type: &tg.InlineButtonTypeURL{URL: "https://example.com/x"}}, }}}} req := &tg.MessagesSendMessageRequest{ Peer: &tg.InputPeerUser{UserID: ownerSeen.ID, AccessHash: ownerSeen.AccessHash}, @@ -312,14 +312,14 @@ func TestBotInlineKeyboardCallbackFlow(t *testing.T) { if !ok || len(inline.Rows) != 1 || len(inline.Rows[0].Buttons) != 2 { t.Fatalf("unexpected markup shape: %#v", rm) } - cbBtn, ok := inline.Rows[0].Buttons[0].(*tg.KeyboardButtonCallback) + cbBtn, ok := inline.Rows[0].Buttons[0].Type.(*tg.InlineButtonTypeCallback) if !ok { t.Fatalf("first button not callback: %#v", inline.Rows[0].Buttons[0]) } if string(cbBtn.Data) != string(callbackData) { t.Fatalf("callback data round-trip mismatch: got %v want %v", cbBtn.Data, callbackData) } - if _, ok := inline.Rows[0].Buttons[1].(*tg.KeyboardButtonURL); !ok { + if _, ok := inline.Rows[0].Buttons[1].Type.(*tg.InlineButtonTypeURL); !ok { t.Fatalf("second button not url: %#v", inline.Rows[0].Buttons[1]) } msgID = msg.ID diff --git a/internal/mtprotoedge/conn.go b/internal/mtprotoedge/conn.go index 56087b39..5f77ce5f 100644 --- a/internal/mtprotoedge/conn.go +++ b/internal/mtprotoedge/conn.go @@ -118,10 +118,13 @@ type Conn struct { transportClose sync.Once rpcScheduler *inboundRPCScheduler - rpcCancel context.CancelFunc - rpcClose sync.Once - rpcMu sync.Mutex - rpcWG sync.WaitGroup + // rpcDeliveryHooks belongs to the owning Server. Directly constructed test + // Conns leave it nil and use the package test fallback. + rpcDeliveryHooks *rpcDeliveryHookExecutor + rpcCancel context.CancelFunc + rpcClose sync.Once + rpcMu sync.Mutex + rpcWG sync.WaitGroup // rpcReservationWG 跟踪 Copy 前预算到 commit/abort 的短窗口，使 Close 返回时 // 全局/单连接预算都已归还或转交给明确的 queued/running task。 rpcReservationWG sync.WaitGroup @@ -177,6 +180,17 @@ type Conn struct { // 同步失败时保持 false，让置位短路放行、下一条 RPC 重试同步，避免 // 「已置位但 channel 路由缺失」的 session 静默漏收超级群推送。 membershipsSynced atomic.Bool + // updatesActivationToken/At are protected by SessionManager.mu. They make + // readiness activation single-flight per physical connection generation; + // an old delivery callback can only release the exact token it acquired. + updatesActivationToken uint64 + updatesActivationAt time.Time + // bootstrapProbeToken/bootstrapProbed are protected by SessionManager.mu. + // A delivered updates baseline performs the durable bootstrap-job probe once + // per physical connection generation. A failed callback releases the token; + // a replacement Conn starts with a fresh zero value and probes again. + bootstrapProbeToken uint64 + bootstrapProbed bool // membershipGen 是本连接 channel membership 索引的修订号：任何增量修订 // （join/leave/kick 的 Add/Remove、身份切换/下线的整体清除）都递增。全量同步方 // 在读取持久成员列表前采样、落地时带回比对，检测「读取窗口内发生增量修订」的 diff --git a/internal/mtprotoedge/encrypted.go b/internal/mtprotoedge/encrypted.go index 1730c338..e6fe67a9 100644 --- a/internal/mtprotoedge/encrypted.go +++ b/internal/mtprotoedge/encrypted.go @@ -237,9 +237,11 @@ func (s *Server) handleEncrypted(ctx context.Context, tc transport.Conn, cs *con // BeginActivation has installed current in claimsByAuth, which is the shared // linearization domain with auth-key revocation. A delete that completed before // the claim is visible here as !found; a delete after this read must observe and - // fence the claim. This final check intentionally covers every activation path: + // fence the claim. Revalidate deliberately does not refresh last_used_at: the + // physical connection's initial Get already established the activity lease. This + // final check intentionally covers every activation path: // first correct-salt frame, retained bad-salt provisional and session transfer. - fresh, found, getErr := s.authKeys.Get(ctx, current.authKeyID) + fresh, found, getErr := s.authKeys.Revalidate(ctx, current.authKeyID) if getErr != nil { return current, fmt.Errorf("revalidate activation auth key: %w", getErr) } @@ -784,6 +786,10 @@ func (s *Server) handleRPC(ctx context.Context, c *Conn, msgID int64, method str } dur := s.clock.Now().Sub(start) s.metrics.RPCHandled(effectiveMethod, dur, dispatchErr) + dbSnapshot := dbStats.Snapshot() + if databaseMetrics, ok := s.metrics.(RPCDatabaseMetrics); ok { + databaseMetrics.RPCDatabase(effectiveMethod, dbSnapshot.Queries, dbSnapshot.Duration, dbSnapshot.Errors) + } // 刷新本连接由 invokeWithLayer 证明并冻结的 exact-session layer。ok=false // 表示仍无协议证据；设备/授权元数据和其它 session 都不具备回填资格。 if layer, ok := s.rpc.NegotiatedLayer(c.authKeyID, c.sessionID); ok { @@ -807,7 +813,7 @@ func (s *Server) handleRPC(ctx context.Context, c *Conn, msgID int64, method str if userID := c.UserID(); userID != 0 { fields = append(fields, zap.Int64("user_id", userID)) } - fields = dbtrace.AppendZapFields(fields, "", dbStats.Snapshot()) + fields = dbtrace.AppendZapFields(fields, "", dbSnapshot) if ctxErr := ctx.Err(); ctxErr != nil { // A running request owns its terminal response until Dispatch returns. If @@ -855,7 +861,7 @@ func (s *Server) handleRPC(ctx context.Context, c *Conn, msgID int64, method str }, nil) } - s.log.Info("RPC handled", fields...) + s.log.Debug("RPC handled", fields...) return s.publishRPCResult(c, msgID, effectiveMethod, owner, result, postresponse.Take(ctx)) } @@ -973,18 +979,11 @@ func (s *Server) publishRPCResult( // Until enqueue transfers ownership, every exit must return the retained-byte // charge. A successful transfer clears the reservation and makes this a no-op. defer reserved.release() - priority, visible := prepareEncoded(encoded) + priority, _ := prepareEncoded(encoded) if owner != nil && !owner.HandOff() { return ErrRPCResultFlightInvalid } - resultLogLevel := zap.DebugLevel - if visible { - // Keep ordinary small RPCs at debug, but make convergence and bulk/gzip - // delivery visible in the default service logs. These are the - // responses whose queueing and write latency diagnose startup Updating. - resultLogLevel = zap.InfoLevel - } egressStarted := time.Now() terminal := func(deliveryErr error) { latency := time.Since(egressStarted) @@ -996,7 +995,7 @@ func (s *Server) publishRPCResult( encoded.markReplayable() c.fenceUndeliveredRPCResult() s.completeRPCResult(c, reqMsgID, encoded, true) - if checked := s.log.Check(resultLogLevel, "RPC result delivery fenced for replay"); checked != nil { + if checked := s.log.Check(zap.InfoLevel, "RPC result delivery fenced for replay"); checked != nil { checked.Write( zap.String("method", method), zap.Int64("req_msg_id", reqMsgID), zap.Int64("delivered_req_msg_id", deliveredReqMsgID), @@ -1008,7 +1007,7 @@ func (s *Server) publishRPCResult( } encoded.markDelivered() s.completeRPCResult(c, reqMsgID, encoded, true) - if checked := s.log.Check(resultLogLevel, "RPC result delivered"); checked != nil { + if checked := s.log.Check(zap.DebugLevel, "RPC result delivered"); checked != nil { checked.Write( zap.String("method", method), zap.Int64("req_msg_id", reqMsgID), zap.Int64("delivered_req_msg_id", deliveredReqMsgID), @@ -1024,7 +1023,7 @@ func (s *Server) publishRPCResult( terminal(err) return err } - if checked := s.log.Check(resultLogLevel, "RPC result admitted"); checked != nil { + if checked := s.log.Check(zap.DebugLevel, "RPC result admitted"); checked != nil { checked.Write( zap.String("method", method), zap.Int64("req_msg_id", reqMsgID), zap.Int("wire_bytes", len(encoded.body)), zap.Int("inner_bytes", encoded.uncompressedBytes), @@ -1365,7 +1364,12 @@ func (s *Server) completeRPCResult(c *Conn, reqMsgID int64, encoded *encodedOutb // sendPong 回复 mt.PingRequest / mt.PingDelayDisconnectRequest。 func (s *Server) sendPong(ctx context.Context, c *Conn, reqMsgID, pingID int64) error { - return c.SendAsync(ctx, proto.MessageServerResponse, &mt.Pong{MsgID: reqMsgID, PingID: pingID}) + // Telegram iOS keeps the account in its connection-context "updating" state + // until the initial actualization ping receives its matching pong. A pong is + // therefore a request-correlated transport barrier, not disposable keepalive + // noise: if it cannot be written, reconnect instead of silently stranding the + // client on an otherwise healthy session. + return c.SendRequiredControl(ctx, proto.MessageServerResponse, &mt.Pong{MsgID: reqMsgID, PingID: pingID}) } // sendFutureSalts 回复 MTProto get_future_salts。 @@ -1388,7 +1392,10 @@ func (s *Server) sendFutureSalts(ctx context.Context, c *Conn, reqMsgID int64, n Salt: c.salt, }) } - return c.SendAsync(ctx, proto.MessageServerResponse, &mt.FutureSalts{ + // future_salts completes the client's time/salt synchronization task. If it + // cannot be written, fail the connection so the client reconnects instead of + // remaining connected in a permanent service-task state. + return c.SendRequiredControl(ctx, proto.MessageServerResponse, &mt.FutureSalts{ ReqMsgID: reqMsgID, Now: now, Salts: salts, @@ -1401,7 +1408,7 @@ func (s *Server) sendFutureSalts(ctx context.Context, c *Conn, reqMsgID int64, n // （Android 收到后才调 getDifference）随之丢失。 func (s *Server) sendNewSessionCreated(ctx context.Context, c *Conn, firstMsgID int64) error { // This notification changes the client's request map and update recovery - // state. Unlike best-effort ack/pong traffic, it must be written successfully + // state. Unlike best-effort ack traffic, it must be written successfully // before the corresponding RPC batch starts executing. return c.SendRequiredControl(ctx, proto.MessageFromServer, &mt.NewSessionCreated{ FirstMsgID: firstMsgID, @@ -1425,7 +1432,9 @@ func (s *Server) sendAck(ctx context.Context, c *Conn, ids ...int64) error { // sendMsgsStateInfo 回复 msgs_state_req/msg_resend_req。 func (s *Server) sendMsgsStateInfo(ctx context.Context, c *Conn, reqMsgID int64, info []byte) error { - return c.SendAsync(ctx, proto.MessageServerResponse, &mt.MsgsStateInfo{ReqMsgID: reqMsgID, Info: info}) + // msgs_state_info terminates the client's resend service. Do not acknowledge + // the request locally and then silently discard its answer from a full queue. + return c.SendRequiredControl(ctx, proto.MessageServerResponse, &mt.MsgsStateInfo{ReqMsgID: reqMsgID, Info: info}) } func (s *Server) sendDestroySession(ctx context.Context, c *Conn, sessionID int64) error { diff --git a/internal/mtprotoedge/exchange.go b/internal/mtprotoedge/exchange.go index 2643cdbc..e4abdf95 100644 --- a/internal/mtprotoedge/exchange.go +++ b/internal/mtprotoedge/exchange.go @@ -88,7 +88,10 @@ func (s *Server) handleExchange(ctx context.Context, conn transport.Conn, first } s.metrics.HandshakeDone(s.clock.Now().Sub(start)) - s.log.Info("Key exchange completed", + // Successful handshakes are already covered by the bounded latency metric. + // One INFO write per PFS connection turns a 10,000-account login burst into + // synchronous logger and filesystem pressure. + s.log.Debug("Key exchange completed", zap.Int64("auth_key_id", res.Key.IntID()), zap.Int64("server_salt", res.ServerSalt), zap.Duration("dur", s.clock.Now().Sub(start)), diff --git a/internal/mtprotoedge/exchange_test.go b/internal/mtprotoedge/exchange_test.go index 2f2d9a09..904475d9 100644 --- a/internal/mtprotoedge/exchange_test.go +++ b/internal/mtprotoedge/exchange_test.go @@ -13,7 +13,9 @@ import ( "testing" "time" + "go.uber.org/zap" "go.uber.org/zap/zaptest" + "go.uber.org/zap/zaptest/observer" "github.com/gotd/log/logzap" "github.com/iamxvbaba/td/bin" @@ -43,8 +45,9 @@ func TestKeyExchange(t *testing.T) { } keys := memory.NewAuthKeyStore() + logCore, observedLogs := observer.New(zap.DebugLevel) srv := New(Options{ - Logger: zaptest.NewLogger(t), + Logger: zap.New(logCore), DC: dc, RSAKey: rsaKey, AuthKeys: keys, @@ -98,6 +101,10 @@ func TestKeyExchange(t *testing.T) { if saved.ServerSalt != res.ServerSalt { t.Fatalf("server salt mismatch: server=%d client=%d", saved.ServerSalt, res.ServerSalt) } + completed := observedLogs.FilterMessage("Key exchange completed").All() + if len(completed) != 1 || completed[0].Level != zap.DebugLevel { + t.Fatalf("successful key exchange logs = %+v, want one Debug entry", completed) + } cancel() select { diff --git a/internal/mtprotoedge/inbound_layer_rpc_test.go b/internal/mtprotoedge/inbound_layer_rpc_test.go index 6b2f0e03..2209d5c9 100644 --- a/internal/mtprotoedge/inbound_layer_rpc_test.go +++ b/internal/mtprotoedge/inbound_layer_rpc_test.go @@ -449,7 +449,7 @@ func TestNestedExplicitLayerAdmissionErrorsAreNotDefaultFailures(t *testing.T) { unsupported := exactLayerRPCBody(t, &tg.InvokeAfterMsgRequest{ MsgID: 1, Query: &tg.InvokeWithLayerRequest{ - Layer: 229, + Layer: 230, Query: &tg.HelpGetConfigRequest{}, }, }) @@ -494,7 +494,7 @@ func TestNestedExplicitLayerAdmissionErrorsAreNotDefaultFailures(t *testing.T) { } switch test.name { case "unsupported": - if !strings.Contains(err.Error(), "unsupported exact profile 229") { + if !strings.Contains(err.Error(), "unsupported exact profile 230") { t.Fatalf("unsupported selector error = %v", err) } case "conflict": @@ -766,7 +766,7 @@ func TestFutureExactLayerWatermarkAllowsOnlyNewerSupportedSelfHeal(t *testing.T) s := New(Options{DC: 2, LayerRPC: handler}) authKeyID := [8]byte{0x31, 0x04} const sessionID = int64(3104) - if _, err := handler.FreezeNegotiatedSessionLayerAt(authKeyID, sessionID, 229, 100); err != nil { + if _, err := handler.FreezeNegotiatedSessionLayerAt(authKeyID, sessionID, 230, 100); err != nil { t.Fatal(err) } c := &Conn{authKeyID: authKeyID, sessionID: sessionID, metrics: NopMetrics{}} @@ -795,7 +795,7 @@ func TestFutureExactLayerWatermarkAllowsOnlyNewerSupportedSelfHeal(t *testing.T) if oldPlan.items[1].kind != inboundItemRPCAdmissionError { t.Fatalf("naked non-invariant after future watermark kind=%d, want admission error", oldPlan.items[1].kind) } - if state, rawLayer, msgID := c.layerProfileRawEvidenceState(); state.Origin != LayerProfileUnknown || rawLayer != 229 || msgID != 100 { + if state, rawLayer, msgID := c.layerProfileRawEvidenceState(); state.Origin != LayerProfileUnknown || rawLayer != 230 || msgID != 100 { t.Fatalf("future raw watermark = %#v raw:%d msgID:%d", state, rawLayer, msgID) } if got := handler.publications(); len(got) != 0 { diff --git a/internal/mtprotoedge/layer_profile_test.go b/internal/mtprotoedge/layer_profile_test.go index ec2081f5..07210463 100644 --- a/internal/mtprotoedge/layer_profile_test.go +++ b/internal/mtprotoedge/layer_profile_test.go @@ -99,7 +99,7 @@ func TestConnSeedLayerProfile(t *testing.T) { } func TestConnLayerProfileRejectsUnsupported(t *testing.T) { - for _, profile := range []tlprofile.Profile{0, 219, 229} { + for _, profile := range []tlprofile.Profile{0, 219, 230} { t.Run(fmt.Sprintf("layer_%d", profile), func(t *testing.T) { c := &Conn{} if err := c.FreezeLayerProfile(profile); !errors.Is(err, ErrLayerProfileUnsupported) { @@ -209,7 +209,7 @@ func TestSessionManagerSeedsOnlyUnknownRawAuthKeyConnections(t *testing.T) { if got := inherited.LayerProfileState(); got.Profile != tlprofile.Profile226 || got.Origin != LayerProfileInherited { t.Fatalf("existing inherited connection was overwritten = %#v", got) } - if seeded := m.SeedInheritedLayerForRawAuthKey(authKeyID, 229); seeded != 0 { + if seeded := m.SeedInheritedLayerForRawAuthKey(authKeyID, 230); seeded != 0 { t.Fatalf("unsupported layer seeded %d connections", seeded) } } @@ -433,7 +433,7 @@ func TestInitialProfileSeedAvoidsPermanentKeyResolverAndPrefersPermForTemp(t *te resolver := &countingInheritedLayerResolver{layer: 227, found: true} s := &Server{layerRPC: resolver} c := &Conn{authKeyExpiresAt: 0} - if err := s.seedInitialLayerProfile(context.Background(), c, 229, LayerProfileSnapshot{}); err != nil { + if err := s.seedInitialLayerProfile(context.Background(), c, 230, LayerProfileSnapshot{}); err != nil { t.Fatal(err) } if resolver.calls != 0 { @@ -445,7 +445,7 @@ func TestInitialProfileSeedAvoidsPermanentKeyResolverAndPrefersPermForTemp(t *te }) t.Run("unsupported bound permanent blocks raw temp shadow", func(t *testing.T) { - resolver := &countingInheritedLayerResolver{layer: 229, found: true} + resolver := &countingInheritedLayerResolver{layer: 230, found: true} s := &Server{layerRPC: resolver} c := &Conn{authKeyExpiresAt: 1_900_000_000} if err := s.seedInitialLayerProfile(context.Background(), c, 225, LayerProfileSnapshot{}); err != nil { @@ -491,7 +491,7 @@ func TestInheritedLayerResolverAvailabilityUsesOnlySupportedRawTempShadow(t *tes wantOrigin LayerProfileOrigin }{ {name: "supported raw shadow", fetchedLayer: 225, wantProfile: tlprofile.Profile225, wantOrigin: LayerProfileInherited}, - {name: "future raw shadow stays unknown", fetchedLayer: 229, wantOrigin: LayerProfileUnknown}, + {name: "future raw shadow stays unknown", fetchedLayer: 230, wantOrigin: LayerProfileUnknown}, } { t.Run(tt.name, func(t *testing.T) { resolver := &countingInheritedLayerResolver{err: layerDurabilityUnavailableTestError{}} @@ -553,7 +553,7 @@ func TestActivationClaimRecheckClosesTempBindLayerRace(t *testing.T) { }) t.Run("unsupported permanent clears preclaim raw shadow", func(t *testing.T) { - resolver := &countingInheritedLayerResolver{layer: 229, found: true} + resolver := &countingInheritedLayerResolver{layer: 230, found: true} s := &Server{layerRPC: resolver} c := &Conn{authKeyID: authKeyID, sessionID: 403, authKeyExpiresAt: 1_900_000_000} if err := c.SeedInheritedLayerProfile(tlprofile.Profile225); err != nil { diff --git a/internal/mtprotoedge/layer_rpc_execution.go b/internal/mtprotoedge/layer_rpc_execution.go index 21a5587c..600646e3 100644 --- a/internal/mtprotoedge/layer_rpc_execution.go +++ b/internal/mtprotoedge/layer_rpc_execution.go @@ -222,6 +222,10 @@ func (s *Server) handleAdmittedLayerRPC( } dur := s.clock.Now().Sub(start) s.metrics.RPCHandled(effectiveMethod, dur, err) + dbSnapshot := dbStats.Snapshot() + if databaseMetrics, ok := s.metrics.(RPCDatabaseMetrics); ok { + databaseMetrics.RPCDatabase(effectiveMethod, dbSnapshot.Queries, dbSnapshot.Duration, dbSnapshot.Errors) + } fields := []zap.Field{ zap.String("method", effectiveMethod), zap.String("auth_key_id", c.authKeyHex), zap.Int64("session_id", c.sessionID), zap.Int64("msg_id", msgID), @@ -236,7 +240,7 @@ func (s *Server) handleAdmittedLayerRPC( if userID := c.UserID(); userID != 0 { fields = append(fields, zap.Int64("user_id", userID)) } - fields = dbtrace.AppendZapFields(fields, "", dbStats.Snapshot()) + fields = dbtrace.AppendZapFields(fields, "", dbSnapshot) if ctxErr := ctx.Err(); ctxErr != nil { var terminal bin.Encoder @@ -273,7 +277,7 @@ func (s *Server) handleAdmittedLayerRPC( ErrorCode: 500, ErrorMessage: "INTERNAL", }, nil) } - s.log.Info("RPC handled", fields...) + s.log.Debug("RPC handled", fields...) return s.publishAdmittedLayerRPCResult(c, msgID, effectiveMethod, owner, true, exact, postresponse.Take(ctx)) } diff --git a/internal/mtprotoedge/logical_session.go b/internal/mtprotoedge/logical_session.go index 9b6fe0ea..0b47a059 100644 --- a/internal/mtprotoedge/logical_session.go +++ b/internal/mtprotoedge/logical_session.go @@ -49,6 +49,16 @@ func (m *SessionManager) adoptLogicalSession(c *Conn) { } key := connSessionKey(c) m.mu.Lock() + // Production Conns are attached before their actor starts. A late RPC + // completion can race after Unregister has marked that same logical session + // offline; adopting the existing outbound owner must not make the physical + // connection live again or extend the six-minute offline horizon. Retired + // construction/embedded Conns must likewise not recreate a session already + // removed by destroy/revoke. + if c.isRetired() { + m.mu.Unlock() + return + } logical := m.logicalSessions[key] if logical == nil { logical = &logicalSession{key: key, outbound: c.outboundState} @@ -59,7 +69,6 @@ func (m *SessionManager) adoptLogicalSession(c *Conn) { logical.businessAuthKeyID = businessAuthKeyID logical.businessAuthResolved = true } - logical.offlineAt = time.Time{} // The actor's state pointer is immutable after startOutbound. Production // attaches before start; this adoption bridge only marks that already-owned // state persistent and must never write the Conn field concurrently. diff --git a/internal/mtprotoedge/logical_session_test.go b/internal/mtprotoedge/logical_session_test.go index 75f0e893..271e4f1f 100644 --- a/internal/mtprotoedge/logical_session_test.go +++ b/internal/mtprotoedge/logical_session_test.go @@ -138,6 +138,47 @@ func TestLogicalSessionOwnsExactResultAcrossPhysicalReconnect(t *testing.T) { } } +func TestLateCompletionAdoptionDoesNotClearOfflineRetention(t *testing.T) { + manager := NewSessionManager(zap.NewNop()) + budget := newOutboundTrackedBudget(1024) + key := sessionKey{authKeyID: [8]byte{1, 3, 5, 7}, sessionID: 421} + c := &Conn{authKeyID: key.authKeyID, sessionID: key.sessionID} + manager.attachLogicalSession(c, budget) + offlineAt := time.Unix(1_800_000_000, 0) + manager.mu.Lock() + manager.markLogicalSessionOfflineLocked(key, offlineAt) + manager.mu.Unlock() + + manager.adoptLogicalSession(c) + snapshot := manager.runtimeSnapshot() + if snapshot.logical != 1 || snapshot.offlineLogical != 1 { + t.Fatalf("late completion snapshot = logical:%d offline:%d, want 1/1", snapshot.logical, snapshot.offlineLogical) + } + manager.sweepLogicalSessions(offlineAt.Add(logicalSessionOfflineTTL + time.Second)) + snapshot = manager.runtimeSnapshot() + if snapshot.logical != 0 || snapshot.offlineLogical != 0 { + t.Fatalf("post-TTL snapshot = logical:%d offline:%d, want 0/0", snapshot.logical, snapshot.offlineLogical) + } +} + +func TestRetiredLateCompletionCannotRecreateDestroyedLogicalSession(t *testing.T) { + manager := NewSessionManager(zap.NewNop()) + budget := newOutboundTrackedBudget(1024) + key := sessionKey{authKeyID: [8]byte{2, 4, 6, 8}, sessionID: 422} + c := &Conn{authKeyID: key.authKeyID, sessionID: key.sessionID} + manager.attachLogicalSession(c, budget) + c.retire() + manager.mu.Lock() + state := manager.destroyLogicalSessionLocked(key) + manager.mu.Unlock() + manager.releaseLogicalSession(key, state) + + manager.adoptLogicalSession(c) + if snapshot := manager.runtimeSnapshot(); snapshot.logical != 0 { + t.Fatalf("retired late completion recreated %d logical sessions", snapshot.logical) + } +} + func TestLogicalSessionACKReleasesPayloadAndReceipt(t *testing.T) { manager := NewSessionManager(zap.NewNop()) budget := newOutboundTrackedBudget(1024) diff --git a/internal/mtprotoedge/metrics.go b/internal/mtprotoedge/metrics.go index 72a75896..d51b1748 100644 --- a/internal/mtprotoedge/metrics.go +++ b/internal/mtprotoedge/metrics.go @@ -30,6 +30,13 @@ type Metrics interface { OutboundQueueWait(len, cap int) } +// RPCDatabaseMetrics is an optional extension for request-scoped database +// work. queries/errors are counts attributed to one RPC and duration is the +// cumulative database time observed by the query wrapper under that request. +type RPCDatabaseMetrics interface { + RPCDatabase(method string, queries int64, duration time.Duration, errors int64) +} + // RPCResultMetrics is an optional extension for the detached response pipeline. // Keeping it separate preserves lightweight embedders while production exporters // can observe preparation/compression and end-to-end delivery independently from diff --git a/internal/mtprotoedge/outbound.go b/internal/mtprotoedge/outbound.go index 0137c8ce..df4b42ef 100644 --- a/internal/mtprotoedge/outbound.go +++ b/internal/mtprotoedge/outbound.go @@ -1297,7 +1297,7 @@ func (c *Conn) send(ctx context.Context, t proto.MessageType, msg bin.Encoder, c func (c *Conn) SendEncoded(ctx context.Context, t proto.MessageType, encoded *encodedOutboundMessage) error { if encoded != nil { - if err := encoded.prepareDeliveryHook(defaultRPCDeliveryHookExecutor); err != nil { + if err := encoded.prepareDeliveryHook(c.deliveryHookExecutor()); err != nil { return err } } @@ -1336,7 +1336,7 @@ func (c *Conn) enqueueEncodedDeliveryReserved( return ErrConnClosed } if encoded != nil { - if err := encoded.prepareDeliveryHook(defaultRPCDeliveryHookExecutor); err != nil { + if err := encoded.prepareDeliveryHook(c.deliveryHookExecutor()); err != nil { return err } } @@ -1384,6 +1384,13 @@ func (c *Conn) enqueueEncodedDeliveryReserved( return nil } +func (c *Conn) deliveryHookExecutor() *rpcDeliveryHookExecutor { + if c != nil && c.rpcDeliveryHooks != nil { + return c.rpcDeliveryHooks + } + return defaultRPCDeliveryHookExecutor +} + func (c *Conn) sendOutbound(ctx context.Context, t proto.MessageType, msg bin.Encoder, encoded *encodedOutboundMessage, control bool) error { return c.sendOutboundWithTerminal(ctx, t, msg, encoded, control, nil) } @@ -1491,10 +1498,11 @@ func (c *Conn) sendOutboundWithTerminalReserved( } } -// SendAsync 入队一条 server 消息但不等待发送结果（fire-and-forget），用于读循环里的控制消息 -// （ack/pong/bad_msg/future_salts/state_info）：避免读循环被 outbound 写 -// 阻塞而连带卡死。走优先(control)队列保证不被普通 push 拖后；队列满时丢弃并记 metrics——此时 -// 连接多已严重拥塞，控制消息丢失由客户端重传 / 读写超时兜底。返回非 nil 仅表示连接已关闭。 +// SendAsync enqueues a fire-and-forget server message without waiting for the +// physical write. It is reserved for genuinely retryable/advisory control +// traffic such as msgs_ack: a full control queue drops the message and records +// a metric. Request-correlated service responses and protocol corrections must +// use SendRequiredControl so they can never be reported as sent after a drop. func (c *Conn) SendAsync(ctx context.Context, t proto.MessageType, msg bin.Encoder) error { if c.outbound == nil || c.outboundControl == nil { return ErrConnClosed diff --git a/internal/mtprotoedge/outbound_required_control_test.go b/internal/mtprotoedge/outbound_required_control_test.go index 77f79a92..1f802313 100644 --- a/internal/mtprotoedge/outbound_required_control_test.go +++ b/internal/mtprotoedge/outbound_required_control_test.go @@ -11,6 +11,7 @@ import ( "time" "github.com/iamxvbaba/td/bin" + "github.com/iamxvbaba/td/clock" "github.com/iamxvbaba/td/crypto" "github.com/iamxvbaba/td/mt" "github.com/iamxvbaba/td/proto" @@ -56,6 +57,75 @@ func (t *gatedRequiredControlTransport) unblock() { t.closeOnce.Do(func() { close(t.release) }) } +func TestServiceTaskResponsesWaitForPhysicalWrite(t *testing.T) { + tests := []struct { + name string + send func(*Server, context.Context, *Conn) error + }{ + { + name: "pong", + send: func(s *Server, ctx context.Context, c *Conn) error { + return s.sendPong(ctx, c, 11, 22) + }, + }, + { + name: "future_salts", + send: func(s *Server, ctx context.Context, c *Conn) error { + return s.sendFutureSalts(ctx, c, 11, 32) + }, + }, + { + name: "msgs_state_info", + send: func(s *Server, ctx context.Context, c *Conn) error { + return s.sendMsgsStateInfo(ctx, c, 11, []byte{4}) + }, + }, + } + + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + tr := newGatedRequiredControlTransport(nil) + c := newOutboundTestConn(t, tr, newOutboundTrackedBudget(1<<20)) + c.outboundControlTrackedBudget = newOutboundTrackedBudget(1 << 20) + srv := &Server{clock: clock.System} + + ctx, cancel := context.WithTimeout(context.Background(), time.Second) + defer cancel() + done := make(chan error, 1) + go func() { + done <- tc.send(srv, ctx, c) + }() + + select { + case <-tr.started: + case <-time.After(time.Second): + t.Fatal("service response did not reach the physical writer") + } + select { + case err := <-done: + t.Fatalf("service response returned before physical write completed: %v", err) + case <-time.After(20 * time.Millisecond): + } + + tr.unblock() + select { + case err := <-done: + if err != nil { + t.Fatalf("service response: %v", err) + } + case <-time.After(time.Second): + t.Fatal("service response did not return after physical write") + } + if c.isRetired() { + t.Fatal("successful service response terminally closed the connection") + } + if got := tr.sends.Load(); got != 1 { + t.Fatalf("physical sends = %d, want 1", got) + } + }) + } +} + func TestSendRequiredControlWaitsForPhysicalWriteAndReturnsBudget(t *testing.T) { tr := newGatedRequiredControlTransport(nil) controlBudget := newOutboundTrackedBudget(1 << 20) diff --git a/internal/mtprotoedge/provisional_revocation_test.go b/internal/mtprotoedge/provisional_revocation_test.go index 516f85ca..042dcfd3 100644 --- a/internal/mtprotoedge/provisional_revocation_test.go +++ b/internal/mtprotoedge/provisional_revocation_test.go @@ -20,22 +20,21 @@ import ( type activationGatedAuthKeyStore struct { store.AuthKeyStore - gets atomic.Int32 + revalidates atomic.Int32 finalStarted chan struct{} finalRelease chan struct{} startOnce sync.Once } -func (s *activationGatedAuthKeyStore) Get(ctx context.Context, id [8]byte) (store.AuthKeyData, bool, error) { - if s.gets.Add(1) == 2 { - s.startOnce.Do(func() { close(s.finalStarted) }) - select { - case <-s.finalRelease: - case <-ctx.Done(): - return store.AuthKeyData{}, false, ctx.Err() - } +func (s *activationGatedAuthKeyStore) Revalidate(ctx context.Context, id [8]byte) (store.AuthKeyData, bool, error) { + s.revalidates.Add(1) + s.startOnce.Do(func() { close(s.finalStarted) }) + select { + case <-s.finalRelease: + case <-ctx.Done(): + return store.AuthKeyData{}, false, ctx.Err() } - return s.AuthKeyStore.Get(ctx, id) + return s.AuthKeyStore.Revalidate(ctx, id) } func waitForManagedSessionAbsent(t *testing.T, manager *SessionManager, key sessionKey) { @@ -79,11 +78,17 @@ func TestBadSaltStormRevalidatesStoreOnlyAtActivationBoundary(t *testing.T) { if got := keys.gets.Load(); got != 1 { t.Fatalf("AuthKeyStore.Get during bad-salt storm = %d, want initial lookup only", got) } + if got := keys.revalidates.Load(); got != 0 { + t.Fatalf("AuthKeyStore.Revalidate during bad-salt storm = %d, want 0", got) + } sendEncrypted(t, conn, cipher, auth, firstID, &tg.HelpGetConfigRequest{}) collectReplyFrames(t, conn, cipher, auth.AuthKey, map[uint32]int{proto.ResultTypeID: 1}) - if got := keys.gets.Load(); got != 2 { - t.Fatalf("AuthKeyStore.Get after activation boundary = %d, want 2", got) + if got := keys.gets.Load(); got != 1 { + t.Fatalf("AuthKeyStore.Get after activation boundary = %d, want initial lookup only", got) + } + if got := keys.revalidates.Load(); got != 1 { + t.Fatalf("AuthKeyStore.Revalidate after activation boundary = %d, want 1", got) } waitForAtomicCalls(t, &handler.calls, 1) } @@ -108,8 +113,9 @@ func TestActivationFinalAuthKeyCheckRunsAfterClaim(t *testing.T) { conn, auth, cipher := dialHandshake(t, addr, dc, pub) msgID := proto.NewMessageIDGen(time.Now).New(proto.MessageFromClient) - // The first Get is serveConn's decrypt lookup. The second is deliberately - // blocked: it must start only after BeginActivation indexed the claim. + // Get is serveConn's activity-bearing decrypt lookup. Revalidate is deliberately + // blocked: it must start only after BeginActivation indexed the claim and must + // not create another durable last_used_at write. sendEncrypted(t, conn, cipher, auth, msgID, &tg.HelpGetConfigRequest{}) select { case <-keys.finalStarted: diff --git a/internal/mtprotoedge/rpc_delivery_hook_executor_test.go b/internal/mtprotoedge/rpc_delivery_hook_executor_test.go index e75127cc..5c7548c2 100644 --- a/internal/mtprotoedge/rpc_delivery_hook_executor_test.go +++ b/internal/mtprotoedge/rpc_delivery_hook_executor_test.go @@ -52,6 +52,11 @@ func TestRPCDeliveryHookExecutorBoundsAdmissionWithoutBlockingDelivery(t *testin if got := len(executor.slots); got != 0 { t.Fatalf("executor retained %d capacity slots", got) } + snapshot := executor.runtimeSnapshot() + if snapshot.workers != 1 || snapshot.capacity != 1 || snapshot.completed != 1 || snapshot.rejected != 1 || + snapshot.reserved != 0 || snapshot.queued != 0 || snapshot.running != 0 || snapshot.durationSeconds <= 0 { + t.Fatalf("executor snapshot = %#v", snapshot) + } } func TestRPCDeliveryHookExecutorIsolatesPanicsAndContinues(t *testing.T) { @@ -109,3 +114,58 @@ func TestEquivalentRPCDeliveryAttemptsShareExactlyOnceCoordinator(t *testing.T) t.Fatalf("equivalent attempts leaked %d tickets", got) } } + +func TestRPCDeliveryHookExecutorStopRejectsNewAndDrainsReserved(t *testing.T) { + executor := newRPCDeliveryHookExecutor(1, 2) + ticket, ok := executor.reserve() + if !ok { + t.Fatal("reserve ticket") + } + stopped := make(chan bool, 1) + go func() { stopped <- executor.stop(time.Second) }() + deadline := time.Now().Add(time.Second) + for time.Now().Before(deadline) { + executor.mu.Lock() + stopping := executor.stopping + executor.mu.Unlock() + if stopping { + break + } + time.Sleep(time.Millisecond) + } + if _, ok := executor.reserve(); ok { + t.Fatal("executor accepted a reservation after stop") + } + select { + case <-stopped: + t.Fatal("stop returned while a reserved ticket was still owned") + default: + } + ticket.release() + select { + case ok := <-stopped: + if !ok { + t.Fatal("executor did not drain before timeout") + } + case <-time.After(time.Second): + t.Fatal("executor stop did not finish after ticket release") + } + snapshot := executor.runtimeSnapshot() + if snapshot.reserved != 0 || snapshot.queued != 0 || snapshot.running != 0 || snapshot.rejected < 1 { + t.Fatalf("stopped executor snapshot = %#v", snapshot) + } +} + +func TestRPCDeliveryHookExecutorIsServerScoped(t *testing.T) { + first := New(Options{RPCDeliveryHookWorkers: 2, RPCDeliveryHookMaxPending: 7}) + second := New(Options{RPCDeliveryHookWorkers: 3, RPCDeliveryHookMaxPending: 9}) + if first.rpcDeliveryHooks == nil || second.rpcDeliveryHooks == nil || first.rpcDeliveryHooks == second.rpcDeliveryHooks { + t.Fatal("servers did not receive isolated delivery-hook executors") + } + firstSnapshot := first.RuntimeSnapshot() + secondSnapshot := second.RuntimeSnapshot() + if firstSnapshot.RPCDeliveryHookWorkers != 2 || firstSnapshot.RPCDeliveryHookCapacity != 7 || + secondSnapshot.RPCDeliveryHookWorkers != 3 || secondSnapshot.RPCDeliveryHookCapacity != 9 { + t.Fatalf("server delivery-hook limits = %#v / %#v", firstSnapshot, secondSnapshot) + } +} diff --git a/internal/mtprotoedge/rpc_flight.go b/internal/mtprotoedge/rpc_flight.go index d6139d0d..099b2785 100644 --- a/internal/mtprotoedge/rpc_flight.go +++ b/internal/mtprotoedge/rpc_flight.go @@ -9,7 +9,11 @@ import ( "github.com/iamxvbaba/td/tlprofile" ) -const rpcResultFlightDefaultMaxPending = 8192 +// A 10,000-session startup can transiently retain more than one scheduled RPC +// per connection while downstream reads drain. Request materialization remains +// bounded independently by RPCGlobalMaxBytes, so this count limit provides +// queue/owner headroom without turning the scheduler into an unbounded queue. +const rpcResultFlightDefaultMaxPending = 32768 var ( // ErrRPCResultFlightCapacity is returned before installing a new owner when diff --git a/internal/mtprotoedge/rpc_result_egress.go b/internal/mtprotoedge/rpc_result_egress.go index 0c96c5da..9b828b3e 100644 --- a/internal/mtprotoedge/rpc_result_egress.go +++ b/internal/mtprotoedge/rpc_result_egress.go @@ -8,24 +8,31 @@ import ( "strings" "sync" "sync/atomic" + "time" "github.com/iamxvbaba/td/bin" "github.com/iamxvbaba/td/proto" ) const ( - rpcResultGZIPMinBytes = 4 << 10 - rpcResultGZIPMaxInputBytes = (10 << 20) - 1 // gotd client decompression hard limit. - rpcResultGZIPMinSavedBytes = 1 << 10 - rpcResultGZIPMinSavedDivisor = 12 // Require roughly 8.3% reduction. - rpcResultGZIPConcurrency = 8 - rpcDeliveryHookConcurrency = 8 - rpcDeliveryHookQueueSize = 1024 + rpcResultGZIPMinBytes = 4 << 10 + rpcResultGZIPMaxInputBytes = (10 << 20) - 1 // gotd client decompression hard limit. + rpcResultGZIPMinSavedBytes = 1 << 10 + rpcResultGZIPMinSavedDivisor = 12 // Require roughly 8.3% reduction. + rpcResultGZIPConcurrency = 8 + defaultRPCDeliveryHookWorkers = 32 + defaultRPCDeliveryHookMaxPending = 16_384 ) var rpcResultGZIPSlots = make(chan struct{}, rpcResultGZIPConcurrency) -var defaultRPCDeliveryHookExecutor = newRPCDeliveryHookExecutor(rpcDeliveryHookConcurrency, rpcDeliveryHookQueueSize) +// This executor is only a compatibility boundary for directly constructed +// Conn/encoded-message tests. Production Conns always use their owning Server's +// isolated executor. +var defaultRPCDeliveryHookExecutor = newRPCDeliveryHookExecutor( + defaultRPCDeliveryHookWorkers, + defaultRPCDeliveryHookMaxPending, +) // ErrRPCDeliveryHookCapacity means an RPC result with a delivery-dependent // transition cannot reserve reliable executor capacity. The result must not be @@ -53,20 +60,43 @@ type rpcDeliveryHookJob struct { fn func() } -// rpcDeliveryHookExecutor has process lifetime. Capacity bounds queued plus -// running hooks; every physical write reserves a ticket before admission. A -// successful writer therefore performs only one short O(1) queue append and -// never waits for capacity or hook work. Failed writes release their ticket, -// while the shared logical coordinator remains eligible for a later replay. +// rpcDeliveryHookExecutor is owned by one Server. Capacity bounds reserved plus +// queued plus running hooks; every physical write reserves a ticket before +// admission. A successful writer therefore performs only one short O(1) queue +// append and never waits for capacity or hook work. Failed writes release their +// ticket, while the shared logical coordinator remains eligible for a later +// replay. type rpcDeliveryHookExecutor struct { - slots chan struct{} + workers int + capacity int + slots chan struct{} + start sync.Once + wg sync.WaitGroup - mu sync.Mutex - cond *sync.Cond - head *rpcDeliveryHookJob - tail *rpcDeliveryHookJob + mu sync.Mutex + cond *sync.Cond + head *rpcDeliveryHookJob + tail *rpcDeliveryHookJob + stopping bool - panics atomic.Uint64 + queued atomic.Int64 + running atomic.Int64 + completed atomic.Uint64 + rejected atomic.Uint64 + panics atomic.Uint64 + durationNanos atomic.Uint64 +} + +type rpcDeliveryHookRuntimeSnapshot struct { + workers int64 + capacity int64 + reserved int64 + queued int64 + running int64 + completed uint64 + rejected uint64 + panics uint64 + durationSeconds float64 } func newRPCDeliveryHookExecutor(workers, capacity int) *rpcDeliveryHookExecutor { @@ -76,24 +106,50 @@ func newRPCDeliveryHookExecutor(workers, capacity int) *rpcDeliveryHookExecutor if capacity < workers { capacity = workers } - e := &rpcDeliveryHookExecutor{slots: make(chan struct{}, capacity)} - e.cond = sync.NewCond(&e.mu) - for range workers { - go e.run() + e := &rpcDeliveryHookExecutor{ + workers: workers, + capacity: capacity, + slots: make(chan struct{}, capacity), } + e.cond = sync.NewCond(&e.mu) return e } +func (e *rpcDeliveryHookExecutor) startWorkers() { + if e == nil { + return + } + e.start.Do(func() { + e.mu.Lock() + defer e.mu.Unlock() + if e.stopping { + return + } + e.wg.Add(e.workers) + for range e.workers { + go e.run() + } + }) +} + func (e *rpcDeliveryHookExecutor) reserve() (*rpcDeliveryHookTicket, bool) { if e == nil { return nil, false } + e.startWorkers() + e.mu.Lock() + defer e.mu.Unlock() + if e.stopping { + e.rejected.Add(1) + return nil, false + } select { case e.slots <- struct{}{}: ticket := &rpcDeliveryHookTicket{executor: e} ticket.state.Store(uint32(rpcDeliveryHookTicketReserved)) return ticket, true default: + e.rejected.Add(1) return nil, false } } @@ -105,6 +161,7 @@ func (t *rpcDeliveryHookTicket) release() { return } <-t.executor.slots + t.executor.signalStateChange() } func (t *rpcDeliveryHookTicket) submit(fn func()) bool { @@ -127,14 +184,20 @@ func (e *rpcDeliveryHookExecutor) enqueue(job *rpcDeliveryHookJob) { e.tail.next = job } e.tail = job + e.queued.Add(1) e.cond.Signal() e.mu.Unlock() } func (e *rpcDeliveryHookExecutor) run() { + defer e.wg.Done() for { e.mu.Lock() for e.head == nil { + if e.stopping && len(e.slots) == 0 { + e.mu.Unlock() + return + } e.cond.Wait() } job := e.head @@ -143,27 +206,88 @@ func (e *rpcDeliveryHookExecutor) run() { e.tail = nil } job.next = nil + e.queued.Add(-1) + e.running.Add(1) e.mu.Unlock() e.runOne(job) } } func (e *rpcDeliveryHookExecutor) runOne(job *rpcDeliveryHookJob) { + started := time.Now() defer func() { if recovered := recover(); recovered != nil { e.panics.Add(1) log.Printf("mtprotoedge: rpc delivery hook panic: %v\n%s", recovered, debug.Stack()) } + e.durationNanos.Add(uint64(time.Since(started))) + e.completed.Add(1) + e.running.Add(-1) if job != nil && job.ticket != nil { job.ticket.state.Store(uint32(rpcDeliveryHookTicketDone)) <-e.slots } + e.signalStateChange() }() if job != nil && job.fn != nil { job.fn() } } +func (e *rpcDeliveryHookExecutor) signalStateChange() { + if e == nil { + return + } + e.mu.Lock() + e.cond.Broadcast() + e.mu.Unlock() +} + +// stop rejects new reservations and lets every already-reserved ticket either +// be released or submitted and executed. Timing out never abandons jobs: the +// existing workers continue draining under their Server-owned executor. +func (e *rpcDeliveryHookExecutor) stop(timeout time.Duration) bool { + if e == nil { + return true + } + e.mu.Lock() + e.stopping = true + e.cond.Broadcast() + e.mu.Unlock() + done := make(chan struct{}) + go func() { + e.wg.Wait() + close(done) + }() + if timeout <= 0 { + <-done + return true + } + select { + case <-done: + return true + case <-time.After(timeout): + return false + } +} + +func (e *rpcDeliveryHookExecutor) runtimeSnapshot() rpcDeliveryHookRuntimeSnapshot { + if e == nil { + return rpcDeliveryHookRuntimeSnapshot{} + } + return rpcDeliveryHookRuntimeSnapshot{ + workers: int64(e.workers), + capacity: int64(e.capacity), + reserved: int64(len(e.slots)), + queued: e.queued.Load(), + running: e.running.Load(), + completed: e.completed.Load(), + rejected: e.rejected.Load(), + panics: e.panics.Load(), + durationSeconds: float64(e.durationNanos.Load()) / float64(time.Second), + } +} + // encodeAdaptiveRPCResultInner returns either the original layer-specific TL // object or one complete gzip_packed object. Compression is CPU bounded and is // retained only when it materially reduces the non-preemptible transport frame. diff --git a/internal/mtprotoedge/rpc_result_egress_test.go b/internal/mtprotoedge/rpc_result_egress_test.go index c3c648b5..588df4c7 100644 --- a/internal/mtprotoedge/rpc_result_egress_test.go +++ b/internal/mtprotoedge/rpc_result_egress_test.go @@ -721,6 +721,11 @@ func TestDeliveryHookRunsOnceAfterReplayNotFailedWrite(t *testing.T) { failing := &failAfterTransport{} failing.failAt.Store(1) oldConn := newOutboundTestConn(t, failing, newOutboundTrackedBudget(1<<20)) + // Production attaches the logical outbox before the outbound actor starts. + // Keep that invariant here so a failed physical write can retire the Conn + // without relying on the construction-only late-adoption bridge to recreate + // an already-retired session. + s.conns.adoptLogicalSession(oldConn) const reqMsgID = int64(9101) claim, err := s.rpcResults.Acquire(oldConn.authKeyID, oldConn.sessionID, reqMsgID) if err != nil || claim.state != rpcResultAcquireOwner { diff --git a/internal/mtprotoedge/runtime_metrics.go b/internal/mtprotoedge/runtime_metrics.go index 155d52a9..85a9faa6 100644 --- a/internal/mtprotoedge/runtime_metrics.go +++ b/internal/mtprotoedge/runtime_metrics.go @@ -23,6 +23,15 @@ type RuntimeSnapshot struct { InboundRPCReadyConnections int64 InboundRPCMaxTasks int64 InboundRPCMaxBytes int64 + RPCDeliveryHookWorkers int64 + RPCDeliveryHookCapacity int64 + RPCDeliveryHookReserved int64 + RPCDeliveryHookQueued int64 + RPCDeliveryHookRunning int64 + RPCDeliveryHookCompleted uint64 + RPCDeliveryHookRejected uint64 + RPCDeliveryHookPanics uint64 + RPCDeliveryHookDurationSeconds float64 InboundFrameBytes int64 InboundFrameMaxBytes int64 OutboundTrackedBytes int64 @@ -139,21 +148,31 @@ func (s *Server) RuntimeSnapshot() RuntimeSnapshot { sessions := s.conns.runtimeSnapshot() admission := s.admission.runtimeSnapshot() inbound := s.rpcScheduler.runtimeSnapshot() + deliveryHooks := s.rpcDeliveryHooks.runtimeSnapshot() result := RuntimeSnapshot{ - RawConnections: admission.connections, - RawConnectionLimit: admission.connectionLimit, - Handshakes: admission.handshakes, - HandshakeLimit: admission.handshakeLimit, - ActiveSessions: sessions.active, - ProvisionalSessions: sessions.provisional, - LogicalSessions: sessions.logical, - OfflineLogicalSessions: sessions.offlineLogical, - LogicalOutboxFrames: sessions.frames, - LogicalOutboxBytes: sessions.bytes, - PendingPushBytes: sessions.pendingBytes, - InboundRPCTasks: inbound.tasks, - InboundRPCBytes: inbound.bytes, - InboundRPCReadyConnections: inbound.ready, + RawConnections: admission.connections, + RawConnectionLimit: admission.connectionLimit, + Handshakes: admission.handshakes, + HandshakeLimit: admission.handshakeLimit, + ActiveSessions: sessions.active, + ProvisionalSessions: sessions.provisional, + LogicalSessions: sessions.logical, + OfflineLogicalSessions: sessions.offlineLogical, + LogicalOutboxFrames: sessions.frames, + LogicalOutboxBytes: sessions.bytes, + PendingPushBytes: sessions.pendingBytes, + InboundRPCTasks: inbound.tasks, + InboundRPCBytes: inbound.bytes, + InboundRPCReadyConnections: inbound.ready, + RPCDeliveryHookWorkers: deliveryHooks.workers, + RPCDeliveryHookCapacity: deliveryHooks.capacity, + RPCDeliveryHookReserved: deliveryHooks.reserved, + RPCDeliveryHookQueued: deliveryHooks.queued, + RPCDeliveryHookRunning: deliveryHooks.running, + RPCDeliveryHookCompleted: deliveryHooks.completed, + RPCDeliveryHookRejected: deliveryHooks.rejected, + RPCDeliveryHookPanics: deliveryHooks.panics, + RPCDeliveryHookDurationSeconds: deliveryHooks.durationSeconds, } if s.rpcScheduler != nil { result.InboundRPCMaxTasks = int64(s.rpcScheduler.maxTasks) diff --git a/internal/mtprotoedge/runtime_metrics_test.go b/internal/mtprotoedge/runtime_metrics_test.go index 73c0ad61..464df92a 100644 --- a/internal/mtprotoedge/runtime_metrics_test.go +++ b/internal/mtprotoedge/runtime_metrics_test.go @@ -18,9 +18,13 @@ func TestRuntimeSnapshotIsNilSafeAndReportsConfiguredLimits(t *testing.T) { if snapshot.RawConnectionLimit <= 0 || snapshot.HandshakeLimit <= 0 { t.Fatalf("admission limits not reported: %#v", snapshot) } - if snapshot.InboundRPCMaxTasks <= 0 || snapshot.InboundRPCMaxBytes <= 0 { + if snapshot.InboundRPCMaxTasks != rpcResultFlightDefaultMaxPending || snapshot.InboundRPCMaxBytes <= 0 { t.Fatalf("inbound RPC limits not reported: %#v", snapshot) } + if snapshot.RPCDeliveryHookWorkers != defaultRPCDeliveryHookWorkers || + snapshot.RPCDeliveryHookCapacity != defaultRPCDeliveryHookMaxPending { + t.Fatalf("delivery hook limits not reported: %#v", snapshot) + } if snapshot.InboundFrameMaxBytes <= 0 || snapshot.OutboundTrackedMaxBytes <= 0 || snapshot.OutboundWriteMaxBytes <= 0 { t.Fatalf("byte limits not reported: %#v", snapshot) } diff --git a/internal/mtprotoedge/server.go b/internal/mtprotoedge/server.go index 40499a42..e7571a2d 100644 --- a/internal/mtprotoedge/server.go +++ b/internal/mtprotoedge/server.go @@ -164,8 +164,10 @@ type LayerRPCDurableSessionProfileResolver interface { } // LayerRPCDurableSessionProfileAdvancer atomically advances exact-session and -// auth-key shared-default evidence. publishShared is true only when this exact -// observation still owns the durable shared default. +// auth-key shared-default evidence. publishShared is true only when this call +// established a different durable profile generation which still owns the +// shared default; a same-generation msg_id high-water advance needs no second +// process-local default publication. type LayerRPCDurableSessionProfileAdvancer interface { AdvanceNegotiatedSessionLayerEvidence( ctx context.Context, @@ -290,12 +292,20 @@ type Options struct { RPCTimeout time.Duration // RPCGlobalWorkers 是 Server 共享 inbound RPC worker 数。默认 256。 RPCGlobalWorkers int - // RPCGlobalMaxTasks 是全进程已预留、排队和执行中的 RPC 条数上限。默认 8192。 + // RPCGlobalMaxTasks 是全进程已预留、排队和执行中的 RPC 条数上限。默认 32768； + // request materialization 仍独立受 RPCGlobalMaxBytes 硬限制。 RPCGlobalMaxTasks int // RPCGlobalMaxBytes 是上述 RPC 的进程级 memory charge 预算。legacy charge // 等于 copied body；exact charge 是 typed decode 前的保守 materialization // 上界，因此该配置不表示可并发接收 512 MiB wire body。默认 512 MiB。 RPCGlobalMaxBytes int64 + // RPCDeliveryHookWorkers bounds concurrent post-response correctness work + // such as delivered-cursor commits and first-session readiness. The pending + // limit separately covers reserved + queued + running hooks so a 10k startup + // burst remains bounded without forcing socket writers to wait. Defaults are + // 32 workers and 16,384 pending hooks. + RPCDeliveryHookWorkers int + RPCDeliveryHookMaxPending int // RPCExecution*Entries bound in-flight owners and compact completed // receipts. Payload bytes are not charged here: the logical-session // outbox owns them under OutboundTrackedGlobalMaxBytes until ACK. ACK removes @@ -415,6 +425,12 @@ func (o *Options) setDefaults() { if o.RPCGlobalMaxBytes <= 0 { o.RPCGlobalMaxBytes = 512 << 20 } + if o.RPCDeliveryHookWorkers <= 0 { + o.RPCDeliveryHookWorkers = defaultRPCDeliveryHookWorkers + } + if o.RPCDeliveryHookMaxPending <= 0 { + o.RPCDeliveryHookMaxPending = defaultRPCDeliveryHookMaxPending + } if o.RPCExecutionMaxEntries == 0 { o.RPCExecutionMaxEntries = rpcExecutionMaxEntries } @@ -463,6 +479,10 @@ func (o *Options) setDefaults() { } func validateRPCExecutionOptions(o Options) error { + if o.RPCDeliveryHookWorkers <= 0 || o.RPCDeliveryHookMaxPending < o.RPCDeliveryHookWorkers { + return fmt.Errorf("rpc delivery hook capacity must satisfy pending >= workers > 0: %d/%d", + o.RPCDeliveryHookMaxPending, o.RPCDeliveryHookWorkers) + } if o.RPCExecutionMaxEntries <= 0 || o.RPCExecutionAuthMaxEntries <= 0 || o.RPCExecutionSessionMaxEntries <= 0 { return fmt.Errorf("rpc execution ledger entry limits must be positive") } @@ -498,6 +518,7 @@ type Server struct { rpcQueueSize int rpcTimeout time.Duration rpcScheduler *inboundRPCScheduler + rpcDeliveryHooks *rpcDeliveryHookExecutor frameBudget *inboundFrameBudget outboundQueueSize int outboundControlQueueSize int @@ -560,6 +581,7 @@ func New(opts Options) *Server { rpcQueueSize: opts.RPCQueueSize, rpcTimeout: opts.RPCTimeout, rpcScheduler: newInboundRPCScheduler(opts.RPCGlobalWorkers, opts.RPCGlobalMaxTasks, opts.RPCGlobalMaxBytes), + rpcDeliveryHooks: newRPCDeliveryHookExecutor(opts.RPCDeliveryHookWorkers, opts.RPCDeliveryHookMaxPending), frameBudget: newInboundFrameBudget(opts.InboundFrameGlobalMaxBytes), outboundQueueSize: opts.OutboundQueueSize, outboundControlQueueSize: opts.OutboundControlQueueSize, @@ -659,6 +681,7 @@ func (s *Server) buildConn(tc transport.Conn, lease *physicalTransportLease, key outboundTrackedBudget: s.outboundTrackedBudget, outboundControlTrackedBudget: s.outboundControlBudget, outboundScratchPool: s.outboundScratchPool, + rpcDeliveryHooks: s.rpcDeliveryHooks, rpcResultAcked: func(conn *Conn, reqMsgID int64) { // The sole outbound actor invokes this only after resolving a client // msgs_ack server msg_id through its tracked resend frame. The actor has @@ -679,8 +702,10 @@ func (s *Server) buildConn(tc transport.Conn, lease *physicalTransportLease, key func (s *Server) Serve(ctx context.Context, ln net.Listener) error { // 共享 worker 池只在 Server 真正 Serve 后允许消费，并在首条 RPC 到达时懒启动。 // serveTCP/serveMixed 返回前会等待连接 goroutine 收敛，各 Conn 已先排空/取消任务； - // 最后再停止全局池，避免关闭过程中留下无人消费但仍占预算的队列。 + // 最后再停止共享池并排空已预留 delivery hook，避免关闭过程中 + // 留下无人消费但仍占预算的队列。 s.rpcScheduler.start() + defer s.rpcDeliveryHooks.stop(rpcCloseWaitTimeout) defer s.conns.releaseAllLogicalSessions() defer s.rpcScheduler.stop(rpcCloseWaitTimeout) // 只在最外层 listener 包一次，确保 same-port mux 的 sniff/HTTP upgrade 也计入 diff --git a/internal/mtprotoedge/session_barrier_integration_test.go b/internal/mtprotoedge/session_barrier_integration_test.go index 908ddd5e..6020dc38 100644 --- a/internal/mtprotoedge/session_barrier_integration_test.go +++ b/internal/mtprotoedge/session_barrier_integration_test.go @@ -614,9 +614,6 @@ func TestCrossConnectionInflightAbortRetriesOnlyAfterOldOwnerStops(t *testing.T) if got := handler.max.Load(); got != 1 { t.Fatalf("old and retry handlers overlapped: max active=%d, want 1", got) } - if got := s.rpcResults.flightLimit.snapshot(); got != 0 { - t.Fatalf("sequential retry leaked flight claims: %d", got) - } resultCount := 0 deadline = time.Now().Add(2 * time.Second) @@ -640,6 +637,11 @@ func TestCrossConnectionInflightAbortRetriesOnlyAfterOldOwnerStops(t *testing.T) if resultCount != 1 { t.Fatalf("sequential retry result count = %d, want 1", resultCount) } + // Scheduler task completion only proves that result encoding/enqueue has + // finished. The outbound actor publishes the terminal execution receipt + // after the physical write, so inspect the flight only after observing that + // result rather than racing the actor callback. + waitForRPCFlightClaims(t, s.rpcResults, 0) if !firstConn.isRetired() || !secondConn.isRetired() || thirdConn == nil || !thirdConn.isActive() { t.Fatalf("replacement lifecycle = first:%v second:%v third:%p active:%v", firstConn.lifecycleState(), secondConn.lifecycleState(), thirdConn, thirdConn != nil && thirdConn.isActive()) } @@ -656,3 +658,14 @@ func waitForAtomicCalls(t *testing.T, calls interface{ Load() int32 }, want int3 t.Fatalf("handler calls = %d, want %d", got, want) } } + +func waitForRPCFlightClaims(t *testing.T, ledger *rpcExecutionLedger, want int64) { + t.Helper() + deadline := time.Now().Add(2 * time.Second) + for ledger.flightLimit.snapshot() != want && time.Now().Before(deadline) { + time.Sleep(time.Millisecond) + } + if got := ledger.flightLimit.snapshot(); got != want { + t.Fatalf("rpc flight claims = %d, want %d", got, want) + } +} diff --git a/internal/mtprotoedge/session_manager.go b/internal/mtprotoedge/session_manager.go index 9c851dd4..54be5dde 100644 --- a/internal/mtprotoedge/session_manager.go +++ b/internal/mtprotoedge/session_manager.go @@ -61,6 +61,10 @@ const ( maxChannelSubscriptionsPerSession = 10 defaultChannelSubscriptionTTL = 75 * time.Second maxChannelSubscriptionTTL = 2 * time.Minute + // A claim is normally released by its rpc_result delivery callback or the + // pending-update flush it starts. This lease only recovers the exceptional + // path where result encoding is replaced before the callback can be attached. + updatesActivationClaimTTL = time.Minute ) // forceCloseBatchTimeout is one deadline for a whole revoke/replace/eviction batch. Conn.Close @@ -201,7 +205,9 @@ type SessionManager struct { // 去 Google 化设备）下仍能收到来电、消息等实时推送。登记后在 pushToUserWithSender // 中被视为【永久就绪】，绕过 receivesUpdates 门槛直接投递，而不是排队等一个永远 // 不会到来的 getState。See memory: call-inactive-account-network-pause。 - pushSessions map[[8]byte]map[int64]struct{} + pushSessions map[[8]byte]map[int64]struct{} + updatesActivationSeq uint64 + bootstrapProbeSeq uint64 lifecycle SessionLifecycleObserver log *zap.Logger @@ -821,6 +827,8 @@ func (m *SessionManager) bindUserLocked(c *Conn, key sessionKey, userID int64) { if old != userID { m.clearSessionChannelIndexesLocked(c, key) c.membershipsSynced.Store(false) + m.clearUpdatesActivationLocked(c) + m.clearBootstrapProbeLocked(c) // 身份变化即丢弃暂存推送：它们属于前一个账号，flush 给新账号是跨账号泄露。 // 同时取消进行中的排空（runFlush 还另有 owner 校验做批内兜底）。 m.deletePendingLocked(key) @@ -833,6 +841,8 @@ func (m *SessionManager) bindUserLocked(c *Conn, key sessionKey, userID int64) { } else { m.clearSessionChannelIndexesLocked(c, key) c.membershipsSynced.Store(false) + m.clearUpdatesActivationLocked(c) + m.clearBootstrapProbeLocked(c) m.deletePendingLocked(key) delete(m.flushing, key) } @@ -898,6 +908,8 @@ func (m *SessionManager) bindAuthKeyLocked(c *Conn, key sessionKey, authKeyID [8 } m.clearSessionChannelIndexesLocked(c, key) c.membershipsSynced.Store(false) + m.clearUpdatesActivationLocked(c) + m.clearBootstrapProbeLocked(c) m.deletePendingLocked(key) delete(m.flushing, key) c.userID.Store(0) @@ -1166,6 +1178,8 @@ func (m *SessionManager) UnbindAuthKey(authKeyID [8]byte) int { } m.clearSessionChannelIndexesLocked(c, key) c.membershipsSynced.Store(false) + m.clearUpdatesActivationLocked(c) + m.clearBootstrapProbeLocked(c) // 授权解除后暂存推送属于已登出的账号，不能等下一个登录者置位时 flush 出去。 m.deletePendingLocked(key) delete(m.flushing, key) @@ -1185,6 +1199,7 @@ func (m *SessionManager) setReceivesUpdatesLocked(c *Conn, key sessionKey, recei c.receivesUpdates.Store(false) m.clearSessionChannelIndexesLocked(c, key) c.membershipsSynced.Store(false) + m.clearUpdatesActivationLocked(c) // 取消进行中的排空激活：runFlush 在置位前会复查该标志，标志已删则放弃置位， // 避免把刚置 false 的开关翻回 true。 delete(m.flushing, key) @@ -1198,11 +1213,15 @@ func (m *SessionManager) setReceivesUpdatesLocked(c *Conn, key sessionKey, recei c.receivesUpdates.Store(false) m.clearSessionChannelIndexesLocked(c, key) c.membershipsSynced.Store(false) + m.clearUpdatesActivationLocked(c) delete(m.flushing, key) return 0, false } if c.receivesUpdates.Load() || m.flushing[key] { // 已就绪，或已有排空协程在跑（完成时会自行取走新增暂存并置位）。 + if c.receivesUpdates.Load() { + m.clearUpdatesActivationLocked(c) + } return 0, false } if len(m.pending[key]) == 0 { @@ -1232,6 +1251,7 @@ func (m *SessionManager) runFlush(c *Conn, key sessionKey, owner int64, attempt // 排空期间发生登出/换号：剩余暂存属于旧账号，丢弃且不得发给新账号。 m.deletePendingLocked(key) delete(m.flushing, key) + m.clearUpdatesActivationLocked(c) m.mu.Unlock() return } @@ -1239,6 +1259,7 @@ func (m *SessionManager) runFlush(c *Conn, key sessionKey, owner int64, attempt if len(batch) == 0 { c.receivesUpdates.Store(true) delete(m.flushing, key) + m.clearUpdatesActivationLocked(c) m.mu.Unlock() return } @@ -1250,6 +1271,7 @@ func (m *SessionManager) runFlush(c *Conn, key sessionKey, owner int64, attempt m.mu.Lock() m.deletePendingLocked(key) delete(m.flushing, key) + m.clearUpdatesActivationLocked(c) m.mu.Unlock() releaseQueuedPushes(batch[i:]) return @@ -1296,6 +1318,7 @@ func (m *SessionManager) runFlush(c *Conn, key sessionKey, owner int64, attempt if c.userID.Load() != owner { m.deletePendingLocked(key) delete(m.flushing, key) + m.clearUpdatesActivationLocked(c) } m.mu.Unlock() releaseQueuedPushes(batch[i:]) @@ -1316,6 +1339,7 @@ func (m *SessionManager) runFlush(c *Conn, key sessionKey, owner int64, attempt c.receivesUpdates.Store(true) m.deletePendingLocked(key) delete(m.flushing, key) + m.clearUpdatesActivationLocked(c) m.mu.Unlock() m.log.Debug("Flush gave up after retries; activated with getDifference fallback", zap.String("auth_key_id", sessionKeyLog(key.authKeyID)), @@ -1356,6 +1380,119 @@ func (m *SessionManager) ReceivesUpdatesForAuthKey(authKeyID [8]byte, sessionID return hasProfile && c.receivesUpdates.Load() && c.membershipsSynced.Load() } +// BeginSessionUpdatesActivation claims the readiness transition for the +// current physical connection. Ordinary startup RPCs race here before they +// register delivery hooks, so at most one of them can enqueue the expensive +// channel-membership synchronization. Cursor commits remain request-owned. +func (m *SessionManager) BeginSessionUpdatesActivation(authKeyID [8]byte, sessionID int64) (uint64, bool) { + if m == nil { + return 0, false + } + key := sessionKey{authKeyID: authKeyID, sessionID: sessionID} + m.mu.Lock() + defer m.mu.Unlock() + c := m.bySession[key] + if c == nil || c.isRetired() { + return 0, false + } + if _, hasProfile := c.LayerProfile(); hasProfile && c.receivesUpdates.Load() && c.membershipsSynced.Load() { + return 0, false + } + now := time.Now() + if c.now != nil { + now = c.now() + } + if c.updatesActivationToken != 0 { + // A pending FIFO flush owns the activation until it reaches a terminal + // outcome. Never lease-steal while that ordered delivery is in progress. + if m.flushing[key] || now.Sub(c.updatesActivationAt) < updatesActivationClaimTTL { + return 0, false + } + } + m.updatesActivationSeq++ + if m.updatesActivationSeq == 0 { + m.updatesActivationSeq++ + } + c.updatesActivationToken = m.updatesActivationSeq + c.updatesActivationAt = now + return c.updatesActivationToken, true +} + +// EndSessionUpdatesActivation releases only the token owned by the caller and +// only on the same current physical Conn. If SetReceivesUpdates started an +// ordered pending flush, that flush retains and releases the claim itself. +func (m *SessionManager) EndSessionUpdatesActivation(authKeyID [8]byte, sessionID int64, token uint64) { + if m == nil || token == 0 { + return + } + key := sessionKey{authKeyID: authKeyID, sessionID: sessionID} + m.mu.Lock() + defer m.mu.Unlock() + c := m.bySession[key] + if c == nil || c.updatesActivationToken != token || m.flushing[key] { + return + } + m.clearUpdatesActivationLocked(c) +} + +// BeginSessionBootstrapProbe claims the first durable bootstrap-job lookup for +// the current physical connection generation. Unlike updates activation, this +// is completed only by a delivered getState/getDifference baseline. +func (m *SessionManager) BeginSessionBootstrapProbe(authKeyID [8]byte, sessionID int64) (uint64, bool) { + if m == nil { + return 0, false + } + key := sessionKey{authKeyID: authKeyID, sessionID: sessionID} + m.mu.Lock() + defer m.mu.Unlock() + c := m.bySession[key] + if c == nil || c.isRetired() || c.bootstrapProbed || c.bootstrapProbeToken != 0 { + return 0, false + } + m.bootstrapProbeSeq++ + if m.bootstrapProbeSeq == 0 { + m.bootstrapProbeSeq++ + } + c.bootstrapProbeToken = m.bootstrapProbeSeq + return c.bootstrapProbeToken, true +} + +// EndSessionBootstrapProbe completes or releases only the token on the same +// current Conn. A delayed callback from a replaced connection cannot mutate the +// replacement's one-shot state. +func (m *SessionManager) EndSessionBootstrapProbe(authKeyID [8]byte, sessionID int64, token uint64, success bool) { + if m == nil || token == 0 { + return + } + key := sessionKey{authKeyID: authKeyID, sessionID: sessionID} + m.mu.Lock() + defer m.mu.Unlock() + c := m.bySession[key] + if c == nil || c.bootstrapProbeToken != token { + return + } + c.bootstrapProbeToken = 0 + if success { + c.bootstrapProbed = true + } +} + +func (m *SessionManager) clearUpdatesActivationLocked(c *Conn) { + if c == nil { + return + } + c.updatesActivationToken = 0 + c.updatesActivationAt = time.Time{} +} + +func (m *SessionManager) clearBootstrapProbeLocked(c *Conn) { + if c == nil { + return + } + c.bootstrapProbeToken = 0 + c.bootstrapProbed = false +} + // SetReceivesUpdatesForAuthKey 标记指定 raw auth_key_id + session_id 是否接收主动 updates。 func (m *SessionManager) SetReceivesUpdatesForAuthKey(authKeyID [8]byte, sessionID int64, receives bool) { m.mu.Lock() @@ -1470,11 +1607,32 @@ func (m *SessionManager) PushToUserAuthKeyTransient(ctx context.Context, userID return m.pushToBusinessAuthKeyBestEffort(ctx, userID, businessAuthKeyID, 0, t, msg, timeout) } -func (m *SessionManager) PushToUserAuthKeyTransientAtLeastLayer(ctx context.Context, userID int64, businessAuthKeyID [8]byte, minLayer int, t proto.MessageType, msg tg.UpdatesClass, timeout time.Duration) (int, error) { - return m.pushToBusinessAuthKeyBestEffort(ctx, userID, businessAuthKeyID, minLayer, t, msg, timeout) +func (m *SessionManager) PushToUserAuthKeyTransientCompatible(ctx context.Context, userID int64, businessAuthKeyID [8]byte, semantic tlprofile.SemanticID, t proto.MessageType, msg tg.UpdatesClass, timeout time.Duration) (int, error) { + return m.pushToBusinessAuthKeyBestEffort(ctx, userID, businessAuthKeyID, semantic, t, msg, timeout) } -func (m *SessionManager) pushToBusinessAuthKeyBestEffort(ctx context.Context, userID int64, businessAuthKeyID [8]byte, minLayer int, t proto.MessageType, msg tg.UpdatesClass, timeout time.Duration) (int, error) { +// PushToUserExceptBusinessAuthKey 把 update 投给账号其它设备，精确排除同一 permanent +// business auth key 下的所有 raw/temp/PFS 连接。密聊 accept 用它让输掉竞态的设备收敛为 +// discarded，同时保证获胜设备的其它连接不会误删刚建立的密聊。 +func (m *SessionManager) PushToUserExceptBusinessAuthKey(ctx context.Context, userID int64, excludeBusinessAuthKeyID [8]byte, t proto.MessageType, msg tg.UpdatesClass, timeout time.Duration) (int, error) { + getUpdates := onceLayerUpdatesFanout(ctx, msg) + return m.pushToUserWithSender(ctx, userID, nil, 0, &excludeBusinessAuthKeyID, 0, t, getUpdates, false, func(c *Conn) error { + if c.outbound == nil || c.outboundControl == nil { + return ErrConnClosed + } + updates, err := getUpdates() + if err != nil { + return err + } + encoded, err := updates.prepareForConn(ctx, c) + if err != nil { + return err + } + return c.SendBestEffortEncoded(ctx, t, encoded, timeout) + }) +} + +func (m *SessionManager) pushToBusinessAuthKeyBestEffort(ctx context.Context, userID int64, businessAuthKeyID [8]byte, semantic tlprofile.SemanticID, t proto.MessageType, msg tg.UpdatesClass, timeout time.Duration) (int, error) { if ctx != nil && ctx.Err() != nil { return 0, ctx.Err() } @@ -1497,7 +1655,7 @@ func (m *SessionManager) pushToBusinessAuthKeyBestEffort(ctx context.Context, us defer cancel() } getUpdates := onceLayerUpdatesFanout(sendCtx, msg) - return m.pushToBusinessAuthKey(ctx, userID, businessAuthKeyID, minLayer, func(c *Conn) error { + return m.pushToBusinessAuthKey(ctx, userID, businessAuthKeyID, semantic, func(c *Conn) error { if c.outbound == nil || c.outboundControl == nil { return ErrConnClosed } @@ -1520,7 +1678,7 @@ func (m *SessionManager) pushToBusinessAuthKeyBestEffort(ctx context.Context, us }) } -func (m *SessionManager) pushToBusinessAuthKey(ctx context.Context, userID int64, businessAuthKeyID [8]byte, minLayer int, send func(*Conn) error) (int, error) { +func (m *SessionManager) pushToBusinessAuthKey(ctx context.Context, userID int64, businessAuthKeyID [8]byte, semantic tlprofile.SemanticID, send func(*Conn) error) (int, error) { m.mu.Lock() candidates := m.businessAuthKeyCandidatesLocked(businessAuthKeyID) conns := make([]*Conn, 0, len(candidates)) @@ -1532,7 +1690,7 @@ func (m *SessionManager) pushToBusinessAuthKey(ctx context.Context, userID int64 // 未就绪：密聊消息靠 getDifference 补，typing 直接丢——都不进 pending。 continue } - if !sessionSupportsMinimumLayer(c, minLayer) { + if !sessionSupportsSemantic(c, semantic) { continue } conns = append(conns, c) @@ -1579,7 +1737,7 @@ func (m *SessionManager) pushToBusinessAuthKey(ctx context.Context, userID int64 func (m *SessionManager) pushToUser(ctx context.Context, userID int64, excludeAuthKeyID *[8]byte, excludeSessionID int64, t proto.MessageType, msg tg.UpdatesClass) (int, error) { getUpdates := onceLayerUpdatesFanout(ctx, msg) - return m.pushToUserWithSender(ctx, userID, excludeAuthKeyID, excludeSessionID, 0, t, getUpdates, true, func(c *Conn) error { + return m.pushToUserWithSender(ctx, userID, excludeAuthKeyID, excludeSessionID, nil, 0, t, getUpdates, true, func(c *Conn) error { if c.outbound == nil || c.outboundControl == nil { return ErrConnClosed } @@ -1602,7 +1760,7 @@ func (m *SessionManager) pushToUser(ctx context.Context, userID int64, excludeAu // 「durable 兜底」丢弃。走 best-effort 发送，不阻塞调用方。 func (m *SessionManager) PushToUserTransientExceptAuthKeySession(ctx context.Context, userID int64, excludeAuthKeyID [8]byte, excludeSessionID int64, t proto.MessageType, msg tg.UpdatesClass, timeout time.Duration) (int, error) { getUpdates := onceLayerUpdatesFanout(ctx, msg) - return m.pushToUserWithSender(ctx, userID, &excludeAuthKeyID, excludeSessionID, 0, t, getUpdates, false, func(c *Conn) error { + return m.pushToUserWithSender(ctx, userID, &excludeAuthKeyID, excludeSessionID, nil, 0, t, getUpdates, false, func(c *Conn) error { if c.outbound == nil || c.outboundControl == nil { return ErrConnClosed } @@ -1618,9 +1776,9 @@ func (m *SessionManager) PushToUserTransientExceptAuthKeySession(ctx context.Con }) } -func (m *SessionManager) PushToUserTransientAtLeastLayer(ctx context.Context, userID int64, minLayer int, t proto.MessageType, msg tg.UpdatesClass, timeout time.Duration) (int, error) { +func (m *SessionManager) PushToUserTransientCompatible(ctx context.Context, userID int64, semantic tlprofile.SemanticID, t proto.MessageType, msg tg.UpdatesClass, timeout time.Duration) (int, error) { getUpdates := onceLayerUpdatesFanout(ctx, msg) - return m.pushToUserWithSender(ctx, userID, nil, 0, minLayer, t, getUpdates, false, func(c *Conn) error { + return m.pushToUserWithSender(ctx, userID, nil, 0, nil, semantic, t, getUpdates, false, func(c *Conn) error { if c.outbound == nil || c.outboundControl == nil { return ErrConnClosed } @@ -1641,10 +1799,6 @@ func (m *SessionManager) PushToUserExceptAuthKeySessionBestEffort(ctx context.Co } func (m *SessionManager) pushToUserBestEffort(ctx context.Context, userID int64, excludeAuthKeyID *[8]byte, excludeSessionID int64, t proto.MessageType, msg tg.UpdatesClass, timeout time.Duration) (int, error) { - return m.pushToUserBestEffortAtLeastLayer(ctx, userID, excludeAuthKeyID, excludeSessionID, 0, t, msg, timeout) -} - -func (m *SessionManager) pushToUserBestEffortAtLeastLayer(ctx context.Context, userID int64, excludeAuthKeyID *[8]byte, excludeSessionID int64, minLayer int, t proto.MessageType, msg tg.UpdatesClass, timeout time.Duration) (int, error) { if ctx != nil && ctx.Err() != nil { return 0, ctx.Err() } @@ -1670,7 +1824,7 @@ func (m *SessionManager) pushToUserBestEffortAtLeastLayer(ctx context.Context, u defer cancel() } getUpdates := onceLayerUpdatesFanout(sendCtx, msg) - return m.pushToUserWithSender(ctx, userID, excludeAuthKeyID, excludeSessionID, minLayer, t, getUpdates, true, func(c *Conn) error { + return m.pushToUserWithSender(ctx, userID, excludeAuthKeyID, excludeSessionID, nil, 0, t, getUpdates, true, func(c *Conn) error { if c.outbound == nil || c.outboundControl == nil { return ErrConnClosed } @@ -1717,7 +1871,7 @@ func onceLayerUpdatesFanout(ctx context.Context, msg tg.UpdatesClass) func() (*l } } -func (m *SessionManager) pushToUserWithSender(ctx context.Context, userID int64, excludeAuthKeyID *[8]byte, excludeSessionID int64, minLayer int, t proto.MessageType, getUpdates func() (*layerUpdatesFanout, error), queueWhenNotReady bool, send func(*Conn) error) (int, error) { +func (m *SessionManager) pushToUserWithSender(ctx context.Context, userID int64, excludeAuthKeyID *[8]byte, excludeSessionID int64, excludeBusinessAuthKeyID *[8]byte, semantic tlprofile.SemanticID, t proto.MessageType, getUpdates func() (*layerUpdatesFanout, error), queueWhenNotReady bool, send func(*Conn) error) (int, error) { // push fan-out 是连接层最热路径之一：debug 日志的字段构造（含 auth_key hex 格式化） // 在关闭 debug 时也会求值，先查级别一次、按需记日志。 debug := m.log.Core().Enabled(zapcore.DebugLevel) @@ -1733,11 +1887,11 @@ func (m *SessionManager) pushToUserWithSender(ctx context.Context, userID int64, skipped := 0 needQueue := false for key, c := range m.byUser[userID] { - if shouldExcludeSession(c, excludeAuthKeyID, excludeSessionID) { + if shouldExcludeSession(c, excludeAuthKeyID, excludeSessionID) || shouldExcludeBusinessAuthKey(c, excludeBusinessAuthKeyID) { excluded++ continue } - if !sessionSupportsMinimumLayer(c, minLayer) { + if !sessionSupportsSemantic(c, semantic) { skipped++ continue } @@ -1768,11 +1922,11 @@ func (m *SessionManager) pushToUserWithSender(ctx context.Context, userID int64, m.mu.Lock() total = len(m.byUser[userID]) for key, c := range m.byUser[userID] { - if shouldExcludeSession(c, excludeAuthKeyID, excludeSessionID) { + if shouldExcludeSession(c, excludeAuthKeyID, excludeSessionID) || shouldExcludeBusinessAuthKey(c, excludeBusinessAuthKeyID) { excluded++ continue } - if !sessionSupportsMinimumLayer(c, minLayer) { + if !sessionSupportsSemantic(c, semantic) { skipped++ continue } @@ -1825,6 +1979,9 @@ func (m *SessionManager) pushToUserWithSender(ctx context.Context, userID int64, if c.userID.Load() != userID { continue } + if shouldExcludeBusinessAuthKey(c, excludeBusinessAuthKeyID) { + continue + } if err := send(c); err != nil { if isOutboundStaleLayerEpoch(err) { // Do not classify profile correction as slow-consumer evidence. @@ -2330,6 +2487,7 @@ func (m *SessionManager) removeLocked(c *Conn, dropPending bool) int64 { removeUserIndex(m.byUser, uid, key) } m.clearSessionChannelIndexesLocked(c, key) + m.clearUpdatesActivationLocked(c) if dropPending { m.deletePendingLocked(key) } @@ -2783,15 +2941,26 @@ func shouldExcludeSession(c *Conn, excludeAuthKeyID *[8]byte, excludeSessionID i return c.authKeyID == *excludeAuthKeyID } -func sessionSupportsMinimumLayer(c *Conn, minLayer int) bool { - if minLayer <= 0 { +func shouldExcludeBusinessAuthKey(c *Conn, excludeBusinessAuthKeyID *[8]byte) bool { + if c == nil || excludeBusinessAuthKeyID == nil || *excludeBusinessAuthKeyID == ([8]byte{}) { + return false + } + return connUsesBusinessAuthKey(c, *excludeBusinessAuthKeyID) +} + +func sessionSupportsSemantic(c *Conn, semantic tlprofile.SemanticID) bool { + if semantic == 0 { return true } if c == nil { return false } state := c.LayerProfileState() - return state.Origin != LayerProfileUnknown && int(state.Profile) >= minLayer + if state.Origin == LayerProfileUnknown { + return false + } + _, ok := tlprofile.WireID(state.Profile, semantic) + return ok } func sessionKeyLog(id [8]byte) string { diff --git a/internal/mtprotoedge/session_manager_test.go b/internal/mtprotoedge/session_manager_test.go index dd4b3c0f..10a14495 100644 --- a/internal/mtprotoedge/session_manager_test.go +++ b/internal/mtprotoedge/session_manager_test.go @@ -1071,6 +1071,110 @@ func TestSessionManagerWithholdsUpdatesReadinessUntilExactProfile(t *testing.T) } } +func TestSessionUpdatesActivationIsSingleFlightAndGenerationFenced(t *testing.T) { + sm := NewSessionManager(zaptest.NewLogger(t)) + key := sessionKey{authKeyID: [8]byte{0x51}, sessionID: 5100} + old := &Conn{authKeyID: key.authKeyID, sessionID: key.sessionID} + if err := sm.Register(old); err != nil { + t.Fatal(err) + } + oldToken, ok := sm.BeginSessionUpdatesActivation(key.authKeyID, key.sessionID) + if !ok || oldToken == 0 { + t.Fatal("first physical generation did not acquire activation") + } + if token, ok := sm.BeginSessionUpdatesActivation(key.authKeyID, key.sessionID); ok || token != 0 { + t.Fatalf("concurrent activation acquired token %d", token) + } + sm.EndSessionUpdatesActivation(key.authKeyID, key.sessionID, oldToken+1) + if token, ok := sm.BeginSessionUpdatesActivation(key.authKeyID, key.sessionID); ok || token != 0 { + t.Fatal("wrong-token release cleared active claim") + } + + replacement := &Conn{authKeyID: key.authKeyID, sessionID: key.sessionID} + if err := sm.Register(replacement); err != nil { + t.Fatal(err) + } + newToken, ok := sm.BeginSessionUpdatesActivation(key.authKeyID, key.sessionID) + if !ok || newToken == 0 || newToken == oldToken { + t.Fatalf("replacement activation token = %d, old %d", newToken, oldToken) + } + sm.EndSessionUpdatesActivation(key.authKeyID, key.sessionID, oldToken) + if token, ok := sm.BeginSessionUpdatesActivation(key.authKeyID, key.sessionID); ok || token != 0 { + t.Fatal("old generation callback cleared replacement claim") + } + sm.EndSessionUpdatesActivation(key.authKeyID, key.sessionID, newToken) + if token, ok := sm.BeginSessionUpdatesActivation(key.authKeyID, key.sessionID); !ok || token == 0 { + t.Fatal("matching replacement token did not release claim") + } +} + +func TestSessionUpdatesActivationLeaseRecoversAbandonedClaim(t *testing.T) { + sm := NewSessionManager(zaptest.NewLogger(t)) + key := sessionKey{authKeyID: [8]byte{0x52}, sessionID: 5200} + now := time.Unix(1700000000, 0) + c := &Conn{authKeyID: key.authKeyID, sessionID: key.sessionID, now: func() time.Time { return now }} + if err := sm.Register(c); err != nil { + t.Fatal(err) + } + first, ok := sm.BeginSessionUpdatesActivation(key.authKeyID, key.sessionID) + if !ok { + t.Fatal("first activation claim rejected") + } + now = now.Add(updatesActivationClaimTTL - time.Second) + if token, ok := sm.BeginSessionUpdatesActivation(key.authKeyID, key.sessionID); ok || token != 0 { + t.Fatal("live activation lease was stolen") + } + now = now.Add(2 * time.Second) + second, ok := sm.BeginSessionUpdatesActivation(key.authKeyID, key.sessionID) + if !ok || second == 0 || second == first { + t.Fatalf("expired activation lease was not replaced: first=%d second=%d", first, second) + } +} + +func TestSessionBootstrapProbeIsOneShotRetryableAndGenerationFenced(t *testing.T) { + sm := NewSessionManager(zaptest.NewLogger(t)) + key := sessionKey{authKeyID: [8]byte{0x53}, sessionID: 5300} + old := &Conn{authKeyID: key.authKeyID, sessionID: key.sessionID} + if err := sm.Register(old); err != nil { + t.Fatal(err) + } + failedToken, ok := sm.BeginSessionBootstrapProbe(key.authKeyID, key.sessionID) + if !ok || failedToken == 0 { + t.Fatal("first bootstrap probe was not claimed") + } + if token, ok := sm.BeginSessionBootstrapProbe(key.authKeyID, key.sessionID); ok || token != 0 { + t.Fatalf("concurrent bootstrap probe acquired token %d", token) + } + sm.EndSessionBootstrapProbe(key.authKeyID, key.sessionID, failedToken, false) + oldToken, ok := sm.BeginSessionBootstrapProbe(key.authKeyID, key.sessionID) + if !ok || oldToken == 0 || oldToken == failedToken { + t.Fatalf("failed probe did not become retryable: failed=%d retry=%d", failedToken, oldToken) + } + + replacement := &Conn{authKeyID: key.authKeyID, sessionID: key.sessionID} + if err := sm.Register(replacement); err != nil { + t.Fatal(err) + } + newToken, ok := sm.BeginSessionBootstrapProbe(key.authKeyID, key.sessionID) + if !ok || newToken == 0 || newToken == oldToken { + t.Fatalf("replacement bootstrap token = %d, old %d", newToken, oldToken) + } + sm.EndSessionBootstrapProbe(key.authKeyID, key.sessionID, oldToken, true) + if token, ok := sm.BeginSessionBootstrapProbe(key.authKeyID, key.sessionID); ok || token != 0 { + t.Fatal("old generation callback cleared replacement probe") + } + sm.EndSessionBootstrapProbe(key.authKeyID, key.sessionID, newToken, true) + if token, ok := sm.BeginSessionBootstrapProbe(key.authKeyID, key.sessionID); ok || token != 0 { + t.Fatal("successful bootstrap probe was not one-shot") + } + + sm.BindUserForAuthKey(key.authKeyID, key.sessionID, 100) + sm.BindUserForAuthKey(key.authKeyID, key.sessionID, 200) + if token, ok := sm.BeginSessionBootstrapProbe(key.authKeyID, key.sessionID); !ok || token == 0 { + t.Fatal("user identity change did not reset bootstrap probe") + } +} + func TestPendingPushBodiesUseGlobalByteBudgetAndReleaseOnDrop(t *testing.T) { sm := NewSessionManager(zaptest.NewLogger(t)) msg := &tg.UpdateShort{Update: &tg.UpdateLoginToken{}, Date: 1700000000} diff --git a/internal/mtprotoedge/transient_push_test.go b/internal/mtprotoedge/transient_push_test.go index 931f2a7d..6db7a0cb 100644 --- a/internal/mtprotoedge/transient_push_test.go +++ b/internal/mtprotoedge/transient_push_test.go @@ -54,10 +54,10 @@ func TestPushTransientSkipsNotReadySession(t *testing.T) { } } -// Layer-228-only transient constructors must be filtered before encoding. A -// Layer 227 or unknown session is skipped without disconnecting it or queuing -// an unreplayable update, while the ready Layer 228 session receives it. -func TestPushTransientAtLeastLayerSkipsOldAndUnknownProfiles(t *testing.T) { +// Constructor compatibility comes from generated profile metadata, not a +// hard-coded minimum layer. Old/unknown sessions are skipped without encoding, +// disconnecting or queuing, while every generated compatible profile receives. +func TestPushTransientCompatibleSkipsUnavailableAndUnknownProfiles(t *testing.T) { sm := NewSessionManager(zaptest.NewLogger(t)) const userID = int64(101) makeConn := func(sessionID int64, profile tlprofile.Profile, known bool) *Conn { @@ -80,25 +80,26 @@ func TestPushTransientAtLeastLayerSkipsOldAndUnknownProfiles(t *testing.T) { return c } old := makeConn(1, tlprofile.Profile227, true) - current := makeConn(2, tlprofile.Profile228, true) + introduced := makeConn(2, tlprofile.Profile228, true) unknown := makeConn(3, 0, false) + newer := makeConn(4, tlprofile.Profile229, true) message := tg.EphemeralMessage{ ID: 7, FromID: &tg.PeerUser{UserID: 2001}, PeerID: &tg.PeerChannel{ChannelID: 3001}, ReceiverID: userID, Date: 1_900_000_000, Message: "private", } updates := &tg.Updates{Updates: []tg.UpdateClass{&tg.UpdateNewEphemeralMessage{Message: message}}, Date: 1_900_000_000} - sent, err := sm.PushToUserTransientAtLeastLayer(context.Background(), userID, 228, proto.MessageFromServer, updates, time.Second) - if err != nil || sent != 1 { + sent, err := sm.PushToUserTransientCompatible(context.Background(), userID, tlprofile.SemanticTypeUpdateNewEphemeralMessage, proto.MessageFromServer, updates, time.Second) + if err != nil || sent != 2 { t.Fatalf("sent=%d err=%v", sent, err) } - if len(old.outbound) != 0 || len(unknown.outbound) != 0 || len(current.outbound) != 1 { - t.Fatalf("queues old=%d unknown=%d current=%d", len(old.outbound), len(unknown.outbound), len(current.outbound)) + if len(old.outbound) != 0 || len(unknown.outbound) != 0 || len(introduced.outbound) != 1 || len(newer.outbound) != 1 { + t.Fatalf("queues old=%d unknown=%d introduced=%d newer=%d", len(old.outbound), len(unknown.outbound), len(introduced.outbound), len(newer.outbound)) } if old.isRetired() || unknown.isRetired() { t.Fatal("unsupported transient update retired an old/unknown session") } - for _, c := range []*Conn{old, current, unknown} { + for _, c := range []*Conn{old, introduced, unknown, newer} { sm.mu.RLock() pending := len(sm.pending[connSessionKey(c)]) sm.mu.RUnlock() diff --git a/internal/observability/metrics/registry.go b/internal/observability/metrics/registry.go index c2fe6b0a..fc4c60dd 100644 --- a/internal/observability/metrics/registry.go +++ b/internal/observability/metrics/registry.go @@ -265,6 +265,20 @@ func (r *Registry) RPCHandled(method string, d time.Duration, err error) { r.observe("telesrv_mtproto_rpc_duration_seconds", d, labels...) } +// RPCDatabase implements mtprotoedge.RPCDatabaseMetrics. +func (r *Registry) RPCDatabase(method string, queries int64, d time.Duration, errors int64) { + labels := []Label{{Name: "method", Value: method}} + if queries > 0 { + r.add("telesrv_rpc_db_queries_total", uint64(queries), labels...) + } + if errors > 0 { + r.add("telesrv_rpc_db_errors_total", uint64(errors), labels...) + } + if d > 0 { + r.observe("telesrv_rpc_db_time_seconds", d, labels...) + } +} + // InboundRPCQueued implements mtprotoedge.Metrics. func (r *Registry) InboundRPCQueued(method string, length, capacity int) { r.inc("telesrv_mtproto_inbound_rpc_queued_total", Label{Name: "method", Value: method}) @@ -384,6 +398,76 @@ func (r *Registry) OutboxFailed(err error) { r.inc("telesrv_rpc_outbox_failed_total", Label{Name: "outcome", Value: errorOutcome(err)}) } +// BootstrapReadyBatch implements postgres.BootstrapReadyBatchMetrics without +// importing store identities into the observability layer. +func (r *Registry) BootstrapReadyBatch(inputs int, matched int, d time.Duration, err error) { + outcome := errorOutcome(err) + r.inc("telesrv_bootstrap_ready_batches_total", Label{Name: "outcome", Value: outcome}) + r.observe("telesrv_bootstrap_ready_batch_duration_seconds", d, Label{Name: "outcome", Value: outcome}) + inputs = max(inputs, 0) + matched = max(min(matched, inputs), 0) + if err != nil { + r.add("telesrv_bootstrap_ready_selectors_total", uint64(inputs), Label{Name: "outcome", Value: "error"}) + return + } + r.add("telesrv_bootstrap_ready_selectors_total", uint64(matched), Label{Name: "outcome", Value: "matched"}) + r.add("telesrv_bootstrap_ready_selectors_total", uint64(inputs-matched), Label{Name: "outcome", Value: "miss"}) +} + +// BootstrapReadyPending implements postgres.BootstrapReadyBatchMetrics. +func (r *Registry) BootstrapReadyPending(delta int) { + r.addGauge("telesrv_bootstrap_ready_pending", int64(delta)) +} + +// ActiveChannelIDsCache implements channels.ActiveChannelIDsReadModelMetrics. +func (r *Registry) ActiveChannelIDsCache(outcome string) { + r.inc("telesrv_active_channel_ids_cache_total", Label{Name: "outcome", Value: outcome}) +} + +// ActiveChannelIDsBatch implements postgres.ActiveChannelIDsBatchMetrics. +func (r *Registry) ActiveChannelIDsBatch(selectors int, rows int, d time.Duration, err error) { + outcome := errorOutcome(err) + r.inc("telesrv_active_channel_ids_batches_total", Label{Name: "outcome", Value: outcome}) + r.add("telesrv_active_channel_ids_selectors_total", uint64(max(selectors, 0)), Label{Name: "outcome", Value: outcome}) + if err == nil { + r.add("telesrv_active_channel_ids_rows_total", uint64(max(rows, 0))) + } + r.observe("telesrv_active_channel_ids_batch_duration_seconds", d, Label{Name: "outcome", Value: outcome}) +} + +// ActiveChannelIDsPending implements postgres.ActiveChannelIDsBatchMetrics. +func (r *Registry) ActiveChannelIDsPending(delta int) { + r.addGauge("telesrv_active_channel_ids_pending", int64(delta)) +} + +// PresenceLastSeenBatch implements rpc.Metrics. +func (r *Registry) PresenceLastSeenBatch(count int, d time.Duration, err error) { + labels := []Label{{Name: "outcome", Value: errorOutcome(err)}} + r.inc("telesrv_presence_last_seen_batches_total", labels...) + r.add("telesrv_presence_last_seen_updates_total", uint64(max(count, 0)), labels...) + r.observe("telesrv_presence_last_seen_batch_duration_seconds", d, labels...) +} + +// PresenceLastSeenSubmitted implements rpc.Metrics. +func (r *Registry) PresenceLastSeenSubmitted() { + r.inc("telesrv_presence_last_seen_submitted_total") +} + +// PresenceLastSeenPending implements rpc.Metrics. +func (r *Registry) PresenceLastSeenPending(delta int) { + r.addGauge("telesrv_presence_last_seen_pending", int64(delta)) +} + +// PresenceLastSeenOverflow implements rpc.Metrics. +func (r *Registry) PresenceLastSeenOverflow() { + r.inc("telesrv_presence_last_seen_overflow_total") +} + +// PresenceLastSeenDrainDropped implements rpc.Metrics. +func (r *Registry) PresenceLastSeenDrainDropped(count int) { + r.add("telesrv_presence_last_seen_drain_dropped_total", uint64(max(count, 0))) +} + // ServeHTTP writes Prometheus text format. func (r *Registry) ServeHTTP(w http.ResponseWriter, _ *http.Request) { w.Header().Set("Content-Type", "text/plain; version=0.0.4; charset=utf-8") diff --git a/internal/observability/metrics/registry_test.go b/internal/observability/metrics/registry_test.go index 01ec80bd..18a9e5f2 100644 --- a/internal/observability/metrics/registry_test.go +++ b/internal/observability/metrics/registry_test.go @@ -13,12 +13,111 @@ import ( var ( _ mtprotoedge.Metrics = (*Registry)(nil) + _ mtprotoedge.RPCDatabaseMetrics = (*Registry)(nil) _ mtprotoedge.RPCResultMetrics = (*Registry)(nil) _ mtprotoedge.LogicalOutboxMetrics = (*Registry)(nil) _ mtprotoedge.ConnectionIntakeMetrics = (*Registry)(nil) _ rpc.Metrics = (*Registry)(nil) ) +func TestRegistryExportsRPCDatabaseWork(t *testing.T) { + registry := New() + registry.RPCDatabase("messages.getDialogs", 17, 25*time.Millisecond, 0) + recorder := httptest.NewRecorder() + registry.ServeHTTP(recorder, httptest.NewRequest("GET", "/metrics", nil)) + body := recorder.Body.String() + for _, want := range []string{ + `telesrv_rpc_db_queries_total{method="messages.getDialogs"} 17`, + `telesrv_rpc_db_time_seconds_sum{method="messages.getDialogs"} 0.025`, + `telesrv_rpc_db_time_seconds_count{method="messages.getDialogs"} 1`, + } { + if !strings.Contains(body, want) { + t.Fatalf("missing %q from:\n%s", want, body) + } + } +} + +func TestRegistryExportsPresenceLastSeenBatchWork(t *testing.T) { + registry := New() + registry.PresenceLastSeenBatch(37, 25*time.Millisecond, nil) + registry.PresenceLastSeenBatch(12, 50*time.Millisecond, errors.New("temporary")) + registry.PresenceLastSeenSubmitted() + registry.PresenceLastSeenSubmitted() + registry.PresenceLastSeenPending(9) + registry.PresenceLastSeenPending(-4) + registry.PresenceLastSeenOverflow() + registry.PresenceLastSeenDrainDropped(3) + recorder := httptest.NewRecorder() + registry.ServeHTTP(recorder, httptest.NewRequest("GET", "/metrics", nil)) + body := recorder.Body.String() + for _, want := range []string{ + `telesrv_presence_last_seen_batches_total{outcome="ok"} 1`, + `telesrv_presence_last_seen_batches_total{outcome="error"} 1`, + `telesrv_presence_last_seen_updates_total{outcome="ok"} 37`, + `telesrv_presence_last_seen_updates_total{outcome="error"} 12`, + `telesrv_presence_last_seen_submitted_total 2`, + `telesrv_presence_last_seen_pending 5`, + `telesrv_presence_last_seen_overflow_total 1`, + `telesrv_presence_last_seen_drain_dropped_total 3`, + } { + if !strings.Contains(body, want) { + t.Fatalf("missing %q from:\n%s", want, body) + } + } +} + +func TestRegistryExportsBootstrapReadyBatchWork(t *testing.T) { + registry := New() + registry.BootstrapReadyPending(7) + registry.BootstrapReadyBatch(7, 2, 25*time.Millisecond, nil) + registry.BootstrapReadyPending(-7) + registry.BootstrapReadyBatch(3, 0, 50*time.Millisecond, errors.New("temporary")) + recorder := httptest.NewRecorder() + registry.ServeHTTP(recorder, httptest.NewRequest("GET", "/metrics", nil)) + body := recorder.Body.String() + for _, want := range []string{ + `telesrv_bootstrap_ready_batches_total{outcome="ok"} 1`, + `telesrv_bootstrap_ready_batches_total{outcome="error"} 1`, + `telesrv_bootstrap_ready_selectors_total{outcome="matched"} 2`, + `telesrv_bootstrap_ready_selectors_total{outcome="miss"} 5`, + `telesrv_bootstrap_ready_selectors_total{outcome="error"} 3`, + `telesrv_bootstrap_ready_pending 0`, + } { + if !strings.Contains(body, want) { + t.Fatalf("missing %q from:\n%s", want, body) + } + } +} + +func TestRegistryExportsActiveChannelIDsReadModelWork(t *testing.T) { + registry := New() + registry.ActiveChannelIDsCache("hit") + registry.ActiveChannelIDsCache("miss") + registry.ActiveChannelIDsCache("served") + registry.ActiveChannelIDsPending(7) + registry.ActiveChannelIDsBatch(7, 19, 25*time.Millisecond, nil) + registry.ActiveChannelIDsPending(-7) + registry.ActiveChannelIDsBatch(3, 0, 50*time.Millisecond, errors.New("temporary")) + recorder := httptest.NewRecorder() + registry.ServeHTTP(recorder, httptest.NewRequest("GET", "/metrics", nil)) + body := recorder.Body.String() + for _, want := range []string{ + `telesrv_active_channel_ids_cache_total{outcome="hit"} 1`, + `telesrv_active_channel_ids_cache_total{outcome="miss"} 1`, + `telesrv_active_channel_ids_cache_total{outcome="served"} 1`, + `telesrv_active_channel_ids_batches_total{outcome="ok"} 1`, + `telesrv_active_channel_ids_batches_total{outcome="error"} 1`, + `telesrv_active_channel_ids_selectors_total{outcome="ok"} 7`, + `telesrv_active_channel_ids_selectors_total{outcome="error"} 3`, + `telesrv_active_channel_ids_rows_total 19`, + `telesrv_active_channel_ids_pending 0`, + } { + if !strings.Contains(body, want) { + t.Fatalf("missing %q from:\n%s", want, body) + } + } +} + func TestRegistryExportsBoundedAggregateMetrics(t *testing.T) { registry := New() registry.maxSeries = 2 diff --git a/internal/readmodelcache/cache.go b/internal/readmodelcache/cache.go index c318dc7a..a7ad90aa 100644 --- a/internal/readmodelcache/cache.go +++ b/internal/readmodelcache/cache.go @@ -32,6 +32,11 @@ type Config[K comparable, V any] struct { // MaxEntries 是 LRU 上界。<=0 时 New 返回 nil(等价"禁用缓存",沿用各处 // New*Cache(max<=0)->nil 的惯例;所有方法对 nil 安全,退化为直接 load)。 MaxEntries int + // MaxWeight 是可选的第二容量边界。>0 时每个值由 Weight 计算权重，缓存同时 + // 满足 MaxEntries 与 MaxWeight；单项超过上限时本次仍可返回但不驻留。 + MaxWeight int64 + // Weight 计算一个缓存值的相对占用；仅 MaxWeight>0 时使用。nil 时每项权重为 1。 + Weight func(V) int64 // TTL 仅作安全兜底(漏掉的带外写)。0 = 纯事件驱动,无时间过期。 TTL time.Duration // Clone 在 store 与返回两个边界上对值做深拷贝,隔离调用方与缓存项的别名突变。 @@ -43,6 +48,10 @@ type Config[K comparable, V any] struct { // Now 注入时钟,仅用于 TTL 过期判断;nil 时默认 time.Now。生产一律留空, // 测试可注入假时钟以确定地推进 TTL。 Now func() time.Time + // OnStore/OnRemove 供依赖倒排索引同步生命周期。回调在缓存锁内执行， + // 不得回调本 Cache 或阻塞；收到的 value 是缓存持有的 immutable clone。 + OnStore func(K, V) + OnRemove func(K, V) } type lruEntry[K comparable, V any] struct { @@ -50,6 +59,7 @@ type lruEntry[K comparable, V any] struct { value V hash int64 expireAt time.Time // 零值 = 不过期 + weight int64 } // Cache 是泛型 read-model 缓存。零值不可用,必须经 New 构造。nil *Cache 合法: @@ -59,12 +69,39 @@ type Cache[K comparable, V any] struct { ll *list.List // LRU 顺序,Front=最近使用 items map[K]*list.Element cap int + maxWeight int64 + weight int64 ttl time.Duration epoch uint64 sf singleflight.Group clone func(V) V + weigh func(V) int64 keyString func(K) string now func() time.Time + onStore func(K, V) + onRemove func(K, V) + + // batchFlights coordinates individual keys across overlapping concurrent + // GetOrLoadBatch calls. A singleflight key for the whole input slice cannot + // coalesce {1,2,3} with {2,3,4}; tracking the misses per key lets the first + // caller own 2/3 while the second still loads 4 in its own backend batch. + batchMu sync.Mutex + batchFlights map[batchFlightKey[K]]*batchFlight[V] +} + +type batchFlightKey[K comparable] struct { + key K + hash int64 + cacheable bool + epoch uint64 +} + +type batchFlight[V any] struct { + done chan struct{} + value V + ok bool + err error + retry bool } // New 构造一个 Cache。MaxEntries<=0 时返回 nil(禁用缓存,沿用既有惯例)。 @@ -81,13 +118,18 @@ func New[K comparable, V any](cfg Config[K, V]) *Cache[K, V] { now = time.Now } return &Cache[K, V]{ - ll: list.New(), - items: make(map[K]*list.Element, initialMapHint(cfg.MaxEntries)), - cap: cfg.MaxEntries, - ttl: cfg.TTL, - clone: cfg.Clone, - keyString: keyString, - now: now, + ll: list.New(), + items: make(map[K]*list.Element, initialMapHint(cfg.MaxEntries)), + cap: cfg.MaxEntries, + maxWeight: cfg.MaxWeight, + ttl: cfg.TTL, + clone: cfg.Clone, + weigh: cfg.Weight, + keyString: keyString, + now: now, + onStore: cfg.OnStore, + onRemove: cfg.OnRemove, + batchFlights: make(map[batchFlightKey[K]]*batchFlight[V]), } } @@ -189,19 +231,38 @@ func (c *Cache[K, V]) storeIfEpoch(key K, v V, hash int64, loadEpoch uint64) boo } func (c *Cache[K, V]) storeLocked(key K, v V, hash int64) { + weight := c.valueWeight(v) + if c.maxWeight > 0 && weight > c.maxWeight { + if el, ok := c.items[key]; ok { + c.removeElement(el) + } + return + } if el, ok := c.items[key]; ok { ent := el.Value.(*lruEntry[K, V]) + if c.onRemove != nil { + c.onRemove(ent.key, ent.value) + } + c.weight -= ent.weight ent.value = c.cloneValue(v) ent.hash = hash ent.expireAt = c.expireAt() + ent.weight = weight + c.weight += weight + if c.onStore != nil { + c.onStore(ent.key, ent.value) + } c.ll.MoveToFront(el) + c.evictOverflow() return } - ent := &lruEntry[K, V]{key: key, value: c.cloneValue(v), hash: hash, expireAt: c.expireAt()} + ent := &lruEntry[K, V]{key: key, value: c.cloneValue(v), hash: hash, expireAt: c.expireAt(), weight: weight} c.items[key] = c.ll.PushFront(ent) - if c.ll.Len() > c.cap { - c.evictOldest() + c.weight += weight + if c.onStore != nil { + c.onStore(ent.key, ent.value) } + c.evictOverflow() } // Store 把一个已在手的值写入缓存(warm-from-list 路径)。不自增 epoch:它不是失效, @@ -292,31 +353,58 @@ func (c *Cache[K, V]) GetOrLoadBatch( if len(missing) == 0 { return out, nil } - missingKeys := make([]K, len(missing)) - for i := range missing { - missingKeys[i] = missing[i].key + waits, owned := c.claimBatchFlights(missing, loadEpoch) + if len(owned) > 0 { + ownedKeys := make([]K, len(owned)) + for i := range owned { + ownedKeys[i] = owned[i].miss.key + } + loaded, loadErr := loadMissing(ctx, ownedKeys) + retry := false + if loadErr == nil { + entries := make([]batchStoreEntry[K, V], 0, len(owned)) + for _, owner := range owned { + value, ok := loaded[owner.miss.key] + if ok && owner.miss.cacheable { + entries = append(entries, batchStoreEntry[K, V]{ + key: owner.miss.key, value: value, hash: owner.miss.hash, + }) + } + } + retry = !c.storeBatchIfEpoch(entries, loadEpoch) + } + for _, owner := range owned { + value, ok := loaded[owner.miss.key] + c.completeBatchFlight(owner.key, owner.flight, value, ok, loadErr, retry) + } } - loaded, err := loadMissing(ctx, missingKeys) - if err != nil { - return nil, err + + retry := false + for _, wait := range waits { + select { + case <-wait.flight.done: + case <-ctx.Done(): + return nil, ctx.Err() + } + if wait.flight.err != nil { + return nil, wait.flight.err + } + if wait.flight.retry { + retry = true + continue + } + if wait.flight.ok { + out[wait.miss.key] = c.cloneValue(wait.flight.value) + } } - if c.cacheEpoch() != loadEpoch { - // 失效在批量 load 期间到达:重试整趟,避免用 pre-invalidation 数据遮蔽它。 + if retry { + // 失效在任一 owner 的批量 load 期间到达:所有参与者重查， + // 不让 pre-invalidation 的共享 flight 值越过 epoch 边界。 if err := ctx.Err(); err != nil { return nil, err } continue } - for _, m := range missing { - v, ok := loaded[m.key] - if !ok { - continue - } - out[m.key] = v - if m.cacheable { - c.storeIfEpoch(m.key, v, m.hash, loadEpoch) - } - } return out, nil } } @@ -327,6 +415,76 @@ type batchMiss[K comparable] struct { cacheable bool } +type batchWait[K comparable, V any] struct { + miss batchMiss[K] + key batchFlightKey[K] + flight *batchFlight[V] +} + +type batchStoreEntry[K comparable, V any] struct { + key K + value V + hash int64 +} + +func (c *Cache[K, V]) claimBatchFlights( + missing []batchMiss[K], + epoch uint64, +) (waits []batchWait[K, V], owned []batchWait[K, V]) { + waits = make([]batchWait[K, V], 0, len(missing)) + owned = make([]batchWait[K, V], 0, len(missing)) + c.batchMu.Lock() + for _, miss := range missing { + key := batchFlightKey[K]{key: miss.key, hash: miss.hash, cacheable: miss.cacheable, epoch: epoch} + flight, found := c.batchFlights[key] + wait := batchWait[K, V]{miss: miss, key: key, flight: flight} + if !found { + flight = &batchFlight[V]{done: make(chan struct{})} + c.batchFlights[key] = flight + wait.flight = flight + owned = append(owned, wait) + } + waits = append(waits, wait) + } + c.batchMu.Unlock() + return waits, owned +} + +func (c *Cache[K, V]) completeBatchFlight( + key batchFlightKey[K], + flight *batchFlight[V], + value V, + ok bool, + err error, + retry bool, +) { + c.batchMu.Lock() + flight.value = c.cloneValue(value) + flight.ok = ok + flight.err = err + flight.retry = retry + if current := c.batchFlights[key]; current == flight { + delete(c.batchFlights, key) + } + close(flight.done) + c.batchMu.Unlock() +} + +// storeBatchIfEpoch makes the write side of one batch atomic with respect to +// invalidation. Besides avoiding partial warm state, this gives every waiter +// one unambiguous retry decision for the batch generation it joined. +func (c *Cache[K, V]) storeBatchIfEpoch(entries []batchStoreEntry[K, V], expected uint64) bool { + c.mu.Lock() + defer c.mu.Unlock() + if c.epoch != expected { + return false + } + for _, entry := range entries { + c.storeLocked(entry.key, entry.value, entry.hash) + } + return true +} + func dedupeKeys[K comparable](keys []K) []K { seen := make(map[K]struct{}, len(keys)) out := make([]K, 0, len(keys)) @@ -391,6 +549,26 @@ func (c *Cache[K, V]) InvalidateWhere(pred func(K) bool) { c.mu.Unlock() } +// InvalidateWhereValue is the dependency-aware form of InvalidateWhere. It is +// intended for bounded composite snapshots whose invalidation key is carried +// by the immutable cached value (for example channel_id -> owner dialog page). +// pred runs under the cache lock and therefore must be fast and must not call +// back into this cache. +func (c *Cache[K, V]) InvalidateWhereValue(pred func(K, V) bool) { + if c == nil || pred == nil { + return + } + c.mu.Lock() + c.epoch++ + for key, el := range c.items { + ent := el.Value.(*lruEntry[K, V]) + if pred(key, ent.value) { + c.removeElement(el) + } + } + c.mu.Unlock() +} + // Flush 清空缓存并自增 epoch(监听器断线重连兜底)。 func (c *Cache[K, V]) Flush() { if c == nil { @@ -398,8 +576,15 @@ func (c *Cache[K, V]) Flush() { } c.mu.Lock() c.epoch++ + if c.onRemove != nil { + for el := c.ll.Front(); el != nil; el = el.Next() { + ent := el.Value.(*lruEntry[K, V]) + c.onRemove(ent.key, ent.value) + } + } c.ll.Init() c.items = make(map[K]*list.Element, initialMapHint(c.cap)) + c.weight = 0 c.mu.Unlock() } @@ -414,6 +599,19 @@ func (c *Cache[K, V]) Len() int { return n } +// Weight returns the current aggregate configured weight. It is intended for +// bounded observability and tests; callers must not use it as a correctness +// input because Weight is deliberately an approximation chosen by each cache. +func (c *Cache[K, V]) Weight() int64 { + if c == nil { + return 0 + } + c.mu.Lock() + weight := c.weight + c.mu.Unlock() + return weight +} + func (c *Cache[K, V]) cacheEpoch() uint64 { c.mu.Lock() e := c.epoch @@ -438,9 +636,34 @@ func (c *Cache[K, V]) evictOldest() { } } +func (c *Cache[K, V]) evictOverflow() { + for c.ll.Len() > c.cap || (c.maxWeight > 0 && c.weight > c.maxWeight) { + if c.ll.Back() == nil { + return + } + c.evictOldest() + } +} + func (c *Cache[K, V]) removeElement(el *list.Element) { + ent := el.Value.(*lruEntry[K, V]) + if c.onRemove != nil { + c.onRemove(ent.key, ent.value) + } + c.weight -= ent.weight c.ll.Remove(el) - delete(c.items, el.Value.(*lruEntry[K, V]).key) + delete(c.items, ent.key) +} + +func (c *Cache[K, V]) valueWeight(v V) int64 { + if c.maxWeight <= 0 || c.weigh == nil { + return 1 + } + weight := c.weigh(v) + if weight <= 0 { + return 1 + } + return weight } func (c *Cache[K, V]) cloneValue(v V) V { diff --git a/internal/readmodelcache/cache_test.go b/internal/readmodelcache/cache_test.go index 7dc4a3af..7f4f7bfc 100644 --- a/internal/readmodelcache/cache_test.go +++ b/internal/readmodelcache/cache_test.go @@ -3,6 +3,7 @@ package readmodelcache import ( "context" "fmt" + "reflect" "sync" "sync/atomic" "testing" @@ -81,6 +82,28 @@ func TestGetOrLoadSingleflightsConcurrentMiss(t *testing.T) { } } +func TestInvalidateWhereValueUsesImmutableDependency(t *testing.T) { + type value struct{ channels []int64 } + c := New[int, value](Config[int, value]{MaxEntries: 4}) + c.Store(1, value{channels: []int64{7, 8}}) + c.Store(2, value{channels: []int64{9}}) + + c.InvalidateWhereValue(func(_ int, v value) bool { + for _, id := range v.channels { + if id == 8 { + return true + } + } + return false + }) + if _, ok := c.Peek(1); ok { + t.Fatal("dependency match remained cached") + } + if got, ok := c.Peek(2); !ok || len(got.channels) != 1 || got.channels[0] != 9 { + t.Fatalf("unrelated value = %+v,%v, want cached channel 9", got, ok) + } +} + // TestEpochGuardRejectsStaleWriteback 证明 epoch 守卫堵住 lost-update:一次锁外 load // 期间到达的 Invalidate 不得被这次 load 的(已陈旧)结果覆盖;在飞读者最终拿到的是 // 失效后重载的新值,且缓存未被陈旧值污染。 @@ -178,6 +201,76 @@ func TestLRUTouchOnGet(t *testing.T) { } } +func TestWeightedLRUEvictsByTotalWeightAndSkipsOversize(t *testing.T) { + ctx := context.Background() + c := New[int, int](Config[int, int]{ + MaxEntries: 10, + MaxWeight: 5, + Weight: func(v int) int64 { return int64(v) }, + }) + mustLoad(t, c, 1, 2) + mustLoad(t, c, 2, 2) + mustLoad(t, c, 3, 3) + if _, ok := c.Peek(1); ok { + t.Fatal("oldest entry should be evicted when aggregate weight exceeds five") + } + for _, key := range []int{2, 3} { + if _, ok := c.Peek(key); !ok { + t.Fatalf("weighted LRU lost retained key %d", key) + } + } + loads := 0 + loadOversize := func() (int, error) { loads++; return 6, nil } + if v, err := c.GetOrLoad(ctx, 4, loadOversize); err != nil || v != 6 { + t.Fatalf("oversize first load = %d,%v", v, err) + } + if v, err := c.GetOrLoad(ctx, 4, loadOversize); err != nil || v != 6 { + t.Fatalf("oversize second load = %d,%v", v, err) + } + if loads != 2 { + t.Fatalf("oversize value unexpectedly retained: loads=%d, want 2", loads) + } + if _, ok := c.Peek(4); ok { + t.Fatal("single value above MaxWeight must not remain cached") + } +} + +func TestLifecycleCallbacksCoverReplaceEvictAndFlush(t *testing.T) { + type event struct { + op string + key int + value string + } + var events []event + c := New[int, string](Config[int, string]{ + MaxEntries: 2, + OnStore: func(key int, value string) { + events = append(events, event{op: "store", key: key, value: value}) + }, + OnRemove: func(key int, value string) { + events = append(events, event{op: "remove", key: key, value: value}) + }, + }) + c.Store(1, "a") + c.Store(1, "b") + c.Store(2, "c") + c.Store(3, "d") + c.Flush() + want := []event{ + {op: "store", key: 1, value: "a"}, + {op: "remove", key: 1, value: "a"}, + {op: "store", key: 1, value: "b"}, + {op: "store", key: 2, value: "c"}, + {op: "store", key: 3, value: "d"}, + {op: "remove", key: 1, value: "b"}, + {op: "remove", key: 3, value: "d"}, + {op: "remove", key: 2, value: "c"}, + } + if !reflect.DeepEqual(events, want) { + t.Fatalf("lifecycle events = %#v, want %#v", events, want) + } +} + func TestVersionGateReloadsOnHashChange(t *testing.T) { ctx := context.Background() c := New[int, string](Config[int, string]{MaxEntries: 16}) @@ -389,6 +482,74 @@ func TestGetOrLoadBatchCachesHitsMissesAndNegatives(t *testing.T) { } } +func TestGetOrLoadBatchCoalescesOverlappingConcurrentMissesPerKey(t *testing.T) { + ctx := context.Background() + c := New[int, batchVal](Config[int, batchVal]{MaxEntries: 64}) + noVersion := func(int) (int64, bool) { return 0, true } + + firstStarted := make(chan struct{}) + secondLoaded := make(chan struct{}) + releaseFirst := make(chan struct{}) + var calls atomic.Int32 + var mu sync.Mutex + loadedKeys := make(map[int]int) + load := func(_ context.Context, missing []int) (map[int]batchVal, error) { + call := calls.Add(1) + mu.Lock() + for _, key := range missing { + loadedKeys[key]++ + } + mu.Unlock() + if call == 1 { + close(firstStarted) + <-releaseFirst + } else { + close(secondLoaded) + } + out := make(map[int]batchVal, len(missing)) + for _, key := range missing { + out[key] = batchVal{n: key * 10, found: true} + } + return out, nil + } + + firstResult := make(chan map[int]batchVal, 1) + firstErr := make(chan error, 1) + go func() { + got, err := c.GetOrLoadBatch(ctx, []int{1, 2, 3}, noVersion, load) + firstResult <- got + firstErr <- err + }() + <-firstStarted + + secondResult := make(chan map[int]batchVal, 1) + secondErr := make(chan error, 1) + go func() { + got, err := c.GetOrLoadBatch(ctx, []int{2, 3, 4}, noVersion, load) + secondResult <- got + secondErr <- err + }() + <-secondLoaded + close(releaseFirst) + + first, second := <-firstResult, <-secondResult + if err := <-firstErr; err != nil { + t.Fatal(err) + } + if err := <-secondErr; err != nil { + t.Fatal(err) + } + if first[1].n != 10 || first[2].n != 20 || first[3].n != 30 || + second[2].n != 20 || second[3].n != 30 || second[4].n != 40 { + t.Fatalf("overlapping results first=%+v second=%+v", first, second) + } + mu.Lock() + defer mu.Unlock() + if calls.Load() != 2 || loadedKeys[1] != 1 || loadedKeys[2] != 1 || loadedKeys[3] != 1 || loadedKeys[4] != 1 { + t.Fatalf("backend calls=%d loaded=%v, want two batches and every key exactly once", calls.Load(), loadedKeys) + } +} + func TestGetOrLoadBatchVersionGateReloadsOnHashChange(t *testing.T) { ctx := context.Background() c := New[int, batchVal](Config[int, batchVal]{MaxEntries: 64}) diff --git a/internal/rpc/account.go b/internal/rpc/account.go index 06768f40..bec54ca4 100644 --- a/internal/rpc/account.go +++ b/internal/rpc/account.go @@ -1042,6 +1042,7 @@ func (r *Router) onAccountSetGlobalPrivacySettings(ctx context.Context, settings return nil, internalErr() } r.accountSettings.Store(userID, saved) + r.invalidateRPCProjectionForUser(userID) return tgGlobalPrivacySettings(saved.GlobalPrivacy), nil } return &settings, nil @@ -1467,6 +1468,15 @@ func tgGlobalPrivacySettings(gp domain.GlobalPrivacy) *tg.GlobalPrivacySettings if gp.NoncontactPeersPaidStars > 0 { out.SetNoncontactPeersPaidStars(gp.NoncontactPeersPaidStars) } + if !gp.DisallowedGifts.Zero() { + out.SetDisallowedGifts(tg.DisallowedGiftsSettings{ + DisallowUnlimitedStargifts: gp.DisallowedGifts.UnlimitedStargifts, + DisallowLimitedStargifts: gp.DisallowedGifts.LimitedStargifts, + DisallowUniqueStargifts: gp.DisallowedGifts.UniqueStargifts, + DisallowPremiumGifts: gp.DisallowedGifts.PremiumGifts, + DisallowStargiftsFromChannels: gp.DisallowedGifts.StargiftsFromChannel, + }) + } return out } @@ -1482,6 +1492,15 @@ func domainGlobalPrivacy(settings tg.GlobalPrivacySettings) domain.GlobalPrivacy if v, ok := settings.GetNoncontactPeersPaidStars(); ok && v > 0 { gp.NoncontactPeersPaidStars = v } + if gifts, ok := settings.GetDisallowedGifts(); ok { + gp.DisallowedGifts = domain.DisallowedGifts{ + UnlimitedStargifts: gifts.DisallowUnlimitedStargifts, + LimitedStargifts: gifts.DisallowLimitedStargifts, + UniqueStargifts: gifts.DisallowUniqueStargifts, + PremiumGifts: gifts.DisallowPremiumGifts, + StargiftsFromChannel: gifts.DisallowStargiftsFromChannels, + } + } return gp } diff --git a/internal/rpc/account_deletion.go b/internal/rpc/account_deletion.go index 5bd90c98..0b13acf6 100644 --- a/internal/rpc/account_deletion.go +++ b/internal/rpc/account_deletion.go @@ -59,15 +59,11 @@ func (r *Router) onAccountDeleteAccount(ctx context.Context, req *tg.AccountDele return false, tgerr.New(420, fmt.Sprintf("2FA_CONFIRM_WAIT_%d", wait)) } r.finishDeletedAccountAuthorizations(ctx, userID, outcome.Deletion.RevokedAuthorizations) - r.invalidateRPCProjectionForUser(userID) - dispatchNotifications := func() { - dispatchCtx, cancel := context.WithTimeout(context.Background(), 30*time.Second) - defer cancel() - r.runAccountLifecycleOnce(dispatchCtx, 500) - } - if !postresponse.Register(ctx, dispatchNotifications) { - go dispatchNotifications() - } + r.invalidateDeletedUserProjectionFacts(userID) + // A tombstone changes this target for every viewer. Flushing once is bounded + // and avoids four full-cache predicate scans; the PostgreSQL user_deleted + // event performs the same coarse invalidation on other instances. + r.flushRPCProjectionCache() return true, nil } @@ -130,6 +126,26 @@ func (r *Router) finishDeletedAccountAuthorizations(ctx context.Context, userID } } +// NotifyModerationAccountDeletion completes the runtime half of the durable +// moderation tombstone. Moderation runs off-request, so every revoked auth key +// can be disconnected immediately; reconnects then observe the missing durable +// authorization and the auth service's tombstone guard. +func (r *Router) NotifyModerationAccountDeletion(ctx context.Context, result domain.AccountDeletionResult) { + if r == nil || !result.Changed || result.User.ID == 0 { + return + } + r.finishDeletedAccountAuthorizations(ctx, result.User.ID, result.RevokedAuthorizations) + r.invalidateDeletedUserProjectionFacts(result.User.ID) + r.flushRPCProjectionCache() +} + +func (r *Router) invalidateDeletedUserProjectionFacts(userID int64) { + if r == nil || userID == 0 || r.deps.UserProjectionFacts == nil { + return + } + r.deps.UserProjectionFacts.InvalidateAccountFreezeFact(userID) +} + func accountDeletionErr(err error) error { switch { case errors.Is(err, domain.ErrPasswordHashInvalid), errors.Is(err, domain.ErrSRPIDInvalid), errors.Is(err, domain.ErrSRPPasswordChanged): diff --git a/internal/rpc/account_deletion_rpc_test.go b/internal/rpc/account_deletion_rpc_test.go index 779e69f3..ae83dd51 100644 --- a/internal/rpc/account_deletion_rpc_test.go +++ b/internal/rpc/account_deletion_rpc_test.go @@ -8,7 +8,6 @@ import ( "time" "github.com/iamxvbaba/td/clock" - "github.com/iamxvbaba/td/proto" "github.com/iamxvbaba/td/tg" "github.com/iamxvbaba/td/tgerr" "go.uber.org/zap/zaptest" @@ -33,7 +32,8 @@ func TestAccountDeleteRPCDeliversResultBeforeClosingCurrentSession(t *testing.T) }, } sessions := &deletionCaptureSessions{} - r := New(Config{}, Deps{Account: accountSvc, Sessions: sessions}, zaptest.NewLogger(t), clock.System) + facts := &recordingUserProjectionFactInvalidator{} + r := New(Config{}, Deps{Account: accountSvc, Sessions: sessions, UserProjectionFacts: facts}, zaptest.NewLogger(t), clock.System) ctx := postresponse.WithCallbacks(WithSessionID(WithAuthKeyID(WithUserID(context.Background(), 42), current), 77)) ok, err := r.onAccountDeleteAccount(ctx, &tg.AccountDeleteAccountRequest{Reason: "manual"}) if err != nil || !ok { @@ -45,10 +45,19 @@ func TestAccountDeleteRPCDeliversResultBeforeClosingCurrentSession(t *testing.T) if !sessions.wasClosed(other) { t.Fatal("other auth key was not revoked immediately") } + if accountSvc.sweepCalls != 0 { + t.Fatalf("account lifecycle sweeps before rpc_result delivery = %d, want 0", accountSvc.sweepCalls) + } + if len(facts.freezes) != 1 || facts.freezes[0] != 42 || len(facts.phones) != 1 || facts.phones[0] != 42 { + t.Fatalf("deleted user fact invalidations freezes=%v phones=%v, want [42]/[42]", facts.freezes, facts.phones) + } postresponse.Run(ctx) if !sessions.wasClosed(current) { t.Fatal("current auth key not closed after rpc_result delivery") } + if accountSvc.sweepCalls != 0 { + t.Fatalf("account lifecycle sweeps after rpc_result delivery = %d, want 0", accountSvc.sweepCalls) + } } func TestAccountDeleteRPCMapsDelayedTwoFAWait(t *testing.T) { @@ -73,18 +82,6 @@ func TestDeleteAccountAllowedWithoutFullAuthorization(t *testing.T) { } } -func TestAccountDeletionNotificationCompletesForOfflineTarget(t *testing.T) { - sessions := &offlineDeletionSessions{} - svc := &deletionWorkerService{} - r := New(Config{}, Deps{Sessions: sessions}, zaptest.NewLogger(t), clock.System) - r.dispatchAccountDeletionNotification(context.Background(), svc, domain.AccountDeletionNotification{ - ID: 9, TargetUserID: 42, DeletedUserID: 77, Attempts: 1, - }) - if len(svc.completed) != 1 || svc.completed[0] != 9 { - t.Fatalf("completed notifications = %v, want [9]", svc.completed) - } -} - func TestAccountLifecyclePartialSweepFinishesCommittedDeletion(t *testing.T) { revoked := [8]byte{3} svc := &rpcDeletionAccountService{ @@ -104,12 +101,31 @@ func TestAccountLifecyclePartialSweepFinishesCommittedDeletion(t *testing.T) { } } +func TestModerationAccountDeletionClosesRevokedSessions(t *testing.T) { + revoked := [8]byte{4} + sessions := &deletionCaptureSessions{} + facts := &recordingUserProjectionFactInvalidator{} + r := New(Config{}, Deps{Sessions: sessions, UserProjectionFacts: facts}, zaptest.NewLogger(t), clock.System) + r.NotifyModerationAccountDeletion(context.Background(), domain.AccountDeletionResult{ + Changed: true, + User: domain.User{ID: 42, Deleted: true}, + RevokedAuthorizations: []domain.Authorization{{AuthKeyID: revoked, UserID: 42}}, + }) + if !sessions.wasClosed(revoked) { + t.Fatal("moderation-deleted authorization session was not closed") + } + if len(facts.freezes) != 1 || facts.freezes[0] != 42 || len(facts.phones) != 1 || facts.phones[0] != 42 { + t.Fatalf("moderation-deleted user fact invalidations freezes=%v phones=%v, want [42]/[42]", facts.freezes, facts.phones) + } +} + type rpcDeletionAccountService struct { *appaccount.Service outcome domain.AccountDeleteOutcome err error sweepResults []domain.AccountDeletionResult sweepErr error + sweepCalls int } func (s *rpcDeletionAccountService) DeleteAccount(context.Context, int64, [8]byte, string, *domain.PasswordCheck, time.Time) (domain.AccountDeleteOutcome, error) { @@ -133,6 +149,7 @@ func (*rpcDeletionAccountService) CancelConfirmPhoneCode(context.Context, int64, } func (s *rpcDeletionAccountService) SweepDueAccountDeletions(context.Context, time.Time, int) ([]domain.AccountDeletionResult, error) { + s.sweepCalls++ return s.sweepResults, s.sweepErr } @@ -141,27 +158,6 @@ type deletionCaptureSessions struct { closed [][8]byte } -type offlineDeletionSessions struct{ captureSessions } - -func (*offlineDeletionSessions) PushToUserExceptAuthKeySession(context.Context, int64, [8]byte, int64, proto.MessageType, tg.UpdatesClass) (int, error) { - return 0, nil -} - -type deletionWorkerService struct{ completed []int64 } - -func (*deletionWorkerService) SweepDueAccountDeletions(context.Context, time.Time, int) ([]domain.AccountDeletionResult, error) { - return nil, nil -} - -func (*deletionWorkerService) ClaimAccountDeletionNotifications(context.Context, time.Time, int, time.Duration) ([]domain.AccountDeletionNotification, error) { - return nil, nil -} - -func (s *deletionWorkerService) CompleteAccountDeletionNotification(_ context.Context, id int64, _ time.Time) error { - s.completed = append(s.completed, id) - return nil -} - func (s *deletionCaptureSessions) CloseSessionsForBusinessAuthKey(id [8]byte) int { s.closed = append(s.closed, id) return 1 diff --git a/internal/rpc/account_freeze_worker.go b/internal/rpc/account_freeze_worker.go index 80ea01cf..03b89b04 100644 --- a/internal/rpc/account_freeze_worker.go +++ b/internal/rpc/account_freeze_worker.go @@ -10,11 +10,6 @@ import ( "telesrv/internal/domain" ) -type accountFreezeNotificationService interface { - ClaimAccountFreezeNotifications(ctx context.Context, now time.Time, limit int, lease time.Duration) ([]domain.AccountFreezeNotification, error) - CompleteAccountFreezeNotification(ctx context.Context, id, version int64, now time.Time) error -} - // RunAccountFreezeNotifications drains the crash-safe, coalesced non-pts // updateUser queue. One attempt is enough for online delivery; offline clients // recover the current state from viewer-scoped user hydration. @@ -39,8 +34,8 @@ func (r *Router) RunAccountFreezeNotifications(ctx context.Context, interval tim } func (r *Router) drainAccountFreezeNotifications(ctx context.Context, batch int) { - svc, ok := r.deps.AccountFreeze.(accountFreezeNotificationService) - if !ok || r.deps.Users == nil { + svc := r.deps.AccountFreezeNotifications + if svc == nil || r.deps.Users == nil { return } for { @@ -61,7 +56,7 @@ func (r *Router) drainAccountFreezeNotifications(ctx context.Context, batch int) } } -func (r *Router) dispatchAccountFreezeNotification(ctx context.Context, svc accountFreezeNotificationService, notification domain.AccountFreezeNotification) { +func (r *Router) dispatchAccountFreezeNotification(ctx context.Context, svc AccountFreezeNotificationService, notification domain.AccountFreezeNotification) { peer := domain.Peer{Type: domain.PeerTypeUser, ID: notification.FrozenUserID} if contacts, ok := r.deps.Contacts.(interface{ InvalidateViewers(...int64) }); ok { contacts.InvalidateViewers(notification.TargetUserID) diff --git a/internal/rpc/account_freeze_worker_test.go b/internal/rpc/account_freeze_worker_test.go index c9f39f42..eeb7dd38 100644 --- a/internal/rpc/account_freeze_worker_test.go +++ b/internal/rpc/account_freeze_worker_test.go @@ -26,9 +26,9 @@ func TestAccountFreezeNotificationPushesCurrentViewerProjection(t *testing.T) { RestrictionReasons: domain.AccountFrozenRestrictionReasons(), }} r := New(Config{}, Deps{ - AccountFreeze: freezeSvc, - Users: users, - Sessions: sessions, + AccountFreezeNotifications: freezeSvc, + Users: users, + Sessions: sessions, }, zaptest.NewLogger(t), clock.System) r.dispatchAccountFreezeNotification(context.Background(), freezeSvc, domain.AccountFreezeNotification{ @@ -67,9 +67,9 @@ func TestAccountFreezeNotificationLoadsCurrentStateAndRetriesLoadFailure(t *test freezeSvc := &freezeWorkerService{} users := &freezeWorkerUsers{err: errors.New("projection unavailable")} r := New(Config{}, Deps{ - AccountFreeze: freezeSvc, - Users: users, - Sessions: sessions, + AccountFreezeNotifications: freezeSvc, + Users: users, + Sessions: sessions, }, zaptest.NewLogger(t), clock.System) notification := domain.AccountFreezeNotification{ ID: 8, TargetUserID: viewerID, FrozenUserID: frozenID, Version: 5, Frozen: true, diff --git a/internal/rpc/account_lifecycle_worker.go b/internal/rpc/account_lifecycle_worker.go index a19de648..cd290331 100644 --- a/internal/rpc/account_lifecycle_worker.go +++ b/internal/rpc/account_lifecycle_worker.go @@ -4,7 +4,6 @@ import ( "context" "time" - "github.com/iamxvbaba/td/tg" "go.uber.org/zap" "telesrv/internal/domain" @@ -12,16 +11,11 @@ import ( type accountLifecycleWorkerService interface { SweepDueAccountDeletions(ctx context.Context, now time.Time, limit int) ([]domain.AccountDeletionResult, error) - ClaimAccountDeletionNotifications(ctx context.Context, now time.Time, limit int, lease time.Duration) ([]domain.AccountDeletionNotification, error) - CompleteAccountDeletionNotification(ctx context.Context, id int64, now time.Time) error } // RunAccountLifecycle executes all due account deletion sources through one -// tombstone path and drains the durable non-pts updateUser queue. The queue is -// a crash-safe, bounded online nudge: offline users are completed after the -// first attempt because getDialogs/getHistory hydration independently returns -// the authoritative tombstone. This avoids an immortal retry queue for a -// non-pts update that cannot participate in getDifference. +// tombstone path. Deleted-user projections converge from authoritative reads; +// updateUser is non-PTS and therefore is not queued as a correctness signal. func (r *Router) RunAccountLifecycle(ctx context.Context, interval time.Duration, batch int) { if interval <= 0 { interval = time.Minute @@ -51,49 +45,24 @@ func (r *Router) runAccountLifecycleOnce(ctx context.Context, batch int) { sweepCtx, cancel := context.WithTimeout(ctx, 45*time.Second) results, err := svc.SweepDueAccountDeletions(sweepCtx, now, batch) cancel() + changed := false for _, result := range results { if !result.Changed { continue } - r.invalidateRPCProjectionForUser(result.User.ID) + changed = true r.finishDeletedAccountAuthorizations(context.Background(), result.User.ID, result.RevokedAuthorizations) } + if changed { + // One flush covers the entire due batch. Per-user predicate invalidation + // would scan the same large projection maps four times for every account. + r.flushRPCProjectionCache() + } if err != nil { // SweepDueAccountDeletions may return already-committed results before a - // later candidate fails. Always finish those sessions/caches and drain - // their durable notifications; the failed and remaining candidates are - // retried from their authoritative due rows on the next tick. + // later candidate fails. Always finish those sessions/caches; the failed + // and remaining candidates are retried from their authoritative due rows + // on the next tick. r.log.Warn("account lifecycle deletion sweep partially failed", zap.Int("completed", len(results)), zap.Error(err)) } - for { - claimCtx, claimCancel := context.WithTimeout(ctx, 30*time.Second) - notifications, err := svc.ClaimAccountDeletionNotifications(claimCtx, now, batch, 2*time.Minute) - claimCancel() - if err != nil { - r.log.Warn("claim account deletion notifications failed", zap.Error(err)) - return - } - for _, notification := range notifications { - r.dispatchAccountDeletionNotification(ctx, svc, notification) - } - if len(notifications) < batch { - return - } - } -} - -func (r *Router) dispatchAccountDeletionNotification(ctx context.Context, svc accountLifecycleWorkerService, notification domain.AccountDeletionNotification) { - now := r.clock.Now().UTC() - updates := &tg.Updates{ - Updates: []tg.UpdateClass{&tg.UpdateUser{UserID: notification.DeletedUserID}}, - Users: []tg.UserClass{tgUser(domain.User{ - ID: notification.DeletedUserID, - Deleted: true, - })}, - Date: int(now.Unix()), - } - r.pushUserUpdates(ctx, notification.TargetUserID, updates) - if err := svc.CompleteAccountDeletionNotification(ctx, notification.ID, now); err != nil { - r.log.Warn("complete account deletion notification failed", zap.Int64("notification_id", notification.ID), zap.Error(err)) - } } diff --git a/internal/rpc/account_phone.go b/internal/rpc/account_phone.go index 5597fd7e..a75d7f51 100644 --- a/internal/rpc/account_phone.go +++ b/internal/rpc/account_phone.go @@ -3,21 +3,11 @@ package rpc import ( "context" - "go.uber.org/zap" - "github.com/iamxvbaba/td/tg" "telesrv/internal/domain" ) -type phoneChangeEventConfirmer interface { - ConfirmEvent(ctx context.Context, authKeyID [8]byte, userID int64, event domain.UpdateEvent) error -} - -type phoneChangeReliableDispatchReporter interface { - PhoneChangeUsesReliableDispatch() bool -} - func (r *Router) onAccountSendChangePhoneCode(ctx context.Context, req *tg.AccountSendChangePhoneCodeRequest) (tg.AuthSentCodeClass, error) { userID, found, err := r.currentUserID(ctx) if err != nil { @@ -73,22 +63,11 @@ func (r *Router) onAccountChangePhone(ctx context.Context, req *tg.AccountChange return nil, internalErr() } r.invalidateRPCProjectionForUser(result.User.ID) - if result.Event.Pts > 0 { - if confirmer, ok := r.deps.Updates.(phoneChangeEventConfirmer); ok { - if err := confirmer.ConfirmEvent(ctx, authKeyID, userID, result.Event); err != nil { - // user/event/outbox 已原子提交，不能把已成功改号伪装成失败；当前 - // session 仍会收到 pts 簿记，设备水位存储可由后续 getDifference 自愈。 - r.log.Warn("confirm phone change event", zap.Int64("user_id", userID), zap.Int("pts", result.Event.Pts), zap.Error(err)) - } - } - reliable := false - if reporter, ok := r.deps.Account.(phoneChangeReliableDispatchReporter); ok { - reliable = reporter.PhoneChangeUsesReliableDispatch() - } - if !reliable { - r.pushUserUpdates(ctx, userID, tgUpdateForOutboxEvent(result.Event)) - } - r.bookkeepAuxPtsForCurrentSession(ctx, result.Event) + if result.Changed { + // account.changePhone returns the authoritative self User to the current + // session. Other online sessions receive a non-PTS updateUser; offline + // sessions converge on their next full-user/startup read. + r.pushPremiumStatusUpdate(ctx, result.User) } return r.tgSelfUserWithUsernames(ctx, result.User), nil } diff --git a/internal/rpc/account_phone_rpc_test.go b/internal/rpc/account_phone_rpc_test.go index 3fb76dd5..9de721d9 100644 --- a/internal/rpc/account_phone_rpc_test.go +++ b/internal/rpc/account_phone_rpc_test.go @@ -15,7 +15,7 @@ import ( "telesrv/internal/store/memory" ) -func TestAccountChangePhoneRPCReturnsSelfPushesOthersAndReplaysDifference(t *testing.T) { +func TestAccountChangePhoneRPCReturnsSelfAndPushesNonPTSUpdate(t *testing.T) { ctx := context.Background() users := memory.NewUserStore() auths := memory.NewAuthorizationStore() @@ -39,7 +39,7 @@ func TestAccountChangePhoneRPCReturnsSelfPushesOthersAndReplaysDifference(t *tes {Username: "Alice", Editable: true, Active: true, SortOrder: 0}, {Username: "aliceCollect0728b", Active: true, SortOrder: 1, CollectibleID: 2}, } - sessions := &captureSessions{} + sessions := &captureSessions{onlineUserIDs: []int64{user.ID}} r := New(Config{}, Deps{Account: accountSvc, Sessions: sessions, Usernames: registry}, zaptest.NewLogger(t), clock.System) reqCtx := WithSessionID(WithAuthKeyID(WithUserID(ctx, user.ID), authKeyID), 77) @@ -70,22 +70,23 @@ func TestAccountChangePhoneRPCReturnsSelfPushesOthersAndReplaysDifference(t *tes assertVectorOnlyUsernames(t, "account.changePhone", self, []string{"Alice", "aliceCollect0728b"}) otherPush, ok := sessions.lastUserPush().(*tg.Updates) - if !ok || len(otherPush.Updates) != 2 { + if !ok || len(otherPush.Updates) != 1 { t.Fatalf("other-session push = %T %+v", sessions.lastUserPush(), sessions.lastUserPush()) } - phoneUpdate, ok := otherPush.Updates[0].(*tg.UpdateUserPhone) - if !ok || phoneUpdate.UserID != user.ID || phoneUpdate.Phone != "15550013002" { - t.Fatalf("phone update = %T %+v", otherPush.Updates[0], otherPush.Updates[0]) + userUpdate, ok := otherPush.Updates[0].(*tg.UpdateUser) + if !ok || userUpdate.UserID != user.ID { + t.Fatalf("user update = %T %+v", otherPush.Updates[0], otherPush.Updates[0]) } - if _, ok := otherPush.Updates[1].(*tg.UpdateDeleteMessages); !ok { - t.Fatalf("pts bookkeeping = %T", otherPush.Updates[1]) + if len(otherPush.Users) != 1 { + t.Fatalf("push users = %+v", otherPush.Users) } - currentPush, ok := sessions.snapshot().message.(*tg.Updates) - if !ok || len(currentPush.Updates) != 1 { - t.Fatalf("current-session bookkeeping = %T %+v", sessions.snapshot().message, sessions.snapshot().message) + pushedSelf, ok := otherPush.Users[0].(*tg.User) + if !ok || pushedSelf.Phone != "15550013002" { + t.Fatalf("pushed self = %T %+v", otherPush.Users[0], otherPush.Users[0]) } - if _, ok := currentPush.Updates[0].(*tg.UpdateDeleteMessages); !ok { - t.Fatalf("current bookkeeping update = %T", currentPush.Updates[0]) + snapshot := sessions.snapshot() + if sessions.rawAuthKeyID != authKeyID || snapshot.sessionID != 77 { + t.Fatalf("push exclusion = %x/%d", sessions.rawAuthKeyID, snapshot.sessionID) } updateSvc := appupdates.NewService(memory.NewUpdateStateStore(), events) @@ -93,13 +94,8 @@ func TestAccountChangePhoneRPCReturnsSelfPushesOthersAndReplaysDifference(t *tes if err != nil { t.Fatalf("get difference: %v", err) } - tgDiff, ok := tgUpdatesDifference(user.ID, diff).(*tg.UpdatesDifference) - if !ok || len(tgDiff.OtherUpdates) != 1 { - t.Fatalf("difference = %T %+v", tgUpdatesDifference(user.ID, diff), tgUpdatesDifference(user.ID, diff)) - } - replayed, ok := tgDiff.OtherUpdates[0].(*tg.UpdateUserPhone) - if !ok || replayed.UserID != user.ID || replayed.Phone != "15550013002" { - t.Fatalf("replayed update = %T %+v", tgDiff.OtherUpdates[0], tgDiff.OtherUpdates[0]) + if diff.State.Pts != 0 || len(diff.Events) != 0 { + t.Fatalf("difference unexpectedly changed = %+v", diff) } } diff --git a/internal/rpc/account_settings_rpc_test.go b/internal/rpc/account_settings_rpc_test.go index 67134377..6f09e80c 100644 --- a/internal/rpc/account_settings_rpc_test.go +++ b/internal/rpc/account_settings_rpc_test.go @@ -56,6 +56,10 @@ func TestAccountSettingsRoundTrip(t *testing.T) { NewNoncontactPeersRequirePremium: true, } in.SetNoncontactPeersPaidStars(50) + in.SetDisallowedGifts(tg.DisallowedGiftsSettings{ + DisallowLimitedStargifts: true, + DisallowPremiumGifts: true, + }) saved, err := r.onAccountSetGlobalPrivacySettings(ctx, in) if err != nil { t.Fatalf("set global privacy: %v", err) @@ -135,4 +139,10 @@ func assertGlobalPrivacy(t *testing.T, got *tg.GlobalPrivacySettings, want tg.Gl if gotStars != wantStars { t.Fatalf("noncontact paid stars = %d, want %d", gotStars, wantStars) } + wantGifts, wantGiftsOK := want.GetDisallowedGifts() + gotGifts, gotGiftsOK := got.GetDisallowedGifts() + if gotGiftsOK != wantGiftsOK || gotGifts != wantGifts { + t.Fatalf("disallowed gifts = %+v ok=%v, want %+v ok=%v", + gotGifts, gotGiftsOK, wantGifts, wantGiftsOK) + } } diff --git a/internal/rpc/admin_hooks.go b/internal/rpc/admin_hooks.go index d0e18ce7..b63c79ce 100644 --- a/internal/rpc/admin_hooks.go +++ b/internal/rpc/admin_hooks.go @@ -39,6 +39,9 @@ func (r *Router) NotifyAccountFreezeChanged(_ context.Context, freeze domain.Acc if r == nil || freeze.UserID == 0 { return nil } + if r.deps.UserProjectionFacts != nil { + r.deps.UserProjectionFacts.InvalidateAccountFreezeFact(freeze.UserID) + } r.invalidateRPCProjectionForUser(freeze.UserID) if r.accountFreezeWake != nil { select { diff --git a/internal/rpc/auth.go b/internal/rpc/auth.go index a19b9f59..20251f0f 100644 --- a/internal/rpc/auth.go +++ b/internal/rpc/auth.go @@ -6,6 +6,7 @@ import ( "crypto/rand" "crypto/sha256" "encoding/binary" + "encoding/hex" "errors" "fmt" "strings" @@ -216,29 +217,43 @@ func (r *Router) onAuthBindTempAuthKey(ctx context.Context, req *tg.AuthBindTemp id, _ = AuthKeyIDFrom(ctx) } sessionID, _ := SessionIDFrom(ctx) - if err := r.deps.Auth.BindTempAuthKey(ctx, sessionID, domain.TempAuthKeyBinding{ + boundState, err := r.deps.Auth.BindTempAuthKey(ctx, sessionID, domain.TempAuthKeyBinding{ TempAuthKeyID: id, PermAuthKeyID: req.PermAuthKeyID, Nonce: req.Nonce, ExpiresAt: req.ExpiresAt, EncryptedMessage: append([]byte(nil), req.EncryptedMessage...), - }); err != nil { + }) + if err != nil { return false, bindTempAuthKeyErr(err) } permID := authKeyIDFromInt64(req.PermAuthKeyID) - // temp key (re)bind 后立即作废其 temp→perm 解析缓存，确保下一帧按新绑定重新解析， - // 不被 TTL 内的旧 perm 缓存命中（防跨账号串号）。 + // The committed bind transaction is authoritative for this immutable + // temp→permanent identity. Replace any prior local entry, then publish the + // exact positive mapping so Layer publication and the first business RPC do + // not re-read the same row. A competing different-permanent bind has already + // failed in the store before reaching this point. if id != ([8]byte{}) { r.tempKeyResolveCache.Delete(id) + r.cacheResolvedAuthKey(id, permID) } - // Save atomically merged raw/permanent Layer observations. Both identities - // must now re-read that durable permanent primary; pre-bind process caches - // are not ordering evidence and cannot overwrite the transaction's winner. + // Save atomically merged raw/permanent Layer observations and returned the + // exact committed tuple. Project that generation directly; a post-commit + // read could observe a later selector and wrongly attribute it to this bind. r.invalidateAuthUserCache(id) r.invalidateAuthUserCache(permID) unlockLayerCommit := r.lockAuthLayerCommit(id, permID) defer unlockLayerCommit() - r.invalidateBoundAuthKeyLayerResolution(id, permID) + layer, blocked, err := r.cacheBoundAuthKeyLayerResolution(id, permID, boundState) + if err != nil { + if r.log != nil { + r.log.Error("project committed temp auth key bind Layer failed", + zap.String("raw_auth_key_id", fmt.Sprintf("%x", id[:])), + zap.String("perm_auth_key_id", fmt.Sprintf("%x", permID[:])), + zap.Error(err)) + } + return false, internalErr() + } if r.deps.Sessions != nil { if all, ok := r.deps.Sessions.(RawAuthKeySessionBinder); ok { all.BindAuthKeyForRawAuthKey(id, permID) @@ -246,72 +261,86 @@ func (r *Router) onAuthBindTempAuthKey(ctx context.Context, req *tg.AuthBindTemp r.deps.Sessions.BindAuthKeyForSession(id, sessionID, permID) } } - layer, _, err := r.resolveAuthKeyLayerDefault(ctx, permID) - if err != nil { - if clearer, ok := r.deps.Sessions.(AuthKeyInheritedLayerClearer); ok { - clearer.ClearInheritedLayerForRawAuthKey(id) - } - if r.log != nil { - r.log.Warn("reload merged permanent layer after temp auth key bind failed", - zap.String("raw_auth_key_id", fmt.Sprintf("%x", id[:])), - zap.String("perm_auth_key_id", fmt.Sprintf("%x", permID[:])), - zap.Error(err)) - } - return false, internalErr() - } - r.cacheBoundAuthKeyLayerResolution(id, permID) if isSupportedLayer(layer) { if refresher, ok := r.deps.Sessions.(AuthKeyLayerRefresher); ok { refresher.RefreshInheritedLayerForRawAuthKey(id, layer) } else if binder, ok := r.deps.Sessions.(AuthKeyLayerBinder); ok { binder.SeedInheritedLayerForRawAuthKey(id, layer) } - } else if clearer, ok := r.deps.Sessions.(AuthKeyInheritedLayerClearer); ok { - clearer.ClearInheritedLayerForRawAuthKey(id) + } else if blocked || layer == 0 { + if clearer, ok := r.deps.Sessions.(AuthKeyInheritedLayerClearer); ok { + clearer.ClearInheritedLayerForRawAuthKey(id) + } } return true, nil } -func (r *Router) invalidateBoundAuthKeyLayerResolution(authKeyIDs ...[8]byte) { +func (r *Router) cacheBoundAuthKeyLayerResolution( + rawAuthKeyID, permAuthKeyID [8]byte, + result domain.TempAuthKeyBindingResult, +) (layer int, blocked bool, err error) { + if result.Layer < 0 || result.LayerObservationID < 0 || + (result.LayerObservationID > 0 && result.Layer == 0) { + return 0, false, fmt.Errorf( + "invalid bound auth-key Layer result layer=%d observation=%d", + result.Layer, result.LayerObservationID, + ) + } + outcome := clientSessionInfo{layerObservationID: result.LayerObservationID} + if isSupportedLayer(result.Layer) { + outcome.layer = result.Layer + } else if result.Layer != 0 { + outcome.layerBlocked = true + outcome.layerBlockedByAuthKey = true + } + r.clientInfoMu.Lock() defer r.clientInfoMu.Unlock() - for _, authKeyID := range authKeyIDs { - if info, ok := r.authInfo[authKeyID]; ok { - info.layer = 0 - info.layerObservationID = 0 - info.layerAdmissionSeq = 0 - info.authKeyInfoChecked = false - info.authorizationChecked = false - info.layerBlocked = false - info.layerBlockedByAuthKey = false - r.authInfo[authKeyID] = info + for _, authKeyID := range [][8]byte{rawAuthKeyID, permAuthKeyID} { + current := r.authInfo[authKeyID] + switch { + case current.layerObservationID > outcome.layerObservationID: + outcome.layer = current.layer + outcome.layerObservationID = current.layerObservationID + outcome.layerBlocked = current.layerBlocked + outcome.layerBlockedByAuthKey = current.layerBlockedByAuthKey + case current.layerObservationID == outcome.layerObservationID && outcome.layerObservationID > 0: + currentBlocked := current.layerBlocked || current.layerBlockedByAuthKey + outcomeBlocked := outcome.layerBlocked || outcome.layerBlockedByAuthKey + if current.layer != 0 && outcome.layer != 0 && current.layer != outcome.layer { + return 0, false, fmt.Errorf( + "conflicting cached bound auth-key Layer observation %d: %d != %d", + outcome.layerObservationID, current.layer, outcome.layer, + ) + } + if currentBlocked != outcomeBlocked && + (current.layer != 0 || outcome.layer != 0 || currentBlocked || outcomeBlocked) { + return 0, false, fmt.Errorf( + "conflicting cached bound auth-key blocked observation %d", + outcome.layerObservationID, + ) + } + if outcome.layer == 0 { + outcome.layer = current.layer + } } } -} - -func (r *Router) cacheBoundAuthKeyLayerResolution(rawAuthKeyID, permAuthKeyID [8]byte) { - r.clientInfoMu.Lock() - defer r.clientInfoMu.Unlock() if r.authInfo == nil { r.authInfo = make(map[[8]byte]clientSessionInfo) } - if _, exists := r.authInfo[rawAuthKeyID]; !exists { - evictMapEntryIfFullLocked(r.authInfo, maxAuthInfoEntries) + for _, authKeyID := range [][8]byte{rawAuthKeyID, permAuthKeyID} { + if _, exists := r.authInfo[authKeyID]; !exists { + evictMapEntryIfFullLocked(r.authInfo, maxAuthInfoEntries) + } + info := r.authInfo[authKeyID] + info.layer = outcome.layer + info.layerObservationID = outcome.layerObservationID + info.layerAdmissionSeq = 0 + info.layerBlocked = outcome.layerBlocked + info.layerBlockedByAuthKey = outcome.layerBlockedByAuthKey + r.authInfo[authKeyID] = info } - canonical := r.authInfo[permAuthKeyID] - info := r.authInfo[rawAuthKeyID] - // The bind transaction made the permanent row authoritative for both - // identities. Copy its complete resolution tuple: a Layer without the same - // observation token (or a stale blocked bit) would let later cache merging - // manufacture an ordering state that never existed durably. - info.layer = canonical.layer - info.layerObservationID = canonical.layerObservationID - info.layerAdmissionSeq = canonical.layerAdmissionSeq - info.layerBlocked = canonical.layerBlocked - info.layerBlockedByAuthKey = canonical.layerBlockedByAuthKey - info.authKeyInfoChecked = canonical.authKeyInfoChecked - info.authorizationChecked = canonical.authorizationChecked - r.authInfo[rawAuthKeyID] = info + return outcome.layer, outcome.layerBlocked || outcome.layerBlockedByAuthKey, nil } // onAuthExportLoginToken 给 QR 登录请求方返回短期 token；扫码端接受后，同一目标 @@ -473,9 +502,25 @@ func (r *Router) onAuthSendCode(ctx context.Context, req *tg.AuthSendCodeRequest errors.Is(err, auth.ErrSystemUserLoginForbidden) { return nil, phoneNumberInvalidErr() } + // The public MTProto error intentionally stays opaque, but operators need + // the wrapped store/provider cause to repair an update-related failure. + // Hash the normalized phone so neither the number nor the OTP reaches logs. + phoneDigest := sha256.Sum256([]byte(domain.NormalizePhone(req.PhoneNumber))) + fields := append(r.contextLogFields(ctx), + zap.Int("api_id", req.APIID), + zap.String("phone_digest", hex.EncodeToString(phoneDigest[:8])), + zap.Error(err), + ) + r.log.Error("auth.sendCode failed", fields...) return nil, internalErr() } - return r.tgSentCodeForHash(ctx, hash) + sent, err := r.tgSentCodeForHash(ctx, hash) + if err != nil { + fields := append(r.contextLogFields(ctx), zap.Error(err)) + r.log.Error("auth.sendCode delivery lookup failed", fields...) + return nil, err + } + return sent, nil } func (r *Router) onAuthReportMissingCode(ctx context.Context, req *tg.AuthReportMissingCodeRequest) (bool, error) { @@ -828,7 +873,7 @@ func (r *Router) completePendingPasswordSignIn(ctx context.Context, authKeyID [8 if r.deps.Auth == nil { return nil } - if err := r.deps.Auth.CompletePasswordSignIn(ctx, authKeyID); err != nil { + if err := r.deps.Auth.CompletePasswordSignIn(ctx, authKeyID, userID); err != nil { return err } r.invalidateAuthUserCache(authKeyID) diff --git a/internal/rpc/auth_code_rate_limit_test.go b/internal/rpc/auth_code_rate_limit_test.go index f4ed92a6..55b4ee8e 100644 --- a/internal/rpc/auth_code_rate_limit_test.go +++ b/internal/rpc/auth_code_rate_limit_test.go @@ -101,6 +101,26 @@ func TestAuthSendCodeRateLimitUsesOpaquePhoneAndRawAuthKeyKeys(t *testing.T) { } } +func TestAuthCodeRateLimitSharesBudgetAcrossNationalTrunkVariants(t *testing.T) { + limiter := &captureRateLimiter{} + r := New(Config{ + AuthCodePhoneRateLimit: 5, + AuthCodeRateWindow: time.Minute, + }, Deps{Limiter: limiter}, zaptest.NewLogger(t), clock.System) + + for _, phone := range []string{"+98 0998 167 9461", "989981679461"} { + if err := r.checkAuthCodeRateLimit(context.Background(), phone); err != nil { + t.Fatalf("checkAuthCodeRateLimit(%q): %v", phone, err) + } + } + if len(limiter.calls) != 2 { + t.Fatalf("limiter calls = %d, want 2", len(limiter.calls)) + } + if limiter.calls[0].key != limiter.calls[1].key { + t.Fatalf("equivalent phone variants used different limiter keys: %q != %q", limiter.calls[0].key, limiter.calls[1].key) + } +} + func TestAuthSendCodePhoneRateLimitPrecedesBusinessLookupAndWrite(t *testing.T) { limiter := &captureRateLimiter{block: true, retryAfter: 17} authService := &authCodeRateTestService{captureAuthService: &captureAuthService{}} diff --git a/internal/rpc/auth_password_pending_test.go b/internal/rpc/auth_password_pending_test.go index 9ac599e6..d7212b3e 100644 --- a/internal/rpc/auth_password_pending_test.go +++ b/internal/rpc/auth_password_pending_test.go @@ -96,8 +96,9 @@ func TestAuthRecoverPasswordCompletesPendingSignIn(t *testing.T) { if _, err := router.onAuthRecoverPassword(ctx, &tg.AuthRecoverPasswordRequest{Code: sender.code}); err != nil { t.Fatalf("auth.recoverPassword: %v", err) } - if auth.completePasswordCount != 1 || auth.completedPasswordKey != authKeyID { - t.Fatalf("CompletePasswordSignIn count=%d key=%x, want one call for %x", auth.completePasswordCount, auth.completedPasswordKey, authKeyID) + if auth.completePasswordCount != 1 || auth.completedPasswordKey != authKeyID || auth.completedPasswordUser != userID { + t.Fatalf("CompletePasswordSignIn count=%d key=%x user=%d, want one call for %x/%d", + auth.completePasswordCount, auth.completedPasswordKey, auth.completedPasswordUser, authKeyID, userID) } if snap := sessions.snapshot(); snap.userID != userID || !snap.userResolved { t.Fatalf("session user = %d resolved=%v, want %d resolved", snap.userID, snap.userResolved, userID) diff --git a/internal/rpc/bootstrap_updates.go b/internal/rpc/bootstrap_updates.go index 052dc02a..c38dd61d 100644 --- a/internal/rpc/bootstrap_updates.go +++ b/internal/rpc/bootstrap_updates.go @@ -106,26 +106,27 @@ func (r *Router) enqueueLoginMessageBootstrap(ctx context.Context, msg domain.Me // publishBootstrapAfterBaseline runs only from the ordered post-response plan. // It must never be called while the baseline rpc_result is merely encoded or // queued, otherwise the bootstrap update can overtake that baseline on wire. -func (r *Router) publishBootstrapAfterBaseline(ctx context.Context, userID int64) { +func (r *Router) publishBootstrapAfterBaseline(ctx context.Context, userID int64) bool { if r.deps.BootstrapUpdates == nil || userID == 0 { - return + return false } authKeyID, hasAuthKeyID := AuthKeyIDFrom(ctx) sessionID, hasSessionID := SessionIDFrom(ctx) if !hasAuthKeyID || !hasSessionID { - return + return false } cbCtx, cancel := context.WithTimeout(ctx, updatesDeliveryPhaseTimeout) defer cancel() ready, err := r.deps.BootstrapUpdates.MarkReadyForSession(cbCtx, userID, authKeyID, sessionID) if err != nil { r.log.Warn("mark bootstrap updates ready", zap.Int64("user_id", userID), zap.Int64("session_id", sessionID), zap.Error(err)) - return + return false } if ready == 0 { - return + return true } r.publishReadyBootstrapUpdates(cbCtx, ready, defaultBootstrapLease, r.log.Named("bootstrap")) + return true } func (r *Router) publishReadyBootstrapUpdates(ctx context.Context, batch int, leaseTimeout time.Duration, log *zap.Logger) int { diff --git a/internal/rpc/bot_verification_projection.go b/internal/rpc/bot_verification_projection.go index b7759480..9b40e5b3 100644 --- a/internal/rpc/bot_verification_projection.go +++ b/internal/rpc/bot_verification_projection.go @@ -2,6 +2,7 @@ package rpc import ( "context" + "errors" "strings" "github.com/iamxvbaba/td/tg" @@ -103,7 +104,7 @@ func (r *Router) applyBotVerificationIconsToPeerObjects(ctx context.Context, use peers = append(peers, peer) } for _, item := range users { - if u, ok := item.(*tg.User); ok && u != nil { + if u, ok := item.(*tg.User); ok && u != nil && !u.Deleted { addPeer(domain.Peer{Type: domain.PeerTypeUser, ID: u.ID}) } } @@ -119,9 +120,13 @@ func (r *Router) applyBotVerificationIconsToPeerObjects(ctx context.Context, use if len(byPeer) == 0 { return } + applyBotVerificationIconsFromMap(users, chats, byPeer) +} + +func applyBotVerificationIconsFromMap(users []tg.UserClass, chats []tg.ChatClass, byPeer map[domain.Peer]domain.CustomVerification) { for _, item := range users { u, ok := item.(*tg.User) - if !ok || u == nil { + if !ok || u == nil || u.Deleted { continue } mark, ok := byPeer[domain.Peer{Type: domain.PeerTypeUser, ID: u.ID}] @@ -152,18 +157,29 @@ func (r *Router) botVerificationMap(ctx context.Context, peers []domain.Peer) ma if r.deps.BotVerifications == nil || len(peers) == 0 { return nil } + _, verifications := r.peerIdentityMaps(ctx, peers, false, true) + return verifications +} + +func (r *Router) loadBotVerificationMap(ctx context.Context, peers []domain.Peer) (map[domain.Peer]domain.CustomVerification, error) { if len(peers) == 1 { mark, err := r.deps.BotVerifications.PeerVerification(ctx, peers[0]) - if err != nil || mark.IconDocumentID <= 0 { - return nil + if err != nil { + if errors.Is(err, domain.ErrCustomVerificationNotFound) { + return map[domain.Peer]domain.CustomVerification{}, nil + } + return nil, err } - return map[domain.Peer]domain.CustomVerification{peers[0]: mark} + if mark.IconDocumentID <= 0 { + return map[domain.Peer]domain.CustomVerification{}, nil + } + return map[domain.Peer]domain.CustomVerification{peers[0]: mark}, nil } byPeer, err := r.deps.BotVerifications.PeerVerificationBatch(ctx, peers) if err != nil { - return nil + return nil, err } - return byPeer + return byPeer, nil } // peerBotVerificationIcon resolves just the icon for one peer, for the update @@ -189,7 +205,7 @@ func applyBotVerificationIconToUsers(users []tg.UserClass, userID, icon int64) { return } for _, item := range users { - if u, ok := item.(*tg.User); ok && u != nil && u.ID == userID { + if u, ok := item.(*tg.User); ok && u != nil && !u.Deleted && u.ID == userID { u.SetBotVerificationIcon(icon) } } diff --git a/internal/rpc/bots_callback.go b/internal/rpc/bots_callback.go index c390c3de..96be6dfb 100644 --- a/internal/rpc/bots_callback.go +++ b/internal/rpc/bots_callback.go @@ -59,6 +59,7 @@ func (r *Router) onMessagesGetBotCallbackAnswer(ctx context.Context, req *tg.Mes if err != nil { return nil, err } + callback.ClientSession = clientSessionMetadataFromContext(ctx) botUserID := callback.BotUserID // 内置（进程内）service bot 分支：@verifybot 这类 bot 没有 MTProto session、也没有 diff --git a/internal/rpc/bots_inline.go b/internal/rpc/bots_inline.go index d6fad25c..a33f806c 100644 --- a/internal/rpc/bots_inline.go +++ b/internal/rpc/bots_inline.go @@ -128,6 +128,19 @@ func (r *Router) onMessagesGetInlineBotResults(ctx context.Context, req *tg.Mess results := r.inlines.registerCachedContext(ctx, now, bot.ID, userID, peer, cached) return r.tgBotInlineResults(ctx, userID, results), nil } + if service := r.deps.ServiceBotInlineResults; service != nil && service.HandlesInlineBot(bot.ID) { + results, handled, err := service.OnInlineQuery(ctx, bot.ID, userID, req.Query, req.Offset) + if err != nil { + return nil, internalErr() + } + if handled { + if len(results.Results) > domain.MaxBotInlineResults { + return nil, internalErr() + } + registered := r.inlines.registerCachedContext(ctx, now, bot.ID, userID, peer, results) + return r.tgBotInlineResults(ctx, userID, registered), nil + } + } queryID, pending := r.inlines.registerWithCacheKeyContext(ctx, now, bot.ID, userID, peer, cacheKey) defer r.inlines.deregisterIfUnansweredContext(ctx, queryID) diff --git a/internal/rpc/bots_inline_rpc_test.go b/internal/rpc/bots_inline_rpc_test.go index 42ad7798..cf12c83e 100644 --- a/internal/rpc/bots_inline_rpc_test.go +++ b/internal/rpc/bots_inline_rpc_test.go @@ -33,6 +33,43 @@ type inlineBotRPCTestFixture struct { document domain.Document } +type builtinGifCatalogRPCSource struct{ doc domain.Document } + +func (s builtinGifCatalogRPCSource) ListGifCatalog(context.Context, bool) ([]domain.GifCatalogEntry, error) { + return []domain.GifCatalogEntry{{ID: 91, Title: "Wave", DocumentID: s.doc.ID, Enabled: true}}, nil +} +func (s builtinGifCatalogRPCSource) GetDocuments(context.Context, []int64) ([]domain.Document, error) { + return []domain.Document{s.doc}, nil +} + +func TestBuiltinGifInlineQueryAcceptsGlobalEmptyPeerAndRegistersQuery(t *testing.T) { + ctx := context.Background() + users := memory.NewUserStore() + botStore := memory.NewBotStore(users) + owner, err := users.Create(ctx, domain.User{AccessHash: 7001, Phone: "15550007001", FirstName: "Owner"}) + if err != nil { + t.Fatal(err) + } + doc := domain.Document{ID: 901, AccessHash: 902, DCID: 2, MimeType: "video/mp4", Attributes: []domain.DocumentAttribute{{Kind: domain.DocAttrAnimated}, {Kind: domain.DocAttrVideo, W: 320, H: 240, Duration: 1}}} + bots := botsapp.NewService(users, botStore, memory.NewMessageStore(memory.NewDialogStore()), botsapp.WithGifCatalogSource(builtinGifCatalogRPCSource{doc: doc})) + router := New(Config{DC: 2, IP: "127.0.0.1", Port: 2398}, Deps{Users: appusers.NewService(users), Bots: bots, ServiceBotInlineResults: bots}, zaptest.NewLogger(t), clock.System) + got, err := router.onMessagesGetInlineBotResults(WithUserID(ctx, owner.ID), &tg.MessagesGetInlineBotResultsRequest{Bot: inputUser(domain.GifBotUser()), Peer: &tg.InputPeerEmpty{}, Query: "wave"}) + if err != nil { + t.Fatalf("global @gif query: %v", err) + } + if got.QueryID == 0 || len(got.Results) != 1 { + t.Fatalf("results = query_id %d len %d", got.QueryID, len(got.Results)) + } + media, ok := got.Results[0].(*tg.BotInlineMediaResult) + if !ok { + t.Fatalf("result type = %T", got.Results[0]) + } + wireDoc, ok := media.Document.(*tg.Document) + if !ok || wireDoc.ID != doc.ID { + t.Fatalf("document = %#v", media.Document) + } +} + func newInlineBotRPCTestFixture(t *testing.T) inlineBotRPCTestFixture { t.Helper() ctx := context.Background() @@ -844,8 +881,8 @@ func TestInlineBotArticleTextChannelRoundTrip(t *testing.T) { } editReq := &tg.MessagesEditInlineBotMessageRequest{ID: msgID} editReq.SetMessage("inline group edited") - editReq.SetReplyMarkup(&tg.ReplyInlineMarkup{Rows: []tg.KeyboardButtonRow{{ - Buttons: []tg.KeyboardButtonClass{&tg.KeyboardButtonCallback{Text: "Done", Data: []byte("v2")}}, + editReq.SetReplyMarkup(&tg.ReplyInlineMarkup{Rows: []tg.KeyboardInlineButtonRow{{ + Buttons: []tg.KeyboardInlineButton{{Text: "Done", Type: &tg.InlineButtonTypeCallback{Data: []byte("v2")}}}, }}}) if ok, err := f.router.onMessagesEditInlineBotMessage(botCtx, editReq); err != nil || !ok { t.Fatalf("channel inline edit = %v,%v, want true,nil", ok, err) @@ -2065,12 +2102,13 @@ func assertTGInlineReplyMarkup(t *testing.T, msg *tg.Message, wantText string, w if len(markup.Rows) != 1 || len(markup.Rows[0].Buttons) != 1 { t.Fatalf("reply_markup rows = %+v, want one callback button", markup.Rows) } - button, ok := markup.Rows[0].Buttons[0].(*tg.KeyboardButtonCallback) + button := markup.Rows[0].Buttons[0] + callback, ok := button.Type.(*tg.InlineButtonTypeCallback) if !ok { - t.Fatalf("reply_markup button = %T, want callback", markup.Rows[0].Buttons[0]) + t.Fatalf("reply_markup button type = %T, want callback", button.Type) } - if button.Text != wantText || !bytes.Equal(button.Data, wantData) { - t.Fatalf("reply_markup button = %q/%v, want %q/%v", button.Text, button.Data, wantText, wantData) + if button.Text != wantText || !bytes.Equal(callback.Data, wantData) { + t.Fatalf("reply_markup button = %q/%v, want %q/%v", button.Text, callback.Data, wantText, wantData) } } @@ -2119,8 +2157,8 @@ func inlineArticleResult(id, message string) tg.InputBotInlineResultClass { func inlineArticleResultWithCallback(id, message, button string, data []byte) tg.InputBotInlineResultClass { result := inlineArticleResult(id, message).(*tg.InputBotInlineResult) msg := result.SendMessage.(*tg.InputBotInlineMessageText) - msg.SetReplyMarkup(&tg.ReplyInlineMarkup{Rows: []tg.KeyboardButtonRow{{ - Buttons: []tg.KeyboardButtonClass{&tg.KeyboardButtonCallback{Text: button, Data: data}}, + msg.SetReplyMarkup(&tg.ReplyInlineMarkup{Rows: []tg.KeyboardInlineButtonRow{{ + Buttons: []tg.KeyboardInlineButton{{Text: button, Type: &tg.InlineButtonTypeCallback{Data: data}}}, }}}) return result } @@ -2308,8 +2346,8 @@ func inlineContactResult(id, phone, first, last, vcard string) *tg.InputBotInlin func inlineContactResultWithCallback(id, phone, first, last string, data []byte) tg.InputBotInlineResultClass { result := inlineContactResult(id, phone, first, last, "BEGIN:VCARD\nFN:"+first+" "+last+"\nEND:VCARD") msg := result.SendMessage.(*tg.InputBotInlineMessageMediaContact) - msg.SetReplyMarkup(&tg.ReplyInlineMarkup{Rows: []tg.KeyboardButtonRow{{ - Buttons: []tg.KeyboardButtonClass{&tg.KeyboardButtonCallback{Text: "Contact", Data: data}}, + msg.SetReplyMarkup(&tg.ReplyInlineMarkup{Rows: []tg.KeyboardInlineButtonRow{{ + Buttons: []tg.KeyboardInlineButton{{Text: "Contact", Type: &tg.InlineButtonTypeCallback{Data: data}}}, }}}) return result } diff --git a/internal/rpc/bots_longtail.go b/internal/rpc/bots_longtail.go index ae18d8ba..0bf4bc27 100644 --- a/internal/rpc/bots_longtail.go +++ b/internal/rpc/bots_longtail.go @@ -594,7 +594,7 @@ func (r *Router) onBotsRequestWebViewButton(ctx context.Context, req *tg.BotsReq if err != nil { return nil, internalErr() } - if req.UserID == nil || req.Button == nil { + if req.UserID == nil || req.Button.Type == nil { return nil, buttonDataInvalidErr() } if r.deps.Bots == nil { @@ -622,7 +622,7 @@ func (r *Router) onBotsRequestWebViewButton(ctx context.Context, req *tg.BotsReq return &tg.BotsRequestedButton{WebappReqID: saved.WebAppReqID}, nil } -func (r *Router) onBotsGetRequestedWebViewButton(ctx context.Context, req *tg.BotsGetRequestedWebViewButtonRequest) (tg.KeyboardButtonClass, error) { +func (r *Router) onBotsGetRequestedWebViewButton(ctx context.Context, req *tg.BotsGetRequestedWebViewButtonRequest) (*tg.KeyboardButton, error) { userID, _, err := r.currentUserID(ctx) if err != nil { return nil, internalErr() @@ -761,21 +761,20 @@ func (r *Router) tgBotPreviewMedia(ctx context.Context, item domain.BotAppPrevie return out } -func domainRequestedButtonFromTG(botUserID int64, _ tg.InputUserClass, button tg.KeyboardButtonClass) (domain.BotRequestedWebViewButton, error) { +func domainRequestedButtonFromTG(botUserID int64, _ tg.InputUserClass, button tg.KeyboardButton) (domain.BotRequestedWebViewButton, error) { var out domain.BotRequestedWebViewButton out.BotUserID = botUserID - switch b := button.(type) { - case *tg.InputKeyboardButtonRequestPeer: + out.Text = strings.TrimSpace(button.Text) + switch b := button.Type.(type) { + case *tg.InputButtonTypeRequestPeer: out.ButtonID = b.ButtonID - out.Text = strings.TrimSpace(b.Text) out.PeerType, out.PeerFilter = domainRequestPeerFilter(b.PeerType) out.MaxQuantity = b.MaxQuantity out.NameRequested = b.NameRequested out.UsernameRequested = b.UsernameRequested out.PhotoRequested = b.PhotoRequested - case *tg.KeyboardButtonRequestPeer: + case *tg.ButtonTypeRequestPeer: out.ButtonID = b.ButtonID - out.Text = strings.TrimSpace(b.Text) out.PeerType, out.PeerFilter = domainRequestPeerFilter(b.PeerType) out.MaxQuantity = b.MaxQuantity default: @@ -800,13 +799,10 @@ func requestPeerTypeName(peerType tg.RequestPeerTypeClass) string { } } -func tgKeyboardButtonRequestPeer(button domain.BotRequestedWebViewButton) tg.KeyboardButtonClass { - return &tg.KeyboardButtonRequestPeer{ - Text: button.Text, - ButtonID: button.ButtonID, - PeerType: tgRequestPeerTypeWithFilter(button.PeerType, button.PeerFilter), - MaxQuantity: button.MaxQuantity, - } +func tgKeyboardButtonRequestPeer(button domain.BotRequestedWebViewButton) *tg.KeyboardButton { + return &tg.KeyboardButton{Text: button.Text, Type: &tg.ButtonTypeRequestPeer{ + ButtonID: button.ButtonID, PeerType: tgRequestPeerTypeWithFilter(button.PeerType, button.PeerFilter), MaxQuantity: button.MaxQuantity, + }} } func tgRequestPeerType(kind string) tg.RequestPeerTypeClass { diff --git a/internal/rpc/bots_longtail_rpc_test.go b/internal/rpc/bots_longtail_rpc_test.go index ac647f30..55e07644 100644 --- a/internal/rpc/bots_longtail_rpc_test.go +++ b/internal/rpc/bots_longtail_rpc_test.go @@ -252,9 +252,9 @@ func TestBotsLongtailCommercialAndSettingsStubs(t *testing.T) { } if _, err := f.router.onBotsRequestWebViewButton(botCtx, &tg.BotsRequestWebViewButtonRequest{ UserID: inputUser(f.owner), - Button: &tg.KeyboardButtonSimpleWebView{ + Button: tg.KeyboardButton{ Text: "Open", - URL: "https://example.com/app", + Type: &tg.ButtonTypeSimpleWebView{URL: "https://example.com/app"}, }, }); !tgerr.Is(err, "BUTTON_DATA_INVALID") { t.Fatalf("request webview button err = %v, want BUTTON_DATA_INVALID", err) diff --git a/internal/rpc/channel_fanout_dispatcher.go b/internal/rpc/channel_fanout_dispatcher.go index a0a19a34..b392f6f7 100644 --- a/internal/rpc/channel_fanout_dispatcher.go +++ b/internal/rpc/channel_fanout_dispatcher.go @@ -335,10 +335,11 @@ func (s *channelFanoutShard) signalEligibleOverflow() { } // channelFanoutPrefetch 在 worker 解析出最终 recipient 集合后、逐 viewer build 之前调用一次， -// 用于跨全部 recipient 一次性预热每 viewer 的用户投影（fan-out 模板化，O(owner)）。可选：为 nil -// 时 build 仍逐 viewer 解析（行为不变）。在 worker goroutine 内串行执行，与 build 共享同一 -// viewerPeerCache，无跨 goroutine 竞态。 -type channelFanoutPrefetch func(ctx context.Context, viewers []int64) +// 用于跨全部 recipient 一次性预热每 viewer 的用户投影（fan-out 模板化，O(owner)）。为 nil +// 表示该 payload 不含需要预热的 user envelope。在 worker goroutine 内串行执行，与 build 共享同一 +// viewerPeerCache，无跨 goroutine 竞态。返回 false 表示批量预热失败；worker 必须 fail-closed， +// 不能静默退回逐 viewer 投影。 +type channelFanoutPrefetch func(ctx context.Context, viewers []int64) bool // channelFanoutDispatcher 把频道 payload fan-out 移出发送者 RPC，按 channelID 分片串行处理。 type channelFanoutDispatcher struct { @@ -881,13 +882,22 @@ func (r *Router) runChannelFanoutJob(ctx context.Context, job channelFanoutJob) recipients := r.channelFanoutRecipients(ctx, job.scope, job.channelID, job.recipients) // 预热跨 viewer 用户投影（fan-out 模板化）：在逐 viewer build 之前一次性算好每 recipient 的 // 投影并预热共享 cache，使 build 只命中缓存、不再 O(viewer) 逐个 ForViewer。覆盖 recipients + - // 兜底 origin（无在线 recipient 时 build 会回退给 origin）。失败/未实现时静默退化为逐 viewer。 + // 兜底 origin（无在线 recipient 时 build 会回退给 origin）。失败时禁止构造真实 payload， + // 改发 viewer-independent too-long nudge，让客户端从 durable difference 恢复。 if job.prefetch != nil { viewers := recipients if job.originUserID != 0 { viewers = append(append(make([]int64, 0, len(recipients)+1), recipients...), job.originUserID) } - job.prefetch(ctx, viewers) + if !job.prefetch(ctx, viewers) { + r.log.Warn("channel fanout prefetch failed; replacing online payload with recovery nudge", + zap.Int64("channel_id", job.channelID), + zap.Int("pts", job.pts), + zap.Int("viewers", len(viewers)), + ) + r.recoverFailedChannelFanoutPrefetch(pushCtx, job, recipients) + return + } } seen := make(map[int64]struct{}, len(recipients)) pushed := false @@ -923,27 +933,82 @@ func (r *Router) runChannelFanoutJob(ctx context.Context, job channelFanoutJob) } } +func (r *Router) recoverFailedChannelFanoutPrefetch(ctx context.Context, job channelFanoutJob, recipients []int64) { + if job.channelID == 0 || job.pts <= 0 { + return + } + targets := append([]int64(nil), recipients...) + if job.originUserID != 0 { + targets = append(targets, job.originUserID) + } + targets = uniquePeerIDs(targets) + delivered := make(map[int64]struct{}, len(targets)) + date := int(r.clock.Now().Unix()) + tooLong := &tg.UpdateChannelTooLong{ChannelID: job.channelID} + tooLong.SetPts(job.pts) + updates := &tg.Updates{ + Updates: []tg.UpdateClass{tooLong}, + Users: []tg.UserClass{}, + Chats: []tg.ChatClass{}, + Date: date, + } + for _, userID := range targets { + if userID == 0 { + continue + } + select { + case <-ctx.Done(): + return + default: + } + r.pushUserUpdates(ctx, userID, updates) + delivered[userID] = struct{}{} + } + // Explicit monoforum/suggested-post recipients are the full authorized + // audience. Member/message-box scopes may have additional online viewers + // beyond the full-payload cap, so nudge that recovery audience too. + switch job.scope { + case channelFanoutMembers: + r.nudgeBeyondCapChannelMembers(ctx, job.channelID, job.pts, delivered) + case channelFanoutMessageBox: + r.nudgeBeyondCapChannelMessageAudience(ctx, job.channelID, job.pts, delivered) + } +} + // prefetchChannelFanoutUsers 跨全部 recipient 一次性投影 owner 用户（fan-out 模板化，O(owner)）， // 把结果按 viewer 预热进共享 cache；之后每 viewer 的 build 只命中缓存，不再逐 viewer ForViewer。 -// ownerIDs 由调用方从消息/事件 peer refs 收集。deps.Users 未实现 BatchViewerUsersResolver 或解析 -// 失败时静默跳过——build 回退逐 viewer 解析，行为不变，仅退化为旧的 O(viewer) 成本。 -func (r *Router) prefetchChannelFanoutUsers(ctx context.Context, cache *viewerPeerCache, viewers, ownerIDs []int64) { - if cache == nil || len(viewers) == 0 || len(ownerIDs) == 0 || r.deps.Users == nil { - return +// ownerIDs 由调用方从消息/事件 peer refs 收集。deps.Users 必须实现 BatchViewerUsersResolver； +// 缺能力、解析失败或 envelope 不完整时返回 false，由 worker fail-closed，禁止逐 viewer 回退。 +func (r *Router) prefetchChannelFanoutUsers(ctx context.Context, cache *viewerPeerCache, viewers, ownerIDs []int64) bool { + viewers = uniquePeerIDs(viewers) + ownerIDs = uniquePeerIDs(ownerIDs) + if len(viewers) == 0 || len(ownerIDs) == 0 { + return true + } + if cache == nil || r.deps.Users == nil { + return false } resolver, ok := r.deps.Users.(BatchViewerUsersResolver) if !ok { - return + return false } byViewer, err := resolver.ByIDsForViewers(ctx, viewers, ownerIDs) if err != nil { - r.log.Warn("channel fanout user prefetch failed; falling back to per-viewer projection", + r.log.Warn("channel fanout user prefetch failed", zap.Int("viewers", len(viewers)), zap.Int("owners", len(ownerIDs)), zap.Error(err)) - return + return false } - for viewer, users := range byViewer { - cache.primeUsers(viewer, users) + for _, viewer := range viewers { + if missingID, missing := missingProjectedUserID(ownerIDs, byViewer[viewer]); missing { + r.log.Warn("channel fanout user prefetch returned an incomplete envelope", + zap.Int64("viewer_user_id", viewer), + zap.Int64("missing_user_id", missingID), + zap.Int("owners", len(ownerIDs))) + return false + } + cache.primeExpectedUsers(viewer, ownerIDs, byViewer[viewer]) } + return true } // channelMessageFanoutOwnerIDs 收集一条频道消息 fan-out 会下发到 Users 数组里的全部 owner 用户 id @@ -998,9 +1063,12 @@ func (r *Router) enqueueChannelMessageFanout(ctx context.Context, originUserID i skip := skipDeliverySet(res.SkipDeliveryUserIDs) r.enqueueChannelFanoutWithPrefetch(ctx, channelFanoutMessageBox, originUserID, res.Channel.ID, res.Event.Pts, res.Recipients, 0, - func(bgCtx context.Context, viewers []int64) { - r.prefetchChannelFanoutUsers(bgCtx, fanoutCache, viewers, ownerIDs) + func(bgCtx context.Context, viewers []int64) bool { + if !r.prefetchChannelFanoutUsers(bgCtx, fanoutCache, viewers, ownerIDs) { + return false + } usernames = r.usernameRegistryMap(bgCtx, usernamePeers) + return true }, func(bgCtx context.Context, viewerUserID int64) *tg.Updates { // privacy bot 在 send 时被 SkipDeliveryUserIDs 排除（命令/@/回复以外的消息不可见）。 @@ -1021,13 +1089,19 @@ func (r *Router) enqueueChannelMessageFanout(ctx context.Context, originUserID i func (r *Router) enqueueMonoforumMessageFanout(ctx context.Context, originUserID int64, mono domain.Channel, savedPeer domain.Peer, res domain.SendChannelMessageResult) { fanoutCache := newViewerPeerCache(r) ownerIDs := channelMessageFanoutOwnerIDs(res, []int64{savedPeer.ID}) + projectionPeers := monoforumProjectionPeers(mono.ID, mono.LinkedMonoforumID, ownerIDs) + var overlays *monoforumPeerOverlays r.enqueueChannelFanoutWithPrefetch(ctx, channelFanoutExplicit, originUserID, mono.ID, res.Event.Pts, res.Recipients, 0, - func(bgCtx context.Context, viewers []int64) { - r.prefetchChannelFanoutUsers(bgCtx, fanoutCache, viewers, ownerIDs) + func(bgCtx context.Context, viewers []int64) bool { + if !r.prefetchChannelFanoutUsers(bgCtx, fanoutCache, viewers, ownerIDs) { + return false + } + overlays = r.loadMonoforumPeerOverlays(bgCtx, projectionPeers) + return true }, func(bgCtx context.Context, viewerUserID int64) *tg.Updates { - return r.monoforumDeliveryUpdates(bgCtx, viewerUserID, mono, savedPeer, res) + return r.monoforumDeliveryUpdatesWithPeerCacheAndOverlays(bgCtx, viewerUserID, mono, savedPeer, res, fanoutCache, overlays) }) } @@ -1099,9 +1173,12 @@ func (r *Router) enqueueChannelEditMessageFanout(ctx context.Context, originUser nudgePts := max(res.Event.Pts, res.ServiceEvent.Pts) r.enqueueChannelFanoutWithPrefetch(ctx, channelFanoutMessageBox, originUserID, res.Channel.ID, nudgePts, res.Recipients, 0, - func(bgCtx context.Context, viewers []int64) { - r.prefetchChannelFanoutUsers(bgCtx, fanoutCache, viewers, ownerIDs) + func(bgCtx context.Context, viewers []int64) bool { + if !r.prefetchChannelFanoutUsers(bgCtx, fanoutCache, viewers, ownerIDs) { + return false + } usernames = r.usernameRegistryMap(bgCtx, usernamePeers) + return true }, func(bgCtx context.Context, viewerUserID int64) *tg.Updates { return r.channelEditMessageUpdatesWithPeerCacheAndUsernames(bgCtx, viewerUserID, res, fanoutCache, usernames) @@ -1119,9 +1196,12 @@ func (r *Router) enqueueChannelMessagesFanout(ctx context.Context, originUserID, var usernames map[domain.Peer][]domain.Username r.enqueueChannelFanoutWithPrefetch(ctx, channelFanoutMessageBox, originUserID, channelID, pts, recipients, int64(len(results))*(64<<10), - func(bgCtx context.Context, viewers []int64) { - r.prefetchChannelFanoutUsers(bgCtx, fanoutCache, viewers, ownerIDs) + func(bgCtx context.Context, viewers []int64) bool { + if !r.prefetchChannelFanoutUsers(bgCtx, fanoutCache, viewers, ownerIDs) { + return false + } usernames = r.usernameRegistryMap(bgCtx, usernamePeers) + return true }, func(bgCtx context.Context, viewerUserID int64) *tg.Updates { return r.channelMessagesUpdatesWithPeerCacheAndUsernames(bgCtx, viewerUserID, results, nil, false, extraUserIDs, fanoutCache, usernames) diff --git a/internal/rpc/channel_fanout_dispatcher_test.go b/internal/rpc/channel_fanout_dispatcher_test.go index ebd9e87d..9df93f42 100644 --- a/internal/rpc/channel_fanout_dispatcher_test.go +++ b/internal/rpc/channel_fanout_dispatcher_test.go @@ -249,8 +249,9 @@ func TestChannelFanoutDispatcherInvokesPrefetch(t *testing.T) { var gotViewers []int64 job := fanoutTestJob([]int64{2001, 2002}, 5, 99, nil) - job.prefetch = func(_ context.Context, viewers []int64) { + job.prefetch = func(_ context.Context, viewers []int64) bool { gotViewers = append([]int64(nil), viewers...) + return true } // deps.Channels=nil → channelFanoutRecipients 返回 explicit recipients=[2001 2002]；origin=5 兜底追加。 r.channelFanout.Enqueue(context.Background(), job) @@ -266,6 +267,36 @@ func TestChannelFanoutDispatcherInvokesPrefetch(t *testing.T) { } } +func TestChannelFanoutJobPrefetchFailureSendsRecoveryNudge(t *testing.T) { + sessions := &captureSessions{} + r := New(Config{}, Deps{Sessions: sessions}, zaptest.NewLogger(t), clock.System) + built := make(map[int64]bool) + job := fanoutTestJob([]int64{20}, 10, 0, built) + job.pts = 7 + job.prefetch = func(context.Context, []int64) bool { return false } + + r.runChannelFanoutJob(context.Background(), job) + + if len(built) != 0 { + t.Fatalf("build called after prefetch failure: %v", built) + } + if got := sessions.pushedUserIDs(); len(got) != 2 || got[0] != 20 || got[1] != 10 { + t.Fatalf("pushes after prefetch failure = %v, want recovery nudge to recipient 20 and origin 10", got) + } + updates, ok := sessions.lastUserPush().(*tg.Updates) + if !ok || len(updates.Updates) != 1 { + t.Fatalf("recovery payload = %#v, want one UpdateChannelTooLong", sessions.lastUserPush()) + } + nudge, ok := updates.Updates[0].(*tg.UpdateChannelTooLong) + if !ok { + t.Fatalf("recovery update = %T, want UpdateChannelTooLong", updates.Updates[0]) + } + pts, present := nudge.GetPts() + if !present || nudge.ChannelID != 1001 || pts != 7 { + t.Fatalf("recovery nudge = %+v pts_present=%v, want channel=1001 pts=7", nudge, present) + } +} + // editFanoutTestResult 构造一条覆盖两容器的 EditChannelMessageResult：主容器(Event/Message)带 // sender A + reply B，服务消息容器(ServiceEvent/ServiceMessage)带 sender C + Action.UserIDs=[D]。 func editFanoutTestResult(eventPts, servicePts int) domain.EditChannelMessageResult { @@ -326,6 +357,16 @@ type prefetchRecordingUsersService struct { gotViewers []int64 gotOwnerIDs []int64 forViewerCall int + byIDsCalls int + omitViewer int64 + omitOwner int64 +} + +func (s *prefetchRecordingUsersService) ByIDs(ctx context.Context, viewerUserID int64, userIDs []int64) ([]domain.User, error) { + s.mu.Lock() + s.byIDsCalls++ + s.mu.Unlock() + return s.mapUsersService.ByIDs(ctx, viewerUserID, userIDs) } func (s *prefetchRecordingUsersService) ByIDsForViewers(_ context.Context, viewerUserIDs, userIDs []int64) (map[int64][]domain.User, error) { @@ -336,11 +377,46 @@ func (s *prefetchRecordingUsersService) ByIDsForViewers(_ context.Context, viewe s.mu.Unlock() out := make(map[int64][]domain.User, len(viewerUserIDs)) for _, v := range viewerUserIDs { - out[v] = nil + if v == s.omitViewer { + continue + } + for _, id := range userIDs { + if id == s.omitOwner { + continue + } + user, ok := s.mapUsersService.users[id] + if !ok { + user = domain.User{ID: id} + } + out[v] = append(out[v], user) + } } return out, nil } +func (s *prefetchRecordingUsersService) snapshot() (forViewerCall int, viewers, ownerIDs []int64) { + s.mu.Lock() + defer s.mu.Unlock() + return s.forViewerCall, append([]int64(nil), s.gotViewers...), append([]int64(nil), s.gotOwnerIDs...) +} + +func TestPrefetchChannelFanoutUsersRejectsMissingViewersAndOwners(t *testing.T) { + users := &prefetchRecordingUsersService{omitViewer: 3002, mapUsersService: mapUsersService{users: map[int64]domain.User{ + 2001: {ID: 2001, FirstName: "must not scalar load"}, + 2002: {ID: 2002, FirstName: "must not scalar load"}, + }}} + r := New(Config{}, Deps{Users: users}, zaptest.NewLogger(t), clock.System) + cache := newViewerPeerCache(r) + if r.prefetchChannelFanoutUsers(context.Background(), cache, []int64{3001, 3002}, []int64{2001, 2002}) { + t.Fatal("prefetch accepted a response that omitted an entire viewer") + } + users.omitViewer = 0 + users.omitOwner = 2002 + if r.prefetchChannelFanoutUsers(context.Background(), cache, []int64{3001}, []int64{2001, 2002}) { + t.Fatal("prefetch accepted a response that omitted an owner") + } +} + // TestChannelEditMessageFanoutInvokesPrefetch：enqueueChannelEditMessageFanout 在逐 viewer build // 前用「channelEditMessageFanoutOwnerIDs(res) + recipients+origin」预热（dispatcher 未启动→同步 // 回退，prefetch 同步执行）。锁定 edit 路径接入了 O(owner) 预热而非逐 viewer 投影。 @@ -353,19 +429,20 @@ func TestChannelEditMessageFanoutInvokesPrefetch(t *testing.T) { res := editFanoutTestResult(5, 6) r.enqueueChannelEditMessageFanout(context.Background(), 5, res) - if users.forViewerCall != 1 { - t.Fatalf("ByIDsForViewers called %d times, want 1 (prefetch must run once before per-viewer build)", users.forViewerCall) + forViewerCall, viewers, ownerIDs := users.snapshot() + if forViewerCall != 1 { + t.Fatalf("ByIDsForViewers called %d times, want 1 (prefetch must run once before per-viewer build)", forViewerCall) } - gotViewers := ownerIDSet(users.gotViewers) + gotViewers := ownerIDSet(viewers) for _, want := range []int64{3001, 3002, 5} { if !gotViewers[want] { - t.Fatalf("prefetch viewers %v missing %d (recipients+origin)", users.gotViewers, want) + t.Fatalf("prefetch viewers %v missing %d (recipients+origin)", viewers, want) } } - gotOwners := ownerIDSet(users.gotOwnerIDs) + gotOwners := ownerIDSet(ownerIDs) for _, want := range []int64{2001, 2002, 2003, 2004} { if !gotOwners[want] { - t.Fatalf("prefetch owner ids %v missing %d (must equal channelEditMessageFanoutOwnerIDs)", users.gotOwnerIDs, want) + t.Fatalf("prefetch owner ids %v missing %d (must equal channelEditMessageFanoutOwnerIDs)", ownerIDs, want) } } if registry.batchCalls != 1 || registry.peerCalls != 0 { diff --git a/internal/rpc/channel_fanout_privacy_bot_rpc_test.go b/internal/rpc/channel_fanout_privacy_bot_rpc_test.go index be0fb052..8a592604 100644 --- a/internal/rpc/channel_fanout_privacy_bot_rpc_test.go +++ b/internal/rpc/channel_fanout_privacy_bot_rpc_test.go @@ -61,7 +61,10 @@ func TestChannelMessageFanoutSkipsPrivacyBotOnlinePush(t *testing.T) { sessions := &captureSessions{ channelMembers: map[int64][]int64{created.Channel.ID: {1002, 1003}}, } - r := New(Config{}, Deps{Channels: channelService, Sessions: sessions}, zaptest.NewLogger(t), clock.System) + users := &prefetchRecordingUsersService{mapUsersService: mapUsersService{users: map[int64]domain.User{ + 1001: {ID: 1001, FirstName: "sender"}, + }}} + r := New(Config{}, Deps{Channels: channelService, Sessions: sessions, Users: users}, zaptest.NewLogger(t), clock.System) // 复核前置:修复前后 channelFanoutRecipients 都会把 1003 列进 recipients(在线活跃成员), // 漏洞/修复的差异在 build 是否对它返回 nil。 diff --git a/internal/rpc/channels_core.go b/internal/rpc/channels_core.go index 6b8b090b..cd1ca475 100644 --- a/internal/rpc/channels_core.go +++ b/internal/rpc/channels_core.go @@ -39,13 +39,33 @@ func (r *Router) onChannelsCreateChannel(ctx context.Context, req *tg.ChannelsCr return nil, channelInvalidErr(err) } r.addOnlineChannelMemberships(res.Channel.ID, channelMemberUserIDs(res.Members)...) - updates := r.channelOperationUpdates(ctx, userID, res) + updates, err := r.channelCreationResponseUpdates(ctx, userID, res) + if err != nil { + return nil, err + } r.pushChannelUpdates(ctx, userID, res.Channel.ID, res.Recipients, func(viewerUserID int64) *tg.Updates { return r.channelOperationUpdates(ctx, viewerUserID, res) }) return updates, nil } +// channelCreationResponseUpdates adds the response-only message mapping TDLib +// requires to recognize a channels.createChannel result. The mapping is never +// reused by fan-out or difference; the create service message remains the sole +// durable, PTS-bearing fact. +func (r *Router) channelCreationResponseUpdates(ctx context.Context, viewerUserID int64, res domain.CreateChannelResult) (*tg.Updates, error) { + if res.Message.ID <= 0 || res.Message.Action == nil || res.Message.Action.Type != domain.ChannelActionCreate { + return nil, internalErr() + } + updates := r.channelOperationUpdates(ctx, viewerUserID, res) + if updates == nil { + return nil, internalErr() + } + mapping := &tg.UpdateMessageID{ID: res.Message.ID, RandomID: randomNonZeroInt64()} + updates.Updates = append([]tg.UpdateClass{mapping}, updates.Updates...) + return updates, nil +} + func validateChannelsCreateChannelOptions(req *tg.ChannelsCreateChannelRequest) error { if req == nil { return inputRequestInvalidErr() @@ -168,6 +188,9 @@ func (r *Router) onChannelsGetFullChannel(ctx context.Context, input tg.InputCha return nil, channelInvalidErr(domain.ErrChannelPrivate) } full := cached.full + if err := r.applyWelcomeMessagesToFullChat(ctx, ref.ID, &full); err != nil { + return nil, err + } if err := r.applyTranslationDisabledToChannelFull(ctx, userID, ref.ID, &full); err != nil { return nil, err } @@ -191,6 +214,7 @@ func (r *Router) onChannelsGetFullChannel(ctx context.Context, input tg.InputCha return nil, err } full := tgChannelFull(view, r.cfg.PublicBaseURL) + r.applyChannelStatsCapability(full) userIDs := []int64{view.Channel.CreatorUserID, view.Self.UserID} // 注：Bots 过滤实际会返回群内 bot（TestGroupBotRPCShape 覆盖），这里据此富化 full.BotInfo。 // （此前审计误判为死代码，已由单测纠正——勿删。） @@ -217,6 +241,9 @@ func (r *Router) onChannelsGetFullChannel(ctx context.Context, input tg.InputCha chats: append([]tg.ChatClass(nil), chats...), userIDs: userIDs, }, loadEpoch) + if err := r.applyWelcomeMessagesToFullChat(ctx, view.Channel.ID, full); err != nil { + return nil, err + } if err := r.applyTranslationDisabledToChannelFull(ctx, userID, view.Channel.ID, full); err != nil { return nil, err } @@ -235,6 +262,23 @@ func (r *Router) onChannelsGetFullChannel(ctx context.Context, input tg.InputCha }, nil } +func (r *Router) applyWelcomeMessagesToFullChat(ctx context.Context, channelID int64, full tg.ChatFullClass) error { + if r.deps.WelcomeMessages == nil || channelID <= 0 || full == nil { + return nil + } + hasAny, err := r.deps.WelcomeMessages.HasAny(ctx, domain.Peer{Type: domain.PeerTypeChannel, ID: channelID}) + if err != nil { + return internalErr() + } + switch value := full.(type) { + case *tg.ChannelFull: + value.HasWelcomeMessages = hasAny + case *tg.ChatFull: + value.HasWelcomeMessages = hasAny + } + return nil +} + type channelReadModelResolver interface { GetChannelReadModel(ctx context.Context, userID, channelID int64) (domain.ChannelView, error) } @@ -290,27 +334,48 @@ func (r *Router) onChannelsGetSendAs(ctx context.Context, req *tg.ChannelsGetSen } } chats = []tg.ChatClass{tgChannelChatForView(userID, view)} - // 以「当前频道/群本身」发言：广播频道自帖、匿名管理员等（canCurrentChannelSendAs 判定）。 - if canCurrentChannelSendAs(view) { - peers = append(peers, tg.SendAsPeer{Peer: &tg.PeerChannel{ChannelID: view.Channel.ID}}) - } - // 以「用户自己拥有的其它广播频道」身份在本群发言。非本群关联频道的个人频道需会员 - // （premium_required，对齐官方：仅本群的 linked 讨论频道免会员），客户端据此置灰/引导开会员， - // 服务端在发送侧用 PremiumActiveAt 兜底门控。 - if owned, err := r.deps.Channels.ListSendAsChannels(ctx, userID); err == nil && len(owned) > 0 { - extras := make([]domain.Channel, 0, len(owned)) + owned, ownedErr := r.deps.Channels.ListSendAsChannels(ctx, userID) + if req.ForPaidReactions { + // Paid reaction identities are self plus currently owned/postable + // broadcast channels. They are not message send-as candidates and do + // not carry the unrelated premium_required gate. + seen := make(map[int64]struct{}, len(owned)) for _, ch := range owned { - if ch.ID == 0 || ch.ID == view.Channel.ID { + if ch.ID == 0 || ch.Deleted || !ch.Broadcast || ch.CreatorUserID != userID { continue } - sendAs := tg.SendAsPeer{Peer: &tg.PeerChannel{ChannelID: ch.ID}} - if ch.ID != view.Channel.LinkedChatID { - sendAs.PremiumRequired = true + if _, ok := seen[ch.ID]; ok { + continue + } + seen[ch.ID] = struct{}{} + peers = append(peers, tg.SendAsPeer{Peer: &tg.PeerChannel{ChannelID: ch.ID}}) + if ch.ID != view.Channel.ID { + chats = append(chats, tgChannels(userID, []domain.Channel{ch})...) } - peers = append(peers, sendAs) - extras = append(extras, ch) } - chats = append(chats, tgChannels(userID, extras)...) + } else { + // 以「当前频道/群本身」发言：广播频道自帖、匿名管理员等（canCurrentChannelSendAs 判定）。 + if canCurrentChannelSendAs(view) { + peers = append(peers, tg.SendAsPeer{Peer: &tg.PeerChannel{ChannelID: view.Channel.ID}}) + } + // 以「用户自己拥有的其它广播频道」身份在本群发言。非本群关联频道的个人频道需会员 + // （premium_required，对齐官方：仅本群的 linked 讨论频道免会员），客户端据此置灰/引导开会员， + // 服务端在发送侧用 PremiumActiveAt 兜底门控。 + if ownedErr == nil && len(owned) > 0 { + extras := make([]domain.Channel, 0, len(owned)) + for _, ch := range owned { + if ch.ID == 0 || ch.ID == view.Channel.ID { + continue + } + sendAs := tg.SendAsPeer{Peer: &tg.PeerChannel{ChannelID: ch.ID}} + if ch.ID != view.Channel.LinkedChatID { + sendAs.PremiumRequired = true + } + peers = append(peers, sendAs) + extras = append(extras, ch) + } + chats = append(chats, tgChannels(userID, extras)...) + } } } out := &tg.ChannelsSendAsPeers{ diff --git a/internal/rpc/channels_create_response_rpc_test.go b/internal/rpc/channels_create_response_rpc_test.go new file mode 100644 index 00000000..8f5572d9 --- /dev/null +++ b/internal/rpc/channels_create_response_rpc_test.go @@ -0,0 +1,97 @@ +package rpc + +import ( + "context" + "testing" + + "github.com/iamxvbaba/td/clock" + "github.com/iamxvbaba/td/tg" + "go.uber.org/zap/zaptest" + + appchannels "telesrv/internal/app/channels" + appusers "telesrv/internal/app/users" + "telesrv/internal/domain" + "telesrv/internal/store/memory" +) + +func TestChannelsCreateChannelResponseCarriesTdlibMessageMappingOnlyForCaller(t *testing.T) { + ctx := context.Background() + userStore := memory.NewUserStore() + owner, err := userStore.Create(ctx, domain.User{ + AccessHash: 88001, + Phone: "15550088001", + FirstName: "Owner", + }) + if err != nil { + t.Fatalf("create owner: %v", err) + } + sessions := &captureSessions{onlineUserIDs: []int64{owner.ID}} + r := New(Config{}, Deps{ + Users: appusers.NewService(userStore), + Channels: appchannels.NewService(memory.NewChannelStore()), + Sessions: sessions, + }, zaptest.NewLogger(t), clock.System) + + tests := []struct { + name string + req *tg.ChannelsCreateChannelRequest + }{ + {name: "broadcast", req: &tg.ChannelsCreateChannelRequest{Title: "TDLib broadcast", Broadcast: true}}, + {name: "megagroup", req: &tg.ChannelsCreateChannelRequest{Title: "TDLib group", Megagroup: true}}, + {name: "forum", req: &tg.ChannelsCreateChannelRequest{Title: "TDLib forum", Megagroup: true, Forum: true}}, + } + for _, test := range tests { + t.Run(test.name, func(t *testing.T) { + sessions.clearMessages() + created, err := r.onChannelsCreateChannel(WithUserID(ctx, owner.ID), test.req) + if err != nil { + t.Fatalf("create channel: %v", err) + } + updates, ok := created.(*tg.Updates) + if !ok || len(updates.Updates) != 3 { + t.Fatalf("response = %T %+v, want mapping, create message, and channel refresh", created, created) + } + mapping, ok := updates.Updates[0].(*tg.UpdateMessageID) + if !ok || mapping.ID <= 0 || mapping.RandomID == 0 { + t.Fatalf("mapping = %#v, want positive message id and non-zero random id", updates.Updates[0]) + } + create, ok := updates.Updates[1].(*tg.UpdateNewChannelMessage) + if !ok || create.Pts != domain.FirstChannelEventPts || create.PtsCount != 1 { + t.Fatalf("create update = %#v, want pts=2 pts_count=1", updates.Updates[1]) + } + service, ok := create.Message.(*tg.MessageService) + if !ok || service.ID != mapping.ID { + t.Fatalf("create service = %#v, want mapped id %d", create.Message, mapping.ID) + } + if _, ok := service.Action.(*tg.MessageActionChannelCreate); !ok { + t.Fatalf("create action = %T, want messageActionChannelCreate", service.Action) + } + if refresh, ok := updates.Updates[2].(*tg.UpdateChannel); !ok || refresh.ChannelID == 0 { + t.Fatalf("refresh = %#v, want updateChannel", updates.Updates[2]) + } + + pushed, ok := sessions.lastUserPush().(*tg.Updates) + if !ok || len(pushed.Updates) != 2 { + t.Fatalf("fan-out = %T %+v, want create message and channel refresh only", sessions.lastUserPush(), sessions.lastUserPush()) + } + for _, update := range pushed.Updates { + if _, ok := update.(*tg.UpdateMessageID); ok { + t.Fatalf("response-only updateMessageID leaked into fan-out: %+v", pushed.Updates) + } + } + }) + } +} + +func TestChannelCreationResponseRejectsNonCreationResult(t *testing.T) { + r := New(Config{}, Deps{}, zaptest.NewLogger(t), clock.System) + for _, result := range []domain.CreateChannelResult{ + {}, + {Message: domain.ChannelMessage{ID: 1}}, + {Message: domain.ChannelMessage{ID: 1, Action: &domain.ChannelMessageAction{Type: domain.ChannelActionChatAddUser}}}, + } { + if updates, err := r.channelCreationResponseUpdates(context.Background(), 1, result); err == nil || updates != nil { + t.Fatalf("invalid creation result = %+v produced updates=%+v err=%v", result, updates, err) + } + } +} diff --git a/internal/rpc/channels_invites_members_rpc_test.go b/internal/rpc/channels_invites_members_rpc_test.go index 2ee18378..3edfbe89 100644 --- a/internal/rpc/channels_invites_members_rpc_test.go +++ b/internal/rpc/channels_invites_members_rpc_test.go @@ -102,6 +102,57 @@ func TestChannelsGetParticipantsUsesSingleBatchUserLookup(t *testing.T) { } } +func TestChannelsGetParticipantsRetainsDeletedAccountTombstone(t *testing.T) { + ctx := context.Background() + owner := domain.User{ID: 1, AccessHash: 101, Phone: "15550002131", FirstName: "Owner"} + member := domain.User{ID: 2, AccessHash: 102, Phone: "15550002132", FirstName: "Member"} + users := mapUsersService{users: map[int64]domain.User{ + owner.ID: owner, + member.ID: member, + }} + channelStore := memory.NewChannelStore() + r := New(Config{}, Deps{ + Users: users, + Channels: appchannels.NewService(channelStore), + }, zaptest.NewLogger(t), clock.System) + + created, err := r.onMessagesCreateChat(WithUserID(ctx, owner.ID), &tg.MessagesCreateChatRequest{ + Users: []tg.InputUserClass{ + &tg.InputUser{UserID: member.ID, AccessHash: member.AccessHash}, + }, + Title: "Deleted Account Membership Group", + }) + if err != nil { + t.Fatalf("create chat: %v", err) + } + channel := created.Updates.(*tg.Updates).Chats[0].(*tg.Channel) + users.users[member.ID] = domain.User{ID: member.ID, Deleted: true, DeletedAt: 1_800_000_000} + + got, err := r.onChannelsGetParticipants(WithUserID(ctx, owner.ID), &tg.ChannelsGetParticipantsRequest{ + Channel: &tg.InputChannel{ChannelID: channel.ID, AccessHash: channel.AccessHash}, + Filter: &tg.ChannelParticipantsRecent{}, + Limit: 20, + }) + if err != nil { + t.Fatalf("get participants: %v", err) + } + list := got.(*tg.ChannelsChannelParticipants) + if len(list.Participants) != 2 { + t.Fatalf("participants = %+v, want owner and retained deleted member", list.Participants) + } + for _, item := range list.Users { + u, ok := item.(*tg.User) + if !ok || u.ID != member.ID { + continue + } + if !u.Deleted || u.AccessHash != 0 || u.Phone != "" || u.FirstName != "" || u.LastName != "" || u.Username != "" || u.Photo != nil || u.Status != nil { + t.Fatalf("deleted member projection leaked profile state: %+v", u) + } + return + } + t.Fatalf("users = %+v, want retained deleted member tombstone", list.Users) +} + func TestChannelsGetParticipantsValidatesHashAfterParticipantAccessCheck(t *testing.T) { ctx := context.Background() userStore := memory.NewUserStore() diff --git a/internal/rpc/channels_legacy_chat.go b/internal/rpc/channels_legacy_chat.go index b3d653ff..a3717bc6 100644 --- a/internal/rpc/channels_legacy_chat.go +++ b/internal/rpc/channels_legacy_chat.go @@ -618,8 +618,8 @@ func (r *Router) enqueueChannelWallpaperFanout(ctx context.Context, originUserID ownerIDs := channelMessageFanoutOwnerIDs(sendRes, nil) r.enqueueChannelFanoutWithPrefetch(ctx, channelFanoutMessageBox, originUserID, res.Channel.ID, res.Event.Pts, res.Recipients, 0, - func(bgCtx context.Context, viewers []int64) { - r.prefetchChannelFanoutUsers(bgCtx, fanoutCache, viewers, ownerIDs) + func(bgCtx context.Context, viewers []int64) bool { + return r.prefetchChannelFanoutUsers(bgCtx, fanoutCache, viewers, ownerIDs) }, func(bgCtx context.Context, viewerUserID int64) *tg.Updates { return r.channelWallpaperUpdatesWithPeerCache(bgCtx, viewerUserID, res, fanoutCache) diff --git a/internal/rpc/channels_members.go b/internal/rpc/channels_members.go index 0ad8b911..3b59ebcf 100644 --- a/internal/rpc/channels_members.go +++ b/internal/rpc/channels_members.go @@ -344,7 +344,10 @@ func (r *Router) onChannelsInviteToChannel(ctx context.Context, req *tg.Channels r.addOnlineChannelMemberships(res.Channel.ID, channelMemberUserIDs(res.Members)...) cache := newViewerPeerCache(r) updates := r.channelOperationUpdatesWithPeerCache(ctx, userID, res, cache) - r.pushChannelUpdates(ctx, userID, res.Channel.ID, res.Recipients, func(viewerUserID int64) *tg.Updates { + // Durable membership is not a realtime audience. Production fan-out derives + // online active members from the session fabric; offline members converge via + // the committed channel event/difference and must not pay payload-build cost. + r.pushChannelUpdates(ctx, userID, res.Channel.ID, nil, func(viewerUserID int64) *tg.Updates { return r.channelOperationUpdatesWithPeerCache(ctx, viewerUserID, res, cache) }) return &tg.MessagesInvitedUsers{Updates: updates, MissingInvitees: missingInvitees}, nil diff --git a/internal/rpc/channels_messages.go b/internal/rpc/channels_messages.go index f73e8e1d..b996eadd 100644 --- a/internal/rpc/channels_messages.go +++ b/internal/rpc/channels_messages.go @@ -100,6 +100,7 @@ func (r *Router) onChannelsSearchPosts(ctx context.Context, req *tg.ChannelsSear return nil, channelInvalidErr(err) } history = r.enrichChannelHistory(ctx, userID, history) + r.maybeEnqueueExpiredChannelWebPageResolves(userID, history.Messages) result := tgChannelSearchPostsMessages(userID, history) r.applyPeerReadModelsToMessages(ctx, userID, result) return result, nil @@ -267,15 +268,10 @@ func (r *Router) onChannelsGetMessages(ctx context.Context, req *tg.ChannelsGetM if err := r.checkFrozenChannelParticipants(ctx, userID, channelID); err != nil { return nil, err } - ids := make([]int, 0, len(req.ID)) - for _, input := range req.ID { - id, ok := inputMessageBoxID(input) - if !ok || id <= 0 || id > domain.MaxMessageBoxID { - continue - } - ids = append(ids, id) - } + trace := newGetMessagesInputTrace(req.ID) + ids := trace.lookupIDs if len(ids) == 0 { + r.logChannelGetMessagesTrace(ctx, channelID, trace, nil, &tg.MessagesMessages{}) return &tg.MessagesMessages{}, nil } history, err := r.deps.Channels.GetMessages(ctx, userID, channelID, ids) @@ -287,6 +283,7 @@ func (r *Router) onChannelsGetMessages(ctx context.Context, req *tg.ChannelsGetM for _, msg := range history.Messages { byID[msg.ID] = msg } + r.maybeEnqueueExpiredChannelWebPageResolves(userID, history.Messages) messages := make([]tg.MessageClass, 0, len(ids)) for _, id := range ids { if msg, ok := byID[id]; ok { @@ -301,6 +298,7 @@ func (r *Router) onChannelsGetMessages(ctx context.Context, req *tg.ChannelsGetM Users: r.tgUsersForViewer(userID, history.Users), // viewer 补拉自己的消息（含置顶）须带 self } r.applyPeerReadModelsToMessages(ctx, userID, result) + r.logChannelGetMessagesTrace(ctx, channelID, trace, history.Messages, result) return result, nil } diff --git a/internal/rpc/channels_settings_rpc_test.go b/internal/rpc/channels_settings_rpc_test.go index 82b312b8..94b14c6a 100644 --- a/internal/rpc/channels_settings_rpc_test.go +++ b/internal/rpc/channels_settings_rpc_test.go @@ -121,11 +121,15 @@ func TestChannelInputAccessHashIsValidatedRPC(t *testing.T) { if got := len(mixedChats.(*tg.MessagesChats).Chats); got != 2 { t.Fatalf("get channels mixed access_hash chats = %d, want two good refs", got) } - if _, err := r.dialogFilterFromRequest(WithUserID(ctx, owner.ID), owner.ID, &tg.MessagesGetDialogsRequest{ + dialogFilter, err := r.dialogFilterFromRequest(WithUserID(ctx, owner.ID), owner.ID, &tg.MessagesGetDialogsRequest{ OffsetPeer: &tg.InputPeerChannel{ChannelID: channel.ID, AccessHash: badHash}, Limit: 20, - }); err == nil || !strings.Contains(err.Error(), "CHANNEL_PRIVATE") { - t.Fatalf("get dialogs offset bad access_hash err = %v, want CHANNEL_PRIVATE", err) + }) + if err != nil { + t.Fatalf("get dialogs cursor with stale access_hash: %v", err) + } + if !dialogFilter.HasOffsetPeer || dialogFilter.OffsetPeer != (domain.Peer{Type: domain.PeerTypeChannel, ID: channel.ID}) { + t.Fatalf("get dialogs cursor = %+v, want channel id without content authorization", dialogFilter) } if _, err := r.onMessagesSaveDraft(WithUserID(ctx, owner.ID), &tg.MessagesSaveDraftRequest{ Peer: &tg.InputPeerChannel{ChannelID: channel.ID, AccessHash: badHash}, @@ -525,13 +529,14 @@ func TestChannelsCreateChannelUnsupportedOptionsReturnExplicitErrors(t *testing. } } -func TestChannelsGetFullChannelCanSetUsernameOnlyForCreator(t *testing.T) { +func TestChannelsGetFullChannelProjectsManagementAndStatsCapabilities(t *testing.T) { ctx := context.Background() userStore := memory.NewUserStore() owner, _ := userStore.Create(ctx, domain.User{AccessHash: 56, Phone: "15550002211", FirstName: "Owner"}) member, _ := userStore.Create(ctx, domain.User{AccessHash: 57, Phone: "15550002212", FirstName: "Member"}) + admin, _ := userStore.Create(ctx, domain.User{AccessHash: 58, Phone: "15550002213", FirstName: "Admin"}) channelStore := memory.NewChannelStore() - r := New(Config{}, Deps{ + r := New(Config{DC: 2}, Deps{ Users: appusers.NewService(userStore), Channels: appchannels.NewService(channelStore), }, zaptest.NewLogger(t), clock.System) @@ -572,23 +577,56 @@ func TestChannelsGetFullChannelCanSetUsernameOnlyForCreator(t *testing.T) { t.Fatalf("owner get full channel: %v", err) } ownerChannelFull := ownerFull.FullChat.(*tg.ChannelFull) - if !ownerChannelFull.CanSetUsername || !ownerChannelFull.CanDeleteChannel { - t.Fatalf("owner full flags can_set_username=%v can_delete_channel=%v, want both true", ownerChannelFull.CanSetUsername, ownerChannelFull.CanDeleteChannel) + if !ownerChannelFull.CanSetUsername || !ownerChannelFull.CanDeleteChannel || !ownerChannelFull.CanViewStats { + t.Fatalf("owner full flags can_set_username=%v can_delete_channel=%v can_view_stats=%v, want all true", ownerChannelFull.CanSetUsername, ownerChannelFull.CanDeleteChannel, ownerChannelFull.CanViewStats) + } + if statsDC, ok := ownerChannelFull.GetStatsDC(); !ok || statsDC != 2 { + t.Fatalf("owner full stats_dc=(%d,%v), want (2,true)", statsDC, ok) + } + cachedOwnerFull, err := r.onChannelsGetFullChannel(WithUserID(ctx, owner.ID), input) + if err != nil { + t.Fatalf("owner get cached full channel: %v", err) + } + cachedOwnerChannelFull := cachedOwnerFull.FullChat.(*tg.ChannelFull) + if statsDC, ok := cachedOwnerChannelFull.GetStatsDC(); !cachedOwnerChannelFull.CanViewStats || !ok || statsDC != 2 { + t.Fatalf("cached owner full can_view_stats=%v stats_dc=(%d,%v), want true and (2,true)", cachedOwnerChannelFull.CanViewStats, statsDC, ok) } if _, err := r.onChannelsInviteToChannel(WithUserID(ctx, owner.ID), &tg.ChannelsInviteToChannelRequest{ Channel: input, - Users: []tg.InputUserClass{&tg.InputUser{UserID: member.ID, AccessHash: member.AccessHash}}, + Users: []tg.InputUserClass{ + &tg.InputUser{UserID: member.ID, AccessHash: member.AccessHash}, + &tg.InputUser{UserID: admin.ID, AccessHash: admin.AccessHash}, + }, }); err != nil { - t.Fatalf("invite member: %v", err) + t.Fatalf("invite members: %v", err) } memberFull, err := r.onChannelsGetFullChannel(WithUserID(ctx, member.ID), input) if err != nil { t.Fatalf("member get full channel: %v", err) } memberChannelFull := memberFull.FullChat.(*tg.ChannelFull) - if memberChannelFull.CanSetUsername || memberChannelFull.CanDeleteChannel { - t.Fatalf("member full flags can_set_username=%v can_delete_channel=%v, want both false", memberChannelFull.CanSetUsername, memberChannelFull.CanDeleteChannel) + if memberChannelFull.CanSetUsername || memberChannelFull.CanDeleteChannel || memberChannelFull.CanViewStats { + t.Fatalf("member full flags can_set_username=%v can_delete_channel=%v can_view_stats=%v, want all false", memberChannelFull.CanSetUsername, memberChannelFull.CanDeleteChannel, memberChannelFull.CanViewStats) + } + if statsDC, ok := memberChannelFull.GetStatsDC(); ok { + t.Fatalf("member full stats_dc=(%d,true), want absent", statsDC) + } + + if _, err := r.onChannelsEditAdmin(WithUserID(ctx, owner.ID), &tg.ChannelsEditAdminRequest{ + Channel: input, + UserID: &tg.InputUser{UserID: admin.ID, AccessHash: admin.AccessHash}, + AdminRights: tg.ChatAdminRights{ChangeInfo: true}, + }); err != nil { + t.Fatalf("promote admin: %v", err) + } + adminFull, err := r.onChannelsGetFullChannel(WithUserID(ctx, admin.ID), input) + if err != nil { + t.Fatalf("admin get full channel: %v", err) + } + adminChannelFull := adminFull.FullChat.(*tg.ChannelFull) + if statsDC, ok := adminChannelFull.GetStatsDC(); !adminChannelFull.CanViewStats || !ok || statsDC != 2 { + t.Fatalf("admin full can_view_stats=%v stats_dc=(%d,%v), want true and (2,true)", adminChannelFull.CanViewStats, statsDC, ok) } }) } diff --git a/internal/rpc/channels_updates.go b/internal/rpc/channels_updates.go index aeee742c..1290a0de 100644 --- a/internal/rpc/channels_updates.go +++ b/internal/rpc/channels_updates.go @@ -45,13 +45,20 @@ func (r *Router) onUpdatesGetChannelDifference(ctx context.Context, req *tg.Upda } return nil, channelInvalidErr(err) } + diff, err = r.enrichChannelDifferenceStrict(ctx, userID, diff) + if err != nil { + r.log.Error("project durable channel difference users", + zap.Int64("viewer_user_id", userID), + zap.Int64("channel_id", channelID), + zap.Error(err)) + return nil, internalErr() + } if diff.Channel.Username != "" && diff.Self.Status != domain.ChannelMemberActive { // Telegram's public-channel passive delivery is enabled only after a // successful short-poll difference. The runtime subscription is renewed // by subsequent polls and never creates membership/dialog/read state. r.refreshPublicChannelSubscription(ctx, userID, channelID) } - diff = r.enrichChannelDifference(ctx, userID, diff) out := r.tgChannelDifference(ctx, userID, diff) if linked, ok := r.linkedDiscussionChat(ctx, userID, channelID); ok { switch value := out.(type) { diff --git a/internal/rpc/channels_updates_rpc_test.go b/internal/rpc/channels_updates_rpc_test.go index b05d0b08..79d842e7 100644 --- a/internal/rpc/channels_updates_rpc_test.go +++ b/internal/rpc/channels_updates_rpc_test.go @@ -104,8 +104,8 @@ func TestChannelSendHistoryAndDifferenceRPC(t *testing.T) { t.Fatalf("message id update = %#v, want id=3 random_id=99", sendUpdates.Updates[0]) } newMsg, ok := sendUpdates.Updates[1].(*tg.UpdateNewChannelMessage) - if !ok || newMsg.Pts != 3 || newMsg.PtsCount != 1 { - t.Fatalf("new channel update = %#v, want pts=3", sendUpdates.Updates[1]) + if !ok || newMsg.Pts != 4 || newMsg.PtsCount != 1 { + t.Fatalf("new channel update = %#v, want pts=4", sendUpdates.Updates[1]) } msg := newMsg.Message.(*tg.Message) if msg.PeerID.(*tg.PeerChannel).ChannelID != channel.ID || msg.Message != "hello channel" || !msg.Out { diff --git a/internal/rpc/client_info_test.go b/internal/rpc/client_info_test.go index d49eebf9..2a9ed6d2 100644 --- a/internal/rpc/client_info_test.go +++ b/internal/rpc/client_info_test.go @@ -95,6 +95,22 @@ func TestNormalizeClientInfoPreservesMetadataWithinLimits(t *testing.T) { } } +func TestClientSessionMetadataFromContextCarriesLanguageAndPhysicalSession(t *testing.T) { + var raw [8]byte + raw[0], raw[7] = 0x11, 0x77 + ctx := WithClientInfo(context.Background(), ClientInfo{ + SystemLangCode: "en-US", LangPack: "tdesktop", LangCode: "ru", + }) + ctx = WithRawAuthKeyID(ctx, raw) + ctx = WithSessionID(ctx, 998877) + got := clientSessionMetadataFromContext(ctx) + if got.AuthKeyID != raw || got.SessionID != 998877 || + got.SystemLangCode != "en-US" || got.LangPack != "tdesktop" || got.LangCode != "ru" || + got.PreferredLanguage() != "ru" { + t.Fatalf("client session metadata = %+v", got) + } +} + func assertClientMetadataRunes(t *testing.T, field, value string, want int) { t.Helper() if got := utf8.RuneCountInString(value); got != want { diff --git a/internal/rpc/client_regressions_test.go b/internal/rpc/client_regressions_test.go new file mode 100644 index 00000000..52d1efac --- /dev/null +++ b/internal/rpc/client_regressions_test.go @@ -0,0 +1,50 @@ +package rpc + +import ( + "context" + "testing" + + "github.com/iamxvbaba/td/clock" + "github.com/iamxvbaba/td/tg" + "go.uber.org/zap/zaptest" + + "telesrv/internal/domain" +) + +func TestMessagesSearchPhoneCallsDoesNotFallThroughToOrdinaryHistory(t *testing.T) { + r := New(Config{}, Deps{}, zaptest.NewLogger(t), clock.System) + filter, err := r.messageFilterFromSearchRequest(context.Background(), 1001, &tg.MessagesSearchRequest{ + Peer: &tg.InputPeerSelf{}, + Filter: &tg.InputMessagesFilterPhoneCalls{Missed: true}, + Limit: 50, + }) + if err != nil { + t.Fatal(err) + } + if !filter.PhoneCallsOnly || !filter.MissedPhoneCallsOnly { + t.Fatalf("phone filter = %+v", filter) + } + if searchFilterNeedsMediaStore(&tg.InputMessagesFilterPhoneCalls{}) { + t.Fatal("phone-call filter must use message service-action search, not media search") + } +} + +func TestCrossDialogReplyKeepsExplicitSourcePeer(t *testing.T) { + const senderID, destinationID, sourceID = int64(1001), int64(1002), int64(1003) + r := New(Config{}, Deps{Users: mapUsersService{users: map[int64]domain.User{ + senderID: {ID: senderID, AccessHash: 11}, + destinationID: {ID: destinationID, AccessHash: 22}, + sourceID: {ID: sourceID, AccessHash: 33}, + }}}, zaptest.NewLogger(t), clock.System) + input := &tg.InputReplyToMessage{ReplyToMsgID: 77} + input.SetReplyToPeerID(&tg.InputPeerUser{UserID: sourceID, AccessHash: 33}) + input.SetQuoteText("source quote") + reply, err := r.messageReplyFromInput(context.Background(), senderID, + domain.Peer{Type: domain.PeerTypeUser, ID: destinationID}, input) + if err != nil { + t.Fatal(err) + } + if reply == nil || reply.MessageID != 77 || reply.Peer != (domain.Peer{Type: domain.PeerTypeUser, ID: sourceID}) { + t.Fatalf("cross-dialog reply = %+v", reply) + } +} diff --git a/internal/rpc/contacts_users_rpc_test.go b/internal/rpc/contacts_users_rpc_test.go index af179b2f..4b01d264 100644 --- a/internal/rpc/contacts_users_rpc_test.go +++ b/internal/rpc/contacts_users_rpc_test.go @@ -2,12 +2,18 @@ package rpc import ( "context" + "fmt" + "reflect" + "strings" + "testing" + "time" + "github.com/iamxvbaba/td/bin" "github.com/iamxvbaba/td/clock" "github.com/iamxvbaba/td/tg" + "github.com/iamxvbaba/td/tlprofile" "go.uber.org/zap/zaptest" - "reflect" - "strings" + appchannels "telesrv/internal/app/channels" appcontacts "telesrv/internal/app/contacts" appprivacy "telesrv/internal/app/privacy" @@ -18,8 +24,6 @@ import ( appusers "telesrv/internal/app/users" "telesrv/internal/domain" "telesrv/internal/store/memory" - "testing" - "time" ) func TestContactsSearchFindsUsers(t *testing.T) { @@ -187,6 +191,7 @@ func TestContactsEditCloseFriendsFanoutsCloseFriendStories(t *testing.T) { Contacts: appcontacts.NewService(contactsStore, users), Stories: appstories.NewService(storyStore), Updates: appupdates.NewService(stateStore, updateStore), + Users: appusers.NewService(users), }, zaptest.NewLogger(t), fixedClock{now: time.Unix(1700000100, 0)}) ownerAuth := [8]byte{1, 2, 3} @@ -321,6 +326,7 @@ func TestContactsBlockUnblockFanoutsStoryVisibilityChanges(t *testing.T) { Contacts: appcontacts.NewService(contactsStore, users), Stories: appstories.NewService(storyStore), Updates: appupdates.NewService(memory.NewUpdateStateStore(), updateStore), + Users: appusers.NewService(users), }, zaptest.NewLogger(t), fixedClock{now: time.Unix(1700000100, 0)}) ownerAuth := [8]byte{7, 7, 1} @@ -475,6 +481,7 @@ func TestContactsSetBlockedReplacesStoryBlocklistFanouts(t *testing.T) { Contacts: appcontacts.NewService(contactsStore, users), Stories: appstories.NewService(storyStore), Updates: appupdates.NewService(memory.NewUpdateStateStore(), updateStore), + Users: appusers.NewService(users), }, zaptest.NewLogger(t), fixedClock{now: time.Unix(1700000100, 0)}) ownerAuth := [8]byte{8, 8, 1} @@ -1558,14 +1565,22 @@ func TestContactsBlockGetBlockedAndUnblockRPC(t *testing.T) { Users: appusers.NewService(userStore), Contacts: appcontacts.NewService(memory.NewContactStore(), userStore), }, zaptest.NewLogger(t), clock.System) + bobCtx := WithUserID(ctx, bob.ID) + userFull, err := r.onUsersGetFullUser(bobCtx, &tg.InputUser{UserID: alice.ID, AccessHash: alice.AccessHash}) + if err != nil { + t.Fatalf("users.getFullUser before block: %v", err) + } + if userFull.FullUser.Blocked || userFull.FullUser.BlockedMyStoriesFrom || !userFull.FullUser.Settings.BlockContact { + t.Fatalf("full user before block = %+v, want unblocked flags and block action", userFull.FullUser) + } - ok, err := r.onContactsBlock(WithUserID(ctx, bob.ID), &tg.ContactsBlockRequest{ + ok, err := r.onContactsBlock(bobCtx, &tg.ContactsBlockRequest{ ID: &tg.InputPeerUser{UserID: alice.ID, AccessHash: alice.AccessHash}, }) if err != nil || !ok { t.Fatalf("contacts.block = %v, %v", ok, err) } - blocked, err := r.onContactsGetBlocked(WithUserID(ctx, bob.ID), &tg.ContactsGetBlockedRequest{Limit: 10}) + blocked, err := r.onContactsGetBlocked(bobCtx, &tg.ContactsGetBlockedRequest{Limit: 10}) if err != nil { t.Fatalf("contacts.getBlocked: %v", err) } @@ -1579,18 +1594,134 @@ func TestContactsBlockGetBlockedAndUnblockRPC(t *testing.T) { if user, ok := full.Users[0].(*tg.User); !ok || user.ID != alice.ID || user.Phone != "" { t.Fatalf("blocked user = %#v, want alice with hidden phone", full.Users[0]) } + userFull, err = r.onUsersGetFullUser(bobCtx, &tg.InputUser{UserID: alice.ID, AccessHash: alice.AccessHash}) + if err != nil { + t.Fatalf("users.getFullUser after block: %v", err) + } + if !userFull.FullUser.Blocked || !userFull.FullUser.BlockedMyStoriesFrom || userFull.FullUser.Settings.BlockContact { + t.Fatalf("full user after block = %+v, want blocked flags and no block action", userFull.FullUser) + } + aliceView, err := r.onUsersGetFullUser(WithUserID(ctx, alice.ID), &tg.InputUser{UserID: bob.ID, AccessHash: bob.AccessHash}) + if err != nil { + t.Fatalf("users.getFullUser for opposite owner: %v", err) + } + if aliceView.FullUser.Blocked || aliceView.FullUser.BlockedMyStoriesFrom || !aliceView.FullUser.Settings.BlockContact { + t.Fatalf("opposite owner full user = %+v, want unblocked owner-scoped state", aliceView.FullUser) + } - ok, err = r.onContactsUnblock(WithUserID(ctx, bob.ID), &tg.ContactsUnblockRequest{ + ok, err = r.onContactsUnblock(bobCtx, &tg.ContactsUnblockRequest{ ID: &tg.InputPeerUser{UserID: alice.ID, AccessHash: alice.AccessHash}, }) if err != nil || !ok { t.Fatalf("contacts.unblock = %v, %v", ok, err) } - blocked, err = r.onContactsGetBlocked(WithUserID(ctx, bob.ID), &tg.ContactsGetBlockedRequest{Limit: 10}) + blocked, err = r.onContactsGetBlocked(bobCtx, &tg.ContactsGetBlockedRequest{Limit: 10}) if err != nil { t.Fatalf("contacts.getBlocked after unblock: %v", err) } if full, ok := blocked.(*tg.ContactsBlocked); !ok || len(full.Blocked) != 0 { t.Fatalf("blocked after unblock = %T %+v, want empty contacts.blocked", blocked, blocked) } + userFull, err = r.onUsersGetFullUser(bobCtx, &tg.InputUser{UserID: alice.ID, AccessHash: alice.AccessHash}) + if err != nil { + t.Fatalf("users.getFullUser after unblock: %v", err) + } + if userFull.FullUser.Blocked || userFull.FullUser.BlockedMyStoriesFrom || !userFull.FullUser.Settings.BlockContact { + t.Fatalf("full user after unblock = %+v, want unblocked flags and block action", userFull.FullUser) + } +} + +func TestContactsBlockGetBlockedAndUnblockAcrossExactProfiles(t *testing.T) { + for profile := tlprofile.Profile225; profile <= tlprofile.Profile228; profile++ { + t.Run(fmt.Sprintf("layer_%d", profile), func(t *testing.T) { + ctx := context.Background() + userStore := memory.NewUserStore() + alice, err := userStore.Create(ctx, domain.User{ + AccessHash: 11, + Phone: "15550009101", + FirstName: "Alice", + }) + if err != nil { + t.Fatalf("create alice: %v", err) + } + bob, err := userStore.Create(ctx, domain.User{ + AccessHash: 22, + Phone: "15550009102", + FirstName: "Bob", + }) + if err != nil { + t.Fatalf("create bob: %v", err) + } + r := New(Config{}, Deps{ + Users: appusers.NewService(userStore), + Contacts: appcontacts.NewService(memory.NewContactStore(), userStore), + }, zaptest.NewLogger(t), clock.System) + ownerCtx := WithUserID(ctx, bob.ID) + peer := &tg.InputPeerUser{UserID: alice.ID, AccessHash: alice.AccessHash} + + if _, method := dispatchExactLayerRPCTest(t, r, ownerCtx, profile, &tg.ContactsBlockRequest{ID: peer}); method != "contacts.block" { + t.Fatalf("block method = %q", method) + } + if _, method := dispatchExactLayerRPCTest(t, r, ownerCtx, profile, &tg.ContactsGetBlockedRequest{Limit: 10}); method != "contacts.getBlocked" { + t.Fatalf("getBlocked method = %q", method) + } + blocked, err := r.onContactsGetBlocked(ownerCtx, &tg.ContactsGetBlockedRequest{Limit: 10}) + if err != nil { + t.Fatalf("read blocked after exact block: %v", err) + } + if full, ok := blocked.(*tg.ContactsBlocked); !ok || len(full.Blocked) != 1 { + t.Fatalf("blocked after exact block = %T %+v", blocked, blocked) + } + result, method := dispatchExactLayerRPCTest(t, r, ownerCtx, profile, &tg.UsersGetFullUserRequest{ + ID: &tg.InputUser{UserID: alice.ID, AccessHash: alice.AccessHash}, + }) + if method != "users.getFullUser" { + t.Fatalf("getFullUser method = %q", method) + } + var responseWire bin.Buffer + if err := result.Encode(&responseWire); err != nil { + t.Fatalf("encode exact blocked full user: %v", err) + } + decoded, err := tlprofile.DecodeObject(profile, &bin.Buffer{Buf: responseWire.Copy()}, tlprofile.Limits{}) + if err != nil { + t.Fatalf("decode exact blocked full user: %v", err) + } + blockedFull, ok := decoded.(*tg.UsersUserFull) + if !ok || !blockedFull.FullUser.Blocked || !blockedFull.FullUser.BlockedMyStoriesFrom || blockedFull.FullUser.Settings.BlockContact { + t.Fatalf("Layer %d blocked full user = %T %+v", profile, decoded, decoded) + } + + if _, method := dispatchExactLayerRPCTest(t, r, ownerCtx, profile, &tg.ContactsUnblockRequest{ID: peer}); method != "contacts.unblock" { + t.Fatalf("unblock method = %q", method) + } + if _, method := dispatchExactLayerRPCTest(t, r, ownerCtx, profile, &tg.ContactsGetBlockedRequest{Limit: 10}); method != "contacts.getBlocked" { + t.Fatalf("getBlocked after unblock method = %q", method) + } + blocked, err = r.onContactsGetBlocked(ownerCtx, &tg.ContactsGetBlockedRequest{Limit: 10}) + if err != nil { + t.Fatalf("read blocked after exact unblock: %v", err) + } + if full, ok := blocked.(*tg.ContactsBlocked); !ok || len(full.Blocked) != 0 { + t.Fatalf("blocked after exact unblock = %T %+v", blocked, blocked) + } + result, method = dispatchExactLayerRPCTest(t, r, ownerCtx, profile, &tg.UsersGetFullUserRequest{ + ID: &tg.InputUser{UserID: alice.ID, AccessHash: alice.AccessHash}, + }) + if method != "users.getFullUser" { + t.Fatalf("getFullUser after unblock method = %q", method) + } + responseWire.Reset() + if err := result.Encode(&responseWire); err != nil { + t.Fatalf("encode exact unblocked full user: %v", err) + } + decoded, err = tlprofile.DecodeObject(profile, &bin.Buffer{Buf: responseWire.Copy()}, tlprofile.Limits{}) + if err != nil { + t.Fatalf("decode exact unblocked full user: %v", err) + } + unblockedFull, ok := decoded.(*tg.UsersUserFull) + if !ok || unblockedFull.FullUser.Blocked || unblockedFull.FullUser.BlockedMyStoriesFrom || !unblockedFull.FullUser.Settings.BlockContact { + t.Fatalf("Layer %d unblocked full user = %T %+v", profile, decoded, decoded) + } + }) + } } diff --git a/internal/rpc/context.go b/internal/rpc/context.go index f79a7180..c8f5e4c0 100644 --- a/internal/rpc/context.go +++ b/internal/rpc/context.go @@ -7,6 +7,8 @@ import ( "unicode/utf8" "github.com/iamxvbaba/td/tg" + + "telesrv/internal/domain" ) type ctxKey int @@ -96,6 +98,18 @@ func ClientInfoFrom(ctx context.Context) (ClientInfo, bool) { return v, ok } +func clientSessionMetadataFromContext(ctx context.Context) domain.ClientSessionMetadata { + metadata := domain.ClientSessionMetadata{} + metadata.AuthKeyID = rawAuthKeyIDForOrigin(ctx) + metadata.SessionID, _ = SessionIDFrom(ctx) + if info, ok := ClientInfoFrom(ctx); ok { + metadata.SystemLangCode = info.SystemLangCode + metadata.LangPack = info.LangPack + metadata.LangCode = info.LangCode + } + return metadata +} + func ClientTypeFrom(ctx context.Context) ClientType { if info, ok := ClientInfoFrom(ctx); ok { return info.ClientType() diff --git a/internal/rpc/convert_channels_core.go b/internal/rpc/convert_channels_core.go index 0c0dfc10..85786602 100644 --- a/internal/rpc/convert_channels_core.go +++ b/internal/rpc/convert_channels_core.go @@ -183,7 +183,7 @@ func tgChannelMessage(viewerUserID int64, m domain.ChannelMessage) tg.MessageCla if markup := tgReplyMarkup(m.ReplyMarkup); markup != nil { msg.SetReplyMarkup(markup) } - if rich := mustTGRichMessage(m.RichMessage); rich != nil { + if rich := optionalTGRichMessage("channel_message", m.ID, m.RichMessage); rich != nil { msg.SetRichMessage(*rich) } if replies := tgChannelMessageReplies(m.Replies); replies != nil { @@ -549,7 +549,13 @@ func tgChannelFull(view domain.ChannelView, publicBaseURL ...string) *tg.Channel CanViewParticipants: channelMemberIsAdmin(view.Self) || !ch.MembersListAdminOnly(), CanSetUsername: view.Self.Role == domain.ChannelRoleCreator, CanDeleteChannel: view.Self.Role == domain.ChannelRoleCreator, - ID: ch.ID, + // TDesktop only exposes the Statistics entry after channelFull.can_view_stats. + // The stats RPCs enforce the same creator/admin boundary, so project the + // capability from the membership instead of leaving a reachable service + // hidden behind a permanently false wire flag. Monoforum is an internal + // direct-message container and has no independent statistics surface. + CanViewStats: !ch.Monoforum && channelMemberIsAdmin(view.Self), + ID: ch.ID, // Official clients render localized warnings from scam/fake flags. // About remains the owner's unmodified description. About: ch.About, @@ -648,6 +654,23 @@ func tgChannelFull(view domain.ChannelView, publicBaseURL ...string) *tg.Channel return full } +// applyChannelStatsCapability completes the config-dependent half of the +// channelFull statistics capability. TDLib deliberately clears +// can_view_stats when stats_dc is absent or invalid, so these fields must be +// projected as one invariant rather than as independent optional hints. +// A manually constructed zero-value Router config is treated as unavailable; +// production config validation requires a positive canonical DC. +func (r *Router) applyChannelStatsCapability(full *tg.ChannelFull) { + if full == nil || !full.CanViewStats { + return + } + if r.cfg.DC <= 0 { + full.CanViewStats = false + return + } + full.SetStatsDC(r.cfg.DC) +} + func channelMemberIsAdmin(member domain.ChannelMember) bool { return member.Role == domain.ChannelRoleCreator || member.Role == domain.ChannelRoleAdmin } @@ -848,23 +871,24 @@ func tgAdminLogMessage(viewerUserID, channelID int64, msg *domain.ChannelMessage func tgChatAdminRights(rights domain.ChannelAdminRights) tg.ChatAdminRights { return tg.ChatAdminRights{ - ChangeInfo: rights.ChangeInfo, - PostMessages: rights.PostMessages, - EditMessages: rights.EditMessages, - DeleteMessages: rights.DeleteMessages, - PostStories: rights.PostStories, - EditStories: rights.EditStories, - DeleteStories: rights.DeleteStories, - BanUsers: rights.BanUsers, - InviteUsers: rights.InviteUsers, - PinMessages: rights.PinMessages, - AddAdmins: rights.AddAdmins, - Anonymous: rights.Anonymous, - ManageCall: rights.ManageCall, - Other: true, - ManageTopics: rights.ManageTopics, - ManageRanks: rights.ManageRanks, - ManageLinkedPeers: rights.ManageLinkedPeers, + ChangeInfo: rights.ChangeInfo, + PostMessages: rights.PostMessages, + EditMessages: rights.EditMessages, + DeleteMessages: rights.DeleteMessages, + PostStories: rights.PostStories, + EditStories: rights.EditStories, + DeleteStories: rights.DeleteStories, + BanUsers: rights.BanUsers, + InviteUsers: rights.InviteUsers, + PinMessages: rights.PinMessages, + AddAdmins: rights.AddAdmins, + Anonymous: rights.Anonymous, + ManageCall: rights.ManageCall, + Other: true, + ManageTopics: rights.ManageTopics, + ManageRanks: rights.ManageRanks, + ManageLinkedPeers: rights.ManageLinkedPeers, + ManageWelcomeMessages: rights.ManageWelcomeMessages, // manage_direct_messages(flags.17):客户端据此在母频道上判定 canAccessMonoforum, // 从而为关联 monoforum 派生 MonoforumAdmin(Direct-Messages 容器渲染所需)。 ManageDirectMessages: rights.ManageDirectMessages, @@ -877,24 +901,25 @@ func creatorProjectionAdminRights(rights domain.ChannelAdminRights) domain.Chann func domainChannelAdminRights(rights tg.ChatAdminRights) domain.ChannelAdminRights { return domain.ChannelAdminRights{ - ChangeInfo: rights.ChangeInfo, - PostMessages: rights.PostMessages, - EditMessages: rights.EditMessages, - DeleteMessages: rights.DeleteMessages, - PostStories: rights.PostStories, - EditStories: rights.EditStories, - DeleteStories: rights.DeleteStories, - BanUsers: rights.BanUsers, - InviteUsers: rights.InviteUsers, - PinMessages: rights.PinMessages, - AddAdmins: rights.AddAdmins, - Anonymous: rights.Anonymous, - ManageCall: rights.ManageCall, - ManageChat: rights.Other, - ManageTopics: rights.ManageTopics, - ManageRanks: rights.ManageRanks, - ManageLinkedPeers: rights.ManageLinkedPeers, - ManageDirectMessages: rights.ManageDirectMessages, + ChangeInfo: rights.ChangeInfo, + PostMessages: rights.PostMessages, + EditMessages: rights.EditMessages, + DeleteMessages: rights.DeleteMessages, + PostStories: rights.PostStories, + EditStories: rights.EditStories, + DeleteStories: rights.DeleteStories, + BanUsers: rights.BanUsers, + InviteUsers: rights.InviteUsers, + PinMessages: rights.PinMessages, + AddAdmins: rights.AddAdmins, + Anonymous: rights.Anonymous, + ManageCall: rights.ManageCall, + ManageChat: rights.Other, + ManageTopics: rights.ManageTopics, + ManageRanks: rights.ManageRanks, + ManageLinkedPeers: rights.ManageLinkedPeers, + ManageWelcomeMessages: rights.ManageWelcomeMessages, + ManageDirectMessages: rights.ManageDirectMessages, } } diff --git a/internal/rpc/convert_channels_core_test.go b/internal/rpc/convert_channels_core_test.go index 9855d1cc..ddfbc295 100644 --- a/internal/rpc/convert_channels_core_test.go +++ b/internal/rpc/convert_channels_core_test.go @@ -68,6 +68,46 @@ func TestTGChannelFullIncludesExportedInvite(t *testing.T) { } } +func TestChannelFullStatsCapabilityRequiresEligibleViewerAndExactDC(t *testing.T) { + tests := []struct { + name string + dc int + monoforum bool + role domain.ChannelMemberRole + want bool + }{ + {name: "creator", dc: 2, role: domain.ChannelRoleCreator, want: true}, + {name: "ordinary member", dc: 2, role: domain.ChannelRoleMember}, + {name: "monoforum creator", dc: 2, monoforum: true, role: domain.ChannelRoleCreator}, + {name: "invalid canonical dc", role: domain.ChannelRoleCreator}, + } + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + view := domain.ChannelView{ + Channel: domain.Channel{ID: 1003, Monoforum: tc.monoforum}, + Self: domain.ChannelMember{ + ChannelID: 1003, + UserID: 10, + Status: domain.ChannelMemberActive, + Role: tc.role, + }, + } + full := tgChannelFull(view) + (&Router{cfg: Config{DC: tc.dc}}).applyChannelStatsCapability(full) + statsDC, ok := full.GetStatsDC() + if tc.want { + if !full.CanViewStats || !ok || statsDC != tc.dc { + t.Fatalf("can_view_stats=%v stats_dc=(%d,%v), want true and (%d,true)", full.CanViewStats, statsDC, ok, tc.dc) + } + return + } + if full.CanViewStats || ok { + t.Fatalf("can_view_stats=%v stats_dc=(%d,%v), want false and absent", full.CanViewStats, statsDC, ok) + } + }) + } +} + func TestChannelBannedRightsRoundTripModernFields(t *testing.T) { in := tg.ChatBannedRights{ ViewMessages: true, diff --git a/internal/rpc/convert_dialogs.go b/internal/rpc/convert_dialogs.go index a77b5105..a889f764 100644 --- a/internal/rpc/convert_dialogs.go +++ b/internal/rpc/convert_dialogs.go @@ -202,7 +202,7 @@ func tgDialogDraft(d domain.DialogDraft) tg.DraftMessageClass { Date: d.Date, Effect: d.Effect, } - if rich := mustTGRichMessage(d.RichMessage); rich != nil { + if rich := optionalTGRichMessage("dialog_draft", 0, d.RichMessage); rich != nil { out.SetRichMessage(*rich) } if suggested, ok := tgSuggestedPost(d.SuggestedPost); ok { diff --git a/internal/rpc/convert_markup.go b/internal/rpc/convert_markup.go index 9005e162..a4dad19a 100644 --- a/internal/rpc/convert_markup.go +++ b/internal/rpc/convert_markup.go @@ -229,21 +229,21 @@ func domainOutgoingReplyMarkupForSender(markup tg.ReplyMarkupClass, senderIsBot } } -func domainReplyKeyboardButton(button tg.KeyboardButtonClass) (domain.MarkupButton, error) { - style, icon, err := domainMarkupButtonStyle(button) +func domainReplyKeyboardButton(button tg.KeyboardButton) (domain.MarkupButton, error) { + style, icon, err := domainMarkupButtonStyle(&button) if err != nil { return domain.MarkupButton{}, err } - base := domain.MarkupButton{Style: style, IconCustomEmojiID: icon} - switch b := button.(type) { - case *tg.KeyboardButton: - base.Type, base.Text = domain.MarkupButtonText, b.Text - case *tg.KeyboardButtonRequestPhone: - base.Type, base.Text = domain.MarkupButtonRequestPhone, b.Text - case *tg.KeyboardButtonRequestGeoLocation: - base.Type, base.Text = domain.MarkupButtonRequestLocation, b.Text - case *tg.KeyboardButtonRequestPoll: - base.Type, base.Text = domain.MarkupButtonRequestPoll, b.Text + base := domain.MarkupButton{Text: button.Text, Style: style, IconCustomEmojiID: icon} + switch b := button.Type.(type) { + case *tg.ButtonTypeDefault: + base.Type = domain.MarkupButtonText + case *tg.ButtonTypeRequestPhone: + base.Type = domain.MarkupButtonRequestPhone + case *tg.ButtonTypeRequestGeoLocation: + base.Type = domain.MarkupButtonRequestLocation + case *tg.ButtonTypeRequestPoll: + base.Type = domain.MarkupButtonRequestPoll if quiz, ok := b.GetQuiz(); ok { if quiz { base.PollType = "quiz" @@ -251,12 +251,12 @@ func domainReplyKeyboardButton(button tg.KeyboardButtonClass) (domain.MarkupButt base.PollType = "regular" } } - case *tg.KeyboardButtonRequestPeer: - base.Type, base.Text = domain.MarkupButtonRequestPeer, b.Text + case *tg.ButtonTypeRequestPeer: + base.Type = domain.MarkupButtonRequestPeer base.ButtonID, base.MaxQuantity = b.ButtonID, b.MaxQuantity base.RequestPeerType, base.RequestPeerFilter = domainRequestPeerFilter(b.PeerType) - case *tg.KeyboardButtonSimpleWebView: - base.Type, base.Text, base.URL = domain.MarkupButtonSimpleWebView, b.Text, b.URL + case *tg.ButtonTypeSimpleWebView: + base.Type, base.URL = domain.MarkupButtonSimpleWebView, b.URL default: return domain.MarkupButton{}, domain.ErrButtonTypeInvalid } @@ -281,27 +281,27 @@ func domainInlineMarkup(inline *tg.ReplyInlineMarkup) (*domain.MessageReplyMarku return out, nil } -func domainMarkupButton(btn tg.KeyboardButtonClass, buttonID int) (domain.MarkupButton, error) { - style, icon, err := domainMarkupButtonStyle(btn) +func domainMarkupButton(btn tg.KeyboardInlineButton, buttonID int) (domain.MarkupButton, error) { + style, icon, err := domainMarkupButtonStyle(&btn) if err != nil { return domain.MarkupButton{}, err } - switch b := btn.(type) { - case *tg.KeyboardButtonCallback: + switch b := btn.Type.(type) { + case *tg.InlineButtonTypeCallback: return domain.MarkupButton{ Type: domain.MarkupButtonCallback, - Text: b.Text, + Text: btn.Text, Style: style, IconCustomEmojiID: icon, Data: append([]byte(nil), b.Data...), RequiresPassword: b.RequiresPassword, }, nil - case *tg.KeyboardButtonURL: + case *tg.InlineButtonTypeURL: return domain.MarkupButton{ - Type: domain.MarkupButtonURL, Text: b.Text, URL: b.URL, + Type: domain.MarkupButtonURL, Text: btn.Text, URL: b.URL, Style: style, IconCustomEmojiID: icon, }, nil - case *tg.InputKeyboardButtonURLAuth: + case *tg.InputInlineButtonTypeURLAuth: botUserID := int64(0) switch bot := b.Bot.(type) { case nil, *tg.InputUserEmpty, *tg.InputUserSelf: @@ -311,33 +311,35 @@ func domainMarkupButton(btn tg.KeyboardButtonClass, buttonID int) (domain.Markup return domain.MarkupButton{}, domain.ErrButtonInvalid } return domain.MarkupButton{ - Type: domain.MarkupButtonLoginURL, Text: b.Text, URL: b.URL, + Type: domain.MarkupButtonLoginURL, Text: btn.Text, URL: b.URL, ForwardText: b.FwdText, ButtonID: buttonID, LoginBotUserID: botUserID, RequestWriteAccess: b.RequestWriteAccess, Style: style, IconCustomEmojiID: icon, }, nil - case *tg.KeyboardButtonURLAuth: + case *tg.InlineButtonTypeURLAuth: return domain.MarkupButton{ - Type: domain.MarkupButtonLoginURL, Text: b.Text, URL: b.URL, + Type: domain.MarkupButtonLoginURL, Text: btn.Text, URL: b.URL, ForwardText: b.FwdText, ButtonID: b.ButtonID, Style: style, IconCustomEmojiID: icon, }, nil - case *tg.KeyboardButtonWebView: - return domain.MarkupButton{Type: domain.MarkupButtonWebView, Text: b.Text, URL: b.URL, Style: style, IconCustomEmojiID: icon}, nil - case *tg.KeyboardButtonSwitchInline: + case *tg.InlineButtonTypeWebView: + return domain.MarkupButton{Type: domain.MarkupButtonWebView, Text: btn.Text, URL: b.URL, Style: style, IconCustomEmojiID: icon}, nil + case *tg.InlineButtonTypeSwitchInline: peerTypes, err := preparedInlinePeerTypesFromTG(b.PeerTypes) if err != nil { return domain.MarkupButton{}, domain.ErrButtonInvalid } - return domain.MarkupButton{Type: domain.MarkupButtonSwitchInline, Text: b.Text, Query: b.Query, SamePeer: b.SamePeer, PeerTypes: peerTypes, Style: style, IconCustomEmojiID: icon}, nil - case *tg.KeyboardButtonCopy: - return domain.MarkupButton{Type: domain.MarkupButtonCopy, Text: b.Text, CopyText: b.CopyText, Style: style, IconCustomEmojiID: icon}, nil + return domain.MarkupButton{Type: domain.MarkupButtonSwitchInline, Text: btn.Text, Query: b.Query, SamePeer: b.SamePeer, PeerTypes: peerTypes, Style: style, IconCustomEmojiID: icon}, nil + case *tg.InlineButtonTypeCopy: + return domain.MarkupButton{Type: domain.MarkupButtonCopy, Text: btn.Text, CopyText: b.CopyText, Style: style, IconCustomEmojiID: icon}, nil default: // webview/game/url_auth/request_*/switch_inline/buy 等 P3 未实现按钮类型。 return domain.MarkupButton{}, domain.ErrButtonTypeInvalid } } -func domainMarkupButtonStyle(btn tg.KeyboardButtonClass) (domain.MarkupButtonStyle, int64, error) { +func domainMarkupButtonStyle(btn interface { + GetStyle() (tg.KeyboardButtonStyle, bool) +}) (domain.MarkupButtonStyle, int64, error) { style, ok := btn.GetStyle() if !ok { return "", 0, nil @@ -388,7 +390,7 @@ func tgReplyMarkup(m *domain.MessageReplyMarkup) tg.ReplyMarkupClass { case domain.MessageReplyMarkupKeyboard: rows := make([]tg.KeyboardButtonRow, 0, len(m.Keyboard)) for _, row := range m.Keyboard { - buttons := make([]tg.KeyboardButtonClass, 0, len(row)) + buttons := make([]tg.KeyboardButton, 0, len(row)) for _, btn := range row { buttons = append(buttons, tgReplyKeyboardButton(btn)) } @@ -415,93 +417,77 @@ func tgReplyMarkup(m *domain.MessageReplyMarkup) tg.ReplyMarkupClass { default: return nil } - rows := make([]tg.KeyboardButtonRow, 0, len(m.Inline)) + rows := make([]tg.KeyboardInlineButtonRow, 0, len(m.Inline)) for _, row := range m.Inline { - buttons := make([]tg.KeyboardButtonClass, 0, len(row)) + buttons := make([]tg.KeyboardInlineButton, 0, len(row)) for _, btn := range row { buttons = append(buttons, tgMarkupButton(btn)) } - rows = append(rows, tg.KeyboardButtonRow{Buttons: buttons}) + rows = append(rows, tg.KeyboardInlineButtonRow{Buttons: buttons}) } return &tg.ReplyInlineMarkup{Rows: rows} } -func tgMarkupButton(btn domain.MarkupButton) tg.KeyboardButtonClass { +func tgMarkupButton(btn domain.MarkupButton) tg.KeyboardInlineButton { + out := tg.KeyboardInlineButton{Text: btn.Text} switch btn.Type { case domain.MarkupButtonURL: - out := &tg.KeyboardButtonURL{Text: btn.Text, URL: btn.URL} - if style, ok := tgMarkupButtonStyle(btn); ok { - out.SetStyle(style) - } - return out + out.Type = &tg.InlineButtonTypeURL{URL: btn.URL} case domain.MarkupButtonLoginURL: - out := &tg.KeyboardButtonURLAuth{Text: btn.Text, URL: btn.URL, ButtonID: btn.ButtonID} + buttonType := &tg.InlineButtonTypeURLAuth{URL: btn.URL, ButtonID: btn.ButtonID} if btn.ForwardText != "" { - out.SetFwdText(btn.ForwardText) + buttonType.SetFwdText(btn.ForwardText) } - if style, ok := tgMarkupButtonStyle(btn); ok { - out.SetStyle(style) - } - return out + out.Type = buttonType case domain.MarkupButtonWebView: - out := &tg.KeyboardButtonWebView{Text: btn.Text, URL: btn.URL} - if style, ok := tgMarkupButtonStyle(btn); ok { - out.SetStyle(style) - } - return out + out.Type = &tg.InlineButtonTypeWebView{URL: btn.URL} case domain.MarkupButtonSwitchInline: - out := &tg.KeyboardButtonSwitchInline{Text: btn.Text, Query: btn.Query, SamePeer: btn.SamePeer} + buttonType := &tg.InlineButtonTypeSwitchInline{Query: btn.Query, SamePeer: btn.SamePeer} if len(btn.PeerTypes) > 0 { - out.SetPeerTypes(tgPreparedInlinePeerTypes(btn.PeerTypes)) + buttonType.SetPeerTypes(tgPreparedInlinePeerTypes(btn.PeerTypes)) } - if style, ok := tgMarkupButtonStyle(btn); ok { - out.SetStyle(style) - } - return out + out.Type = buttonType case domain.MarkupButtonCopy: - out := &tg.KeyboardButtonCopy{Text: btn.Text, CopyText: btn.CopyText} - if style, ok := tgMarkupButtonStyle(btn); ok { - out.SetStyle(style) - } - return out + out.Type = &tg.InlineButtonTypeCopy{CopyText: btn.CopyText} + case domain.MarkupButtonBuy: + out.Type = &tg.InlineButtonTypeBuy{} default: // callback - out := &tg.KeyboardButtonCallback{Text: btn.Text, Data: btn.Data} + buttonType := &tg.InlineButtonTypeCallback{Data: btn.Data} if btn.RequiresPassword { - out.SetRequiresPassword(true) + buttonType.SetRequiresPassword(true) } - if style, ok := tgMarkupButtonStyle(btn); ok { - out.SetStyle(style) - } - return out + out.Type = buttonType } + if style, ok := tgMarkupButtonStyle(btn); ok { + out.SetStyle(style) + } + return out } -func tgReplyKeyboardButton(btn domain.MarkupButton) tg.KeyboardButtonClass { - var out tg.KeyboardButtonClass +func tgReplyKeyboardButton(btn domain.MarkupButton) tg.KeyboardButton { + out := tg.KeyboardButton{Text: btn.Text} switch btn.Type { case domain.MarkupButtonRequestPhone: - out = &tg.KeyboardButtonRequestPhone{Text: btn.Text} + out.Type = &tg.ButtonTypeRequestPhone{} case domain.MarkupButtonRequestLocation: - out = &tg.KeyboardButtonRequestGeoLocation{Text: btn.Text} + out.Type = &tg.ButtonTypeRequestGeoLocation{} case domain.MarkupButtonRequestPoll: - button := &tg.KeyboardButtonRequestPoll{Text: btn.Text} + button := &tg.ButtonTypeRequestPoll{} if btn.PollType == "quiz" { button.SetQuiz(true) } else if btn.PollType == "regular" { button.SetQuiz(false) } - out = button + out.Type = button case domain.MarkupButtonRequestPeer: - out = &tg.KeyboardButtonRequestPeer{Text: btn.Text, ButtonID: btn.ButtonID, PeerType: tgRequestPeerTypeWithFilter(btn.RequestPeerType, btn.RequestPeerFilter), MaxQuantity: btn.MaxQuantity} + out.Type = &tg.ButtonTypeRequestPeer{ButtonID: btn.ButtonID, PeerType: tgRequestPeerTypeWithFilter(btn.RequestPeerType, btn.RequestPeerFilter), MaxQuantity: btn.MaxQuantity} case domain.MarkupButtonSimpleWebView: - out = &tg.KeyboardButtonSimpleWebView{Text: btn.Text, URL: btn.URL} + out.Type = &tg.ButtonTypeSimpleWebView{URL: btn.URL} default: - out = &tg.KeyboardButton{Text: btn.Text} + out.Type = &tg.ButtonTypeDefault{} } if style, ok := tgMarkupButtonStyle(btn); ok { - if setter, ok := out.(interface{ SetStyle(tg.KeyboardButtonStyle) }); ok { - setter.SetStyle(style) - } + out.SetStyle(style) } return out } diff --git a/internal/rpc/convert_markup_test.go b/internal/rpc/convert_markup_test.go index 834ca2df..0757a3af 100644 --- a/internal/rpc/convert_markup_test.go +++ b/internal/rpc/convert_markup_test.go @@ -15,10 +15,10 @@ func TestReplyKeyboardTLDomainRoundTrip(t *testing.T) { Selective: true, Persistent: true, Placeholder: "Choose", - Rows: []tg.KeyboardButtonRow{{Buttons: []tg.KeyboardButtonClass{ - &tg.KeyboardButton{Text: "Help"}, - func() *tg.KeyboardButton { - button := &tg.KeyboardButton{Text: "Status"} + Rows: []tg.KeyboardButtonRow{{Buttons: []tg.KeyboardButton{ + {Text: "Help", Type: &tg.ButtonTypeDefault{}}, + func() tg.KeyboardButton { + button := tg.KeyboardButton{Text: "Status", Type: &tg.ButtonTypeDefault{}} style := tg.KeyboardButtonStyle{} style.SetBgPrimary(true) style.SetIcon(123456) @@ -43,7 +43,8 @@ func TestReplyKeyboardTLDomainRoundTrip(t *testing.T) { if !ok || len(wire.Rows) != 1 || len(wire.Rows[0].Buttons) != 2 { t.Fatalf("wire markup = %#v", wire) } - if button, ok := wire.Rows[0].Buttons[1].(*tg.KeyboardButton); !ok || button.Text != "Status" { + button := &wire.Rows[0].Buttons[1] + if button.Text != "Status" { t.Fatalf("second button = %#v", wire.Rows[0].Buttons[1]) } else if style, ok := button.GetStyle(); !ok || !style.GetBgPrimary() || style.Icon != 123456 { t.Fatalf("second button style = %#v ok=%v", style, ok) @@ -54,30 +55,31 @@ func TestReplyKeyboardTLDomainRoundTrip(t *testing.T) { } func TestInlineButtonStyleTLDomainRoundTrip(t *testing.T) { - button := &tg.KeyboardButtonCallback{Text: "Delete", Data: []byte("delete")} + button := tg.KeyboardInlineButton{Text: "Delete", Type: &tg.InlineButtonTypeCallback{Data: []byte("delete")}} style := tg.KeyboardButtonStyle{} style.SetBgDanger(true) button.SetStyle(style) - got, err := domainReplyMarkupForSender(&tg.ReplyInlineMarkup{Rows: []tg.KeyboardButtonRow{{Buttons: []tg.KeyboardButtonClass{button}}}}, true) + got, err := domainReplyMarkupForSender(&tg.ReplyInlineMarkup{Rows: []tg.KeyboardInlineButtonRow{{Buttons: []tg.KeyboardInlineButton{button}}}}, true) if err != nil { t.Fatalf("domainReplyMarkupForSender: %v", err) } if got.Inline[0][0].Style != domain.MarkupButtonStyleDanger { t.Fatalf("domain style = %#v", got.Inline[0][0]) } - wire := tgReplyMarkup(got).(*tg.ReplyInlineMarkup).Rows[0].Buttons[0].(*tg.KeyboardButtonCallback) + wire := tgReplyMarkup(got).(*tg.ReplyInlineMarkup).Rows[0].Buttons[0] if roundTrip, ok := wire.GetStyle(); !ok || !roundTrip.GetBgDanger() { t.Fatalf("wire style = %#v ok=%v", roundTrip, ok) } } func TestLoginURLButtonTLDomainProjection(t *testing.T) { - button := &tg.InputKeyboardButtonURLAuth{ - Text: "Log in", URL: "https://example.com/login", Bot: &tg.InputUser{UserID: 9001, AccessHash: 77}, + buttonType := &tg.InputInlineButtonTypeURLAuth{ + URL: "https://example.com/login", Bot: &tg.InputUser{UserID: 9001, AccessHash: 77}, } - button.SetRequestWriteAccess(true) - button.SetFwdText("Open login") - markup, err := domainReplyMarkupForSender(&tg.ReplyInlineMarkup{Rows: []tg.KeyboardButtonRow{{Buttons: []tg.KeyboardButtonClass{button}}}}, true) + buttonType.SetRequestWriteAccess(true) + buttonType.SetFwdText("Open login") + button := tg.KeyboardInlineButton{Text: "Log in", Type: buttonType} + markup, err := domainReplyMarkupForSender(&tg.ReplyInlineMarkup{Rows: []tg.KeyboardInlineButtonRow{{Buttons: []tg.KeyboardInlineButton{button}}}}, true) if err != nil { t.Fatal(err) } @@ -85,8 +87,9 @@ func TestLoginURLButtonTLDomainProjection(t *testing.T) { if got.Type != domain.MarkupButtonLoginURL || got.LoginBotUserID != 9001 || !got.RequestWriteAccess || got.ForwardText != "Open login" || got.ButtonID != 0 { t.Fatalf("domain login_url = %#v", got) } - wire, ok := tgReplyMarkup(markup).(*tg.ReplyInlineMarkup).Rows[0].Buttons[0].(*tg.KeyboardButtonURLAuth) - if !ok || wire.Text != "Log in" || wire.URL != "https://example.com/login" || wire.ButtonID != 0 || wire.FwdText != "Open login" { + wire := tgReplyMarkup(markup).(*tg.ReplyInlineMarkup).Rows[0].Buttons[0] + wireType, ok := wire.Type.(*tg.InlineButtonTypeURLAuth) + if !ok || wire.Text != "Log in" || wireType.URL != "https://example.com/login" || wireType.ButtonID != 0 || wireType.FwdText != "Open login" { t.Fatalf("wire login_url = %#v", wire) } } @@ -112,7 +115,7 @@ func TestReplyKeyboardHideAndForceReplyTLDomainRoundTrip(t *testing.T) { func TestReplyKeyboardRequestPhoneTLDomainRoundTrip(t *testing.T) { markup, err := domainOutgoingReplyMarkupForSender(&tg.ReplyKeyboardMarkup{Rows: []tg.KeyboardButtonRow{{ - Buttons: []tg.KeyboardButtonClass{&tg.KeyboardButtonRequestPhone{Text: "Share phone"}}, + Buttons: []tg.KeyboardButton{{Text: "Share phone", Type: &tg.ButtonTypeRequestPhone{}}}, }}}, true) if err != nil || markup == nil || len(markup.Keyboard) != 1 || len(markup.Keyboard[0]) != 1 || markup.Keyboard[0][0].Type != domain.MarkupButtonRequestPhone { @@ -122,7 +125,7 @@ func TestReplyKeyboardRequestPhoneTLDomainRoundTrip(t *testing.T) { if !ok || len(wire.Rows) != 1 || len(wire.Rows[0].Buttons) != 1 { t.Fatalf("request_phone wire = %#v", wire) } - if _, ok := wire.Rows[0].Buttons[0].(*tg.KeyboardButtonRequestPhone); !ok { + if _, ok := wire.Rows[0].Buttons[0].Type.(*tg.ButtonTypeRequestPhone); !ok { t.Fatalf("request_phone button = %#v", wire.Rows[0].Buttons[0]) } if _, err := domainReplyMarkupForSender(&tg.ReplyKeyboardHide{}, true); err == nil { @@ -138,9 +141,9 @@ func TestReplyKeyboardRequestPeerFiltersTLDomainRoundTrip(t *testing.T) { chatType.SetHasUsername(false) chatType.SetForum(true) chatType.SetUserAdminRights(tg.ChatAdminRights{DeleteMessages: true, ManageTopics: true}) - in := &tg.ReplyKeyboardMarkup{Rows: []tg.KeyboardButtonRow{{Buttons: []tg.KeyboardButtonClass{ - &tg.KeyboardButtonRequestPeer{Text: "Premium person", ButtonID: 1, PeerType: userType, MaxQuantity: 2}, - &tg.KeyboardButtonRequestPeer{Text: "Forum", ButtonID: 2, PeerType: chatType, MaxQuantity: 1}, + in := &tg.ReplyKeyboardMarkup{Rows: []tg.KeyboardButtonRow{{Buttons: []tg.KeyboardButton{ + {Text: "Premium person", Type: &tg.ButtonTypeRequestPeer{ButtonID: 1, PeerType: userType, MaxQuantity: 2}}, + {Text: "Forum", Type: &tg.ButtonTypeRequestPeer{ButtonID: 2, PeerType: chatType, MaxQuantity: 1}}, }}}} markup, err := domainOutgoingReplyMarkupForSender(in, true) if err != nil { @@ -157,14 +160,14 @@ func TestReplyKeyboardRequestPeerFiltersTLDomainRoundTrip(t *testing.T) { t.Fatalf("chat filter = %#v", chatFilter) } wire := tgReplyMarkup(markup).(*tg.ReplyKeyboardMarkup) - wireUser := wire.Rows[0].Buttons[0].(*tg.KeyboardButtonRequestPeer).PeerType.(*tg.RequestPeerTypeUser) + wireUser := wire.Rows[0].Buttons[0].Type.(*tg.ButtonTypeRequestPeer).PeerType.(*tg.RequestPeerTypeUser) if bot, ok := wireUser.GetBot(); !ok || bot { t.Fatalf("wire user bot=%v ok=%v", bot, ok) } if premium, ok := wireUser.GetPremium(); !ok || !premium { t.Fatalf("wire user premium=%v ok=%v", premium, ok) } - wireChat := wire.Rows[0].Buttons[1].(*tg.KeyboardButtonRequestPeer).PeerType.(*tg.RequestPeerTypeChat) + wireChat := wire.Rows[0].Buttons[1].Type.(*tg.ButtonTypeRequestPeer).PeerType.(*tg.RequestPeerTypeChat) if !wireChat.Creator || !wireChat.BotParticipant { t.Fatalf("wire chat = %#v", wireChat) } @@ -177,10 +180,10 @@ func TestReplyKeyboardRequestPeerFiltersTLDomainRoundTrip(t *testing.T) { } func TestInputRequestPeerButtonPreservesRequestedMetadata(t *testing.T) { - button := &tg.InputKeyboardButtonRequestPeer{ + button := tg.KeyboardButton{Text: "Share", Type: &tg.InputButtonTypeRequestPeer{ NameRequested: true, UsernameRequested: true, PhotoRequested: true, - Text: "Share", ButtonID: 99, PeerType: &tg.RequestPeerTypeUser{}, MaxQuantity: 3, - } + ButtonID: 99, PeerType: &tg.RequestPeerTypeUser{}, MaxQuantity: 3, + }} got, err := domainRequestedButtonFromTG(1001, nil, button) if err != nil { t.Fatal(err) diff --git a/internal/rpc/convert_media.go b/internal/rpc/convert_media.go index 9920c2ce..587705e1 100644 --- a/internal/rpc/convert_media.go +++ b/internal/rpc/convert_media.go @@ -301,7 +301,7 @@ func tgDocument(d domain.Document) tg.DocumentClass { Date: d.Date, MimeType: d.MimeType, Size: d.Size, - Thumbs: tgDocumentThumbs(d.MimeType, d.Thumbs), + Thumbs: tgDocumentThumbs(d.Thumbs), DCID: d.DCID, Attributes: tgDocumentAttributes(d.MimeType, d.Attributes), } @@ -315,15 +315,12 @@ func tgDocuments(docs []domain.Document) []tg.DocumentClass { return out } -func tgDocumentThumbs(mimeType string, sizes []domain.PhotoSize) []tg.PhotoSizeClass { +func tgDocumentThumbs(sizes []domain.PhotoSize) []tg.PhotoSizeClass { if len(sizes) == 0 { return nil } out := make([]tg.PhotoSizeClass, 0, len(sizes)) for _, s := range sizes { - if isSeedSyntheticTGStickerPreviewThumb(mimeType, s) { - continue - } if s.Kind == domain.PhotoSizeKindCached && len(s.Bytes) > 0 { size := s.Size if size == 0 { @@ -339,17 +336,6 @@ func tgDocumentThumbs(mimeType string, sizes []domain.PhotoSize) []tg.PhotoSizeC return compactPhotoSizeClasses(out) } -func isSeedSyntheticTGStickerPreviewThumb(mimeType string, s domain.PhotoSize) bool { - // Older seed imports gave TGS documents without thumbnails a 1x1 transparent - // "m" PNG. Clients can prefer that unusable preview and render blank stickers. - return mimeType == mimeApplicationXTGSticker && - s.Kind == domain.PhotoSizeKindCached && - s.Type == "m" && - s.W <= 1 && - s.H <= 1 && - len(s.Bytes) > 0 -} - func tgPhotoSizes(sizes []domain.PhotoSize) []tg.PhotoSizeClass { if len(sizes) == 0 { return nil diff --git a/internal/rpc/convert_messages.go b/internal/rpc/convert_messages.go index d65f518d..5cf8631f 100644 --- a/internal/rpc/convert_messages.go +++ b/internal/rpc/convert_messages.go @@ -119,7 +119,7 @@ func tgMessage(m domain.Message) tg.MessageClass { if markup := tgReplyMarkup(m.ReplyMarkup); markup != nil { msg.SetReplyMarkup(markup) } - if rich := mustTGRichMessage(m.RichMessage); rich != nil { + if rich := optionalTGRichMessage("private_message", m.ID, m.RichMessage); rich != nil { msg.SetRichMessage(*rich) } if m.TTLPeriod > 0 { diff --git a/internal/rpc/convert_rich_message.go b/internal/rpc/convert_rich_message.go index 7026b6e2..ead3a960 100644 --- a/internal/rpc/convert_rich_message.go +++ b/internal/rpc/convert_rich_message.go @@ -2,52 +2,39 @@ package rpc import ( "context" + "fmt" + "log" "strconv" + "sync/atomic" "github.com/iamxvbaba/td/bin" "github.com/iamxvbaba/td/tg" + "github.com/iamxvbaba/td/tlprofile" "telesrv/internal/domain" ) -// 本文件集中 Layer 228 富文本消息（richMessage）的 tg.* ↔ domain 转换。 +// 本文件集中富文本消息（richMessage）的 tg.* ↔ domain 转换。 // inputRichMessage 的 blocks、HTML 与 Markdown 三种输入均在 RPC 边界归一为 PageBlock； // blocks 以 TL 向量序列化为不透明字节存 domain（详见 domain.MessageRichMessage）。 -// encodeRichBlocks 把 []tg.PageBlockClass 序列化为 TL 向量字节（含 vector 头）。 -func encodeRichBlocks(blocks []tg.PageBlockClass) ([]byte, error) { +// encodeRichBlocks 把 []tg.PageBlockClass 按明确的存储 profile 序列化为 TL 向量字节。 +func encodeRichBlocks(profile tlprofile.Profile, blocks []tg.PageBlockClass) ([]byte, error) { var b bin.Buffer - b.PutVectorHeader(len(blocks)) - for _, blk := range blocks { - if blk == nil { - return nil, mediaInvalidErr() - } - if err := blk.Encode(&b); err != nil { - return nil, err - } + if err := tlprofile.EncodePageBlockVector(profile, blocks, &b); err != nil { + return nil, err } return b.Buf, nil } -// decodeRichBlocks 把 encodeRichBlocks 产生的字节还原为 []tg.PageBlockClass。 -func decodeRichBlocks(data []byte) ([]tg.PageBlockClass, error) { +// decodeRichBlocks 按写入时的 exact profile 还原完整 PageBlock 向量。调用方必须提供 +// 持久化元数据确定的 profile，不允许失败后换 profile 重试。 +func decodeRichBlocks(profile tlprofile.Profile, data []byte) ([]tg.PageBlockClass, error) { if len(data) == 0 { return nil, nil } b := &bin.Buffer{Buf: append([]byte(nil), data...)} - n, err := b.VectorHeader() - if err != nil { - return nil, err - } - out := make([]tg.PageBlockClass, 0, n) - for i := 0; i < n; i++ { - blk, err := tg.DecodePageBlock(b) - if err != nil { - return nil, err - } - out = append(out, blk) - } - return out, nil + return tlprofile.DecodePageBlockVector(profile, b, tlprofile.Limits{}) } // richMessageMediaRefs is the media closure referenced by one PageBlock graph. @@ -376,13 +363,14 @@ func (r *Router) domainRichMessageFromInput(ctx context.Context, input tg.InputR return nil, notImplementedErr() } normalizeRichBlocksForClients(in.Blocks) - blocks, err := encodeRichBlocks(in.Blocks) + blocks, err := encodeRichBlocks(tlprofile.ProfileCanonical, in.Blocks) if err != nil { return nil, err } rich := &domain.MessageRichMessage{ - Rtl: in.Rtl, - Blocks: blocks, + Rtl: in.Rtl, + BlocksLayer: int(tlprofile.ProfileCanonical), + Blocks: blocks, } projection, projectionErr := botAPIRichMessageProjection(in.Blocks, in.Rtl) if projectionErr != nil && sourceParsed { @@ -411,9 +399,14 @@ func tgRichMessage(m *domain.MessageRichMessage) (*tg.RichMessage, error) { if m.IsZero() { return nil, nil } - blocks, err := decodeRichBlocks(m.Blocks) + layer := m.EffectiveBlocksLayer() + profile, ok := tlprofile.ResolveProfile(layer) + if !ok { + return nil, fmt.Errorf("stored rich_message blocks layer %d is unavailable", layer) + } + blocks, err := decodeRichBlocks(profile, m.Blocks) if err != nil { - return nil, err + return nil, fmt.Errorf("decode stored rich_message blocks at layer %d: %w", layer, err) } out := &tg.RichMessage{ Rtl: m.Rtl, @@ -431,10 +424,22 @@ func tgRichMessage(m *domain.MessageRichMessage) (*tg.RichMessage, error) { return out, nil } -func mustTGRichMessage(m *domain.MessageRichMessage) *tg.RichMessage { +var richMessageProjectionFailureCount atomic.Uint64 + +// optionalTGRichMessage projects an optional extension without allowing one +// malformed persisted snapshot to terminate the RPC worker or server process. +// Known historical formats are decoded exactly above. Truly invalid data is +// omitted from the base message and compatibility-traced with logarithmic +// sampling so a repeatedly requested row cannot create an unbounded log storm. +func optionalTGRichMessage(scope string, id int, m *domain.MessageRichMessage) *tg.RichMessage { out, err := tgRichMessage(m) if err != nil { - panic("invalid stored rich_message: " + err.Error()) + count := richMessageProjectionFailureCount.Add(1) + if count <= 10 || count&(count-1) == 0 { + log.Printf("rich_message compatibility trace: scope=%s id=%d blocks_layer=%d failures=%d error=%q", + scope, id, m.EffectiveBlocksLayer(), count, err) + } + return nil } return out } diff --git a/internal/rpc/convert_updates.go b/internal/rpc/convert_updates.go index fb1915e4..213767c8 100644 --- a/internal/rpc/convert_updates.go +++ b/internal/rpc/convert_updates.go @@ -23,9 +23,11 @@ func tgUpdatesDifference(viewerUserID int64, diff domain.UpdateDifference) tg.Up addChannels(out, seenChats, event.UserID, event.Channels) switch event.Type { case domain.UpdateEventNewMessage: - if msg := tgMessage(event.Message); msg != nil { - out.NewMessages = append(out.NewMessages, msg) - addMessageUsers(out, seenUsers, event.Message) + if messageSnapshotVisible(event.Message) { + if msg := tgMessage(event.Message); msg != nil { + out.NewMessages = append(out.NewMessages, msg) + addMessageUsers(out, seenUsers, event.Message) + } } case domain.UpdateEventReadHistoryInbox: if update := tgReadHistoryInboxUpdate(event); update != nil { @@ -38,9 +40,11 @@ func tgUpdatesDifference(viewerUserID int64, diff domain.UpdateDifference) tg.Up case domain.UpdateEventMessagePoll: // 同时下发消息快照（含最新聚合）与对应通知 update；事件无 TL pts， // pts 推进靠 difference state 本身。 - if msg := tgMessage(event.Message); msg != nil { - out.NewMessages = append(out.NewMessages, msg) - addMessageUsers(out, seenUsers, event.Message) + if messageSnapshotVisible(event.Message) { + if msg := tgMessage(event.Message); msg != nil { + out.NewMessages = append(out.NewMessages, msg) + addMessageUsers(out, seenUsers, event.Message) + } } if update := tgOtherUpdateFromEvent(event); update != nil { out.OtherUpdates = append(out.OtherUpdates, update) @@ -90,6 +94,10 @@ func tgUpdatesDifference(viewerUserID int64, diff domain.UpdateDifference) tg.Up return out } +func messageSnapshotVisible(msg domain.Message) bool { + return !msg.Deleted +} + func tgChannelDifference(viewerUserID int64, diff domain.ChannelDifference) tg.UpdatesChannelDifferenceClass { if diff.TooLong { messages := make([]tg.MessageClass, 0, len(diff.NewMessages)) diff --git a/internal/rpc/convert_users.go b/internal/rpc/convert_users.go index 6b9c0764..8f27212b 100644 --- a/internal/rpc/convert_users.go +++ b/internal/rpc/convert_users.go @@ -9,6 +9,7 @@ import ( // tgSelfUser 把 domain.User 转为 self 标记的 tg.User（optional 字段由 Encode 自动 SetFlags）。 func tgSelfUser(u domain.User) *tg.User { + u = officialSystemUserPresentation(u) if u.Deleted { return &tg.User{ID: u.ID, Deleted: true} } @@ -42,6 +43,7 @@ func tgSelfUser(u domain.User) *tg.User { } func tgUser(u domain.User) *tg.User { + u = officialSystemUserPresentation(u) if u.Deleted { return &tg.User{ID: u.ID, Deleted: true} } @@ -73,6 +75,22 @@ func tgUser(u domain.User) *tg.User { return out } +// officialSystemUserPresentation keeps the durable reserved identity stable +// while projecting the deployment brand from configuration. Older databases +// may still contain "Telesrv" in users.first_name; without this boundary +// normalization clients alternate between the database row and the synthetic +// system-user snapshot as caches are refreshed. +func officialSystemUserPresentation(u domain.User) domain.User { + if u.ID != domain.OfficialSystemUserID { + return u + } + official := domain.OfficialSystemUser() + u.FirstName = official.FirstName + u.LastName = official.LastName + u.Username = official.Username + return u +} + func applyTgUserRestrictionFields(out *tg.User, u domain.User) { if out == nil || len(u.RestrictionReasons) == 0 { return diff --git a/internal/rpc/convert_users_deleted_test.go b/internal/rpc/convert_users_deleted_test.go index 70e6da21..3feb2322 100644 --- a/internal/rpc/convert_users_deleted_test.go +++ b/internal/rpc/convert_users_deleted_test.go @@ -2,12 +2,18 @@ package rpc import ( "context" + "reflect" "testing" + "time" "github.com/iamxvbaba/td/clock" + "github.com/iamxvbaba/td/tg" "go.uber.org/zap/zaptest" + appstories "telesrv/internal/app/stories" + "telesrv/internal/compat/tdesktop" "telesrv/internal/domain" + "telesrv/internal/store/memory" ) func TestDeletedUserTLProjectionContainsOnlyTombstoneIdentity(t *testing.T) { @@ -54,3 +60,108 @@ func TestHistoryHydrationReplacesStaleUserWithDeletedTombstone(t *testing.T) { t.Fatalf("history TL user = %+v", got) } } + +func TestDeletedUserReadModelOverlaysRemainMinimal(t *testing.T) { + ctx := context.Background() + viewerID := int64(7) + deletedID := int64(42) + peer := domain.Peer{Type: domain.PeerTypeUser, ID: deletedID} + now := int(time.Now().Unix()) + + storyStore := memory.NewStoryStore() + if _, err := storyStore.UpsertStory(ctx, domain.UpsertStoryRequest{Story: domain.Story{ + Owner: peer, ID: 1, Date: now, ExpireDate: now + 3600, Public: true, + }}); err != nil { + t.Fatalf("upsert retained story: %v", err) + } + stories := &countingStoriesService{StoriesService: appstories.NewService(storyStore)} + usernames := newFakeUsernameRegistry() + usernames.byPeer[peer] = []domain.Username{{Username: "retained_collectible", Active: true, CollectibleID: 9}} + verifications := newFakeBotVerifications() + verifications.marks[peer] = domain.CustomVerification{ + VerifierBotID: 9001, Peer: peer, IconDocumentID: 9002, Description: "retained mark", + } + r := New(Config{}, Deps{ + Stories: stories, Usernames: usernames, BotVerifications: verifications, + }, zaptest.NewLogger(t), clock.System) + + users := []tg.UserClass{tgUser(domain.User{ID: deletedID, Deleted: true, DeletedAt: int64(now)})} + r.applyPeerReadModels(ctx, viewerID, users, nil) + u := users[0].(*tg.User) + _, usernamesSet := u.GetUsernames() + _, storiesSet := u.GetStoriesMaxID() + _, verificationSet := u.GetBotVerificationIcon() + if !u.Deleted || u.ID != deletedID || usernamesSet || storiesSet || u.GetStoriesHidden() || verificationSet { + t.Fatalf("deleted user gained retained read-model overlays: %+v", u) + } + if stories.projectionCalls != 0 || usernames.peerCalls != 0 || usernames.batchCalls != 0 || verifications.peerCalls != 0 || verifications.batchCalls != 0 { + t.Fatalf("deleted user triggered overlay reads: stories=%d usernames=(%d,%d) verifications=(%d,%d)", + stories.projectionCalls, usernames.peerCalls, usernames.batchCalls, verifications.peerCalls, verifications.batchCalls) + } +} + +func TestGetFullDeletedUserReturnsOnlyTombstone(t *testing.T) { + ctx := context.Background() + viewer := domain.User{ID: 7, FirstName: "Viewer"} + deleted := domain.User{ + ID: 42, AccessHash: 99, Phone: "secret", FirstName: "Alice", LastName: "Private", + Username: "released", About: "retained about", PhotoID: 123, Deleted: true, + } + peer := domain.Peer{Type: domain.PeerTypeUser, ID: deleted.ID} + now := int(time.Now().Unix()) + + storyStore := memory.NewStoryStore() + if _, err := storyStore.UpsertStory(ctx, domain.UpsertStoryRequest{Story: domain.Story{ + Owner: peer, ID: 1, Date: now, ExpireDate: now + 3600, Public: true, + }}); err != nil { + t.Fatalf("upsert retained story: %v", err) + } + stories := &countingStoriesService{StoriesService: appstories.NewService(storyStore)} + usernames := newFakeUsernameRegistry() + usernames.byPeer[peer] = []domain.Username{{Username: "retained_collectible", Active: true, CollectibleID: 9}} + verifications := newFakeBotVerifications() + verifications.marks[peer] = domain.CustomVerification{ + VerifierBotID: 9001, Peer: peer, IconDocumentID: 9002, Description: "retained mark", + } + r := New(Config{}, Deps{ + Users: mapUsersService{users: map[int64]domain.User{ + viewer.ID: viewer, + deleted.ID: deleted, + }}, + Stories: stories, Usernames: usernames, BotVerifications: verifications, + }, zaptest.NewLogger(t), clock.System) + + got, err := r.onUsersGetFullUser(WithUserID(ctx, viewer.ID), &tg.InputUser{ + UserID: deleted.ID, AccessHash: deleted.AccessHash, + }) + if err != nil { + t.Fatalf("get full deleted user: %v", err) + } + wantFull := tg.UserFull{ + ID: deleted.ID, + Settings: tg.PeerSettings{}, + NotifySettings: *tdesktop.NotifySettings(), + } + if !reflect.DeepEqual(got.FullUser, wantFull) { + t.Fatalf("full deleted user = %+v, want minimal %+v", got.FullUser, wantFull) + } + if len(got.Users) != 1 { + t.Fatalf("users = %+v, want one tombstone", got.Users) + } + u, ok := got.Users[0].(*tg.User) + if !ok || !reflect.DeepEqual(u, &tg.User{ID: deleted.ID, Deleted: true}) { + t.Fatalf("deleted user envelope = %+v", got.Users[0]) + } + if len(got.Chats) != 0 { + t.Fatalf("deleted user chats = %+v, want none", got.Chats) + } + if stories.projectionCalls != 0 || usernames.peerCalls != 0 || usernames.batchCalls != 0 || verifications.peerCalls != 0 || verifications.batchCalls != 0 { + t.Fatalf("deleted getFullUser triggered retained read-model reads: stories=%d usernames=(%d,%d) verifications=(%d,%d)", + stories.projectionCalls, usernames.peerCalls, usernames.batchCalls, verifications.peerCalls, verifications.batchCalls) + } + wire := &tg.UsersUserFull{} + tlRoundTrip(t, got, wire) + if !reflect.DeepEqual(wire.FullUser, wantFull) || len(wire.Users) != 1 { + t.Fatalf("wire deleted user full = %+v", wire) + } +} diff --git a/internal/rpc/deps.go b/internal/rpc/deps.go index 2ec30a9c..12070d2e 100644 --- a/internal/rpc/deps.go +++ b/internal/rpc/deps.go @@ -6,11 +6,13 @@ import ( "github.com/iamxvbaba/td/proto" "github.com/iamxvbaba/td/tg" + "github.com/iamxvbaba/td/tlprofile" "telesrv/internal/domain" "telesrv/internal/sfu" "telesrv/internal/store" "telesrv/internal/turnsrv" + "telesrv/internal/updatecdn" ) // 本文件按「消费者定义接口」惯例，在 rpc 包定义 Router 依赖的业务服务接口。 @@ -19,11 +21,11 @@ import ( // AuthService 抽象登录/注册业务。 type AuthService interface { - BindTempAuthKey(ctx context.Context, sessionID int64, binding domain.TempAuthKeyBinding) error + BindTempAuthKey(ctx context.Context, sessionID int64, binding domain.TempAuthKeyBinding) (domain.TempAuthKeyBindingResult, error) ResolveAuthKey(ctx context.Context, authKeyID [8]byte) ([8]byte, bool, error) UserID(ctx context.Context, authKeyID [8]byte) (int64, bool, error) PendingPasswordUserID(ctx context.Context, authKeyID [8]byte) (int64, bool, error) - CompletePasswordSignIn(ctx context.Context, authKeyID [8]byte) error + CompletePasswordSignIn(ctx context.Context, authKeyID [8]byte, expectedUserID int64) error SendCode(ctx context.Context, phone string) (string, error) CodeDelivery(ctx context.Context, phoneCodeHash string) (domain.AuthCodeDelivery, bool, error) ResendCode(ctx context.Context, phone, phoneCodeHash string) (string, error) @@ -99,6 +101,29 @@ type SessionUpdatesStateProvider interface { ReceivesUpdatesForAuthKey(rawAuthKeyID [8]byte, sessionID int64) bool } +// SessionUpdatesActivationProvider serializes the expensive transition from an +// authenticated physical session to updates-ready. A successful claim belongs +// to exactly one physical connection generation; the token prevents a delayed +// callback from an old connection clearing a replacement's claim. +// +// This capability gates only membership synchronization and readiness. Each +// updates.getState/getDifference delivery keeps its own cursor commit and must +// never be coalesced with another RPC. +type SessionUpdatesActivationProvider interface { + BeginSessionUpdatesActivation(rawAuthKeyID [8]byte, sessionID int64) (token uint64, ok bool) + EndSessionUpdatesActivation(rawAuthKeyID [8]byte, sessionID int64, token uint64) +} + +// SessionBootstrapProbeProvider makes the durable bootstrap-job readiness +// lookup a one-shot per physical connection generation. A successful probe +// includes an authoritative zero-row result. Failed delivery work releases the +// claim so a later delivered baseline can retry; replacement connections own +// independent state and reject completion from an older generation. +type SessionBootstrapProbeProvider interface { + BeginSessionBootstrapProbe(rawAuthKeyID [8]byte, sessionID int64) (token uint64, ok bool) + EndSessionBootstrapProbe(rawAuthKeyID [8]byte, sessionID int64, token uint64, success bool) +} + // ClientLayerBinder 把协商 TL layer 即时下推到连接（可选能力）。 // invokeWithLayer 在 Dispatch 入口被观测到时立即调用，使同一请求 handler 执行期间 // 触发的 pending flush / 并发 push 就已按正确 layer 降级；不实现时连接层只能靠 @@ -193,20 +218,20 @@ type TransientSessionBinder interface { } // AuthKeyTargetedSessionBinder 把 update 定向投递给某用户【绑定到具体 business auth_key -// 这台设备】的就绪连接（密聊设备级投递）。SessionManager 实现；测试替身/未装配时 -// rpc 层回退账号级推送。未就绪连接跳过、不进 pending（密聊离线靠 getDifference 补）。 +// 这台设备】的就绪连接（密聊设备级投递）。SessionManager 实现；密聊启用时必须装配， +// 缺失时 fail-closed，严禁回退账号级推送。未就绪连接跳过、不进 pending（离线靠 difference 补）。 type AuthKeyTargetedSessionBinder interface { PushToUserAuthKey(ctx context.Context, userID int64, businessAuthKeyID [8]byte, t proto.MessageType, msg tg.UpdatesClass) (int, error) PushToUserAuthKeyTransient(ctx context.Context, userID int64, businessAuthKeyID [8]byte, t proto.MessageType, msg tg.UpdatesClass, timeout time.Duration) (int, error) + PushToUserExceptBusinessAuthKey(ctx context.Context, userID int64, excludeBusinessAuthKeyID [8]byte, t proto.MessageType, msg tg.UpdatesClass, timeout time.Duration) (int, error) } -// ExactLayerTransientSessionBinder is the admission boundary for updates whose -// constructors do not exist in older profiles. Implementations must filter the -// live session index before encoding, skip unknown/not-ready profiles, and must -// never queue the transient payload for later delivery. -type ExactLayerTransientSessionBinder interface { - PushToUserTransientAtLeastLayer(ctx context.Context, userID int64, minLayer int, t proto.MessageType, msg tg.UpdatesClass, timeout time.Duration) (int, error) - PushToUserAuthKeyTransientAtLeastLayer(ctx context.Context, userID int64, businessAuthKeyID [8]byte, minLayer int, t proto.MessageType, msg tg.UpdatesClass, timeout time.Duration) (int, error) +// SemanticTransientSessionBinder filters by generated exact-profile metadata +// instead of a hard-coded minimum layer. A newly generated profile therefore +// becomes eligible automatically when it has a wire constructor for semantic. +type SemanticTransientSessionBinder interface { + PushToUserTransientCompatible(ctx context.Context, userID int64, semantic tlprofile.SemanticID, t proto.MessageType, msg tg.UpdatesClass, timeout time.Duration) (int, error) + PushToUserAuthKeyTransientCompatible(ctx context.Context, userID int64, businessAuthKeyID [8]byte, semantic tlprofile.SemanticID, t proto.MessageType, msg tg.UpdatesClass, timeout time.Duration) (int, error) } // OnlineUserProvider exposes a bounded runtime snapshot for best-effort fanout. @@ -271,6 +296,17 @@ type UsersService interface { ByIDs(ctx context.Context, currentUserID int64, userIDs []int64) ([]domain.User, error) } +// BaseUserBotStatusProvider exposes the immutable, viewer-independent bot bit +// without constructing a full user projection. Production users.Service +// implements it through the shared base-user Redis read model. +type BaseUserBotStatusProvider interface { + BotStatus(ctx context.Context, userID int64) (bot bool, found bool, err error) +} + +type UserProjectionFactInvalidator interface { + InvalidateAccountFreezeFact(userID int64) +} + // TelegramLoginService is the domain-only boundary shared by the MTProto RPC // edge and the public OIDC provider. PostgreSQL remains authoritative for all // consent transitions; the RPC layer only projects domain state to TL. @@ -291,12 +327,20 @@ type TelegramLoginService interface { // BatchViewerUsersResolver 是 UsersService 的可选能力：跨多个 viewer 一次性投影同一组 user // （fan-out 模板化，把 per-recipient 的 ByIDs(=ForViewer) 折叠成 O(owner) 查询）。结果按 viewer -// 与 ByIDs(viewer, ids) 字节等价（personal photo overlay 除外，见 users.ByIDsForViewers）。 -// 未实现时 fan-out 预热静默跳过，回退逐 viewer 解析（行为不变，仅退化为旧的 O(viewer) 成本）。 +// 与 ByIDs(viewer, ids) 字节等价，包含 viewer-specific personal photo overlay。 +// 声明需要 fan-out 预热的路径必须具备该能力；缺失或失败时在线 fan-out fail-closed， +// 不得在同一请求里改走逐 recipient 查询。 type BatchViewerUsersResolver interface { ByIDsForViewers(ctx context.Context, viewerUserIDs []int64, userIDs []int64) (map[int64][]domain.User, error) } +// SparseBatchViewerUsersResolver projects only the explicitly supplied +// viewer->user edges. Local Durable Outbox uses this instead of widening one +// claim into viewers x union(users). +type SparseBatchViewerUsersResolver interface { + ByIDsForViewerUserIDs(ctx context.Context, userIDsByViewer map[int64][]int64) (map[int64][]domain.User, error) +} + // BotsService 抽象 bot 元数据查询与管理（bots.* RPC + userFull.bot_info hydrate）。 // 写方法返回 bump 后的 bot_info_version（客户端据此重拉）。 type BotsService interface { @@ -429,6 +473,7 @@ type AccountService interface { GetPasswordSettings(ctx context.Context, userID int64, check domain.PasswordCheck) (domain.PrivatePasswordSettings, error) UpdatePasswordSettings(ctx context.Context, userID int64, check domain.PasswordCheck, input domain.PasswordInputSettings) error CheckPassword(ctx context.Context, userID int64, check domain.PasswordCheck) error + RevenueWithdrawalPasswordState(ctx context.Context, userID int64) (domain.RevenueWithdrawalPasswordState, error) RequestPasswordRecovery(ctx context.Context, userID int64) (string, error) CheckRecoveryPassword(ctx context.Context, userID int64, code string) error RecoverPassword(ctx context.Context, userID int64, code string, input *domain.PasswordInputSettings) error @@ -505,6 +550,15 @@ type AccountFreezeService interface { AccountFreeze(ctx context.Context, userID int64) (domain.AccountFreeze, bool, error) } +// AccountFreezeNotificationService owns the durable non-PTS notification +// queue. It is intentionally separate from AccountFreezeService so hot +// read-only gates can use a versioned fact cache without disabling queue +// consumption. +type AccountFreezeNotificationService interface { + ClaimAccountFreezeNotifications(ctx context.Context, now time.Time, limit int, lease time.Duration) ([]domain.AccountFreezeNotification, error) + CompleteAccountFreezeNotification(ctx context.Context, id, version int64, now time.Time) error +} + // UpdatesService 抽象 update 状态查询。 type UpdatesService interface { GetState(ctx context.Context, authKeyID [8]byte, userID int64) (domain.UpdateState, error) @@ -808,6 +862,9 @@ type ChannelsService interface { GetHistory(ctx context.Context, userID int64, filter domain.ChannelHistoryFilter) (domain.ChannelHistory, error) SearchChannelMedia(ctx context.Context, userID, channelID int64, req domain.MediaSearchRequest) (domain.ChannelHistory, error) CountChannelMediaCategories(ctx context.Context, userID, channelID int64) (domain.MediaCategoryCounts, error) + GetStats(ctx context.Context, userID int64, req domain.ChannelStatsRequest) (domain.ChannelStats, error) + GetMessageStats(ctx context.Context, userID int64, req domain.ChannelMessageStatsRequest) (domain.ChannelMessageStats, error) + ListMessagePublicForwards(ctx context.Context, userID int64, req domain.ChannelMessagePublicForwardListRequest) (domain.ChannelMessagePublicForwardList, error) SearchPosts(ctx context.Context, userID int64, req domain.ChannelSearchPostsRequest) (domain.ChannelHistory, error) SearchJoinedMessages(ctx context.Context, userID int64, req domain.ChannelGlobalSearchRequest) (domain.ChannelHistory, error) GetMessages(ctx context.Context, userID, channelID int64, ids []int) (domain.ChannelHistory, error) @@ -973,6 +1030,18 @@ type EphemeralService interface { ReportTarget(ctx context.Context, userID int64, device domain.EphemeralDevice, peer domain.Peer, id int) (domain.EphemeralMessage, error) } +// WelcomeMessageService owns the independent durable Layer 229 peer templates. +// It has no transient device, PTS, difference, push or outbox responsibility. +type WelcomeMessageService interface { + Authorize(ctx context.Context, userID int64, peer domain.Peer) error + Create(ctx context.Context, userID int64, peer domain.Peer, randomID int64, content domain.WelcomeMessageContent) (domain.WelcomeMessage, bool, error) + Edit(ctx context.Context, userID int64, peer domain.Peer, id int, fields domain.WelcomeMessageEditFields) (domain.WelcomeMessage, error) + List(ctx context.Context, userID int64, peer domain.Peer, hash int64) (domain.WelcomeMessageList, error) + Delete(ctx context.Context, userID int64, peer domain.Peer, id int) (bool, error) + DeleteAll(ctx context.Context, userID int64, peer domain.Peer) (bool, error) + HasAny(ctx context.Context, peer domain.Peer) (bool, error) +} + // ModerationService accepts only final report choices. Implementations must // validate and snapshot referenced evidence, then durably commit the immutable // submission before returning success. @@ -1066,50 +1135,55 @@ type Deps struct { // AuthKeySessionLayers is the protocol-only durable ordering boundary for // explicit invokeWithLayer evidence. Production must wire the same auth-key // store used by the MTProto edge; nil is reserved for isolated router tests. - AuthKeySessionLayers store.AuthKeySessionLayerStore - Account AccountService - Privacy PrivacyService - Help HelpService - AccountFreeze AccountFreezeService - AICompose AIComposeService - Ephemeral EphemeralService - EphemeralPush store.EphemeralPushBroker - Moderation ModerationService - Users UsersService - Usernames UsernameRegistryService - BotVerifications BotVerificationService - TelegramLogin TelegramLoginService - Updates UpdatesService - BootstrapUpdates store.BootstrapUpdateJobStore - BotAPIUpdates store.BotAPIUpdateStore - BotCallbacks store.BotCallbackRegistryStore - Contacts ContactsService - Dialogs DialogsService - Chatlists ChatlistsService - Messages MessagesService - Translation TranslationService - Stories StoriesService - Channels ChannelsService - Communities CommunitiesService - Files FilesService - PremiumPromo PremiumPromoService - Bots BotsService - ServiceBotCallbacks ServiceBotCallbacks - ServiceBotInlineResults ServiceBotInlineResults - Polls PollsService - Phone PhoneService - GroupCalls GroupCallsService - LiveStreams LiveStreamsService - SFU sfu.Service - TURN turnsrv.Service - LangPack LangPackService - Sessions SessionBinder - Inline store.InlineRegistryStore - Limiter RateLimiter - Metrics Metrics - SecretChats SecretChatService - Passkey PasskeyService - Themes ThemeService + AuthKeySessionLayers store.AuthKeySessionLayerStore + ReadModelVersions store.ReadModelVersionStore + UserProjectionFacts UserProjectionFactInvalidator + Account AccountService + Privacy PrivacyService + Help HelpService + AppUpdates updatecdn.Resolver + AccountFreeze AccountFreezeService + AccountFreezeNotifications AccountFreezeNotificationService + AICompose AIComposeService + Ephemeral EphemeralService + EphemeralPush store.EphemeralPushBroker + WelcomeMessages WelcomeMessageService + Moderation ModerationService + Users UsersService + Usernames UsernameRegistryService + BotVerifications BotVerificationService + TelegramLogin TelegramLoginService + Updates UpdatesService + BootstrapUpdates store.BootstrapUpdateJobStore + BotAPIUpdates store.BotAPIUpdateStore + BotCallbacks store.BotCallbackRegistryStore + Contacts ContactsService + Dialogs DialogsService + Chatlists ChatlistsService + Messages MessagesService + Translation TranslationService + Stories StoriesService + Channels ChannelsService + Communities CommunitiesService + Files FilesService + PremiumPromo PremiumPromoService + Bots BotsService + ServiceBotCallbacks ServiceBotCallbacks + ServiceBotInlineResults ServiceBotInlineResults + Polls PollsService + Phone PhoneService + GroupCalls GroupCallsService + LiveStreams LiveStreamsService + SFU sfu.Service + TURN turnsrv.Service + LangPack LangPackService + Sessions SessionBinder + Inline store.InlineRegistryStore + Limiter RateLimiter + Metrics Metrics + SecretChats SecretChatService + Passkey PasskeyService + Themes ThemeService } // ThemeService 抽象自定义云主题(app/themes):创建/更新/查询主题 + 维护每用户已安装列表。 @@ -1143,12 +1217,12 @@ type PasskeyService interface { type SecretChatService interface { RequestEncryption(ctx context.Context, req domain.SecretChatRequest) (domain.SecretChat, error) AcceptEncryption(ctx context.Context, chatID int, viewerUserID, participantAuthKeyID, accessHash int64, gb []byte, keyFingerprint int64) (domain.SecretChat, error) - DiscardEncryption(ctx context.Context, chatID int, viewerUserID int64, deleteHistory bool) (domain.SecretChat, bool, error) + DiscardEncryption(ctx context.Context, chatID int, viewerUserID, viewerAuthKeyID int64, deleteHistory bool) (domain.SecretChat, bool, error) // DiscardForAuthKey 级联 discard 绑定该 perm auth_key 的全部活跃密聊（设备登出/授权撤销）， // 返回实际迁移到 discarded 的密聊供通知对端。 DiscardForAuthKey(ctx context.Context, authKeyID int64) ([]domain.SecretChat, error) GetSecretChat(ctx context.Context, chatID int) (domain.SecretChat, bool, error) - SendEncrypted(ctx context.Context, chatID int, viewerUserID, accessHash int64, delivery domain.SecretMessageDelivery) (domain.SecretChat, domain.SecretChatMessage, error) + SendEncrypted(ctx context.Context, chatID int, viewerUserID, viewerAuthKeyID, accessHash int64, delivery domain.SecretMessageDelivery) (domain.SecretChat, domain.SecretChatMessage, error) ListNewMessages(ctx context.Context, deviceAuthKeyID int64, sinceQts, limit int) ([]domain.SecretChatMessage, error) DeviceReservedQts(ctx context.Context, deviceAuthKeyID int64) (int, error) AckQueue(ctx context.Context, deviceAuthKeyID int64, maxQts int) error diff --git a/internal/rpc/dialogs_pinned.go b/internal/rpc/dialogs_pinned.go index 811438ec..5d7c1bd2 100644 --- a/internal/rpc/dialogs_pinned.go +++ b/internal/rpc/dialogs_pinned.go @@ -9,11 +9,21 @@ import ( ) func (r *Router) pinnedDialogsList(ctx context.Context, userID int64, folderID int) (domain.DialogList, error) { - list, err := r.pinnedDialogsBaseList(ctx, userID, folderID) + key := fmt.Sprintf("%d:%d:%d", userID, folderID, LayerFrom(ctx)) + value, err, _ := r.dialogsPinnedListSF.Do(key, func() (any, error) { + list, err := r.pinnedDialogsBaseList(ctx, userID, folderID) + if err != nil { + return domain.DialogList{}, err + } + return r.withCommunityDialogList(ctx, userID, domain.DialogFilter{PinnedOnly: true, HasFolderID: true, FolderID: folderID}, list) + }) if err != nil { return domain.DialogList{}, err } - return r.withCommunityDialogList(ctx, userID, domain.DialogFilter{PinnedOnly: true, HasFolderID: true, FolderID: folderID}, list) + if list, ok := value.(domain.DialogList); ok { + return list, nil + } + return domain.DialogList{}, nil } func (r *Router) pinnedDialogsBaseList(ctx context.Context, userID int64, folderID int) (domain.DialogList, error) { diff --git a/internal/rpc/dialogs_rpc_test.go b/internal/rpc/dialogs_rpc_test.go index aa7b56ff..2b193025 100644 --- a/internal/rpc/dialogs_rpc_test.go +++ b/internal/rpc/dialogs_rpc_test.go @@ -48,7 +48,7 @@ func TestDialogFilterFromGetDialogsRequestUsesAllParameters(t *testing.T) { } } -func TestMessagesGetDialogsReturnsNotModifiedFromFullListHash(t *testing.T) { +func TestMessagesGetDialogsUnknownHashReturnsFullListToRefreshPeerMetadata(t *testing.T) { dialogs := &captureDialogs{list: domain.DialogList{Count: 3, Hash: 77}} r := New(Config{}, Deps{Dialogs: dialogs}, zaptest.NewLogger(t), clock.System) req := &tg.MessagesGetDialogsRequest{ @@ -65,12 +65,11 @@ func TestMessagesGetDialogsReturnsNotModifiedFromFullListHash(t *testing.T) { if err != nil { t.Fatalf("dispatch: %v", err) } - got, ok := enc.(*tg.MessagesDialogsNotModified) - if !ok { - t.Fatalf("response = %T, want *tg.MessagesDialogsNotModified", enc) + if _, ok := enc.(*tg.MessagesDialogsNotModified); ok { + t.Fatalf("response = %T, want full dialogs after unknown/invalidation hash", enc) } - if got.Count != 3 || dialogs.filter.Hash != 77 { - t.Fatalf("not modified = %+v filter %+v, want count/hash from service", got, dialogs.filter) + if dialogs.filter.Hash != 77 || dialogs.getDialogsCalls != 1 { + t.Fatalf("filter %+v full calls %d, want one authoritative load", dialogs.filter, dialogs.getDialogsCalls) } } @@ -1090,8 +1089,17 @@ func TestMessagesGetDialogsTDesktopInitialPageMergesPinnedHeader(t *testing.T) { if dialogs.getDialogsCalls != 2 || len(dialogs.filters) != 2 { t.Fatalf("GetDialogs calls = %d filters %+v, want normal + pinned", dialogs.getDialogsCalls, dialogs.filters) } - if !dialogs.filters[0].ExcludePinned || !dialogs.filters[1].PinnedOnly { - t.Fatalf("filters = %+v, want exclude-pinned then pinned-only", dialogs.filters) + var excludePinnedCalls, pinnedOnlyCalls int + for _, filter := range dialogs.filters { + if filter.ExcludePinned { + excludePinnedCalls++ + } + if filter.PinnedOnly { + pinnedOnlyCalls++ + } + } + if excludePinnedCalls != 1 || pinnedOnlyCalls != 1 { + t.Fatalf("filters = %+v, want one exclude-pinned and one pinned-only load", dialogs.filters) } if len(out.Dialogs) != 4 { t.Fatalf("dialogs = %d, want archive + two pinned + normal", len(out.Dialogs)) @@ -1201,11 +1209,13 @@ func TestPinnedDialogsListSingleflightsConcurrentStartupLoads(t *testing.T) { entered: make(chan struct{}), release: make(chan struct{}), } - r := New(Config{}, Deps{Dialogs: dialogs}, zaptest.NewLogger(t), clock.System) + communities := &countingPinnedCommunities{} + r := New(Config{}, Deps{Dialogs: dialogs, Communities: communities}, zaptest.NewLogger(t), clock.System) + ctx := WithLayer(context.Background(), communitiesLayer) errs := make(chan error, 2) results := make(chan domain.DialogList, 2) call := func() { - list, err := r.pinnedDialogsList(context.Background(), userID, domain.DialogMainFolderID) + list, err := r.pinnedDialogsList(ctx, userID, domain.DialogMainFolderID) errs <- err results <- list } @@ -1225,6 +1235,28 @@ func TestPinnedDialogsListSingleflightsConcurrentStartupLoads(t *testing.T) { if calls := dialogs.pinnedCalls(); calls != 1 { t.Fatalf("pinned GetDialogs calls = %d, want singleflight to share one in-flight load", calls) } + if calls := communities.listJoinedCalls(); calls != 1 { + t.Fatalf("pinned community ListJoined calls = %d, want projected singleflight to share one aggregate load", calls) + } +} + +type countingPinnedCommunities struct { + CommunitiesService + mu sync.Mutex + calls int +} + +func (s *countingPinnedCommunities) ListJoined(context.Context, int64) ([]domain.CommunityView, error) { + s.mu.Lock() + s.calls++ + s.mu.Unlock() + return nil, nil +} + +func (s *countingPinnedCommunities) listJoinedCalls() int { + s.mu.Lock() + defer s.mu.Unlock() + return s.calls } type blockingPinnedDialogs struct { diff --git a/internal/rpc/difference_projection_strict_test.go b/internal/rpc/difference_projection_strict_test.go new file mode 100644 index 00000000..a51d1017 --- /dev/null +++ b/internal/rpc/difference_projection_strict_test.go @@ -0,0 +1,233 @@ +package rpc + +import ( + "context" + "errors" + "fmt" + "testing" + + "github.com/iamxvbaba/td/clock" + "github.com/iamxvbaba/td/tg" + "go.uber.org/zap/zaptest" + + appchannels "telesrv/internal/app/channels" + appusers "telesrv/internal/app/users" + "telesrv/internal/domain" + "telesrv/internal/store" + "telesrv/internal/store/memory" +) + +type strictDifferenceUsers struct { + mapUsersService + maxBatch int + capacityErr error + failErr error + calls [][]int64 + capacityFailure int +} + +func (s *strictDifferenceUsers) ByIDs(ctx context.Context, viewerUserID int64, ids []int64) ([]domain.User, error) { + s.calls = append(s.calls, append([]int64(nil), ids...)) + if s.failErr != nil { + return nil, s.failErr + } + if s.maxBatch > 0 && len(ids) > s.maxBatch { + s.capacityFailure++ + return nil, fmt.Errorf("%w: test batch %d", s.capacityErr, len(ids)) + } + return s.mapUsersService.ByIDs(ctx, viewerUserID, ids) +} + +type strictDifferenceChannels struct { + *appchannels.Service + difference domain.ChannelDifference +} + +func (s *strictDifferenceChannels) GetDifference(context.Context, int64, domain.ChannelDifferenceRequest) (domain.ChannelDifference, error) { + return s.difference, nil +} + +func strictDifferenceUsersAndRefs(count int) ([]int64, []domain.Peer, []domain.User, map[int64]domain.User) { + ids := make([]int64, count) + peers := make([]domain.Peer, count) + raw := make([]domain.User, count) + projected := make(map[int64]domain.User, count) + for i := range ids { + id := int64(2_000_000_000 + i) + ids[i] = id + peers[i] = domain.Peer{Type: domain.PeerTypeUser, ID: id} + raw[i] = domain.User{ID: id, AccessHash: id + 10, Phone: "raw-secret-phone", FirstName: "raw"} + projected[id] = domain.User{ID: id, FirstName: "projected"} + } + return ids, peers, raw, projected +} + +func assertStrictDifferenceUsers(t *testing.T, users []tg.UserClass, want int) { + t.Helper() + if len(users) != want { + t.Fatalf("projected users = %d, want %d", len(users), want) + } + for _, item := range users { + user, ok := item.(*tg.User) + if !ok { + t.Fatalf("projected user = %T, want *tg.User", item) + } + if user.Phone != "" { + t.Fatalf("raw phone leaked for user %d: %q", user.ID, user.Phone) + } + } +} + +func TestViewerPeerCacheStrictProjectionSplitsAllCapacityErrorsAndRejectsMissing(t *testing.T) { + capacityErrors := map[string]error{ + "privacy_memberships": store.ErrActiveChannelMemberPairsLimit, + "owner_union": appusers.ErrBatchUsersLimit, + "sparse_cells": appusers.ErrBatchViewerCells, + } + for name, capacityErr := range capacityErrors { + t.Run(name, func(t *testing.T) { + ids, _, _, projected := strictDifferenceUsersAndRefs(9) + users := &strictDifferenceUsers{ + mapUsersService: mapUsersService{users: projected}, + maxBatch: 2, + capacityErr: capacityErr, + } + r := New(Config{}, Deps{Users: users}, zaptest.NewLogger(t), clock.System) + got, err := newViewerPeerCache(r).usersForIDsStrict(context.Background(), 1_900_000_001, ids) + if err != nil || len(got) != len(ids) || users.capacityFailure == 0 { + t.Fatalf("strict projection users=%d failures=%d err=%v, want complete split result", len(got), users.capacityFailure, err) + } + }) + } + + missingID := int64(2_100_000_001) + r := New(Config{}, Deps{Users: &strictDifferenceUsers{ + mapUsersService: mapUsersService{users: map[int64]domain.User{}}, + }}, zaptest.NewLogger(t), clock.System) + got, err := newViewerPeerCache(r).usersForIDsStrict(context.Background(), 1_900_000_001, []int64{missingID, domain.OfficialSystemUserID}) + if !errors.Is(err, ErrDurableUserProjectionIncomplete) || got != nil { + t.Fatalf("strict incomplete projection = %+v, %v; want nil ErrDurableUserProjectionIncomplete", got, err) + } +} + +func TestUpdatesGetDifferenceStrictProjectionChunksAndSplitsCapacity(t *testing.T) { + const viewerID = int64(1_900_000_001) + ids, peers, raw, projected := strictDifferenceUsersAndRefs(maxPeerProjectionUsersPerBatch + 1) + users := &strictDifferenceUsers{ + mapUsersService: mapUsersService{users: projected}, + maxBatch: 250, + capacityErr: appusers.ErrBatchUsersLimit, + } + updates := &captureUpdates{state: domain.UpdateState{Pts: 42, Date: 1700000000}} + updates.difference = &domain.UpdateDifference{ + State: updates.state, + Events: []domain.UpdateEvent{{ + Type: domain.UpdateEventPinnedDialogs, Pts: 42, PtsCount: 1, Peers: peers, Users: raw, + }}, + } + r := New(Config{}, Deps{Users: users, Updates: updates}, zaptest.NewLogger(t), clock.System) + + got, err := r.onUpdatesGetDifference(WithUserID(context.Background(), viewerID), &tg.UpdatesGetDifferenceRequest{}) + if err != nil { + t.Fatalf("updates.getDifference: %v", err) + } + full, ok := got.(*tg.UpdatesDifference) + if !ok || full.State.Pts != 42 { + t.Fatalf("difference = %T %+v, want full pts 42", got, got) + } + assertStrictDifferenceUsers(t, full.Users, len(ids)) + if users.capacityFailure == 0 || len(users.calls) < 3 { + t.Fatalf("resolver calls=%d capacity failures=%d, want bounded recursive split", len(users.calls), users.capacityFailure) + } + for i, call := range users.calls { + if len(call) > maxPeerProjectionUsersPerBatch { + t.Fatalf("resolver call %d size=%d exceeds outer chunk %d", i, len(call), maxPeerProjectionUsersPerBatch) + } + } +} + +func TestUpdatesGetChannelDifferenceStrictProjectionChunksAndSplitsCapacity(t *testing.T) { + ctx := context.Background() + const viewerID = int64(1_900_000_001) + ids, _, raw, projected := strictDifferenceUsersAndRefs(maxPeerProjectionUsersPerBatch + 1) + users := &strictDifferenceUsers{ + mapUsersService: mapUsersService{users: projected}, + maxBatch: 250, + capacityErr: appusers.ErrBatchViewerCells, + } + base := appchannels.NewService(memory.NewChannelStore()) + created, err := base.CreateChannel(ctx, viewerID, domain.CreateChannelRequest{Title: "strict diff", Broadcast: true, Date: 1700000000}) + if err != nil { + t.Fatal(err) + } + channels := &strictDifferenceChannels{Service: base, difference: domain.ChannelDifference{ + Channel: created.Channel, + Self: domain.ChannelMember{ChannelID: created.Channel.ID, UserID: viewerID, Status: domain.ChannelMemberActive}, + OtherUpdates: []domain.ChannelUpdateEvent{{ + Type: domain.ChannelUpdateDeleteMessages, Pts: 77, PtsCount: 1, MessageIDs: []int{1}, UserIDs: ids, + }}, + Users: raw, Pts: 77, Final: true, + }} + r := New(Config{}, Deps{Users: users, Channels: channels}, zaptest.NewLogger(t), clock.System) + + got, err := r.onUpdatesGetChannelDifference(WithUserID(ctx, viewerID), &tg.UpdatesGetChannelDifferenceRequest{ + Channel: &tg.InputChannel{ChannelID: created.Channel.ID, AccessHash: created.Channel.AccessHash}, + Filter: &tg.ChannelMessagesFilterEmpty{}, Limit: 100, + }) + if err != nil { + t.Fatalf("updates.getChannelDifference: %v", err) + } + full, ok := got.(*tg.UpdatesChannelDifference) + if !ok || full.Pts != 77 { + t.Fatalf("channel difference = %T %+v, want full pts 77", got, got) + } + assertStrictDifferenceUsers(t, full.Users, len(ids)) + if users.capacityFailure == 0 || len(users.calls) < 3 { + t.Fatalf("resolver calls=%d capacity failures=%d, want bounded recursive split", len(users.calls), users.capacityFailure) + } +} + +func TestDurableDifferencesFailClosedOnOrdinaryUserResolverError(t *testing.T) { + boom := errors.New("projection unavailable") + const viewerID = int64(1_900_000_001) + ids, peers, raw, projected := strictDifferenceUsersAndRefs(1) + + t.Run("account", func(t *testing.T) { + users := &strictDifferenceUsers{mapUsersService: mapUsersService{users: projected}, failErr: boom} + updates := &captureUpdates{state: domain.UpdateState{Pts: 9, Date: 1700000000}} + updates.difference = &domain.UpdateDifference{State: updates.state, Events: []domain.UpdateEvent{{ + Type: domain.UpdateEventPinnedDialogs, Pts: 9, PtsCount: 1, Peers: peers, Users: raw, + }}} + r := New(Config{}, Deps{Users: users, Updates: updates}, zaptest.NewLogger(t), clock.System) + got, err := r.onUpdatesGetDifference(WithUserID(context.Background(), viewerID), &tg.UpdatesGetDifferenceRequest{}) + if err == nil || got != nil || len(users.calls) != 1 || updates.commitCalls != 0 { + t.Fatalf("account difference=%T err=%v calls=%d commits=%d, want fail-closed nil without raw phone/PTS advance", got, err, len(users.calls), updates.commitCalls) + } + }) + + t.Run("channel", func(t *testing.T) { + ctx := context.Background() + users := &strictDifferenceUsers{mapUsersService: mapUsersService{users: projected}, failErr: boom} + base := appchannels.NewService(memory.NewChannelStore()) + created, err := base.CreateChannel(ctx, viewerID, domain.CreateChannelRequest{Title: "strict error", Broadcast: true, Date: 1700000000}) + if err != nil { + t.Fatal(err) + } + channels := &strictDifferenceChannels{Service: base, difference: domain.ChannelDifference{ + Channel: created.Channel, + Self: domain.ChannelMember{ChannelID: created.Channel.ID, UserID: viewerID, Status: domain.ChannelMemberActive}, + OtherUpdates: []domain.ChannelUpdateEvent{{ + Type: domain.ChannelUpdateDeleteMessages, Pts: 10, PtsCount: 1, MessageIDs: []int{1}, UserIDs: ids, + }}, + Users: raw, Pts: 10, Final: true, + }} + r := New(Config{}, Deps{Users: users, Channels: channels}, zaptest.NewLogger(t), clock.System) + got, err := r.onUpdatesGetChannelDifference(WithUserID(ctx, viewerID), &tg.UpdatesGetChannelDifferenceRequest{ + Channel: &tg.InputChannel{ChannelID: created.Channel.ID, AccessHash: created.Channel.AccessHash}, + Filter: &tg.ChannelMessagesFilterEmpty{}, Limit: 100, + }) + if err == nil || got != nil || len(users.calls) != 1 { + t.Fatalf("channel difference=%T err=%v calls=%d, want fail-closed nil without raw phone/PTS response", got, err, len(users.calls)) + } + }) +} diff --git a/internal/rpc/dispatch_context.go b/internal/rpc/dispatch_context.go index 99462a64..e81fe00c 100644 --- a/internal/rpc/dispatch_context.go +++ b/internal/rpc/dispatch_context.go @@ -77,7 +77,11 @@ func (r *Router) prepareRPCDispatchContext( } if r.log != nil { if tInfo := r.clock.Now(); tInfo.Sub(preStart) > 50*time.Millisecond { - r.log.Info("slow pre-handler", + // Successful slow paths are already represented by per-method latency + // and request-scoped database-work metrics. Keep their request detail + // only under explicit Debug logging; INFO must not become synchronous + // per-RPC I/O during a concentrated login burst. + r.log.Debug("slow pre-handler", zap.String("method", method), zap.Duration("pre_total", tInfo.Sub(preStart)), zap.Duration("auth_resolve", tAuth.Sub(preStart)), diff --git a/internal/rpc/dispatch_context_logging_test.go b/internal/rpc/dispatch_context_logging_test.go new file mode 100644 index 00000000..dfdc4263 --- /dev/null +++ b/internal/rpc/dispatch_context_logging_test.go @@ -0,0 +1,50 @@ +package rpc + +import ( + "context" + "sync" + "testing" + "time" + + "github.com/iamxvbaba/td/clock" + "go.uber.org/zap" + "go.uber.org/zap/zaptest/observer" +) + +type loggingStepClock struct { + mu sync.Mutex + now time.Time + step time.Duration +} + +func (c *loggingStepClock) Now() time.Time { + c.mu.Lock() + defer c.mu.Unlock() + c.now = c.now.Add(c.step) + return c.now +} + +func (*loggingStepClock) Timer(d time.Duration) clock.Timer { return clock.System.Timer(d) } + +func (*loggingStepClock) Ticker(d time.Duration) clock.Ticker { return clock.System.Ticker(d) } + +func TestSlowSuccessfulPreHandlerDoesNotEnterInfoHotPath(t *testing.T) { + infoCore, infoLogs := observer.New(zap.InfoLevel) + infoRouter := New(Config{}, Deps{}, zap.New(infoCore), &loggingStepClock{step: 25 * time.Millisecond}) + if _, _, err := infoRouter.prepareRPCDispatchContext(context.Background(), [8]byte{1}, 2, 0, "help.getConfig"); err != nil { + t.Fatal(err) + } + if got := infoLogs.FilterMessage("slow pre-handler").Len(); got != 0 { + t.Fatalf("slow successful pre-handler emitted %d Info logs, want none", got) + } + + debugCore, debugLogs := observer.New(zap.DebugLevel) + debugRouter := New(Config{}, Deps{}, zap.New(debugCore), &loggingStepClock{step: 25 * time.Millisecond}) + if _, _, err := debugRouter.prepareRPCDispatchContext(context.Background(), [8]byte{1}, 2, 0, "help.getConfig"); err != nil { + t.Fatal(err) + } + entries := debugLogs.FilterMessage("slow pre-handler").All() + if len(entries) != 1 || entries[0].Level != zap.DebugLevel { + t.Fatalf("slow pre-handler debug entries=%v, want one Debug entry", entries) + } +} diff --git a/internal/rpc/durable_layer_evidence.go b/internal/rpc/durable_layer_evidence.go index db390e17..9303f8cc 100644 --- a/internal/rpc/durable_layer_evidence.go +++ b/internal/rpc/durable_layer_evidence.go @@ -83,9 +83,10 @@ func (r *Router) ResolveNegotiatedSessionLayerEvidence( // AdvanceNegotiatedSessionLayerEvidence commits the same-session watermark and // auth-key-wide default atomically before any connection/profile/readiness -// state is mutated. publishShared is true only when this observation is still -// the durable shared default; an old duplicate cannot overwrite a newer -// session's local cache after restart. +// state is mutated. publishShared is true only for a different durable profile +// generation which still owns the shared default. A same-generation msg_id +// advance remains fully durable and fresh for the exact session, but does not +// re-read/re-publish the unchanged auth-key default. func (r *Router) AdvanceNegotiatedSessionLayerEvidence( ctx context.Context, rawAuthKeyID [8]byte, @@ -106,6 +107,7 @@ func (r *Router) AdvanceNegotiatedSessionLayerEvidence( } return currentLayer, currentMsgID, currentLayer == layer && currentMsgID == msgID, nil } + previousObservationID, hadPreviousGeneration := r.cachedDurableSessionLayerObservation(rawAuthKeyID, sessionID) current, _, err := r.deps.AuthKeySessionLayers.AdvanceSessionLayer( ctx, rawAuthKeyID, @@ -125,7 +127,23 @@ func (r *Router) AdvanceNegotiatedSessionLayerEvidence( if err := r.cacheResolvedDurableSessionLayer(rawAuthKeyID, sessionID, current); err != nil { return 0, 0, false, err } - return current.Layer, current.MessageID, current.SharedDefault, nil + generationChanged := !hadPreviousGeneration || previousObservationID != current.ObservationID + return current.Layer, current.MessageID, current.SharedDefault && generationChanged, nil +} + +func (r *Router) cachedDurableSessionLayerObservation(rawAuthKeyID [8]byte, sessionID int64) (int64, bool) { + if r == nil || rawAuthKeyID == ([8]byte{}) || sessionID == 0 { + return 0, false + } + key := clientInfoSessionKey{rawAuthKeyID: rawAuthKeyID, sessionID: sessionID} + now := r.clock.Now() + r.exactProfileMu.RLock() + entry, found := r.exactProfiles[key] + r.exactProfileMu.RUnlock() + if !found || entry.observationID <= 0 || !now.Before(entry.expiresAt) { + return 0, false + } + return entry.observationID, true } // cacheResolvedDurableSessionLayer updates only the bounded typed accelerator; @@ -184,12 +202,18 @@ func (r *Router) cacheResolvedDurableSessionLayer( // Advance which already refreshed the local cache. Do not roll it back. return nil case current.observationID == entry.observationID && entry.observationID > 0: - if current.layer != entry.layer || current.msgID != entry.msgID { - return fmt.Errorf("%w: observation %d maps to (%d,%d) and (%d,%d)", - store.ErrAuthKeySessionLayerConflict, entry.observationID, - current.layer, current.msgID, entry.layer, entry.msgID) + if current.layer != entry.layer { + return fmt.Errorf("%w: observation %d maps to Layer %d and %d", + store.ErrAuthKeySessionLayerConflict, entry.observationID, current.layer, entry.layer) } - // The store row may have an authoritative expiry refresh; replace it. + if current.msgID > entry.msgID { + // One same-Layer fast advance refreshed this process after the + // current DB read linearized. Observation identifies the stable + // Layer generation; msg_id remains its monotonic high-water mark. + return nil + } + // The store row may have a newer same-generation high-water mark or + // an authoritative expiry refresh; replace it. case entry.observationID <= 0 && current.msgID > entry.msgID: // Defensive compatibility for an old custom store without observation // ids. Production stores always take the branches above. diff --git a/internal/rpc/durable_layer_evidence_test.go b/internal/rpc/durable_layer_evidence_test.go index 5dad6fe5..3383ce27 100644 --- a/internal/rpc/durable_layer_evidence_test.go +++ b/internal/rpc/durable_layer_evidence_test.go @@ -41,7 +41,7 @@ func TestDurableSessionLayerSurvivesRestartAndRejectsOldSelectorRollback(t *test t.Fatalf("restart restore = (%d,%d,%v,%v)", layer, msgID, found, err) } layer, msgID, publish, err := restarted.AdvanceNegotiatedSessionLayerEvidence(ctx, authKeyID, 10, 225, olderID) - if err != nil || layer != 227 || msgID != newerID || !publish { + if err != nil || layer != 227 || msgID != newerID || publish { t.Fatalf("old selector after restart = (%d,%d,%v,%v)", layer, msgID, publish, err) } key, found, err := keys.Get(ctx, authKeyID) @@ -50,6 +50,34 @@ func TestDurableSessionLayerSurvivesRestartAndRejectsOldSelectorRollback(t *test } } +func TestDurableSessionLayerSameGenerationSkipsSharedPublication(t *testing.T) { + ctx := context.Background() + keys := memory.NewAuthKeyStore() + authKeyID := [8]byte{1, 0xb3} + if err := keys.Save(ctx, store.AuthKeyData{ID: authKeyID}); err != nil { + t.Fatal(err) + } + now := time.Now().UTC() + msgIDs := proto.NewMessageIDGen(func() time.Time { return now }) + firstID := int64(msgIDs.New(proto.MessageFromClient)) + secondID := int64(msgIDs.New(proto.MessageFromClient)) + r := New(Config{}, Deps{AuthKeySessionLayers: keys}, zaptest.NewLogger(t), clock.System) + if layer, msgID, publish, err := r.AdvanceNegotiatedSessionLayerEvidence(ctx, authKeyID, 11, 227, firstID); err != nil || layer != 227 || msgID != firstID || !publish { + t.Fatalf("first generation = (%d,%d,%v,%v)", layer, msgID, publish, err) + } + first, found, err := keys.GetSessionLayer(ctx, authKeyID, 11) + if err != nil || !found { + t.Fatalf("first row = (%+v,%v,%v)", first, found, err) + } + if layer, msgID, publish, err := r.AdvanceNegotiatedSessionLayerEvidence(ctx, authKeyID, 11, 227, secondID); err != nil || layer != 227 || msgID != secondID || publish { + t.Fatalf("same generation = (%d,%d,%v,%v)", layer, msgID, publish, err) + } + second, found, err := keys.GetSessionLayer(ctx, authKeyID, 11) + if err != nil || !found || second.ObservationID != first.ObservationID { + t.Fatalf("same-generation row = (%+v,%v,%v), first observation %d", second, found, err, first.ObservationID) + } +} + func TestDurableSessionLayerResolveRefreshesStaleRouterFromSharedStore(t *testing.T) { ctx := context.Background() keys := memory.NewAuthKeyStore() @@ -94,12 +122,12 @@ func TestDurableSessionLayerFutureProfileCanBeCorrectedByGreaterSelector(t *test now := time.Now().UTC() futureID := int64(proto.NewMessageIDGen(func() time.Time { return now }).New(proto.MessageFromClient)) correctID := int64(proto.NewMessageIDGen(func() time.Time { return now.Add(time.Second) }).New(proto.MessageFromClient)) - if _, applied, err := keys.AdvanceSessionLayer(ctx, authKeyID, 20, 229, futureID); err != nil || !applied { + if _, applied, err := keys.AdvanceSessionLayer(ctx, authKeyID, 20, 230, futureID); err != nil || !applied { t.Fatalf("seed future evidence = applied %v err %v", applied, err) } r := New(Config{}, Deps{AuthKeySessionLayers: keys}, zaptest.NewLogger(t), clock.System) layer, msgID, found, err := r.ResolveNegotiatedSessionLayerEvidence(ctx, authKeyID, 20) - if err != nil || !found || layer != 229 || msgID != futureID { + if err != nil || !found || layer != 230 || msgID != futureID { t.Fatalf("future restore = (%d,%d,%v,%v)", layer, msgID, found, err) } if _, _, cached := r.NegotiatedSessionLayerEvidence(authKeyID, 20); cached { @@ -177,6 +205,36 @@ func TestDurableSessionLayerCacheOrdersRebuiltRowsByObservationID(t *testing.T) } } +func TestDurableSessionLayerCacheAdvancesHighWaterWithinObservation(t *testing.T) { + now := time.Now().UTC() + r := New(Config{}, Deps{}, zaptest.NewLogger(t), clock.System) + authKeyID := [8]byte{3, 0xc6} + const sessionID = int64(306) + first := store.AuthKeySessionLayer{ + Layer: 227, MessageID: 10_000, ObservationID: 10, ExpiresAt: now.Add(time.Minute), + } + if err := r.cacheResolvedDurableSessionLayer(authKeyID, sessionID, first); err != nil { + t.Fatal(err) + } + advanced := first + advanced.MessageID = 20_000 + advanced.ExpiresAt = now.Add(2 * time.Minute) + if err := r.cacheResolvedDurableSessionLayer(authKeyID, sessionID, advanced); err != nil { + t.Fatal(err) + } + if layer, msgID, found := r.NegotiatedSessionLayerEvidence(authKeyID, sessionID); !found || layer != 227 || msgID != 20_000 { + t.Fatalf("same-observation advance = (%d,%d,%v)", layer, msgID, found) + } + stale := first + stale.MessageID = 15_000 + if err := r.cacheResolvedDurableSessionLayer(authKeyID, sessionID, stale); err != nil { + t.Fatal(err) + } + if layer, msgID, found := r.NegotiatedSessionLayerEvidence(authKeyID, sessionID); !found || layer != 227 || msgID != 20_000 { + t.Fatalf("stale same-observation read rolled cache back = (%d,%d,%v)", layer, msgID, found) + } +} + func TestDurableSessionLayerAvailabilityErrorCarriesStructuralMarker(t *testing.T) { boom := errors.New("database unavailable") r := New(Config{}, Deps{AuthKeySessionLayers: unavailableSessionLayerStore{err: boom}}, zaptest.NewLogger(t), clock.System) @@ -201,7 +259,7 @@ func TestDurableInheritedLayerRevalidatesEachNewSession(t *testing.T) { if layer, found, err := r.ResolveInheritedAuthKeyLayer(ctx, authKeyID); err != nil || !found || layer != 225 { t.Fatalf("initial default = (%d,%v,%v)", layer, found, err) } - auth.authKeyClientInfos[authKeyID] = domain.AuthKeyClientInfo{Layer: 229, LayerObservationID: 2} + auth.authKeyClientInfos[authKeyID] = domain.AuthKeyClientInfo{Layer: 230, LayerObservationID: 2} if layer, found, err := r.ResolveInheritedAuthKeyLayer(ctx, authKeyID); err != nil || !found || layer != 0 { t.Fatalf("future authoritative default = (%d,%v,%v)", layer, found, err) } diff --git a/internal/rpc/encrypted_chats.go b/internal/rpc/encrypted_chats.go index a79de082..865d54f4 100644 --- a/internal/rpc/encrypted_chats.go +++ b/internal/rpc/encrypted_chats.go @@ -4,6 +4,7 @@ import ( "context" "errors" + "github.com/iamxvbaba/td/proto" "github.com/iamxvbaba/td/tg" "go.uber.org/zap" @@ -14,9 +15,9 @@ import ( // 私聊端对端加密（Secret Chat / encrypted chat）握手 RPC handler。状态机与 DH 校验 // 归 app/secretchat；本文件只做鉴权、入参校验、TL 转换与在线推送编排。 // -// P0 范围：requestEncryption / acceptEncryption / discardEncryption 的握手闭环 + -// updateEncryption 在线推送（账号级 pushUserMessage，与 phone 同套）。设备级定向、 -// durable 离线 getDifference 补偿、qts 消息投递（sendEncrypted 等）见 P1， +// requestEncryption / acceptEncryption / discardEncryption 的握手闭环 + +// updateEncryption 在线设备定向、durable 离线 getDifference 补偿与输家设备收敛； +// qts 消息投递（sendEncrypted 等）见 encrypted_messages.go， // 设计 docs/secret-chat-module.md。服务端是盲中继，永不接触共享密钥与明文。 // secretChatErr 把 app/secretchat + domain 业务错误映射为 RPC_ERROR。 @@ -28,6 +29,8 @@ func secretChatErr(err error) error { return encryptionAlreadyAcceptedErr() case errors.Is(err, domain.ErrSecretChatAlreadyDeclined): return encryptionAlreadyDeclinedErr() + case errors.Is(err, domain.ErrSecretChatRandomIDDuplicate): + return secretChatRandomIDDuplicateErr() case errors.Is(err, domain.ErrSecretChatNotFound): return chatIDInvalidErr() default: @@ -56,9 +59,9 @@ func businessAuthKeyIDFrom(ctx context.Context) (int64, bool) { return businessAuthKeyInt64(id), true } -// pushUpdateEncryption 把 targetUserID 视角的 updateEncryption 推给其全部在线设备。 -// P0 用账号级在线推送（设备级定向 + 离线补偿见 P1）。 -func (r *Router) pushUpdateEncryption(ctx context.Context, targetUserID int64, chat domain.SecretChat, logMessage string) { +// pushUpdateEncryption 把 updateEncryption 投给目标账号或精确绑定设备。targetAuthKeyID=0 +// 仅允许用于 accept 前邀请/撤回；accept 后必须非零，缺少定向 binder 时 fail-closed。 +func (r *Router) pushUpdateEncryption(ctx context.Context, targetUserID, targetAuthKeyID int64, chat domain.SecretChat, logMessage string) { now := int(r.clock.Now().Unix()) upd := &tg.Updates{ Updates: []tg.UpdateClass{&tg.UpdateEncryption{ @@ -70,7 +73,45 @@ func (r *Router) pushUpdateEncryption(ctx context.Context, targetUserID int64, c Date: now, Seq: 0, } - r.pushUserMessage(ctx, targetUserID, logMessage, upd) + if targetAuthKeyID == 0 { + r.pushUserMessage(ctx, targetUserID, logMessage, upd) + return + } + if targeted, ok := r.deps.Sessions.(AuthKeyTargetedSessionBinder); ok { + _, _ = targeted.PushToUserAuthKey(ctx, targetUserID, deviceAuthKeyBytes(targetAuthKeyID), proto.MessageFromServer, upd) + return + } + r.log.Error("secret chat targeted session binder unavailable", + zap.String("update", logMessage), + zap.Int64("target_user_id", targetUserID), + zap.Int64("target_auth_key_id", targetAuthKeyID)) +} + +// pushAcceptedLoserDiscarded 让 participant 账号中除获胜 business auth key 外的在线设备 +// 删除 requested 幽灵。离线/未就绪设备由 accept 后新增的账号级 state event 收敛。 +func (r *Router) pushAcceptedLoserDiscarded(ctx context.Context, chat domain.SecretChat, date int) { + if chat.ParticipantUserID == 0 || chat.ParticipantAuthKeyID == 0 { + return + } + upd := &tg.Updates{ + Updates: []tg.UpdateClass{&tg.UpdateEncryption{ + Chat: &tg.EncryptedChatDiscarded{ID: chat.ID, HistoryDeleted: true}, + Date: date, + }}, + Users: r.tgUsersForIDs(ctx, chat.ParticipantUserID, []int64{chat.AdminUserID, chat.ParticipantUserID}), + Chats: []tg.ChatClass{}, + Date: date, + Seq: 0, + } + if targeted, ok := r.deps.Sessions.(AuthKeyTargetedSessionBinder); ok { + _, _ = targeted.PushToUserExceptBusinessAuthKey(ctx, chat.ParticipantUserID, + deviceAuthKeyBytes(chat.ParticipantAuthKeyID), proto.MessageFromServer, upd, r.cfg.OutboundPushTimeout) + return + } + r.log.Error("secret chat targeted session binder unavailable", + zap.String("update", "secret chat accept loser discarded"), + zap.Int64("target_user_id", chat.ParticipantUserID), + zap.Int64("exclude_auth_key_id", chat.ParticipantAuthKeyID)) } // recordEncryptionEventBestEffort 写入 durable updateEncryption 状态事件供离线设备 @@ -106,7 +147,7 @@ func (r *Router) discardSecretChatsForAuthKey(ctx context.Context, businessAuthK } // 对端绑定设备已知则 device-level 定向，建链前（未绑定，0）则账号级。 r.recordEncryptionEventBestEffort(ctx, chat.ID, peer, chat.PeerAuthKeyOf(ownerUserID), now) - r.pushUpdateEncryption(ctx, peer, chat, "secret chat discarded on peer logout/revoke") + r.pushUpdateEncryption(ctx, peer, chat.PeerAuthKeyOf(ownerUserID), chat, "secret chat discarded on peer logout/revoke") } } @@ -114,6 +155,9 @@ func (r *Router) onMessagesRequestEncryption(ctx context.Context, req *tg.Messag if req == nil { return nil, inputRequestInvalidErr() } + if req.RandomID == 0 || int(int32(req.RandomID)) != req.RandomID { + return nil, secretChatRandomIDDuplicateErr() + } if r.deps.SecretChats == nil || r.deps.Users == nil { return nil, notImplementedErr() } @@ -152,7 +196,7 @@ func (r *Router) onMessagesRequestEncryption(ctx context.Context, req *tg.Messag // 建链前邀请是账号级（targetAuthKeyID=0）：participant 所有设备（含离线）可见。 r.recordEncryptionEventBestEffort(ctx, chat.ID, chat.ParticipantUserID, 0, chat.Date) // 推接受方全部在线设备 encryptedChatRequested（携 g_a）。离线设备经 getDifference 补回。 - r.pushUpdateEncryption(ctx, chat.ParticipantUserID, chat, "secret chat requested") + r.pushUpdateEncryption(ctx, chat.ParticipantUserID, 0, chat, "secret chat requested") // 发起方同步收 encryptedChatWaiting（无 g_a）。 return tgEncryptedChatForViewer(chat, adminID), nil } @@ -177,11 +221,15 @@ func (r *Router) onMessagesAcceptEncryption(ctx context.Context, req *tg.Message if err != nil { return nil, secretChatErr(err) } + now := int(r.clock.Now().Unix()) // 建链完成定向发起方绑定设备（device-level）：离线发起方经 getDifference 补回成型态。 - r.recordEncryptionEventBestEffort(ctx, chat.ID, chat.AdminUserID, chat.AdminAuthKeyID, int(r.clock.Now().Unix())) - // 推发起方全部在线设备 encryptedChat（GAOrB=g_b, key_fingerprint），发起方据此 - // 算共享密钥并比对指纹。 - r.pushUpdateEncryption(ctx, chat.AdminUserID, chat, "secret chat accepted") + r.recordEncryptionEventBestEffort(ctx, chat.ID, chat.AdminUserID, chat.AdminAuthKeyID, now) + // 给 participant 账号新增一次收敛事件：获胜 auth key 跳过，其它已见/未见邀请的设备 + // 均投影为 discarded，避免 requested 幽灵与 future-device normal 泄漏。 + r.recordEncryptionEventBestEffort(ctx, chat.ID, chat.ParticipantUserID, 0, now) + // 仅推发起方绑定设备 encryptedChat（GAOrB=g_b, key_fingerprint）。 + r.pushUpdateEncryption(ctx, chat.AdminUserID, chat.AdminAuthKeyID, chat, "secret chat accepted") + r.pushAcceptedLoserDiscarded(ctx, chat, now) // 接受方同步收 encryptedChat（GAOrB=g_a）。 return tgEncryptedChatForViewer(chat, userID), nil } @@ -197,7 +245,11 @@ func (r *Router) onMessagesDiscardEncryption(ctx context.Context, req *tg.Messag if err != nil { return false, err } - chat, already, err := r.deps.SecretChats.DiscardEncryption(ctx, req.ChatID, userID, req.DeleteHistory) + deviceAuthKeyID, ok := businessAuthKeyIDFrom(ctx) + if !ok { + return false, internalErr() + } + chat, already, err := r.deps.SecretChats.DiscardEncryption(ctx, req.ChatID, userID, deviceAuthKeyID, req.DeleteHistory) if err != nil { return false, secretChatErr(err) } @@ -206,7 +258,7 @@ func (r *Router) onMessagesDiscardEncryption(ctx context.Context, req *tg.Messag // 对端绑定设备已知则 device-level，建链前（未绑定）则账号级（同 requested 集合）。 if peer := chat.PeerOf(userID); peer != 0 { r.recordEncryptionEventBestEffort(ctx, chat.ID, peer, chat.PeerAuthKeyOf(userID), int(r.clock.Now().Unix())) - r.pushUpdateEncryption(ctx, peer, chat, "secret chat discarded") + r.pushUpdateEncryption(ctx, peer, chat.PeerAuthKeyOf(userID), chat, "secret chat discarded") } } return true, nil diff --git a/internal/rpc/encrypted_chats_test.go b/internal/rpc/encrypted_chats_test.go index c42d54ee..7f1aaf73 100644 --- a/internal/rpc/encrypted_chats_test.go +++ b/internal/rpc/encrypted_chats_test.go @@ -2,12 +2,18 @@ package rpc import ( "context" + "crypto/sha1" + "encoding/binary" + "math/big" "testing" + "github.com/iamxvbaba/td/bin" "github.com/iamxvbaba/td/clock" "github.com/iamxvbaba/td/tg" + "github.com/iamxvbaba/td/tlprofile" "go.uber.org/zap/zaptest" + appphone "telesrv/internal/app/phone" appsecret "telesrv/internal/app/secretchat" appupdates "telesrv/internal/app/updates" appusers "telesrv/internal/app/users" @@ -15,24 +21,6 @@ import ( "telesrv/internal/store/memory" ) -// seqSecretChatIDAllocator 是单调自增的测试 chat id 分配器。 -type seqSecretChatIDAllocator struct{ n int } - -func (a *seqSecretChatIDAllocator) NextSecretChatID(context.Context) (int, error) { - a.n++ - return a.n, nil -} - -func (a *seqSecretChatIDAllocator) NextSecretChatIDAtLeast(_ context.Context, floor int) (int, error) { - if a.n < floor { - a.n = floor - } - a.n++ - return a.n, nil -} - -func (a *seqSecretChatIDAllocator) CurrentSecretChatID(context.Context) (int, error) { return a.n, nil } - func dhParam(lead byte) []byte { b := make([]byte, 256) for i := range b { @@ -53,13 +41,15 @@ type encryptedFixture struct { } const ( - encAdminSession = int64(301) - encPartSession = int64(302) + encAdminSession = int64(301) + encPartSession = int64(302) + encPartOtherSession = int64(303) ) var ( - encAdminAuthKey = [8]byte{1, 0, 0, 0, 0, 0, 0, 0} - encPartAuthKey = [8]byte{2, 0, 0, 0, 0, 0, 0, 0} + encAdminAuthKey = [8]byte{1, 0, 0, 0, 0, 0, 0, 0} + encPartAuthKey = [8]byte{2, 0, 0, 0, 0, 0, 0, 0} + encPartOtherAuthKey = [8]byte{3, 0, 0, 0, 0, 0, 0, 0} ) func newEncryptedFixture(t *testing.T) *encryptedFixture { @@ -71,7 +61,7 @@ func newEncryptedFixture(t *testing.T) *encryptedFixture { queueStore := memory.NewEncryptedQueueStore() router := New(Config{}, Deps{ Users: appusers.NewService(userStore), - SecretChats: appsecret.NewService(secretStore, queueStore, &seqSecretChatIDAllocator{}), + SecretChats: appsecret.NewService(secretStore, queueStore), Updates: appupdates.NewService(memory.NewUpdateStateStore(), memory.NewUpdateEventStore()), Files: &fakeFiles{}, Sessions: sessions, @@ -97,6 +87,10 @@ func (f *encryptedFixture) participantCtx() context.Context { return WithAuthKeyID(WithSessionID(WithUserID(f.ctx, f.participant.ID), encPartSession), encPartAuthKey) } +func (f *encryptedFixture) participantOtherCtx() context.Context { + return WithAuthKeyID(WithSessionID(WithUserID(f.ctx, f.participant.ID), encPartOtherSession), encPartOtherAuthKey) +} + // encChatPayload 从捕获的推送里取出 updateEncryption 载荷。 func encChatPayload(t *testing.T, rec phonePushRecord) tg.EncryptedChatClass { t.Helper() @@ -111,6 +105,121 @@ func encChatPayload(t *testing.T, rec phonePushRecord) tg.EncryptedChatClass { return upd.Chat } +func secretChatDHFixture(t *testing.T, wantNegativeFingerprint bool) (ga, gb []byte, fingerprint int64) { + t.Helper() + prime := new(big.Int).SetBytes(appphone.DHPrime()) + generator := big.NewInt(int64(appphone.DHG)) + privateA := new(big.Int).SetBytes(make([]byte, 256)) + privateA.SetBit(privateA, 2046, 1) + privateA.Add(privateA, big.NewInt(0x12345)) + gaInt := new(big.Int).Exp(generator, privateA, prime) + ga = gaInt.Bytes() + + for n := int64(1); n < 128; n++ { + privateB := new(big.Int).SetBit(new(big.Int), 2045, 1) + privateB.Add(privateB, big.NewInt(0x54321+n)) + gbInt := new(big.Int).Exp(generator, privateB, prime) + sharedA := new(big.Int).Exp(gbInt, privateA, prime) + sharedB := new(big.Int).Exp(gaInt, privateB, prime) + if sharedA.Cmp(sharedB) != 0 { + t.Fatal("DH fixture derived different shared keys") + } + key := make([]byte, 256) + sharedBytes := sharedA.Bytes() + copy(key[len(key)-len(sharedBytes):], sharedBytes) + digest := sha1.Sum(key) + fingerprint = int64(binary.LittleEndian.Uint64(digest[12:20])) + if (fingerprint < 0) == wantNegativeFingerprint { + return ga, gbInt.Bytes(), fingerprint + } + } + t.Fatalf("could not generate DH fixture with negative=%v fingerprint", wantNegativeFingerprint) + return nil, nil, 0 +} + +func TestEncryptedChatRealDHHandshakeAcrossExactLayers(t *testing.T) { + for _, negative := range []bool{false, true} { + name := "positive_fingerprint" + if negative { + name = "negative_fingerprint" + } + t.Run(name, func(t *testing.T) { + f := newEncryptedFixture(t) + ga, gb, fingerprint := secretChatDHFixture(t, negative) + waitingClass, err := f.router.onMessagesRequestEncryption(f.adminCtx(), &tg.MessagesRequestEncryptionRequest{ + UserID: &tg.InputUser{UserID: f.participant.ID, AccessHash: f.participant.AccessHash}, + RandomID: 909, + GA: ga, + }) + if err != nil { + t.Fatalf("requestEncryption: %v", err) + } + waiting := waitingClass.(*tg.EncryptedChatWaiting) + if waiting.ID != 909 { + t.Fatalf("waiting id = %d, want request random_id 909", waiting.ID) + } + chat, ok, err := f.store.GetSecretChat(f.ctx, waiting.ID) + if err != nil || !ok { + t.Fatalf("stored requested chat: ok=%v err=%v", ok, err) + } + + f.sessions.reset() + if _, err := f.router.onMessagesAcceptEncryption(f.participantCtx(), &tg.MessagesAcceptEncryptionRequest{ + Peer: tg.InputEncryptedChat{ChatID: chat.ID, AccessHash: chat.ParticipantAccessHash}, + GB: gb, + KeyFingerprint: fingerprint, + }); err != nil { + t.Fatalf("acceptEncryption: %v", err) + } + + var adminUpdates *tg.Updates + for _, rec := range f.sessions.records() { + if rec.userID == f.admin.ID { + adminUpdates = rec.msg.(*tg.Updates) + break + } + } + if adminUpdates == nil { + t.Fatal("missing accepted update for the initiating device") + } + + for _, profile := range []tlprofile.Profile{ + tlprofile.Profile225, + tlprofile.Profile226, + tlprofile.Profile227, + tlprofile.Profile228, + } { + var body bin.Buffer + if err := tlprofile.EncodeObject(profile, adminUpdates, &body); err != nil { + t.Fatalf("encode accepted update for profile %d: %v", profile, err) + } + decoded, err := tlprofile.DecodeObject(profile, &bin.Buffer{Buf: body.Buf}, tlprofile.Limits{}) + if err != nil { + t.Fatalf("decode accepted update for profile %d: %v", profile, err) + } + updates, ok := decoded.(*tg.Updates) + if !ok || len(updates.Updates) != 1 { + t.Fatalf("profile %d decoded update = %T", profile, decoded) + } + encUpdate, ok := updates.Updates[0].(*tg.UpdateEncryption) + if !ok { + t.Fatalf("profile %d nested update = %T", profile, updates.Updates[0]) + } + accepted, ok := encUpdate.Chat.(*tg.EncryptedChat) + if !ok { + t.Fatalf("profile %d chat = %T", profile, encUpdate.Chat) + } + if new(big.Int).SetBytes(accepted.GAOrB).Cmp(new(big.Int).SetBytes(gb)) != 0 { + t.Fatalf("profile %d changed g_b", profile) + } + if accepted.KeyFingerprint != fingerprint { + t.Fatalf("profile %d fingerprint = %d, want %d", profile, accepted.KeyFingerprint, fingerprint) + } + } + }) + } +} + func TestEncryptedChatRPCHappyPath(t *testing.T) { f := newEncryptedFixture(t) ga := dhParam(0x55) @@ -129,6 +238,9 @@ func TestEncryptedChatRPCHappyPath(t *testing.T) { if !ok { t.Fatalf("request response = %T, want *tg.EncryptedChatWaiting", res) } + if waiting.ID != 777 { + t.Fatalf("waiting id = %d, want request random_id 777", waiting.ID) + } // 推送给接受方的 encryptedChatRequested（携 g_a）。 recs := f.sessions.records() if len(recs) != 1 || recs[0].userID != f.participant.ID { @@ -138,8 +250,8 @@ func TestEncryptedChatRPCHappyPath(t *testing.T) { if !ok { t.Fatalf("participant payload = %T, want EncryptedChatRequested", encChatPayload(t, recs[0])) } - if requested.ID != waiting.ID { - t.Fatalf("chat id mismatch admin=%d participant=%d", waiting.ID, requested.ID) + if requested.ID != 777 { + t.Fatalf("participant requested id = %d, want request random_id 777", requested.ID) } if string(requested.GA) != string(ga) { t.Fatal("requested g_a not relayed verbatim") @@ -172,14 +284,29 @@ func TestEncryptedChatRPCHappyPath(t *testing.T) { if partView.KeyFingerprint != fp { t.Fatalf("key fingerprint = %x, want %x", partView.KeyFingerprint, fp) } - // 推送给发起方：encryptedChat，GAOrB = g_b。 + // 定向推送给发起设备 encryptedChat，并让 participant 其它设备收敛为 discarded。 recs = f.sessions.records() - if len(recs) != 1 || recs[0].userID != f.admin.ID { - t.Fatalf("accept push = %+v, want single push to admin %d", recs, f.admin.ID) + if len(recs) != 2 { + t.Fatalf("accept pushes = %+v, want admin accepted + participant loser discarded", recs) } - adminView, ok := encChatPayload(t, recs[0]).(*tg.EncryptedChat) + var adminRec, loserRec *phonePushRecord + for i := range recs { + switch recs[i].userID { + case f.admin.ID: + adminRec = &recs[i] + case f.participant.ID: + loserRec = &recs[i] + } + } + if adminRec == nil || adminRec.rawAuthKeyID != encAdminAuthKey { + t.Fatalf("admin accept push = %+v, want target auth key %x", adminRec, encAdminAuthKey) + } + if loserRec == nil || loserRec.rawAuthKeyID != encPartAuthKey { + t.Fatalf("loser discard push = %+v, want exclusion auth key %x", loserRec, encPartAuthKey) + } + adminView, ok := encChatPayload(t, *adminRec).(*tg.EncryptedChat) if !ok { - t.Fatalf("admin payload = %T, want EncryptedChat", encChatPayload(t, recs[0])) + t.Fatalf("admin payload = %T, want EncryptedChat", encChatPayload(t, *adminRec)) } if string(adminView.GAOrB) != string(gb) { t.Fatal("admin view GAOrB must be g_b") @@ -187,6 +314,9 @@ func TestEncryptedChatRPCHappyPath(t *testing.T) { if adminView.KeyFingerprint != fp { t.Fatal("admin view key fingerprint not relayed byte-for-byte") } + if discarded, ok := encChatPayload(t, *loserRec).(*tg.EncryptedChatDiscarded); !ok || !discarded.HistoryDeleted { + t.Fatalf("loser payload = %+v, want history-deleting EncryptedChatDiscarded", encChatPayload(t, *loserRec)) + } // --- discardEncryption（发起方） --- f.sessions.reset() @@ -277,6 +407,58 @@ func TestRequestEncryptionSelf(t *testing.T) { assertPhoneRPCErr(t, err, "USER_ID_INVALID") } +func TestRequestEncryptionRandomIDContractRPC(t *testing.T) { + f := newEncryptedFixture(t) + request := func(randomID int) (tg.EncryptedChatClass, error) { + return f.router.onMessagesRequestEncryption(f.adminCtx(), &tg.MessagesRequestEncryptionRequest{ + UserID: &tg.InputUser{UserID: f.participant.ID, AccessHash: f.participant.AccessHash}, + RandomID: randomID, + GA: dhParam(0x55), + }) + } + + negative, err := request(-808) + if err != nil { + t.Fatalf("negative random_id: %v", err) + } + if got := negative.(*tg.EncryptedChatWaiting).ID; got != -808 { + t.Fatalf("negative waiting id = %d, want -808", got) + } + negativeChat, found, err := f.store.GetSecretChat(f.ctx, -808) + if err != nil || !found { + t.Fatalf("stored negative chat: found=%v err=%v", found, err) + } + accepted, err := f.router.onMessagesAcceptEncryption(f.participantCtx(), &tg.MessagesAcceptEncryptionRequest{ + Peer: tg.InputEncryptedChat{ChatID: -808, AccessHash: negativeChat.ParticipantAccessHash}, + GB: dhParam(0x66), + KeyFingerprint: 0x1234, + }) + if err != nil { + t.Fatalf("accept negative chat id: %v", err) + } + if got := accepted.(*tg.EncryptedChat).ID; got != -808 { + t.Fatalf("accepted id = %d, want -808", got) + } + + if _, err := request(0); err == nil { + t.Fatal("zero random_id succeeded, want RANDOM_ID_DUPLICATE") + } else { + assertPhoneRPCErr(t, err, "RANDOM_ID_DUPLICATE") + } + + // 同一全局 chat_id 改变握手意图不能被幂等吞掉。 + changed := &tg.MessagesRequestEncryptionRequest{ + UserID: &tg.InputUser{UserID: f.participant.ID, AccessHash: f.participant.AccessHash}, + RandomID: -808, + GA: dhParam(0x66), + } + if _, err := f.router.onMessagesRequestEncryption(f.adminCtx(), changed); err == nil { + t.Fatal("changed intent succeeded, want RANDOM_ID_DUPLICATE") + } else { + assertPhoneRPCErr(t, err, "RANDOM_ID_DUPLICATE") + } +} + func TestAcceptEncryptionWrongAccessHashRPC(t *testing.T) { f := newEncryptedFixture(t) res, err := f.router.onMessagesRequestEncryption(f.adminCtx(), &tg.MessagesRequestEncryptionRequest{ diff --git a/internal/rpc/encrypted_files.go b/internal/rpc/encrypted_files.go index c95ea96d..8b08ac6f 100644 --- a/internal/rpc/encrypted_files.go +++ b/internal/rpc/encrypted_files.go @@ -64,6 +64,9 @@ func (r *Router) onMessagesSendEncryptedFile(ctx context.Context, req *tg.Messag if req == nil { return nil, inputRequestInvalidErr() } + if len(req.Data) > domain.MaxSecretMessageDataBytes { + return nil, dataTooLongErr() + } if r.deps.SecretChats == nil { return nil, notImplementedErr() } @@ -71,11 +74,19 @@ func (r *Router) onMessagesSendEncryptedFile(ctx context.Context, req *tg.Messag if err != nil { return nil, err } + deviceAuthKeyID, ok := businessAuthKeyIDFrom(ctx) + if !ok { + return nil, internalErr() + } + // 先完成 chat/device 授权，避免无权或终态请求先组装 blob、写元数据后才失败。 + if _, _, _, err := r.resolveSecretChatPeer(ctx, userID, req.Peer); err != nil { + return nil, err + } fileRef, err := r.resolveInputEncryptedFile(ctx, userID, req.File) if err != nil { return nil, err } - _, stored, err := r.deps.SecretChats.SendEncrypted(ctx, req.Peer.ChatID, userID, req.Peer.AccessHash, domain.SecretMessageDelivery{ + _, stored, err := r.deps.SecretChats.SendEncrypted(ctx, req.Peer.ChatID, userID, deviceAuthKeyID, req.Peer.AccessHash, domain.SecretMessageDelivery{ RandomID: req.RandomID, Bytes: req.Data, IsService: false, diff --git a/internal/rpc/encrypted_files_test.go b/internal/rpc/encrypted_files_test.go index e7a45d74..6c2743f1 100644 --- a/internal/rpc/encrypted_files_test.go +++ b/internal/rpc/encrypted_files_test.go @@ -1,9 +1,13 @@ package rpc import ( + "bytes" "testing" "github.com/iamxvbaba/td/tg" + "github.com/iamxvbaba/td/tgerr" + + "telesrv/internal/domain" ) // TestSendEncryptedFileFlow：sendEncryptedFile 铸造 EncryptedFile、随消息投递、返回 @@ -71,13 +75,70 @@ func TestUploadEncryptedFile(t *testing.T) { } } -// TestEncryptedFileLocationKey：inputEncryptedFileLocation → "enc:" 下载 key。 -func TestEncryptedFileLocationKey(t *testing.T) { - key, ok := fileLocationKey(&tg.InputEncryptedFileLocation{ID: 123, AccessHash: 456}) - if !ok || key != "enc:123" { - t.Fatalf("location key = %q ok %v, want enc:123", key, ok) +// TestEncryptedFileDownloadRequiresCapability：密聊 blob 只有在 id+access_hash 元数据能力 +// 校验成功后才会转换为内部 enc: key；错误 hash 不能触达 Files.GetFile。 +func TestEncryptedFileDownloadRequiresCapability(t *testing.T) { + f := newEncryptedFixture(t) + chatID, _ := f.acceptChat(t) + chat, _, _ := f.store.GetSecretChat(f.ctx, chatID) + res, err := f.router.onMessagesUploadEncryptedFile(f.adminCtx(), &tg.MessagesUploadEncryptedFileRequest{ + Peer: tg.InputEncryptedChat{ChatID: chatID, AccessHash: chat.AdminAccessHash}, + File: &tg.InputEncryptedFileUploaded{ID: 888, Parts: 1, KeyFingerprint: 9}, + }) + if err != nil { + t.Fatalf("uploadEncryptedFile: %v", err) } - if _, ok := fileLocationKey(&tg.InputEncryptedFileLocation{ID: 0}); ok { - t.Fatal("id=0 must be rejected") + ef := res.(*tg.EncryptedFile) + files := f.router.deps.Files.(*fakeFiles) + files.getFileFound = true + files.getFileChunk = domain.FileChunk{MimeType: "application/octet-stream", Bytes: []byte{1, 2, 3}} + + got, err := f.router.onUploadGetFile(f.adminCtx(), &tg.UploadGetFileRequest{ + Location: &tg.InputEncryptedFileLocation{ID: ef.ID, AccessHash: ef.AccessHash}, + Offset: 0, + Limit: 1024, + }) + if err != nil { + t.Fatalf("get encrypted file: %v", err) + } + file, ok := got.(*tg.UploadFile) + if !ok || !bytes.Equal(file.Bytes, []byte{1, 2, 3}) { + t.Fatalf("download = %T %+v", got, got) + } + if files.getFileCalls != 1 || files.getFileRequest.LocationKey != "enc:9001" { + t.Fatalf("GetFile calls/key = %d/%q", files.getFileCalls, files.getFileRequest.LocationKey) + } + + _, err = f.router.onUploadGetFile(f.adminCtx(), &tg.UploadGetFileRequest{ + Location: &tg.InputEncryptedFileLocation{ID: ef.ID, AccessHash: ef.AccessHash + 1}, + Offset: 0, + Limit: 1024, + }) + if !tgerr.Is(err, "LOCATION_INVALID") { + t.Fatalf("wrong access hash err = %v", err) + } + if files.getFileCalls != 1 { + t.Fatalf("wrong access hash reached blob store: calls=%d", files.getFileCalls) + } +} + +func TestEncryptedDataLimit(t *testing.T) { + f := newEncryptedFixture(t) + chatID, _ := f.acceptChat(t) + chat, _, _ := f.store.GetSecretChat(f.ctx, chatID) + tooLong := make([]byte, domain.MaxSecretMessageDataBytes+1) + + _, err := f.router.onMessagesSendEncrypted(f.adminCtx(), &tg.MessagesSendEncryptedRequest{ + Peer: tg.InputEncryptedChat{ChatID: chatID, AccessHash: chat.AdminAccessHash}, RandomID: 1, Data: tooLong, + }) + if !tgerr.Is(err, "DATA_TOO_LONG") { + t.Fatalf("sendEncrypted oversized err = %v", err) + } + _, err = f.router.onMessagesSendEncryptedFile(f.adminCtx(), &tg.MessagesSendEncryptedFileRequest{ + Peer: tg.InputEncryptedChat{ChatID: chatID, AccessHash: chat.AdminAccessHash}, RandomID: 2, Data: tooLong, + File: &tg.InputEncryptedFileUploaded{ID: 888, Parts: 1, KeyFingerprint: 9}, + }) + if !tgerr.Is(err, "DATA_TOO_LONG") { + t.Fatalf("sendEncryptedFile oversized err = %v", err) } } diff --git a/internal/rpc/encrypted_messages.go b/internal/rpc/encrypted_messages.go index b5d8f788..962ec22f 100644 --- a/internal/rpc/encrypted_messages.go +++ b/internal/rpc/encrypted_messages.go @@ -2,13 +2,17 @@ package rpc import ( "context" + "fmt" "github.com/iamxvbaba/td/proto" "github.com/iamxvbaba/td/tg" + "go.uber.org/zap" "telesrv/internal/domain" ) +const encryptedDifferencePageSize = 1000 + // 私聊密聊 qts 消息收发 RPC handler（P1）。服务端是盲中继：sendEncrypted* 的 bytes 是 // 客户端加密的 DecryptedMessage，服务端盲存进【接收方设备】的 qts 队列、原样转发， // 永不解密。在线推 updateNewEncryptedMessage（设备定向，离线靠 getDifference 补回）。 @@ -34,11 +38,16 @@ func (r *Router) pushEncryptedNewMessage(ctx context.Context, msg domain.SecretC _, _ = targeted.PushToUserAuthKey(ctx, msg.ReceiverUserID, deviceAuthKeyBytes(msg.ReceiverAuthKeyID), proto.MessageFromServer, upd) return } - // 回退（测试替身/未装配定向能力）：账号级推送。 - r.pushUserMessage(ctx, msg.ReceiverUserID, "secret chat message", upd) + // 设备隔离是安全边界；缺少定向能力时只保留 durable qts，离线 difference 补回。 + r.log.Error("secret chat targeted session binder unavailable", + zap.Int64("target_user_id", msg.ReceiverUserID), + zap.Int64("target_auth_key_id", msg.ReceiverAuthKeyID)) } func (r *Router) sendEncryptedCommon(ctx context.Context, peer tg.InputEncryptedChat, randomID int64, data []byte, isService bool) (tg.MessagesSentEncryptedMessageClass, error) { + if len(data) > domain.MaxSecretMessageDataBytes { + return nil, dataTooLongErr() + } if r.deps.SecretChats == nil { return nil, notImplementedErr() } @@ -46,7 +55,11 @@ func (r *Router) sendEncryptedCommon(ctx context.Context, peer tg.InputEncrypted if err != nil { return nil, err } - _, stored, err := r.deps.SecretChats.SendEncrypted(ctx, peer.ChatID, userID, peer.AccessHash, domain.SecretMessageDelivery{ + deviceAuthKeyID, ok := businessAuthKeyIDFrom(ctx) + if !ok { + return nil, internalErr() + } + _, stored, err := r.deps.SecretChats.SendEncrypted(ctx, peer.ChatID, userID, deviceAuthKeyID, peer.AccessHash, domain.SecretMessageDelivery{ RandomID: randomID, Bytes: data, IsService: isService, @@ -130,27 +143,38 @@ func (r *Router) deviceEncryptedQts(ctx context.Context) int { return qts } -// encryptedDifference 返回当前设备 qts > sinceQts 的加密消息（TL 投影）与推进后的 qts -// （getDifference 注入用）。无新消息时返回 (nil, sinceQts)。 -func (r *Router) encryptedDifference(ctx context.Context, sinceQts int) ([]tg.EncryptedMessageClass, int) { +// encryptedDifference 返回当前设备 qts > sinceQts 的连续前缀、推进后的 qts 与是否还有 +// 下一页。存储错误或 qts gap 必须 fail-fast，禁止越过缺口推进客户端水位。 +func (r *Router) encryptedDifference(ctx context.Context, sinceQts int) ([]tg.EncryptedMessageClass, int, bool, error) { if r.deps.SecretChats == nil { - return nil, sinceQts + return nil, sinceQts, false, nil } deviceKey, ok := businessAuthKeyIDFrom(ctx) if !ok { - return nil, sinceQts + return nil, sinceQts, false, nil } - msgs, err := r.deps.SecretChats.ListNewMessages(ctx, deviceKey, sinceQts, 0) - if err != nil || len(msgs) == 0 { - return nil, sinceQts + msgs, err := r.deps.SecretChats.ListNewMessages(ctx, deviceKey, sinceQts, encryptedDifferencePageSize+1) + if err != nil { + return nil, sinceQts, false, err + } + if len(msgs) == 0 { + return nil, sinceQts, false, nil + } + partial := len(msgs) > encryptedDifferencePageSize + if partial { + msgs = msgs[:encryptedDifferencePageSize] } out := make([]tg.EncryptedMessageClass, 0, len(msgs)) newQts := sinceQts - for _, m := range msgs { + for i, m := range msgs { + expected := newQts + 1 + if m.Qts != expected { + return nil, sinceQts, false, fmt.Errorf("secret chat qts gap at index %d: got %d want %d", i, m.Qts, expected) + } out = append(out, tgEncryptedMessage(m)) newQts = m.Qts } - return out, newQts + return out, newQts, partial, nil } // injectEncryptedMessages 把加密消息与推进后的 qts 注入差分响应（按类型分别写 State / @@ -169,19 +193,28 @@ func injectEncryptedMessages(diff tg.UpdatesDifferenceClass, encMsgs []tg.Encryp // encryptedStateUpdates 返回当前设备未投递的握手/已读状态事件重建出的 update（进 // OtherUpdates）、涉及的 peer user id（补 Users）、以及要登记已投递的事件 id。 -// encryption 事件按 secret_chats 权威态重建（不固化快照）。 -func (r *Router) encryptedStateUpdates(ctx context.Context, userID int64) (updates []tg.UpdateClass, peerUserIDs []int64, eventIDs []int64) { +// encryption 事件按 secret_chats 权威态重建（不固化密钥材料快照）。账号级邀请在 +// accept 后只对未绑定设备投影为 discarded；获胜设备消费并跳过，绝不能收到 normal 泄漏。 +func (r *Router) encryptedStateUpdates(ctx context.Context, userID int64) (updates []tg.UpdateClass, peerUserIDs []int64, eventIDs []int64, partial bool, err error) { if r.deps.SecretChats == nil { - return nil, nil, nil + return nil, nil, nil, false, nil } deviceKey, ok := businessAuthKeyIDFrom(ctx) if !ok { - return nil, nil, nil + return nil, nil, nil, false, nil } - events, err := r.deps.SecretChats.ListStateEvents(ctx, userID, deviceKey, 0) - if err != nil || len(events) == 0 { - return nil, nil, nil + events, err := r.deps.SecretChats.ListStateEvents(ctx, userID, deviceKey, encryptedDifferencePageSize+1) + if err != nil { + return nil, nil, nil, false, err } + if len(events) == 0 { + return nil, nil, nil, false, nil + } + partial = len(events) > encryptedDifferencePageSize + if partial { + events = events[:encryptedDifferencePageSize] + } + seenEncryption := make(map[int]struct{}) for _, ev := range events { switch ev.Type { case domain.EncryptedStateEventEncryption: @@ -189,12 +222,23 @@ func (r *Router) encryptedStateUpdates(ctx context.Context, userID int64) (updat if gerr != nil || !found { continue } - updates = append(updates, &tg.UpdateEncryption{ - Chat: tgEncryptedChatForViewer(chat, userID), - Date: ev.Date, - }) - peerUserIDs = append(peerUserIDs, chat.AdminUserID, chat.ParticipantUserID) eventIDs = append(eventIDs, ev.ID) + if _, duplicate := seenEncryption[chat.ID]; duplicate { + continue + } + seenEncryption[chat.ID] = struct{}{} + + chatView := tgEncryptedChatForViewer(chat, userID) + if ev.TargetAuthKeyID == 0 && chat.State == domain.SecretChatStateNormal { + // 账号级事件只承载 accept 前邀请。accept 后获胜设备已有同步响应；其它设备 + // 必须收敛为 discarded，不能用当前 normal 权威态泄漏 access_hash/g_a。 + if chat.AuthKeyOf(userID) == deviceKey { + continue + } + chatView = &tg.EncryptedChatDiscarded{ID: chat.ID, HistoryDeleted: true} + } + updates = append(updates, &tg.UpdateEncryption{Chat: chatView, Date: ev.Date}) + peerUserIDs = append(peerUserIDs, chat.AdminUserID, chat.ParticipantUserID) case domain.EncryptedStateEventRead: updates = append(updates, &tg.UpdateEncryptedMessagesRead{ ChatID: ev.ChatID, @@ -204,7 +248,7 @@ func (r *Router) encryptedStateUpdates(ctx context.Context, userID int64) (updat eventIDs = append(eventIDs, ev.ID) } } - return updates, peerUserIDs, eventIDs + return updates, peerUserIDs, eventIDs, partial, nil } // injectEncryptedOtherUpdates 把握手/已读 update 追加进差分的 OtherUpdates、把 peer @@ -214,6 +258,24 @@ func (r *Router) injectEncryptedOtherUpdates(ctx context.Context, viewerUserID i return diff } users := r.tgUsersForIDs(ctx, viewerUserID, peerUserIDs) + return appendEncryptedOtherUpdates(diff, updates, users) +} + +func (r *Router) injectEncryptedOtherUpdatesStrict(ctx context.Context, viewerUserID int64, diff tg.UpdatesDifferenceClass, updates []tg.UpdateClass, peerUserIDs []int64, cache *viewerPeerCache) (tg.UpdatesDifferenceClass, error) { + if len(updates) == 0 { + return diff, nil + } + if cache == nil { + cache = newViewerPeerCache(r) + } + users, err := cache.usersForIDsStrict(ctx, viewerUserID, peerUserIDs) + if err != nil { + return nil, err + } + return appendEncryptedOtherUpdates(diff, updates, r.tgUsersForViewer(viewerUserID, users)), nil +} + +func appendEncryptedOtherUpdates(diff tg.UpdatesDifferenceClass, updates []tg.UpdateClass, users []tg.UserClass) tg.UpdatesDifferenceClass { switch v := diff.(type) { case *tg.UpdatesDifference: v.OtherUpdates = append(v.OtherUpdates, updates...) diff --git a/internal/rpc/encrypted_messages_test.go b/internal/rpc/encrypted_messages_test.go index 2c121a11..2c97c4d7 100644 --- a/internal/rpc/encrypted_messages_test.go +++ b/internal/rpc/encrypted_messages_test.go @@ -169,6 +169,52 @@ func TestSendEncryptedRPCFlow(t *testing.T) { } } +func TestSecretChatRejectsUnboundAccountDeviceMutations(t *testing.T) { + f := newEncryptedFixture(t) + chatID, participantAccessHash := f.acceptChat(t) + peer := tg.InputEncryptedChat{ChatID: chatID, AccessHash: participantAccessHash} + ctx := f.participantOtherCtx() + + if _, err := f.router.onMessagesSendEncrypted(ctx, &tg.MessagesSendEncryptedRequest{ + Peer: peer, RandomID: 8101, Data: []byte{1}, + }); err == nil { + t.Fatal("unbound sendEncrypted succeeded") + } else { + assertPhoneRPCErr(t, err, "CHAT_ID_INVALID") + } + if _, err := f.router.onMessagesReadEncryptedHistory(ctx, &tg.MessagesReadEncryptedHistoryRequest{ + Peer: peer, MaxDate: int(f.router.clock.Now().Unix()), + }); err == nil { + t.Fatal("unbound readEncryptedHistory succeeded") + } else { + assertPhoneRPCErr(t, err, "CHAT_ID_INVALID") + } + if _, err := f.router.onMessagesSetEncryptedTyping(ctx, &tg.MessagesSetEncryptedTypingRequest{ + Peer: peer, Typing: true, + }); err == nil { + t.Fatal("unbound setEncryptedTyping succeeded") + } else { + assertPhoneRPCErr(t, err, "CHAT_ID_INVALID") + } + if _, err := f.router.onMessagesUploadEncryptedFile(ctx, &tg.MessagesUploadEncryptedFileRequest{ + Peer: peer, File: &tg.InputEncryptedFileUploaded{ID: 991, Parts: 1, KeyFingerprint: 7}, + }); err == nil { + t.Fatal("unbound uploadEncryptedFile succeeded") + } else { + assertPhoneRPCErr(t, err, "CHAT_ID_INVALID") + } + if _, err := f.router.onMessagesDiscardEncryption(ctx, &tg.MessagesDiscardEncryptionRequest{ChatID: chatID}); err == nil { + t.Fatal("unbound discardEncryption succeeded") + } else { + assertPhoneRPCErr(t, err, "CHAT_ID_INVALID") + } + + chat, ok, err := f.store.GetSecretChat(f.ctx, chatID) + if err != nil || !ok || chat.State != domain.SecretChatStateNormal { + t.Fatalf("chat after rejected mutations = %+v ok=%v err=%v", chat, ok, err) + } +} + func encOtherUpdate[T tg.UpdateClass](t *testing.T, diff tg.UpdatesDifferenceClass) T { t.Helper() full, ok := diff.(*tg.UpdatesDifference) @@ -231,6 +277,131 @@ func TestEncryptionStateEventOfflineDelivery(t *testing.T) { } } +func TestAcceptConvergesLosingAndFutureParticipantDevices(t *testing.T) { + f := newEncryptedFixture(t) + chatID, _ := f.acceptChat(t) + + // 未绑定 participant 设备只能看到 history-deleting discarded，不能拿到 normal/access_hash。 + loserCtx := postresponse.WithCallbacks(f.participantOtherCtx()) + diff, err := f.router.onUpdatesGetDifference(loserCtx, &tg.UpdatesGetDifferenceRequest{}) + if err != nil { + t.Fatalf("loser difference: %v", err) + } + loserUpdate := encOtherUpdate[*tg.UpdateEncryption](t, diff) + loserDiscarded, ok := loserUpdate.Chat.(*tg.EncryptedChatDiscarded) + if !ok || loserDiscarded.ID != chatID || !loserDiscarded.HistoryDeleted { + t.Fatalf("loser update = %+v, want history-deleting discarded", loserUpdate.Chat) + } + postresponse.Run(loserCtx) + + // 获胜设备已经从 accept 同步响应获得 normal；账号级邀请事件仅确认、不回放。 + winnerCtx := postresponse.WithCallbacks(f.participantCtx()) + winnerDiff, err := f.router.onUpdatesGetDifference(winnerCtx, &tg.UpdatesGetDifferenceRequest{}) + if err != nil { + t.Fatalf("winner difference: %v", err) + } + if _, ok := winnerDiff.(*tg.UpdatesDifferenceEmpty); !ok { + t.Fatalf("winner difference = %T, want UpdatesDifferenceEmpty", winnerDiff) + } + postresponse.Run(winnerCtx) + + for name, deviceKey := range map[string]int64{ + "winner": businessAuthKeyInt64(encPartAuthKey), + "loser": businessAuthKeyInt64(encPartOtherAuthKey), + } { + pending, err := f.queue.ListUndeliveredStateEvents(f.ctx, f.participant.ID, deviceKey, 100) + if err != nil || len(pending) != 0 { + t.Fatalf("%s pending events = %+v err=%v, want none", name, pending, err) + } + } +} + +func TestEncryptedDifferenceUsesSliceForQtsPagination(t *testing.T) { + f := newEncryptedFixture(t) + deviceKey := businessAuthKeyInt64(encPartAuthKey) + for i := 1; i <= encryptedDifferencePageSize+1; i++ { + if _, _, err := f.queue.AppendEncryptedMessage(f.ctx, domain.SecretChatMessage{ + ReceiverAuthKeyID: deviceKey, + ReceiverUserID: f.participant.ID, + ChatID: 700, + RandomID: int64(70000 + i), + Date: 1700000000 + i, + Bytes: []byte{byte(i)}, + }); err != nil { + t.Fatalf("append encrypted message %d: %v", i, err) + } + } + + first, err := f.router.onUpdatesGetDifference(f.participantCtx(), &tg.UpdatesGetDifferenceRequest{}) + if err != nil { + t.Fatalf("first difference: %v", err) + } + slice, ok := first.(*tg.UpdatesDifferenceSlice) + if !ok { + t.Fatalf("first difference = %T, want UpdatesDifferenceSlice", first) + } + if len(slice.NewEncryptedMessages) != encryptedDifferencePageSize || slice.IntermediateState.Qts != encryptedDifferencePageSize { + t.Fatalf("first encrypted page len/qts = %d/%d, want %d/%d", + len(slice.NewEncryptedMessages), slice.IntermediateState.Qts, encryptedDifferencePageSize, encryptedDifferencePageSize) + } + + second, err := f.router.onUpdatesGetDifference(f.participantCtx(), &tg.UpdatesGetDifferenceRequest{Qts: slice.IntermediateState.Qts}) + if err != nil { + t.Fatalf("second difference: %v", err) + } + full, ok := second.(*tg.UpdatesDifference) + if !ok { + t.Fatalf("second difference = %T, want UpdatesDifference", second) + } + if len(full.NewEncryptedMessages) != 1 || full.State.Qts != encryptedDifferencePageSize+1 { + t.Fatalf("second encrypted page len/qts = %d/%d, want 1/%d", + len(full.NewEncryptedMessages), full.State.Qts, encryptedDifferencePageSize+1) + } +} + +func TestEncryptedDifferenceUsesSliceForStateEventPagination(t *testing.T) { + f := newEncryptedFixture(t) + deviceKey := businessAuthKeyInt64(encPartAuthKey) + for i := 1; i <= encryptedDifferencePageSize+1; i++ { + if _, err := f.queue.AppendStateEvent(f.ctx, domain.EncryptedStateEvent{ + TargetUserID: f.participant.ID, + TargetAuthKeyID: deviceKey, + ChatID: 701, + Type: domain.EncryptedStateEventRead, + MaxDate: 1700000000 + i, + Date: 1700001000 + i, + }); err != nil { + t.Fatalf("append state event %d: %v", i, err) + } + } + + firstCtx := postresponse.WithCallbacks(f.participantCtx()) + first, err := f.router.onUpdatesGetDifference(firstCtx, &tg.UpdatesGetDifferenceRequest{}) + if err != nil { + t.Fatalf("first difference: %v", err) + } + slice, ok := first.(*tg.UpdatesDifferenceSlice) + if !ok || len(slice.OtherUpdates) != encryptedDifferencePageSize { + t.Fatalf("first state page = %T updates=%d, want slice/%d", first, len(slice.OtherUpdates), encryptedDifferencePageSize) + } + postresponse.Run(firstCtx) + + secondCtx := postresponse.WithCallbacks(f.participantCtx()) + second, err := f.router.onUpdatesGetDifference(secondCtx, &tg.UpdatesGetDifferenceRequest{}) + if err != nil { + t.Fatalf("second difference: %v", err) + } + full, ok := second.(*tg.UpdatesDifference) + if !ok || len(full.OtherUpdates) != 1 { + t.Fatalf("second state page = %T updates=%d, want full/1", second, len(full.OtherUpdates)) + } + postresponse.Run(secondCtx) + + if pending, err := f.queue.ListUndeliveredStateEvents(f.ctx, f.participant.ID, deviceKey, 10); err != nil || len(pending) != 0 { + t.Fatalf("pending after two pages = %+v err=%v, want none", pending, err) + } +} + func TestEncryptedDifferenceAcknowledgesOnlyProjectedStateEvents(t *testing.T) { f := newEncryptedFixture(t) chatID, _ := f.acceptChat(t) diff --git a/internal/rpc/encrypted_read_typing.go b/internal/rpc/encrypted_read_typing.go index 6cf25dc0..b9aac927 100644 --- a/internal/rpc/encrypted_read_typing.go +++ b/internal/rpc/encrypted_read_typing.go @@ -14,14 +14,16 @@ import ( // P1：在线推送（已读 durable 离线补偿见后续 encrypted_state_events）。typing 是 transient。 // 设计见 docs/secret-chat-module.md §8。 -// resolveSecretChatPeer 校验调用方是密聊参与者且 access_hash 匹配，返回密聊、对端 user、 -// 对端绑定设备 auth_key。失败返回 CHAT_ID_INVALID。 +// resolveSecretChatPeer 校验调用方是 normal 密聊的绑定设备且 access_hash 匹配，返回密聊、 +// 对端 user、对端绑定设备 auth_key。失败返回 CHAT_ID_INVALID。 func (r *Router) resolveSecretChatPeer(ctx context.Context, userID int64, peer tg.InputEncryptedChat) (domain.SecretChat, int64, int64, error) { chat, ok, err := r.deps.SecretChats.GetSecretChat(ctx, peer.ChatID) if err != nil { return domain.SecretChat{}, 0, 0, internalErr() } - if !ok || !chat.HasParticipant(userID) || chat.AccessHashFor(userID) != peer.AccessHash { + deviceAuthKeyID, hasDevice := businessAuthKeyIDFrom(ctx) + if !ok || !hasDevice || chat.State != domain.SecretChatStateNormal || !chat.HasParticipant(userID) || + chat.AuthKeyOf(userID) != deviceAuthKeyID || chat.AccessHashFor(userID) != peer.AccessHash { return domain.SecretChat{}, 0, 0, chatIDInvalidErr() } return chat, chat.PeerOf(userID), chat.PeerAuthKeyOf(userID), nil @@ -49,11 +51,10 @@ func (r *Router) pushEncryptedPeerUpdate(ctx context.Context, peerUserID, peerAu } return } - if transient { - r.pushUserMessageTransient(ctx, peerUserID, logMessage, upd) - } else { - r.pushUserMessage(ctx, peerUserID, logMessage, upd) - } + r.log.Error("secret chat targeted session binder unavailable", + zap.String("update", logMessage), + zap.Int64("target_user_id", peerUserID), + zap.Int64("target_auth_key_id", peerAuthKeyID)) } func (r *Router) onMessagesReadEncryptedHistory(ctx context.Context, req *tg.MessagesReadEncryptedHistoryRequest) (bool, error) { diff --git a/internal/rpc/ephemeral.go b/internal/rpc/ephemeral.go index c5b25cf9..c85e8a38 100644 --- a/internal/rpc/ephemeral.go +++ b/internal/rpc/ephemeral.go @@ -27,10 +27,28 @@ func (r *Router) registerEphemeral(d *tlprofile.Dispatcher) { registerRPC[*tg.EphemeralGetCallbackAnswerRequest](d, tlprofile.SemanticMethodEphemeralGetCallbackAnswer, func(ctx context.Context, request *tg.EphemeralGetCallbackAnswerRequest) (any, error) { return r.onEphemeralGetCallbackAnswer(ctx, request) }) + registerRPC[*tg.EphemeralEditMessageRequest](d, tlprofile.SemanticMethodEphemeralEditMessage, func(ctx context.Context, request *tg.EphemeralEditMessageRequest) (any, error) { + return r.onEphemeralEditWelcomeMessage(ctx, request) + }) + registerRPC[*tg.EphemeralDeleteWelcomeMessageRequest](d, tlprofile.SemanticMethodEphemeralDeleteWelcomeMessage, func(ctx context.Context, request *tg.EphemeralDeleteWelcomeMessageRequest) (any, error) { + return r.onEphemeralDeleteWelcomeMessage(ctx, request) + }) + registerRPC[*tg.EphemeralDeleteAllWelcomeMessagesRequest](d, tlprofile.SemanticMethodEphemeralDeleteAllWelcomeMessages, func(ctx context.Context, request *tg.EphemeralDeleteAllWelcomeMessagesRequest) (any, error) { + return r.onEphemeralDeleteAllWelcomeMessages(ctx, request) + }) + registerRPC[*tg.EphemeralGetWelcomeMessagesRequest](d, tlprofile.SemanticMethodEphemeralGetWelcomeMessages, func(ctx context.Context, request *tg.EphemeralGetWelcomeMessagesRequest) (any, error) { + return r.onEphemeralGetWelcomeMessages(ctx, request) + }) } func (r *Router) onEphemeralSendMessage(ctx context.Context, request *tg.EphemeralSendMessageRequest) (tg.UpdatesClass, error) { - if request == nil || r.deps.Ephemeral == nil { + if request == nil { + return nil, inputRequestInvalidErr() + } + if request.Welcome { + return r.onEphemeralSendWelcomeMessage(ctx, request) + } + if r.deps.Ephemeral == nil { return nil, inputRequestInvalidErr() } userID, _, err := r.currentUserID(ctx) diff --git a/internal/rpc/ephemeral_push.go b/internal/rpc/ephemeral_push.go index 62216ad7..3cdda523 100644 --- a/internal/rpc/ephemeral_push.go +++ b/internal/rpc/ephemeral_push.go @@ -6,6 +6,7 @@ import ( "github.com/iamxvbaba/td/proto" "github.com/iamxvbaba/td/tg" + "github.com/iamxvbaba/td/tlprofile" "go.uber.org/zap" "telesrv/internal/store" @@ -61,11 +62,12 @@ func (r *Router) deliverEphemeralPushLocal(ctx context.Context, event store.Ephe if online, ok := r.deps.Sessions.(OnlineUserProvider); ok && !online.IsUserOnline(event.TargetUserID) { return } - binder, ok := r.deps.Sessions.(ExactLayerTransientSessionBinder) + binder, ok := r.deps.Sessions.(SemanticTransientSessionBinder) if !ok { return } var updates tg.UpdatesClass + var semantic tlprofile.SemanticID switch event.Kind { case store.EphemeralPushNew, store.EphemeralPushEdit: if event.TargetUserID != event.Message.ReceiverUserID || event.Message.Deleted { @@ -76,11 +78,16 @@ func (r *Router) deliverEphemeralPushLocal(ctx context.Context, event store.Ephe return } updates = built + semantic = tlprofile.SemanticTypeUpdateNewEphemeralMessage + if event.Kind == store.EphemeralPushEdit { + semantic = tlprofile.SemanticTypeUpdateEditEphemeralMessage + } case store.EphemeralPushDelete: if !event.Message.Deleted || (event.TargetUserID != event.Message.SenderUserID && event.TargetUserID != event.Message.ReceiverUserID) { return } updates = ephemeralDeleteUpdates(event.Message, event.Date) + semantic = tlprofile.SemanticTypeUpdateDeleteEphemeralMessages case store.EphemeralPushCallback: callback := event.Callback if callback == nil || callback.BotUserID != event.TargetUserID || callback.MessageID != event.Message.ID || callback.Peer != event.Message.Peer { @@ -92,16 +99,13 @@ func (r *Router) deliverEphemeralPushLocal(ctx context.Context, event store.Ephe } update.SetData(callback.Data) updates = &tg.Updates{Updates: []tg.UpdateClass{update}, Date: event.Date} + semantic = tlprofile.SemanticTypeUpdateBotCallbackQuery default: return } - minLayer := 228 - if event.Kind == store.EphemeralPushCallback { - minLayer = 225 - } if event.TargetBusinessAuthKey != ([8]byte{}) { - _, _ = binder.PushToUserAuthKeyTransientAtLeastLayer(ctx, event.TargetUserID, event.TargetBusinessAuthKey, minLayer, proto.MessageFromServer, updates, r.cfg.OutboundPushTimeout) + _, _ = binder.PushToUserAuthKeyTransientCompatible(ctx, event.TargetUserID, event.TargetBusinessAuthKey, semantic, proto.MessageFromServer, updates, r.cfg.OutboundPushTimeout) return } - _, _ = binder.PushToUserTransientAtLeastLayer(ctx, event.TargetUserID, minLayer, proto.MessageFromServer, updates, r.cfg.OutboundPushTimeout) + _, _ = binder.PushToUserTransientCompatible(ctx, event.TargetUserID, semantic, proto.MessageFromServer, updates, r.cfg.OutboundPushTimeout) } diff --git a/internal/rpc/ephemeral_push_test.go b/internal/rpc/ephemeral_push_test.go index 7ffd17e6..458c8dea 100644 --- a/internal/rpc/ephemeral_push_test.go +++ b/internal/rpc/ephemeral_push_test.go @@ -9,6 +9,7 @@ import ( "github.com/iamxvbaba/td/clock" "github.com/iamxvbaba/td/proto" "github.com/iamxvbaba/td/tg" + "github.com/iamxvbaba/td/tlprofile" "go.uber.org/zap/zaptest" "telesrv/internal/domain" @@ -38,23 +39,23 @@ type ephemeralPushSessions struct { type ephemeralPushCapture struct { userID int64 authKey [8]byte - minLayer int + semantic tlprofile.SemanticID message tg.UpdatesClass } func (s *ephemeralPushSessions) IsUserOnline(int64) bool { return s.online } -func (s *ephemeralPushSessions) PushToUserTransientAtLeastLayer(_ context.Context, userID int64, minLayer int, _ proto.MessageType, message tg.UpdatesClass, _ time.Duration) (int, error) { +func (s *ephemeralPushSessions) PushToUserTransientCompatible(_ context.Context, userID int64, semantic tlprofile.SemanticID, _ proto.MessageType, message tg.UpdatesClass, _ time.Duration) (int, error) { s.mu.Lock() defer s.mu.Unlock() - s.broadcasts = append(s.broadcasts, ephemeralPushCapture{userID: userID, minLayer: minLayer, message: message}) + s.broadcasts = append(s.broadcasts, ephemeralPushCapture{userID: userID, semantic: semantic, message: message}) return 1, nil } -func (s *ephemeralPushSessions) PushToUserAuthKeyTransientAtLeastLayer(_ context.Context, userID int64, authKey [8]byte, minLayer int, _ proto.MessageType, message tg.UpdatesClass, _ time.Duration) (int, error) { +func (s *ephemeralPushSessions) PushToUserAuthKeyTransientCompatible(_ context.Context, userID int64, authKey [8]byte, semantic tlprofile.SemanticID, _ proto.MessageType, message tg.UpdatesClass, _ time.Duration) (int, error) { s.mu.Lock() defer s.mu.Unlock() - s.targeted = append(s.targeted, ephemeralPushCapture{userID: userID, authKey: authKey, minLayer: minLayer, message: message}) + s.targeted = append(s.targeted, ephemeralPushCapture{userID: userID, authKey: authKey, semantic: semantic, message: message}) return 1, nil } @@ -135,8 +136,8 @@ func TestEphemeralPushMultiInstanceSourceDedupAndLayerRouting(t *testing.T) { if broadcast, targeted := sessions2.counts(); broadcast != 1 || targeted != 0 { t.Fatalf("remote delivery broadcast=%d targeted=%d", broadcast, targeted) } - if sessions1.broadcasts[0].minLayer != 228 || sessions2.broadcasts[0].minLayer != 228 { - t.Fatalf("min layers source=%d remote=%d", sessions1.broadcasts[0].minLayer, sessions2.broadcasts[0].minLayer) + if sessions1.broadcasts[0].semantic != tlprofile.SemanticTypeUpdateNewEphemeralMessage || sessions2.broadcasts[0].semantic != tlprofile.SemanticTypeUpdateNewEphemeralMessage { + t.Fatalf("semantics source=%#x remote=%#x", sessions1.broadcasts[0].semantic, sessions2.broadcasts[0].semantic) } if len(broker.published) != 1 || broker.published[0].SourceID != "one" { t.Fatalf("published=%+v", broker.published) @@ -151,7 +152,7 @@ func TestEphemeralPushMultiInstanceSourceDedupAndLayerRouting(t *testing.T) { TargetBusinessAuthKey: key, Message: message, Date: int(time.Now().Unix()), }) _, targeted := sessions2.counts() - if targeted != 1 || sessions2.targeted[0].authKey != key || sessions2.targeted[0].minLayer != 228 { + if targeted != 1 || sessions2.targeted[0].authKey != key || sessions2.targeted[0].semantic != tlprofile.SemanticTypeUpdateDeleteEphemeralMessages { t.Fatalf("targeted=%+v", sessions2.targeted) } deletedUpdates, ok := sessions2.targeted[0].message.(*tg.Updates) diff --git a/internal/rpc/errors.go b/internal/rpc/errors.go index 564bb558..ed051b3d 100644 --- a/internal/rpc/errors.go +++ b/internal/rpc/errors.go @@ -309,6 +309,7 @@ func requestMsgExpiredErr() error { return tgerr.New(400, "REQUEST_MSG_EXPIRED") func inputRequestInvalidErr() error { return tgerr.New(400, "INPUT_REQUEST_INVALID") } func inputRequestTooLongErr() error { return tgerr.New(400, "INPUT_REQUEST_TOO_LONG") } +func dataTooLongErr() error { return tgerr.New(400, "DATA_TOO_LONG") } func inputTextEmptyErr() error { return tgerr.New(400, "INPUT_TEXT_EMPTY") } func inputTextTooLongErr() error { return tgerr.New(400, "INPUT_TEXT_TOO_LONG") } @@ -329,10 +330,16 @@ func topicsEmptyErr() error { return tgerr.New(400, "TOPICS_EMPTY") } // randomIDEmptyErr 表示发送消息缺少 random_id。 func randomIDEmptyErr() error { return tgerr.New(400, "RANDOM_ID_EMPTY") } +func randomIDExpiredErr() error { return tgerr.New(400, "RANDOM_ID_EXPIRED") } + // randomIDDuplicateErr 表示同一发送者重复使用 random_id，但请求载荷与首次 // 成功发送不一致。Layer 227 为该错误定义的 code 是 500。 func randomIDDuplicateErr() error { return tgerr.New(500, "RANDOM_ID_DUPLICATE") } +// secretChatRandomIDDuplicateErr 使用 Telegram messages.requestEncryption 的官方 +// BAD_REQUEST 语义；普通消息历史上使用的 500 映射保持独立，避免扩大改动范围。 +func secretChatRandomIDDuplicateErr() error { return tgerr.New(400, "RANDOM_ID_DUPLICATE") } + // scheduleDateInvalidErr 表示当前阶段不支持定时消息。 func scheduleDateInvalidErr() error { return tgerr.New(400, "SCHEDULE_DATE_INVALID") } diff --git a/internal/rpc/fragment.go b/internal/rpc/fragment.go index 4352ee7a..e830827b 100644 --- a/internal/rpc/fragment.go +++ b/internal/rpc/fragment.go @@ -232,6 +232,7 @@ func (r *Router) deactivateAllRegistryUsernames(ctx context.Context, peer domain // invalidateRegistryProjection drops the cached user/channel projections that // embed the username vector, so the next getFullUser / getFullChannel rebuilds it. func (r *Router) invalidateRegistryProjection(peer domain.Peer) { + r.InvalidatePeerIdentityReadModel(peer) switch peer.Type { case domain.PeerTypeUser: r.invalidateRPCProjectionForUser(peer.ID) @@ -317,7 +318,7 @@ func appendUsernameProjectionPeers(peers []domain.Peer, seen map[domain.Peer]str peers = append(peers, peer) } for _, item := range users { - if u, ok := item.(*tg.User); ok && u != nil { + if u, ok := item.(*tg.User); ok && u != nil && !u.Deleted { addPeer(domain.Peer{Type: domain.PeerTypeUser, ID: u.ID}) } } @@ -338,7 +339,7 @@ func applyUsernamesFromRegistry(users []tg.UserClass, chats []tg.ChatClass, byPe } for _, item := range users { u, ok := item.(*tg.User) - if !ok || u == nil { + if !ok || u == nil || u.Deleted { continue } list, ok := byPeer[domain.Peer{Type: domain.PeerTypeUser, ID: u.ID}] @@ -383,16 +384,24 @@ func (r *Router) usernameRegistryMap(ctx context.Context, peers []domain.Peer) m if r.deps.Usernames == nil || len(peers) == 0 { return nil } + usernames, _ := r.peerIdentityMaps(ctx, peers, true, false) + return usernames +} + +func (r *Router) loadUsernameRegistryMap(ctx context.Context, peers []domain.Peer) (map[domain.Peer][]domain.Username, error) { if len(peers) == 1 { list, err := r.deps.Usernames.PeerUsernames(ctx, peers[0]) - if err != nil || len(list) == 0 { - return nil + if err != nil { + return nil, err } - return map[domain.Peer][]domain.Username{peers[0]: list} + if len(list) == 0 { + return map[domain.Peer][]domain.Username{}, nil + } + return map[domain.Peer][]domain.Username{peers[0]: list}, nil } byPeer, err := r.deps.Usernames.UsernamesBatch(ctx, peers) if err != nil { - return nil + return nil, err } - return byPeer + return byPeer, nil } diff --git a/internal/rpc/help.go b/internal/rpc/help.go index 22baf36a..c3b48dc1 100644 --- a/internal/rpc/help.go +++ b/internal/rpc/help.go @@ -9,7 +9,6 @@ import ( "github.com/iamxvbaba/td/tlprofile" "telesrv/internal/branding" androidcompat "telesrv/internal/compat/android" - ioscompat "telesrv/internal/compat/ios" "telesrv/internal/compat/tdesktop" ) @@ -32,14 +31,7 @@ func (r *Router) registerHelp(d *tlprofile.Dispatcher) { return r.onHelpSaveAppLog(ctx) }) registerRPC[*tg.HelpGetAppUpdateRequest](d, tlprofile.SemanticMethodHelpGetAppUpdate, func(ctx context.Context, layerRequest *tg.HelpGetAppUpdateRequest) (any, error) { - source := layerRequest. - Source - _ = source - - if _, _, err := r.currentUserID(ctx); err != nil { - return nil, internalErr() - } - return ioscompat.NoAppUpdate(), nil + return r.onHelpGetAppUpdate(ctx, layerRequest.Source) }) registerRPC[*tg.HelpGetAppConfigRequest](d, tlprofile.SemanticMethodHelpGetAppConfig, func(ctx context.Context, layerRequest *tg.HelpGetAppConfigRequest) (any, error) { hash := layerRequest. @@ -137,7 +129,7 @@ func (r *Router) onHelpSaveAppLog(ctx context.Context) (bool, error) { } func (r *Router) onHelpGetConfig(ctx context.Context) (*tg.Config, error) { - config := tdesktop.BuildConfig(r.cfg.DC, r.cfg.IP, r.cfg.Port, r.clock.Now(), r.cfg.PublicBaseURL) + config := tdesktop.BuildConfig(r.cfg.DC, r.cfg.IP, r.cfg.Port, r.clock.Now(), r.cfg.PublicBaseURL, r.cfg.UpdatePublicURL) userID, authorized, err := r.currentUserID(ctx) if err != nil { return nil, internalErr() diff --git a/internal/rpc/help_app_update.go b/internal/rpc/help_app_update.go new file mode 100644 index 00000000..ae5b73b0 --- /dev/null +++ b/internal/rpc/help_app_update.go @@ -0,0 +1,99 @@ +package rpc + +import ( + "context" + "strings" + + "go.uber.org/zap" + + "github.com/iamxvbaba/td/tg" + + ioscompat "telesrv/internal/compat/ios" + "telesrv/internal/updatecdn" +) + +func (r *Router) onHelpGetAppUpdate(ctx context.Context, source string) (tg.HelpAppUpdateClass, error) { + if _, _, err := r.currentUserID(ctx); err != nil { + return nil, internalErr() + } + if r.deps.AppUpdates == nil { + return ioscompat.NoAppUpdate(), nil + } + info, ok := ClientInfoFrom(ctx) + if !ok { + return ioscompat.NoAppUpdate(), nil + } + platform := updatePlatform(info.ClientType()) + if platform == "" { + return ioscompat.NoAppUpdate(), nil + } + langCode := strings.TrimSpace(info.LangCode) + if langCode == "" { + langCode = strings.TrimSpace(info.SystemLangCode) + } + resolved, err := r.deps.AppUpdates.Resolve(ctx, updatecdn.ResolveRequest{ + Platform: platform, + Channel: updateChannel(info), + Version: info.AppVersion, + Source: boundedUpdateSource(source), + LangCode: langCode, + }) + if err != nil { + // Update discovery is advisory. Returning a bounded no-update response + // avoids turning a temporary CDN outage into a client-visible RPC 500. + r.log.Warn("application update resolve failed", + zap.String("platform", platform), + zap.String("app_version", info.AppVersion), + zap.Error(err)) + return ioscompat.NoAppUpdate(), nil + } + if resolved == nil { + return ioscompat.NoAppUpdate(), nil + } + result := &tg.HelpAppUpdate{ + ID: resolved.ID, + Version: resolved.Version, + Text: resolved.Text, + Entities: []tg.MessageEntityClass{}, + } + result.SetCanNotSkip(resolved.CanNotSkip) + if resolved.URL != "" { + result.SetURL(resolved.URL) + } + return result, nil +} + +func updateChannel(info ClientInfo) string { + version := strings.ToLower(info.AppVersion) + switch { + case strings.Contains(version, "alpha"): + return "alpha" + case strings.Contains(version, "beta"): + return "beta" + default: + return "stable" + } +} + +func boundedUpdateSource(source string) string { + source = strings.TrimSpace(source) + if len(source) > 256 { + return source[:256] + } + return source +} + +func updatePlatform(clientType ClientType) string { + switch clientType { + case ClientTypeAndroid: + return "android" + case ClientTypeIOS: + return "ios" + case ClientTypeMacOS: + return "macos" + case ClientTypeTDesktop: + return "tdesktop" + default: + return "" + } +} diff --git a/internal/rpc/help_app_update_test.go b/internal/rpc/help_app_update_test.go new file mode 100644 index 00000000..e4183659 --- /dev/null +++ b/internal/rpc/help_app_update_test.go @@ -0,0 +1,66 @@ +package rpc + +import ( + "context" + "errors" + "testing" + + "go.uber.org/zap" + + "github.com/iamxvbaba/td/clock" + "github.com/iamxvbaba/td/tg" + + "telesrv/internal/updatecdn" +) + +type fakeAppUpdateResolver struct { + request updatecdn.ResolveRequest + result *updatecdn.ResolvedUpdate + err error +} + +func (f *fakeAppUpdateResolver) Resolve(_ context.Context, req updatecdn.ResolveRequest) (*updatecdn.ResolvedUpdate, error) { + f.request = req + return f.result, f.err +} + +func TestHelpGetAppUpdateUsesClientPlatformVersionSourceAndLanguage(t *testing.T) { + resolver := &fakeAppUpdateResolver{result: &updatecdn.ResolvedUpdate{ + ID: 91, Version: "12.9.1", Text: "Новая версия", URL: "https://updates.example/app.apk", CanNotSkip: true, + }} + router := New(Config{PublicBaseURL: "https://telesrv.example"}, Deps{AppUpdates: resolver}, zap.NewNop(), clock.System) + ctx := WithClientInfo(WithUserID(context.Background(), 1000000001), ClientInfo{ + Type: ClientTypeAndroid, AppVersion: "12.9.0 (500)", LangCode: "ru", SystemLangCode: "en", + }) + result, err := router.onHelpGetAppUpdate(ctx, "com.example.store") + if err != nil { + t.Fatal(err) + } + update, ok := result.(*tg.HelpAppUpdate) + if !ok { + t.Fatalf("result = %T, want *tg.HelpAppUpdate", result) + } + if update.ID != 91 || update.Version != "12.9.1" || update.Text != "Новая версия" || !update.GetCanNotSkip() { + t.Fatalf("update = %#v", update) + } + if got, ok := update.GetURL(); !ok || got != "https://updates.example/app.apk" { + t.Fatalf("url = %q, %v", got, ok) + } + if resolver.request.Platform != "android" || resolver.request.Version != "12.9.0 (500)" || + resolver.request.Source != "com.example.store" || resolver.request.LangCode != "ru" { + t.Fatalf("resolve request = %#v", resolver.request) + } +} + +func TestHelpGetAppUpdateFailsClosedWithoutRPCError(t *testing.T) { + resolver := &fakeAppUpdateResolver{err: errors.New("service unavailable")} + router := New(Config{PublicBaseURL: "https://telesrv.example"}, Deps{AppUpdates: resolver}, zap.NewNop(), clock.System) + ctx := WithClientInfo(WithUserID(context.Background(), 1000000001), ClientInfo{Type: ClientTypeIOS, AppVersion: "12.9.0"}) + result, err := router.onHelpGetAppUpdate(ctx, "") + if err != nil { + t.Fatal(err) + } + if _, ok := result.(*tg.HelpNoAppUpdate); !ok { + t.Fatalf("result = %T, want *tg.HelpNoAppUpdate", result) + } +} diff --git a/internal/rpc/layer_dispatch.go b/internal/rpc/layer_dispatch.go index 1180be82..1088b94e 100644 --- a/internal/rpc/layer_dispatch.go +++ b/internal/rpc/layer_dispatch.go @@ -173,6 +173,7 @@ func (r *Router) PrepareAdmittedReplay( restoreErr = fmt.Errorf("prepare delivered exact RPC replay metadata: %w", prepareErr) return } + defer updatesDelivery.releaseSessionActivation() replayCtx = r.applyLayerRPCWrapperEffects(replayCtx, profile, profileKnown, identity, effects, msgID, admissionSeq, layerRPCWrapperApplyReplayRestore) if profileKnown && layerRPCProfileEvidenceFresh(replayCtx) { r.maybeMarkSessionReceivesUpdates(replayCtx) @@ -184,7 +185,9 @@ func (r *Router) PrepareAdmittedReplay( // base for ordinary post-response work. Replay restoration is a // stricter ordered barrier, so every phase shares the overall deadline. updatesDelivery.baseCtx = replayCtx - r.runUpdatesDeliveryPlan(updatesDelivery.snapshot()) + snapshot := updatesDelivery.snapshot() + updatesDelivery.disownSessionActivation() + r.runUpdatesDeliveryPlan(snapshot) } if err := replayCtx.Err(); err != nil { restoreErr = fmt.Errorf("restore delivered exact RPC replay metadata: %w", err) @@ -236,6 +239,7 @@ func (r *Router) DispatchAdmitted( if err != nil { return nil, method, err } + defer updatesDelivery.releaseSessionActivation() ctx, err = r.applyLayerRPCWrappers(ctx, msgID, admissionSeq, request) if err != nil { return nil, method, err @@ -274,7 +278,7 @@ func (r *Router) DispatchAdmitted( } dbBefore := dbtrace.SnapshotFromContext(ctx) start := time.Now() - result, err := r.dispatcher.Dispatch(ctx, request) + result, err := r.dispatchGeneratedSafely(ctx, method, request) dur := time.Since(start) dbDelta := dbtrace.SnapshotFromContext(ctx).Sub(dbBefore) fields := append([]zap.Field{ @@ -284,10 +288,8 @@ func (r *Router) DispatchAdmitted( zap.Duration("dur", dur), }, r.contextLogFields(ctx)...) fields = dbtrace.AppendZapFields(fields, "handler_", dbDelta) - if err != nil || dur > 100*time.Millisecond { - if err != nil { - fields = append(fields, zap.Error(err)) - } + if err != nil { + fields = append(fields, zap.Error(err)) r.log.Info("RPC inner handled", fields...) } else { r.log.Debug("RPC inner handled", fields...) diff --git a/internal/rpc/layer_inheritance.go b/internal/rpc/layer_inheritance.go index 7d78e743..a6f7d4de 100644 --- a/internal/rpc/layer_inheritance.go +++ b/internal/rpc/layer_inheritance.go @@ -111,7 +111,7 @@ func (r *Router) PublishAdmittedLayerProfileEvidence( effectiveAuthKeyID := rawAuthKeyID if r.deps.Auth != nil { resolveCtx, cancel := context.WithTimeout(ctx, authLayerPublicationTimeout) - resolved, found, err := r.deps.Auth.ResolveAuthKey(resolveCtx, rawAuthKeyID) + resolved, found, err := r.resolveAuthKeyCached(resolveCtx, rawAuthKeyID) cancel() switch { case err != nil: @@ -386,7 +386,7 @@ func (r *Router) ResolveInheritedAuthKeyLayer(ctx context.Context, rawAuthKeyID } effectiveAuthKeyID := rawAuthKeyID if r.deps.Auth != nil { - resolved, found, err := r.deps.Auth.ResolveAuthKey(ctx, rawAuthKeyID) + resolved, found, err := r.resolveAuthKeyCached(ctx, rawAuthKeyID) if err != nil { return 0, false, wrapLayerEvidenceStoreAvailability(err) } diff --git a/internal/rpc/layer_inheritance_test.go b/internal/rpc/layer_inheritance_test.go index f39403e0..3ad27acb 100644 --- a/internal/rpc/layer_inheritance_test.go +++ b/internal/rpc/layer_inheritance_test.go @@ -46,7 +46,7 @@ func TestResolveInheritedAuthKeyLayerUsesAuthKeyAuthorityOnly(t *testing.T) { }{ {name: "auth key primary", keyLayer: 225, authorization: 227, want: 225, found: true}, {name: "authorization mirror is not protocol evidence", keyLayer: 0, authorization: 225}, - {name: "unsupported primary is authoritative unknown", keyLayer: 229, authorization: 227, found: true}, + {name: "unsupported primary is authoritative unknown", keyLayer: 230, authorization: 227, found: true}, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { @@ -104,6 +104,34 @@ func TestResolveInheritedAuthKeyLayerNormalizesBoundTempToPermanent(t *testing.T } } +func TestPositiveBindingResolutionIsSharedByLayerAndDispatchPaths(t *testing.T) { + rawAuthKeyID := [8]byte{0x31, 1} + permAuthKeyID := [8]byte{0x32, 1} + const sessionID = int64(311) + auth := &captureAuthService{ + resolvedAuthKeyID: permAuthKeyID, + hasResolved: true, + authKeyClientInfos: map[[8]byte]domain.AuthKeyClientInfo{ + permAuthKeyID: {Layer: 227}, + }, + } + sessions := &captureSessions{} + r := New(Config{DC: 2, TempKeyResolveCacheTTL: time.Minute}, Deps{ + Auth: auth, Sessions: sessions, + }, zaptest.NewLogger(t), clock.System) + + if layer, found, err := r.ResolveInheritedAuthKeyLayer(context.Background(), rawAuthKeyID); err != nil || !found || layer != 227 { + t.Fatalf("inherited layer = (%d,%v,%v), want (227,true,nil)", layer, found, err) + } + if got, err := r.effectiveAuthKeyID(context.Background(), rawAuthKeyID, sessionID); err != nil || got != permAuthKeyID { + t.Fatalf("effective auth key = (%x,%v), want (%x,nil)", got, err, permAuthKeyID) + } + freezeAndPublishLayer(t, r, rawAuthKeyID, sessionID, 10, 1, 227) + if auth.resolveCount != 1 { + t.Fatalf("ResolveAuthKey calls across inherited/dispatch/publication = %d, want 1", auth.resolveCount) + } +} + func TestResolveInheritedAuthKeyLayerMarksOnlyAvailabilityFailures(t *testing.T) { boom := errors.New("postgres temporarily unavailable") for _, tt := range []struct { @@ -254,8 +282,8 @@ func TestBindTempAuthKeyLayerPrecedenceAndRawShadow(t *testing.T) { auth := &captureAuthService{authKeyClientInfos: map[[8]byte]domain.AuthKeyClientInfo{ permAuthKeyID: {Layer: 225}, }} - // Model the store-owned bind transaction. The router must only reload - // this merged permanent primary; it must not derive or persist a winner + // Model the store-owned bind transaction. Bind returns the exact committed + // tuple; the router must not re-read a later permanent row or derive a winner // from its process-local exact-session registry after Bind returns. auth.bindTempHook = func(domain.TempAuthKeyBinding) error { auth.authKeyClientInfos[rawAuthKeyID] = domain.AuthKeyClientInfo{Layer: tt.want, LayerObservationID: 42} @@ -273,6 +301,10 @@ func TestBindTempAuthKeyLayerPrecedenceAndRawShadow(t *testing.T) { if err != nil || !ok { t.Fatalf("bind = (%v,%v), want (true,nil)", ok, err) } + if auth.authKeyInfoLookups != 0 || auth.authorizationLookups != 0 { + t.Fatalf("bind re-read durable Layer state: key=%d authorization=%d", + auth.authKeyInfoLookups, auth.authorizationLookups) + } if got := auth.authKeyClientInfos[rawAuthKeyID].Layer; got != tt.want { t.Fatalf("raw shadow = %d, want %d", got, tt.want) } @@ -324,7 +356,7 @@ func TestResolveInheritedBoundTempUnsupportedPermanentBlocksRawShadow(t *testing hasResolved: true, authKeyClientInfos: map[[8]byte]domain.AuthKeyClientInfo{ rawAuthKeyID: {Layer: 225}, - permAuthKeyID: {Layer: 229}, + permAuthKeyID: {Layer: 230}, }, } r := New(Config{DC: 2}, Deps{Auth: auth}, zaptest.NewLogger(t), clock.System) @@ -347,11 +379,11 @@ func TestBindTempAuthKeyFuturePermanentClearsInheritedUntilFreshExplicit(t *test hasResolved: true, authKeyClientInfos: map[[8]byte]domain.AuthKeyClientInfo{ rawAuthKeyID: {Layer: 225}, - permAuthKeyID: {Layer: 229, LayerObservationID: 44}, + permAuthKeyID: {Layer: 230, LayerObservationID: 44}, }, } auth.bindTempHook = func(domain.TempAuthKeyBinding) error { - auth.authKeyClientInfos[rawAuthKeyID] = domain.AuthKeyClientInfo{Layer: 229, LayerObservationID: 44} + auth.authKeyClientInfos[rawAuthKeyID] = domain.AuthKeyClientInfo{Layer: 230, LayerObservationID: 44} return nil } sessions := &inheritedLayerCaptureSessions{} @@ -389,7 +421,7 @@ func TestBindTempAuthKeyFuturePermanentClearsInheritedUntilFreshExplicit(t *test func TestSupportedExplicitEvidenceClearsUnsupportedCacheState(t *testing.T) { authKeyID := [8]byte{0x63, 1} auth := &captureAuthService{authKeyClientInfos: map[[8]byte]domain.AuthKeyClientInfo{ - authKeyID: {Layer: 229}, + authKeyID: {Layer: 230}, }} r := New(Config{DC: 2}, Deps{Auth: auth}, zaptest.NewLogger(t), clock.System) if layer, found, err := r.ResolveInheritedAuthKeyLayer(context.Background(), authKeyID); err != nil || !found || layer != 0 { diff --git a/internal/rpc/media_count.go b/internal/rpc/media_count.go index bd0cb01a..84df3016 100644 --- a/internal/rpc/media_count.go +++ b/internal/rpc/media_count.go @@ -100,3 +100,44 @@ func mediaSearchCanReusePeerWideCount(req *tg.MessagesSearchRequest) bool { } return searchFilterNeedsMediaStore(req.Filter) } + +func (r *Router) mediaSearchRequestFromMessagesSearch( + ctx context.Context, + userID int64, + req *tg.MessagesSearchRequest, + filter domain.MessageFilter, +) (domain.MediaSearchRequest, error) { + out := domain.MediaSearchRequest{ + Categories: mediaCategoriesForFilter(req.Filter), + Query: req.Q, + MinDate: req.MinDate, + MaxDate: req.MaxDate, + SavedPeer: filter.SavedPeer, + SavedReactions: append([]domain.MessageReaction(nil), filter.SavedReactions...), + OffsetID: req.OffsetID, + AddOffset: domain.ClampMessageHistoryAddOffset(req.AddOffset), + Limit: req.Limit, + MaxID: req.MaxID, + MinID: req.MinID, + } + if fromInput, present := req.GetFromID(); present { + if fromInput == nil { + return domain.MediaSearchRequest{}, peerIDInvalidErr() + } + from, err := r.checkedDomainPeerFromInputPeer(ctx, userID, fromInput) + if err != nil { + return domain.MediaSearchRequest{}, err + } + if from.Type != domain.PeerTypeUser || from.ID == 0 { + return domain.MediaSearchRequest{}, peerIDInvalidErr() + } + out.SenderUserID = from.ID + } + if topMsgID, present := req.GetTopMsgID(); present { + if topMsgID <= 0 || topMsgID > domain.MaxMessageBoxID { + return domain.MediaSearchRequest{}, msgIDInvalidErr() + } + out.TopMsgID = topMsgID + } + return out, nil +} diff --git a/internal/rpc/message_entities_autodetect.go b/internal/rpc/message_entities_autodetect.go index 326627ed..1f89da08 100644 --- a/internal/rpc/message_entities_autodetect.go +++ b/internal/rpc/message_entities_autodetect.go @@ -2,11 +2,10 @@ package rpc import ( "strings" - "unicode" - "unicode/utf8" "github.com/iamxvbaba/td/tg" + "telesrv/internal/domain" "telesrv/internal/links" ) @@ -30,9 +29,10 @@ import ( // app-link。客户端实体保持在前(超过上限裁剪时优先保留),结果裁剪到实体上限。 func augmentAutoEntities(message string, entities []tg.MessageEntityClass, appLinks links.AppLinkBuilder) []tg.MessageEntityClass { // 快路径:绝大多数消息不含任何可自动识别的触发字符。单次 ContainsAny 扫描即短路返回, - // 跳过下面各检测器对全文的扫描与区间分配(纯文本发送零额外开销)。所有 http(s) 链接 - // 都含 '/',故 "@#$/" 一并覆盖 url 检测;email/phone 未实现故不在触发集内。 - if message == "" || !strings.ContainsAny(message, "@#$/") { + // 跳过下面各检测器对全文的扫描与区间分配(纯文本发送零额外开销)。裸域名 URL 只需 + // 一个 '.' 即可触发（如 github.com），进入检测后仍会做 TLD/边界校验；email/phone + // 未实现故不在触发集内。 + if message == "" || !strings.ContainsAny(message, "@#$/.") { return entities } type interval struct{ start, end int } @@ -89,17 +89,13 @@ func augmentAutoEntities(message string, entities []tg.MessageEntityClass, appLi } } - // 其余自动实体落在任何已占区间(客户端实体或 URL 跨度)内则丢弃;客户端实体优先保留(上限内)。 - for _, c := range detectMentionEntities(message) { - accept(c) + // 其余自动实体由协议中立 detector 产生，RPC 边界只负责把 domain entity 投影为 TL。 + // 这样服务端生成的系统消息可复用同一 UTF-16/URL 排除规则，而 tg 类型仍不越过 RPC。 + spans := make([]domain.MessageEntitySpan, 0, len(occupied)) + for _, interval := range occupied { + spans = append(spans, domain.MessageEntitySpan{Offset: interval.start, Length: interval.end - interval.start}) } - for _, c := range detectHashtagEntities(message) { - accept(c) - } - for _, c := range detectCashtagEntities(message) { - accept(c) - } - for _, c := range detectBotCommandEntities(message) { + for _, c := range tgMessageEntities(domain.DetectAutomaticMessageEntities(message, spans)) { accept(c) } @@ -114,163 +110,3 @@ func augmentAutoEntities(message string, entities []tg.MessageEntityClass, appLi func (r *Router) augmentAutoEntities(message string, entities []tg.MessageEntityClass) []tg.MessageEntityClass { return augmentAutoEntities(message, entities, r.appLinks) } - -// isWordRune 判定「单词字符」(用于实体前导边界:前一个字符是单词字符时不是新实体起点, -// 借此排除 email 的 local@domain、路径里的 and/or 等)。 -func isWordRune(r rune) bool { - return r == '_' || unicode.IsLetter(r) || unicode.IsDigit(r) -} - -// isHashtagRune 是 hashtag 正文允许的字符(支持 unicode 字母/数字,如 #日本語)。 -func isHashtagRune(r rune) bool { - return r == '_' || unicode.IsLetter(r) || unicode.IsDigit(r) -} - -// prevRuneBefore 取字节位置 i 之前的一个完整 rune(供前导边界判定);i<=0 返回 ok=false -// (字符串起点视为合法实体边界)。 -func prevRuneBefore(s string, i int) (rune, bool) { - if i <= 0 || i > len(s) { - return 0, false - } - r, size := utf8.DecodeLastRuneInString(s[:i]) - if size == 0 { - return 0, false - } - return r, true -} - -// detectMentionEntities 检测 @username(messageEntityMention,仅 offset/length 无 user_id)。 -// 规则:前导字符非单词字符且非 '@';username = [A-Za-z0-9_] 长 1..32;'@' 计入长度。 -// (设置 mentioned 标志是另一条独立链路 mentionedUserIDsFromMessage,基于 user_id,与本检测无关。) -func detectMentionEntities(message string) []tg.MessageEntityClass { - var out []tg.MessageEntityClass - for i := 0; i < len(message); i++ { - if message[i] != '@' { - continue - } - if r, ok := prevRuneBefore(message, i); ok && (isWordRune(r) || r == '@') { - continue - } - j := i + 1 - for j < len(message) && isUsernameByte(message[j]) { - j++ - } - if n := j - i - 1; n < 1 || n > 32 { - continue - } - out = append(out, &tg.MessageEntityMention{ - Offset: utf16CodeUnitLen(message[:i]), - Length: utf16CodeUnitLen(message[i:j]), - }) - i = j - 1 - } - return out -} - -// detectBotCommandEntities 检测 /command 与 /command@botusername(messageEntityBotCommand)。 -// 规则:前导字符非单词字符且非 '/','@','<';command = [A-Za-z0-9_] 长 1..64;可选 -// '@' + [A-Za-z0-9_] 1..32 的 bot username 后缀。前导排除单词字符使日期 12/25、and/or、 -// url 路径不被误判为命令。 -func detectBotCommandEntities(message string) []tg.MessageEntityClass { - var out []tg.MessageEntityClass - for i := 0; i < len(message); i++ { - if message[i] != '/' { - continue - } - if r, ok := prevRuneBefore(message, i); ok && (isWordRune(r) || r == '/' || r == '@' || r == '<') { - continue - } - j := i + 1 - for j < len(message) && isUsernameByte(message[j]) { - j++ - } - if n := j - i - 1; n < 1 || n > 64 { - continue - } - end := j - if end < len(message) && message[end] == '@' { - k := end + 1 - for k < len(message) && isUsernameByte(message[k]) { - k++ - } - if bn := k - end - 1; bn >= 1 && bn <= 32 { - end = k - } - } - out = append(out, &tg.MessageEntityBotCommand{ - Offset: utf16CodeUnitLen(message[:i]), - Length: utf16CodeUnitLen(message[i:end]), - }) - i = end - 1 - } - return out -} - -// detectHashtagEntities 检测 #hashtag(messageEntityHashtag,支持 unicode 字母/数字)。 -// 规则:前导字符非单词字符且非 '#','@';正文 1..256 个 hashtag 字符且首字符非数字 -// (排除 #123 这类纯/前导数字串)。 -func detectHashtagEntities(message string) []tg.MessageEntityClass { - var out []tg.MessageEntityClass - // '#' 是 ASCII,绝不出现在多字节 UTF-8 序列内部,故按字节扫描触发字符(避免对每个 - // 位置做 rune 解码);仅在边界判定与 body(支持 unicode 字母/数字)上才做 rune 解码。 - for i := 0; i < len(message); i++ { - if message[i] != '#' { - continue - } - if r, ok := prevRuneBefore(message, i); ok && (isWordRune(r) || r == '#' || r == '@') { - continue - } - j := i + 1 - var firstRune rune - runeCount := 0 - for j < len(message) { - r, size := utf8.DecodeRuneInString(message[j:]) - if size <= 0 || !isHashtagRune(r) { - break - } - if runeCount == 0 { - firstRune = r - } - runeCount++ - j += size - } - if runeCount >= 1 && runeCount <= 256 && !unicode.IsDigit(firstRune) { - out = append(out, &tg.MessageEntityHashtag{ - Offset: utf16CodeUnitLen(message[:i]), - Length: utf16CodeUnitLen(message[i:j]), - }) - i = j - 1 // for 循环 i++ 后落到 j,跳过已消费的 hashtag body - } - } - return out -} - -// detectCashtagEntities 检测 $TICKER(messageEntityCashtag)。规则:前导字符非单词字符 -// 且非 '$';正文 1..8 个大写字母,且其后紧邻字符非单词字符(排除 $USDfoo)。 -func detectCashtagEntities(message string) []tg.MessageEntityClass { - var out []tg.MessageEntityClass - for i := 0; i < len(message); i++ { - if message[i] != '$' { - continue - } - if r, ok := prevRuneBefore(message, i); ok && (isWordRune(r) || r == '$') { - continue - } - j := i + 1 - for j < len(message) && message[j] >= 'A' && message[j] <= 'Z' { - j++ - } - if n := j - i - 1; n < 1 || n > 8 { - continue - } - if r, size := utf8.DecodeRuneInString(message[j:]); size > 0 && isWordRune(r) { - continue - } - out = append(out, &tg.MessageEntityCashtag{ - Offset: utf16CodeUnitLen(message[:i]), - Length: utf16CodeUnitLen(message[i:j]), - }) - i = j - 1 - } - return out -} diff --git a/internal/rpc/messages_bot_longtail.go b/internal/rpc/messages_bot_longtail.go index 1bf63426..38cd679c 100644 --- a/internal/rpc/messages_bot_longtail.go +++ b/internal/rpc/messages_bot_longtail.go @@ -60,10 +60,11 @@ func (r *Router) onMessagesSendWebViewData(ctx context.Context, req *tg.Messages }, }, }, - Date: int(r.clock.Now().Unix()), - OriginAuthKeyID: rawAuthKeyIDForOrigin(ctx), - OriginSessionID: sessionID, - RecipientBlocked: recipientBlocked, + Date: int(r.clock.Now().Unix()), + OriginAuthKeyID: rawAuthKeyIDForOrigin(ctx), + OriginSessionID: sessionID, + OriginClientSession: clientSessionMetadataFromContext(ctx), + RecipientBlocked: recipientBlocked, }) if err != nil { return nil, messageSendErr(err) @@ -168,10 +169,11 @@ func (r *Router) onMessagesSendBotRequestedPeer(ctx context.Context, req *tg.Mes }, }, }, - Date: int(r.clock.Now().Unix()), - OriginAuthKeyID: rawAuthKeyIDForOrigin(ctx), - OriginSessionID: sessionID, - RecipientBlocked: recipientBlocked, + Date: int(r.clock.Now().Unix()), + OriginAuthKeyID: rawAuthKeyIDForOrigin(ctx), + OriginSessionID: sessionID, + OriginClientSession: clientSessionMetadataFromContext(ctx), + RecipientBlocked: recipientBlocked, }) if err != nil { return nil, internalErr() diff --git a/internal/rpc/messages_bot_no_state.go b/internal/rpc/messages_bot_no_state.go index 8cedef6e..7a4f1610 100644 --- a/internal/rpc/messages_bot_no_state.go +++ b/internal/rpc/messages_bot_no_state.go @@ -338,9 +338,13 @@ func (r *Router) mentionedUserIDsFromDomainMessage(ctx context.Context, currentU } } if identity != nil { - for _, username := range extractMentionUsernames(message, domain.MaxChannelMentionRecipients-len(out)) { + blocked := mentionScanBlockedSpansFromDomainEntities(message, entities) + for _, username := range extractMentionUsernames(message, domain.MaxChannelMentionRecipients-len(out), blocked) { user, found, err := identity.ResolveUsername(ctx, currentUserID, username) if err != nil { + if isMentionResolveMiss(err) { + continue + } return nil, internalErr() } if found { diff --git a/internal/rpc/messages_bot_no_state_rpc_test.go b/internal/rpc/messages_bot_no_state_rpc_test.go index 03a16c2d..31d4a2d9 100644 --- a/internal/rpc/messages_bot_no_state_rpc_test.go +++ b/internal/rpc/messages_bot_no_state_rpc_test.go @@ -99,8 +99,8 @@ func TestMessagesEditInlineBotMessageEditsPrivateInlineMessage(t *testing.T) { editReq := &tg.MessagesEditInlineBotMessageRequest{ID: msgID} editReq.SetMessage("after edit") - editReq.SetReplyMarkup(&tg.ReplyInlineMarkup{Rows: []tg.KeyboardButtonRow{{ - Buttons: []tg.KeyboardButtonClass{&tg.KeyboardButtonCallback{Text: "done", Data: []byte("v2")}}, + editReq.SetReplyMarkup(&tg.ReplyInlineMarkup{Rows: []tg.KeyboardInlineButtonRow{{ + Buttons: []tg.KeyboardInlineButton{{Text: "done", Type: &tg.InlineButtonTypeCallback{Data: []byte("v2")}}}, }}}) if ok, err := f.router.onMessagesEditInlineBotMessage(botCtx, editReq); err != nil || !ok { t.Fatalf("edit inline bot message = %v,%v, want true,nil", ok, err) @@ -291,8 +291,8 @@ func inlineArticleResultWithCallbackMarkup(id, message, button string, data []by Title: id, SendMessage: &tg.InputBotInlineMessageText{ Message: message, - ReplyMarkup: &tg.ReplyInlineMarkup{Rows: []tg.KeyboardButtonRow{{ - Buttons: []tg.KeyboardButtonClass{&tg.KeyboardButtonCallback{Text: button, Data: data}}, + ReplyMarkup: &tg.ReplyInlineMarkup{Rows: []tg.KeyboardInlineButtonRow{{ + Buttons: []tg.KeyboardInlineButton{{Text: button, Type: &tg.InlineButtonTypeCallback{Data: data}}}, }}}, }, } diff --git a/internal/rpc/messages_create_chat_test.go b/internal/rpc/messages_create_chat_test.go index 2dd92af5..f34b894a 100644 --- a/internal/rpc/messages_create_chat_test.go +++ b/internal/rpc/messages_create_chat_test.go @@ -53,8 +53,8 @@ func TestMessagesCreateChatCreatesMegagroupAndDialogsRPC(t *testing.T) { t.Fatalf("updates len = %d, want create/invite service messages plus channel refreshes", len(updates.Updates)) } newMsg, ok := updates.Updates[0].(*tg.UpdateNewChannelMessage) - if !ok || newMsg.Pts != 1 || newMsg.PtsCount != 1 { - t.Fatalf("create update = %#v, want channel pts=1", updates.Updates[0]) + if !ok || newMsg.Pts != domain.FirstChannelEventPts || newMsg.PtsCount != 1 { + t.Fatalf("create update = %#v, want channel pts=2", updates.Updates[0]) } if refresh, ok := updates.Updates[1].(*tg.UpdateChannel); !ok || refresh.ChannelID != channel.ID { t.Fatalf("create refresh = %#v, want channel refresh", updates.Updates[1]) @@ -67,8 +67,8 @@ func TestMessagesCreateChatCreatesMegagroupAndDialogsRPC(t *testing.T) { t.Fatalf("service action = %T, want channel create", service.Action) } inviteMsg, ok := updates.Updates[2].(*tg.UpdateNewChannelMessage) - if !ok || inviteMsg.Pts != 2 || inviteMsg.PtsCount != 1 { - t.Fatalf("invite update = %#v, want channel pts=2", updates.Updates[2]) + if !ok || inviteMsg.Pts != 3 || inviteMsg.PtsCount != 1 { + t.Fatalf("invite update = %#v, want channel pts=3", updates.Updates[2]) } if refresh, ok := updates.Updates[3].(*tg.UpdateChannel); !ok || refresh.ChannelID != channel.ID { t.Fatalf("invite refresh = %#v, want channel refresh", updates.Updates[3]) @@ -296,8 +296,8 @@ func TestMessagesCreateChatCreatesOwnerOnlyMegagroupRPC(t *testing.T) { t.Fatalf("updates len = %d, want create service message + channel refresh only", len(updates.Updates)) } created, ok := updates.Updates[0].(*tg.UpdateNewChannelMessage) - if !ok || created.Pts != 1 || created.PtsCount != 1 { - t.Fatalf("create update = %#v, want pts=1/count=1", updates.Updates[0]) + if !ok || created.Pts != domain.FirstChannelEventPts || created.PtsCount != 1 { + t.Fatalf("create update = %#v, want pts=2/count=1", updates.Updates[0]) } createdMessage, ok := created.Message.(*tg.MessageService) if !ok { @@ -400,9 +400,13 @@ func TestMessagesCreateChatCreatesOwnerOnlyMegagroupRPC(t *testing.T) { if err != nil { t.Fatalf("getChannelDifference from pts=0: %v", err) } - fullDifference, ok := difference.(*tg.UpdatesChannelDifference) - if !ok || fullDifference.Pts != 1 || len(fullDifference.NewMessages) != 1 { - t.Fatalf("difference = %T %+v, want creation event at pts=1", difference, difference) + fullDifference, ok := difference.(*tg.UpdatesChannelDifferenceTooLong) + if !ok { + t.Fatalf("difference = %T %+v, want baseline-gap snapshot at pts=2", difference, difference) + } + differenceDialog, dialogOK := fullDifference.Dialog.(*tg.Dialog) + if !dialogOK || differenceDialog.Pts != domain.FirstChannelEventPts || len(fullDifference.Messages) != 1 { + t.Fatalf("difference = %T %+v, want baseline-gap snapshot at pts=2", difference, difference) } }) } diff --git a/internal/rpc/messages_dialogs.go b/internal/rpc/messages_dialogs.go index 1c05a9bc..15e1e941 100644 --- a/internal/rpc/messages_dialogs.go +++ b/internal/rpc/messages_dialogs.go @@ -375,6 +375,14 @@ func dialogDraftErr(err error) error { } func (r *Router) clearDraftAfterSend(ctx context.Context, userID int64, peer domain.Peer, replyTo *domain.MessageReply) { + r.clearDraftAfterSendWithOptionalPeerObjects(ctx, userID, peer, replyTo, nil, nil, false) +} + +func (r *Router) clearDraftAfterSendWithPeerObjects(ctx context.Context, userID int64, peer domain.Peer, replyTo *domain.MessageReply, users []tg.UserClass, chats []tg.ChatClass) { + r.clearDraftAfterSendWithOptionalPeerObjects(ctx, userID, peer, replyTo, users, chats, true) +} + +func (r *Router) clearDraftAfterSendWithOptionalPeerObjects(ctx context.Context, userID int64, peer domain.Peer, replyTo *domain.MessageReply, users []tg.UserClass, chats []tg.ChatClass, peerObjectsReady bool) { if r.deps.Dialogs == nil || userID == 0 || peer.ID == 0 { return } @@ -397,7 +405,9 @@ func (r *Router) clearDraftAfterSend(ctx context.Context, userID int64, peer dom } recorded := r.recordDraftMessageEvent(ctx, userID, peer, topMessageID, &date) r.bookkeepAuxPtsForCurrentSession(ctx, recorded) - users, chats := r.peerObjectsForDraftUpdate(ctx, userID, peer) + if !peerObjectsReady { + users, chats = r.peerObjectsForDraftUpdate(ctx, userID, peer) + } r.pushUserUpdatesIfNoReliableDispatch(ctx, userID, &tg.Updates{ Updates: appendAuxPtsBookkeeping([]tg.UpdateClass{update}, recorded), Users: users, @@ -982,11 +992,17 @@ func (r *Router) dialogFilterFromRequest(ctx context.Context, userID int64, req filter.HasFolderID = true filter.FolderID = folderID } - if peer, err := r.checkedDomainPeerFromInputPeer(ctx, userID, req.OffsetPeer); err == nil { + // offset_peer is only the stable tie-breaker paired with offset_date/id. It + // neither grants access nor selects content, so resolving a channel view (and + // validating its access_hash) here adds database work without a security + // boundary. Content-bearing peer arguments continue through checkedDomainPeer. + if _, empty := req.OffsetPeer.(*tg.InputPeerEmpty); !empty && !inputPeerClassNil(req.OffsetPeer) { + peer, ok := r.domainPeerFromInputPeer(userID, req.OffsetPeer) + if !ok || peer.ID <= 0 { + return domain.DialogFilter{}, peerIDInvalidErr() + } filter.HasOffsetPeer = true filter.OffsetPeer = peer - } else if _, ok := req.OffsetPeer.(*tg.InputPeerEmpty); !ok && req.OffsetPeer != nil { - return domain.DialogFilter{}, err } return filter, nil } diff --git a/internal/rpc/messages_forward.go b/internal/rpc/messages_forward.go index fb2adbef..4382890b 100644 --- a/internal/rpc/messages_forward.go +++ b/internal/rpc/messages_forward.go @@ -392,7 +392,11 @@ func (r *Router) forwardMessagesToMonoforum( if len(absentIndexes) == 0 { results := make([]tg.UpdatesClass, 0, len(replays)) for _, replay := range replays { - results = append(results, r.monoforumSendUpdates(ctx, userID, mono, savedPeer, replay.channel)) + updates, err := r.monoforumSendUpdatesStrict(ctx, userID, mono, savedPeer, replay.channel) + if err != nil { + return nil, err + } + results = append(results, updates) } return combineSendUpdates(results), nil } @@ -436,7 +440,11 @@ func (r *Router) forwardMessagesToMonoforum( results := make([]tg.UpdatesClass, 0, len(req.ID)) for i, source := range sources { if replays[i].found { - results = append(results, r.monoforumSendUpdates(ctx, userID, mono, savedPeer, replays[i].channel)) + updates, err := r.monoforumSendUpdatesStrict(ctx, userID, mono, savedPeer, replays[i].channel) + if err != nil { + return nil, err + } + results = append(results, updates) continue } forward := source.forward diff --git a/internal/rpc/messages_getmessages_trace.go b/internal/rpc/messages_getmessages_trace.go new file mode 100644 index 00000000..c618c6b1 --- /dev/null +++ b/internal/rpc/messages_getmessages_trace.go @@ -0,0 +1,204 @@ +package rpc + +import ( + "context" + "fmt" + + "github.com/iamxvbaba/td/tg" + "go.uber.org/zap" + + "telesrv/internal/domain" +) + +type getMessagesInputTrace struct { + inputCount int + inputTypes []string + inputIDs []int + lookupIDs []int + invalidIDs []int + replyToIDs []int + callbackMessageIDs []int + callbackQueryIDs []int64 + pinnedCount int + unsupportedTypes []string + duplicateLookupIDs []int +} + +func newGetMessagesInputTrace(inputs []tg.InputMessageClass) getMessagesInputTrace { + trace := getMessagesInputTrace{ + inputCount: len(inputs), + inputTypes: make([]string, 0, len(inputs)), + inputIDs: make([]int, 0, len(inputs)), + lookupIDs: make([]int, 0, len(inputs)), + } + seenLookup := make(map[int]int, len(inputs)) + duplicateSeen := make(map[int]struct{}) + for _, input := range inputs { + switch msg := input.(type) { + case *tg.InputMessageID: + trace.recordInputID("inputMessageID", msg.ID) + if validMessageBoxID(msg.ID) { + trace.lookupIDs = append(trace.lookupIDs, msg.ID) + seenLookup[msg.ID]++ + if seenLookup[msg.ID] == 2 { + trace.duplicateLookupIDs = append(trace.duplicateLookupIDs, msg.ID) + duplicateSeen[msg.ID] = struct{}{} + } else if seenLookup[msg.ID] > 2 { + if _, ok := duplicateSeen[msg.ID]; !ok { + trace.duplicateLookupIDs = append(trace.duplicateLookupIDs, msg.ID) + duplicateSeen[msg.ID] = struct{}{} + } + } + } else { + trace.invalidIDs = append(trace.invalidIDs, msg.ID) + } + case *tg.InputMessageReplyTo: + trace.recordInputID("inputMessageReplyTo", msg.ID) + trace.replyToIDs = append(trace.replyToIDs, msg.ID) + trace.unsupportedTypes = append(trace.unsupportedTypes, "inputMessageReplyTo") + if !validMessageBoxID(msg.ID) { + trace.invalidIDs = append(trace.invalidIDs, msg.ID) + } + case *tg.InputMessagePinned: + trace.inputTypes = append(trace.inputTypes, "inputMessagePinned") + trace.pinnedCount++ + trace.unsupportedTypes = append(trace.unsupportedTypes, "inputMessagePinned") + case *tg.InputMessageCallbackQuery: + trace.recordInputID("inputMessageCallbackQuery", msg.ID) + trace.callbackMessageIDs = append(trace.callbackMessageIDs, msg.ID) + trace.callbackQueryIDs = append(trace.callbackQueryIDs, msg.QueryID) + trace.unsupportedTypes = append(trace.unsupportedTypes, "inputMessageCallbackQuery") + if !validMessageBoxID(msg.ID) { + trace.invalidIDs = append(trace.invalidIDs, msg.ID) + } + case nil: + trace.inputTypes = append(trace.inputTypes, "nil") + trace.unsupportedTypes = append(trace.unsupportedTypes, "nil") + default: + name := fmt.Sprintf("%T", input) + trace.inputTypes = append(trace.inputTypes, name) + trace.unsupportedTypes = append(trace.unsupportedTypes, name) + } + } + return trace +} + +func (t *getMessagesInputTrace) recordInputID(inputType string, id int) { + t.inputTypes = append(t.inputTypes, inputType) + t.inputIDs = append(t.inputIDs, id) +} + +func validMessageBoxID(id int) bool { + return id > 0 && id <= domain.MaxMessageBoxID +} + +func (t getMessagesInputTrace) zapFields() []zap.Field { + fields := []zap.Field{ + zap.Int("input_count", t.inputCount), + zap.Strings("input_types", t.inputTypes), + zap.Ints("input_ids", t.inputIDs), + zap.Ints("lookup_ids", t.lookupIDs), + } + if len(t.invalidIDs) > 0 { + fields = append(fields, zap.Ints("invalid_ids", t.invalidIDs)) + } + if len(t.replyToIDs) > 0 { + fields = append(fields, zap.Ints("reply_to_ids", t.replyToIDs)) + } + if t.pinnedCount > 0 { + fields = append(fields, zap.Int("pinned_inputs", t.pinnedCount)) + } + if len(t.callbackMessageIDs) > 0 { + fields = append(fields, + zap.Ints("callback_message_ids", t.callbackMessageIDs), + zap.Int64s("callback_query_ids", t.callbackQueryIDs), + ) + } + if len(t.unsupportedTypes) > 0 { + fields = append(fields, zap.Strings("unsupported_input_types", t.unsupportedTypes)) + } + if len(t.duplicateLookupIDs) > 0 { + fields = append(fields, zap.Ints("duplicate_lookup_ids", t.duplicateLookupIDs)) + } + return fields +} + +func (t getMessagesInputTrace) missingLookupIDs(found map[int]struct{}) []int { + if len(t.lookupIDs) == 0 { + return nil + } + missing := make([]int, 0) + seenMissing := make(map[int]struct{}) + for _, id := range t.lookupIDs { + if _, ok := found[id]; ok { + continue + } + if _, ok := seenMissing[id]; ok { + continue + } + missing = append(missing, id) + seenMissing[id] = struct{}{} + } + return missing +} + +func (r *Router) logPrivateGetMessagesTrace(ctx context.Context, trace getMessagesInputTrace, found []domain.Message, result *tg.MessagesMessages) { + if r == nil || r.log == nil || result == nil { + return + } + foundIDs := make([]int, 0, len(found)) + foundSet := make(map[int]struct{}, len(found)) + peers := make([]string, 0, len(found)) + for _, msg := range found { + foundIDs = append(foundIDs, msg.ID) + foundSet[msg.ID] = struct{}{} + peers = append(peers, fmt.Sprintf("id=%d peer=%s:%d from=%s:%d out=%t uid=%d pts=%d", + msg.ID, msg.Peer.Type, msg.Peer.ID, msg.From.Type, msg.From.ID, msg.Out, msg.UID, msg.Pts)) + } + fields := append([]zap.Field{zap.String("method", "messages.getMessages")}, r.contextLogFields(ctx)...) + fields = append(fields, trace.zapFields()...) + fields = append(fields, + zap.Ints("found_ids", foundIDs), + zap.Ints("missing_lookup_ids", trace.missingLookupIDs(foundSet)), + zap.Strings("found_peers", peers), + zap.Int("result_messages", len(result.Messages)), + zap.Int("result_users", len(result.Users)), + zap.Int("result_chats", len(result.Chats)), + ) + r.log.Info("messages.getMessages detail", fields...) +} + +func (r *Router) logChannelGetMessagesTrace(ctx context.Context, channelID int64, trace getMessagesInputTrace, found []domain.ChannelMessage, result *tg.MessagesMessages) { + if r == nil || r.log == nil { + return + } + foundIDs := make([]int, 0, len(found)) + foundSet := make(map[int]struct{}, len(found)) + peers := make([]string, 0, len(found)) + for _, msg := range found { + foundIDs = append(foundIDs, msg.ID) + foundSet[msg.ID] = struct{}{} + peers = append(peers, fmt.Sprintf("id=%d channel=%d from=%s:%d sender_user_id=%d post=%t pts=%d", + msg.ID, msg.ChannelID, msg.From.Type, msg.From.ID, msg.SenderUserID, msg.Post, msg.Pts)) + } + resultMessages, resultUsers, resultChats := 0, 0, 0 + if result != nil { + resultMessages = len(result.Messages) + resultUsers = len(result.Users) + resultChats = len(result.Chats) + } + fields := append([]zap.Field{ + zap.String("method", "channels.getMessages"), + zap.Int64("channel_id", channelID), + }, r.contextLogFields(ctx)...) + fields = append(fields, trace.zapFields()...) + fields = append(fields, + zap.Ints("found_ids", foundIDs), + zap.Ints("missing_lookup_ids", trace.missingLookupIDs(foundSet)), + zap.Strings("found_peers", peers), + zap.Int("result_messages", resultMessages), + zap.Int("result_users", resultUsers), + zap.Int("result_chats", resultChats), + ) + r.log.Info("channels.getMessages detail", fields...) +} diff --git a/internal/rpc/messages_history.go b/internal/rpc/messages_history.go index f7b71edb..b70149d9 100644 --- a/internal/rpc/messages_history.go +++ b/internal/rpc/messages_history.go @@ -502,14 +502,8 @@ func (r *Router) onMessagesGetMessages(ctx context.Context, ids []tg.InputMessag } out := make([]tg.MessageClass, 0, len(ids)) - requestedIDs := make([]int, 0, len(ids)) - for _, input := range ids { - id, ok := inputMessageBoxID(input) - if !ok || id <= 0 || id > domain.MaxMessageBoxID { - continue - } - requestedIDs = append(requestedIDs, id) - } + trace := newGetMessagesInputTrace(ids) + requestedIDs := trace.lookupIDs list, err := r.deps.Messages.GetMessages(ctx, userID, requestedIDs) if err != nil { return nil, internalErr() @@ -533,13 +527,15 @@ func (r *Router) onMessagesGetMessages(ctx context.Context, ids []tg.InputMessag found = append(found, msg) out = append(out, tgMessage(msg)) } + r.maybeEnqueueExpiredPrivateWebPageResolves(found) chats := r.chatsForMessageUpdates(ctx, userID, found) result := &tg.MessagesMessages{ Messages: out, - Users: r.usersForMessageUpdates(ctx, userID, found), + Users: r.usersForMessageUpdatesWithPreloaded(ctx, userID, found, r.preloadedMessageUsers(list)), Chats: chats, } r.applyPeerReadModelsToMessages(ctx, userID, result) + r.logPrivateGetMessagesTrace(ctx, trace, found, result) return result, nil } @@ -583,7 +579,7 @@ func (r *Router) onMessagesGetRichMessage(ctx context.Context, req *tg.MessagesG } result := &tg.MessagesMessages{ Messages: out, - Users: r.usersForMessageUpdates(ctx, userID, found), + Users: r.usersForMessageUpdatesWithPreloaded(ctx, userID, found, r.preloadedMessageUsers(list)), Chats: r.chatsForMessageUpdates(ctx, userID, found), } r.applyPeerReadModelsToMessages(ctx, userID, result) @@ -669,8 +665,7 @@ func (r *Router) onMessagesSearchGlobal(ctx context.Context, req *tg.MessagesSea } } if req.UsersOnly || r.deps.Channels == nil { - result := appendCommunitySearchChat(tgMessagesMessages(userID, r.enrichMessageList(ctx, userID, limitMessageList(private, limit))), communityView) - r.applyPeerReadModelsToMessages(ctx, userID, result) + result := appendCommunitySearchChat(r.tgMessagesMessages(ctx, userID, r.enrichMessageList(ctx, userID, limitMessageList(private, limit))), communityView) return result, nil } channelHistory, err := r.deps.Channels.SearchJoinedMessages(ctx, userID, domain.ChannelGlobalSearchRequest{ @@ -851,6 +846,10 @@ func (r *Router) messageFilterFromSearchRequest(ctx context.Context, userID int6 MusicOnly: messagesSearchFilterMusic(req.Filter), NeedTotalCount: req.OffsetID == 0 && req.MinDate == 0 && req.MaxDate == 0 && req.AddOffset >= 0 && req.Hash == 0, } + if phoneCalls, ok := req.Filter.(*tg.InputMessagesFilterPhoneCalls); ok { + filter.PhoneCallsOnly = true + filter.MissedPhoneCallsOnly = phoneCalls.Missed + } if peer, ok := r.domainPeerFromInputPeer(userID, req.Peer); ok { filter.HasPeer = true filter.Peer = peer @@ -953,7 +952,7 @@ func messagesSearchFilterChatPhotos(filter tg.MessagesFilterClass) bool { func searchFilterNeedsMediaStore(filter tg.MessagesFilterClass) bool { switch filter.(type) { - case nil, *tg.InputMessagesFilterEmpty: + case nil, *tg.InputMessagesFilterEmpty, *tg.InputMessagesFilterPhoneCalls: return false case *tg.InputMessagesFilterPhotos, *tg.InputMessagesFilterVideo, diff --git a/internal/rpc/messages_history_rpc_test.go b/internal/rpc/messages_history_rpc_test.go index 5443ba8f..9a7e6f65 100644 --- a/internal/rpc/messages_history_rpc_test.go +++ b/internal/rpc/messages_history_rpc_test.go @@ -607,6 +607,43 @@ func TestMessagesGetHistoryReturnsStoredMessages(t *testing.T) { } } +func TestMessagesSearchMediaPreservesCombinedFilters(t *testing.T) { + ctx := context.Background() + users := memory.NewUserStore() + alice, err := users.Create(ctx, domain.User{AccessHash: 511, Phone: "15550000511", FirstName: "Alice"}) + if err != nil { + t.Fatal(err) + } + bob, err := users.Create(ctx, domain.User{AccessHash: 512, Phone: "15550000512", FirstName: "Bob"}) + if err != nil { + t.Fatal(err) + } + messages := &captureMessages{} + r := New(Config{}, Deps{Messages: messages, Users: appusers.NewService(users)}, zaptest.NewLogger(t), clock.System) + req := &tg.MessagesSearchRequest{ + Peer: &tg.InputPeerUser{UserID: alice.ID, AccessHash: alice.AccessHash}, + Q: "invoice", FromID: &tg.InputPeerUser{UserID: alice.ID, AccessHash: alice.AccessHash}, + Filter: &tg.InputMessagesFilterPhotos{}, MinDate: 100, MaxDate: 200, + OffsetID: 90, AddOffset: 3, Limit: 20, MaxID: 80, MinID: 10, + } + req.SetTopMsgID(7) + var in bin.Buffer + if err := req.Encode(&in); err != nil { + t.Fatalf("encode request: %v", err) + } + if _, err := r.Dispatch(WithUserID(ctx, bob.ID), [8]byte{}, 0, &in); err != nil { + t.Fatalf("messages.search media: %v", err) + } + got := messages.mediaReq + if got.Query != "invoice" || got.SenderUserID != alice.ID || got.MinDate != 100 || got.MaxDate != 200 || + got.TopMsgID != 7 || got.OffsetID != 90 || got.AddOffset != 3 || got.Limit != 20 || got.MaxID != 80 || got.MinID != 10 { + t.Fatalf("media request = %+v", got) + } + if len(got.Categories) != 1 || got.Categories[0] != domain.MediaCategoryPhoto { + t.Fatalf("media categories = %v", got.Categories) + } +} + func TestMessagesSetTypingPushesUserTypingUpdate(t *testing.T) { sessions := &captureScopedSessions{captureSessions: &captureSessions{}} r := New(Config{}, Deps{Sessions: sessions}, zaptest.NewLogger(t), clock.System) diff --git a/internal/rpc/messages_monoforum.go b/internal/rpc/messages_monoforum.go index bc3c5d3a..0ba8025e 100644 --- a/internal/rpc/messages_monoforum.go +++ b/internal/rpc/messages_monoforum.go @@ -3,6 +3,7 @@ package rpc import ( "context" "errors" + "sort" "github.com/iamxvbaba/td/tg" @@ -91,11 +92,15 @@ func (r *Router) monoforumSavedDialogs(ctx context.Context, userID int64, mono d messages = append(messages, item) } } + users, err := r.monoforumSubscriberUsersWithPeerCacheAndOverlaysStrict(ctx, userID, list.Dialogs, list.Messages, nil, nil) + if err != nil { + return nil, internalErr() + } return &tg.MessagesSavedDialogs{ Dialogs: dialogs, Messages: messages, Chats: r.monoforumChats(ctx, userID, mono), - Users: r.monoforumSubscriberUsers(ctx, userID, list.Dialogs, list.Messages), + Users: users, }, nil } @@ -119,11 +124,15 @@ func (r *Router) monoforumSavedHistory(ctx context.Context, userID int64, mono d messages = append(messages, item) } } + users, err := r.monoforumSubscriberUsersWithPeerCacheAndOverlaysStrict(ctx, userID, nil, hist.Messages, nil, nil) + if err != nil { + return nil, internalErr() + } result := &tg.MessagesMessagesSlice{ Count: hist.Count, Messages: messages, Chats: r.monoforumChats(ctx, userID, mono), - Users: r.monoforumSubscriberUsers(ctx, userID, nil, hist.Messages), + Users: users, } r.applyPeerReadModelsToMessages(ctx, userID, result) return result, nil @@ -145,8 +154,13 @@ func (r *Router) monoforumChats(ctx context.Context, userID int64, mono domain.C return chats } -// monoforumSubscriberUsers 投影订阅者用户(子会话 saved_peer + 消息发件人)。 -func (r *Router) monoforumSubscriberUsers(ctx context.Context, userID int64, dialogs []domain.MonoforumDialog, messages []domain.ChannelMessage) []tg.UserClass { +type monoforumPeerOverlays struct { + usernames map[domain.Peer][]domain.Username + botProfiles map[int64]domain.BotProfile + botVerifications map[domain.Peer]domain.CustomVerification +} + +func monoforumSubscriberUserIDs(dialogs []domain.MonoforumDialog, messages []domain.ChannelMessage) []int64 { ids := make([]int64, 0, len(dialogs)+len(messages)) seen := map[int64]struct{}{} add := func(id int64) { @@ -167,14 +181,132 @@ func (r *Router) monoforumSubscriberUsers(ctx context.Context, userID int64, dia for _, m := range messages { add(m.SenderUserID) } - if len(ids) == 0 || r.deps.Users == nil { - return []tg.UserClass{} + // tgChannelMessage can reference users beyond its sender (from/send_as, + // forward, via_bot, reply/quote mention, contact/poll/todo/action/reaction). + // Reuse the common channel-message closure so saved history, send echo and + // online fan-out all materialize the same complete Users envelope. + userIDs := make(map[int64]struct{}) + channelIDs := make(map[int64]struct{}) + for _, message := range messages { + collectChannelMessagePeerRefs(message, message.ChannelID, userIDs, channelIDs) } - found, err := r.deps.Users.ByIDs(ctx, userID, ids) + extra := peerIDMapKeys(userIDs) + sort.Slice(extra, func(i, j int) bool { return extra[i] < extra[j] }) + for _, id := range extra { + add(id) + } + return ids +} + +func monoforumProjectionPeers(monoforumID, parentID int64, userIDs []int64) []domain.Peer { + peers := make([]domain.Peer, 0, len(userIDs)+2) + seen := make(map[domain.Peer]struct{}, len(userIDs)+2) + add := func(peer domain.Peer) { + if peer.ID == 0 { + return + } + if _, ok := seen[peer]; ok { + return + } + seen[peer] = struct{}{} + peers = append(peers, peer) + } + for _, userID := range userIDs { + add(domain.Peer{Type: domain.PeerTypeUser, ID: userID}) + } + add(domain.Peer{Type: domain.PeerTypeChannel, ID: monoforumID}) + add(domain.Peer{Type: domain.PeerTypeChannel, ID: parentID}) + return peers +} + +// loadMonoforumPeerOverlays resolves peer-wide facts once before a fan-out. The +// returned snapshot is immutable for the lifetime of that job and can therefore +// be reused by every viewer builder without turning overlays into N+1 reads. +func (r *Router) loadMonoforumPeerOverlays(ctx context.Context, peers []domain.Peer) *monoforumPeerOverlays { + overlays := &monoforumPeerOverlays{ + usernames: r.usernameRegistryMap(ctx, peers), + botVerifications: r.botVerificationMap(ctx, peers), + } + if r.deps.Bots == nil { + return overlays + } + userIDs := make([]int64, 0, len(peers)) + for _, peer := range peers { + if peer.Type == domain.PeerTypeUser && peer.ID != 0 { + userIDs = append(userIDs, peer.ID) + } + } + if len(userIDs) == 0 { + return overlays + } + if batch, ok := r.deps.Bots.(botProfileBatchResolver); ok { + if profiles, err := batch.BotInfos(ctx, userIDs); err == nil { + overlays.botProfiles = profiles + return overlays + } + } + overlays.botProfiles = make(map[int64]domain.BotProfile) + for _, userID := range userIDs { + if profile, found, err := r.deps.Bots.BotInfo(ctx, userID); err == nil && found { + overlays.botProfiles[userID] = profile + } + } + return overlays +} + +func applyMonoforumPeerOverlays(users []tg.UserClass, chats []tg.ChatClass, overlays *monoforumPeerOverlays) { + if overlays == nil { + return + } + applyUsernamesFromRegistry(users, chats, overlays.usernames) + for _, item := range users { + u, ok := item.(*tg.User) + if !ok || u == nil || u.Deleted { + continue + } + if u.Bot { + if profile, found := overlays.botProfiles[u.ID]; found { + applyBotProfileFlags(u, profile) + } + } + if mark, found := overlays.botVerifications[domain.Peer{Type: domain.PeerTypeUser, ID: u.ID}]; found && mark.IconDocumentID > 0 { + u.SetBotVerificationIcon(mark.IconDocumentID) + } + } + for _, item := range chats { + ch, ok := item.(*tg.Channel) + if !ok || ch == nil { + continue + } + if mark, found := overlays.botVerifications[domain.Peer{Type: domain.PeerTypeChannel, ID: ch.ID}]; found && mark.IconDocumentID > 0 { + ch.SetBotVerificationIcon(mark.IconDocumentID) + } + } +} + +// monoforumSubscriberUsers projects subscriber users (saved_peer + message +// senders) for one viewer. Fan-out callers pass their preheated peer cache and +// overlay snapshot; single-viewer callers retain the same output shape through a +// one-shot local cache. The pure TL conversion is viewer-aware so self is never +// lost for a subscriber viewing their own envelope. +func (r *Router) monoforumSubscriberUsersWithPeerCacheAndOverlaysStrict(ctx context.Context, userID int64, dialogs []domain.MonoforumDialog, messages []domain.ChannelMessage, cache *viewerPeerCache, overlays *monoforumPeerOverlays) ([]tg.UserClass, error) { + ids := monoforumSubscriberUserIDs(dialogs, messages) + if len(ids) == 0 { + return []tg.UserClass{}, nil + } + if cache == nil { + cache = newViewerPeerCache(r) + } + projected, err := cache.usersForIDsStrict(ctx, userID, ids) if err != nil { - return []tg.UserClass{} + return nil, err } - return r.tgUsers(found) + if overlays == nil { + overlays = r.loadMonoforumPeerOverlays(ctx, monoforumProjectionPeers(0, 0, ids)) + } + out := tgUsersForViewer(userID, projected) + applyMonoforumPeerOverlays(out, nil, overlays) + return out, nil } // monoforumReplyPresent 判断 sendMessage 的 reply_to 是否显式携带 monoforum_peer_id。 @@ -283,12 +415,21 @@ func (r *Router) sendMonoforumMessage(ctx context.Context, userID int64, peer do if !res.Duplicate { r.enqueueMonoforumMessageFanout(ctx, userID, mono, req.SavedPeer, res) } - return r.monoforumSendUpdates(ctx, userID, mono, req.SavedPeer, res), nil + return r.monoforumSendUpdatesStrict(ctx, userID, mono, req.SavedPeer, res) } // monoforumSendUpdates 给发送者构造回声 Updates:updateMessageID(关联 random_id)+ updateNewChannelMessage // (monoforum 走 channel pts)。另一方经 monoforum 频道的 getChannelDifference 收取该 durable 事件。 -func (r *Router) monoforumSendUpdates(ctx context.Context, userID int64, mono domain.Channel, savedPeer domain.Peer, res domain.SendChannelMessageResult) tg.UpdatesClass { +func (r *Router) monoforumSendUpdatesStrict(ctx context.Context, userID int64, mono domain.Channel, savedPeer domain.Peer, res domain.SendChannelMessageResult) (tg.UpdatesClass, error) { + return r.monoforumSendUpdatesWithPeerCacheAndOverlaysStrict(ctx, userID, mono, savedPeer, res, nil, nil) +} + +func (r *Router) monoforumSendUpdatesWithPeerCacheAndOverlays(ctx context.Context, userID int64, mono domain.Channel, savedPeer domain.Peer, res domain.SendChannelMessageResult, cache *viewerPeerCache, overlays *monoforumPeerOverlays) tg.UpdatesClass { + updates, _ := r.monoforumSendUpdatesWithPeerCacheAndOverlaysStrict(ctx, userID, mono, savedPeer, res, cache, overlays) + return updates +} + +func (r *Router) monoforumSendUpdatesWithPeerCacheAndOverlaysStrict(ctx context.Context, userID int64, mono domain.Channel, savedPeer domain.Peer, res domain.SendChannelMessageResult, cache *viewerPeerCache, overlays *monoforumPeerOverlays) (tg.UpdatesClass, error) { updates := make([]tg.UpdateClass, 0, 3) if res.Message.RandomID != 0 { updates = append(updates, &tg.UpdateMessageID{ID: res.Message.ID, RandomID: res.Message.RandomID}) @@ -309,16 +450,35 @@ func (r *Router) monoforumSendUpdates(ctx context.Context, userID int64, mono do date = res.ReplayDeleteEvent.Date } } + dialogs := []domain.MonoforumDialog{{SavedPeer: savedPeer}} + messages := []domain.ChannelMessage{res.Message} + if cache == nil { + cache = newViewerPeerCache(r) + } + if overlays == nil { + ids := monoforumSubscriberUserIDs(dialogs, messages) + overlays = r.loadMonoforumPeerOverlays(ctx, monoforumProjectionPeers(mono.ID, mono.LinkedMonoforumID, ids)) + } + chats := r.monoforumChats(ctx, userID, mono) + users, err := r.monoforumSubscriberUsersWithPeerCacheAndOverlaysStrict(ctx, userID, dialogs, messages, cache, overlays) + if err != nil { + return nil, err + } + applyMonoforumPeerOverlays(nil, chats, overlays) return &tg.Updates{ Updates: updates, - Chats: r.monoforumChats(ctx, userID, mono), - Users: r.monoforumSubscriberUsers(ctx, userID, []domain.MonoforumDialog{{SavedPeer: savedPeer}}, []domain.ChannelMessage{res.Message}), + Chats: chats, + Users: users, Date: date, - } + }, nil } func (r *Router) monoforumDeliveryUpdates(ctx context.Context, userID int64, mono domain.Channel, savedPeer domain.Peer, res domain.SendChannelMessageResult) *tg.Updates { - updates, _ := r.monoforumSendUpdates(ctx, userID, mono, savedPeer, res).(*tg.Updates) + return r.monoforumDeliveryUpdatesWithPeerCacheAndOverlays(ctx, userID, mono, savedPeer, res, nil, nil) +} + +func (r *Router) monoforumDeliveryUpdatesWithPeerCacheAndOverlays(ctx context.Context, userID int64, mono domain.Channel, savedPeer domain.Peer, res domain.SendChannelMessageResult, cache *viewerPeerCache, overlays *monoforumPeerOverlays) *tg.Updates { + updates, _ := r.monoforumSendUpdatesWithPeerCacheAndOverlays(ctx, userID, mono, savedPeer, res, cache, overlays).(*tg.Updates) if updates == nil { return nil } diff --git a/internal/rpc/messages_monoforum_rpc_test.go b/internal/rpc/messages_monoforum_rpc_test.go index f21d28f7..2cc30ca5 100644 --- a/internal/rpc/messages_monoforum_rpc_test.go +++ b/internal/rpc/messages_monoforum_rpc_test.go @@ -2,6 +2,7 @@ package rpc import ( "context" + "errors" "strings" "testing" @@ -17,6 +18,93 @@ import ( "telesrv/internal/store/memory" ) +func TestMonoforumSendUpdatesIncludesCompleteMessageUserEnvelope(t *testing.T) { + const ( + viewerID = int64(1000000201) + savedPeerID = int64(1000000202) + viaBotID = int64(1000000203) + replyPeerID = int64(1000000204) + quoteUserID = int64(1000000205) + monoforumID = int64(1000000291) + messageID = 41 + messagePts = 51 + ) + users := map[int64]domain.User{} + for _, id := range []int64{viewerID, savedPeerID, viaBotID, replyPeerID, quoteUserID} { + users[id] = domain.User{ID: id, FirstName: "projected"} + } + router := New(Config{}, Deps{Users: mapUsersService{users: users}}, zaptest.NewLogger(t), clock.System) + savedPeer := domain.Peer{Type: domain.PeerTypeUser, ID: savedPeerID} + message := domain.ChannelMessage{ + ChannelID: monoforumID, ID: messageID, SenderUserID: viewerID, + From: domain.Peer{Type: domain.PeerTypeUser, ID: viewerID}, SavedPeer: savedPeer, + ViaBotID: viaBotID, Date: 1700000600, + ReplyTo: &domain.MessageReply{ + MessageID: 40, + Peer: domain.Peer{Type: domain.PeerTypeUser, ID: replyPeerID}, + QuoteEntities: []domain.MessageEntity{{ + Type: domain.MessageEntityMentionName, UserID: quoteUserID, + }}, + }, + } + result := domain.SendChannelMessageResult{ + Channel: domain.Channel{ID: monoforumID, Monoforum: true}, + Message: message, + Event: domain.ChannelUpdateEvent{ + ChannelID: monoforumID, Type: domain.ChannelUpdateNewMessage, + Pts: messagePts, PtsCount: 1, Message: message, + }, + } + + updatesClass, err := router.monoforumSendUpdatesStrict(context.Background(), viewerID, result.Channel, savedPeer, result) + if err != nil { + t.Fatalf("monoforumSendUpdatesStrict: %v", err) + } + updates, ok := updatesClass.(*tg.Updates) + if !ok || updates == nil { + t.Fatalf("monoforumSendUpdates = %T, want *tg.Updates", updates) + } + got := make(map[int64]bool, len(updates.Users)) + for _, item := range updates.Users { + if user, ok := item.(*tg.User); ok { + got[user.ID] = true + } + } + for _, id := range []int64{viewerID, savedPeerID, viaBotID, replyPeerID, quoteUserID} { + if !got[id] { + t.Fatalf("Users = %+v, missing referenced user %d", got, id) + } + } +} + +func TestMonoforumSendUpdatesFailsClosedOnIncompleteUserEnvelope(t *testing.T) { + const ( + viewerID = int64(1000000301) + savedPeerID = int64(1000000302) + missingBot = int64(1000000303) + monoforumID = int64(1000000391) + ) + router := New(Config{}, Deps{Users: mapUsersService{users: map[int64]domain.User{ + viewerID: {ID: viewerID, FirstName: "viewer"}, + savedPeerID: {ID: savedPeerID, FirstName: "saved peer"}, + }}}, zaptest.NewLogger(t), clock.System) + savedPeer := domain.Peer{Type: domain.PeerTypeUser, ID: savedPeerID} + message := domain.ChannelMessage{ + ChannelID: monoforumID, ID: 1, SenderUserID: viewerID, + From: domain.Peer{Type: domain.PeerTypeUser, ID: viewerID}, SavedPeer: savedPeer, + ViaBotID: missingBot, Date: 1700000700, + } + result := domain.SendChannelMessageResult{ + Channel: domain.Channel{ID: monoforumID, Monoforum: true}, Message: message, + Event: domain.ChannelUpdateEvent{ChannelID: monoforumID, Type: domain.ChannelUpdateNewMessage, Pts: 2, PtsCount: 1, Message: message}, + } + + updates, err := router.monoforumSendUpdatesStrict(context.Background(), viewerID, result.Channel, savedPeer, result) + if !errors.Is(err, ErrDurableUserProjectionIncomplete) || updates != nil { + t.Fatalf("monoforum strict envelope = %T, %v; want nil ErrDurableUserProjectionIncomplete", updates, err) + } +} + // TestMonoforumSavedDialogsAndHistory 验证频道私信(monoforum)读侧 RPC：管理员经 // getSavedDialogs/getSavedHistory 看订阅者子会话，parent_peer 同时兼容 TDesktop 实际发送的 // 母广播频道和虚拟 monoforum；订阅者经普通 getHistory 只看自己的子会话。 diff --git a/internal/rpc/messages_reactions_helpers.go b/internal/rpc/messages_reactions_helpers.go index 3359aea7..f033f034 100644 --- a/internal/rpc/messages_reactions_helpers.go +++ b/internal/rpc/messages_reactions_helpers.go @@ -177,6 +177,8 @@ func messageReactionErr(err error) error { func channelReactionErr(err error) error { switch { + case errors.Is(err, domain.ErrMessageRandomIDDuplicate): + return randomIDDuplicateErr() case errors.Is(err, domain.ErrMessageIDInvalid): return messageIDInvalidErr() case errors.Is(err, domain.ErrReactionInvalid): diff --git a/internal/rpc/messages_read.go b/internal/rpc/messages_read.go index cbd60e71..fe58aa29 100644 --- a/internal/rpc/messages_read.go +++ b/internal/rpc/messages_read.go @@ -293,7 +293,11 @@ func tgReadHistoryInboxUpdate(event domain.UpdateEvent) tg.UpdateClass { } return update } - return tgReadHistoryInbox(event) + update := tgReadHistoryInbox(event) + if update == nil { + return nil + } + return update } func tgReadHistoryOutbox(event domain.UpdateEvent) *tg.UpdateReadHistoryOutbox { @@ -316,5 +320,9 @@ func tgReadHistoryOutboxUpdate(event domain.UpdateEvent) tg.UpdateClass { MaxID: event.MaxID, } } - return tgReadHistoryOutbox(event) + update := tgReadHistoryOutbox(event) + if update == nil { + return nil + } + return update } diff --git a/internal/rpc/messages_register.go b/internal/rpc/messages_register.go index d57e2a8b..6fed4a9b 100644 --- a/internal/rpc/messages_register.go +++ b/internal/rpc/messages_register.go @@ -2,11 +2,13 @@ package rpc import ( "context" + "unicode/utf8" + "github.com/iamxvbaba/td/tg" "github.com/iamxvbaba/td/tlprofile" + "telesrv/internal/compat/tdesktop" "telesrv/internal/domain" - "unicode/utf8" ) // registerMessages 注册 messages.* RPC handler。 @@ -432,6 +434,21 @@ func (r *Router) registerMessages(d *tlprofile.Dispatcher) { return &tg.MessagesDialogsNotModified{Count: hashCheck.Count}, nil } } + type pinnedLoadResult struct { + list domain.DialogList + err error + } + var pinnedLoad <-chan pinnedLoadResult + if ClientTypeFrom(ctx) == ClientTypeTDesktop && tdesktop.ShouldMergePinnedIntoInitialDialogs(filter) { + pinnedCtx, cancelPinned := context.WithCancel(ctx) + defer cancelPinned() + results := make(chan pinnedLoadResult, 1) + pinnedLoad = results + go func() { + list, err := r.pinnedDialogsList(pinnedCtx, userID, domain.DialogMainFolderID) + results <- pinnedLoadResult{list: list, err: err} + }() + } list, err := r.deps.Dialogs.GetDialogs(ctx, userID, filter) if err != nil { return nil, internalErr() @@ -440,16 +457,18 @@ func (r *Router) registerMessages(d *tlprofile.Dispatcher) { if err != nil { return nil, communityErr(err) } - if ClientTypeFrom(ctx) == ClientTypeTDesktop && tdesktop.ShouldMergePinnedIntoInitialDialogs(filter) { - pinned, err := r.pinnedDialogsList(ctx, userID, domain.DialogMainFolderID) - if err != nil { + if pinnedLoad != nil { + pinned := <-pinnedLoad + if pinned.err != nil { return nil, internalErr() } - list = tdesktop.MergeInitialDialogsWithPinned(list, pinned) - } - if filter.Hash != 0 && r.deps.Communities == nil && list.Hash == filter.Hash { - return &tg.MessagesDialogsNotModified{Count: list.Count}, nil + list = tdesktop.MergeInitialDialogsWithPinned(list, pinned.list) } + // An unknown cache entry is also the invalidation signal for metadata that + // does not alter dialog ordering (for example verified/scam/fake flags). + // In that case the peer objects must be sent once even when the freshly + // computed list hash still equals the client's hash. The response warms the + // cache, so later identical requests retain the fast NotModified path above. return r.tgMessagesDialogs(ctx, userID, r.withDialogListPresence(ctx, userID, list)), nil }) registerRPC[*tg.MessagesGetPinnedDialogsRequest](d, tlprofile.SemanticMethodMessagesGetPinnedDialogs, func(ctx context.Context, layerRequest *tg.MessagesGetPinnedDialogsRequest) (any, error) { @@ -720,6 +739,12 @@ func (r *Router) registerMessages(d *tlprofile.Dispatcher) { if isLegacyInputPeerChat(req.Peer) { return &tg.MessagesMessages{}, nil } + // P2P calls are stored exclusively in private message boxes. Returning + // an empty result is important here: falling through to channel history + // would make ordinary channel posts appear in the Calls tab. + if filter.PhoneCallsOnly { + return &tg.MessagesMessages{}, nil + } if messagesSearchFilterChatPhotos(req.Filter) { view, err := r.resolveInputPeerChannelView(ctx, userID, req.Peer, filter.Peer.ID) if err != nil { @@ -758,15 +783,11 @@ func (r *Router) registerMessages(d *tlprofile.Dispatcher) { if err := r.validateInputPeerChannelAccess(ctx, userID, req.Peer, filter.Peer.ID); err != nil { return nil, err } - categories := mediaCategoriesForFilter(req.Filter) - mediaReq := domain.MediaSearchRequest{ - Categories: categories, - OffsetID: req.OffsetID, - AddOffset: domain.ClampMessageHistoryAddOffset(req.AddOffset), - Limit: req.Limit, - MaxID: req.MaxID, - MinID: req.MinID, + mediaReq, err := r.mediaSearchRequestFromMessagesSearch(ctx, userID, req, filter) + if err != nil { + return nil, err } + categories := mediaReq.Categories if mediaSearchCanReusePeerWideCount(req) { counts, err := r.mediaCountsForPeer(ctx, userID, filter.Peer) if err != nil { @@ -843,15 +864,11 @@ func (r *Router) registerMessages(d *tlprofile.Dispatcher) { Count: counts.CountAny(mediaCategoriesForFilter(req.Filter)), }), nil } - categories := mediaCategoriesForFilter(req.Filter) - mediaReq := domain.MediaSearchRequest{ - Categories: categories, - OffsetID: req.OffsetID, - AddOffset: domain.ClampMessageHistoryAddOffset(req.AddOffset), - Limit: req.Limit, - MaxID: req.MaxID, - MinID: req.MinID, + mediaReq, err := r.mediaSearchRequestFromMessagesSearch(ctx, userID, req, filter) + if err != nil { + return nil, err } + categories := mediaReq.Categories if mediaSearchCanReusePeerWideCount(req) { counts, err := r.mediaCountsForPeer(ctx, userID, peer) if err != nil { diff --git a/internal/rpc/messages_rich_message_rpc_test.go b/internal/rpc/messages_rich_message_rpc_test.go index e1893860..b79210b2 100644 --- a/internal/rpc/messages_rich_message_rpc_test.go +++ b/internal/rpc/messages_rich_message_rpc_test.go @@ -2,6 +2,7 @@ package rpc import ( "context" + "encoding/binary" "encoding/json" "strings" "testing" @@ -20,6 +21,163 @@ import ( "telesrv/internal/store/memory" ) +func TestStoredRichMessageMissingLayerDecodesAsExact228(t *testing.T) { + legacyBlocks := []tg.PageBlockClass{&tg.PageBlockBlockquote{ + Text: &tg.TextPlain{Text: "legacy quote"}, + Caption: &tg.TextEmpty{}, + }} + var wire bin.Buffer + if err := tlprofile.EncodePageBlockVector(tlprofile.Profile228, legacyBlocks, &wire); err != nil { + t.Fatal(err) + } + raw := wire.Copy() + rich := &domain.MessageRichMessage{Blocks: raw} + got, err := tgRichMessage(rich) + if err != nil { + t.Fatal(err) + } + if rich.BlocksLayer != 0 || string(rich.Blocks) != string(raw) { + t.Fatal("legacy read mutated the persisted snapshot") + } + quote, ok := got.Blocks[0].(*tg.PageBlockBlockquote) + if !ok { + t.Fatalf("decoded block = %T", got.Blocks[0]) + } + if quote.Collapsed { + t.Fatal("Layer 228 blockquote acquired Layer 229 collapsed state") + } + text, ok := quote.Text.(*tg.TextPlain) + if !ok || text.Text != "legacy quote" { + t.Fatalf("decoded quote text = %#v", quote.Text) + } +} + +func TestNewRichMessageStoresExact229Profile(t *testing.T) { + r := &Router{} + rich, err := r.domainRichMessageFromInput(context.Background(), &tg.InputRichMessage{ + Blocks: []tg.PageBlockClass{&tg.PageBlockBlockquote{ + Collapsed: true, + Text: &tg.TextPlain{Text: "current quote"}, + Caption: &tg.TextEmpty{}, + }}, + }) + if err != nil { + t.Fatal(err) + } + if rich.BlocksLayer != int(tlprofile.ProfileCanonical) { + t.Fatalf("stored blocks layer = %d, want canonical %d", rich.BlocksLayer, tlprofile.ProfileCanonical) + } + if got := binary.LittleEndian.Uint32(rich.Blocks[8:12]); got != 0x66d1670b { + t.Fatalf("stored blockquote constructor = %#08x, want Layer 229", got) + } +} + +func TestLayer228SenderRichMessageProjectsToLayer229Receiver(t *testing.T) { + canonical := []tg.PageBlockClass{&tg.PageBlockBlockquote{ + Text: &tg.TextPlain{Text: "cross-layer quote"}, + Caption: &tg.TextEmpty{}, + }} + var senderWire bin.Buffer + if err := tlprofile.EncodePageBlockVector(tlprofile.Profile228, canonical, &senderWire); err != nil { + t.Fatal(err) + } + if got := binary.LittleEndian.Uint32(senderWire.Raw()[8:12]); got != 0x263d7c26 { + t.Fatalf("Layer 228 sender constructor = %#08x", got) + } + decodedSender, err := tlprofile.DecodePageBlockVector( + tlprofile.Profile228, + &bin.Buffer{Buf: senderWire.Copy()}, + tlprofile.Limits{}, + ) + if err != nil { + t.Fatal(err) + } + + r := &Router{} + stored, err := r.domainRichMessageFromInput(context.Background(), &tg.InputRichMessage{Blocks: decodedSender}) + if err != nil { + t.Fatal(err) + } + if stored.BlocksLayer != int(tlprofile.ProfileCanonical) { + t.Fatalf("storage layer = %d, want canonical %d", stored.BlocksLayer, tlprofile.ProfileCanonical) + } + if got := binary.LittleEndian.Uint32(stored.Blocks[8:12]); got != 0x66d1670b { + t.Fatalf("storage constructor = %#08x, want Layer 229", got) + } + + projected, err := tgRichMessage(stored) + if err != nil { + t.Fatal(err) + } + quote := projected.Blocks[0].(*tg.PageBlockBlockquote) + if quote.Collapsed { + t.Fatal("Layer 228 sender acquired collapsed=true") + } + var receiverWire bin.Buffer + if err := tlprofile.EncodePageBlockVector(tlprofile.Profile229, projected.Blocks, &receiverWire); err != nil { + t.Fatal(err) + } + if got := binary.LittleEndian.Uint32(receiverWire.Raw()[8:12]); got != 0x66d1670b { + t.Fatalf("Layer 229 receiver constructor = %#08x", got) + } +} + +func TestLayer228ReceiverSkipsLayer229OnlyRichBlocks(t *testing.T) { + message := &tg.Message{ + ID: 42, + PeerID: &tg.PeerUser{UserID: 1001}, + Date: 1700000000, + Message: "base message", + } + message.SetRichMessage(tg.RichMessage{Blocks: []tg.PageBlockClass{ + &tg.PageBlockParagraph{Text: &tg.TextPlain{Text: "compatible"}}, + &tg.PageBlockButtonRow{}, + }}) + + var wire bin.Buffer + if err := tlprofile.EncodeObject(tlprofile.Profile228, message, &wire); err != nil { + t.Fatal(err) + } + decoded, err := tlprofile.DecodeObject(tlprofile.Profile228, &bin.Buffer{Buf: wire.Copy()}, tlprofile.Limits{}) + if err != nil { + t.Fatal(err) + } + projected, ok := decoded.(*tg.Message) + if !ok { + t.Fatalf("decoded message = %T", decoded) + } + if projected.Message != "base message" { + t.Fatalf("base message = %q", projected.Message) + } + rich, present := projected.GetRichMessage() + if !present { + t.Fatal("compatible rich_message was dropped") + } + if len(rich.Blocks) != 1 { + t.Fatalf("Layer 228 rich blocks = %d, want one compatible block", len(rich.Blocks)) + } + if _, ok := rich.Blocks[0].(*tg.PageBlockParagraph); !ok { + t.Fatalf("remaining block = %T", rich.Blocks[0]) + } +} + +func TestInvalidStoredRichMessageDoesNotPanicBaseProjection(t *testing.T) { + projected, ok := tgMessage(domain.Message{ + ID: 42, + Peer: domain.Peer{Type: domain.PeerTypeUser, ID: 1001}, + RichMessage: &domain.MessageRichMessage{ + BlocksLayer: 999, + Blocks: []byte{1, 2, 3, 4}, + }, + }).(*tg.Message) + if !ok { + t.Fatal("base message projection was lost") + } + if _, present := projected.GetRichMessage(); present { + t.Fatal("invalid optional rich_message was projected") + } +} + // richTextBlocks 构造一组纯文本 IV 页面块，用于富文本往返断言。 func richTextBlocks() []tg.PageBlockClass { return richTextBlocksWith("Rich Title", "First paragraph.") diff --git a/internal/rpc/messages_saved_dialogs.go b/internal/rpc/messages_saved_dialogs.go index e405e001..09f30aae 100644 --- a/internal/rpc/messages_saved_dialogs.go +++ b/internal/rpc/messages_saved_dialogs.go @@ -353,8 +353,7 @@ func (r *Router) savedDialogsProjection(ctx context.Context, userID int64, list } } } - r.applyUsernamesToPeerObjects(ctx, users, chats) - r.applyBotVerificationIconsToPeerObjects(ctx, users, chats) + r.applyPeerIdentitiesToPeerObjects(ctx, users, chats) return users, chats } diff --git a/internal/rpc/messages_send.go b/internal/rpc/messages_send.go index 51cbc892..d83668a5 100644 --- a/internal/rpc/messages_send.go +++ b/internal/rpc/messages_send.go @@ -3,6 +3,7 @@ package rpc import ( "context" "errors" + "sort" "strings" "unicode/utf8" @@ -116,7 +117,12 @@ func (r *Router) onMessagesSendMessage(ctx context.Context, req *tg.MessagesSend if req.ClearDraft { r.clearDraftAfterSend(ctx, userID, peer, replyTo) } - return r.monoforumSendUpdates(ctx, userID, replay.channel.Channel, savedPeer, replay.channel), nil + updates, projectionErr := r.monoforumSendUpdatesStrict(ctx, userID, replay.channel.Channel, savedPeer, replay.channel) + if projectionErr != nil { + sendErr = projectionErr + return nil, projectionErr + } + return updates, nil } if err := r.checkSendRateLimit(ctx, userID, 1); err != nil { sendErr = err @@ -325,7 +331,7 @@ func (r *Router) messageReplyFromInput(ctx context.Context, userID int64, peer d replyPeer := peer if inputPeer, ok := reply.GetReplyToPeerID(); ok { parsed, err := r.checkedDomainPeerFromInputPeer(ctx, userID, inputPeer) - if err != nil || parsed != peer { + if err != nil { return nil, replyMessageIDInvalidErr() } replyPeer = parsed @@ -340,6 +346,19 @@ func (r *Router) messageReplyFromInput(ctx context.Context, userID int64, peer d if reply.ReplyToMsgID == 0 && topMsgID == 0 { return nil, replyMessageIDInvalidErr() } + // inputReplyToMessage.reply_to_peer_id is explicitly allowed to point to a + // different dialog. Private-source existence is checked transactionally by + // MessageStore; channel sources are validated here because they live in the + // channel store rather than message_boxes. + if replyPeer.Type == domain.PeerTypeChannel && reply.ReplyToMsgID > 0 { + if r.deps.Channels == nil { + return nil, replyMessageIDInvalidErr() + } + history, err := r.deps.Channels.GetMessages(ctx, userID, replyPeer.ID, []int{reply.ReplyToMsgID}) + if err != nil || len(history.Messages) != 1 || history.Messages[0].ID != reply.ReplyToMsgID { + return nil, replyMessageIDInvalidErr() + } + } quoteText, _ := reply.GetQuoteText() if utf8.RuneCountInString(quoteText) > maxReplyQuoteLength { return nil, limitInvalidErr() @@ -434,9 +453,13 @@ func (r *Router) mentionedUserIDsFromMessage(ctx context.Context, currentUserID } } if identity != nil { - for _, username := range extractMentionUsernames(message, domain.MaxChannelMentionRecipients-len(out)) { + blocked := mentionScanBlockedSpansFromTGEntities(message, entities) + for _, username := range extractMentionUsernames(message, domain.MaxChannelMentionRecipients-len(out), blocked) { user, found, err := identity.ResolveUsername(ctx, currentUserID, username) if err != nil { + if isMentionResolveMiss(err) { + continue + } return nil, internalErr() } if found { @@ -450,16 +473,29 @@ func (r *Router) mentionedUserIDsFromMessage(ctx context.Context, currentUserID return out, nil } -func extractMentionUsernames(message string, limit int) []string { +func isMentionResolveMiss(err error) bool { + return errors.Is(err, domain.ErrUsernameInvalid) || errors.Is(err, domain.ErrUsernameNotOccupied) +} + +func extractMentionUsernames(message string, limit int, blocked []byteSpan) []string { if limit <= 0 || message == "" { return nil } + blocked = mergeByteSpans(append(blocked, rawURLByteSpans(message)...)) + blockIndex := 0 seen := make(map[string]struct{}) out := make([]string, 0) for i := 0; i < len(message); i++ { if message[i] != '@' { continue } + for blockIndex < len(blocked) && blocked[blockIndex].end <= i { + blockIndex++ + } + if blockIndex < len(blocked) && blocked[blockIndex].start <= i && i < blocked[blockIndex].end { + i = blocked[blockIndex].end - 1 + continue + } if i > 0 && isUsernameByte(message[i-1]) { continue } @@ -484,6 +520,110 @@ func extractMentionUsernames(message string, limit int) []string { return out } +func mergeByteSpans(spans []byteSpan) []byteSpan { + if len(spans) == 0 { + return nil + } + out := spans[:0] + for _, span := range spans { + if span.start < 0 || span.end <= span.start { + continue + } + inserted := false + for i := range out { + if span.start < out[i].start { + out = append(out, byteSpan{}) + copy(out[i+1:], out[i:]) + out[i] = span + inserted = true + break + } + } + if !inserted { + out = append(out, span) + } + } + if len(out) == 0 { + return nil + } + merged := out[:1] + for _, span := range out[1:] { + last := &merged[len(merged)-1] + if span.start <= last.end { + if span.end > last.end { + last.end = span.end + } + continue + } + merged = append(merged, span) + } + return merged +} + +func mentionScanBlockedSpansFromTGEntities(message string, entities []tg.MessageEntityClass) []byteSpan { + if len(entities) == 0 { + return nil + } + bounds := utf16ByteBoundaries(message) + var out []byteSpan + for _, entity := range entities { + switch entity.(type) { + case *tg.MessageEntityURL, *tg.MessageEntityTextURL: + default: + continue + } + if span, ok := byteSpanFromUTF16Bounds(bounds, entity.GetOffset(), entity.GetLength()); ok { + out = append(out, span) + } + } + return out +} + +func mentionScanBlockedSpansFromDomainEntities(message string, entities []domain.MessageEntity) []byteSpan { + if len(entities) == 0 { + return nil + } + bounds := utf16ByteBoundaries(message) + var out []byteSpan + for _, entity := range entities { + if entity.Type != domain.MessageEntityURL && entity.Type != domain.MessageEntityTextURL { + continue + } + if span, ok := byteSpanFromUTF16Bounds(bounds, entity.Offset, entity.Length); ok { + out = append(out, span) + } + } + return out +} + +func utf16ByteBoundaries(message string) []int { + total := utf16CodeUnitLen(message) + bounds := make([]int, total+1) + for i := range bounds { + bounds[i] = -1 + } + unit := 0 + bounds[0] = 0 + for i, r := range message { + bounds[unit] = i + if r <= 0xFFFF { + unit++ + } else { + unit += 2 + } + bounds[unit] = i + utf8.RuneLen(r) + } + return bounds +} + +func byteSpanFromUTF16Bounds(bounds []int, offset, length int) (byteSpan, bool) { + end := offset + length + if offset < 0 || length <= 0 || end > len(bounds)-1 || bounds[offset] < 0 || bounds[end] < 0 { + return byteSpan{}, false + } + return byteSpan{start: bounds[offset], end: bounds[end]}, true +} + func isUsernameByte(b byte) bool { return (b >= 'a' && b <= 'z') || (b >= 'A' && b <= 'Z') || (b >= '0' && b <= '9') || b == '_' } @@ -543,63 +683,18 @@ func tgPrivateSendResultUpdates(res domain.SendPrivateTextResult, randomID int64 } func (r *Router) usersForMessageUpdate(ctx context.Context, ownerUserID int64, msg domain.Message) []tg.UserClass { - seen := make(map[int64]struct{}, 2) - users := make([]tg.UserClass, 0, 2) - add := func(id int64) { - if id == 0 { - return - } - if _, ok := seen[id]; ok { - return - } - seen[id] = struct{}{} - switch { - case isSystemUserID(id): - if u, ok := domain.SystemUserByID(id); ok { - users = append(users, r.tgUser(u)) - } - case id == ownerUserID: - if r.deps.Users == nil { - return - } - u, err := r.deps.Users.Self(ctx, ownerUserID) - if err == nil && u.ID != 0 { - users = append(users, r.tgSelfUser(u)) - } - default: - if r.deps.Users == nil { - return - } - u, found, err := r.deps.Users.ByID(ctx, ownerUserID, id) - if err == nil && found { - users = append(users, r.tgUser(u)) - } - } - } - if msg.From.Type == domain.PeerTypeUser { - add(msg.From.ID) - } - if msg.Peer.Type == domain.PeerTypeUser { - add(msg.Peer.ID) - } - if msg.Forward != nil && msg.Forward.From.Type == domain.PeerTypeUser { - add(msg.Forward.From.ID) - } - add(msg.ViaBotID) - if msg.ReplyTo != nil && msg.ReplyTo.Peer.Type == domain.PeerTypeUser { - add(msg.ReplyTo.Peer.ID) - } - if msg.Media != nil && msg.Media.Contact != nil { - add(msg.Media.Contact.UserID) - } - // A non-min User replaces the cached peer on iOS. Keep the complete - // username vector on synchronous message echoes instead of letting this - // response regress a previously hydrated profile to the legacy scalar. - r.applyUsernamesToPeerObjects(ctx, users, nil) - return users + return r.usersForMessageUpdates(ctx, ownerUserID, []domain.Message{msg}) +} + +func (r *Router) usersForMessageUpdateWithPreloaded(ctx context.Context, ownerUserID int64, msg domain.Message, preloaded []domain.User) []tg.UserClass { + return r.usersForMessageUpdatesWithPreloaded(ctx, ownerUserID, []domain.Message{msg}, preloaded) } func (r *Router) usersForMessageUpdates(ctx context.Context, ownerUserID int64, messages []domain.Message) []tg.UserClass { + return r.usersForMessageUpdatesWithPreloaded(ctx, ownerUserID, messages, nil) +} + +func (r *Router) usersForMessageUpdatesWithPreloaded(ctx context.Context, ownerUserID int64, messages []domain.Message, preloaded []domain.User) []tg.UserClass { seen := make(map[int64]struct{}, len(messages)*2) ids := make([]int64, 0, len(messages)*2) addID := func(id int64) { @@ -613,29 +708,30 @@ func (r *Router) usersForMessageUpdates(ctx context.Context, ownerUserID int64, ids = append(ids, id) } for _, msg := range messages { - if msg.From.Type == domain.PeerTypeUser { - addID(msg.From.ID) - } - if msg.Peer.Type == domain.PeerTypeUser { - addID(msg.Peer.ID) - } - if msg.Forward != nil && msg.Forward.From.Type == domain.PeerTypeUser { - addID(msg.Forward.From.ID) - } - addID(msg.ViaBotID) - if msg.ReplyTo != nil && msg.ReplyTo.Peer.Type == domain.PeerTypeUser { - addID(msg.ReplyTo.Peer.ID) - } - if msg.Media != nil && msg.Media.Contact != nil { - addID(msg.Media.Contact.UserID) + for _, id := range appendMessageUserIDs(nil, make(map[int64]struct{}), msg) { + addID(id) } } if len(ids) == 0 { return nil } loaded := make(map[int64]domain.User, len(ids)) - if r.deps.Users != nil { - if users, err := r.deps.Users.ByIDs(ctx, ownerUserID, ids); err == nil { + for _, user := range preloaded { + if user.ID != 0 { + loaded[user.ID] = user + } + } + missing := make([]int64, 0, len(ids)) + for _, id := range ids { + if isSystemUserID(id) { + continue + } + if _, ok := loaded[id]; !ok { + missing = append(missing, id) + } + } + if r.deps.Users != nil && len(missing) > 0 { + if users, err := r.deps.Users.ByIDs(ctx, ownerUserID, missing); err == nil { for _, user := range users { loaded[user.ID] = user } @@ -666,6 +762,46 @@ func (r *Router) chatsForMessageUpdate(ctx context.Context, ownerUserID int64, m return r.chatsForMessageUpdates(ctx, ownerUserID, []domain.Message{msg}) } +func appendMessageUserIDs(ids []int64, seen map[int64]struct{}, msg domain.Message) []int64 { + add := func(id int64) { + if id == 0 { + return + } + if _, ok := seen[id]; ok { + return + } + seen[id] = struct{}{} + ids = append(ids, id) + } + for _, peer := range []domain.Peer{msg.From, msg.Peer} { + if peer.Type == domain.PeerTypeUser { + add(peer.ID) + } + } + if msg.Forward != nil && msg.Forward.From.Type == domain.PeerTypeUser { + add(msg.Forward.From.ID) + } + add(msg.ViaBotID) + if msg.ReplyTo != nil && msg.ReplyTo.Peer.Type == domain.PeerTypeUser { + add(msg.ReplyTo.Peer.ID) + } + if msg.Media != nil && msg.Media.Contact != nil { + add(msg.Media.Contact.UserID) + } + userRefs := make(map[int64]struct{}) + channelRefs := make(map[int64]struct{}) + collectMessagePeerRefs(msg, 0, userRefs, channelRefs) + extra := make([]int64, 0, len(userRefs)) + for id := range userRefs { + extra = append(extra, id) + } + sort.Slice(extra, func(i, j int) bool { return extra[i] < extra[j] }) + for _, id := range extra { + add(id) + } + return ids +} + func appendMessageChannelIDs(ids []int64, seen map[int64]struct{}, msg domain.Message) []int64 { add := func(id int64) { if id == 0 { @@ -677,11 +813,10 @@ func appendMessageChannelIDs(ids []int64, seen map[int64]struct{}, msg domain.Me seen[id] = struct{}{} ids = append(ids, id) } - if msg.From.Type == domain.PeerTypeChannel { - add(msg.From.ID) - } - if msg.Peer.Type == domain.PeerTypeChannel { - add(msg.Peer.ID) + for _, peer := range []domain.Peer{msg.From, msg.Peer} { + if peer.Type == domain.PeerTypeChannel { + add(peer.ID) + } } if msg.Forward != nil && msg.Forward.From.Type == domain.PeerTypeChannel { add(msg.Forward.From.ID) @@ -689,6 +824,17 @@ func appendMessageChannelIDs(ids []int64, seen map[int64]struct{}, msg domain.Me if msg.ReplyTo != nil && msg.ReplyTo.Peer.Type == domain.PeerTypeChannel { add(msg.ReplyTo.Peer.ID) } + userRefs := make(map[int64]struct{}) + channelRefs := make(map[int64]struct{}) + collectMessagePeerRefs(msg, 0, userRefs, channelRefs) + extra := make([]int64, 0, len(channelRefs)) + for id := range channelRefs { + extra = append(extra, id) + } + sort.Slice(extra, func(i, j int) bool { return extra[i] < extra[j] }) + for _, id := range extra { + add(id) + } return ids } @@ -744,9 +890,13 @@ func (r *Router) mentionUserIDsFromDomain(ctx context.Context, currentUserID int } } if identity, ok := r.deps.Users.(UserIdentityService); ok && identity != nil { - for _, username := range extractMentionUsernames(message, domain.MaxChannelMentionRecipients-len(out)) { + blocked := mentionScanBlockedSpansFromDomainEntities(message, entities) + for _, username := range extractMentionUsernames(message, domain.MaxChannelMentionRecipients-len(out), blocked) { user, found, err := identity.ResolveUsername(ctx, currentUserID, username) if err != nil { + if isMentionResolveMiss(err) { + continue + } break } if found { diff --git a/internal/rpc/messages_send_rpc_test.go b/internal/rpc/messages_send_rpc_test.go index 675e270b..f5271647 100644 --- a/internal/rpc/messages_send_rpc_test.go +++ b/internal/rpc/messages_send_rpc_test.go @@ -17,16 +17,20 @@ func TestMessagesSendMessageReturnsUpdateAndRecordsOwnerContext(t *testing.T) { sender := domain.User{ID: 1000000001, AccessHash: 11, FirstName: "Sender"} recipient := domain.User{ID: 1000000002, AccessHash: 22, FirstName: "Recipient"} messages := &captureMessages{} + dialogs := &captureDialogs{} + users := &countingMapUsersService{mapUsersService: mapUsersService{users: map[int64]domain.User{sender.ID: sender, recipient.ID: recipient}}} metrics := &captureRPCMetrics{} r := New(Config{}, Deps{ Messages: messages, - Users: mapUsersService{users: map[int64]domain.User{sender.ID: sender, recipient.ID: recipient}}, + Dialogs: dialogs, + Users: users, Metrics: metrics, }, zaptest.NewLogger(t), clock.System) req := &tg.MessagesSendMessageRequest{ - Peer: &tg.InputPeerUser{UserID: recipient.ID, AccessHash: recipient.AccessHash}, - Message: "hello", - RandomID: 123456, + Peer: &tg.InputPeerUser{UserID: recipient.ID, AccessHash: recipient.AccessHash}, + Message: "hello", + RandomID: 123456, + ClearDraft: true, Entities: []tg.MessageEntityClass{ &tg.MessageEntityBold{Offset: 0, Length: 5}, &tg.MessageEntityFormattedDate{Offset: 6, Length: 8, Date: 1773436800, ShortDate: true, ShortTime: true}, @@ -82,6 +86,40 @@ func TestMessagesSendMessageReturnsUpdateAndRecordsOwnerContext(t *testing.T) { if metrics.messageSend != 1 || metrics.messageSendErr != nil { t.Fatalf("metrics send=%d err=%v, want one successful send", metrics.messageSend, metrics.messageSendErr) } + if users.byIDsCalls != 1 || users.byIDCalls != 0 || users.selfCalls != 0 { + t.Fatalf("send user lookups byIDs/byID/self = %d/%d/%d, want one shared batch projection", users.byIDsCalls, users.byIDCalls, users.selfCalls) + } +} + +func TestUsersForMessageUpdateUsesOneBatchLookup(t *testing.T) { + const ownerID int64 = 1000000001 + const peerID int64 = 1000000002 + users := &countingMapUsersService{mapUsersService: mapUsersService{users: map[int64]domain.User{ + ownerID: {ID: ownerID, FirstName: "Owner"}, + peerID: {ID: peerID, FirstName: "Peer"}, + }}} + r := New(Config{}, Deps{Users: users}, zaptest.NewLogger(t), clock.System) + + got := r.usersForMessageUpdate(context.Background(), ownerID, domain.Message{ + OwnerUserID: ownerID, + From: domain.Peer{Type: domain.PeerTypeUser, ID: ownerID}, + Peer: domain.Peer{Type: domain.PeerTypeUser, ID: peerID}, + }) + + if users.byIDsCalls != 1 || users.selfCalls != 0 || users.byIDCalls != 0 { + t.Fatalf("user lookups byIDs/self/byID = %d/%d/%d, want 1/0/0", users.byIDsCalls, users.selfCalls, users.byIDCalls) + } + if len(got) != 2 { + t.Fatalf("users = %+v, want owner and peer", got) + } + owner, ok := got[0].(*tg.User) + if !ok || owner.ID != ownerID || !owner.Self { + t.Fatalf("first user = %+v, want self owner %d", got[0], ownerID) + } + peer, ok := got[1].(*tg.User) + if !ok || peer.ID != peerID || peer.Self { + t.Fatalf("second user = %+v, want non-self peer %d", got[1], peerID) + } } func TestMessagesSendMessageRateLimitReturnsFloodWait(t *testing.T) { diff --git a/internal/rpc/messages_send_webpage_rpc_test.go b/internal/rpc/messages_send_webpage_rpc_test.go index 1751850b..2a565683 100644 --- a/internal/rpc/messages_send_webpage_rpc_test.go +++ b/internal/rpc/messages_send_webpage_rpc_test.go @@ -104,6 +104,68 @@ func TestSendChannelMessageUsesSameFutureWebPageDeadline(t *testing.T) { } } +func TestSendChannelMessageAllowsAtPathSegmentURL(t *testing.T) { + ctx := context.Background() + r, owner, channel := newRichChannelTestRouter(t) + + const message = "https://github.com/@11" + updates, err := r.onMessagesSendMessage(WithUserID(ctx, owner.ID), &tg.MessagesSendMessageRequest{ + Peer: &tg.InputPeerChannel{ChannelID: channel.ID, AccessHash: channel.AccessHash}, + Message: message, + RandomID: 5107, + }) + if err != nil { + t.Fatalf("send channel message with @ path segment URL: %v", err) + } + msg := newMessageFromUpdates(t, updates) + if msg.Message != message { + t.Fatalf("message = %q, want %q", msg.Message, message) + } + var urls, mentions int + for _, entity := range msg.Entities { + switch entity.(type) { + case *tg.MessageEntityURL: + urls++ + case *tg.MessageEntityMention: + mentions++ + } + } + if urls != 1 || mentions != 0 { + t.Fatalf("entities url=%d mention=%d, want url=1 mention=0: %#v", urls, mentions, msg.Entities) + } +} + +func TestSendChannelMessageAllowsBareDomainAtPathSegmentURL(t *testing.T) { + ctx := context.Background() + r, owner, channel := newRichChannelTestRouter(t) + + const message = "github.com/@alice" + updates, err := r.onMessagesSendMessage(WithUserID(ctx, owner.ID), &tg.MessagesSendMessageRequest{ + Peer: &tg.InputPeerChannel{ChannelID: channel.ID, AccessHash: channel.AccessHash}, + Message: message, + RandomID: 5108, + }) + if err != nil { + t.Fatalf("send channel message with bare @ path segment URL: %v", err) + } + msg := newMessageFromUpdates(t, updates) + if msg.Message != message { + t.Fatalf("message = %q, want %q", msg.Message, message) + } + var urls, mentions int + for _, entity := range msg.Entities { + switch entity.(type) { + case *tg.MessageEntityURL: + urls++ + case *tg.MessageEntityMention: + mentions++ + } + } + if urls != 1 || mentions != 0 { + t.Fatalf("entities url=%d mention=%d, want url=1 mention=0: %#v", urls, mentions, msg.Entities) + } +} + // TestSendMessageAttachesCachedDoneCard 验证：URL 已缓存解析时，发送 echo 直接带 done 卡片 // （非 pending）——官方行为，TDesktop 据此立即渲染、不依赖异步换卡。 func TestSendMessageAttachesCachedDoneCard(t *testing.T) { diff --git a/internal/rpc/messages_suggested_post.go b/internal/rpc/messages_suggested_post.go index 1649b54b..30290d82 100644 --- a/internal/rpc/messages_suggested_post.go +++ b/internal/rpc/messages_suggested_post.go @@ -65,7 +65,7 @@ func (r *Router) onMessagesToggleSuggestedPostApproval(ctx context.Context, req if !result.Duplicate { r.enqueueSuggestedPostApprovalFanout(ctx, userID, result) } - return r.suggestedPostApprovalUpdates(ctx, userID, result), nil + return r.suggestedPostApprovalUpdatesStrict(ctx, userID, result) } func suggestedPostApprovalErr(err error) error { diff --git a/internal/rpc/messages_suggested_post_rpc_test.go b/internal/rpc/messages_suggested_post_rpc_test.go index 20977a5a..206378c3 100644 --- a/internal/rpc/messages_suggested_post_rpc_test.go +++ b/internal/rpc/messages_suggested_post_rpc_test.go @@ -2,6 +2,7 @@ package rpc import ( "context" + "errors" "testing" "time" @@ -17,6 +18,33 @@ import ( "telesrv/internal/store/memory" ) +func TestSuggestedPostApprovalUpdatesFailsClosedOnIncompleteUserEnvelope(t *testing.T) { + const ( + viewerID = int64(1000000401) + savedPeerID = int64(1000000402) + monoforumID = int64(1000000491) + ) + router := New(Config{}, Deps{Users: mapUsersService{users: map[int64]domain.User{ + viewerID: {ID: viewerID, FirstName: "viewer"}, + }}}, zaptest.NewLogger(t), clock.System) + savedPeer := domain.Peer{Type: domain.PeerTypeUser, ID: savedPeerID} + message := domain.ChannelMessage{ + ChannelID: monoforumID, ID: 1, SenderUserID: viewerID, + From: domain.Peer{Type: domain.PeerTypeUser, ID: viewerID}, SavedPeer: savedPeer, + Date: 1700000800, + } + result := domain.ToggleSuggestedPostApprovalResult{ + Monoforum: domain.Channel{ID: monoforumID, Monoforum: true}, SavedPeer: savedPeer, + OriginalMessage: message, + OriginalEvent: domain.ChannelUpdateEvent{ChannelID: monoforumID, Type: domain.ChannelUpdateEditMessage, Pts: 3, PtsCount: 1, Message: message}, + } + + updates, err := router.suggestedPostApprovalUpdatesStrict(context.Background(), viewerID, result) + if !errors.Is(err, ErrDurableUserProjectionIncomplete) || updates != nil { + t.Fatalf("suggested-post strict envelope = %T, %v; want nil ErrDurableUserProjectionIncomplete", updates, err) + } +} + func TestMessagesToggleSuggestedPostApprovalRegisteredAndProjectsLifecycle(t *testing.T) { ctx := context.Background() users := memory.NewUserStore() diff --git a/internal/rpc/messages_suggested_post_updates.go b/internal/rpc/messages_suggested_post_updates.go index 54935371..466eacdb 100644 --- a/internal/rpc/messages_suggested_post_updates.go +++ b/internal/rpc/messages_suggested_post_updates.go @@ -8,7 +8,16 @@ import ( "telesrv/internal/domain" ) -func (r *Router) suggestedPostApprovalUpdates(ctx context.Context, viewerUserID int64, result domain.ToggleSuggestedPostApprovalResult) *tg.Updates { +func (r *Router) suggestedPostApprovalUpdatesStrict(ctx context.Context, viewerUserID int64, result domain.ToggleSuggestedPostApprovalResult) (*tg.Updates, error) { + return r.suggestedPostApprovalUpdatesWithPeerCacheAndOverlaysStrict(ctx, viewerUserID, result, nil, nil) +} + +func (r *Router) suggestedPostApprovalUpdatesWithPeerCacheAndOverlays(ctx context.Context, viewerUserID int64, result domain.ToggleSuggestedPostApprovalResult, cache *viewerPeerCache, overlays *monoforumPeerOverlays) *tg.Updates { + updates, _ := r.suggestedPostApprovalUpdatesWithPeerCacheAndOverlaysStrict(ctx, viewerUserID, result, cache, overlays) + return updates +} + +func (r *Router) suggestedPostApprovalUpdatesWithPeerCacheAndOverlaysStrict(ctx context.Context, viewerUserID int64, result domain.ToggleSuggestedPostApprovalResult, cache *viewerPeerCache, overlays *monoforumPeerOverlays) (*tg.Updates, error) { updates := make([]tg.UpdateClass, 0, 4) if result.OriginalEvent.Pts > 0 { if update := tgChannelUpdate(viewerUserID, result.OriginalEvent); update != nil { @@ -39,12 +48,24 @@ func (r *Router) suggestedPostApprovalUpdates(ctx context.Context, viewerUserID if result.Published != nil { messages = append(messages, result.Published.Message) } + if cache == nil { + cache = newViewerPeerCache(r) + } + if overlays == nil { + ids := monoforumSubscriberUserIDs([]domain.MonoforumDialog{{SavedPeer: result.SavedPeer}}, messages) + overlays = r.loadMonoforumPeerOverlays(ctx, monoforumProjectionPeers(result.Monoforum.ID, result.Parent.ID, ids)) + } + users, err := r.monoforumSubscriberUsersWithPeerCacheAndOverlaysStrict(ctx, viewerUserID, []domain.MonoforumDialog{{SavedPeer: result.SavedPeer}}, messages, cache, overlays) + if err != nil { + return nil, err + } + applyMonoforumPeerOverlays(nil, chats, overlays) return &tg.Updates{ Updates: updates, Chats: chats, - Users: r.monoforumSubscriberUsers(ctx, viewerUserID, []domain.MonoforumDialog{{SavedPeer: result.SavedPeer}}, messages), + Users: users, Date: int(r.clock.Now().Unix()), - } + }, nil } func (r *Router) enqueueSuggestedPostApprovalFanout(ctx context.Context, originUserID int64, result domain.ToggleSuggestedPostApprovalResult) { @@ -52,9 +73,29 @@ func (r *Router) enqueueSuggestedPostApprovalFanout(ctx context.Context, originU monoOnly.Published = nil nudge := max(result.OriginalEvent.Pts, result.ServiceEvent.Pts) if nudge > 0 { - r.enqueueChannelFanout(ctx, channelFanoutExplicit, originUserID, result.Monoforum.ID, nudge, result.Recipients, func(bgCtx context.Context, viewerUserID int64) *tg.Updates { - return r.suggestedPostApprovalUpdates(bgCtx, viewerUserID, monoOnly) - }) + messages := make([]domain.ChannelMessage, 0, 2) + if monoOnly.OriginalMessage.ID != 0 { + messages = append(messages, monoOnly.OriginalMessage) + } + if monoOnly.ServiceMessage.ID != 0 { + messages = append(messages, monoOnly.ServiceMessage) + } + ownerIDs := monoforumSubscriberUserIDs([]domain.MonoforumDialog{{SavedPeer: monoOnly.SavedPeer}}, messages) + fanoutCache := newViewerPeerCache(r) + projectionPeers := monoforumProjectionPeers(monoOnly.Monoforum.ID, monoOnly.Parent.ID, ownerIDs) + var overlays *monoforumPeerOverlays + r.enqueueChannelFanoutWithPrefetch(ctx, channelFanoutExplicit, originUserID, result.Monoforum.ID, nudge, result.Recipients, + 0, + func(bgCtx context.Context, viewers []int64) bool { + if !r.prefetchChannelFanoutUsers(bgCtx, fanoutCache, viewers, ownerIDs) { + return false + } + overlays = r.loadMonoforumPeerOverlays(bgCtx, projectionPeers) + return true + }, + func(bgCtx context.Context, viewerUserID int64) *tg.Updates { + return r.suggestedPostApprovalUpdatesWithPeerCacheAndOverlays(bgCtx, viewerUserID, monoOnly, fanoutCache, overlays) + }) } if result.Published != nil && result.Published.Event.Pts > 0 { r.enqueueChannelMessageFanout(ctx, originUserID, *result.Published, nil) diff --git a/internal/rpc/metrics.go b/internal/rpc/metrics.go index ea74f44e..164eb1c9 100644 --- a/internal/rpc/metrics.go +++ b/internal/rpc/metrics.go @@ -9,6 +9,11 @@ type Metrics interface { OutboxClaimed(count int) OutboxDelivered(d time.Duration) OutboxFailed(err error) + PresenceLastSeenBatch(count int, d time.Duration, err error) + PresenceLastSeenSubmitted() + PresenceLastSeenPending(delta int) + PresenceLastSeenOverflow() + PresenceLastSeenDrainDropped(count int) } // NopMetrics 是 Metrics 的空实现。 @@ -23,3 +28,13 @@ func (NopMetrics) OutboxClaimed(int) {} func (NopMetrics) OutboxDelivered(time.Duration) {} func (NopMetrics) OutboxFailed(error) {} + +func (NopMetrics) PresenceLastSeenBatch(int, time.Duration, error) {} + +func (NopMetrics) PresenceLastSeenSubmitted() {} + +func (NopMetrics) PresenceLastSeenPending(int) {} + +func (NopMetrics) PresenceLastSeenOverflow() {} + +func (NopMetrics) PresenceLastSeenDrainDropped(int) {} diff --git a/internal/rpc/moderation_profile_update_test.go b/internal/rpc/moderation_profile_update_test.go index 50e02fe9..e44e056c 100644 --- a/internal/rpc/moderation_profile_update_test.go +++ b/internal/rpc/moderation_profile_update_test.go @@ -57,7 +57,8 @@ func TestUserModerationFlagsPushStandardNonPTSUpdate(t *testing.T) { audience: []int64{targetID, onlineViewerID, offlineViewerID}, } sessions := &captureSessions{onlineUserIDs: []int64{targetID, onlineViewerID}} - r := New(Config{}, Deps{Users: users, Sessions: sessions}, zap.NewNop(), clock.System) + dialogs := &captureDialogs{} + r := New(Config{}, Deps{Users: users, Sessions: sessions, Dialogs: dialogs}, zap.NewNop(), clock.System) if err := r.NotifyUserModerationFlagsChanged(context.Background(), domain.User{ ID: targetID, FirstName: "Flagged", Scam: true, @@ -71,6 +72,15 @@ func TestUserModerationFlagsPushStandardNonPTSUpdate(t *testing.T) { if len(users.viewers) != 2 || users.viewers[0] != targetID || users.viewers[1] != onlineViewerID { t.Fatalf("projected viewers = %v", users.viewers) } + if len(dialogs.invalidatedDialogs) != 3 { + t.Fatalf("dialog hash invalidations = %+v, want online and offline audience", dialogs.invalidatedDialogs) + } + for i, viewerID := range []int64{targetID, onlineViewerID, offlineViewerID} { + got := dialogs.invalidatedDialogs[i] + if got.userID != viewerID || got.peer != (domain.Peer{Type: domain.PeerTypeUser, ID: targetID}) { + t.Fatalf("dialog hash invalidation[%d] = %+v", i, got) + } + } updates, ok := sessions.lastUserPush().(*tg.Updates) if !ok || len(updates.Updates) != 1 { t.Fatalf("updates = %T %+v", sessions.lastUserPush(), sessions.lastUserPush()) diff --git a/internal/rpc/outbox_dispatcher.go b/internal/rpc/outbox_dispatcher.go index f4850deb..258b7204 100644 --- a/internal/rpc/outbox_dispatcher.go +++ b/internal/rpc/outbox_dispatcher.go @@ -3,6 +3,7 @@ package rpc import ( "context" "errors" + "fmt" "sort" "sync" "time" @@ -16,7 +17,7 @@ import ( ) const ( - defaultOutboxBatch = 100 + defaultOutboxBatch = 10 defaultOutboxInterval = 200 * time.Millisecond defaultOutboxWorkers = 4 // outboxLogicalShards 是稳定 user→lane 哈希空间。它不随运行时 worker 数变化， @@ -31,6 +32,9 @@ const ( var ( errMissingOutboxEvent = errors.New("missing outbox update event") + errOutboxUpdateBuilderMissing = errors.New("outbox update builder is required") + errOutboxUpdateBuilderCount = errors.New("outbox update builder returned mismatched count") + errOutboxUpdateBuilderEmpty = errors.New("outbox update builder returned a nil non-noop update") errInvalidOutboxExclusionPair = errors.New("outbox exclusion requires both raw auth key and session id") ) @@ -60,7 +64,7 @@ type OutboxUpdateRequest struct { } // OutboxUpdateBuilder 按接收者视角批量把 domain.UpdateEvent 转为 TL updates。 -type OutboxUpdateBuilder func(ctx context.Context, requests []OutboxUpdateRequest) []*tg.Updates +type OutboxUpdateBuilder func(ctx context.Context, requests []OutboxUpdateRequest) ([]*tg.Updates, error) // WithOutboxUpdateBuilder 注入按接收者视角的批量 updates 构建器。 func WithOutboxUpdateBuilder(builder OutboxUpdateBuilder) OutboxOption { @@ -333,7 +337,24 @@ func (d *OutboxDispatcher) dispatchBatch(ctx context.Context, items []store.Disp ready = append(ready, outboxDispatchReady{item: item}) requests = append(requests, OutboxUpdateRequest{TargetUserID: item.TargetUserID, Event: event}) } - builtUpdates := d.buildOutboxUpdates(ctx, requests) + builtUpdates, err := d.buildOutboxUpdates(ctx, requests) + if err != nil { + // 聚合构建失败不代表每个 durable row 都坏了。复用本批已经加载的 event + // 做 singleton 隔离，避免某一条坏数据或批量容量错误污染无关用户；同一用户 + // 的 lane head 一旦失败，后续 pts 仍不得越过。 + d.log.Warn("batch build dispatch outbox updates; isolating items", zap.Error(err)) + clear(blockedUsers) + for i, entry := range ready { + item := entry.item + if _, blocked := blockedUsers[item.TargetUserID]; blocked { + continue + } + if !d.dispatchPreparedItem(ctx, item, requests[i].Event, time.Now()) { + blockedUsers[item.TargetUserID] = struct{}{} + } + } + return + } delivered := make([]store.DispatchOutboxItem, 0, len(items)) clear(blockedUsers) for i, entry := range ready { @@ -395,7 +416,17 @@ func (d *OutboxDispatcher) dispatchItem(ctx context.Context, item store.Dispatch d.markDispatchFailed(ctx, item, errMissingOutboxEvent) return false } - update := d.buildOutboxUpdate(ctx, item, events[0]) + return d.dispatchPreparedItem(ctx, item, events[0], start) +} + +// dispatchPreparedItem 构建并投递一条已经加载、且 exclusion pair 已验证的 event。 +// 批量构建隔离路径调用它时不会再次读取 event store。 +func (d *OutboxDispatcher) dispatchPreparedItem(ctx context.Context, item store.DispatchOutboxItem, event domain.UpdateEvent, start time.Time) bool { + update, err := d.buildOutboxUpdate(ctx, item, event) + if err != nil { + d.markDispatchFailed(ctx, item, err) + return false + } if update == nil { if err := d.outbox.MarkDelivered(ctx, item); err != nil { d.log.Warn("mark noop dispatch delivered", zap.Int64("target_user_id", item.TargetUserID), zap.Int64("outbox_id", item.ID), zap.Error(err)) @@ -433,33 +464,38 @@ func (d *OutboxDispatcher) dispatchItem(ctx context.Context, item store.Dispatch return true } -func (d *OutboxDispatcher) buildOutboxUpdate(ctx context.Context, item store.DispatchOutboxItem, event domain.UpdateEvent) *tg.Updates { - updates := d.buildOutboxUpdates(ctx, []OutboxUpdateRequest{{TargetUserID: item.TargetUserID, Event: event}}) - if len(updates) == 0 { - return nil +func (d *OutboxDispatcher) buildOutboxUpdate(ctx context.Context, item store.DispatchOutboxItem, event domain.UpdateEvent) (*tg.Updates, error) { + updates, err := d.buildOutboxUpdates(ctx, []OutboxUpdateRequest{{TargetUserID: item.TargetUserID, Event: event}}) + if err != nil { + return nil, err } - return updates[0] + if len(updates) == 0 { + return nil, nil + } + return updates[0], nil } -func (d *OutboxDispatcher) buildOutboxUpdates(ctx context.Context, requests []OutboxUpdateRequest) []*tg.Updates { +func (d *OutboxDispatcher) buildOutboxUpdates(ctx context.Context, requests []OutboxUpdateRequest) ([]*tg.Updates, error) { out := make([]*tg.Updates, len(requests)) if len(requests) == 0 { - return out + return out, nil } - if d.updateBuilder != nil { - built := d.updateBuilder(ctx, requests) - if len(built) == len(requests) { - return built + if d.updateBuilder == nil { + return nil, errOutboxUpdateBuilderMissing + } + built, err := d.updateBuilder(ctx, requests) + if err != nil { + return nil, err + } + if len(built) != len(requests) { + return nil, fmt.Errorf("%w: got %d want %d", errOutboxUpdateBuilderCount, len(built), len(requests)) + } + for i := range built { + if built[i] == nil && requests[i].Event.Type != domain.UpdateEventNoop { + return nil, fmt.Errorf("%w: index=%d user_id=%d pts=%d event_type=%s", errOutboxUpdateBuilderEmpty, i, requests[i].TargetUserID, requests[i].Event.Pts, requests[i].Event.Type) } - d.log.Warn("outbox update builder returned mismatched count", - zap.Int("requests", len(requests)), - zap.Int("updates", len(built)), - ) } - for i, req := range requests { - out[i] = tgUpdateForOutboxEvent(req.Event) - } - return out + return built, nil } // pushOutboxUpdate 投递一条 outbox update，返回 (送达的在线 session 数, 是否可重试, err)。 @@ -527,6 +563,9 @@ func tgUpdateForOutboxEventForViewer(event domain.UpdateEvent, viewerUserID int6 } switch event.Type { case domain.UpdateEventNewMessage: + if event.Message.Deleted { + return tgDeletedPrivateMessageOutboxUpdate(event) + } return tgPrivateMessageUpdates(event, event.Message, 0, false, tgUsersForViewer(viewerUserID, event.Users), tgChannels(viewerUserID, event.Channels)) case domain.UpdateEventReadHistoryInbox, domain.UpdateEventReadHistoryOutbox: var update tg.UpdateClass @@ -569,6 +608,29 @@ func tgUpdateForOutboxEventForViewer(event domain.UpdateEvent, viewerUserID int6 } } +func tgDeletedPrivateMessageOutboxUpdate(event domain.UpdateEvent) *tg.Updates { + if event.Pts <= 0 || event.PtsCount <= 0 { + return nil + } + ids := []int{} + if event.Message.ID > 0 && event.Message.ID <= domain.MaxMessageBoxID { + ids = append(ids, event.Message.ID) + } + date := event.Date + if date == 0 { + date = event.Message.Date + } + return &tg.Updates{ + Updates: []tg.UpdateClass{&tg.UpdateDeleteMessages{ + Messages: ids, + Pts: event.Pts, + PtsCount: event.PtsCount, + }}, + Date: date, + Seq: 0, + } +} + // appendAuxPtsBookkeeping 给"占账号 pts 但 TL update 不带 pts"的事件附一条 // 空 updateDeleteMessages：客户端按 pts/pts_count 推进本地水位且不产生任何 // 可见变化。没有它，客户端水位停在事件前，下一条带 pts 的更新会被判为空洞。 diff --git a/internal/rpc/outbox_dispatcher_test.go b/internal/rpc/outbox_dispatcher_test.go index b6598af5..76ab686c 100644 --- a/internal/rpc/outbox_dispatcher_test.go +++ b/internal/rpc/outbox_dispatcher_test.go @@ -13,12 +13,29 @@ import ( "github.com/iamxvbaba/td/clock" "github.com/iamxvbaba/td/proto" "github.com/iamxvbaba/td/tg" + "go.uber.org/zap" "go.uber.org/zap/zaptest" "telesrv/internal/domain" "telesrv/internal/store" ) +func newTestOutboxDispatcher(events store.UpdateEventStore, outbox store.DispatchOutboxStore, sessions SessionBinder, log *zap.Logger, opts ...OutboxOption) *OutboxDispatcher { + testBuilder := WithOutboxUpdateBuilder(func(_ context.Context, requests []OutboxUpdateRequest) ([]*tg.Updates, error) { + out := make([]*tg.Updates, len(requests)) + for i, req := range requests { + viewerUserID := req.TargetUserID + if viewerUserID == 0 { + viewerUserID = req.Event.UserID + } + out[i] = tgUpdateForOutboxEventForViewer(req.Event, viewerUserID) + } + return out, nil + }) + opts = append([]OutboxOption{testBuilder}, opts...) + return NewOutboxDispatcher(events, outbox, sessions, log, opts...) +} + func TestOutboxDispatcherPushesNewMessageAndMarksDelivered(t *testing.T) { msg := domain.Message{ ID: 10, @@ -51,7 +68,7 @@ func TestOutboxDispatcherPushesNewMessageAndMarksDelivered(t *testing.T) { }}} sessions := &captureSessions{} metrics := &captureOutboxMetrics{} - dispatcher := NewOutboxDispatcher(events, outbox, sessions, zaptest.NewLogger(t), WithOutboxMetrics(metrics)) + dispatcher := newTestOutboxDispatcher(events, outbox, sessions, zaptest.NewLogger(t), WithOutboxMetrics(metrics)) dispatcher.DispatchOnce(context.Background()) if !outbox.delivered || outbox.deliveredUserID != msg.OwnerUserID || outbox.deliveredID != 55 { @@ -76,6 +93,37 @@ func TestOutboxDispatcherPushesNewMessageAndMarksDelivered(t *testing.T) { } } +func TestOutboxEventDeletedNewMessageUsesDeletePtsUpdate(t *testing.T) { + msg := domain.Message{ + ID: 547, + OwnerUserID: 1000000001, + Peer: domain.Peer{Type: domain.PeerTypeUser, ID: 1000000002}, + From: domain.Peer{Type: domain.PeerTypeUser, ID: 1000000001}, + Date: 1700000301, + Body: "deleted before dispatch", + Pts: 2035, + Deleted: true, + } + updates := tgUpdateForOutboxEvent(domain.UpdateEvent{ + UserID: msg.OwnerUserID, + Type: domain.UpdateEventNewMessage, + Pts: msg.Pts, + PtsCount: 1, + Date: msg.Date, + Message: msg, + }) + if updates == nil || len(updates.Updates) != 1 { + t.Fatalf("updates = %+v, want one delete pts update", updates) + } + del, ok := updates.Updates[0].(*tg.UpdateDeleteMessages) + if !ok { + t.Fatalf("update = %T, want UpdateDeleteMessages instead of UpdateNewMessage", updates.Updates[0]) + } + if del.Pts != msg.Pts || del.PtsCount != 1 || len(del.Messages) != 1 || del.Messages[0] != msg.ID { + t.Fatalf("delete update = %+v, want message %d at pts=%d", del, msg.ID, msg.Pts) + } +} + func TestOutboxDispatcherUsesScopedAuthKeyExclusion(t *testing.T) { var excludeAuthKeyID [8]byte excludeAuthKeyID[0] = 7 @@ -97,7 +145,7 @@ func TestOutboxDispatcherUsesScopedAuthKeyExclusion(t *testing.T) { Peer: peer, }}} sessions := &captureScopedSessions{captureSessions: &captureSessions{}} - dispatcher := NewOutboxDispatcher(events, outbox, sessions, zaptest.NewLogger(t)) + dispatcher := newTestOutboxDispatcher(events, outbox, sessions, zaptest.NewLogger(t)) dispatcher.DispatchOnce(context.Background()) if sessions.scopedAuthKey() != excludeAuthKeyID || sessions.sessionID != 99 || sessions.userID != 1000000002 { @@ -130,7 +178,7 @@ func TestOutboxDispatcherRejectsPartialSessionExclusion(t *testing.T) { events := &captureUpdateEventStore{} sessions := &captureSessions{} metrics := &captureOutboxMetrics{} - dispatcher := NewOutboxDispatcher(events, outbox, sessions, zaptest.NewLogger(t), WithOutboxMetrics(metrics)) + dispatcher := newTestOutboxDispatcher(events, outbox, sessions, zaptest.NewLogger(t), WithOutboxMetrics(metrics)) dispatcher.DispatchOnce(context.Background()) if !outbox.failed || outbox.delivered { @@ -163,7 +211,7 @@ func TestOutboxDispatcherBatchRejectsPartialExclusionBeforeNoop(t *testing.T) { EventType: domain.UpdateEventNoop, ExcludeAuthKeyID: [8]byte{1}, }}}} - dispatcher := NewOutboxDispatcher(events, outbox, &captureSessions{}, zaptest.NewLogger(t)) + dispatcher := newTestOutboxDispatcher(events, outbox, &captureSessions{}, zaptest.NewLogger(t)) dispatcher.DispatchOnce(context.Background()) if !outbox.failed || outbox.delivered || len(outbox.deliveredBatch) != 0 { @@ -208,7 +256,7 @@ func TestOutboxDispatcherBatchPath(t *testing.T) { }}}} sessions := &captureSessions{} metrics := &captureOutboxMetrics{} - dispatcher := NewOutboxDispatcher(events, outbox, sessions, zaptest.NewLogger(t), WithOutboxMetrics(metrics)) + dispatcher := newTestOutboxDispatcher(events, outbox, sessions, zaptest.NewLogger(t), WithOutboxMetrics(metrics)) dispatcher.DispatchOnce(context.Background()) if len(events.batchCursors) != 1 || events.batchCursors[0] != (store.EventCursor{UserID: msg.OwnerUserID, Pts: msg.Pts}) { @@ -266,7 +314,10 @@ func TestRouterBuildOutboxUpdatesProjectsSenderPerViewerAndCaches(t *testing.T) }) } - updates := router.BuildOutboxUpdates(context.Background(), requests) + updates, err := router.BuildOutboxUpdates(context.Background(), requests) + if err != nil { + t.Fatalf("BuildOutboxUpdates: %v", err) + } if len(updates) != len(requests) { t.Fatalf("updates count = %d, want %d", len(updates), len(requests)) } @@ -286,11 +337,74 @@ func TestRouterBuildOutboxUpdatesProjectsSenderPerViewerAndCaches(t *testing.T) t.Fatalf("updates[%d] user photo = %#v, want photo_id=%d dc=%d", i, user.Photo, projected.PhotoID, projected.PhotoDCID) } } - if len(users.calls) != 1 { - t.Fatalf("ByIDs calls = %+v, want one batch call for repeated sender", users.calls) + if users.sparseCalls != 1 || len(users.calls) != 0 { + t.Fatalf("user projection calls = sparse %d scalar %+v, want one sparse call", users.sparseCalls, users.calls) } - if users.calls[0].viewerUserID != viewerUserID || !reflect.DeepEqual(users.calls[0].ids, []int64{senderUserID}) { - t.Fatalf("ByIDs call = %+v, want viewer=%d ids=[%d]", users.calls[0], viewerUserID, senderUserID) + if !reflect.DeepEqual(users.sparseRequest[viewerUserID], []int64{senderUserID}) { + t.Fatalf("sparse request = %+v, want viewer=%d ids=[%d]", users.sparseRequest, viewerUserID, senderUserID) + } +} + +func TestRouterBuildOutboxUpdatesReplacesRawOnlyUserEnvelopeWithoutScalarFallback(t *testing.T) { + const ( + senderUserID = int64(1000000101) + rawOnlyUserID = int64(1000000102) + viewerUserID = int64(1000000103) + ) + users := &countingOutboxUsersService{users: map[int64]domain.User{ + senderUserID: {ID: senderUserID, FirstName: "Projected sender"}, + rawOnlyUserID: {ID: rawOnlyUserID, FirstName: "Projected raw-only"}, + }} + router := New(Config{}, Deps{Users: users}, zaptest.NewLogger(t), clock.System) + message := domain.Message{ + ID: 31, + OwnerUserID: viewerUserID, + Peer: domain.Peer{Type: domain.PeerTypeUser, ID: senderUserID}, + From: domain.Peer{Type: domain.PeerTypeUser, ID: senderUserID}, + Date: 1700000500, + Pts: 31, + } + + updates, err := router.BuildOutboxUpdates(context.Background(), []OutboxUpdateRequest{{ + TargetUserID: viewerUserID, + Event: domain.UpdateEvent{ + UserID: viewerUserID, Type: domain.UpdateEventNewMessage, + Pts: message.Pts, PtsCount: 1, Date: message.Date, Message: message, + Users: []domain.User{ + {ID: senderUserID, AccessHash: 9001, Phone: "raw-sender-phone", FirstName: "Raw sender"}, + {ID: rawOnlyUserID, AccessHash: 9002, Phone: "raw-only-phone", FirstName: "Raw only"}, + }, + }, + }}) + if err != nil || len(updates) != 1 || updates[0] == nil { + t.Fatalf("BuildOutboxUpdates = %+v, %v; want one update", updates, err) + } + projected := make(map[int64]*tg.User, len(updates[0].Users)) + for _, item := range updates[0].Users { + if user, ok := item.(*tg.User); ok { + projected[user.ID] = user + } + } + if len(projected) != 2 { + t.Fatalf("projected users = %+v, want sender and raw-only user", updates[0].Users) + } + for id, wantName := range map[int64]string{ + senderUserID: "Projected sender", + rawOnlyUserID: "Projected raw-only", + } { + user := projected[id] + if user == nil || user.FirstName != wantName { + t.Fatalf("projected user %d = %#v, want name %q", id, user, wantName) + } + if user.Phone != "" || user.AccessHash != 0 { + t.Fatalf("raw account fields leaked for user %d: phone=%q access_hash=%d", id, user.Phone, user.AccessHash) + } + } + if users.sparseCalls != 1 || len(users.calls) != 0 { + t.Fatalf("user projection calls = sparse %d scalar %+v, want one sparse call and zero scalar fallbacks", users.sparseCalls, users.calls) + } + if !reflect.DeepEqual(users.sparseRequest[viewerUserID], []int64{senderUserID, rawOnlyUserID}) { + t.Fatalf("sparse request = %+v, want viewer=%d ids=[%d %d]", users.sparseRequest, viewerUserID, senderUserID, rawOnlyUserID) } } @@ -340,7 +454,10 @@ func TestRouterBuildOutboxUpdatesProjectsUsernamesOncePerClaim(t *testing.T) { }) } - updates := router.BuildOutboxUpdates(context.Background(), requests) + updates, err := router.BuildOutboxUpdates(context.Background(), requests) + if err != nil { + t.Fatalf("BuildOutboxUpdates: %v", err) + } if len(updates) != len(requests) { t.Fatalf("updates count = %d, want %d", len(updates), len(requests)) } @@ -408,7 +525,10 @@ func TestRouterBuildOutboxUpdatesSeparatesViewerCache(t *testing.T) { }, } - updates := router.BuildOutboxUpdates(context.Background(), requests) + updates, err := router.BuildOutboxUpdates(context.Background(), requests) + if err != nil { + t.Fatalf("BuildOutboxUpdates: %v", err) + } if len(updates) != 2 || updates[0] == nil || updates[1] == nil { t.Fatalf("updates = %+v, want two updates", updates) } @@ -423,12 +543,11 @@ func TestRouterBuildOutboxUpdatesSeparatesViewerCache(t *testing.T) { if firstUser.FirstName != "viewer2" || secondUser.FirstName != "viewer3" { t.Fatalf("projected users = %q/%q, want viewer-specific names", firstUser.FirstName, secondUser.FirstName) } - wantCalls := []outboxUsersCall{ - {viewerUserID: 1000000002, ids: []int64{senderUserID}}, - {viewerUserID: 1000000003, ids: []int64{senderUserID}}, + if users.sparseCalls != 1 || len(users.calls) != 0 { + t.Fatalf("user projection calls = sparse %d scalar %+v, want one sparse call", users.sparseCalls, users.calls) } - if !sameOutboxUsersCalls(users.calls, wantCalls) { - t.Fatalf("ByIDs calls = %+v, want %+v", users.calls, wantCalls) + if !reflect.DeepEqual(users.sparseRequest[1000000002], []int64{senderUserID}) || !reflect.DeepEqual(users.sparseRequest[1000000003], []int64{senderUserID}) { + t.Fatalf("sparse request = %+v, want one sender edge per viewer", users.sparseRequest) } } @@ -521,7 +640,7 @@ func TestOutboxDispatcherBatchPathUsesUpdateBuilder(t *testing.T) { outbox := &batchDispatchOutbox{captureDispatchOutbox: &captureDispatchOutbox{items: items}} sessions := &orderedOutboxCaptureSessions{} var gotRequests []OutboxUpdateRequest - builder := func(_ context.Context, requests []OutboxUpdateRequest) []*tg.Updates { + builder := func(_ context.Context, requests []OutboxUpdateRequest) ([]*tg.Updates, error) { gotRequests = append([]OutboxUpdateRequest(nil), requests...) out := make([]*tg.Updates, len(requests)) for i, req := range requests { @@ -536,9 +655,9 @@ func TestOutboxDispatcherBatchPathUsesUpdateBuilder(t *testing.T) { Date: req.Event.Date, } } - return out + return out, nil } - dispatcher := NewOutboxDispatcher(events, outbox, sessions, zaptest.NewLogger(t), WithOutboxUpdateBuilder(builder)) + dispatcher := newTestOutboxDispatcher(events, outbox, sessions, zaptest.NewLogger(t), WithOutboxUpdateBuilder(builder)) dispatcher.DispatchOnce(context.Background()) @@ -556,6 +675,124 @@ func TestOutboxDispatcherBatchPathUsesUpdateBuilder(t *testing.T) { } } +func TestOutboxDispatcherBatchBuildFailureIsolatesSingletonsWithoutReloadingEvents(t *testing.T) { + const ( + firstUser = int64(1000000002) + otherUser = int64(1000000003) + ) + items := []store.DispatchOutboxItem{ + {ID: 11, TargetUserID: firstUser, Pts: 11, EventType: domain.UpdateEventReadHistoryInbox}, + {ID: 5, TargetUserID: otherUser, Pts: 5, EventType: domain.UpdateEventReadHistoryInbox}, + {ID: 10, TargetUserID: firstUser, Pts: 10, EventType: domain.UpdateEventReadHistoryInbox}, + } + events := make([]domain.UpdateEvent, 0, len(items)) + for _, item := range items { + events = append(events, outboxReadEvent(item.TargetUserID, item.Pts)) + } + eventStore := &batchEventStore{captureUpdateEventStore: &captureUpdateEventStore{events: events}} + outbox := &batchDispatchOutbox{captureDispatchOutbox: &captureDispatchOutbox{items: items}} + sessions := &orderedOutboxCaptureSessions{} + var buildCalls [][]outboxPushAttempt + builder := func(_ context.Context, requests []OutboxUpdateRequest) ([]*tg.Updates, error) { + call := make([]outboxPushAttempt, len(requests)) + for i, request := range requests { + call[i] = outboxPushAttempt{userID: request.TargetUserID, pts: request.Event.Pts} + } + buildCalls = append(buildCalls, call) + if len(requests) > 1 { + return nil, errors.New("injected aggregate build failure") + } + return []*tg.Updates{tgUpdateForOutboxEventForViewer(requests[0].Event, requests[0].TargetUserID)}, nil + } + dispatcher := newTestOutboxDispatcher(eventStore, outbox, sessions, zaptest.NewLogger(t), WithOutboxUpdateBuilder(builder)) + + dispatcher.DispatchOnce(context.Background()) + + wantCalls := [][]outboxPushAttempt{ + {{userID: firstUser, pts: 10}, {userID: firstUser, pts: 11}, {userID: otherUser, pts: 5}}, + {{userID: firstUser, pts: 10}}, + {{userID: firstUser, pts: 11}}, + {{userID: otherUser, pts: 5}}, + } + if !reflect.DeepEqual(buildCalls, wantCalls) { + t.Fatalf("builder calls = %+v, want aggregate then isolated singletons %+v", buildCalls, wantCalls) + } + if eventStore.listAfterCalls != 0 { + t.Fatalf("ListAfter calls = %d, want 0 because isolation must reuse batch-loaded events", eventStore.listAfterCalls) + } + if len(outbox.failedItems) != 0 { + t.Fatalf("failed items = %+v, want none after successful singleton isolation", outbox.failedItems) + } + if got := outboxDeliveredIDs(outbox.deliveredItems); !reflect.DeepEqual(got, []int64{10, 11, 5}) { + t.Fatalf("individually delivered ids = %v, want [10 11 5]", got) + } + if len(outbox.deliveredBatch) != 0 { + t.Fatalf("batch delivered items = %+v, want singleton markers on aggregate-build fallback", outbox.deliveredBatch) + } + if got := sessions.pushedPts(); !reflect.DeepEqual(got, []int{10, 11, 5}) { + t.Fatalf("pushed pts = %v, want every isolated item delivered", got) + } +} + +func TestOutboxDispatcherBatchBuildFailureMarksOnlyBadSingletonAndBlocksItsLane(t *testing.T) { + const ( + blockedUser = int64(1000000002) + otherUser = int64(1000000003) + ) + items := []store.DispatchOutboxItem{ + {ID: 12, TargetUserID: blockedUser, Pts: 12, EventType: domain.UpdateEventReadHistoryInbox}, + {ID: 5, TargetUserID: otherUser, Pts: 5, EventType: domain.UpdateEventReadHistoryInbox}, + {ID: 11, TargetUserID: blockedUser, Pts: 11, EventType: domain.UpdateEventReadHistoryInbox}, + } + events := make([]domain.UpdateEvent, 0, len(items)) + for _, item := range items { + events = append(events, outboxReadEvent(item.TargetUserID, item.Pts)) + } + eventStore := &batchEventStore{captureUpdateEventStore: &captureUpdateEventStore{events: events}} + outbox := &batchDispatchOutbox{captureDispatchOutbox: &captureDispatchOutbox{items: items}} + sessions := &orderedOutboxCaptureSessions{} + var singletonCalls []outboxPushAttempt + builder := func(_ context.Context, requests []OutboxUpdateRequest) ([]*tg.Updates, error) { + if len(requests) > 1 { + return nil, errors.New("injected aggregate build failure") + } + request := requests[0] + singletonCalls = append(singletonCalls, outboxPushAttempt{userID: request.TargetUserID, pts: request.Event.Pts}) + if request.TargetUserID == blockedUser && request.Event.Pts == 11 { + return nil, errors.New("injected bad singleton") + } + return []*tg.Updates{tgUpdateForOutboxEventForViewer(request.Event, request.TargetUserID)}, nil + } + dispatcher := newTestOutboxDispatcher(eventStore, outbox, sessions, zaptest.NewLogger(t), WithOutboxUpdateBuilder(builder)) + + dispatcher.DispatchOnce(context.Background()) + + wantSingletonCalls := []outboxPushAttempt{{userID: blockedUser, pts: 11}, {userID: otherUser, pts: 5}} + if !reflect.DeepEqual(singletonCalls, wantSingletonCalls) { + t.Fatalf("singleton builder calls = %+v, want %+v (pts=12 must not overtake failed lane head)", singletonCalls, wantSingletonCalls) + } + if eventStore.listAfterCalls != 0 { + t.Fatalf("ListAfter calls = %d, want 0 because isolation must reuse batch-loaded events", eventStore.listAfterCalls) + } + if got := outboxDeliveredIDs(outbox.failedItems); !reflect.DeepEqual(got, []int64{11}) { + t.Fatalf("failed ids = %v, want only bad singleton id=11", got) + } + if got := outboxDeliveredIDs(outbox.deliveredItems); !reflect.DeepEqual(got, []int64{5}) { + t.Fatalf("delivered ids = %v, want unrelated user id=5", got) + } + if got := sessions.pushedPts(); !reflect.DeepEqual(got, []int{5}) { + t.Fatalf("pushed pts = %v, want only unrelated user's pts=5", got) + } +} + +func outboxDeliveredIDs(items []store.DispatchOutboxItem) []int64 { + out := make([]int64, len(items)) + for i, item := range items { + out[i] = item.ID + } + return out +} + func TestOutboxDispatcherOrdersClaimedItemsByUserPts(t *testing.T) { const targetUserID int64 = 1000000002 items := []store.DispatchOutboxItem{ @@ -587,7 +824,7 @@ func TestOutboxDispatcherOrdersClaimedItemsByUserPts(t *testing.T) { eventStore := &batchEventStore{captureUpdateEventStore: &captureUpdateEventStore{events: events}} outbox := &batchDispatchOutbox{captureDispatchOutbox: &captureDispatchOutbox{items: items}} sessions := &orderedOutboxCaptureSessions{} - dispatcher := NewOutboxDispatcher(eventStore, outbox, sessions, zaptest.NewLogger(t)) + dispatcher := newTestOutboxDispatcher(eventStore, outbox, sessions, zaptest.NewLogger(t)) dispatcher.DispatchOnce(context.Background()) @@ -648,7 +885,7 @@ func TestOutboxDispatcherBatchFailureBlocksHigherUserPts(t *testing.T) { eventStore := &batchEventStore{captureUpdateEventStore: &captureUpdateEventStore{events: events}} outbox := &batchDispatchOutbox{captureDispatchOutbox: &captureDispatchOutbox{items: items}} sessions := &selectiveFailOutboxSessions{failUserID: blockedUser, failPts: 11} - dispatcher := NewOutboxDispatcher(eventStore, outbox, sessions, zaptest.NewLogger(t)) + dispatcher := newTestOutboxDispatcher(eventStore, outbox, sessions, zaptest.NewLogger(t)) dispatcher.DispatchOnce(context.Background()) @@ -678,7 +915,7 @@ func TestOutboxDispatcherBatchLoadFallbackStillBlocksHigherUserPts(t *testing.T) eventStore := &failingBatchEventStore{captureUpdateEventStore: &captureUpdateEventStore{events: events}} outbox := &batchDispatchOutbox{captureDispatchOutbox: &captureDispatchOutbox{items: items}} sessions := &selectiveFailOutboxSessions{failUserID: blockedUser, failPts: 21} - dispatcher := NewOutboxDispatcher(eventStore, outbox, sessions, zaptest.NewLogger(t)) + dispatcher := newTestOutboxDispatcher(eventStore, outbox, sessions, zaptest.NewLogger(t)) dispatcher.DispatchOnce(context.Background()) @@ -729,12 +966,28 @@ func sameOutboxUsersCalls(got, want []outboxUsersCall) bool { } type countingOutboxUsersService struct { - users map[int64]domain.User - calls []outboxUsersCall + users map[int64]domain.User + calls []outboxUsersCall + sparseCalls int + sparseRequest map[int64][]int64 } type viewerSpecificOutboxUsersService struct { - calls []outboxUsersCall + calls []outboxUsersCall + sparseCalls int + sparseRequest map[int64][]int64 +} + +func (s *viewerSpecificOutboxUsersService) ByIDsForViewerUserIDs(_ context.Context, requested map[int64][]int64) (map[int64][]domain.User, error) { + s.sparseCalls++ + s.sparseRequest = cloneOutboxSparseRequest(requested) + out := make(map[int64][]domain.User, len(requested)) + for viewerID, ids := range requested { + for _, id := range ids { + out[viewerID] = append(out[viewerID], domain.User{ID: id, FirstName: viewerSpecificName(viewerID)}) + } + } + return out, nil } func (s *viewerSpecificOutboxUsersService) Self(_ context.Context, userID int64) (domain.User, error) { @@ -788,6 +1041,28 @@ func (s *countingOutboxUsersService) ByIDs(_ context.Context, viewerUserID int64 return out, nil } +func (s *countingOutboxUsersService) ByIDsForViewerUserIDs(_ context.Context, requested map[int64][]int64) (map[int64][]domain.User, error) { + s.sparseCalls++ + s.sparseRequest = cloneOutboxSparseRequest(requested) + out := make(map[int64][]domain.User, len(requested)) + for viewerID, ids := range requested { + for _, id := range ids { + if user, ok := s.users[id]; ok { + out[viewerID] = append(out[viewerID], user) + } + } + } + return out, nil +} + +func cloneOutboxSparseRequest(in map[int64][]int64) map[int64][]int64 { + out := make(map[int64][]int64, len(in)) + for viewerID, ids := range in { + out[viewerID] = append([]int64(nil), ids...) + } + return out +} + func TestOutboxDispatcherUsesBestEffortPush(t *testing.T) { msg := domain.Message{ ID: 10, @@ -825,7 +1100,7 @@ func TestOutboxDispatcherUsesBestEffortPush(t *testing.T) { ExcludeSessionID: tt.sessionID, }}} sessions := &captureBestEffortSessions{captureSessions: &captureSessions{}} - dispatcher := NewOutboxDispatcher(events, outbox, sessions, zaptest.NewLogger(t), WithOutboxPushTimeout(50*time.Millisecond)) + dispatcher := newTestOutboxDispatcher(events, outbox, sessions, zaptest.NewLogger(t), WithOutboxPushTimeout(50*time.Millisecond)) dispatcher.DispatchOnce(context.Background()) if !sessions.bestEffort || sessions.timeout != 50*time.Millisecond { @@ -968,7 +1243,8 @@ func (s *batchDispatchOutbox) MarkDeliveredBatch(_ context.Context, items []stor } type captureUpdateEventStore struct { - events []domain.UpdateEvent + events []domain.UpdateEvent + listAfterCalls int } func (s *captureUpdateEventStore) Append(context.Context, int64, domain.UpdateEvent) error { @@ -992,6 +1268,7 @@ func (s *captureUpdateEventStore) AppendAllocated(_ context.Context, userID int6 } func (s *captureUpdateEventStore) ListAfter(_ context.Context, _ int64, pts, limit int) ([]domain.UpdateEvent, error) { + s.listAfterCalls++ out := make([]domain.UpdateEvent, 0, len(s.events)) for _, event := range s.events { if event.Pts > pts { @@ -1034,8 +1311,10 @@ type captureDispatchOutbox struct { delivered bool deliveredUserID int64 deliveredID int64 + deliveredItems []store.DispatchOutboxItem failed bool failedError string + failedItems []store.DispatchOutboxItem } type captureScopedSessions struct { @@ -1125,12 +1404,14 @@ func (s *captureDispatchOutbox) MarkDelivered(_ context.Context, item store.Disp s.delivered = true s.deliveredUserID = item.TargetUserID s.deliveredID = item.ID + s.deliveredItems = append(s.deliveredItems, item) return nil } -func (s *captureDispatchOutbox) MarkFailed(_ context.Context, _ store.DispatchOutboxItem, lastError string) error { +func (s *captureDispatchOutbox) MarkFailed(_ context.Context, item store.DispatchOutboxItem, lastError string) error { s.failed = true s.failedError = lastError + s.failedItems = append(s.failedItems, item) return nil } @@ -1152,7 +1433,7 @@ func TestOutboxDispatcherUsesNoopAsDelivered(t *testing.T) { Date: 1700000301, }}} metrics := &captureOutboxMetrics{} - dispatcher := NewOutboxDispatcher(events, outbox, &captureSessions{}, zaptest.NewLogger(t), WithOutboxMetrics(metrics)) + dispatcher := newTestOutboxDispatcher(events, outbox, &captureSessions{}, zaptest.NewLogger(t), WithOutboxMetrics(metrics)) dispatcher.DispatchOnce(context.Background()) if !outbox.delivered || outbox.failed { @@ -1185,6 +1466,16 @@ func (m *captureOutboxMetrics) OutboxFailed(error) { m.failed++ } +func (m *captureOutboxMetrics) PresenceLastSeenBatch(int, time.Duration, error) {} + +func (m *captureOutboxMetrics) PresenceLastSeenSubmitted() {} + +func (m *captureOutboxMetrics) PresenceLastSeenPending(int) {} + +func (m *captureOutboxMetrics) PresenceLastSeenOverflow() {} + +func (m *captureOutboxMetrics) PresenceLastSeenDrainDropped(int) {} + // interruptedBestEffortSessions 模拟 dispatcher context 到期：该中断可安全靠 lease 重试。 type interruptedBestEffortSessions struct { *captureSessions @@ -1226,7 +1517,7 @@ func TestOutboxDispatcherDefersOnPushInterruption(t *testing.T) { }}} sessions := &interruptedBestEffortSessions{captureSessions: &captureSessions{}} metrics := &captureOutboxMetrics{} - dispatcher := NewOutboxDispatcher(events, outbox, sessions, zaptest.NewLogger(t), WithOutboxPushTimeout(50*time.Millisecond), WithOutboxMetrics(metrics)) + dispatcher := newTestOutboxDispatcher(events, outbox, sessions, zaptest.NewLogger(t), WithOutboxPushTimeout(50*time.Millisecond), WithOutboxMetrics(metrics)) dispatcher.DispatchOnce(context.Background()) if sessions.attempts != 1 { diff --git a/internal/rpc/outbox_projection_strict_test.go b/internal/rpc/outbox_projection_strict_test.go new file mode 100644 index 00000000..52a4ba60 --- /dev/null +++ b/internal/rpc/outbox_projection_strict_test.go @@ -0,0 +1,262 @@ +package rpc + +import ( + "context" + "errors" + "fmt" + "strings" + "testing" + + "github.com/iamxvbaba/td/clock" + "github.com/iamxvbaba/td/tg" + "go.uber.org/zap/zaptest" + + appusers "telesrv/internal/app/users" + "telesrv/internal/domain" + "telesrv/internal/store" +) + +type capacitySplittingMainOutboxUsers struct { + *countingOutboxUsersService + maxEdges int + capacityErr error + sparseRequests []map[int64][]int64 +} + +func (s *capacitySplittingMainOutboxUsers) ByIDsForViewerUserIDs(ctx context.Context, requested map[int64][]int64) (map[int64][]domain.User, error) { + s.sparseRequests = append(s.sparseRequests, cloneOutboxSparseRequest(requested)) + if s.maxEdges > 0 && sparseOutboxRequestedEdgeCount(requested, s.maxEdges+1) > s.maxEdges { + err := s.capacityErr + if err == nil { + err = store.ErrActiveChannelMemberPairsLimit + } + return nil, fmt.Errorf("%w: test capacity", err) + } + return s.countingOutboxUsersService.ByIDsForViewerUserIDs(ctx, requested) +} + +type failingSparseMainOutboxResolver struct { + err error + calls int +} + +func (s *failingSparseMainOutboxResolver) ByIDsForViewerUserIDs(context.Context, map[int64][]int64) (map[int64][]domain.User, error) { + s.calls++ + return nil, s.err +} + +func TestResolveSparseOutboxUsersSplitsEveryProjectionCapacityError(t *testing.T) { + capacityErrors := map[string]error{ + "privacy_memberships": store.ErrActiveChannelMemberPairsLimit, + "owner_union": appusers.ErrBatchUsersLimit, + "sparse_cells": appusers.ErrBatchViewerCells, + } + for name, capacityErr := range capacityErrors { + t.Run(name, func(t *testing.T) { + base := &countingOutboxUsersService{users: map[int64]domain.User{ + 2001: {ID: 2001, FirstName: "one"}, + 2002: {ID: 2002, FirstName: "two"}, + }} + resolver := &capacitySplittingMainOutboxUsers{ + countingOutboxUsersService: base, + maxEdges: 1, + capacityErr: capacityErr, + } + projected, err := resolveSparseOutboxUsers(context.Background(), resolver, map[int64][]int64{ + 1001: {2001}, + 1002: {2002}, + }) + if err != nil || len(projected[1001]) != 1 || len(projected[1002]) != 1 { + t.Fatalf("projected=%+v err=%v, want both split results", projected, err) + } + if len(resolver.sparseRequests) != 3 || len(base.calls) != 0 { + t.Fatalf("sparse calls=%d scalar=%+v, want one failed batch plus two sparse halves", len(resolver.sparseRequests), base.calls) + } + }) + } +} + +func TestResolveSparseOutboxUsersDoesNotSplitOtherErrors(t *testing.T) { + boom := errors.New("projection unavailable") + resolver := &failingSparseMainOutboxResolver{err: boom} + projected, err := resolveSparseOutboxUsers(context.Background(), resolver, map[int64][]int64{ + 1001: {2001}, + 1002: {2002}, + }) + if !errors.Is(err, boom) || projected != nil { + t.Fatalf("resolveSparseOutboxUsers = %+v, %v; want nil, boom", projected, err) + } + if resolver.calls != 1 { + t.Fatalf("resolver calls = %d, want no split for non-capacity error", resolver.calls) + } +} + +func TestRouterBuildOutboxUpdatesFailsClosedAtSparseRecoveryCallBudget(t *testing.T) { + const viewerID = int64(1000000050) + base := &countingOutboxUsersService{users: make(map[int64]domain.User)} + peers := make([]domain.Peer, 100) + for i := range peers { + id := int64(1000001000 + i) + peers[i] = domain.Peer{Type: domain.PeerTypeUser, ID: id} + base.users[id] = domain.User{ID: id, FirstName: "projected"} + } + users := &capacitySplittingMainOutboxUsers{ + countingOutboxUsersService: base, + maxEdges: 1, + capacityErr: store.ErrActiveChannelMemberPairsLimit, + } + router := New(Config{}, Deps{Users: users}, zaptest.NewLogger(t), clock.System) + + updates, err := router.BuildOutboxUpdates(context.Background(), []OutboxUpdateRequest{{ + TargetUserID: viewerID, + Event: domain.UpdateEvent{ + UserID: viewerID, + Type: domain.UpdateEventPinnedDialogs, + Peers: peers, + }, + }}) + if updates != nil || !errors.Is(err, ErrUserProjectionCapacityRecoveryLimit) { + t.Fatalf("updates=%+v err=%v, want nil recovery-limit error", updates, err) + } + if errors.Is(err, store.ErrActiveChannelMemberPairsLimit) { + t.Fatalf("recovery-limit error must not retain capacity identity: %v", err) + } + if len(users.sparseRequests) != maxSparseOutboxRecoveryCalls { + t.Fatalf("sparse resolver calls=%d, want hard limit %d", len(users.sparseRequests), maxSparseOutboxRecoveryCalls) + } + if len(base.calls) != 0 { + t.Fatalf("scalar ByIDs calls=%+v, want zero fallback", base.calls) + } +} + +func TestResolveSparseOutboxUsersRejectsAttemptedEdgeOverflowBeforeResolver(t *testing.T) { + makeIDs := func(count int) []int64 { + ids := make([]int64, count) + for i := range ids { + ids[i] = int64(i + 1) + } + return ids + } + + t.Run("initial request", func(t *testing.T) { + resolver := &failingSparseMainOutboxResolver{err: errors.New("must not be called")} + projected, err := resolveSparseOutboxUsers(context.Background(), resolver, map[int64][]int64{ + 1001: makeIDs(maxSparseOutboxAttemptedUserEdges + 1), + }) + if projected != nil || !errors.Is(err, ErrUserProjectionCapacityRecoveryLimit) { + t.Fatalf("projected=%+v err=%v, want nil recovery-limit error", projected, err) + } + if resolver.calls != 0 { + t.Fatalf("resolver calls=%d, want rejection before first call", resolver.calls) + } + if isSparseProjectionCapacityError(err) { + t.Fatalf("recovery-limit error must be terminal, got capacity identity: %v", err) + } + }) + + t.Run("cumulative recursive edges", func(t *testing.T) { + resolver := &failingSparseMainOutboxResolver{err: store.ErrActiveChannelMemberPairsLimit} + projected, err := resolveSparseOutboxUsers(context.Background(), resolver, map[int64][]int64{ + 1001: makeIDs(300000), + }) + if projected != nil || !errors.Is(err, ErrUserProjectionCapacityRecoveryLimit) { + t.Fatalf("projected=%+v err=%v, want nil recovery-limit error", projected, err) + } + if resolver.calls != 2 { + t.Fatalf("resolver calls=%d, want root and first half before shared edge limit", resolver.calls) + } + if errors.Is(err, store.ErrActiveChannelMemberPairsLimit) { + t.Fatalf("recovery-limit error must not retain capacity identity: %v", err) + } + }) +} + +func TestRouterBuildOutboxUpdatesRejectsIncompleteSparseProjection(t *testing.T) { + const ( + viewerUserID = int64(1000000010) + missingUserID = int64(1000000011) + ) + users := &countingOutboxUsersService{users: map[int64]domain.User{}} + router := New(Config{}, Deps{Users: users}, zaptest.NewLogger(t), clock.System) + updates, err := router.BuildOutboxUpdates(context.Background(), []OutboxUpdateRequest{{ + TargetUserID: viewerUserID, + Event: domain.UpdateEvent{UserID: viewerUserID, Type: domain.UpdateEventNewMessage, Pts: 3, PtsCount: 1, + Message: domain.Message{ID: 3, OwnerUserID: viewerUserID, + Peer: domain.Peer{Type: domain.PeerTypeUser, ID: missingUserID}, + From: domain.Peer{Type: domain.PeerTypeUser, ID: missingUserID}}}, + }}) + if !errors.Is(err, ErrSparseOutboxUserProjectionIncomplete) || updates != nil { + t.Fatalf("BuildOutboxUpdates=%+v err=%v, want incomplete fail-closed", updates, err) + } + if users.sparseCalls != 1 || len(users.calls) != 0 { + t.Fatalf("projection calls = sparse %d scalar %+v, want one sparse call and no fallback", users.sparseCalls, users.calls) + } +} + +func TestRouterBuildOutboxUpdatesAllowsOnlyExplicitNoopToStayEmpty(t *testing.T) { + router := New(Config{}, Deps{}, zaptest.NewLogger(t), clock.System) + updates, err := router.BuildOutboxUpdates(context.Background(), []OutboxUpdateRequest{{ + TargetUserID: 1000000030, + Event: domain.UpdateEvent{UserID: 1000000030, Type: domain.UpdateEventNoop, Pts: 9, PtsCount: 1}, + }}) + if err != nil || len(updates) != 1 || updates[0] != nil { + t.Fatalf("explicit noop updates=%+v err=%v, want one nil entry without error", updates, err) + } + + updates, err = router.BuildOutboxUpdates(context.Background(), []OutboxUpdateRequest{{ + TargetUserID: 1000000030, + Event: domain.UpdateEvent{UserID: 1000000030, Type: domain.UpdateEventReadHistoryInbox, Pts: 10, PtsCount: 1}, + }}) + if !errors.Is(err, ErrOutboxUpdateProjectionEmpty) || updates != nil { + t.Fatalf("invalid non-noop updates=%+v err=%v, want ErrOutboxUpdateProjectionEmpty", updates, err) + } +} + +func TestOutboxDispatcherFailsClosedOnBuilderErrorAndNilNonNoop(t *testing.T) { + const userID = int64(1000000040) + baseEvent := domain.UpdateEvent{ + UserID: userID, Type: domain.UpdateEventReadHistoryInbox, Pts: 10, PtsCount: 1, + Peer: domain.Peer{Type: domain.PeerTypeUser, ID: 1000000041}, MaxID: 9, + } + tests := []struct { + name string + builder OutboxUpdateBuilder + wantErr error + }{ + { + name: "builder error", + builder: func(context.Context, []OutboxUpdateRequest) ([]*tg.Updates, error) { + return nil, errors.New("projection unavailable") + }, + }, + { + name: "nil non-noop", + builder: func(_ context.Context, requests []OutboxUpdateRequest) ([]*tg.Updates, error) { + return make([]*tg.Updates, len(requests)), nil + }, + wantErr: errOutboxUpdateBuilderEmpty, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + outbox := &captureDispatchOutbox{items: []store.DispatchOutboxItem{{ + ID: 71, TargetUserID: userID, Pts: baseEvent.Pts, EventType: baseEvent.Type, + }}} + sessions := &captureSessions{} + dispatcher := newTestOutboxDispatcher( + &captureUpdateEventStore{events: []domain.UpdateEvent{baseEvent}}, + outbox, + sessions, + zaptest.NewLogger(t), + WithOutboxUpdateBuilder(tt.builder), + ) + dispatcher.DispatchOnce(context.Background()) + if !outbox.failed || outbox.delivered || sessions.message != nil { + t.Fatalf("failed=%v delivered=%v pushed=%T, want terminal failure without delivery", outbox.failed, outbox.delivered, sessions.message) + } + if tt.wantErr != nil && !strings.Contains(outbox.failedError, tt.wantErr.Error()) { + t.Fatalf("failed error=%q, want %v", outbox.failedError, tt.wantErr) + } + }) + } +} diff --git a/internal/rpc/outbox_update_builder.go b/internal/rpc/outbox_update_builder.go index 66fe7a65..f15e4cae 100644 --- a/internal/rpc/outbox_update_builder.go +++ b/internal/rpc/outbox_update_builder.go @@ -2,20 +2,35 @@ package rpc import ( "context" + "errors" + "fmt" + "sort" "github.com/iamxvbaba/td/tg" "telesrv/internal/domain" ) +const ( + maxSparseOutboxRecoveryCalls = 64 + maxSparseOutboxAttemptedUserEdges = 524288 +) + +var ( + ErrSparseOutboxUserProjectionMissing = errors.New("sparse outbox user projection is required") + ErrSparseOutboxUserProjectionIncomplete = errors.New("sparse outbox user projection is incomplete") + ErrOutboxUpdateProjectionEmpty = errors.New("non-noop outbox event produced no update") +) + // BuildOutboxUpdates 为在线 outbox worker 构造按接收者视角补全后的 updates。 -func (r *Router) BuildOutboxUpdates(ctx context.Context, requests []OutboxUpdateRequest) []*tg.Updates { +func (r *Router) BuildOutboxUpdates(ctx context.Context, requests []OutboxUpdateRequest) ([]*tg.Updates, error) { out := make([]*tg.Updates, len(requests)) if len(requests) == 0 { - return out + return out, nil } cache := newViewerPeerCache(r) groups := make(map[int64][]outboxUpdateBuildItem) + userIDsByViewer := make(map[int64]map[int64]struct{}) for i, req := range requests { viewerUserID := req.TargetUserID if viewerUserID == 0 { @@ -27,16 +42,68 @@ func (r *Router) BuildOutboxUpdates(ctx context.Context, requests []OutboxUpdate } groups[viewerUserID] = append(groups[viewerUserID], outboxUpdateBuildItem{index: i, event: event}) } + // Poll and draft events can replace their message with an authoritative + // viewer-specific snapshot. Prepare before collecting the sparse refs. + for viewerUserID, items := range groups { + events := make([]domain.UpdateEvent, len(items)) + for i := range items { + events[i] = items[i].event + } + events = r.prepareUpdateEventsForViewer(ctx, viewerUserID, events) + for i, event := range events { + items[i].event = event + refs := collectOutboxEventUserRefs(event) + if len(refs) == 0 { + continue + } + if userIDsByViewer[viewerUserID] == nil { + userIDsByViewer[viewerUserID] = make(map[int64]struct{}, len(refs)) + } + for id := range refs { + if _, system := domain.SystemUserByID(id); !system { + userIDsByViewer[viewerUserID][id] = struct{}{} + } + } + } + groups[viewerUserID] = items + } + if len(userIDsByViewer) > 0 { + resolver, ok := r.deps.Users.(SparseBatchViewerUsersResolver) + if !ok { + return nil, ErrSparseOutboxUserProjectionMissing + } + requested := make(map[int64][]int64, len(userIDsByViewer)) + for viewerID, ids := range userIDsByViewer { + requested[viewerID] = sortedOutboxUserIDs(ids) + } + projected, err := resolveSparseOutboxUsers(ctx, resolver, requested) + if err != nil { + return nil, fmt.Errorf("sparse outbox user projection: %w", err) + } + for viewerID, expectedIDs := range requested { + if missingID, missing := missingProjectedUserID(expectedIDs, projected[viewerID]); missing { + return nil, fmt.Errorf("%w: viewer_user_id=%d missing_user_id=%d", ErrSparseOutboxUserProjectionIncomplete, viewerID, missingID) + } + cache.primeExpectedUsers(viewerID, expectedIDs, projected[viewerID]) + } + } for viewerUserID, items := range groups { events := make([]domain.UpdateEvent, len(items)) for i, item := range items { events[i] = item.event } - events = r.enrichUpdateEventsWithPeerCache(ctx, viewerUserID, events, cache) + var err error + events, err = r.enrichPreparedUpdateEventsWithPeerCacheStrict(ctx, viewerUserID, events, cache) + if err != nil { + return nil, fmt.Errorf("strict outbox user projection for viewer %d: %w", viewerUserID, err) + } for i, item := range items { update := tgUpdateForOutboxEventForViewer(events[i], viewerUserID) + if update == nil && events[i].Type != domain.UpdateEventNoop { + return nil, fmt.Errorf("%w: viewer_user_id=%d event_type=%s pts=%d", ErrOutboxUpdateProjectionEmpty, viewerUserID, events[i].Type, events[i].Pts) + } if peers := storyUpdateEventPeers(events[i]); len(peers) > 0 { - update = r.withStoryUpdatePeerObjectsForOutbox(ctx, viewerUserID, update, peers...) + update = r.withStoryUpdatePeerObjectsForOutboxWithCache(ctx, viewerUserID, update, cache, peers...) } out[item.index] = update } @@ -45,10 +112,140 @@ func (r *Router) BuildOutboxUpdates(ctx context.Context, requests []OutboxUpdate // viewer-specific update has been built so one outbox claim never turns into // a registry query per event/session. r.applyUsernamesToUpdatesBatch(ctx, out) - return out + return out, nil +} + +func resolveSparseOutboxUsers(ctx context.Context, resolver SparseBatchViewerUsersResolver, requested map[int64][]int64) (map[int64][]domain.User, error) { + budget := userProjectionRecoveryBudget{ + maxCalls: maxSparseOutboxRecoveryCalls, + maxItems: maxSparseOutboxAttemptedUserEdges, + } + return resolveSparseOutboxUsersWithBudget(ctx, resolver, requested, &budget) +} + +func resolveSparseOutboxUsersWithBudget(ctx context.Context, resolver SparseBatchViewerUsersResolver, requested map[int64][]int64, budget *userProjectionRecoveryBudget) (map[int64][]domain.User, error) { + edges := sparseOutboxRequestedEdgeCount(requested, maxSparseOutboxAttemptedUserEdges+1) + if err := budget.consume(edges); err != nil { + return nil, err + } + projected, err := resolver.ByIDsForViewerUserIDs(ctx, requested) + if err == nil { + return projected, nil + } + if !isSparseProjectionCapacityError(err) { + return nil, err + } + left, right, ok := splitSparseOutboxUserEdges(requested) + if !ok { + return nil, err + } + leftProjected, leftErr := resolveSparseOutboxUsersWithBudget(ctx, resolver, left, budget) + if leftErr != nil { + return nil, leftErr + } + rightProjected, rightErr := resolveSparseOutboxUsersWithBudget(ctx, resolver, right, budget) + if rightErr != nil { + return nil, rightErr + } + if leftProjected == nil { + leftProjected = make(map[int64][]domain.User) + } + for viewerID, users := range rightProjected { + leftProjected[viewerID] = append(leftProjected[viewerID], users...) + } + return leftProjected, nil +} + +func sparseOutboxRequestedEdgeCount(requested map[int64][]int64, limit int) int { + if limit <= 0 { + return 0 + } + total := 0 + for viewerID, userIDs := range requested { + if viewerID == 0 || len(userIDs) == 0 { + continue + } + if len(userIDs) >= limit-total { + return limit + } + total += len(userIDs) + } + return total +} + +func splitSparseOutboxUserEdges(requested map[int64][]int64) (map[int64][]int64, map[int64][]int64, bool) { + viewerIDs := make([]int64, 0, len(requested)) + total := 0 + for viewerID, userIDs := range requested { + if viewerID == 0 || len(userIDs) == 0 { + continue + } + viewerIDs = append(viewerIDs, viewerID) + total += len(userIDs) + } + if total < 2 { + return nil, nil, false + } + sort.Slice(viewerIDs, func(i, j int) bool { return viewerIDs[i] < viewerIDs[j] }) + left := make(map[int64][]int64) + right := make(map[int64][]int64) + leftCount := total / 2 + seen := 0 + for _, viewerID := range viewerIDs { + for _, userID := range requested[viewerID] { + dst := right + if seen < leftCount { + dst = left + } + dst[viewerID] = append(dst[viewerID], userID) + seen++ + } + } + return left, right, len(left) > 0 && len(right) > 0 } type outboxUpdateBuildItem struct { index int event domain.UpdateEvent } + +func collectOutboxEventUserRefs(event domain.UpdateEvent) map[int64]struct{} { + userIDs := make(map[int64]struct{}) + channelIDs := make(map[int64]struct{}) + for _, user := range event.Users { + if user.ID != 0 { + userIDs[user.ID] = struct{}{} + } + } + addDomainPeerRef(event.Peer, 0, userIDs, channelIDs) + for _, peer := range event.Peers { + addDomainPeerRef(peer, 0, userIDs, channelIDs) + } + addDomainPeerRef(event.Story.Owner, 0, userIDs, channelIDs) + for _, peer := range storyForwardPeers(event.Story) { + addDomainPeerRef(peer, 0, userIDs, channelIDs) + } + collectMessagePeerRefs(event.Message, 0, userIDs, channelIDs) + if message := event.EphemeralMessage; message != nil { + collectEphemeralMessagePeerRefs(*message, userIDs, channelIDs) + if message.BotAPIReply != nil { + collectEphemeralMessagePeerRefs(*message.BotAPIReply, userIDs, channelIDs) + } + } + if event.BotCallbackQuery != nil && event.BotCallbackQuery.UserID != 0 { + userIDs[event.BotCallbackQuery.UserID] = struct{}{} + } + collectDialogDraftPeerRefs(event.Draft, userIDs, channelIDs) + return userIDs +} + +func sortedOutboxUserIDs(ids map[int64]struct{}) []int64 { + out := make([]int64, 0, len(ids)) + for id := range ids { + if id != 0 { + out = append(out, id) + } + } + sort.Slice(out, func(i, j int) bool { return out[i] < out[j] }) + return out +} diff --git a/internal/rpc/passive_compat_test.go b/internal/rpc/passive_compat_test.go index af0d1030..4c1a8221 100644 --- a/internal/rpc/passive_compat_test.go +++ b/internal/rpc/passive_compat_test.go @@ -55,7 +55,7 @@ func TestAccountGetUniqueGiftChatThemesReturnsEmptyStub(t *testing.T) { } } -func TestAccountGetWallPapersReturnsOrangeCatalog(t *testing.T) { +func TestAccountGetWallPapersReturnsDefaultCatalog(t *testing.T) { r := New(Config{DC: 2, IP: "127.0.0.1", Port: 2398}, Deps{}, zaptest.NewLogger(t), clock.System) req := &tg.AccountGetWallPapersRequest{} var in bin.Buffer diff --git a/internal/rpc/peer_identity_cache.go b/internal/rpc/peer_identity_cache.go new file mode 100644 index 00000000..fdea8f29 --- /dev/null +++ b/internal/rpc/peer_identity_cache.go @@ -0,0 +1,228 @@ +package rpc + +import ( + "context" + + "telesrv/internal/domain" + "telesrv/internal/readmodelcache" + "telesrv/internal/store" +) + +const ( + peerIdentityReadModel = "peer_identity" + defaultPeerIdentityCacheMaxEntries = 1_000_000 +) + +type peerIdentityEntry struct { + hash int64 + usernames []domain.Username + usernamesLoaded bool + verification domain.CustomVerification + verificationFound bool + verificationLoaded bool +} + +// peerIdentityCache keeps both viewer-independent decorations under their one +// durable peer_identity token. A miss fills every configured facet even for a +// narrow update builder, so concurrent callers cannot overwrite one another +// with partial entries. The embedded hash is checked on every lookup; exact invalidation +// therefore never needs a process-wide load epoch that rejects unrelated peers. +type peerIdentityCache struct { + cache *readmodelcache.Cache[domain.Peer, peerIdentityEntry] +} + +func newPeerIdentityCache(max int) *peerIdentityCache { + if max <= 0 { + max = defaultPeerIdentityCacheMaxEntries + } + return &peerIdentityCache{cache: readmodelcache.New[domain.Peer, peerIdentityEntry]( + readmodelcache.Config[domain.Peer, peerIdentityEntry]{ + MaxEntries: max, + Clone: func(in peerIdentityEntry) peerIdentityEntry { + in.usernames = append([]domain.Username(nil), in.usernames...) + return in + }, + }, + )} +} + +func (c *peerIdentityCache) lookup(peer domain.Peer, hash int64) (peerIdentityEntry, bool) { + if c == nil || c.cache == nil || hash == 0 { + return peerIdentityEntry{}, false + } + entry, ok := c.cache.Peek(peer) + if !ok || entry.hash != hash { + return peerIdentityEntry{}, false + } + return entry, true +} + +func (c *peerIdentityCache) store(peer domain.Peer, entry peerIdentityEntry) { + if c == nil || c.cache == nil || peer.ID == 0 || entry.hash == 0 { + return + } + c.cache.Store(peer, entry) +} + +func (c *peerIdentityCache) invalidate(peer domain.Peer) { + if c != nil && c.cache != nil { + c.cache.Invalidate(peer) + } +} + +func (c *peerIdentityCache) flush() { + if c != nil && c.cache != nil { + c.cache.Flush() + } +} + +func (r *Router) peerIdentityHashes(ctx context.Context, peers []domain.Peer) (map[domain.Peer]int64, error) { + out := make(map[domain.Peer]int64, len(peers)) + if r == nil || r.deps.ReadModelVersions == nil || len(peers) == 0 { + return out, nil + } + keys := make([]store.ReadModelKey, 0, len(peers)) + seen := make(map[domain.Peer]struct{}, len(peers)) + for _, peer := range peers { + if peer.ID == 0 || (peer.Type != domain.PeerTypeUser && peer.Type != domain.PeerTypeChannel) { + continue + } + if _, ok := seen[peer]; ok { + continue + } + seen[peer] = struct{}{} + keys = append(keys, store.ReadModelKey{ + Model: peerIdentityReadModel, + PeerType: peer.Type, + PeerID: peer.ID, + }) + } + rows, err := r.deps.ReadModelVersions.ReadModelHashes(ctx, keys) + if err != nil { + return nil, err + } + for _, key := range keys { + out[domain.Peer{Type: key.PeerType, ID: key.PeerID}] = rows[key] + } + return out, nil +} + +// peerIdentityMaps resolves the requested facets in at most two batched backend +// reads, preserves positive and negative results, and revalidates the durable +// hash before admitting them. Username and verification failures are isolated: +// one optional backend cannot suppress the other decoration. +func (r *Router) peerIdentityMaps( + ctx context.Context, + peers []domain.Peer, + wantUsernames bool, + wantVerification bool, +) (map[domain.Peer][]domain.Username, map[domain.Peer]domain.CustomVerification) { + usernames := make(map[domain.Peer][]domain.Username) + verifications := make(map[domain.Peer]domain.CustomVerification) + if len(peers) == 0 || (!wantUsernames && !wantVerification) { + return usernames, verifications + } + projectUsernames := wantUsernames && r.deps.Usernames != nil + projectVerification := wantVerification && r.deps.BotVerifications != nil + if !projectUsernames && !projectVerification { + return usernames, verifications + } + // A cache miss fills every configured facet, even when a narrow caller only + // asks for one. This keeps a single immutable value per peer and prevents two + // concurrent narrow builders from overwriting each other's partial entry. + loadUsernames := r.deps.Usernames != nil + loadVerification := r.deps.BotVerifications != nil + + // Without the durable token, load fresh data for this response but never + // reuse it. A token read failure is fail-closed for the cache as well. + if r.peerIdentityCache == nil || r.deps.ReadModelVersions == nil { + if projectUsernames { + if loaded, err := r.loadUsernameRegistryMap(ctx, peers); err == nil { + usernames = loaded + } + } + if projectVerification { + if loaded, err := r.loadBotVerificationMap(ctx, peers); err == nil { + verifications = loaded + } + } + return usernames, verifications + } + + hashes, err := r.peerIdentityHashes(ctx, peers) + if err != nil { + return usernames, verifications + } + entries := make(map[domain.Peer]peerIdentityEntry, len(peers)) + usernameMisses := make([]domain.Peer, 0, len(peers)) + verificationMisses := make([]domain.Peer, 0, len(peers)) + seen := make(map[domain.Peer]struct{}, len(peers)) + for _, peer := range peers { + if _, ok := seen[peer]; ok || peer.ID == 0 { + continue + } + seen[peer] = struct{}{} + entry, _ := r.peerIdentityCache.lookup(peer, hashes[peer]) + entry.hash = hashes[peer] + entries[peer] = entry + if loadUsernames && !entry.usernamesLoaded { + usernameMisses = append(usernameMisses, peer) + } + if loadVerification && !entry.verificationLoaded { + verificationMisses = append(verificationMisses, peer) + } + } + + if len(usernameMisses) > 0 { + if loaded, loadErr := r.loadUsernameRegistryMap(ctx, usernameMisses); loadErr == nil { + for _, peer := range usernameMisses { + entry := entries[peer] + entry.usernames = append([]domain.Username(nil), loaded[peer]...) + entry.usernamesLoaded = true + entries[peer] = entry + } + } + } + if len(verificationMisses) > 0 { + if loaded, loadErr := r.loadBotVerificationMap(ctx, verificationMisses); loadErr == nil { + for _, peer := range verificationMisses { + entry := entries[peer] + entry.verification, entry.verificationFound = loaded[peer] + entry.verificationLoaded = true + entries[peer] = entry + } + } + } + + // The version store is itself an exact-key L1 cache, so this revalidation + // adds no warm PostgreSQL trip. If a concurrent peer_identity mutation was + // observed, do not admit or project the pre-mutation value in this response. + currentHashes, err := r.peerIdentityHashes(ctx, peers) + if err != nil { + return usernames, verifications + } + for peer, entry := range entries { + if entry.hash == 0 || currentHashes[peer] != entry.hash { + continue + } + complete := (!loadUsernames || entry.usernamesLoaded) && (!loadVerification || entry.verificationLoaded) + if complete { + r.peerIdentityCache.store(peer, entry) + } + if projectUsernames && entry.usernamesLoaded && len(entry.usernames) > 0 { + usernames[peer] = append([]domain.Username(nil), entry.usernames...) + } + if projectVerification && entry.verificationLoaded && entry.verificationFound { + verifications[peer] = entry.verification + } + } + return usernames, verifications +} + +func (r *Router) InvalidatePeerIdentityReadModel(peer domain.Peer) { + r.peerIdentityCache.invalidate(peer) +} + +func (r *Router) FlushPeerIdentityReadModel() { + r.peerIdentityCache.flush() +} diff --git a/internal/rpc/peer_identity_cache_test.go b/internal/rpc/peer_identity_cache_test.go new file mode 100644 index 00000000..d021494b --- /dev/null +++ b/internal/rpc/peer_identity_cache_test.go @@ -0,0 +1,165 @@ +package rpc + +import ( + "context" + "errors" + "testing" + + "telesrv/internal/domain" + "telesrv/internal/store" +) + +func peerIdentityVersionKey(peer domain.Peer) store.ReadModelKey { + return store.ReadModelKey{Model: peerIdentityReadModel, PeerType: peer.Type, PeerID: peer.ID} +} + +func TestPeerUsernameIdentityCacheVersionsPositiveAndNegativeResults(t *testing.T) { + positive := domain.Peer{Type: domain.PeerTypeUser, ID: 11} + negative := domain.Peer{Type: domain.PeerTypeChannel, ID: 22} + versions := &fakeRPCReadModelVersions{hashes: map[store.ReadModelKey]int64{ + peerIdentityVersionKey(positive): 101, + peerIdentityVersionKey(negative): 202, + }} + registry := newFakeUsernameRegistry() + registry.byPeer[positive] = []domain.Username{{Username: "first", Active: true, CollectibleID: 1}} + r := &Router{ + deps: Deps{Usernames: registry, ReadModelVersions: versions}, + peerIdentityCache: newPeerIdentityCache(8), + } + + first := r.usernameRegistryMap(context.Background(), []domain.Peer{positive, negative}) + if registry.batchCalls != 1 || len(first[positive]) != 1 { + t.Fatalf("first load calls=%d result=%+v", registry.batchCalls, first) + } + first[positive][0].Username = "caller-mutated" + second := r.usernameRegistryMap(context.Background(), []domain.Peer{positive, negative}) + if registry.batchCalls != 1 { + t.Fatalf("positive/negative cache miss: batch calls=%d, want 1", registry.batchCalls) + } + if got := second[positive][0].Username; got != "first" { + t.Fatalf("cached username aliased caller mutation: got %q", got) + } + if _, ok := second[negative]; ok { + t.Fatalf("negative peer unexpectedly projected: %+v", second[negative]) + } + + registry.byPeer[positive] = []domain.Username{{Username: "second", Active: true, CollectibleID: 2}} + versions.hashes[peerIdentityVersionKey(positive)] = 303 + third := r.usernameRegistryMap(context.Background(), []domain.Peer{positive, negative}) + if registry.batchCalls != 1 || registry.peerCalls != 1 || len(third[positive]) != 1 || third[positive][0].Username != "second" { + t.Fatalf("version advance did not reload: batch=%d peer=%d result=%+v", registry.batchCalls, registry.peerCalls, third) + } +} + +func TestPeerVerificationIdentityCacheVersionsPositiveAndNegativeResults(t *testing.T) { + positive := domain.Peer{Type: domain.PeerTypeChannel, ID: 31} + negative := domain.Peer{Type: domain.PeerTypeUser, ID: 32} + versions := &fakeRPCReadModelVersions{hashes: map[store.ReadModelKey]int64{ + peerIdentityVersionKey(positive): 401, + peerIdentityVersionKey(negative): 402, + }} + verifications := newFakeBotVerifications() + verifications.marks[positive] = domain.CustomVerification{Peer: positive, IconDocumentID: 9001} + r := &Router{ + deps: Deps{BotVerifications: verifications, ReadModelVersions: versions}, + peerIdentityCache: newPeerIdentityCache(8), + } + + first := r.botVerificationMap(context.Background(), []domain.Peer{positive, negative}) + if verifications.batchCalls != 1 || first[positive].IconDocumentID != 9001 { + t.Fatalf("first load calls=%d result=%+v", verifications.batchCalls, first) + } + second := r.botVerificationMap(context.Background(), []domain.Peer{positive, negative}) + if verifications.batchCalls != 1 || len(second) != 1 { + t.Fatalf("positive/negative cache miss: calls=%d result=%+v", verifications.batchCalls, second) + } + + delete(verifications.marks, positive) + versions.hashes[peerIdentityVersionKey(positive)] = 403 + third := r.botVerificationMap(context.Background(), []domain.Peer{positive, negative}) + if verifications.batchCalls != 1 || verifications.peerCalls != 1 || len(third) != 0 { + t.Fatalf("version advance did not reload removal: batch=%d peer=%d result=%+v", verifications.batchCalls, verifications.peerCalls, third) + } +} + +func TestPeerIdentityCachesDoNotTurnReadErrorsIntoNegativeEntries(t *testing.T) { + peer := domain.Peer{Type: domain.PeerTypeUser, ID: 51} + versions := &fakeRPCReadModelVersions{hashes: map[store.ReadModelKey]int64{ + peerIdentityVersionKey(peer): 501, + }} + registry := newFakeUsernameRegistry() + registry.err = errors.New("username backend unavailable") + verifications := newFakeBotVerifications() + verifications.err = errors.New("verification backend unavailable") + r := &Router{ + deps: Deps{ + Usernames: registry, + BotVerifications: verifications, + ReadModelVersions: versions, + }, + peerIdentityCache: newPeerIdentityCache(8), + } + + if got := r.usernameRegistryMap(context.Background(), []domain.Peer{peer}); len(got) != 0 { + t.Fatalf("username error result = %+v, want empty overlay", got) + } + if got := r.botVerificationMap(context.Background(), []domain.Peer{peer}); len(got) != 0 { + t.Fatalf("verification error result = %+v, want empty overlay", got) + } + registry.err = nil + registry.byPeer[peer] = []domain.Username{{Username: "recovered", Active: true, CollectibleID: 7}} + verifications.err = nil + verifications.marks[peer] = domain.CustomVerification{Peer: peer, IconDocumentID: 9007} + + if got := r.usernameRegistryMap(context.Background(), []domain.Peer{peer}); len(got[peer]) != 1 || got[peer][0].Username != "recovered" { + t.Fatalf("username backend recovery hidden by negative cache: %+v", got) + } + if got := r.botVerificationMap(context.Background(), []domain.Peer{peer}); got[peer].IconDocumentID != 9007 { + t.Fatalf("verification backend recovery hidden by negative cache: %+v", got) + } + if registry.peerCalls != 3 || verifications.peerCalls != 3 { + t.Fatalf("backend recovery did not retry: usernames=%d verifications=%d", registry.peerCalls, verifications.peerCalls) + } +} + +func TestPeerIdentityCacheCombinesFacetsAndIgnoresBaseProjectionInvalidation(t *testing.T) { + userPeer := domain.Peer{Type: domain.PeerTypeUser, ID: 61} + channelPeer := domain.Peer{Type: domain.PeerTypeChannel, ID: 62} + peers := []domain.Peer{userPeer, channelPeer} + versions := &fakeRPCReadModelVersions{hashes: map[store.ReadModelKey]int64{ + peerIdentityVersionKey(userPeer): 601, + peerIdentityVersionKey(channelPeer): 602, + }} + registry := newFakeUsernameRegistry() + registry.byPeer[userPeer] = []domain.Username{{Username: "stable", Active: true}} + verifications := newFakeBotVerifications() + verifications.marks[channelPeer] = domain.CustomVerification{Peer: channelPeer, IconDocumentID: 9062} + r := &Router{ + deps: Deps{ + Usernames: registry, + BotVerifications: verifications, + ReadModelVersions: versions, + }, + peerIdentityCache: newPeerIdentityCache(8), + } + + usernames, marks := r.peerIdentityMaps(context.Background(), peers, true, true) + if registry.batchCalls != 1 || verifications.batchCalls != 1 || usernames[userPeer][0].Username != "stable" || marks[channelPeer].IconDocumentID != 9062 { + t.Fatalf("combined load registry=%d verification=%d usernames=%+v marks=%+v", registry.batchCalls, verifications.batchCalls, usernames, marks) + } + registry.byPeer[userPeer] = []domain.Username{{Username: "must-not-leak", Active: true}} + delete(verifications.marks, channelPeer) + r.InvalidateRPCProjectionReadModelForUser(userPeer.ID) + r.InvalidateRPCProjectionReadModelForChannel(channelPeer.ID) + usernames, marks = r.peerIdentityMaps(context.Background(), peers, true, true) + if registry.batchCalls != 1 || verifications.batchCalls != 1 || usernames[userPeer][0].Username != "stable" || marks[channelPeer].IconDocumentID != 9062 { + t.Fatalf("base invalidation evicted identity registry=%d verification=%d usernames=%+v marks=%+v", registry.batchCalls, verifications.batchCalls, usernames, marks) + } + + versions.hashes[peerIdentityVersionKey(userPeer)] = 603 + r.InvalidatePeerIdentityReadModel(userPeer) + usernames = r.usernameRegistryMap(context.Background(), peers) + if registry.peerCalls != 1 || usernames[userPeer][0].Username != "must-not-leak" { + t.Fatalf("exact identity invalidation did not reload user: peerCalls=%d usernames=%+v", registry.peerCalls, usernames) + } +} diff --git a/internal/rpc/peer_projection_cache.go b/internal/rpc/peer_projection_cache.go index befee15f..83709417 100644 --- a/internal/rpc/peer_projection_cache.go +++ b/internal/rpc/peer_projection_cache.go @@ -2,13 +2,56 @@ package rpc import ( "context" + "errors" + "fmt" "go.uber.org/zap" "telesrv/internal/app/peerview" + appusers "telesrv/internal/app/users" "telesrv/internal/domain" + "telesrv/internal/store" ) +const ( + maxPeerProjectionUsersPerBatch = 1000 + maxPeerProjectionRecoveryCalls = 64 + maxPeerProjectionAttemptedOwnerIDs = 16000 +) + +var ( + ErrDurableUserProjectionIncomplete = errors.New("durable user projection is incomplete") + ErrUserProjectionCapacityRecoveryLimit = errors.New("user projection capacity recovery limit exceeded") +) + +type userProjectionRecoveryBudget struct { + maxCalls int + maxItems int + calls int + attempted int +} + +func (b *userProjectionRecoveryBudget) consume(items int) error { + if b == nil { + return nil + } + itemsExceeded := items < 0 || b.attempted > b.maxItems || items > b.maxItems-b.attempted + if b.calls >= b.maxCalls || itemsExceeded { + return fmt.Errorf( + "%w: calls=%d/%d attempted=%d/%d next=%d", + ErrUserProjectionCapacityRecoveryLimit, + b.calls, + b.maxCalls, + b.attempted, + b.maxItems, + items, + ) + } + b.calls++ + b.attempted += items + return nil +} + // viewerPeerCache 是一次 outbox/fanout 构建内的短生命周期缓存。 // 用户资料含联系人、隐私、头像和在线状态，必须按 viewerUserID 隔离，不能跨视角复用。 type viewerPeerCache struct { @@ -33,21 +76,77 @@ func newViewerPeerCache(r *Router) *viewerPeerCache { } func (c *viewerPeerCache) usersForIDs(ctx context.Context, viewerUserID int64, ids []int64) []domain.User { - if c == nil || c.users == nil { - return nil - } - users, err := c.users.UsersForView(ctx, viewerUserID, ids) - if err != nil && c.r != nil { + unique := uniquePeerIDs(ids) + users, err := c.resolveUsersForIDs(ctx, viewerUserID, unique) + if err != nil && c != nil && c.r != nil { c.r.log.Warn("batch resolve users for peer projection failed", zap.Int64("viewer_user_id", viewerUserID), - zap.Int("count", len(uniquePeerIDs(ids))), + zap.Int("count", len(unique)), zap.Error(err), ) } - if c.r == nil { - return users + return users +} + +// usersForIDsStrict rejects resolver errors and incomplete durable envelopes. +// Callers must not merge a partial projection with raw store users while +// advancing an account/channel difference cursor or dispatching an outbox row. +func (c *viewerPeerCache) usersForIDsStrict(ctx context.Context, viewerUserID int64, ids []int64) ([]domain.User, error) { + unique := uniquePeerIDs(ids) + users, err := c.resolveUsersForIDs(ctx, viewerUserID, unique) + if err != nil { + return nil, fmt.Errorf("resolve durable users for viewer %d: %w", viewerUserID, err) } - return c.r.withUsersPresence(users) + if missingID, missing := missingProjectedUserID(unique, users); missing { + return nil, fmt.Errorf("%w: viewer_user_id=%d missing_user_id=%d", ErrDurableUserProjectionIncomplete, viewerUserID, missingID) + } + return users, nil +} + +func (c *viewerPeerCache) resolveUsersForIDs(ctx context.Context, viewerUserID int64, unique []int64) ([]domain.User, error) { + if c == nil || c.users == nil { + return nil, nil + } + budget := userProjectionRecoveryBudget{ + maxCalls: maxPeerProjectionRecoveryCalls, + maxItems: maxPeerProjectionAttemptedOwnerIDs, + } + users := make([]domain.User, 0, len(unique)) + for start := 0; start < len(unique); start += maxPeerProjectionUsersPerBatch { + end := start + maxPeerProjectionUsersPerBatch + if end > len(unique) { + end = len(unique) + } + batch, err := c.usersForIDBatch(ctx, viewerUserID, unique[start:end], &budget) + if err != nil { + return nil, err + } + users = append(users, batch...) + } + if c.r == nil { + return users, nil + } + return c.r.withUsersPresence(users), nil +} + +func (c *viewerPeerCache) usersForIDBatch(ctx context.Context, viewerUserID int64, ids []int64, budget *userProjectionRecoveryBudget) ([]domain.User, error) { + if err := budget.consume(len(ids)); err != nil { + return nil, err + } + users, err := c.users.UsersForView(ctx, viewerUserID, ids) + if err == nil || !isSparseProjectionCapacityError(err) || len(ids) < 2 { + return users, err + } + middle := len(ids) / 2 + left, leftErr := c.usersForIDBatch(ctx, viewerUserID, ids[:middle], budget) + if leftErr != nil { + return nil, leftErr + } + right, rightErr := c.usersForIDBatch(ctx, viewerUserID, ids[middle:], budget) + if rightErr != nil { + return nil, rightErr + } + return append(left, right...), nil } // primeUsers 把跨 viewer 一次性投影（ByIDsForViewers）的结果按 viewer 预热进底层 BatchCache， @@ -59,6 +158,40 @@ func (c *viewerPeerCache) primeUsers(viewerUserID int64, users []domain.User) { c.users.Prime(viewerUserID, users) } +// primeExpectedUsers follows a caller-side completeness check. PrimeExpected +// also negative-caches omitted system-resolved IDs so later lookups cannot +// silently fall back to a scalar resolver. +func (c *viewerPeerCache) primeExpectedUsers(viewerUserID int64, expectedIDs []int64, users []domain.User) { + if c == nil || c.users == nil || viewerUserID == 0 { + return + } + c.users.PrimeExpected(viewerUserID, expectedIDs, users) +} + +func missingProjectedUserID(expectedIDs []int64, users []domain.User) (int64, bool) { + found := make(map[int64]struct{}, len(users)) + for _, user := range users { + if user.ID != 0 { + found[user.ID] = struct{}{} + } + } + for _, id := range uniquePeerIDs(expectedIDs) { + if _, system := domain.SystemUserByID(id); system { + continue + } + if _, ok := found[id]; !ok { + return id, true + } + } + return 0, false +} + +func isSparseProjectionCapacityError(err error) bool { + return errors.Is(err, store.ErrActiveChannelMemberPairsLimit) || + errors.Is(err, appusers.ErrBatchUsersLimit) || + errors.Is(err, appusers.ErrBatchViewerCells) +} + func (c *viewerPeerCache) channelsForIDs(ctx context.Context, viewerUserID int64, ids []int64) []domain.Channel { unique := uniquePeerIDs(ids) if c == nil || c.r == nil || len(unique) == 0 || c.r.deps.Channels == nil || viewerUserID == 0 { diff --git a/internal/rpc/peer_projection_cache_test.go b/internal/rpc/peer_projection_cache_test.go index 193c02f3..24b54799 100644 --- a/internal/rpc/peer_projection_cache_test.go +++ b/internal/rpc/peer_projection_cache_test.go @@ -2,6 +2,8 @@ package rpc import ( "context" + "errors" + "fmt" "testing" "github.com/iamxvbaba/td/clock" @@ -9,11 +11,121 @@ import ( appchannels "telesrv/internal/app/channels" appdialogs "telesrv/internal/app/dialogs" + appmessages "telesrv/internal/app/messages" appusers "telesrv/internal/app/users" "telesrv/internal/domain" "telesrv/internal/store/memory" ) +func TestEnrichMessageListReusesApplicationViewerProjection(t *testing.T) { + ctx := context.Background() + const ( + viewerID = int64(1001) + peerID = int64(1002) + viaBotID = int64(1003) + ) + users := &countingMapUsersService{mapUsersService: mapUsersService{users: map[int64]domain.User{ + viewerID: {ID: viewerID, FirstName: "Viewer"}, + peerID: {ID: peerID, FirstName: "Peer"}, + viaBotID: {ID: viaBotID, FirstName: "Bot", Bot: true}, + }}} + r := New(Config{}, Deps{ + Messages: newCompletePeerCacheMessageService(), + Users: users, + }, zaptest.NewLogger(t), clock.System) + + list := domain.MessageList{ + Messages: []domain.Message{{ + OwnerUserID: viewerID, + Peer: domain.Peer{Type: domain.PeerTypeUser, ID: peerID}, + From: domain.Peer{Type: domain.PeerTypeUser, ID: viewerID}, + ViaBotID: viaBotID, + }}, + Users: []domain.User{ + {ID: viewerID, FirstName: "Viewer"}, + {ID: peerID, FirstName: "Peer"}, + }, + } + got := r.enrichMessageList(ctx, viewerID, list) + if users.byIDsCalls != 1 || len(users.lastByIDs) != 1 || users.lastByIDs[0] != viaBotID { + t.Fatalf("ByIDs calls=%d ids=%v, want only missing nested bot %d", users.byIDsCalls, users.lastByIDs, viaBotID) + } + if len(got.Users) != 3 { + t.Fatalf("users=%+v, want projected envelope plus nested bot", got.Users) + } + + users.byIDsCalls = 0 + users.lastByIDs = nil + list.Users = append(list.Users, domain.User{ID: viaBotID, FirstName: "Bot", Bot: true}) + got = r.enrichMessageList(ctx, viewerID, list) + if users.byIDsCalls != 0 { + t.Fatalf("ByIDs calls with complete projected envelope=%d, want 0", users.byIDsCalls) + } + if len(got.Users) != 3 { + t.Fatalf("complete users=%+v, want 3", got.Users) + } +} + +func TestEnrichMessageListDoesNotTrustPartialApplicationProjection(t *testing.T) { + ctx := context.Background() + const ( + viewerID = int64(1101) + peerID = int64(1102) + ) + users := &countingMapUsersService{mapUsersService: mapUsersService{users: map[int64]domain.User{ + viewerID: {ID: viewerID, FirstName: "Projected viewer"}, + peerID: {ID: peerID, FirstName: "Projected peer"}, + }}} + r := New(Config{}, Deps{ + Messages: appmessages.NewService(memory.NewMessageStore(), nil), + Users: users, + }, zaptest.NewLogger(t), clock.System) + + got := r.enrichMessageList(ctx, viewerID, domain.MessageList{ + Messages: []domain.Message{{ + OwnerUserID: viewerID, + Peer: domain.Peer{Type: domain.PeerTypeUser, ID: peerID}, + From: domain.Peer{Type: domain.PeerTypeUser, ID: viewerID}, + }}, + Users: []domain.User{{ID: viewerID, FirstName: "Raw viewer"}, {ID: peerID, FirstName: "Raw peer"}}, + }) + if users.byIDsCalls != 1 || len(users.lastByIDs) != 2 { + t.Fatalf("ByIDs calls=%d ids=%v, want one authoritative reload of both ordinary refs", users.byIDsCalls, users.lastByIDs) + } + for _, user := range got.Users { + if user.ID == peerID && user.FirstName != "Projected peer" { + t.Fatalf("peer=%+v, want RPC projection to replace the untrusted raw envelope", user) + } + } +} + +func newCompletePeerCacheMessageService() *appmessages.Service { + return appmessages.NewService(memory.NewMessageStore(), nil, + appmessages.WithContactStore(memory.NewContactStore()), + appmessages.WithPhotoProvider(peerCacheTestPhotos{}), + appmessages.WithPrivacyEvaluator(peerCacheTestPrivacy{}), + appmessages.WithAccountFreezeProvider(peerCacheTestFreezes{}), + ) +} + +type peerCacheTestPhotos struct{} + +func (peerCacheTestPhotos) CurrentProfilePhotos(context.Context, domain.PeerType, []int64) (map[int64]domain.ProfilePhotoRef, error) { + return map[int64]domain.ProfilePhotoRef{}, nil +} + +type peerCacheTestPrivacy struct{} + +func (peerCacheTestPrivacy) CanSee(context.Context, int64, int64, domain.PrivacyKey) (bool, error) { + return true, nil +} + +type peerCacheTestFreezes struct{} + +func (peerCacheTestFreezes) AccountFreezes(context.Context, []int64) (map[int64]domain.AccountFreeze, error) { + return map[int64]domain.AccountFreeze{}, nil +} + func TestViewerPeerCacheChannelsForIDsUsesBatchAndCachesMissing(t *testing.T) { ctx := context.Background() userStore := memory.NewUserStore() @@ -81,3 +193,146 @@ func TestViewerPeerCacheChannelsForIDsUsesBatchAndCachesMissing(t *testing.T) { t.Fatalf("cached missing calls: GetChannels=%d GetChannel=%d, want no extra calls", counting.getChannelsCalls, counting.getChannelCalls) } } + +func TestViewerPeerCacheChunksLargeUserUnionsWithoutTruncation(t *testing.T) { + const viewerID = int64(9001) + ids := make([]int64, maxPeerProjectionUsersPerBatch+37) + base := make(map[int64]domain.User, len(ids)) + for i := range ids { + ids[i] = int64(10000 + i) + base[ids[i]] = domain.User{ID: ids[i], FirstName: "projected"} + } + users := &countingMapUsersService{mapUsersService: mapUsersService{users: base}} + router := New(Config{}, Deps{Users: users}, zaptest.NewLogger(t), clock.System) + + got := newViewerPeerCache(router).usersForIDs(context.Background(), viewerID, ids) + if len(got) != len(ids) { + t.Fatalf("projected users=%d, want all %d", len(got), len(ids)) + } + if users.byIDsCalls != 2 || len(users.byIDsBatches) != 2 { + t.Fatalf("ByIDs calls=%d batches=%d, want two bounded batches", users.byIDsCalls, len(users.byIDsBatches)) + } + for i, batch := range users.byIDsBatches { + if len(batch) == 0 || len(batch) > maxPeerProjectionUsersPerBatch { + t.Fatalf("batch %d size=%d, want 1..%d", i, len(batch), maxPeerProjectionUsersPerBatch) + } + } +} + +type capacityBudgetPeerUsers struct { + mapUsersService + maxBatch int + calls [][]int64 +} + +func (s *capacityBudgetPeerUsers) ByIDs(_ context.Context, _ int64, ids []int64) ([]domain.User, error) { + s.calls = append(s.calls, append([]int64(nil), ids...)) + if s.maxBatch > 0 && len(ids) > s.maxBatch { + return nil, fmt.Errorf("%w: test batch size %d", appusers.ErrBatchViewerCells, len(ids)) + } + out := make([]domain.User, len(ids)) + for i, id := range ids { + out[i] = domain.User{ID: id, FirstName: "projected"} + } + return out, nil +} + +func TestViewerPeerCacheCapacityRecoveryBudgetIsSharedAndFailClosed(t *testing.T) { + ids := func(count int) []int64 { + out := make([]int64, count) + for i := range out { + out[i] = int64(20_000 + i) + } + return out + } + newCache := func(users *capacityBudgetPeerUsers) *viewerPeerCache { + router := New(Config{}, Deps{Users: users}, zaptest.NewLogger(t), clock.System) + return newViewerPeerCache(router) + } + + t.Run("bounded split completes below call limit", func(t *testing.T) { + users := &capacityBudgetPeerUsers{maxBatch: 32} + got, err := newCache(users).usersForIDsStrict(context.Background(), 9001, ids(maxPeerProjectionUsersPerBatch)) + if err != nil || len(got) != maxPeerProjectionUsersPerBatch { + t.Fatalf("strict users=%d err=%v, want complete projection", len(got), err) + } + if len(users.calls) != 63 { + t.Fatalf("resolver calls=%d, want balanced 63-call recovery below limit %d", len(users.calls), maxPeerProjectionRecoveryCalls) + } + }) + + t.Run("call budget rejects whole projection", func(t *testing.T) { + users := &capacityBudgetPeerUsers{maxBatch: 16} + got, err := newCache(users).usersForIDsStrict(context.Background(), 9001, ids(maxPeerProjectionUsersPerBatch)) + if got != nil || !errors.Is(err, ErrUserProjectionCapacityRecoveryLimit) { + t.Fatalf("strict users=%+v err=%v, want nil recovery-limit error", got, err) + } + if errors.Is(err, appusers.ErrBatchViewerCells) { + t.Fatalf("recovery-limit error must not retain capacity identity: %v", err) + } + if len(users.calls) != maxPeerProjectionRecoveryCalls { + t.Fatalf("resolver calls=%d, want hard limit %d", len(users.calls), maxPeerProjectionRecoveryCalls) + } + }) + + t.Run("attempted owner budget spans outer chunks", func(t *testing.T) { + users := &capacityBudgetPeerUsers{} + got, err := newCache(users).usersForIDsStrict(context.Background(), 9001, ids(maxPeerProjectionAttemptedOwnerIDs+1)) + if got != nil || !errors.Is(err, ErrUserProjectionCapacityRecoveryLimit) { + t.Fatalf("strict users=%+v err=%v, want nil recovery-limit error", got, err) + } + wantCalls := maxPeerProjectionAttemptedOwnerIDs / maxPeerProjectionUsersPerBatch + if len(users.calls) != wantCalls { + t.Fatalf("resolver calls=%d, want %d successful chunks before shared owner limit", len(users.calls), wantCalls) + } + }) +} + +func TestWithDialogListPresenceOnlyLoadsMissingMessagePeers(t *testing.T) { + ctx := context.Background() + const ( + viewerID = int64(1001) + peerID = int64(1002) + viaBotID = int64(1003) + ) + users := &countingMapUsersService{mapUsersService: mapUsersService{users: map[int64]domain.User{ + viewerID: {ID: viewerID, FirstName: "Viewer"}, + peerID: {ID: peerID, FirstName: "Peer"}, + viaBotID: {ID: viaBotID, FirstName: "Bot", Bot: true}, + }}} + r := New(Config{}, Deps{Users: users}, zaptest.NewLogger(t), clock.System) + + list := domain.DialogList{ + Messages: []domain.Message{{ + Peer: domain.Peer{Type: domain.PeerTypeUser, ID: peerID}, + From: domain.Peer{Type: domain.PeerTypeUser, ID: viewerID}, + ViaBotID: viaBotID, + }}, + Users: []domain.User{ + {ID: viewerID, FirstName: "Viewer"}, + {ID: peerID, FirstName: "Peer"}, + }, + } + + got := r.withDialogListPresence(ctx, viewerID, list) + if users.byIDsCalls != 1 { + t.Fatalf("ByIDs calls = %d, want one missing-peer batch", users.byIDsCalls) + } + if len(users.lastByIDs) != 1 || users.lastByIDs[0] != viaBotID { + t.Fatalf("ByIDs ids = %v, want only missing via bot %d", users.lastByIDs, viaBotID) + } + if len(got.Users) != 3 { + t.Fatalf("projected users = %d, want existing two plus missing bot", len(got.Users)) + } + + users.byIDsCalls = 0 + users.lastByIDs = nil + list.Users = append(list.Users, domain.User{ID: viaBotID, FirstName: "Bot", Bot: true}) + got = r.withDialogListPresence(ctx, viewerID, list) + if users.byIDsCalls != 0 { + t.Fatalf("ByIDs calls with complete envelope = %d, want zero", users.byIDsCalls) + } + if len(got.Users) != 3 { + t.Fatalf("complete projected users = %d, want unchanged three", len(got.Users)) + } +} diff --git a/internal/rpc/phone_rpc_test.go b/internal/rpc/phone_rpc_test.go index 8ae14542..ef253f21 100644 --- a/internal/rpc/phone_rpc_test.go +++ b/internal/rpc/phone_rpc_test.go @@ -63,6 +63,24 @@ func (s *phoneCaptureSessions) PushToUserExceptAuthKeySession(_ context.Context, return 1, nil } +func (s *phoneCaptureSessions) PushToUserAuthKey(_ context.Context, userID int64, businessAuthKeyID [8]byte, _ proto.MessageType, msg tg.UpdatesClass) (int, error) { + s.mu.Lock() + defer s.mu.Unlock() + s.log = append(s.log, phonePushRecord{userID: userID, rawAuthKeyID: businessAuthKeyID, msg: msg}) + return 1, s.pushErr +} + +func (s *phoneCaptureSessions) PushToUserAuthKeyTransient(ctx context.Context, userID int64, businessAuthKeyID [8]byte, t proto.MessageType, msg tg.UpdatesClass, _ time.Duration) (int, error) { + return s.PushToUserAuthKey(ctx, userID, businessAuthKeyID, t, msg) +} + +func (s *phoneCaptureSessions) PushToUserExceptBusinessAuthKey(_ context.Context, userID int64, excludeBusinessAuthKeyID [8]byte, _ proto.MessageType, msg tg.UpdatesClass, _ time.Duration) (int, error) { + s.mu.Lock() + defer s.mu.Unlock() + s.log = append(s.log, phonePushRecord{userID: userID, rawAuthKeyID: excludeBusinessAuthKeyID, msg: msg}) + return 1, s.pushErr +} + func (s *phoneCaptureSessions) records() []phonePushRecord { s.mu.Lock() defer s.mu.Unlock() @@ -576,6 +594,18 @@ func TestPhoneUserFullCallFlags(t *testing.T) { func TestMessagesGetDhConfig(t *testing.T) { f := newPhoneFixture(t, stubPrivacy{}) + // Version 1 was the pre-server-ready placeholder. A private-DC client may + // still have that version cached with parameters from a different profile; + // treating it as current lets the two secret-chat endpoints derive different + // auth keys while acceptEncryption itself appears to succeed. + legacy, err := f.router.onMessagesGetDhConfig(f.callerCtx(), &tg.MessagesGetDhConfigRequest{Version: 1, RandomLength: 256}) + if err != nil { + t.Fatalf("getDhConfig legacy version: %v", err) + } + if _, ok := legacy.(*tg.MessagesDhConfig); !ok { + t.Fatalf("legacy version result = %T, want full MessagesDhConfig", legacy) + } + res, err := f.router.onMessagesGetDhConfig(f.callerCtx(), &tg.MessagesGetDhConfigRequest{Version: 0, RandomLength: 256}) if err != nil { t.Fatalf("getDhConfig: %v", err) diff --git a/internal/rpc/photos.go b/internal/rpc/photos.go index c8c8c696..3c2cf035 100644 --- a/internal/rpc/photos.go +++ b/internal/rpc/photos.go @@ -45,8 +45,14 @@ func (r *Router) onPhotosUploadProfilePhoto(ctx context.Context, req *tg.PhotosU if !ok || userID == 0 { return nil, photoInvalidErr() } - if bot, hasBot := req.GetBot(); hasBot && bot != nil { - return nil, inputConstructorInvalidErr() + targetUserID := userID + var botTarget domain.User + bot, hasBot := req.GetBot() + if target, isBotTarget, err := r.resolveProfilePhotoBotTarget(ctx, userID, bot, hasBot); err != nil { + return nil, err + } else if isBotTarget { + botTarget = target + targetUserID = target.ID } upload, mediaFlags, err := parseProfilePhotoUpload(req) if err != nil { @@ -63,13 +69,16 @@ func (r *Router) onPhotosUploadProfilePhoto(ctx context.Context, req *tg.PhotosU if err != nil { return nil, err } - photo, found, err := r.deps.Files.SetCurrentProfilePhotoKind(ctx, domain.PeerTypeUser, userID, kind, photo.ID, int(r.clock.Now().Unix())) + photo, found, err := r.deps.Files.SetCurrentProfilePhotoKind(ctx, domain.PeerTypeUser, targetUserID, kind, photo.ID, int(r.clock.Now().Unix())) if err != nil { return nil, internalErr() } if !found { return nil, photoInvalidErr() } + if botTarget.ID != 0 { + return r.photosPhotoForBotTarget(ctx, userID, botTarget.ID, photo, kind), nil + } return r.photosPhotoForSelf(ctx, userID, photo, kind), nil } @@ -84,8 +93,14 @@ func (r *Router) onPhotosUpdateProfilePhoto(ctx context.Context, req *tg.PhotosU if !ok || userID == 0 { return nil, photoInvalidErr() } - if bot, hasBot := req.GetBot(); hasBot && bot != nil { - return nil, inputConstructorInvalidErr() + targetUserID := userID + var botTarget domain.User + bot, hasBot := req.GetBot() + if target, isBotTarget, err := r.resolveProfilePhotoBotTarget(ctx, userID, bot, hasBot); err != nil { + return nil, err + } else if isBotTarget { + botTarget = target + targetUserID = target.ID } kind := domain.ProfilePhotoKindProfile if req.GetFallback() { @@ -93,23 +108,53 @@ func (r *Router) onPhotosUpdateProfilePhoto(ctx context.Context, req *tg.PhotosU } switch in := req.ID.(type) { case *tg.InputPhoto: - photo, found, err := r.deps.Files.SetCurrentProfilePhotoKind(ctx, domain.PeerTypeUser, userID, kind, in.ID, int(r.clock.Now().Unix())) + photo, found, err := r.deps.Files.SetCurrentProfilePhotoKind(ctx, domain.PeerTypeUser, targetUserID, kind, in.ID, int(r.clock.Now().Unix())) if err != nil { return nil, internalErr() } if !found { return nil, photoInvalidErr() } + if botTarget.ID != 0 { + return r.photosPhotoForBotTarget(ctx, userID, botTarget.ID, photo, kind), nil + } return r.photosPhotoForSelf(ctx, userID, photo, kind), nil default: // InputPhotoEmpty：移除当前头像（停用现有当前照片）。 - if cur, found, err := r.deps.Files.CurrentProfilePhotoKind(ctx, domain.PeerTypeUser, userID, kind); err == nil && found { - _, _ = r.deps.Files.DeleteProfilePhotosKind(ctx, domain.PeerTypeUser, userID, kind, []int64{cur.ID}) + if cur, found, err := r.deps.Files.CurrentProfilePhotoKind(ctx, domain.PeerTypeUser, targetUserID, kind); err == nil && found { + _, _ = r.deps.Files.DeleteProfilePhotosKind(ctx, domain.PeerTypeUser, targetUserID, kind, []int64{cur.ID}) + } + if botTarget.ID != 0 { + return r.photosPhotoForBotTarget(ctx, userID, botTarget.ID, domain.Photo{}, kind), nil } return r.photosPhotoForSelf(ctx, userID, domain.Photo{}, kind), nil } } +func (r *Router) resolveProfilePhotoBotTarget(ctx context.Context, ownerUserID int64, bot tg.InputUserClass, hasBot bool) (domain.User, bool, error) { + if !hasBot { + return domain.User{}, false, nil + } + if bot == nil || ownerUserID == 0 || r.deps.Users == nil || r.deps.Bots == nil { + return domain.User{}, false, botInvalidErr() + } + target, found, err := r.userFromInput(ctx, ownerUserID, bot) + if err != nil { + return domain.User{}, false, internalErr() + } + if !found || target.ID == 0 { + return domain.User{}, false, botInvalidErr() + } + owns, err := r.deps.Bots.OwnsBot(ctx, ownerUserID, target.ID) + if err != nil { + return domain.User{}, false, internalErr() + } + if !owns { + return domain.User{}, false, botInvalidErr() + } + return target, true, nil +} + func (r *Router) onPhotosUploadContactProfilePhoto(ctx context.Context, req *tg.PhotosUploadContactProfilePhotoRequest) (*tg.PhotosPhoto, error) { if r.deps.Files == nil || r.deps.Users == nil { return nil, notImplementedErr() @@ -494,6 +539,29 @@ func (r *Router) photosPhotoForSelf(ctx context.Context, userID int64, photo dom return out } +func (r *Router) photosPhotoForBotTarget(ctx context.Context, viewerUserID, botUserID int64, photo domain.Photo, kind domain.ProfilePhotoKind) *tg.PhotosPhoto { + out := &tg.PhotosPhoto{Photo: tgPhoto(photo), Users: []tg.UserClass{}} + r.invalidateRPCProjectionForUser(botUserID) + if r.deps.Users == nil { + return out + } + bot, found, err := r.deps.Users.ByID(ctx, viewerUserID, botUserID) + if err != nil || !found { + return out + } + if kind == domain.ProfilePhotoKindProfile { + applyProfilePhotoToUser(&bot, photo) + } + projected := r.tgUser(bot) + _ = r.applyBotCanEditToUser(ctx, viewerUserID, bot, projected) + pushed := r.tgUser(bot) + _ = r.applyBotCanEditToUser(ctx, viewerUserID, bot, pushed) + r.applyUsernamesToPeerObjects(ctx, []tg.UserClass{projected, pushed}, nil) + out.Users = append(out.Users, projected) + r.pushBotPhotoUpdateToOwner(ctx, viewerUserID, bot, pushed) + return out +} + func (r *Router) photosPhotoForUser(ctx context.Context, viewerUserID, targetUserID int64, photo domain.Photo) *tg.PhotosPhoto { out := &tg.PhotosPhoto{Photo: tgPhoto(photo), Users: []tg.UserClass{}} if r.deps.Users == nil { @@ -576,6 +644,15 @@ func (r *Router) pushSelfPhotoUpdateWithUser(ctx context.Context, self domain.Us r.pushSelfPhotoUpdateToCurrentSession(ctx, updates) } +func (r *Router) pushBotPhotoUpdateToOwner(ctx context.Context, ownerUserID int64, bot domain.User, projected *tg.User) { + if ownerUserID == 0 || bot.ID == 0 || projected == nil { + return + } + updates := selfPhotoUpdates(bot, int(r.clock.Now().Unix()), projected) + r.pushUserUpdates(ctx, ownerUserID, updates) + r.pushSelfPhotoUpdateToCurrentSession(ctx, updates) +} + // defaultSelfPhotoEchoPushDelay 是头像变更后向当前 session 回显 updateUser 的延迟： // 必须晚于 RPC 结果写出与客户端响应回调，否则 DrKLO 的手工 photo 重建会覆盖回显内容。 // updateUser 无 pts，晚到/丢失不影响 difference 正确性。 diff --git a/internal/rpc/photos_push_test.go b/internal/rpc/photos_push_test.go index 15f8c51d..ae5ee9c3 100644 --- a/internal/rpc/photos_push_test.go +++ b/internal/rpc/photos_push_test.go @@ -9,6 +9,7 @@ import ( "github.com/iamxvbaba/td/tg" "go.uber.org/zap/zaptest" + botsapp "telesrv/internal/app/bots" appusers "telesrv/internal/app/users" "telesrv/internal/domain" "telesrv/internal/store/memory" @@ -206,6 +207,139 @@ func TestDeletePhotosPushesSelfUpdate(t *testing.T) { } } +func TestUploadProfilePhotoBotTargetUpdatesOwnedBot(t *testing.T) { + ctx := context.Background() + userStore := memory.NewUserStore() + botStore := memory.NewBotStore(userStore) + dialogStore := memory.NewDialogStore() + bots := botsapp.NewService(userStore, botStore, memory.NewMessageStore(dialogStore)) + owner, _ := userStore.Create(ctx, domain.User{AccessHash: 11, Phone: "15550001006", FirstName: "Owner"}) + bot, _, err := bots.CreateBot(ctx, owner.ID, "Photo Bot", "photo_shape_bot") + if err != nil { + t.Fatalf("create bot: %v", err) + } + sessions := &captureSessions{} + files := &fakeFiles{} + r := New(Config{DC: 2, IP: "127.0.0.1", Port: 2398}, Deps{ + Users: appusers.NewService(userStore, appusers.WithPhotoProvider(files)), + Bots: bots, + Files: files, + Sessions: sessions, + }, zaptest.NewLogger(t), clock.System) + r.selfPhotoEchoPushDelay = 0 + + const currentSessionID = int64(454545) + reqCtx := WithSessionID(WithUserID(ctx, owner.ID), currentSessionID) + req := &tg.PhotosUploadProfilePhotoRequest{} + req.SetBot(&tg.InputUser{UserID: bot.ID, AccessHash: bot.AccessHash}) + req.SetFile(&tg.InputFile{ID: 42, Parts: 1, Name: "bot.jpg"}) + got, err := r.onPhotosUploadProfilePhoto(reqCtx, req) + if err != nil { + t.Fatalf("upload bot profile photo: %v", err) + } + + if cur, ok, err := files.CurrentProfilePhotoKind(ctx, domain.PeerTypeUser, bot.ID, domain.ProfilePhotoKindProfile); err != nil || !ok || cur.ID != 778 { + t.Fatalf("bot current profile photo = %+v ok=%v err=%v, want 778", cur, ok, err) + } + if _, ok, err := files.CurrentProfilePhotoKind(ctx, domain.PeerTypeUser, owner.ID, domain.ProfilePhotoKindProfile); err != nil || ok { + t.Fatalf("owner current profile photo after bot upload: ok=%v err=%v, want unchanged", ok, err) + } + + returnedBot := firstPhotosUser(t, got) + if returnedBot.ID != bot.ID || returnedBot.Self { + t.Fatalf("returned user = id:%d self:%v, want bot id %d and self=false", returnedBot.ID, returnedBot.Self, bot.ID) + } + if !returnedBot.Bot || !returnedBot.GetBotCanEdit() { + t.Fatalf("returned bot flags = bot:%v can_edit:%v, want both true", returnedBot.Bot, returnedBot.GetBotCanEdit()) + } + returnedPhoto, ok := returnedBot.Photo.(*tg.UserProfilePhoto) + if !ok || returnedPhoto.PhotoID != 778 || returnedPhoto.DCID != 2 { + t.Fatalf("returned bot photo = %+v, want photo_id=778 dc_id=2", returnedBot.Photo) + } + + if pushed := sessions.pushedUserIDs(); len(pushed) != 1 || pushed[0] != owner.ID { + t.Fatalf("pushed user ids = %v, want owner %d", pushed, owner.ID) + } + snap := sessions.snapshot() + if snap.sessionID != currentSessionID { + t.Fatalf("echo session = %d, want %d", snap.sessionID, currentSessionID) + } + echoed, ok := snap.message.(*tg.Updates) + if !ok { + t.Fatalf("echoed message = %T, want *tg.Updates", snap.message) + } + hasBotUpdate := false + for _, u := range echoed.Updates { + if uu, ok := u.(*tg.UpdateUser); ok && uu.UserID == bot.ID { + hasBotUpdate = true + } + } + if !hasBotUpdate || len(echoed.Users) == 0 { + t.Fatalf("echoed updates = %+v, want UpdateUser + bot user", echoed) + } + echoedBot, ok := echoed.Users[0].(*tg.User) + if !ok { + t.Fatalf("echoed user = %T, want *tg.User", echoed.Users[0]) + } + echoedPhoto, ok := echoedBot.Photo.(*tg.UserProfilePhoto) + if echoedBot.ID != bot.ID || echoedBot.Self || !ok || echoedPhoto.PhotoID != 778 { + t.Fatalf("echoed bot = %+v photo=%+v, want updated non-self bot", echoedBot, echoedBot.Photo) + } + + sessions.clearMessages() + clearReq := &tg.PhotosUpdateProfilePhotoRequest{ID: &tg.InputPhotoEmpty{}} + clearReq.SetBot(&tg.InputUser{UserID: bot.ID, AccessHash: bot.AccessHash}) + cleared, err := r.onPhotosUpdateProfilePhoto(reqCtx, clearReq) + if err != nil { + t.Fatalf("clear bot profile photo: %v", err) + } + if _, ok, err := files.CurrentProfilePhotoKind(ctx, domain.PeerTypeUser, bot.ID, domain.ProfilePhotoKindProfile); err != nil || ok { + t.Fatalf("bot current profile photo after clear: ok=%v err=%v, want removed", ok, err) + } + clearedBot := firstPhotosUser(t, cleared) + if clearedBot.ID != bot.ID || clearedBot.Self || clearedBot.Photo != nil { + t.Fatalf("cleared returned bot = id:%d self:%v photo:%+v, want non-self bot without photo", clearedBot.ID, clearedBot.Self, clearedBot.Photo) + } + echoed, ok = sessions.snapshot().message.(*tg.Updates) + if !ok || len(echoed.Users) == 0 { + t.Fatalf("clear echoed message = %T %+v, want *tg.Updates with users", sessions.snapshot().message, sessions.snapshot().message) + } + echoedBot, ok = echoed.Users[0].(*tg.User) + if !ok || echoedBot.ID != bot.ID || echoedBot.Photo != nil { + t.Fatalf("clear echoed bot = %T %+v, want bot without photo", echoed.Users[0], echoed.Users[0]) + } +} + +func TestUploadProfilePhotoBotTargetRejectsForeignBot(t *testing.T) { + ctx := context.Background() + userStore := memory.NewUserStore() + botStore := memory.NewBotStore(userStore) + dialogStore := memory.NewDialogStore() + bots := botsapp.NewService(userStore, botStore, memory.NewMessageStore(dialogStore)) + owner, _ := userStore.Create(ctx, domain.User{AccessHash: 11, Phone: "15550001007", FirstName: "Owner"}) + stranger, _ := userStore.Create(ctx, domain.User{AccessHash: 12, Phone: "15550001008", FirstName: "Stranger"}) + foreignBot, _, err := bots.CreateBot(ctx, stranger.ID, "Foreign Bot", "foreign_photo_shape_bot") + if err != nil { + t.Fatalf("create foreign bot: %v", err) + } + files := &fakeFiles{} + r := New(Config{DC: 2, IP: "127.0.0.1", Port: 2398}, Deps{ + Users: appusers.NewService(userStore, appusers.WithPhotoProvider(files)), + Bots: bots, + Files: files, + }, zaptest.NewLogger(t), clock.System) + + req := &tg.PhotosUploadProfilePhotoRequest{} + req.SetBot(&tg.InputUser{UserID: foreignBot.ID, AccessHash: foreignBot.AccessHash}) + req.SetFile(&tg.InputFile{ID: 42, Parts: 1, Name: "bot.jpg"}) + if _, err := r.onPhotosUploadProfilePhoto(WithUserID(ctx, owner.ID), req); err == nil || !strings.Contains(err.Error(), "BOT_INVALID") { + t.Fatalf("foreign bot upload error = %v, want BOT_INVALID", err) + } + if _, ok, err := files.CurrentProfilePhotoKind(ctx, domain.PeerTypeUser, foreignBot.ID, domain.ProfilePhotoKindProfile); err != nil || ok { + t.Fatalf("foreign bot current profile photo after rejected upload: ok=%v err=%v, want unchanged", ok, err) + } +} + func TestUploadProfilePhotoSupportsAnimatedVideoAndEmojiMarkup(t *testing.T) { ctx := context.Background() userStore := memory.NewUserStore() diff --git a/internal/rpc/premium_sweeper.go b/internal/rpc/premium_sweeper.go index 7f59a56d..5dcc4a98 100644 --- a/internal/rpc/premium_sweeper.go +++ b/internal/rpc/premium_sweeper.go @@ -80,6 +80,10 @@ type moderationUserAudienceService interface { ModerationFlagAudience(ctx context.Context, userID int64, limit int) ([]int64, error) } +type dialogPeerMetadataInvalidator interface { + InvalidateDialog(userID int64, peer domain.Peer) +} + // NotifyUserModerationFlagsChanged sends the standard, non-PTS updateUser // shape to online accounts that already know the peer. Offline accounts // converge when their next authoritative peer/dialog read carries the updated @@ -109,6 +113,8 @@ func (r *Router) NotifyUserModerationFlagsChanged(ctx context.Context, u domain. botVerificationIcon := r.peerBotVerificationIcon(pushCtx, domain.Peer{Type: domain.PeerTypeUser, ID: u.ID}) usernames := r.usernameRegistryMap(pushCtx, []domain.Peer{{Type: domain.PeerTypeUser, ID: u.ID}}) seen := make(map[int64]struct{}, len(audience)) + dialogs, _ := r.deps.Dialogs.(dialogPeerMetadataInvalidator) + peer := domain.Peer{Type: domain.PeerTypeUser, ID: u.ID} for _, viewerUserID := range audience { if viewerUserID == 0 { continue @@ -117,6 +123,13 @@ func (r *Router) NotifyUserModerationFlagsChanged(ctx context.Context, u domain. continue } seen[viewerUserID] = struct{}{} + if dialogs != nil { + // The getDialogs list hash intentionally describes dialog ordering, not + // embedded User flags. Clearing the viewer's cached hash forces exactly + // one full response with the refreshed peer and prevents a stale badge + // from reappearing when the dialog list next refreshes. + dialogs.InvalidateDialog(viewerUserID, peer) + } if online, ok := r.deps.Sessions.(OnlineUserProvider); ok && !online.IsUserOnline(viewerUserID) { continue } diff --git a/internal/rpc/presence.go b/internal/rpc/presence.go index 92fb5a8d..273121bb 100644 --- a/internal/rpc/presence.go +++ b/internal/rpc/presence.go @@ -10,6 +10,7 @@ import ( "go.uber.org/zap" "telesrv/internal/domain" + "telesrv/internal/store" ) const userOnlineTTL = 5 * time.Minute @@ -257,7 +258,7 @@ func (r *Router) announceSessionOnline(ctx context.Context, userID int64) { // last_seen。bot 登录（importBotAuthorization）经此路径，必须整体短路——否则 // 与 bot 有私聊的用户会收到协议中不存在的 bot 在线/离线广播，bot 也不登记 // presence 条目，sweeper 因此天然不会遇到 bot。 - if r.userIsBot(ctx, userID) { + if bot, known := r.userBotStatus(ctx, userID); !known || bot { return } status, notify := r.setPresenceFromContext(ctx, userID, false, presencePersistAsync) @@ -270,31 +271,54 @@ func (r *Router) announceSessionOnline(ctx context.Context, userID int64) { r.pushSessionOnlineAsync(ctx, userID, status) } -// userIsBot 报告 userID 是否为 bot 账号（presence 广播豁免用）。仅在连接生命周期 -// 事件（登录/断线/登出）调用，频率低；命中 redis UserCache。 +// userIsBot reports whether userID is a bot for business call sites that keep +// the historical bool contract. Presence uses userBotStatus directly so an +// unavailable classification cannot be guessed as a human account. func (r *Router) userIsBot(ctx context.Context, userID int64) bool { + bot, known := r.userBotStatus(ctx, userID) + return known && bot +} + +type botStatusResult struct { + bot bool + known bool +} + +func (r *Router) userBotStatus(ctx context.Context, userID int64) (bool, bool) { if userID == 0 || r.deps.Users == nil { - return false + return false, false } // bot 标志不可变 → 永久 in-process 缓存，避免 announceSessionOnline 每 RPC 都发一次重投影 // Users.ByID。仅缓存已存在的用户结果。命中后纯内存。 if v, ok := r.botStatus.Load(userID); ok { - return v.(bool) + return v.(bool), true } // 冷启动洪峰下用 singleflight 合并并发首查：~50 个并发首帧只打 1 次 PG（其余共享）， // 避免 Users.ByID 重投影 herd（曾让首帧 user_resolve 飙到 ~1.1s）。 - v, _, _ := r.authUserSF.Do("bot:"+strconv.FormatInt(userID, 10), func() (any, error) { + v, err, _ := r.authUserSF.Do("bot:"+strconv.FormatInt(userID, 10), func() (any, error) { if cached, ok := r.botStatus.Load(userID); ok { - return cached.(bool), nil + return botStatusResult{bot: cached.(bool), known: true}, nil + } + if provider, ok := r.deps.Users.(BaseUserBotStatusProvider); ok { + bot, found, err := provider.BotStatus(ctx, userID) + if err != nil || !found { + return botStatusResult{}, err + } + r.botStatus.Store(userID, bot) + return botStatusResult{bot: bot, known: true}, nil } u, found, err := r.deps.Users.ByID(ctx, userID, userID) if err != nil || !found { - return false, nil + return botStatusResult{}, err } r.botStatus.Store(userID, u.Bot) - return u.Bot, nil + return botStatusResult{bot: u.Bot, known: true}, nil }) - return v.(bool) + if err != nil { + return false, false + } + result := v.(botStatusResult) + return result.bot, result.known } func (r *Router) userPresenceStatus(userID int64) domain.UserStatus { @@ -375,6 +399,25 @@ func (r *Router) persistLastSeenAsync(ctx context.Context, userID int64, lastSee if !ok { return } + if r.lastSeenBatch != nil { + if err := r.lastSeenBatch.submit(store.UserLastSeenUpdate{UserID: userID, LastSeenAt: lastSeenAt}); err == nil { + return + } else { + // Capacity/stopping is never a silent drop. The direct authoritative + // write is an overload safety valve, not a configurable legacy mode. + r.log.Error("presence last-seen batch admission failed; using authoritative direct write", + zap.Int64("user_id", userID), zap.Error(err)) + } + } + r.persistReservedLastSeenAsync(ctx, updater, userID, lastSeenAt) +} + +func (r *Router) persistReservedLastSeenAsync( + ctx context.Context, + updater userLastSeenUpdater, + userID int64, + lastSeenAt int, +) { bgCtx, cancel := r.presenceBackgroundContext(ctx, 10*time.Second) go func() { defer cancel() @@ -389,6 +432,15 @@ func (r *Router) persistLastSeenAsync(ctx context.Context, userID int64, lastSee }() } +// RunPresenceLastSeenBatch owns the lifecycle batch worker. The worker stops +// accepting on cancellation and performs a bounded drain before returning. +func (r *Router) RunPresenceLastSeenBatch(ctx context.Context) { + if r == nil || r.lastSeenBatch == nil { + return + } + r.lastSeenBatch.Run(ctx) +} + func (r *Router) pushSessionOnlineAsync(ctx context.Context, userID int64, status domain.UserStatus) { pushCtx, cancel := r.presenceBackgroundContext(ctx, 10*time.Second) go func() { @@ -467,12 +519,13 @@ func (r *Router) announceUserOfflineIfStillGone(rawAuthKeyID [8]byte, sessionID, defer cancel() ctx = WithSessionID(WithRawAuthKeyID(ctx, rawAuthKeyID), sessionID) // bot 不广播 offline、不写 last_seen（与 announceSessionOnline 对称）。 - if r.userIsBot(ctx, userID) { + if bot, known := r.userBotStatus(ctx, userID); !known || bot { return } status := domain.UserStatus{Kind: domain.UserStatusOffline, WasOnline: disconnectedAt} - // 断连降级是权威 last_seen，强制落库（不去抖）。 - r.persistLastSeen(ctx, userID, disconnectedAt, false) + // 断连降级是权威 last_seen，不去抖；生命周期写经有界 batch + // 合并，WasOnline 仍取真实断连时刻而不是 flush 时刻。 + r.persistLastSeenAsync(ctx, userID, disconnectedAt, false) r.pushUserStatus(ctx, userID, status) } @@ -555,6 +608,24 @@ func (r *Router) withDialogListPresence(ctx context.Context, viewerUserID int64, for _, msg := range list.ChannelMessages { collectChannelMessagePeerRefs(msg, msg.ChannelID, userIDs, channelIDs) } + // Dialog/application projections already contain the ordinary peer envelope. + // Only resolve nested message references that are still absent (forward author, + // via bot, poll voter, linked giveaway channel, and similar fields). + for _, user := range list.Users { + delete(userIDs, user.ID) + } + for _, channel := range list.Channels { + delete(channelIDs, channel.ID) + } + for _, community := range list.Communities { + delete(channelIDs, community.Community.ID) + for _, user := range community.Users { + delete(userIDs, user.ID) + } + for _, channel := range community.Channels { + delete(channelIDs, channel.ID) + } + } cache := newViewerPeerCache(r) list.Users = r.withUsersPresence(mergeDomainUsers(list.Users, cache.usersForIDs(ctx, viewerUserID, mapKeys(userIDs))...)) list.Channels = mergeDomainChannels(list.Channels, cache.channelsForIDs(ctx, viewerUserID, mapKeys(channelIDs))...) @@ -583,8 +654,7 @@ func (r *Router) tgSelfUser(u domain.User) *tg.User { func (r *Router) tgUsers(users []domain.User) []tg.UserClass { out := tgUsers(r.withUsersPresence(users)) r.withBotProfileFlagsForUsers(context.Background(), out) - r.applyUsernamesToPeerObjects(context.Background(), out, nil) - r.applyBotVerificationIconsToPeerObjects(context.Background(), out, nil) + r.applyPeerIdentitiesToPeerObjects(context.Background(), out, nil) return out } @@ -593,8 +663,7 @@ func (r *Router) tgUsers(users []domain.User) []tg.UserClass { func (r *Router) tgUsersForViewer(viewerUserID int64, users []domain.User) []tg.UserClass { out := tgUsersForViewer(viewerUserID, r.withUsersPresence(users)) r.withBotProfileFlagsForUsers(context.Background(), out) - r.applyUsernamesToPeerObjects(context.Background(), out, nil) - r.applyBotVerificationIconsToPeerObjects(context.Background(), out, nil) + r.applyPeerIdentitiesToPeerObjects(context.Background(), out, nil) return out } @@ -895,14 +964,16 @@ func (r *Router) presenceFanoutCandidates(ctx context.Context, userID int64) []i } } if r.deps.Dialogs != nil { - list, err := r.deps.Dialogs.GetDialogs(ctx, userID, domain.DialogFilter{Limit: presenceDialogFanoutCandidateLimit}) - if err != nil { + provider, ok := r.deps.Dialogs.(interface { + PrivateDialogPeerIDs(context.Context, int64, int) ([]int64, error) + }) + if !ok { + failed = true + } else if ids, err := provider.PrivateDialogPeerIDs(ctx, userID, presenceDialogFanoutCandidateLimit); err != nil { failed = true } else { - for _, dialog := range list.Dialogs { - if dialog.Peer.Type == domain.PeerTypeUser { - add(dialog.Peer.ID) - } + for _, id := range ids { + add(id) } } } diff --git a/internal/rpc/presence_bot_status_test.go b/internal/rpc/presence_bot_status_test.go new file mode 100644 index 00000000..1a8cdd61 --- /dev/null +++ b/internal/rpc/presence_bot_status_test.go @@ -0,0 +1,88 @@ +package rpc + +import ( + "context" + "errors" + "sync/atomic" + "testing" + "time" + + "github.com/iamxvbaba/td/clock" + "go.uber.org/zap/zaptest" + + "telesrv/internal/domain" +) + +func TestUserBotStatusUsesBaseFactProviderAndCachesOnlyKnownResults(t *testing.T) { + users := &captureBaseBotStatusUsers{bot: true, found: true} + r := New(Config{}, Deps{Users: users}, zaptest.NewLogger(t), clock.System) + for i := 0; i < 2; i++ { + bot, known := r.userBotStatus(context.Background(), 42) + if !known || !bot { + t.Fatalf("bot status = %v, known=%v", bot, known) + } + } + if users.statusCalls.Load() != 1 || users.byIDCalls.Load() != 0 { + t.Fatalf("calls = status:%d projected:%d", users.statusCalls.Load(), users.byIDCalls.Load()) + } + + human := &captureBaseBotStatusUsers{found: true} + r = New(Config{}, Deps{Users: human}, zaptest.NewLogger(t), clock.System) + for i := 0; i < 2; i++ { + if bot, known := r.userBotStatus(context.Background(), 43); !known || bot { + t.Fatalf("human status = %v, known=%v", bot, known) + } + } + if human.statusCalls.Load() != 1 || human.byIDCalls.Load() != 0 { + t.Fatalf("human calls = status:%d projected:%d", human.statusCalls.Load(), human.byIDCalls.Load()) + } + + for _, tc := range []struct { + name string + users *captureBaseBotStatusUsers + }{ + {name: "missing", users: &captureBaseBotStatusUsers{}}, + {name: "read error", users: &captureBaseBotStatusUsers{err: errors.New("redis and postgres unavailable")}}, + } { + t.Run(tc.name, func(t *testing.T) { + r := New(Config{}, Deps{Users: tc.users}, zaptest.NewLogger(t), clock.System) + for i := 0; i < 2; i++ { + if bot, known := r.userBotStatus(context.Background(), 44); known || bot { + t.Fatalf("unknown status = %v, known=%v", bot, known) + } + } + if tc.users.statusCalls.Load() != 2 { + t.Fatalf("unknown result was cached; calls = %d", tc.users.statusCalls.Load()) + } + }) + } +} + +func TestAnnounceSessionOnlineSkipsUnknownBotClassification(t *testing.T) { + users := &captureBaseBotStatusUsers{err: errors.New("base user unavailable")} + r := New(Config{}, Deps{Users: users}, zaptest.NewLogger(t), clock.System) + ctx := WithSessionID(WithRawAuthKeyID(context.Background(), [8]byte{1}), 2) + r.announceSessionOnline(ctx, 45) + if _, found := r.presence.statusFor(45, int(time.Now().Unix())); found { + t.Fatal("unknown bot classification announced human presence") + } +} + +type captureBaseBotStatusUsers struct { + UsersService + bot bool + found bool + err error + statusCalls atomic.Int64 + byIDCalls atomic.Int64 +} + +func (u *captureBaseBotStatusUsers) BotStatus(context.Context, int64) (bool, bool, error) { + u.statusCalls.Add(1) + return u.bot, u.found, u.err +} + +func (u *captureBaseBotStatusUsers) ByID(context.Context, int64, int64) (domain.User, bool, error) { + u.byIDCalls.Add(1) + return domain.User{ID: 42, Bot: u.bot}, u.found, u.err +} diff --git a/internal/rpc/presence_last_seen_batch.go b/internal/rpc/presence_last_seen_batch.go new file mode 100644 index 00000000..90243671 --- /dev/null +++ b/internal/rpc/presence_last_seen_batch.go @@ -0,0 +1,291 @@ +package rpc + +import ( + "context" + "errors" + "sort" + "sync" + "time" + + "go.uber.org/zap" + + "telesrv/internal/store" +) + +const ( + defaultPresenceLastSeenBatchMax = 512 + defaultPresenceLastSeenBatchWait = time.Second + defaultPresenceLastSeenBatchQueue = 65_536 + defaultPresenceLastSeenBatchTimeout = 5 * time.Second + defaultPresenceLastSeenShutdownDrain = 10 * time.Second + presenceLastSeenRetryInitial = 50 * time.Millisecond + presenceLastSeenRetryMaximum = 2 * time.Second +) + +var ( + errPresenceLastSeenBatchFull = errors.New("presence last-seen batch queue full") + errPresenceLastSeenBatchStopped = errors.New("presence last-seen batch dispatcher stopped") +) + +type presenceLastSeenBatchUpdater interface { + UpdateLastSeenBatch(ctx context.Context, updates []store.UserLastSeenUpdate) error +} + +type presenceLastSeenBatchConfig struct { + MaxSize int + MaxWait time.Duration + QueueSize int + QueryTimeout time.Duration + DrainTimeout time.Duration +} + +func normalizePresenceLastSeenBatchConfig(cfg presenceLastSeenBatchConfig) presenceLastSeenBatchConfig { + if cfg.MaxSize <= 0 { + cfg.MaxSize = defaultPresenceLastSeenBatchMax + } + if cfg.MaxWait <= 0 { + cfg.MaxWait = defaultPresenceLastSeenBatchWait + } + if cfg.QueueSize <= 0 { + cfg.QueueSize = defaultPresenceLastSeenBatchQueue + } + if cfg.QueryTimeout <= 0 { + cfg.QueryTimeout = defaultPresenceLastSeenBatchTimeout + } + if cfg.DrainTimeout <= 0 { + cfg.DrainTimeout = defaultPresenceLastSeenShutdownDrain + } + return cfg +} + +// presenceLastSeenBatchDispatcher is the single production writer for +// asynchronous lifecycle last-seen watermarks. Accepted work is retried with a +// bounded backoff and remains in memory until the database write plus exact +// cache invalidation succeeds, or the bounded shutdown drain expires. +type presenceLastSeenBatchDispatcher struct { + updater presenceLastSeenBatchUpdater + cfg presenceLastSeenBatchConfig + queue chan store.UserLastSeenUpdate + log *zap.Logger + metrics Metrics + + gate sync.RWMutex + accepting bool +} + +func newPresenceLastSeenBatchDispatcher( + updater presenceLastSeenBatchUpdater, + cfg presenceLastSeenBatchConfig, + log *zap.Logger, + metrics Metrics, +) *presenceLastSeenBatchDispatcher { + if updater == nil { + return nil + } + cfg = normalizePresenceLastSeenBatchConfig(cfg) + if log == nil { + log = zap.NewNop() + } + if metrics == nil { + metrics = NopMetrics{} + } + return &presenceLastSeenBatchDispatcher{ + updater: updater, + cfg: cfg, + queue: make(chan store.UserLastSeenUpdate, cfg.QueueSize), + log: log, + metrics: metrics, + accepting: true, + } +} + +func (d *presenceLastSeenBatchDispatcher) submit(update store.UserLastSeenUpdate) error { + if d == nil || update.UserID == 0 || update.LastSeenAt <= 0 { + return nil + } + d.gate.RLock() + defer d.gate.RUnlock() + if !d.accepting { + return errPresenceLastSeenBatchStopped + } + d.metrics.PresenceLastSeenPending(1) + select { + case d.queue <- update: + d.metrics.PresenceLastSeenSubmitted() + return nil + default: + d.metrics.PresenceLastSeenPending(-1) + d.metrics.PresenceLastSeenOverflow() + return errPresenceLastSeenBatchFull + } +} + +func (d *presenceLastSeenBatchDispatcher) stopAccepting() { + if d == nil { + return + } + d.gate.Lock() + d.accepting = false + d.gate.Unlock() +} + +func (d *presenceLastSeenBatchDispatcher) Run(ctx context.Context) { + if d == nil { + return + } + if ctx == nil { + ctx = context.Background() + } + for { + select { + case first := <-d.queue: + batch, canceled := d.collect(ctx, first) + if canceled || !d.executeWithRetry(ctx, batch) { + d.stopAccepting() + d.drain(batch) + return + } + case <-ctx.Done(): + d.stopAccepting() + d.drain(nil) + return + } + } +} + +func (d *presenceLastSeenBatchDispatcher) collect( + ctx context.Context, + first store.UserLastSeenUpdate, +) ([]store.UserLastSeenUpdate, bool) { + batch := make([]store.UserLastSeenUpdate, 0, d.cfg.MaxSize) + batch = append(batch, first) + if len(batch) >= d.cfg.MaxSize { + return batch, false + } + timer := time.NewTimer(d.cfg.MaxWait) + defer func() { + if !timer.Stop() { + select { + case <-timer.C: + default: + } + } + }() + for len(batch) < d.cfg.MaxSize { + select { + case update := <-d.queue: + batch = append(batch, update) + case <-timer.C: + return batch, false + case <-ctx.Done(): + return batch, true + } + } + return batch, false +} + +func mergePresenceLastSeenBatch(updates []store.UserLastSeenUpdate) []store.UserLastSeenUpdate { + latest := make(map[int64]int, len(updates)) + for _, update := range updates { + if update.UserID == 0 || update.LastSeenAt <= 0 { + continue + } + if current := latest[update.UserID]; update.LastSeenAt > current { + latest[update.UserID] = update.LastSeenAt + } + } + userIDs := make([]int64, 0, len(latest)) + for userID := range latest { + userIDs = append(userIDs, userID) + } + sort.Slice(userIDs, func(i, j int) bool { return userIDs[i] < userIDs[j] }) + merged := make([]store.UserLastSeenUpdate, 0, len(userIDs)) + for _, userID := range userIDs { + merged = append(merged, store.UserLastSeenUpdate{UserID: userID, LastSeenAt: latest[userID]}) + } + return merged +} + +func (d *presenceLastSeenBatchDispatcher) executeWithRetry( + ctx context.Context, + updates []store.UserLastSeenUpdate, +) bool { + rawCount := len(updates) + updates = mergePresenceLastSeenBatch(updates) + if len(updates) == 0 { + return true + } + backoff := presenceLastSeenRetryInitial + for attempt := 1; ; attempt++ { + queryCtx, cancel := context.WithTimeout(ctx, d.cfg.QueryTimeout) + started := time.Now() + err := d.updater.UpdateLastSeenBatch(queryCtx, updates) + cancel() + d.metrics.PresenceLastSeenBatch(len(updates), time.Since(started), err) + if err == nil { + d.metrics.PresenceLastSeenPending(-rawCount) + return true + } + if attempt == 1 || attempt&(attempt-1) == 0 { + d.log.Warn("presence last-seen batch failed; retrying", + zap.Int("updates", len(updates)), + zap.Int("attempt", attempt), + zap.Duration("retry_after", backoff), + zap.Error(err)) + } + timer := time.NewTimer(backoff) + select { + case <-timer.C: + case <-ctx.Done(): + if !timer.Stop() { + select { + case <-timer.C: + default: + } + } + return false + } + backoff *= 2 + if backoff > presenceLastSeenRetryMaximum { + backoff = presenceLastSeenRetryMaximum + } + } +} + +func (d *presenceLastSeenBatchDispatcher) drain(current []store.UserLastSeenUpdate) { + drainCtx, cancel := context.WithTimeout(context.Background(), d.cfg.DrainTimeout) + defer cancel() + pending := append([]store.UserLastSeenUpdate(nil), current...) + for { + for len(pending) < d.cfg.MaxSize { + select { + case update := <-d.queue: + pending = append(pending, update) + default: + break + } + if len(d.queue) == 0 { + break + } + } + if len(pending) > 0 { + if !d.executeWithRetry(drainCtx, pending) { + d.reportDrainDropped(len(pending) + len(d.queue)) + return + } + pending = pending[:0] + } + if len(d.queue) == 0 { + return + } + } +} + +func (d *presenceLastSeenBatchDispatcher) reportDrainDropped(count int) { + if count <= 0 { + return + } + d.metrics.PresenceLastSeenDrainDropped(count) + d.metrics.PresenceLastSeenPending(-count) + d.log.Error("presence last-seen shutdown drain expired", zap.Int("updates", count)) +} diff --git a/internal/rpc/presence_last_seen_batch_test.go b/internal/rpc/presence_last_seen_batch_test.go new file mode 100644 index 00000000..d9d6ed93 --- /dev/null +++ b/internal/rpc/presence_last_seen_batch_test.go @@ -0,0 +1,223 @@ +package rpc + +import ( + "context" + "errors" + "sync" + "sync/atomic" + "testing" + "time" + + "go.uber.org/zap/zaptest" + + "telesrv/internal/store" +) + +type capturePresenceLastSeenUpdater struct { + mu sync.Mutex + calls [][]store.UserLastSeenUpdate + failFirst int + called chan struct{} +} + +func (u *capturePresenceLastSeenUpdater) UpdateLastSeenBatch(_ context.Context, updates []store.UserLastSeenUpdate) error { + u.mu.Lock() + u.calls = append(u.calls, append([]store.UserLastSeenUpdate(nil), updates...)) + fail := u.failFirst > 0 + if fail { + u.failFirst-- + } + u.mu.Unlock() + select { + case u.called <- struct{}{}: + default: + } + if fail { + return errors.New("temporary batch failure") + } + return nil +} + +func (u *capturePresenceLastSeenUpdater) snapshot() [][]store.UserLastSeenUpdate { + u.mu.Lock() + defer u.mu.Unlock() + out := make([][]store.UserLastSeenUpdate, len(u.calls)) + for index := range u.calls { + out[index] = append([]store.UserLastSeenUpdate(nil), u.calls[index]...) + } + return out +} + +type capturePresenceLastSeenMetrics struct { + NopMetrics + batches atomic.Int64 + failures atomic.Int64 + submitted atomic.Int64 + pending atomic.Int64 + overflow atomic.Int64 + dropped atomic.Int64 +} + +func (m *capturePresenceLastSeenMetrics) PresenceLastSeenBatch(_ int, _ time.Duration, err error) { + m.batches.Add(1) + if err != nil { + m.failures.Add(1) + } +} + +func (m *capturePresenceLastSeenMetrics) PresenceLastSeenOverflow() { + m.overflow.Add(1) +} + +func (m *capturePresenceLastSeenMetrics) PresenceLastSeenSubmitted() { + m.submitted.Add(1) +} + +func (m *capturePresenceLastSeenMetrics) PresenceLastSeenPending(delta int) { + m.pending.Add(int64(delta)) +} + +func (m *capturePresenceLastSeenMetrics) PresenceLastSeenDrainDropped(count int) { + m.dropped.Add(int64(count)) +} + +func TestPresenceLastSeenBatchCoalescesMaximumTimestamp(t *testing.T) { + updater := &capturePresenceLastSeenUpdater{called: make(chan struct{}, 4)} + d := newPresenceLastSeenBatchDispatcher(updater, presenceLastSeenBatchConfig{ + MaxSize: 16, MaxWait: 10 * time.Millisecond, QueueSize: 32, + QueryTimeout: time.Second, DrainTimeout: time.Second, + }, zaptest.NewLogger(t), NopMetrics{}) + ctx, cancel := context.WithCancel(context.Background()) + done := make(chan struct{}) + go func() { d.Run(ctx); close(done) }() + + for _, update := range []store.UserLastSeenUpdate{ + {UserID: 2, LastSeenAt: 10}, + {UserID: 1, LastSeenAt: 5}, + {UserID: 1, LastSeenAt: 12}, + } { + if err := d.submit(update); err != nil { + t.Fatalf("submit: %v", err) + } + } + select { + case <-updater.called: + case <-time.After(time.Second): + t.Fatal("batch was not executed") + } + cancel() + select { + case <-done: + case <-time.After(time.Second): + t.Fatal("dispatcher did not stop") + } + + calls := updater.snapshot() + if len(calls) != 1 { + t.Fatalf("batch calls = %d, want 1", len(calls)) + } + want := []store.UserLastSeenUpdate{{UserID: 1, LastSeenAt: 12}, {UserID: 2, LastSeenAt: 10}} + if len(calls[0]) != len(want) { + t.Fatalf("batch = %#v, want %#v", calls[0], want) + } + for index := range want { + if calls[0][index] != want[index] { + t.Fatalf("batch[%d] = %#v, want %#v", index, calls[0][index], want[index]) + } + } +} + +func TestPresenceLastSeenBatchRetriesAcceptedWork(t *testing.T) { + updater := &capturePresenceLastSeenUpdater{failFirst: 1, called: make(chan struct{}, 4)} + metrics := &capturePresenceLastSeenMetrics{} + d := newPresenceLastSeenBatchDispatcher(updater, presenceLastSeenBatchConfig{ + MaxSize: 8, MaxWait: time.Millisecond, QueueSize: 8, + QueryTimeout: time.Second, DrainTimeout: time.Second, + }, zaptest.NewLogger(t), metrics) + ctx, cancel := context.WithCancel(context.Background()) + done := make(chan struct{}) + go func() { d.Run(ctx); close(done) }() + if err := d.submit(store.UserLastSeenUpdate{UserID: 7, LastSeenAt: 19}); err != nil { + t.Fatalf("submit: %v", err) + } + for calls := 0; calls < 2; calls++ { + select { + case <-updater.called: + case <-time.After(time.Second): + t.Fatal("retry was not executed") + } + } + cancel() + <-done + if got := len(updater.snapshot()); got != 2 { + t.Fatalf("batch calls = %d, want failed attempt + retry", got) + } + if metrics.batches.Load() != 2 || metrics.failures.Load() != 1 { + t.Fatalf("metrics batches/failures = %d/%d, want 2/1", metrics.batches.Load(), metrics.failures.Load()) + } + if metrics.pending.Load() != 0 { + t.Fatalf("pending metric = %d, want drained", metrics.pending.Load()) + } + if metrics.submitted.Load() != 1 { + t.Fatalf("submitted metric = %d, want 1", metrics.submitted.Load()) + } +} + +func TestPresenceLastSeenBatchCapacityIsExplicit(t *testing.T) { + updater := &capturePresenceLastSeenUpdater{called: make(chan struct{}, 1)} + metrics := &capturePresenceLastSeenMetrics{} + d := newPresenceLastSeenBatchDispatcher(updater, presenceLastSeenBatchConfig{ + MaxSize: 1, MaxWait: time.Second, QueueSize: 1, + QueryTimeout: time.Second, DrainTimeout: time.Second, + }, zaptest.NewLogger(t), metrics) + if err := d.submit(store.UserLastSeenUpdate{UserID: 1, LastSeenAt: 1}); err != nil { + t.Fatalf("first submit: %v", err) + } + if err := d.submit(store.UserLastSeenUpdate{UserID: 2, LastSeenAt: 2}); !errors.Is(err, errPresenceLastSeenBatchFull) { + t.Fatalf("second submit error = %v, want capacity error", err) + } + if metrics.overflow.Load() != 1 { + t.Fatalf("overflow metric = %d, want 1", metrics.overflow.Load()) + } + if metrics.pending.Load() != 1 { + t.Fatalf("pending metric = %d, want only accepted first update", metrics.pending.Load()) + } + if metrics.submitted.Load() != 1 { + t.Fatalf("submitted metric = %d, want only accepted first update", metrics.submitted.Load()) + } +} + +func TestPresenceLastSeenBatchShutdownDrainsAcceptedWork(t *testing.T) { + updater := &capturePresenceLastSeenUpdater{called: make(chan struct{}, 4)} + d := newPresenceLastSeenBatchDispatcher(updater, presenceLastSeenBatchConfig{ + MaxSize: 16, MaxWait: time.Second, QueueSize: 16, + QueryTimeout: time.Second, DrainTimeout: time.Second, + }, zaptest.NewLogger(t), NopMetrics{}) + ctx, cancel := context.WithCancel(context.Background()) + done := make(chan struct{}) + go func() { d.Run(ctx); close(done) }() + if err := d.submit(store.UserLastSeenUpdate{UserID: 11, LastSeenAt: 21}); err != nil { + t.Fatalf("submit first: %v", err) + } + if err := d.submit(store.UserLastSeenUpdate{UserID: 12, LastSeenAt: 22}); err != nil { + t.Fatalf("submit second: %v", err) + } + cancel() + select { + case <-done: + case <-time.After(2 * time.Second): + t.Fatal("dispatcher did not finish shutdown drain") + } + seen := map[int64]int{} + for _, call := range updater.snapshot() { + for _, update := range call { + seen[update.UserID] = update.LastSeenAt + } + } + if seen[11] != 21 || seen[12] != 22 { + t.Fatalf("drained updates = %v, want both accepted updates", seen) + } + if err := d.submit(store.UserLastSeenUpdate{UserID: 13, LastSeenAt: 23}); !errors.Is(err, errPresenceLastSeenBatchStopped) { + t.Fatalf("post-stop submit error = %v, want stopped", err) + } +} diff --git a/internal/rpc/receives_updates_mark_test.go b/internal/rpc/receives_updates_mark_test.go index 6d1bb739..2cbd9357 100644 --- a/internal/rpc/receives_updates_mark_test.go +++ b/internal/rpc/receives_updates_mark_test.go @@ -67,6 +67,155 @@ func TestDispatchMarksSessionReceivesUpdates(t *testing.T) { } } +type activationCaptureSessions struct { + *captureSessions + activationMu sync.Mutex + nextToken uint64 + activeToken uint64 + beginCalls int + grants int + endCalls int + bootstrapMu sync.Mutex + bootstrapNext uint64 + bootstrapActive uint64 + bootstrapBegin int + bootstrapEnd int + bootstrapSuccess int + bootstrapProbed bool +} + +func (s *activationCaptureSessions) ReceivesUpdatesForAuthKey([8]byte, int64) bool { + return s.captureSessions.snapshot().receives +} + +func (s *activationCaptureSessions) BeginSessionUpdatesActivation([8]byte, int64) (uint64, bool) { + s.activationMu.Lock() + defer s.activationMu.Unlock() + s.beginCalls++ + if s.activeToken != 0 || s.captureSessions.snapshot().receives { + return 0, false + } + s.nextToken++ + s.activeToken = s.nextToken + s.grants++ + return s.activeToken, true +} + +func (s *activationCaptureSessions) EndSessionUpdatesActivation(_ [8]byte, _ int64, token uint64) { + s.activationMu.Lock() + defer s.activationMu.Unlock() + s.endCalls++ + if s.activeToken == token { + s.activeToken = 0 + } +} + +func (s *activationCaptureSessions) activationSnapshot() (begin, grants, end int, active uint64) { + s.activationMu.Lock() + defer s.activationMu.Unlock() + return s.beginCalls, s.grants, s.endCalls, s.activeToken +} + +func (s *activationCaptureSessions) BeginSessionBootstrapProbe([8]byte, int64) (uint64, bool) { + s.bootstrapMu.Lock() + defer s.bootstrapMu.Unlock() + s.bootstrapBegin++ + if s.bootstrapActive != 0 || s.bootstrapProbed { + return 0, false + } + s.bootstrapNext++ + s.bootstrapActive = s.bootstrapNext + return s.bootstrapActive, true +} + +func (s *activationCaptureSessions) EndSessionBootstrapProbe(_ [8]byte, _ int64, token uint64, success bool) { + s.bootstrapMu.Lock() + defer s.bootstrapMu.Unlock() + s.bootstrapEnd++ + if s.bootstrapActive != token { + return + } + s.bootstrapActive = 0 + if success { + s.bootstrapSuccess++ + s.bootstrapProbed = true + } +} + +func (s *activationCaptureSessions) bootstrapSnapshot() (begin, end, success int, active uint64, probed bool) { + s.bootstrapMu.Lock() + defer s.bootstrapMu.Unlock() + return s.bootstrapBegin, s.bootstrapEnd, s.bootstrapSuccess, s.bootstrapActive, s.bootstrapProbed +} + +func TestDispatchCoalescesConcurrentSessionReadinessActivation(t *testing.T) { + sessions := &activationCaptureSessions{captureSessions: &captureSessions{}} + first := dispatchForReceivesUpdates(t, sessions, false, true) + second := dispatchForReceivesUpdates(t, sessions, false, true) + + if begin, grants, end, active := sessions.activationSnapshot(); begin != 2 || grants != 1 || end != 0 || active == 0 { + t.Fatalf("activation before delivery = begin:%d grants:%d end:%d active:%d", begin, grants, end, active) + } + postresponse.Run(second) + if got := sessions.snapshot().receivesCalls; got != 0 { + t.Fatalf("non-owner delivery marked readiness %d times", got) + } + postresponse.Run(first) + if got := sessions.snapshot(); !got.receives || got.receivesCalls != 1 { + t.Fatalf("owner delivery readiness = receives:%v calls:%d", got.receives, got.receivesCalls) + } + if begin, grants, end, active := sessions.activationSnapshot(); begin != 2 || grants != 1 || end != 1 || active != 0 { + t.Fatalf("activation after delivery = begin:%d grants:%d end:%d active:%d", begin, grants, end, active) + } +} + +func TestSessionReadinessActivationReleasedWhenCallbackRegistrationFails(t *testing.T) { + sessions := &activationCaptureSessions{captureSessions: &captureSessions{}} + r := New(Config{}, Deps{Sessions: sessions}, zaptest.NewLogger(t), clock.System) + ctx := WithSessionID(WithRawAuthKeyID(context.Background(), [8]byte{9}), 99) + r.stageSessionUpdatesReadyAfterDelivery(ctx, 1000000009) + if begin, grants, end, active := sessions.activationSnapshot(); begin != 1 || grants != 1 || end != 1 || active != 0 { + t.Fatalf("activation after missing callback registry = begin:%d grants:%d end:%d active:%d", begin, grants, end, active) + } +} + +func TestSuppressSessionActivationReleasesClaimButKeepsCursorWork(t *testing.T) { + sessions := &activationCaptureSessions{captureSessions: &captureSessions{}} + bootstrap := &captureBootstrapReadyStore{BootstrapUpdateJobStore: memory.NewBootstrapUpdateJobStore()} + r := New(Config{}, Deps{Sessions: sessions, BootstrapUpdates: bootstrap}, zaptest.NewLogger(t), clock.System) + ctx := WithSessionID(WithRawAuthKeyID(context.Background(), [8]byte{8}), 88) + ctx, plan := withUpdatesDeliveryPlan(ctx) + r.tryStageSessionUpdatesReady(ctx, plan, 1000000008) + r.tryStageBootstrapProbe(ctx, plan, 1000000008) + plan.stageCursor([8]byte{7}, 1000000008, domain.UpdateState{Pts: 7}, domain.UpdateStateCommitDeliveredOnly) + plan.suppressSessionActivation() + if plan.markSessionReady || plan.publishBootstrap || !plan.commitCursor { + t.Fatalf("suppressed plan = ready:%v bootstrap:%v cursor:%v", plan.markSessionReady, plan.publishBootstrap, plan.commitCursor) + } + if begin, grants, end, active := sessions.activationSnapshot(); begin != 1 || grants != 1 || end != 1 || active != 0 { + t.Fatalf("activation after suppression = begin:%d grants:%d end:%d active:%d", begin, grants, end, active) + } + if begin, end, success, active, probed := sessions.bootstrapSnapshot(); begin != 1 || end != 1 || success != 0 || active != 0 || probed { + t.Fatalf("bootstrap after suppression = begin:%d end:%d success:%d active:%d probed:%v", begin, end, success, active, probed) + } +} + +func TestBootstrapProbeReleasedWhenCallbackRegistrationFails(t *testing.T) { + sessions := &activationCaptureSessions{captureSessions: &captureSessions{}} + bootstrap := &captureBootstrapReadyStore{BootstrapUpdateJobStore: memory.NewBootstrapUpdateJobStore()} + r := New(Config{}, Deps{Sessions: sessions, BootstrapUpdates: bootstrap}, zaptest.NewLogger(t), clock.System) + ctx := WithAuthKeyID(context.Background(), [8]byte{7}) + ctx = WithRawAuthKeyID(ctx, [8]byte{8}) + ctx = WithSessionID(ctx, 88) + r.stageUpdatesBaselineAfterDelivery(ctx, 1000000008, nil, 0, nil, true) + if bootstrap.readyCalls != 0 { + t.Fatalf("bootstrap store called before an attached delivery callback: %d", bootstrap.readyCalls) + } + if begin, end, success, active, probed := sessions.bootstrapSnapshot(); begin != 1 || end != 1 || success != 0 || active != 0 || probed { + t.Fatalf("bootstrap after missing registry = begin:%d end:%d success:%d active:%d probed:%v", begin, end, success, active, probed) + } +} + // TestDispatchSkipsReceivesUpdatesForInvokeWithoutUpdates 验证 invokeWithoutUpdates // 包装的请求（media/temp 连接）不会把该 session 标记为 updates 接收者。 func TestDispatchSkipsReceivesUpdatesForInvokeWithoutUpdates(t *testing.T) { @@ -83,19 +232,60 @@ func TestDispatchSkipsReceivesUpdatesForInvokeWithoutUpdates(t *testing.T) { type captureBootstrapReadyStore struct { *memory.BootstrapUpdateJobStore readyCalls int + readyErr error } func (s *captureBootstrapReadyStore) MarkReadyForSession(ctx context.Context, userID int64, authKeyID [8]byte, sessionID int64) (int, error) { s.readyCalls++ + if s.readyErr != nil { + err := s.readyErr + s.readyErr = nil + return 0, err + } return s.BootstrapUpdateJobStore.MarkReadyForSession(ctx, userID, authKeyID, sessionID) } +func TestBootstrapReadinessProbeIsOneShotAndRetriesFailure(t *testing.T) { + const userID int64 = 1000000199 + rawAuthKeyID := [8]byte{19} + businessAuthKeyID := [8]byte{29} + const sessionID int64 = 199 + sessions := &activationCaptureSessions{captureSessions: &captureSessions{}} + bootstrap := &captureBootstrapReadyStore{ + BootstrapUpdateJobStore: memory.NewBootstrapUpdateJobStore(), + readyErr: errors.New("temporary bootstrap lookup failure"), + } + r := New(Config{}, Deps{Sessions: sessions, BootstrapUpdates: bootstrap}, zaptest.NewLogger(t), clock.System) + + baseline := func() { + ctx := postresponse.WithCallbacks(context.Background()) + ctx = WithAuthKeyID(ctx, businessAuthKeyID) + ctx = WithRawAuthKeyID(ctx, rawAuthKeyID) + ctx = WithSessionID(ctx, sessionID) + ctx = WithUserID(ctx, userID) + r.stageUpdatesBaselineAfterDelivery(ctx, userID, nil, 0, nil, true) + postresponse.Run(ctx) + } + + baseline() // authoritative query fails: release the physical-generation claim + baseline() // successful zero-row result: complete the one-shot + baseline() // no third store call on the same physical generation + + if bootstrap.readyCalls != 2 { + t.Fatalf("bootstrap readiness calls = %d, want failure + one successful retry", bootstrap.readyCalls) + } + begin, end, success, active, probed := sessions.bootstrapSnapshot() + if begin != 3 || end != 2 || success != 1 || active != 0 || !probed { + t.Fatalf("bootstrap probe = begin:%d end:%d success:%d active:%d probed:%v", begin, end, success, active, probed) + } +} + func TestInvokeWithoutUpdatesBaselineCommitsResultAndSecretEventsWithoutSubscribing(t *testing.T) { const userID int64 = 1000000201 authKeyID := [8]byte{21} deviceKey := businessAuthKeyInt64(authKeyID) queue := memory.NewEncryptedQueueStore() - secret := appsecret.NewService(memory.NewSecretChatStore(), queue, &seqSecretChatIDAllocator{}) + secret := appsecret.NewService(memory.NewSecretChatStore(), queue) eventID, err := queue.AppendStateEvent(context.Background(), domain.EncryptedStateEvent{ TargetUserID: userID, ChatID: 77, diff --git a/internal/rpc/remote_authorization_revoke_test.go b/internal/rpc/remote_authorization_revoke_test.go index 545eba6d..379dfa09 100644 --- a/internal/rpc/remote_authorization_revoke_test.go +++ b/internal/rpc/remote_authorization_revoke_test.go @@ -20,19 +20,22 @@ func TestAccountResetAuthorizationKeepsProtocolKeyAndReturnsRPC401(t *testing.T) ctx := context.Background() currentAuthKeyID := [8]byte{0x71} targetAuthKeyID := [8]byte{0x72} - const ( - userID = int64(1000000001) - targetHash = int64(2026072401) - ) + const targetHash = int64(2026072401) authKeys := memory.NewAuthKeyStore() authorizations := memory.NewAuthorizationStore() + users := memory.NewUserStore() + user, err := users.Create(ctx, domain.User{Phone: "15550009001", FirstName: "Auth"}) + if err != nil { + t.Fatalf("create authorization owner: %v", err) + } + userID := user.ID for _, authKeyID := range [][8]byte{currentAuthKeyID, targetAuthKeyID} { if err := authKeys.Save(ctx, store.AuthKeyData{ID: authKeyID}); err != nil { t.Fatalf("save auth key %x: %v", authKeyID, err) } } - authService := appauth.NewService(nil, authorizations, nil, authKeys, nil, "12345") + authService := appauth.NewService(users, authorizations, nil, authKeys, nil, "12345") if err := authorizations.Bind(ctx, domain.Authorization{ AuthKeyID: currentAuthKeyID, UserID: userID, diff --git a/internal/rpc/router.go b/internal/rpc/router.go index badcc97c..e4121412 100644 --- a/internal/rpc/router.go +++ b/internal/rpc/router.go @@ -6,6 +6,7 @@ import ( "errors" "fmt" "reflect" + "runtime/debug" "sync" "time" @@ -85,6 +86,9 @@ type Config struct { RtmpIngestURL string // PublicBaseURL 是所有客户端可见 telesrv 链接的公开根 URL。 PublicBaseURL string + // UpdatePublicURL is advertised as help.getConfig.autoupdate_url_prefix. + // Empty keeps the native desktop updater disabled. + UpdatePublicURL string // PublicAppScheme/PublicAppLinkBase 控制客户端 deep link；base 为空时 // 保持 ://，非空时生成 /。 PublicAppScheme string @@ -92,10 +96,27 @@ type Config struct { // TempKeyResolveCacheTTL 是 PFS temp→perm auth key 解析的进程内缓存有效期。>0 时同一 temp key // 在 TTL 内复用上次解析、跳过每帧 ResolveAuthKey 的 PG 查询；0（默认/测试）关闭=每帧重校验。 // 显式撤销会删除协议 auth key、清缓存并断开活跃连接；TTL 只影响自然过期或异常路径下的 - // 下一次重新解析。re-bind 由 onAuthBindTempAuthKey 显式失效，避免跨账号串号。 + // 下一次重新解析。bind success replaces the exact entry with the committed mapping. TempKeyResolveCacheTTL time.Duration // TempKeyResolveCacheMaxEntries 是 temp→perm 解析缓存容量；<=0 用内置默认。 TempKeyResolveCacheMaxEntries int + // PeerIdentityCacheMaxEntries bounds the viewer-independent peer decoration + // cache (username vectors and third-party verification marks). Values are + // validated by the durable peer_identity token; this is not a permission cache. + PeerIdentityCacheMaxEntries int + // StoryActivePeerCacheMaxEntries bounds the shared viewer-independent + // active-story candidate cache. Hidden preferences are one sparse set per + // viewer and have independent entry/byte bounds. + StoryActivePeerCacheMaxEntries int + StoryHiddenListCacheMaxEntries int + StoryHiddenListCacheMaxBytes int64 + // PresenceLastSeenBatch* bounds the asynchronous server-lifecycle + // last-seen writer. Explicit account.updateStatus remains synchronous. + PresenceLastSeenBatchMax int + PresenceLastSeenBatchWait time.Duration + PresenceLastSeenBatchQueue int + PresenceLastSeenBatchTimeout time.Duration + PresenceLastSeenDrainTimeout time.Duration } // Router 把解密后的 RPC 请求按 semantic method 路由到 typed handler（tlprofile.Dispatcher）。 @@ -132,6 +153,7 @@ type Router struct { authUserSF singleflight.Group mediaCountSF singleflight.Group dialogsPinnedSF singleflight.Group + dialogsPinnedListSF singleflight.Group channelFullBotSF singleflight.Group presence *presenceTracker callbacks *callbackRegistry @@ -157,15 +179,18 @@ type Router struct { // lastSeenPersist 记录每个 user 最近一次 last_seen 落库时刻（unix），用于写去抖： // updateStatus 高频续期时数秒内只落一次 DB。 lastSeenPersist sync.Map // userID(int64) -> int64(unix) + lastSeenBatch *presenceLastSeenBatchDispatcher // tempKeyResolveCache 缓存 rawTempKeyID -> resolved perm（带过期），容量有界。 tempKeyResolveCache *tempKeyResolveCache storyProjectionCache *storyProjectionCache + storySparseProjectionCache *storySparseProjectionCache storyPinnedCache *storyPinnedAvailableCache storyPinnedListCache *storyPinnedStoriesCache channelFullBotCache *channelFullBotInfoCache userFullProjectionCache *userFullProjectionCache peerSettingsProjectionCache *peerSettingsProjectionCache channelFullProjectionCache *channelFullProjectionCache + peerIdentityCache *peerIdentityCache availableReactionDocuments availableReactionDocumentMapCache emojiStickers *emojiStickerIndex notifySettings *notifySettingsCache @@ -251,9 +276,23 @@ func New(cfg Config, deps Deps, log *zap.Logger, clk clock.Clock) *Router { if instanceID == "" { instanceID = fmt.Sprintf("%016x", randomNonZeroInt64()) } - r := &Router{cfg: cfg, appLinks: appLinks, log: log, clock: clk, deps: deps, exactProfiles: make(map[clientInfoSessionKey]exactSessionProfileEntry), authLayerEvidence: make(map[[8]byte]authLayerDefaultEvidence), presence: newPresenceTracker(), callbacks: newCallbackRegistry(deps.BotCallbacks), inlines: newInlineRegistry(botInlineQueryTTL, deps.Inline), webviews: newWebViewRegistry(webViewSessionTTL, deps.Inline), loginTokens: newLoginTokenRegistry(), botAPIUpdates: newBotAPIUpdateNotifier(), tempKeyResolveCache: newTempKeyResolveCache(cfg.TempKeyResolveCacheMaxEntries), storyProjectionCache: newStoryProjectionCache(clk.Now), storyPinnedCache: newStoryPinnedAvailableCache(clk.Now), storyPinnedListCache: newStoryPinnedStoriesCache(clk.Now), channelFullBotCache: newChannelFullBotInfoCache(clk.Now), userFullProjectionCache: newUserFullProjectionCache(clk.Now), peerSettingsProjectionCache: newPeerSettingsProjectionCache(clk.Now), channelFullProjectionCache: newChannelFullProjectionCache(clk.Now), emojiStickers: newEmojiStickerIndex(clk.Now), notifySettings: newNotifySettingsCache(clk.Now), stickerCatalog: newStickerCatalogCache(clk.Now), accountSettings: newAccountSettingsCache(clk.Now), accountFreezeWake: make(chan struct{}, 1), instanceID: instanceID} + r := &Router{cfg: cfg, appLinks: appLinks, log: log, clock: clk, deps: deps, exactProfiles: make(map[clientInfoSessionKey]exactSessionProfileEntry), authLayerEvidence: make(map[[8]byte]authLayerDefaultEvidence), presence: newPresenceTracker(), callbacks: newCallbackRegistry(deps.BotCallbacks), inlines: newInlineRegistry(botInlineQueryTTL, deps.Inline), webviews: newWebViewRegistry(webViewSessionTTL, deps.Inline), loginTokens: newLoginTokenRegistry(), botAPIUpdates: newBotAPIUpdateNotifier(), tempKeyResolveCache: newTempKeyResolveCache(cfg.TempKeyResolveCacheMaxEntries), storyProjectionCache: newStoryProjectionCache(clk.Now), storySparseProjectionCache: newStorySparseProjectionCache(deps.ReadModelVersions, cfg.StoryActivePeerCacheMaxEntries, cfg.StoryHiddenListCacheMaxEntries, cfg.StoryHiddenListCacheMaxBytes), storyPinnedCache: newStoryPinnedAvailableCache(clk.Now), storyPinnedListCache: newStoryPinnedStoriesCache(clk.Now), channelFullBotCache: newChannelFullBotInfoCache(clk.Now), userFullProjectionCache: newUserFullProjectionCache(clk.Now), peerSettingsProjectionCache: newPeerSettingsProjectionCache(clk.Now), channelFullProjectionCache: newChannelFullProjectionCache(clk.Now), peerIdentityCache: newPeerIdentityCache(cfg.PeerIdentityCacheMaxEntries), emojiStickers: newEmojiStickerIndex(clk.Now), notifySettings: newNotifySettingsCache(clk.Now), stickerCatalog: newStickerCatalogCache(clk.Now), accountSettings: newAccountSettingsCache(clk.Now), accountFreezeWake: make(chan struct{}, 1), instanceID: instanceID} r.channelFanout = newChannelFanoutDispatcher(r, defaultChannelFanoutShards, defaultChannelFanoutBuffer) r.botAPIEnqueueQueue = newBotAPIEnqueueDispatcher(log, defaultBotAPIEnqueueBuffer) + // Zero-valued hand-built Router configs are used by focused unit tests and + // retain the direct fake-store path. Validated production config always + // supplies positive batch bounds, so the real server cannot disable this + // writer or fall back to per-account lifecycle transactions. + batchConfigured := cfg.PresenceLastSeenBatchMax > 0 || cfg.PresenceLastSeenBatchWait > 0 || + cfg.PresenceLastSeenBatchQueue > 0 || cfg.PresenceLastSeenBatchTimeout > 0 || + cfg.PresenceLastSeenDrainTimeout > 0 + if updater, ok := deps.Users.(presenceLastSeenBatchUpdater); ok && batchConfigured { + r.lastSeenBatch = newPresenceLastSeenBatchDispatcher(updater, presenceLastSeenBatchConfig{ + MaxSize: cfg.PresenceLastSeenBatchMax, MaxWait: cfg.PresenceLastSeenBatchWait, + QueueSize: cfg.PresenceLastSeenBatchQueue, QueryTimeout: cfg.PresenceLastSeenBatchTimeout, + DrainTimeout: cfg.PresenceLastSeenDrainTimeout, + }, log, r.metrics()) + } r.webPageResolveSem = make(chan struct{}, webPageResolveConcurrency) r.selfPhotoEchoPushDelay = defaultSelfPhotoEchoPushDelay if cfg.DC > 0 { @@ -360,6 +399,7 @@ func (r *Router) DispatchWithMethod(ctx context.Context, authKeyID [8]byte, sess if err != nil { return nil, "", err } + defer updatesDelivery.releaseSessionActivation() meta := rpcDispatchMetadata{} enc, err := r.dispatch(ctx, b, 0, &meta) if err == nil && enc != nil { @@ -368,6 +408,29 @@ func (r *Router) DispatchWithMethod(ctx context.Context, authKeyID [8]byte, sess return enc, meta.method, err } +// dispatchGeneratedSafely is the last process-safety boundary around business +// RPC execution. Persisted snapshots and projection bugs must return a scoped +// RPC failure; they must never terminate every MTProto connection in the +// process. The stack is retained in structured logs so recovery is not silent. +func (r *Router) dispatchGeneratedSafely(ctx context.Context, method string, request tlprofile.Admission) (result tlprofile.Result, err error) { + defer func() { + if recovered := recover(); recovered != nil { + fields := append([]zap.Field{ + zap.String("method", method), + zap.Int("profile", int(request.Call().Profile())), + zap.Any("panic", recovered), + zap.ByteString("stack", debug.Stack()), + }, r.contextLogFields(ctx)...) + if r != nil && r.log != nil { + r.log.Error("RPC handler panic isolated", fields...) + } + result = nil + err = internalErr() + } + }() + return r.dispatcher.Dispatch(ctx, request) +} + func (r *Router) effectiveAuthKeyID(ctx context.Context, rawAuthKeyID [8]byte, sessionID int64) ([8]byte, error) { var ( cached [8]byte @@ -399,61 +462,72 @@ func (r *Router) effectiveAuthKeyID(ctx context.Context, rawAuthKeyID [8]byte, s // durable resolver. Treating either as proof of permanence recreates the // raw-temp identity split when an alternate SessionBinder is installed. } - // temp→perm 解析缓存：PFS 连接每帧都要解析一次 temp key（ResolveAuthKey 打 PG）。TTL 内复用 - // 上次解析、跳过 DB。仅当缓存的 perm 仍等于 session binder 当前 perm 才用（rebind 会改 binder - // 且 onAuthBindTempAuthKey / 授权撤销都会显式 Delete 缓存，双保险防跨账号串号和被踢滞后）。 - ttl := r.cfg.TempKeyResolveCacheTTL - if ttl > 0 { - if perm, ok := r.tempKeyResolveCache.Get(rawAuthKeyID, cached, r.clock.Now()); ok { - return perm, nil - } - } - // cold burst 下并发 temp-key 解析用 singleflight 合并：同一 temp key 的 N 个并发 RPC 只打 - // 1 次 PG ResolveAuthKey（其余共享），避免开群/重连首帧 ~50 并发 herd（曾让 auth_resolve 飙到 - // ~1s）。解析结果 + 缓存写入在 SF 内（幂等共享）；session 绑定仍每 caller 各自做（按 session）。 - // 顺序调用不合并（SF 仅合并真并发），「每帧重校验」语义与固化测试 resolveCount 不变。 - v, sfErr, _ := r.authUserSF.Do(authKeyResolveSingleflightPrefix+string(rawAuthKeyID[:]), func() (any, error) { - if ttl > 0 { - if perm, ok := r.tempKeyResolveCache.Get(rawAuthKeyID, cached, r.clock.Now()); ok { - return tempResolveResult{perm: perm, ok: true}, nil - } - } - resolved, ok, err := r.deps.Auth.ResolveAuthKey(ctx, rawAuthKeyID) - if err != nil { - return tempResolveResult{}, err - } - if ok && ttl > 0 { - r.tempKeyResolveCache.Store(rawAuthKeyID, resolved, r.clock.Now().Add(ttl), r.clock.Now()) - } - return tempResolveResult{perm: resolved, ok: ok}, nil - }) - if sfErr != nil { - return [8]byte{}, sfErr - } - out := v.(tempResolveResult) - if out.ok { - if out.perm != cached { - r.bindEffectiveAuthKey(rawAuthKeyID, sessionID, out.perm) - } - return out.perm, nil - } - r.tempKeyResolveCache.Delete(rawAuthKeyID) - r.invalidateAuthUserCache(cached) + } + if r.deps.Auth == nil { r.bindEffectiveAuthKey(rawAuthKeyID, sessionID, rawAuthKeyID) return rawAuthKeyID, nil } - effective := rawAuthKeyID - if r.deps.Auth != nil { - resolved, ok, err := r.deps.Auth.ResolveAuthKey(ctx, rawAuthKeyID) - if err != nil { - return [8]byte{}, err - } - if ok { - effective = resolved - } + resolved, found, err := r.resolveAuthKeyCached(ctx, rawAuthKeyID) + if err != nil { + return [8]byte{}, err } - r.bindEffectiveAuthKey(rawAuthKeyID, sessionID, effective) - return effective, nil + if found { + if !hasCached || resolved != cached { + r.bindEffectiveAuthKey(rawAuthKeyID, sessionID, resolved) + } + return resolved, nil + } + r.tempKeyResolveCache.Delete(rawAuthKeyID) + if hasCached { + r.invalidateAuthUserCache(cached) + } + r.bindEffectiveAuthKey(rawAuthKeyID, sessionID, rawAuthKeyID) + return rawAuthKeyID, nil +} + +// resolveAuthKeyCached is the single positive temp→permanent identity reader +// for connection Layer inheritance, RPC dispatch and admitted Layer +// publication. It never caches a miss: another physical session may commit the +// first binding immediately after this read. Bind/revoke/destroy paths own exact +// invalidation; TTL is only a bounded cross-instance/abnormal-path recheck. +func (r *Router) resolveAuthKeyCached(ctx context.Context, rawAuthKeyID [8]byte) ([8]byte, bool, error) { + if r == nil || r.deps.Auth == nil || rawAuthKeyID == ([8]byte{}) { + return [8]byte{}, false, nil + } + ttl := r.cfg.TempKeyResolveCacheTTL + if ttl <= 0 { + return r.deps.Auth.ResolveAuthKey(ctx, rawAuthKeyID) + } + if perm, ok := r.tempKeyResolveCache.GetResolved(rawAuthKeyID, r.clock.Now()); ok { + return perm, true, nil + } + v, err, _ := r.authUserSF.Do(authKeyResolveSingleflightPrefix+string(rawAuthKeyID[:]), func() (any, error) { + now := r.clock.Now() + if perm, ok := r.tempKeyResolveCache.GetResolved(rawAuthKeyID, now); ok { + return tempResolveResult{perm: perm, ok: true}, nil + } + resolved, found, resolveErr := r.deps.Auth.ResolveAuthKey(ctx, rawAuthKeyID) + if resolveErr != nil { + return tempResolveResult{}, resolveErr + } + if found { + r.tempKeyResolveCache.Store(rawAuthKeyID, resolved, now.Add(ttl), now) + } + return tempResolveResult{perm: resolved, ok: found}, nil + }) + if err != nil { + return [8]byte{}, false, err + } + result := v.(tempResolveResult) + return result.perm, result.ok, nil +} + +func (r *Router) cacheResolvedAuthKey(rawAuthKeyID, permAuthKeyID [8]byte) { + if r == nil || r.cfg.TempKeyResolveCacheTTL <= 0 { + return + } + now := r.clock.Now() + r.tempKeyResolveCache.Store(rawAuthKeyID, permAuthKeyID, now.Add(r.cfg.TempKeyResolveCacheTTL), now) } func (r *Router) bindEffectiveAuthKey(rawAuthKeyID [8]byte, sessionID int64, effective [8]byte) { @@ -746,7 +820,7 @@ func (r *Router) dispatch(ctx context.Context, b *bin.Buffer, depth int, meta *r if err != nil { return nil, err } - exact, err := r.dispatcher.Dispatch(ctx, admission) + exact, err := r.dispatchGeneratedSafely(ctx, tlTypeName(id), admission) var enc bin.Encoder = exact if err == nil && exact != nil { if canonical, ok := exact.CanonicalValue().(bin.Encoder); ok { @@ -761,10 +835,8 @@ func (r *Router) dispatch(ctx context.Context, b *bin.Buffer, depth int, meta *r zap.Duration("dur", dur), }, r.contextLogFields(ctx)...) fields = dbtrace.AppendZapFields(fields, "handler_", dbDelta) - if err != nil || dur > 100*time.Millisecond { - if err != nil { - fields = append(fields, zap.Error(err)) - } + if err != nil { + fields = append(fields, zap.Error(err)) r.log.Info("RPC inner handled", fields...) } else { r.log.Debug("RPC inner handled", fields...) diff --git a/internal/rpc/router_dispatch_test.go b/internal/rpc/router_dispatch_test.go index a2fb3a2a..a82df0c2 100644 --- a/internal/rpc/router_dispatch_test.go +++ b/internal/rpc/router_dispatch_test.go @@ -1144,6 +1144,7 @@ func TestDispatchAnnouncesPresenceWhenSessionIdentityRestored(t *testing.T) { Auth: auth, Dialogs: appdialogs.NewService(dialogs), Sessions: sessions, + Users: staticUsersService{user: bob}, }, zaptest.NewLogger(t), clock.System) req := &tg.HelpGetConfigRequest{} @@ -1196,6 +1197,7 @@ func TestDispatchPushesOnlinePeerStatusesToRestoredSession(t *testing.T) { Auth: auth, Dialogs: appdialogs.NewService(dialogs), Sessions: sessions, + Users: mapUsersService{users: map[int64]domain.User{alice.ID: alice, bob.ID: bob}}, }, zaptest.NewLogger(t), clock.System) if ok, err := r.onAccountUpdateStatus(WithSessionID(WithUserID(ctx, bob.ID), 22), false); err != nil || !ok { t.Fatalf("bob account.updateStatus online = %v, %v", ok, err) diff --git a/internal/rpc/router_panic_isolation_test.go b/internal/rpc/router_panic_isolation_test.go new file mode 100644 index 00000000..54e87a4e --- /dev/null +++ b/internal/rpc/router_panic_isolation_test.go @@ -0,0 +1,41 @@ +package rpc + +import ( + "context" + "testing" + + "github.com/iamxvbaba/td/bin" + "github.com/iamxvbaba/td/tg" + "github.com/iamxvbaba/td/tgerr" + "github.com/iamxvbaba/td/tlprofile" + "go.uber.org/zap" + "go.uber.org/zap/zaptest/observer" +) + +func TestDispatchGeneratedSafelyIsolatesHandlerPanic(t *testing.T) { + dispatcher := tlprofile.NewDispatcher() + registerRPC[*tg.HelpGetNearestDCRequest](dispatcher, tlprofile.SemanticMethodHelpGetNearestDC, func(context.Context, *tg.HelpGetNearestDCRequest) (any, error) { + panic("projection boom") + }) + core, observed := observer.New(zap.ErrorLevel) + r := &Router{dispatcher: dispatcher, log: zap.New(core)} + + var wire bin.Buffer + if err := tlprofile.EncodeObject(tlprofile.Profile229, &tg.HelpGetNearestDCRequest{}, &wire); err != nil { + t.Fatal(err) + } + admission, err := dispatcher.Admit(tlprofile.Profile229, &wire, tlprofile.Limits{}) + if err != nil { + t.Fatal(err) + } + result, err := r.dispatchGeneratedSafely(context.Background(), "help.getNearestDc", admission) + if result != nil { + t.Fatalf("panic returned result %T", result) + } + if !tgerr.Is(err, "INTERNAL_SERVER_ERROR") { + t.Fatalf("panic error = %v, want INTERNAL_SERVER_ERROR", err) + } + if got := observed.FilterMessage("RPC handler panic isolated").Len(); got != 1 { + t.Fatalf("panic log count = %d, want 1", got) + } +} diff --git a/internal/rpc/router_tempkey_cache_test.go b/internal/rpc/router_tempkey_cache_test.go index e47ececa..742154d3 100644 --- a/internal/rpc/router_tempkey_cache_test.go +++ b/internal/rpc/router_tempkey_cache_test.go @@ -114,9 +114,9 @@ func TestCachedRawSessionWithoutMetadataFailsClosedToDurableResolver(t *testing. } } -// TestTempKeyResolveCacheHitsWithinTTL 验证：TempKeyResolveCacheTTL>0 时，同一 temp key 的连续 -// 请求在 TTL 内只解析一次（首帧走 !hasCached 解析 1 次、次帧 hasCached 解析并填缓存 1 次，之后命中 -// 缓存不再打 ResolveAuthKey）。固化「缓存生效」语义，与现有「TTL=0 每帧重校验」的安全测试互补。 +// TestTempKeyResolveCacheHitsWithinTTL verifies that the first authoritative +// positive resolution fills the shared cache; later frames do not need a +// second session-binder-specific warmup lookup. func TestTempKeyResolveCacheHitsWithinTTL(t *testing.T) { tempAuthKeyID := [8]byte{0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77} permAuthKeyID := [8]byte{0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33} @@ -141,9 +141,8 @@ func TestTempKeyResolveCacheHitsWithinTTL(t *testing.T) { t.Fatalf("dispatch %d: %v", i, err) } } - // 首帧 !hasCached 解析 1 次；次帧 hasCached miss 解析 1 次并填缓存；其余 6 帧命中缓存。 - if auth.resolveCount != 2 { - t.Fatalf("ResolveAuthKey calls = %d over 8 dispatches, want 2 (cached within TTL)", auth.resolveCount) + if auth.resolveCount != 1 { + t.Fatalf("ResolveAuthKey calls = %d over 8 dispatches, want 1 (first positive result cached)", auth.resolveCount) } got := sessions.snapshot() if got.authKeyID != permAuthKeyID || got.userID != 1000000001 { @@ -151,6 +150,32 @@ func TestTempKeyResolveCacheHitsWithinTTL(t *testing.T) { } } +func TestSuccessfulBindSeedsPositiveIdentityCache(t *testing.T) { + rawAuthKeyID := [8]byte{0x7b, 1} + permAuthKeyID := [8]byte{0x4b, 1} + const sessionID = int64(557) + auth := &captureAuthService{} + r := New(Config{TempKeyResolveCacheTTL: time.Minute}, Deps{ + Auth: auth, + Sessions: &captureSessions{}, + }, zaptest.NewLogger(t), clock.System) + ctx := WithAuthKeyID(WithSessionID(WithRawAuthKeyID(context.Background(), rawAuthKeyID), sessionID), rawAuthKeyID) + ctx = r.WithLayerRPCProfileEvidenceFresh(ctx, true) + ok, err := r.onAuthBindTempAuthKey(ctx, &tg.AuthBindTempAuthKeyRequest{ + PermAuthKeyID: businessAuthKeyInt64(permAuthKeyID), + }) + if err != nil || !ok { + t.Fatalf("bind = (%v,%v), want (true,nil)", ok, err) + } + resolved, found, err := r.resolveAuthKeyCached(context.Background(), rawAuthKeyID) + if err != nil || !found || resolved != permAuthKeyID { + t.Fatalf("cached binding = (%x,%v,%v), want (%x,true,nil)", resolved, found, err, permAuthKeyID) + } + if auth.resolveCount != 0 { + t.Fatalf("post-bind ResolveAuthKey calls = %d, want 0", auth.resolveCount) + } +} + // TestTempKeyResolveCacheExpires 验证 TTL 过期后会重新解析自然到期的 temp key。 func TestTempKeyResolveCacheExpires(t *testing.T) { tempAuthKeyID := [8]byte{0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78} diff --git a/internal/rpc/rpc_testkit_auth_test.go b/internal/rpc/rpc_testkit_auth_test.go index 7c0ffe9f..227e3630 100644 --- a/internal/rpc/rpc_testkit_auth_test.go +++ b/internal/rpc/rpc_testkit_auth_test.go @@ -10,6 +10,7 @@ type captureAuthService struct { bindTempCalls int bindTempLayer int bindTempHook func(domain.TempAuthKeyBinding) error + bindTempResult domain.TempAuthKeyBindingResult resolvedAuthKeyID [8]byte hasResolved bool resolveCount int @@ -33,6 +34,7 @@ type captureAuthService struct { pendingPasswordUserID int64 pendingPassword bool completedPasswordKey [8]byte + completedPasswordUser int64 completePasswordCount int codeDelivery domain.AuthCodeDelivery signInCount int @@ -65,8 +67,8 @@ func (s *blockingUserAuthService) UserIDCount() int { return s.count } -func (s *blockingUserAuthService) BindTempAuthKey(context.Context, int64, domain.TempAuthKeyBinding) error { - return nil +func (s *blockingUserAuthService) BindTempAuthKey(context.Context, int64, domain.TempAuthKeyBinding) (domain.TempAuthKeyBindingResult, error) { + return domain.TempAuthKeyBindingResult{}, nil } func (s *blockingUserAuthService) ResolveAuthKey(context.Context, [8]byte) ([8]byte, bool, error) { @@ -158,17 +160,28 @@ func (s *blockingUserAuthService) PendingPasswordUserID(context.Context, [8]byte return 0, false, nil } -func (s *blockingUserAuthService) CompletePasswordSignIn(context.Context, [8]byte) error { +func (s *blockingUserAuthService) CompletePasswordSignIn(context.Context, [8]byte, int64) error { return nil } -func (s *captureAuthService) BindTempAuthKey(ctx context.Context, _ int64, binding domain.TempAuthKeyBinding) error { +func (s *captureAuthService) BindTempAuthKey(ctx context.Context, _ int64, binding domain.TempAuthKeyBinding) (domain.TempAuthKeyBindingResult, error) { s.bindTempCalls++ s.bindTempLayer = LayerFrom(ctx) if s.bindTempHook != nil { - return s.bindTempHook(binding) + if err := s.bindTempHook(binding); err != nil { + return domain.TempAuthKeyBindingResult{}, err + } } - return nil + if s.bindTempResult != (domain.TempAuthKeyBindingResult{}) { + return s.bindTempResult, nil + } + permID := authKeyIDFromInt64(binding.PermAuthKeyID) + if info, ok := s.authKeyClientInfos[permID]; ok { + return domain.TempAuthKeyBindingResult{ + Layer: info.Layer, LayerObservationID: info.LayerObservationID, + }, nil + } + return domain.TempAuthKeyBindingResult{}, nil } func (s *captureAuthService) ResolveAuthKey(context.Context, [8]byte) ([8]byte, bool, error) { @@ -343,8 +356,9 @@ func (s *captureAuthService) PendingPasswordUserID(context.Context, [8]byte) (in return s.pendingPasswordUserID, s.pendingPassword, nil } -func (s *captureAuthService) CompletePasswordSignIn(_ context.Context, authKeyID [8]byte) error { +func (s *captureAuthService) CompletePasswordSignIn(_ context.Context, authKeyID [8]byte, userID int64) error { s.completedPasswordKey = authKeyID + s.completedPasswordUser = userID s.completePasswordCount++ return nil } diff --git a/internal/rpc/rpc_testkit_dialogs_test.go b/internal/rpc/rpc_testkit_dialogs_test.go index c707e6c1..97c2c1ba 100644 --- a/internal/rpc/rpc_testkit_dialogs_test.go +++ b/internal/rpc/rpc_testkit_dialogs_test.go @@ -2,10 +2,12 @@ package rpc import ( "context" + "sync" "telesrv/internal/domain" ) type captureDialogs struct { + mu sync.Mutex list domain.DialogList pinnedList domain.DialogList hasPinnedList bool @@ -31,9 +33,20 @@ type captureDialogs struct { peer domain.Peer topMessageID int } + invalidatedDialogs []struct { + userID int64 + peer domain.Peer + } reorderNoChange bool } +func (s *captureDialogs) InvalidateDialog(userID int64, peer domain.Peer) { + s.invalidatedDialogs = append(s.invalidatedDialogs, struct { + userID int64 + peer domain.Peer + }{userID: userID, peer: peer}) +} + func (s *captureDialogs) GetDialogsHash(_ context.Context, _ int64, filter domain.DialogFilter) (domain.DialogHashCheck, error) { s.hashCalls++ s.hashFilter = filter @@ -41,6 +54,8 @@ func (s *captureDialogs) GetDialogsHash(_ context.Context, _ int64, filter domai } func (s *captureDialogs) GetDialogs(_ context.Context, _ int64, filter domain.DialogFilter) (domain.DialogList, error) { + s.mu.Lock() + defer s.mu.Unlock() s.getDialogsCalls++ s.filter = filter s.filters = append(s.filters, filter) diff --git a/internal/rpc/rpc_testkit_messages_test.go b/internal/rpc/rpc_testkit_messages_test.go index b72c80f9..06066131 100644 --- a/internal/rpc/rpc_testkit_messages_test.go +++ b/internal/rpc/rpc_testkit_messages_test.go @@ -42,6 +42,7 @@ type captureMessages struct { deleteMessagesRes domain.DeleteMessagesResult deleteHistoryReq domain.DeleteHistoryRequest deleteHistoryRes domain.DeleteMessagesResult + mediaReq domain.MediaSearchRequest } type scheduledCaptureMessages struct { @@ -392,7 +393,8 @@ func (s *captureMessages) Search(_ context.Context, _ int64, filter domain.Messa return s.list, nil } -func (s *captureMessages) SearchPrivateMedia(_ context.Context, _, _ int64, _ domain.MediaSearchRequest) (domain.MessageList, error) { +func (s *captureMessages) SearchPrivateMedia(_ context.Context, _, _ int64, req domain.MediaSearchRequest) (domain.MessageList, error) { + s.mediaReq = req return domain.MessageList{}, nil } diff --git a/internal/rpc/rpc_testkit_metrics_test.go b/internal/rpc/rpc_testkit_metrics_test.go index b269f23d..111c9bf7 100644 --- a/internal/rpc/rpc_testkit_metrics_test.go +++ b/internal/rpc/rpc_testkit_metrics_test.go @@ -28,6 +28,16 @@ func (m *captureRPCMetrics) OutboxDelivered(time.Duration) {} func (m *captureRPCMetrics) OutboxFailed(error) {} +func (m *captureRPCMetrics) PresenceLastSeenBatch(int, time.Duration, error) {} + +func (m *captureRPCMetrics) PresenceLastSeenSubmitted() {} + +func (m *captureRPCMetrics) PresenceLastSeenPending(int) {} + +func (m *captureRPCMetrics) PresenceLastSeenOverflow() {} + +func (m *captureRPCMetrics) PresenceLastSeenDrainDropped(int) {} + type rateLimitCall struct { key string cost int diff --git a/internal/rpc/rpc_testkit_users_test.go b/internal/rpc/rpc_testkit_users_test.go index b20a5998..72582071 100644 --- a/internal/rpc/rpc_testkit_users_test.go +++ b/internal/rpc/rpc_testkit_users_test.go @@ -15,10 +15,11 @@ type mapUsersService struct { type countingMapUsersService struct { mapUsersService - selfCalls int - byIDCalls int - byIDsCalls int - lastByIDs []int64 + selfCalls int + byIDCalls int + byIDsCalls int + lastByIDs []int64 + byIDsBatches [][]int64 } func (s staticUsersService) Self(context.Context, int64) (domain.User, error) { @@ -35,6 +36,11 @@ func (s staticUsersService) ByID(_ context.Context, _, userID int64) (domain.Use return domain.User{}, false, nil } +func (s staticUsersService) BotStatus(_ context.Context, userID int64) (bool, bool, error) { + u, found, err := s.ByID(context.Background(), userID, userID) + return u.Bot, found, err +} + func (s staticUsersService) ByIDs(_ context.Context, _ int64, userIDs []int64) ([]domain.User, error) { out := make([]domain.User, 0, len(userIDs)) seen := map[int64]struct{}{} @@ -61,6 +67,11 @@ func (s mapUsersService) ByID(_ context.Context, _, userID int64) (domain.User, return u, ok, nil } +func (s mapUsersService) BotStatus(_ context.Context, userID int64) (bool, bool, error) { + u, found := s.users[userID] + return u.Bot, found, nil +} + func (s mapUsersService) ByIDs(_ context.Context, _ int64, userIDs []int64) ([]domain.User, error) { out := make([]domain.User, 0, len(userIDs)) seen := map[int64]struct{}{} @@ -89,6 +100,7 @@ func (s *countingMapUsersService) Self(ctx context.Context, userID int64) (domai func (s *countingMapUsersService) ByIDs(ctx context.Context, currentUserID int64, userIDs []int64) ([]domain.User, error) { s.byIDsCalls++ s.lastByIDs = append([]int64(nil), userIDs...) + s.byIDsBatches = append(s.byIDsBatches, append([]int64(nil), userIDs...)) return s.mapUsersService.ByIDs(ctx, currentUserID, userIDs) } diff --git a/internal/rpc/send_media.go b/internal/rpc/send_media.go index 4cb7b969..4d4c66f5 100644 --- a/internal/rpc/send_media.go +++ b/internal/rpc/send_media.go @@ -134,10 +134,21 @@ func (r *Router) sendOutgoing(ctx context.Context, userID int64, peer domain.Pee if err := r.ensureVoiceMessagesAllowed(ctx, userID, peer, p.media != nil && p.media.HasUnreadPayload()); err != nil { return nil, false, err } - if r.deps.Users != nil && peer.ID != userID { - if _, found, err := r.deps.Users.ByID(ctx, userID, peer.ID); err != nil { + var projectedUsers []domain.User + if r.deps.Users != nil { + loaded, err := r.deps.Users.ByIDs(ctx, userID, []int64{userID, peer.ID}) + if err != nil { return nil, false, internalErr() - } else if !found { + } + projectedUsers = loaded + peerFound := peer.ID == userID + for _, user := range projectedUsers { + if user.ID == peer.ID { + peerFound = true + break + } + } + if !peerFound { return nil, false, peerIDInvalidErr() } } @@ -170,6 +181,7 @@ func (r *Router) sendOutgoing(ctx context.Context, userID int64, peer domain.Pee Date: int(r.clock.Now().Unix()), OriginAuthKeyID: authKeyID, OriginSessionID: sessionID, + OriginClientSession: clientSessionMetadataFromContext(ctx), RecipientBlocked: recipientBlocked, IdempotencyFingerprint: p.idempotencyFingerprint, IdempotencyPreflighted: p.idempotencyPreflighted, @@ -198,11 +210,11 @@ func (r *Router) sendOutgoing(ctx context.Context, userID int64, peer domain.Pee var users []tg.UserClass var chats []tg.ChatClass if !res.Duplicate { - users = r.usersForMessageUpdate(ctx, userID, res.SenderMessage) + users = r.usersForMessageUpdateWithPreloaded(ctx, userID, res.SenderMessage, projectedUsers) chats = r.chatsForMessageUpdate(ctx, userID, res.SenderMessage) } if p.clearDraft && !res.Duplicate { - r.clearDraftAfterSend(ctx, userID, peer, replyTo) + r.clearDraftAfterSendWithPeerObjects(ctx, userID, peer, replyTo, users, chats) } if !res.Duplicate { // 链接预览 pending 占位：带外解析并就地替换（异步，不阻塞发送 echo）。 @@ -328,7 +340,7 @@ func (r *Router) onMessagesSendMedia(ctx context.Context, req *tg.MessagesSendMe if req.ClearDraft { r.clearDraftAfterSend(ctx, userID, peer, replyTo) } - return r.monoforumSendUpdates(ctx, userID, replay.channel.Channel, savedPeer, replay.channel), nil + return r.monoforumSendUpdatesStrict(ctx, userID, replay.channel.Channel, savedPeer, replay.channel) } if r.messageEffectInvalid(ctx, req.Effect) { return nil, effectIDInvalidErr() diff --git a/internal/rpc/send_media_test.go b/internal/rpc/send_media_test.go index 2de6dc30..c2b725dc 100644 --- a/internal/rpc/send_media_test.go +++ b/internal/rpc/send_media_test.go @@ -39,6 +39,10 @@ type fakeFiles struct { webPagePreviewOn bool getDocumentsCalls int createUploadCalls int + getFileRequest domain.FileDownloadRequest + getFileChunk domain.FileChunk + getFileFound bool + getFileCalls int } type fakeProfilePhotoKey struct { @@ -61,8 +65,10 @@ func (f *fakeFiles) SaveFilePart(context.Context, int64, int64, int, []byte) (bo func (f *fakeFiles) SaveBigFilePart(context.Context, int64, int64, int, int, []byte) (bool, error) { return true, nil } -func (f *fakeFiles) GetFile(context.Context, domain.FileDownloadRequest) (domain.FileChunk, bool, error) { - return domain.FileChunk{}, false, nil +func (f *fakeFiles) GetFile(_ context.Context, req domain.FileDownloadRequest) (domain.FileChunk, bool, error) { + f.getFileCalls++ + f.getFileRequest = req + return f.getFileChunk, f.getFileFound, nil } func (f *fakeFiles) CreateEncryptedFileFromUpload(context.Context, domain.UploadedFileRef, int) (domain.EncryptedFileRef, error) { return domain.EncryptedFileRef{ID: 9001, AccessHash: 9002, Size: 16, DCID: 2, KeyFingerprint: 7}, nil diff --git a/internal/rpc/stats.go b/internal/rpc/stats.go index 5501c38b..30be3fa8 100644 --- a/internal/rpc/stats.go +++ b/internal/rpc/stats.go @@ -2,7 +2,11 @@ package rpc import ( "context" + "encoding/json" + "errors" "fmt" + "sort" + "strconv" "github.com/iamxvbaba/td/tg" @@ -51,7 +55,14 @@ func (r *Router) onStatsGetBroadcastStats(ctx context.Context, req *tg.StatsGetB if !view.Channel.Broadcast { return nil, tgerr400("BROADCAST_REQUIRED") } - return r.emptyBroadcastStats(), nil + stats, err := r.deps.Channels.GetStats(ctx, view.Self.UserID, domain.ChannelStatsRequest{ + ChannelID: view.Channel.ID, + Period: r.statsPeriod(), + }) + if err != nil { + return nil, statsServiceErr(err) + } + return r.tgBroadcastStats(stats), nil } func (r *Router) onStatsGetMegagroupStats(ctx context.Context, req *tg.StatsGetMegagroupStatsRequest) (*tg.StatsMegagroupStats, error) { @@ -62,19 +73,37 @@ func (r *Router) onStatsGetMegagroupStats(ctx context.Context, req *tg.StatsGetM if !view.Channel.Megagroup { return nil, tgerr400("MEGAGROUP_REQUIRED") } - return r.emptyMegagroupStats(), nil + stats, err := r.deps.Channels.GetStats(ctx, view.Self.UserID, domain.ChannelStatsRequest{ + ChannelID: view.Channel.ID, + Period: r.statsPeriod(), + }) + if err != nil { + return nil, statsServiceErr(err) + } + return r.tgMegagroupStats(ctx, view.Self.UserID, stats), nil } func (r *Router) onStatsGetMessageStats(ctx context.Context, req *tg.StatsGetMessageStatsRequest) (*tg.StatsMessageStats, error) { if req.MsgID <= 0 || req.MsgID > domain.MaxMessageBoxID { return nil, messageIDInvalidErr() } - if _, err := r.statsChannelView(ctx, req.Channel); err != nil { + view, err := r.statsChannelView(ctx, req.Channel) + if err != nil { return nil, err } + stats, err := r.deps.Channels.GetMessageStats(ctx, view.Self.UserID, domain.ChannelMessageStatsRequest{ + ChannelID: view.Channel.ID, + MessageID: req.MsgID, + Period: r.statsPeriod(), + }) + if err != nil { + return nil, statsServiceErr(err) + } return &tg.StatsMessageStats{ - ViewsGraph: r.emptyStatsGraph("Views"), - ReactionsByEmotionGraph: r.emptyStatsGraph("Reactions"), + ViewsGraph: r.statsGraph(stats.Days, []statsGraphSeries{{ + Key: "views", Label: "Views", Color: statsGraphColors[0], Value: func(day domain.ChannelStatsDay) int { return day.Views }, + }}), + ReactionsByEmotionGraph: r.statsReactionGraph(stats.Days), }, nil } @@ -82,13 +111,36 @@ func (r *Router) onStatsGetMessagePublicForwards(ctx context.Context, req *tg.St if req.MsgID <= 0 || req.MsgID > domain.MaxMessageBoxID { return nil, messageIDInvalidErr() } - if req.Limit < 0 || req.Limit > maxStatsPublicForwardsLimit || len(req.Offset) > maxStatsOffsetLength { + if req.Limit < 0 || req.Limit > maxStatsPublicForwardsLimit { return nil, limitInvalidErr() } - if _, err := r.statsChannelView(ctx, req.Channel); err != nil { + if len(req.Offset) > maxStatsOffsetLength { + return nil, tgerr400("OFFSET_INVALID") + } + view, err := r.statsChannelView(ctx, req.Channel) + if err != nil { return nil, err } - return emptyStatsPublicForwards(), nil + limit := req.Limit + if limit <= 0 { + limit = maxStatsPublicForwardsLimit + } + list, err := r.deps.Channels.ListMessagePublicForwards(ctx, view.Self.UserID, domain.ChannelMessagePublicForwardListRequest{ + ChannelID: view.Channel.ID, + MessageID: req.MsgID, + Offset: req.Offset, + Limit: limit, + }) + if err != nil { + return nil, statsServiceErr(err) + } + views := make([]domain.StoryView, 0, len(list.Messages)) + for _, message := range list.Messages { + views = append(views, domain.StoryView{Date: message.Date, PublicForward: &domain.StoryPublicForward{Message: message}}) + } + return r.tgStatsPublicForwards(ctx, view.Self.UserID, domain.StoryPublicForwardList{ + Count: list.Count, Forwards: views, NextOffset: list.NextOffset, + }), nil } func (r *Router) onStatsLoadAsyncGraph(_ context.Context, req *tg.StatsLoadAsyncGraphRequest) (tg.StatsGraphClass, error) { @@ -115,9 +167,27 @@ func (r *Router) onStatsGetStoryStats(ctx context.Context, req *tg.StatsGetStory return nil, storyErr(err) } } + date := int(r.clock.Now().Unix()) - 1 + views := 0 + reactions := []domain.ChannelMessageReactionCount(nil) + if r.deps.Stories != nil { + list, loadErr := r.deps.Stories.GetStoriesByID(ctx, userID, peer, []int{req.ID}, int(r.clock.Now().Unix())) + if loadErr != nil { + return nil, storyErr(loadErr) + } + for _, story := range list.Stories { + if story.ID != req.ID || story.Owner != peer || story.Deleted { + continue + } + date = story.Date + views = story.Views.ViewsCount + reactions = story.Views.Reactions + break + } + } return &tg.StatsStoryStats{ - ViewsGraph: r.emptyStatsGraph("Views"), - ReactionsByEmotionGraph: r.emptyStatsGraph("Reactions"), + ViewsGraph: r.statsSnapshotGraph("views", "Views", date, views), + ReactionsByEmotionGraph: r.statsReactionSnapshotGraph(date, reactions), }, nil } @@ -183,10 +253,45 @@ func (r *Router) onStatsGetPollStats(ctx context.Context, req *tg.StatsGetPollSt if req.MsgID <= 0 || req.MsgID > domain.MaxMessageBoxID { return nil, messageIDInvalidErr() } - if err := r.validateStatsPeer(ctx, req.Peer); err != nil { + userID, _, err := r.currentUserID(ctx) + if err != nil { + return nil, internalErr() + } + peer, err := r.checkedDomainPeerFromInputPeer(ctx, userID, req.Peer) + if err != nil { return nil, err } - return &tg.StatsPollStats{VotesGraph: r.emptyStatsGraph("Votes")}, nil + date, votes := int(r.clock.Now().Unix())-1, 0 + if peer.Type == domain.PeerTypeChannel && r.deps.Channels != nil { + history, loadErr := r.deps.Channels.GetMessages(ctx, userID, peer.ID, []int{req.MsgID}) + if loadErr != nil { + return nil, channelInvalidErr(loadErr) + } + for _, message := range history.Messages { + if message.ID == req.MsgID && message.Media != nil && message.Media.Poll != nil { + date = message.Date + if message.Media.Poll.Results != nil { + votes = message.Media.Poll.Results.TotalVoters + } + break + } + } + } else if peer.Type == domain.PeerTypeUser && r.deps.Messages != nil { + messages, loadErr := r.deps.Messages.GetMessages(ctx, userID, []int{req.MsgID}) + if loadErr != nil { + return nil, internalErr() + } + for _, message := range messages.Messages { + if message.ID == req.MsgID && message.Peer == peer && message.Media != nil && message.Media.Poll != nil { + date = message.Date + if message.Media.Poll.Results != nil { + votes = message.Media.Poll.Results.TotalVoters + } + break + } + } + } + return &tg.StatsPollStats{VotesGraph: r.statsSnapshotGraph("votes", "Votes", date, votes)}, nil } func (r *Router) statsChannelView(ctx context.Context, input tg.InputChannelClass) (domain.ChannelView, error) { @@ -200,77 +305,242 @@ func (r *Router) statsChannelView(ctx context.Context, input tg.InputChannelClas return view, nil } -func (r *Router) validateStatsPeer(ctx context.Context, peer tg.InputPeerClass) error { - userID, _, err := r.currentUserID(ctx) - if err != nil { - return internalErr() - } - _, err = r.checkedDomainPeerFromInputPeer(ctx, userID, peer) - return err +var statsGraphColors = [...]string{ + "#4A90E2", "#50E3C2", "#F5A623", "#D0021B", "#9013FE", "#7ED321", "#B8E986", "#BD10E0", } -func (r *Router) emptyBroadcastStats() *tg.StatsBroadcastStats { +type statsGraphSeries struct { + Key string + Label string + Color string + Value func(domain.ChannelStatsDay) int +} + +type statsGraphJSON struct { + Columns [][]any `json:"columns"` + Types map[string]string `json:"types"` + Names map[string]string `json:"names"` + Colors map[string]string `json:"colors"` +} + +func (r *Router) statsPeriod() domain.StatsPeriod { + maxDate := int(r.clock.Now().Unix()) + if maxDate <= 7*86400 { + maxDate = 7*86400 + 1 + } + return domain.StatsPeriod{MinDate: maxDate - 7*86400, MaxDate: maxDate} +} + +func tgStatsPeriod(period domain.StatsPeriod) tg.StatsDateRangeDays { + return tg.StatsDateRangeDays{MinDate: period.MinDate, MaxDate: period.MaxDate} +} + +func tgStatsValue(value domain.StatsValueAndPrev) tg.StatsAbsValueAndPrev { + return tg.StatsAbsValueAndPrev{Current: value.Current, Previous: value.Previous} +} + +func (r *Router) tgBroadcastStats(stats domain.ChannelStats) *tg.StatsBroadcastStats { + recent := make([]tg.PostInteractionCountersClass, 0, len(stats.RecentPosts)) + for _, item := range stats.RecentPosts { + recent = append(recent, &tg.PostInteractionCountersMessage{ + MsgID: item.MessageID, Views: item.Views, Forwards: item.Forwards, Reactions: item.Reactions, + }) + } return &tg.StatsBroadcastStats{ - Period: r.statsDateRange(), - Followers: tg.StatsAbsValueAndPrev{}, - ViewsPerPost: tg.StatsAbsValueAndPrev{}, - SharesPerPost: tg.StatsAbsValueAndPrev{}, - ReactionsPerPost: tg.StatsAbsValueAndPrev{}, - ViewsPerStory: tg.StatsAbsValueAndPrev{}, - SharesPerStory: tg.StatsAbsValueAndPrev{}, - ReactionsPerStory: tg.StatsAbsValueAndPrev{}, - EnabledNotifications: tg.StatsPercentValue{}, - GrowthGraph: r.emptyStatsGraph("Growth"), - FollowersGraph: r.emptyStatsGraph("Followers"), - MuteGraph: r.emptyStatsGraph("Muted"), - TopHoursGraph: r.emptyStatsGraph("Hours"), - InteractionsGraph: r.emptyStatsGraph("Interactions"), - IvInteractionsGraph: r.emptyStatsGraph("Instant Views"), - ViewsBySourceGraph: r.emptyStatsGraph("Views"), - NewFollowersBySourceGraph: r.emptyStatsGraph("Followers"), - LanguagesGraph: r.emptyStatsGraph("Languages"), - ReactionsByEmotionGraph: r.emptyStatsGraph("Reactions"), - StoryInteractionsGraph: r.emptyStatsGraph("Stories"), - StoryReactionsByEmotionGraph: r.emptyStatsGraph("Story Reactions"), + Period: tgStatsPeriod(stats.Period), + Followers: tgStatsValue(stats.Members), + ViewsPerPost: tgStatsValue(stats.ViewsPerPost), + SharesPerPost: tgStatsValue(stats.SharesPerPost), + ReactionsPerPost: tgStatsValue(stats.ReactionsPerPost), + ViewsPerStory: tg.StatsAbsValueAndPrev{}, + SharesPerStory: tg.StatsAbsValueAndPrev{}, + ReactionsPerStory: tg.StatsAbsValueAndPrev{}, + EnabledNotifications: tg.StatsPercentValue{}, + GrowthGraph: r.statsGraph(stats.Days, []statsGraphSeries{{ + Key: "members", Label: "Followers", Color: statsGraphColors[0], Value: func(day domain.ChannelStatsDay) int { return day.Members }, + }}), + FollowersGraph: r.statsGraph(stats.Days, []statsGraphSeries{{ + Key: "new_members", Label: "New followers", Color: statsGraphColors[1], Value: func(day domain.ChannelStatsDay) int { return day.NewMembers }, + }}), + MuteGraph: statsGraphUnavailable(), + TopHoursGraph: statsGraphUnavailable(), + InteractionsGraph: r.statsGraph(stats.Days, []statsGraphSeries{ + {Key: "views", Label: "Views", Color: statsGraphColors[0], Value: func(day domain.ChannelStatsDay) int { return day.Views }}, + {Key: "shares", Label: "Shares", Color: statsGraphColors[1], Value: func(day domain.ChannelStatsDay) int { return day.Shares }}, + }), + IvInteractionsGraph: statsGraphUnavailable(), + ViewsBySourceGraph: statsGraphUnavailable(), + NewFollowersBySourceGraph: statsGraphUnavailable(), + LanguagesGraph: statsGraphUnavailable(), + ReactionsByEmotionGraph: r.statsReactionGraph(stats.Days), + StoryInteractionsGraph: statsGraphUnavailable(), + StoryReactionsByEmotionGraph: statsGraphUnavailable(), + RecentPostsInteractions: recent, } } -func (r *Router) emptyMegagroupStats() *tg.StatsMegagroupStats { - return &tg.StatsMegagroupStats{ - Period: r.statsDateRange(), - Members: tg.StatsAbsValueAndPrev{}, - Messages: tg.StatsAbsValueAndPrev{}, - Viewers: tg.StatsAbsValueAndPrev{}, - Posters: tg.StatsAbsValueAndPrev{}, - GrowthGraph: r.emptyStatsGraph("Growth"), - MembersGraph: r.emptyStatsGraph("Members"), - NewMembersBySourceGraph: r.emptyStatsGraph("Members"), - LanguagesGraph: r.emptyStatsGraph("Languages"), - MessagesGraph: r.emptyStatsGraph("Messages"), - ActionsGraph: r.emptyStatsGraph("Actions"), - TopHoursGraph: r.emptyStatsGraph("Hours"), - WeekdaysGraph: r.emptyStatsGraph("Weekdays"), - TopPosters: []tg.StatsGroupTopPoster{}, - TopAdmins: []tg.StatsGroupTopAdmin{}, - TopInviters: []tg.StatsGroupTopInviter{}, +func (r *Router) tgMegagroupStats(ctx context.Context, viewerUserID int64, stats domain.ChannelStats) *tg.StatsMegagroupStats { + posterIDs := make([]int64, 0, len(stats.TopPosters)) + topPosters := make([]tg.StatsGroupTopPoster, 0, len(stats.TopPosters)) + for _, item := range stats.TopPosters { + posterIDs = append(posterIDs, item.UserID) + topPosters = append(topPosters, tg.StatsGroupTopPoster{UserID: item.UserID, Messages: item.Messages, AvgChars: item.AvgChars}) } + users := tgUsersForViewer(viewerUserID, r.domainUsersForIDs(ctx, viewerUserID, posterIDs)) + out := &tg.StatsMegagroupStats{ + Period: tgStatsPeriod(stats.Period), + Members: tgStatsValue(stats.Members), + Messages: tgStatsValue(stats.Messages), + Viewers: tgStatsValue(stats.Viewers), + Posters: tgStatsValue(stats.Posters), + GrowthGraph: r.statsGraph(stats.Days, []statsGraphSeries{{ + Key: "members", Label: "Members", Color: statsGraphColors[0], Value: func(day domain.ChannelStatsDay) int { return day.Members }, + }}), + MembersGraph: r.statsGraph(stats.Days, []statsGraphSeries{{ + Key: "new_members", Label: "New members", Color: statsGraphColors[1], Value: func(day domain.ChannelStatsDay) int { return day.NewMembers }, + }}), + NewMembersBySourceGraph: statsGraphUnavailable(), + LanguagesGraph: statsGraphUnavailable(), + MessagesGraph: r.statsGraph(stats.Days, []statsGraphSeries{{ + Key: "messages", Label: "Messages", Color: statsGraphColors[0], Value: func(day domain.ChannelStatsDay) int { return day.Messages }, + }}), + ActionsGraph: statsGraphUnavailable(), + TopHoursGraph: statsGraphUnavailable(), + WeekdaysGraph: statsGraphUnavailable(), + TopPosters: topPosters, + TopAdmins: []tg.StatsGroupTopAdmin{}, + TopInviters: []tg.StatsGroupTopInviter{}, + Users: users, + } + r.applyPeerReadModels(ctx, viewerUserID, out.Users, nil) + return out } -func (r *Router) statsDateRange() tg.StatsDateRangeDays { +func (r *Router) statsGraph(days []domain.ChannelStatsDay, series []statsGraphSeries) tg.StatsGraphClass { + graph := statsGraphJSON{ + Columns: make([][]any, 0, len(series)+1), + Types: map[string]string{"x": "x"}, + Names: make(map[string]string, len(series)), + Colors: make(map[string]string, len(series)), + } + x := make([]any, 1, len(days)+1) + x[0] = "x" + for _, day := range days { + x = append(x, int64(day.Date)*1000) + } + graph.Columns = append(graph.Columns, x) + for i, item := range series { + key := "y" + strconv.Itoa(i) + column := make([]any, 1, len(days)+1) + column[0] = key + for _, day := range days { + column = append(column, item.Value(day)) + } + graph.Columns = append(graph.Columns, column) + graph.Types[key] = "line" + graph.Names[key] = item.Label + color := item.Color + if color == "" { + color = statsGraphColors[i%len(statsGraphColors)] + } + graph.Colors[key] = color + } + data, err := json.Marshal(graph) + if err != nil { + return &tg.StatsGraphError{Error: "GRAPH_SERIALIZATION_FAILED"} + } + return &tg.StatsGraph{JSON: tg.DataJSON{Data: string(data)}} +} + +func (r *Router) statsReactionGraph(days []domain.ChannelStatsDay) tg.StatsGraphClass { + byKey := make(map[string]domain.MessageReaction) + for _, day := range days { + for _, item := range day.ByReaction { + byKey[item.Reaction.Key()] = item.Reaction + } + } + keys := make([]string, 0, len(byKey)) + for key := range byKey { + keys = append(keys, key) + } + sort.Strings(keys) + if len(keys) == 0 { + return r.statsGraph(days, []statsGraphSeries{{ + Key: "reactions", Label: "Reactions", Color: statsGraphColors[2], Value: func(day domain.ChannelStatsDay) int { return day.Reactions }, + }}) + } + series := make([]statsGraphSeries, 0, len(keys)) + for i, reactionKey := range keys { + key := reactionKey + reaction := byKey[key] + series = append(series, statsGraphSeries{ + Key: key, Label: statsReactionLabel(reaction), Color: statsGraphColors[i%len(statsGraphColors)], + Value: func(day domain.ChannelStatsDay) int { + for _, item := range day.ByReaction { + if item.Reaction.Key() == key { + return item.Count + } + } + return 0 + }, + }) + } + return r.statsGraph(days, series) +} + +func statsReactionLabel(reaction domain.MessageReaction) string { + if reaction.Type == domain.MessageReactionCustomEmoji { + return fmt.Sprintf("Custom emoji %d", reaction.DocumentID) + } + if reaction.Emoticon != "" { + return reaction.Emoticon + } + return "Reaction" +} + +func (r *Router) statsSnapshotGraph(key, label string, date, value int) tg.StatsGraphClass { now := int(r.clock.Now().Unix()) - return tg.StatsDateRangeDays{MinDate: now - 86400, MaxDate: now} + if date <= 0 || date >= now { + date = now - 1 + } + days := []domain.ChannelStatsDay{{Date: date}, {Date: now, Views: value, Reactions: value}} + return r.statsGraph(days, []statsGraphSeries{{ + Key: key, Label: label, Color: statsGraphColors[0], + Value: func(day domain.ChannelStatsDay) int { + if key == "views" { + return day.Views + } + return day.Reactions + }, + }}) } -func (r *Router) emptyStatsGraph(label string) *tg.StatsGraph { - nowMillis := r.clock.Now().UnixMilli() - prevMillis := nowMillis - 86400000 - data := fmt.Sprintf( - `{"columns":[["x",%d,%d],["y0",0,0]],"types":{"x":"x","y0":"line"},"names":{"y0":%q},"colors":{"y0":"blue#4a90e2"}}`, - prevMillis, - nowMillis, - label, - ) - return &tg.StatsGraph{JSON: tg.DataJSON{Data: data}} +func (r *Router) statsReactionSnapshotGraph(date int, counts []domain.ChannelMessageReactionCount) tg.StatsGraphClass { + now := int(r.clock.Now().Unix()) + if date <= 0 || date >= now { + date = now - 1 + } + end := domain.ChannelStatsDay{Date: now} + for _, item := range counts { + end.Reactions += item.Count + end.ByReaction = append(end.ByReaction, domain.StatsReactionCount{Reaction: item.Reaction, Count: item.Count}) + } + return r.statsReactionGraph([]domain.ChannelStatsDay{{Date: date}, end}) +} + +func statsGraphUnavailable() tg.StatsGraphClass { + return &tg.StatsGraphError{Error: "GRAPH_NOT_AVAILABLE"} +} + +func statsServiceErr(err error) error { + switch { + case errors.Is(err, domain.ErrMessageIDInvalid): + return messageIDInvalidErr() + case errors.Is(err, domain.ErrStatsOffsetInvalid): + return tgerr400("OFFSET_INVALID") + default: + return channelInvalidErr(err) + } } func emptyStatsPublicForwards() *tg.StatsPublicForwards { diff --git a/internal/rpc/stats_real_rpc_test.go b/internal/rpc/stats_real_rpc_test.go new file mode 100644 index 00000000..ff2aed3b --- /dev/null +++ b/internal/rpc/stats_real_rpc_test.go @@ -0,0 +1,133 @@ +package rpc + +import ( + "context" + "encoding/json" + "testing" + "time" + + "github.com/iamxvbaba/td/tg" + "go.uber.org/zap/zaptest" + + appchannels "telesrv/internal/app/channels" + appusers "telesrv/internal/app/users" + "telesrv/internal/domain" + "telesrv/internal/store/memory" +) + +func TestStatsRPCProjectsRealGraphsAndPublicForwardPages(t *testing.T) { + ctx := context.Background() + const now = 1_700_611_200 + users := memory.NewUserStore() + owner, err := users.Create(ctx, domain.User{AccessHash: 901, Phone: "15550000901", FirstName: "Stats"}) + if err != nil { + t.Fatalf("create owner: %v", err) + } + channels := memory.NewChannelStore() + source, err := channels.CreateChannel(ctx, domain.CreateChannelRequest{ + CreatorUserID: owner.ID, Title: "stats source", Broadcast: true, Date: now - 100, + }) + if err != nil { + t.Fatalf("create source: %v", err) + } + post, err := channels.SendChannelMessage(ctx, domain.SendChannelMessageRequest{ + UserID: owner.ID, ChannelID: source.Channel.ID, RandomID: 1, Message: "post", Date: now - 90, + }) + if err != nil { + t.Fatalf("send post: %v", err) + } + if _, err := channels.GetChannelMessageViews(ctx, domain.ChannelMessageViewsRequest{ + UserID: owner.ID, ChannelID: source.Channel.ID, IDs: []int{post.Message.ID}, Increment: true, Date: now - 80, + }); err != nil { + t.Fatalf("increment post view: %v", err) + } + if _, err := channels.SetChannelMessageReactions(ctx, domain.SetChannelMessageReactionsRequest{ + UserID: owner.ID, ChannelID: source.Channel.ID, MessageID: post.Message.ID, + Reactions: []domain.MessageReaction{{Type: domain.MessageReactionEmoji, Emoticon: "🔥"}}, Date: now - 70, + }); err != nil { + t.Fatalf("react to post: %v", err) + } + destinationCreated, err := channels.CreateChannel(ctx, domain.CreateChannelRequest{ + CreatorUserID: owner.ID, Title: "public destination", Broadcast: true, Date: now - 60, + }) + if err != nil { + t.Fatalf("create destination: %v", err) + } + destination, err := channels.UpdateUsername(ctx, domain.UpdateChannelUsernameRequest{ + UserID: owner.ID, ChannelID: destinationCreated.Channel.ID, Username: "stats_rpc_forward", + }) + if err != nil { + t.Fatalf("make destination public: %v", err) + } + forward := &domain.MessageForward{ + From: domain.Peer{Type: domain.PeerTypeChannel, ID: source.Channel.ID}, Date: post.Message.Date, ChannelPost: post.Message.ID, + } + for i := 0; i < 2; i++ { + if _, err := channels.SendChannelMessage(ctx, domain.SendChannelMessageRequest{ + UserID: owner.ID, ChannelID: destination.ID, RandomID: int64(10 + i), Message: "forward", Forward: forward, Date: now - 50 + i, + }); err != nil { + t.Fatalf("send forward %d: %v", i, err) + } + } + r := New(Config{}, Deps{ + Users: appusers.NewService(users), Channels: appchannels.NewService(channels), + }, zaptest.NewLogger(t), fixedClock{now: time.Unix(now, 0)}) + requestCtx := WithUserID(ctx, owner.ID) + inputSource := &tg.InputChannel{ChannelID: source.Channel.ID, AccessHash: source.Channel.AccessHash} + + broadcast, err := r.onStatsGetBroadcastStats(requestCtx, &tg.StatsGetBroadcastStatsRequest{Channel: inputSource}) + if err != nil { + t.Fatalf("get broadcast stats: %v", err) + } + if broadcast.Followers.Current != 1 || broadcast.ViewsPerPost.Current != 1 || + broadcast.SharesPerPost.Current != 2 || broadcast.ReactionsPerPost.Current != 1 { + t.Fatalf("broadcast metrics = %+v, want real durable values", broadcast) + } + graph, ok := broadcast.InteractionsGraph.(*tg.StatsGraph) + if !ok { + t.Fatalf("interactions graph = %T, want *tg.StatsGraph", broadcast.InteractionsGraph) + } + var payload struct { + Columns [][]any `json:"columns"` + Colors map[string]string `json:"colors"` + } + if err := json.Unmarshal([]byte(graph.JSON.Data), &payload); err != nil { + t.Fatalf("decode interactions graph: %v (%s)", err, graph.JSON.Data) + } + if len(payload.Columns) != 3 || payload.Colors["y0"] != "#4A90E2" { + t.Fatalf("interactions graph payload = %+v", payload) + } + if _, ok := broadcast.LanguagesGraph.(*tg.StatsGraphError); !ok { + t.Fatalf("unsupported language graph = %T, want explicit statsGraphError", broadcast.LanguagesGraph) + } + + messageStats, err := r.onStatsGetMessageStats(requestCtx, &tg.StatsGetMessageStatsRequest{ + Channel: inputSource, MsgID: post.Message.ID, + }) + if err != nil { + t.Fatalf("get message stats: %v", err) + } + if _, ok := messageStats.ViewsGraph.(*tg.StatsGraph); !ok { + t.Fatalf("message views graph = %T, want real statsGraph", messageStats.ViewsGraph) + } + + first, err := r.onStatsGetMessagePublicForwards(requestCtx, &tg.StatsGetMessagePublicForwardsRequest{ + Channel: inputSource, MsgID: post.Message.ID, Limit: 1, + }) + if err != nil { + t.Fatalf("get first public forwards page: %v", err) + } + next, ok := first.GetNextOffset() + if first.Count != 2 || len(first.Forwards) != 1 || !ok || next == "" || len(first.Chats) != 1 { + t.Fatalf("first public forwards page = %+v", first) + } + second, err := r.onStatsGetMessagePublicForwards(requestCtx, &tg.StatsGetMessagePublicForwardsRequest{ + Channel: inputSource, MsgID: post.Message.ID, Offset: next, Limit: 1, + }) + if err != nil { + t.Fatalf("get second public forwards page: %v", err) + } + if second.Count != 2 || len(second.Forwards) != 1 { + t.Fatalf("second public forwards page = %+v", second) + } +} diff --git a/internal/rpc/stickers.go b/internal/rpc/stickers.go index d2ced196..56543c21 100644 --- a/internal/rpc/stickers.go +++ b/internal/rpc/stickers.go @@ -67,7 +67,7 @@ func (r *Router) onMessagesGetAvailableEffects(ctx context.Context, hash int) (t } func (r *Router) onMessagesGetStickerSet(ctx context.Context, req *tg.MessagesGetStickerSetRequest) (tg.MessagesStickerSetClass, error) { - if r.deps.Files == nil { + if req == nil || r.deps.Files == nil { return tdesktop.StickerSet(req), nil } ref, ok := stickerSetRefFromInput(req.Stickerset) @@ -87,29 +87,33 @@ func (r *Router) onMessagesGetStickerSet(ctx context.Context, req *tg.MessagesGe zap.Int64("set_id", ref.ID), zap.String("system_key", ref.SystemKey), zap.Bool("found", found), + zap.Int("request_hash", req.Hash), ) } if !found { if fallbackSet, fallbackDocs, fallbackFound, fallbackErr := r.resolvePlaceholderStickerSet(ctx, ref); fallbackErr != nil { return nil, internalErr() } else if fallbackFound { - fallbackSet, fallbackErr = r.stickerSetWithViewerInstallState(ctx, fallbackSet) - if fallbackErr != nil { - return nil, fallbackErr - } if r.log != nil { r.log.Debug("getStickerSet placeholder fallback", zap.String("short_name", ref.ShortName), zap.Int64("fallback_set_id", fallbackSet.ID), zap.String("fallback_short_name", fallbackSet.ShortName), zap.Int("documents", len(fallbackDocs)), + zap.Int("response_hash", fallbackSet.Hash), ) } + if req.Hash != 0 && req.Hash == fallbackSet.Hash { + return &tg.MessagesStickerSetNotModified{}, nil + } return tgMessagesStickerSet(fallbackSet, fallbackDocs), nil } // 未 seed 的系统集 / 未知短名：回退兼容 stub，避免破坏客户端。 return tdesktop.StickerSet(req), nil } + if req.Hash != 0 && req.Hash == set.Hash { + return &tg.MessagesStickerSetNotModified{}, nil + } set, err = r.stickerSetWithViewerInstallState(ctx, set) if err != nil { return nil, err @@ -118,7 +122,8 @@ func (r *Router) onMessagesGetStickerSet(ctx context.Context, req *tg.MessagesGe } func (r *Router) resolvePlaceholderStickerSet(ctx context.Context, ref domain.StickerSetRef) (domain.StickerSet, []domain.Document, bool, error) { - if ref.Kind != domain.StickerSetRefByShortName || !isClientPlaceholderStickerSet(ref.ShortName) { + placeholder, ok := clientPlaceholderStickerSet(ref) + if !ok { return domain.StickerSet{}, nil, false, nil } for _, candidate := range placeholderStickerSetCandidates() { @@ -129,54 +134,130 @@ func (r *Router) resolvePlaceholderStickerSet(ctx context.Context, ref domain.St } continue } - if len(docs) >= androidPlaceholderStickerMinDocuments { - return set, docs, true, nil - } - } - for _, kind := range []domain.StickerSetKind{domain.StickerSetKindSystem, domain.StickerSetKindEmoji, domain.StickerSetKindStickers} { - sets, err := r.deps.Files.ListStickerSets(ctx, kind) - if err != nil { - return domain.StickerSet{}, nil, false, err - } - for _, candidate := range sets { - if len(candidate.DocumentIDs) < androidPlaceholderStickerMinDocuments { - continue - } - set, docs, found, err := r.deps.Files.ResolveStickerSet(ctx, domain.StickerSetRef{ - Kind: domain.StickerSetRefByID, - ID: candidate.ID, - AccessHash: candidate.AccessHash, - }) - if err != nil { - return domain.StickerSet{}, nil, false, err - } - if found && len(docs) >= androidPlaceholderStickerMinDocuments { - return set, docs, true, nil + if len(docs) >= androidPlaceholderStickerDocumentLimit { + projectedSet, projectedDocs := projectClientPlaceholderStickerSet(placeholder, set, docs) + if len(projectedDocs) == androidPlaceholderStickerDocumentLimit { + return projectedSet, projectedDocs, true, nil } } } return domain.StickerSet{}, nil, false, nil } -const androidPlaceholderStickerMinDocuments = 7 +const androidPlaceholderStickerDocumentLimit = 7 -func isClientPlaceholderStickerSet(shortName string) bool { - switch shortName { - case "tg_placeholders_android", "tg_superplaceholders_android_2": - return true - default: - return false +// Android 的两个内建 placeholder 名称没有独立 seed。兼容投影使用稳定的独立 +// identity，避免复用 AnimatedEmoji 的 set id/hash 后与真正的 598 文档缓存互相覆盖。 +var clientPlaceholderStickerSets = []domain.StickerSet{ + { + ID: 7_776_100_000_000_001, + AccessHash: 7_776_100_000_000_101, + ShortName: "tg_placeholders_android", + Title: "Android Placeholders", + Kind: domain.StickerSetKindSystem, + Official: true, + }, + { + ID: 7_776_100_000_000_002, + AccessHash: 7_776_100_000_000_102, + ShortName: "tg_superplaceholders_android_2", + Title: "Android Super Placeholders", + Kind: domain.StickerSetKindSystem, + Official: true, + }, +} + +func clientPlaceholderStickerSet(ref domain.StickerSetRef) (domain.StickerSet, bool) { + for _, set := range clientPlaceholderStickerSets { + switch ref.Kind { + case domain.StickerSetRefByShortName: + if ref.ShortName == set.ShortName { + return set, true + } + case domain.StickerSetRefByID: + if ref.ID == set.ID && ref.AccessHash == set.AccessHash { + return set, true + } + } } + return domain.StickerSet{}, false +} + +func projectClientPlaceholderStickerSet(placeholder, source domain.StickerSet, docs []domain.Document) (domain.StickerSet, []domain.Document) { + docByID := documentsByID(docs) + selectedDocs := make([]domain.Document, 0, androidPlaceholderStickerDocumentLimit) + selectedIDs := make([]int64, 0, androidPlaceholderStickerDocumentLimit) + selected := make(map[int64]struct{}, androidPlaceholderStickerDocumentLimit) + for _, id := range source.DocumentIDs { + if len(selectedDocs) == androidPlaceholderStickerDocumentLimit { + break + } + doc, found := docByID[id] + if !found { + continue + } + if _, duplicate := selected[id]; duplicate { + continue + } + selected[id] = struct{}{} + selectedIDs = append(selectedIDs, id) + selectedDocs = append(selectedDocs, doc) + } + + placeholder.Animated = source.Animated + placeholder.Videos = source.Videos + placeholder.Emojis = source.Emojis + placeholder.TextColor = source.TextColor + placeholder.Count = len(selectedIDs) + placeholder.DocumentIDs = selectedIDs + placeholder.Hash = projectedStickerSetHash(selectedIDs) + placeholder.Packs = filterStickerPacks(source.Packs, selected) + placeholder.Keywords = filterStickerKeywords(source.Keywords, selected) + return placeholder, selectedDocs +} + +func projectedStickerSetHash(ids []int64) int { + hash := int(tdesktopCountHash(ids) & 0x7fffffff) + if hash == 0 && len(ids) > 0 { + return 1 + } + return hash +} + +func filterStickerPacks(packs []domain.StickerPack, selected map[int64]struct{}) []domain.StickerPack { + out := make([]domain.StickerPack, 0, len(packs)) + for _, pack := range packs { + filtered := domain.StickerPack{Emoticon: pack.Emoticon} + for _, id := range pack.DocumentIDs { + if _, ok := selected[id]; ok { + filtered.DocumentIDs = append(filtered.DocumentIDs, id) + } + } + if len(filtered.DocumentIDs) > 0 { + out = append(out, filtered) + } + } + return out +} + +func filterStickerKeywords(keywords []domain.StickerKeyword, selected map[int64]struct{}) []domain.StickerKeyword { + out := make([]domain.StickerKeyword, 0, len(keywords)) + for _, keyword := range keywords { + if _, ok := selected[keyword.DocumentID]; ok { + out = append(out, keyword) + } + } + return out } func placeholderStickerSetCandidates() []domain.StickerSetRef { return []domain.StickerSetRef{ - {Kind: domain.StickerSetRefBySystem, SystemKey: "animated_emoji"}, {Kind: domain.StickerSetRefBySystem, SystemKey: "emoji_generic_animations"}, {Kind: domain.StickerSetRefBySystem, SystemKey: "animated_emoji_animations"}, - {Kind: domain.StickerSetRefByShortName, ShortName: "AnimatedEmojies"}, {Kind: domain.StickerSetRefByShortName, ShortName: "EmojiGenericAnimations"}, {Kind: domain.StickerSetRefByShortName, ShortName: "EmojiAnimations"}, + {Kind: domain.StickerSetRefBySystem, SystemKey: "animated_emoji"}, + {Kind: domain.StickerSetRefByShortName, ShortName: "AnimatedEmojies"}, } } diff --git a/internal/rpc/stickers_emoji_index.go b/internal/rpc/stickers_emoji_index.go index b07813b6..9cfee66d 100644 --- a/internal/rpc/stickers_emoji_index.go +++ b/internal/rpc/stickers_emoji_index.go @@ -21,6 +21,12 @@ const ( emojiStickerIndexTTL = 5 * time.Minute // maxStickersPerEmoji 限制单个 emoji 返回的贴纸数。 maxStickersPerEmoji = 100 + // maxGreetingStickers 限制官方客户端 greeting 类别的启动预取集合。普通 👋 + // 搜索仍保留完整结果；特殊 👋⭐ 类别只取不同贴纸集的代表项，避免客户端每次 + // 启动在几十个普通 wave pack 之间随机命中并逐步下载整个目录。 + maxGreetingStickers = 12 + // greetingStickerCategoryKey 是去掉 variation selector 后的官方 greeting 标记。 + greetingStickerCategoryKey = "👋⭐" ) // emojiStickerIndex 是 emoji→贴纸文档 id 的 TTL 缓存索引。 @@ -76,7 +82,8 @@ func normalizeStickerEmoticon(e string) string { // normalizeStickerSearchEmoticon 解析官方客户端通过 messages.getStickers // 传递的特殊贴纸类别标记。TDesktop、DrKLO Android 与 Telegram-iOS 都使用 // wave+star 获取 greeting、double-star 获取 premium preview、folder+star 获取 -// premium/cloud catalog；它们不是普通复合 emoji，需先映射到 seed pack 的基础键。 +// premium/cloud catalog；它们不是普通复合 emoji。greeting 在索引中维护独立的 +// 有界代表集合，另外两个类别仍映射到 seed pack 的基础键。 // // 只匹配这三个完整标记，不能把任意复合 emoji 拆分成单个 emoji，否则会改变普通 // sticker search 的精确匹配语义。先去掉 variation selector，可同时接纳三端的 @@ -84,8 +91,8 @@ func normalizeStickerEmoticon(e string) string { func normalizeStickerSearchEmoticon(e string) string { e = normalizeStickerEmoticon(e) switch e { - case "👋⭐": - return "👋" + case greetingStickerCategoryKey: + return greetingStickerCategoryKey case "⭐⭐": return "⭐" case "📂⭐": @@ -99,11 +106,16 @@ func (r *Router) onMessagesGetStickers(ctx context.Context, req *tg.MessagesGetS if req == nil || r.deps.Files == nil || r.emojiStickers == nil { return &tg.MessagesStickers{Hash: 0, Stickers: []tg.DocumentClass{}}, nil } - docIDs := r.emojiStickers.lookup(normalizeStickerSearchEmoticon(req.Emoticon), func() map[string][]int64 { + searchKey := normalizeStickerSearchEmoticon(req.Emoticon) + docIDs := r.emojiStickers.lookup(searchKey, func() map[string][]int64 { return r.buildEmojiStickerIndex(ctx) }) - if len(docIDs) > maxStickersPerEmoji { - docIDs = docIDs[:maxStickersPerEmoji] + limit := maxStickersPerEmoji + if searchKey == greetingStickerCategoryKey { + limit = maxGreetingStickers + } + if len(docIDs) > limit { + docIDs = docIDs[:limit] } catalogHash := int64(tdesktopCountHash(docIDs)) if req.Hash != 0 && req.Hash == catalogHash { @@ -144,6 +156,7 @@ func (r *Router) buildEmojiStickerIndex(ctx context.Context) map[string][]int64 if s.Archived { continue } + greetingAdded := false for _, pack := range s.Packs { key := normalizeStickerEmoticon(pack.Emoticon) if key == "" { @@ -164,6 +177,28 @@ func (r *Router) buildEmojiStickerIndex(ctx context.Context) map[string][]int64 dedup[id] = struct{}{} byEmoji[key] = append(byEmoji[key], id) } + // greeting 是客户端启动预取目录，不等同于普通 👋 搜索。每个贴纸集 + // 只放一个代表项，随后在响应边界再限制总数；这样既保留多样性，也 + // 不会把所有普通 wave sticker 暴露为启动资源候选。 + if key == "👋" && !greetingAdded { + greetingSeen := seen[greetingStickerCategoryKey] + if greetingSeen == nil { + greetingSeen = make(map[int64]struct{}) + seen[greetingStickerCategoryKey] = greetingSeen + } + for _, id := range pack.DocumentIDs { + if id == 0 { + continue + } + if _, ok := greetingSeen[id]; ok { + continue + } + greetingSeen[id] = struct{}{} + byEmoji[greetingStickerCategoryKey] = append(byEmoji[greetingStickerCategoryKey], id) + greetingAdded = true + break + } + } } } return byEmoji diff --git a/internal/rpc/stickers_emoji_index_test.go b/internal/rpc/stickers_emoji_index_test.go index 1a7f4234..a4e3eb7f 100644 --- a/internal/rpc/stickers_emoji_index_test.go +++ b/internal/rpc/stickers_emoji_index_test.go @@ -152,6 +152,64 @@ func TestMessagesGetStickersSpecialCategories(t *testing.T) { } } +// TestMessagesGetStickersGreetingCategoryIsBounded 固定 greeting 与普通 👋 搜索的 +// 边界：每个贴纸集只贡献一个 greeting 代表项，且启动预取目录总数有界；普通搜索 +// 不受影响，避免为了优化启动资源而缩窄用户主动搜索结果。 +func TestMessagesGetStickersGreetingCategoryIsBounded(t *testing.T) { + docs := make(map[int64]domain.Document) + sets := make([]domain.StickerSet, 0, maxGreetingStickers+4) + for i := 0; i < maxGreetingStickers+4; i++ { + first := int64(10_000 + i*2) + second := first + 1 + docs[first] = domain.Document{ID: first, AccessHash: first + 100_000, DCID: 2} + docs[second] = domain.Document{ID: second, AccessHash: second + 100_000, DCID: 2} + sets = append(sets, domain.StickerSet{ + ID: int64(1_000 + i), + Kind: domain.StickerSetKindStickers, + DocumentIDs: []int64{first, second}, + Packs: []domain.StickerPack{{ + Emoticon: "👋", + DocumentIDs: []int64{first, second}, + }}, + }) + } + r := New(Config{}, Deps{Files: &fakeFiles{ + docs: docs, + sets: map[domain.StickerSetKind][]domain.StickerSet{ + domain.StickerSetKindStickers: sets, + }, + }}, zaptest.NewLogger(t), clock.System) + ctx := WithUserID(context.Background(), 1000000001) + + greeting := mustStickers(t, r, ctx, "👋⭐️", 0).(*tg.MessagesStickers) + greetingIDs := stickerDocIDs(t, greeting) + if len(greetingIDs) != maxGreetingStickers { + t.Fatalf("greeting documents = %d, want bounded %d", len(greetingIDs), maxGreetingStickers) + } + for i, id := range greetingIDs { + want := int64(10_000 + i*2) + if id != want { + t.Fatalf("greeting document[%d] = %d, want per-set representative %d", i, id, want) + } + } + + wave := mustStickers(t, r, ctx, "👋", 0).(*tg.MessagesStickers) + if got, want := len(stickerDocIDs(t, wave)), (maxGreetingStickers+4)*2; got != want { + t.Fatalf("ordinary wave search documents = %d, want full %d", got, want) + } + if greeting.Hash == 0 || greeting.Hash == wave.Hash { + t.Fatalf("greeting/wave hashes = %d/%d, want independent non-zero catalogs", greeting.Hash, wave.Hash) + } + if cached, err := r.onMessagesGetStickers(ctx, &tg.MessagesGetStickersRequest{ + Emoticon: "👋⭐", + Hash: greeting.Hash, + }); err != nil { + t.Fatalf("get bounded greeting with hash: %v", err) + } else if _, ok := cached.(*tg.MessagesStickersNotModified); !ok { + t.Fatalf("bounded greeting matching hash = %T, want NotModified", cached) + } +} + func mustStickers(t *testing.T, r *Router, ctx context.Context, emoticon string, hash int64) tg.MessagesStickersClass { t.Helper() res, err := r.onMessagesGetStickers(ctx, &tg.MessagesGetStickersRequest{Emoticon: emoticon, Hash: hash}) diff --git a/internal/rpc/stickers_test.go b/internal/rpc/stickers_test.go index be66a173..a88cf6fc 100644 --- a/internal/rpc/stickers_test.go +++ b/internal/rpc/stickers_test.go @@ -173,8 +173,8 @@ func TestAccountGetDefaultEmojiStatusesFallsBackWhenUnseeded(t *testing.T) { func TestMessagesGetStickerSetAndroidPlaceholderUsesSeededSet(t *testing.T) { ctx := context.Background() docs := make(map[int64]domain.Document) - documentIDs := make([]int64, 0, androidPlaceholderStickerMinDocuments) - for i := 0; i < androidPlaceholderStickerMinDocuments; i++ { + documentIDs := make([]int64, 0, androidPlaceholderStickerDocumentLimit+3) + for i := 0; i < androidPlaceholderStickerDocumentLimit+3; i++ { id := int64(100 + i) documentIDs = append(documentIDs, id) docs[id] = domain.Document{ID: id, AccessHash: id + 1000, DCID: 2} @@ -194,6 +194,11 @@ func TestMessagesGetStickerSetAndroidPlaceholderUsesSeededSet(t *testing.T) { Count: len(documentIDs), Hash: 12345, DocumentIDs: documentIDs, + Packs: []domain.StickerPack{{ + Emoticon: "🙂", + DocumentIDs: append([]int64(nil), documentIDs...), + }}, + Keywords: []domain.StickerKeyword{{DocumentID: documentIDs[0], Keywords: []string{"placeholder"}}}, }, }, }, @@ -210,15 +215,41 @@ func TestMessagesGetStickerSetAndroidPlaceholderUsesSeededSet(t *testing.T) { if !ok { t.Fatalf("getStickerSet placeholder = %T, want *tg.MessagesStickerSet", res) } - if full.Set.ID != 77 { - t.Fatalf("placeholder fallback set id = %d, want 77", full.Set.ID) + if full.Set.ID == 77 || full.Set.ShortName != "tg_placeholders_android" { + t.Fatalf("placeholder projection identity = %d/%q, want independent tg_placeholders_android", full.Set.ID, full.Set.ShortName) } - if len(full.Documents) < androidPlaceholderStickerMinDocuments { - t.Fatalf("placeholder fallback documents = %d, want >= %d", len(full.Documents), androidPlaceholderStickerMinDocuments) + if len(full.Documents) != androidPlaceholderStickerDocumentLimit || full.Set.Count != androidPlaceholderStickerDocumentLimit { + t.Fatalf("placeholder projection documents/count = %d/%d, want exactly %d", len(full.Documents), full.Set.Count, androidPlaceholderStickerDocumentLimit) + } + if full.Set.Hash == 0 || len(full.Packs) != 1 || len(full.Packs[0].Documents) != androidPlaceholderStickerDocumentLimit { + t.Fatalf("placeholder projection hash/packs = %d/%+v", full.Set.Hash, full.Packs) + } + if got := files.sets[domain.StickerSetKindSystem][0]; len(got.DocumentIDs) != androidPlaceholderStickerDocumentLimit+3 || got.ID != 77 { + t.Fatalf("source set mutated by projection: id=%d docs=%d", got.ID, len(got.DocumentIDs)) + } + + // 投影有独立 identity：客户端后续按返回的 id/access_hash 请求仍能解析，不会 + // 与真正的 AnimatedEmoji set id/hash 缓存互相覆盖。 + byID, err := r.onMessagesGetStickerSet(ctx, &tg.MessagesGetStickerSetRequest{ + Stickerset: &tg.InputStickerSetID{ID: full.Set.ID, AccessHash: full.Set.AccessHash}, + }) + if err != nil { + t.Fatalf("get placeholder projection by id: %v", err) + } + if byIDFull, ok := byID.(*tg.MessagesStickerSet); !ok || byIDFull.Set.ID != full.Set.ID || len(byIDFull.Documents) != androidPlaceholderStickerDocumentLimit { + t.Fatalf("placeholder projection by id = %T %+v", byID, byID) + } + if cached, err := r.onMessagesGetStickerSet(ctx, &tg.MessagesGetStickerSetRequest{ + Stickerset: &tg.InputStickerSetShortName{ShortName: "tg_placeholders_android"}, + Hash: full.Set.Hash, + }); err != nil { + t.Fatalf("get placeholder projection matching hash: %v", err) + } else if _, ok := cached.(*tg.MessagesStickerSetNotModified); !ok { + t.Fatalf("placeholder matching hash = %T, want NotModified", cached) } } -func TestMessagesGetStickerSetReturnsFullOnMatchingHash(t *testing.T) { +func TestMessagesGetStickerSetHonorsNonZeroHash(t *testing.T) { ctx := context.Background() files := &fakeFiles{ docs: map[int64]domain.Document{ @@ -248,12 +279,21 @@ func TestMessagesGetStickerSetReturnsFullOnMatchingHash(t *testing.T) { if err != nil { t.Fatalf("getStickerSet matching hash: %v", err) } - full, ok := res.(*tg.MessagesStickerSet) - if !ok { - t.Fatalf("getStickerSet matching hash = %T, want *tg.MessagesStickerSet", res) + if _, ok := res.(*tg.MessagesStickerSetNotModified); !ok { + t.Fatalf("getStickerSet matching hash = %T, want *tg.MessagesStickerSetNotModified", res) } - if full.Set.ID != 10 || len(full.Documents) != 1 { - t.Fatalf("getStickerSet matching hash returned set %d docs %d, want set 10 with one doc", full.Set.ID, len(full.Documents)) + + // hash=0 是强制完整响应，不能因为任何默认值或兼容 stub 返回 NotModified。 + fullResult, err := r.onMessagesGetStickerSet(ctx, &tg.MessagesGetStickerSetRequest{ + Stickerset: &tg.InputStickerSetID{ID: 10, AccessHash: 100}, + Hash: 0, + }) + if err != nil { + t.Fatalf("getStickerSet hash=0: %v", err) + } + full, ok := fullResult.(*tg.MessagesStickerSet) + if !ok || full.Set.ID != 10 || len(full.Documents) != 1 { + t.Fatalf("getStickerSet hash=0 = %T %+v, want set 10 with one doc", fullResult, fullResult) } } @@ -627,7 +667,7 @@ func TestTGDocumentCompactsCachedThumbToDownloadableSize(t *testing.T) { } } -func TestTGDocumentDropsSeedSyntheticTGSPreviewThumb(t *testing.T) { +func TestTGDocumentDoesNotApplySeedSpecificTGSPreviewFiltering(t *testing.T) { doc := tgDocument(domain.Document{ ID: 100, AccessHash: 1, @@ -641,8 +681,8 @@ func TestTGDocumentDropsSeedSyntheticTGSPreviewThumb(t *testing.T) { if !ok { t.Fatalf("tgDocument = %T, want *tg.Document", doc) } - if len(full.Thumbs) != 0 { - t.Fatalf("thumbs = %#v, want no synthetic TGS preview thumb", full.Thumbs) + if len(full.Thumbs) != 1 { + t.Fatalf("thumbs = %#v, want domain metadata preserved without seed-specific filtering", full.Thumbs) } } @@ -709,6 +749,9 @@ func TestMessagesGetCustomEmojiDocumentsUsesDomainIDs(t *testing.T) { AccessHash: 1, DCID: 2, MimeType: "application/x-tgsticker", + Thumbs: []domain.PhotoSize{{ + Kind: domain.PhotoSizeKindCached, Type: "m", W: 128, H: 128, Bytes: []byte("png"), + }}, }, }, }}} @@ -727,4 +770,11 @@ func TestMessagesGetCustomEmojiDocumentsUsesDomainIDs(t *testing.T) { if doc.ID != documentID { t.Fatalf("doc id = %d, want %d", doc.ID, documentID) } + if len(doc.Thumbs) != 1 { + t.Fatalf("doc thumbs = %#v, want one downloadable preview", doc.Thumbs) + } + thumb, ok := doc.Thumbs[0].(*tg.PhotoSize) + if !ok || thumb.Type != "m" || thumb.W != 128 || thumb.H != 128 || thumb.Size != 3 { + t.Fatalf("doc thumb = %#v, want downloadable m 128x128 size=3", doc.Thumbs[0]) + } } diff --git a/internal/rpc/stories.go b/internal/rpc/stories.go index 1dfb5970..5ede1ac3 100644 --- a/internal/rpc/stories.go +++ b/internal/rpc/stories.go @@ -12,6 +12,7 @@ import ( "github.com/iamxvbaba/td/tg" "github.com/iamxvbaba/td/tgerr" + "go.uber.org/zap" "github.com/iamxvbaba/td/tlprofile" "telesrv/internal/compat/tdesktop" @@ -2800,10 +2801,15 @@ func (r *Router) onStoriesSendReaction(ctx context.Context, req *tg.StoriesSendR if err != nil { return nil, internalErr() } - if updates := r.BuildOutboxUpdates(ctx, []OutboxUpdateRequest{{ + updates, buildErr := r.BuildOutboxUpdates(ctx, []OutboxUpdateRequest{{ TargetUserID: ownerUserID, Event: event, - }}); len(updates) == 1 && updates[0] != nil { + }}) + if buildErr != nil { + r.log.Error("build story reaction outbox update", + zap.Int64("viewer_user_id", ownerUserID), + zap.Error(buildErr)) + } else if len(updates) == 1 && updates[0] != nil { r.pushUserUpdatesIfNoReliableDispatch(ctx, ownerUserID, updates[0]) } } diff --git a/internal/rpc/stories_rpc_test.go b/internal/rpc/stories_rpc_test.go index 4a72555e..c058d68d 100644 --- a/internal/rpc/stories_rpc_test.go +++ b/internal/rpc/stories_rpc_test.go @@ -445,6 +445,9 @@ func TestStoriesReadStoriesRecordsDifferenceUpdate(t *testing.T) { r := New(Config{}, Deps{ Stories: appstories.NewService(storyStore), Updates: appupdates.NewService(memory.NewUpdateStateStore(), updateStore), + Users: mapUsersService{users: map[int64]domain.User{ + owner.ID: {ID: owner.ID, FirstName: "Owner"}, + }}, }, zaptest.NewLogger(t), fixedClock{now: time.Unix(1700000100, 0)}) readCtx := WithSessionID(WithAuthKeyID(WithUserID(ctx, 1000000002), authKeyID), 77) @@ -617,6 +620,9 @@ func TestStoriesReadStoriesClampsFutureMaxID(t *testing.T) { r := New(Config{}, Deps{ Stories: appstories.NewService(storyStore), Updates: appupdates.NewService(memory.NewUpdateStateStore(), memory.NewUpdateEventStore()), + Users: mapUsersService{users: map[int64]domain.User{ + owner.ID: {ID: owner.ID, FirstName: "Owner"}, + }}, }, zaptest.NewLogger(t), fixedClock{now: time.Unix(1700000100, 0)}) readCtx := WithSessionID(WithAuthKeyID(WithUserID(ctx, 1000000002), authKeyID), 88) diff --git a/internal/rpc/story_peer_projection.go b/internal/rpc/story_peer_projection.go index 701cb4ea..079e0858 100644 --- a/internal/rpc/story_peer_projection.go +++ b/internal/rpc/story_peer_projection.go @@ -112,18 +112,21 @@ func (r *Router) tgResolvedChannelPeerWithStories(ctx context.Context, viewerUse } func (r *Router) tgGlobalChannelMessages(ctx context.Context, viewerUserID int64, history domain.ChannelHistory) tg.MessagesMessagesClass { + r.maybeEnqueueExpiredChannelWebPageResolves(viewerUserID, history.Messages) out := tgGlobalChannelMessages(viewerUserID, history) r.applyPeerReadModelsToMessages(ctx, viewerUserID, out) return out } func (r *Router) tgMessagesMessages(ctx context.Context, viewerUserID int64, list domain.MessageList) tg.MessagesMessagesClass { + r.maybeEnqueueExpiredPrivateWebPageResolves(list.Messages) out := tgMessagesMessages(viewerUserID, list) r.applyPeerReadModelsToMessages(ctx, viewerUserID, out) return out } func (r *Router) tgChannelHistoryMessages(ctx context.Context, viewerUserID int64, history domain.ChannelHistory) tg.MessagesMessagesClass { + r.maybeEnqueueExpiredChannelWebPageResolves(viewerUserID, history.Messages) out := tgChannelHistoryMessages(viewerUserID, history) if linked, ok := r.linkedDiscussionChat(ctx, viewerUserID, history.Channel.ID); ok { switch value := out.(type) { @@ -173,6 +176,8 @@ func (r *Router) applyStoryMaxIDsToMessageReactionsList(ctx context.Context, vie } func (r *Router) tgGlobalSearchMessages(ctx context.Context, viewerUserID int64, limit int, private domain.MessageList, channel domain.ChannelHistory) tg.MessagesMessagesClass { + r.maybeEnqueueExpiredPrivateWebPageResolves(private.Messages) + r.maybeEnqueueExpiredChannelWebPageResolves(viewerUserID, channel.Messages) out := tgGlobalSearchMessages(viewerUserID, limit, private, channel) r.applyPeerReadModelsToMessages(ctx, viewerUserID, out) return out @@ -248,10 +253,14 @@ func (r *Router) withStoryUpdatePeerObjects(ctx context.Context, viewerUserID in // BuildOutboxUpdates' claim-wide pass. This avoids turning story events into an // extra username-registry query per event before the final batch projection. func (r *Router) withStoryUpdatePeerObjectsForOutbox(ctx context.Context, viewerUserID int64, updates *tg.Updates, peers ...domain.Peer) *tg.Updates { + return r.withStoryUpdatePeerObjectsForOutboxWithCache(ctx, viewerUserID, updates, newViewerPeerCache(r), peers...) +} + +func (r *Router) withStoryUpdatePeerObjectsForOutboxWithCache(ctx context.Context, viewerUserID int64, updates *tg.Updates, cache *viewerPeerCache, peers ...domain.Peer) *tg.Updates { if updates == nil { return nil } - users, channels := r.storyPeerObjects(ctx, viewerUserID, peers) + users, channels := r.storyPeerObjectsWithCache(ctx, viewerUserID, cache, peers) if len(users) > 0 { projected := tgUsersForViewer(viewerUserID, r.withUsersPresence(users)) updates.Users = appendUniqueTGUsers(updates.Users, projected...) @@ -391,6 +400,10 @@ func storyViewPeers(views []domain.StoryView) []domain.Peer { } func (r *Router) storyPeerObjects(ctx context.Context, viewerUserID int64, peers []domain.Peer) ([]domain.User, []domain.Channel) { + return r.storyPeerObjectsWithCache(ctx, viewerUserID, newViewerPeerCache(r), peers) +} + +func (r *Router) storyPeerObjectsWithCache(ctx context.Context, viewerUserID int64, cache *viewerPeerCache, peers []domain.Peer) ([]domain.User, []domain.Channel) { if viewerUserID == 0 || len(peers) == 0 { return nil, nil } @@ -408,7 +421,9 @@ func (r *Router) storyPeerObjects(ctx context.Context, viewerUserID int64, peers } } } - cache := newViewerPeerCache(r) + if cache == nil { + cache = newViewerPeerCache(r) + } return cache.usersForIDs(ctx, viewerUserID, mapKeys(userIDs)), cache.channelsForIDs(ctx, viewerUserID, mapKeys(channelIDs)) } @@ -545,8 +560,26 @@ func appendUniqueTGChats(base []tg.ChatClass, extra ...tg.ChatClass) []tg.ChatCl // helpers instead. func (r *Router) applyPeerReadModels(ctx context.Context, viewerUserID int64, users []tg.UserClass, chats []tg.ChatClass) { r.applyStoryMaxIDsToPeerObjects(ctx, viewerUserID, users, chats) - r.applyUsernamesToPeerObjects(ctx, users, chats) - r.applyBotVerificationIconsToPeerObjects(ctx, users, chats) + r.applyPeerIdentitiesToPeerObjects(ctx, users, chats) +} + +func (r *Router) applyPeerIdentitiesToPeerObjects(ctx context.Context, users []tg.UserClass, chats []tg.ChatClass) { + if len(users)+len(chats) == 0 || (r.deps.Usernames == nil && r.deps.BotVerifications == nil) { + return + } + peers := make([]domain.Peer, 0, len(users)+len(chats)) + seen := make(map[domain.Peer]struct{}, len(users)+len(chats)) + peers = appendUsernameProjectionPeers(peers, seen, users, chats) + if len(peers) == 0 { + return + } + usernames, verifications := r.peerIdentityMaps(ctx, peers, r.deps.Usernames != nil, r.deps.BotVerifications != nil) + if len(usernames) > 0 { + applyUsernamesFromRegistry(users, chats, usernames) + } + if len(verifications) > 0 { + applyBotVerificationIconsFromMap(users, chats, verifications) + } } func (r *Router) applyStoryMaxIDsToPeerObjects(ctx context.Context, viewerUserID int64, users []tg.UserClass, chats []tg.ChatClass) { @@ -566,7 +599,7 @@ func (r *Router) applyStoryMaxIDsToPeerObjects(ctx context.Context, viewerUserID peers = append(peers, peer) } for _, item := range users { - if u, ok := item.(*tg.User); ok { + if u, ok := item.(*tg.User); ok && u != nil && !u.Deleted { addPeer(domain.Peer{Type: domain.PeerTypeUser, ID: u.ID}) } } @@ -578,7 +611,7 @@ func (r *Router) applyStoryMaxIDsToPeerObjects(ctx context.Context, viewerUserID recent, hidden := r.storyProjectionMaps(ctx, viewerUserID, peers) for _, item := range users { u, ok := item.(*tg.User) - if !ok { + if !ok || u == nil || u.Deleted { continue } peer := domain.Peer{Type: domain.PeerTypeUser, ID: u.ID} diff --git a/internal/rpc/story_peer_projection_rpc_test.go b/internal/rpc/story_peer_projection_rpc_test.go index b97f5565..67f9376f 100644 --- a/internal/rpc/story_peer_projection_rpc_test.go +++ b/internal/rpc/story_peer_projection_rpc_test.go @@ -14,16 +14,19 @@ import ( appstories "telesrv/internal/app/stories" appusers "telesrv/internal/app/users" "telesrv/internal/domain" + "telesrv/internal/store" "telesrv/internal/store/memory" ) type countingStoriesService struct { StoriesService - maxIDCalls int - hiddenCalls int - projectionCalls int - pinnedAvailCalls int - pinnedStoriesCalls int + maxIDCalls int + hiddenCalls int + projectionCalls int + activeCandidateCalls int + hiddenSnapshotCalls int + pinnedAvailCalls int + pinnedStoriesCalls int } type blockingProjectionStoriesService struct { @@ -69,6 +72,16 @@ func (s *countingStoriesService) GetPeerStoryProjections(ctx context.Context, vi return s.StoriesService.GetPeerStoryProjections(ctx, viewerUserID, peers, now) } +func (s *countingStoriesService) ActiveStoryPeerExpirations(ctx context.Context, peers []domain.Peer, now int) (map[domain.Peer]int, error) { + s.activeCandidateCalls++ + return s.StoriesService.(storySparseProjectionProvider).ActiveStoryPeerExpirations(ctx, peers, now) +} + +func (s *countingStoriesService) ListHiddenStoryPeers(ctx context.Context, viewerUserID int64) ([]domain.Peer, error) { + s.hiddenSnapshotCalls++ + return s.StoriesService.(storySparseProjectionProvider).ListHiddenStoryPeers(ctx, viewerUserID) +} + func (s *countingStoriesService) HasPinnedStories(ctx context.Context, viewerUserID int64, peer domain.Peer, now int) (bool, error) { s.pinnedAvailCalls++ return s.StoriesService.HasPinnedStories(ctx, viewerUserID, peer, now) @@ -130,6 +143,43 @@ func TestUsersProjectStoriesMaxID(t *testing.T) { } } +func TestStorySparseProjectionAvoidsViewerPeerNegativeMatrix(t *testing.T) { + ctx := context.Background() + const viewerID int64 = 94001 + active := domain.Peer{Type: domain.PeerTypeUser, ID: 94002} + inactiveHidden := domain.Peer{Type: domain.PeerTypeChannel, ID: 94003} + storyStore := memory.NewStoryStore() + if _, err := storyStore.UpsertStory(ctx, domain.UpsertStoryRequest{Story: domain.Story{ + Owner: active, ID: 7, Date: 100, ExpireDate: 200, Public: true, + }}); err != nil { + t.Fatalf("upsert active story: %v", err) + } + if err := storyStore.SetPeerHidden(ctx, viewerID, inactiveHidden, true); err != nil { + t.Fatalf("hide inactive peer: %v", err) + } + service := &countingStoriesService{StoriesService: appstories.NewService(storyStore)} + versions := &fakeRPCReadModelVersions{hashes: map[store.ReadModelKey]int64{ + storyPeerVersionKey(active): 401, + storyPeerVersionKey(inactiveHidden): 402, + storyHiddenListVersionKey(viewerID): 403, + }} + r := New(Config{}, Deps{Stories: service, ReadModelVersions: versions}, zaptest.NewLogger(t), fixedClock{now: time.Unix(150, 0)}) + + for i := 0; i < 2; i++ { + recent, hidden := r.storyProjectionMaps(ctx, viewerID, []domain.Peer{active, inactiveHidden}) + if story, ok := recent[active]; !ok || story.MaxID != 7 { + t.Fatalf("recent(%d) = %+v, want active max id 7", i, recent) + } + if _, ok := recent[inactiveHidden]; ok || !hidden[inactiveHidden] { + t.Fatalf("inactive hidden projection(%d) recent=%+v hidden=%+v", i, recent, hidden) + } + } + if service.activeCandidateCalls != 1 || service.hiddenSnapshotCalls != 1 || service.projectionCalls != 1 { + t.Fatalf("sparse loads active=%d hidden=%d viewerProjection=%d, want 1/1/1", + service.activeCandidateCalls, service.hiddenSnapshotCalls, service.projectionCalls) + } +} + func TestUsersProjectStoriesHiddenWithoutActiveStory(t *testing.T) { ctx := context.Background() userStore := memory.NewUserStore() @@ -1275,7 +1325,7 @@ func TestBuildOutboxStoryUpdatesHydratesCompanionPeersWithStoriesMaxID(t *testin Usernames: registry, }, zaptest.NewLogger(t), fixedClock{now: time.Unix(1700000300, 0)}) - updates := r.BuildOutboxUpdates(ctx, []OutboxUpdateRequest{{ + updates, err := r.BuildOutboxUpdates(ctx, []OutboxUpdateRequest{{ TargetUserID: viewer.ID, Event: domain.UpdateEvent{ UserID: viewer.ID, @@ -1287,6 +1337,9 @@ func TestBuildOutboxStoryUpdatesHydratesCompanionPeersWithStoriesMaxID(t *testin Story: story, }, }}) + if err != nil { + t.Fatalf("BuildOutboxUpdates: %v", err) + } if len(updates) != 1 || updates[0] == nil { t.Fatalf("updates = %+v, want one story update", updates) } @@ -1333,7 +1386,7 @@ func TestBuildOutboxNewStoryReactionHydratesReactorUser(t *testing.T) { Stories: appstories.NewService(storyStore), }, zaptest.NewLogger(t), fixedClock{now: time.Unix(1700000310, 0)}) - updates := r.BuildOutboxUpdates(ctx, []OutboxUpdateRequest{{ + updates, err := r.BuildOutboxUpdates(ctx, []OutboxUpdateRequest{{ TargetUserID: owner.ID, Event: domain.UpdateEvent{ UserID: owner.ID, @@ -1347,6 +1400,9 @@ func TestBuildOutboxNewStoryReactionHydratesReactorUser(t *testing.T) { Reaction: &domain.MessageReaction{Type: domain.MessageReactionEmoji, Emoticon: "🔥"}, }, }}) + if err != nil { + t.Fatalf("BuildOutboxUpdates: %v", err) + } if len(updates) != 1 || updates[0] == nil { t.Fatalf("updates = %+v, want one new story reaction update", updates) } diff --git a/internal/rpc/story_projection_cache.go b/internal/rpc/story_projection_cache.go index 4a601464..e62c1623 100644 --- a/internal/rpc/story_projection_cache.go +++ b/internal/rpc/story_projection_cache.go @@ -8,6 +8,8 @@ import ( "time" "github.com/iamxvbaba/td/tg" + "go.uber.org/zap" + "golang.org/x/sync/errgroup" "golang.org/x/sync/singleflight" "telesrv/internal/domain" @@ -151,6 +153,46 @@ func (r *Router) storyProjectionMaps(ctx context.Context, viewerUserID int64, pe if r.deps.Stories == nil || viewerUserID == 0 || len(peers) == 0 { return nil, nil } + provider, sparse := r.deps.Stories.(storySparseProjectionProvider) + if sparse && r.storySparseProjectionCache != nil { + var ( + activePeers []domain.Peer + hiddenPeers hiddenStoryPeerSet + ) + now := int(r.clock.Now().Unix()) + g, gctx := errgroup.WithContext(ctx) + g.Go(func() error { + var err error + activePeers, err = r.storySparseProjectionCache.activePeers(gctx, provider, peers, now) + return err + }) + g.Go(func() error { + var err error + hiddenPeers, err = r.storySparseProjectionCache.hiddenPeers(gctx, provider, viewerUserID) + return err + }) + if err := g.Wait(); err == nil { + hidden := make(map[domain.Peer]bool, len(peers)) + for _, peer := range peers { + _, isHidden := hiddenPeers[peer] + hidden[peer] = isHidden + } + if len(activePeers) == 0 { + return map[domain.Peer]tg.RecentStory{}, hidden + } + if r.storyProjectionCache == nil { + recent, _ := r.storyProjectionFreshMaps(ctx, viewerUserID, activePeers) + return recent, hidden + } + recent, _ := r.storyProjectionCache.getMany(ctx, viewerUserID, activePeers, func(ctx context.Context, missPeers []domain.Peer) (map[domain.Peer]tg.RecentStory, map[domain.Peer]bool) { + return r.storyProjectionFreshMaps(ctx, viewerUserID, missPeers) + }) + return recent, hidden + } else { + r.log.Warn("story sparse projection read model failed; using authoritative projection", + zap.Int64("viewer_user_id", viewerUserID), zap.Int("peer_count", len(peers)), zap.Error(err)) + } + } if r.storyProjectionCache == nil { return r.storyProjectionFreshMaps(ctx, viewerUserID, peers) } @@ -190,6 +232,9 @@ func storyProjectionSingleflightKey(viewerUserID int64, peers []domain.Peer) str } func (r *Router) invalidateStoryProjectionCache(viewerUserID int64, peer domain.Peer) { + if r.storySparseProjectionCache != nil { + r.storySparseProjectionCache.DeleteViewer(viewerUserID) + } if r.storyProjectionCache != nil { r.storyProjectionCache.Delete(viewerUserID, peer) } @@ -202,6 +247,9 @@ func (r *Router) invalidateStoryProjectionCache(viewerUserID int64, peer domain. } func (r *Router) invalidateStoryProjectionCacheForViewer(viewerUserID int64) { + if r.storySparseProjectionCache != nil { + r.storySparseProjectionCache.DeleteViewer(viewerUserID) + } if r.storyProjectionCache != nil { r.storyProjectionCache.DeleteViewer(viewerUserID) } @@ -214,6 +262,9 @@ func (r *Router) invalidateStoryProjectionCacheForViewer(viewerUserID int64) { } func (r *Router) invalidateStoryProjectionCacheForPeer(peer domain.Peer) { + if r.storySparseProjectionCache != nil { + r.storySparseProjectionCache.DeletePeer(peer) + } if r.storyProjectionCache != nil { r.storyProjectionCache.DeletePeer(peer) } @@ -236,6 +287,9 @@ func (r *Router) InvalidateStoryReadModelPeer(peer domain.Peer) { } func (r *Router) FlushStoryReadModelCache() { + if r.storySparseProjectionCache != nil { + r.storySparseProjectionCache.Flush() + } if r.storyProjectionCache != nil { r.storyProjectionCache.Flush() } diff --git a/internal/rpc/story_sparse_projection_cache.go b/internal/rpc/story_sparse_projection_cache.go new file mode 100644 index 00000000..3073ab1b --- /dev/null +++ b/internal/rpc/story_sparse_projection_cache.go @@ -0,0 +1,216 @@ +package rpc + +import ( + "context" + "errors" + + appreadmodel "telesrv/internal/app/readmodel" + "telesrv/internal/domain" + "telesrv/internal/readmodelcache" + "telesrv/internal/store" +) + +const ( + defaultStoryActivePeerCacheMaxEntries = 1_000_000 + defaultStoryHiddenListCacheMaxEntries = 100_000 + defaultStoryHiddenListCacheMaxBytes = 64 << 20 + missingStoryReadModelHash = int64(-1) +) + +var errStorySparseProjectionUnavailable = errors.New("story sparse projection read model unavailable") + +type storySparseProjectionProvider interface { + ActiveStoryPeerExpirations(ctx context.Context, peers []domain.Peer, now int) (map[domain.Peer]int, error) + ListHiddenStoryPeers(ctx context.Context, viewerUserID int64) ([]domain.Peer, error) +} + +type activeStoryPeerFact struct { + maxExpireAt int +} + +type hiddenStoryPeerSet map[domain.Peer]struct{} + +// storySparseProjectionCache avoids a viewer×peer negative matrix. Active +// existence is shared by peer; hidden preferences are stored once per viewer. +type storySparseProjectionCache struct { + versions store.ReadModelVersionStore + active *readmodelcache.Cache[domain.Peer, activeStoryPeerFact] + hidden *readmodelcache.Cache[int64, hiddenStoryPeerSet] +} + +func newStorySparseProjectionCache( + versions store.ReadModelVersionStore, + activeMaxEntries int, + hiddenMaxEntries int, + hiddenMaxBytes int64, +) *storySparseProjectionCache { + if versions == nil { + return nil + } + if activeMaxEntries <= 0 { + activeMaxEntries = defaultStoryActivePeerCacheMaxEntries + } + if hiddenMaxEntries <= 0 { + hiddenMaxEntries = defaultStoryHiddenListCacheMaxEntries + } + if hiddenMaxBytes <= 0 { + hiddenMaxBytes = defaultStoryHiddenListCacheMaxBytes + } + return &storySparseProjectionCache{ + versions: versions, + active: readmodelcache.New[domain.Peer, activeStoryPeerFact](readmodelcache.Config[domain.Peer, activeStoryPeerFact]{ + MaxEntries: activeMaxEntries, + }), + hidden: readmodelcache.New[int64, hiddenStoryPeerSet](readmodelcache.Config[int64, hiddenStoryPeerSet]{ + MaxEntries: hiddenMaxEntries, + MaxWeight: hiddenMaxBytes, + Weight: func(value hiddenStoryPeerSet) int64 { + return 64 + int64(len(value))*32 + }, + Clone: cloneHiddenStoryPeerSet, + }), + } +} + +func (c *storySparseProjectionCache) activePeers( + ctx context.Context, + provider storySparseProjectionProvider, + peers []domain.Peer, + now int, +) ([]domain.Peer, error) { + if c == nil || c.versions == nil || c.active == nil || provider == nil { + return nil, errStorySparseProjectionUnavailable + } + peers = uniqueStoryProjectionPeers(peers) + if len(peers) == 0 { + return nil, nil + } + for _, peer := range peers { + if fact, ok := c.active.Peek(peer); ok && fact.maxExpireAt > 0 && fact.maxExpireAt <= now { + c.active.Invalidate(peer) + } + } + keys := make([]store.ReadModelKey, 0, len(peers)) + for _, peer := range peers { + keys = append(keys, store.ReadModelKey{ + Model: appreadmodel.ModelStoryPeer, PeerType: peer.Type, PeerID: peer.ID, + }) + } + hashes, err := c.versions.ReadModelHashes(ctx, keys) + if err != nil { + return nil, err + } + peerHashes := make(map[domain.Peer]int64, len(peers)) + for _, key := range keys { + hash := hashes[key] + if hash == 0 { + hash = missingStoryReadModelHash + } + peerHashes[domain.Peer{Type: key.PeerType, ID: key.PeerID}] = hash + } + values, err := c.active.GetOrLoadBatch(ctx, peers, + func(peer domain.Peer) (int64, bool) { return peerHashes[peer], true }, + func(ctx context.Context, missing []domain.Peer) (map[domain.Peer]activeStoryPeerFact, error) { + expirations, err := provider.ActiveStoryPeerExpirations(ctx, missing, now) + if err != nil { + return nil, err + } + out := make(map[domain.Peer]activeStoryPeerFact, len(missing)) + for _, peer := range missing { + out[peer] = activeStoryPeerFact{maxExpireAt: expirations[peer]} + } + return out, nil + }) + if err != nil { + return nil, err + } + out := make([]domain.Peer, 0, len(peers)) + for _, peer := range peers { + if values[peer].maxExpireAt > now { + out = append(out, peer) + } + } + return out, nil +} + +func (c *storySparseProjectionCache) hiddenPeers( + ctx context.Context, + provider storySparseProjectionProvider, + viewerUserID int64, +) (hiddenStoryPeerSet, error) { + if c == nil || c.versions == nil || c.hidden == nil || provider == nil || viewerUserID == 0 { + return nil, errStorySparseProjectionUnavailable + } + key := store.ReadModelKey{ + Model: appreadmodel.ModelStoryHiddenList, + OwnerUserID: viewerUserID, + PeerType: domain.PeerTypeUser, + PeerID: viewerUserID, + } + hash, _, err := c.versions.ReadModelHash(ctx, key.Model, key.OwnerUserID, key.PeerType, key.PeerID) + if err != nil { + return nil, err + } + if hash == 0 { + hash = missingStoryReadModelHash + } + return c.hidden.GetOrLoadVersioned(ctx, viewerUserID, hash, func() (hiddenStoryPeerSet, error) { + peers, err := provider.ListHiddenStoryPeers(ctx, viewerUserID) + if err != nil { + return nil, err + } + out := make(hiddenStoryPeerSet, len(peers)) + for _, peer := range peers { + if peer.ID != 0 { + out[peer] = struct{}{} + } + } + return out, nil + }) +} + +func (c *storySparseProjectionCache) DeletePeer(peer domain.Peer) { + if c != nil && peer.ID != 0 { + c.active.Invalidate(peer) + } +} + +func (c *storySparseProjectionCache) DeleteViewer(viewerUserID int64) { + if c != nil && viewerUserID != 0 { + c.hidden.Invalidate(viewerUserID) + } +} + +func (c *storySparseProjectionCache) Flush() { + if c != nil { + c.active.Flush() + c.hidden.Flush() + } +} + +func cloneHiddenStoryPeerSet(in hiddenStoryPeerSet) hiddenStoryPeerSet { + if in == nil { + return hiddenStoryPeerSet{} + } + out := make(hiddenStoryPeerSet, len(in)) + for peer := range in { + out[peer] = struct{}{} + } + return out +} + +func uniqueStoryProjectionPeers(peers []domain.Peer) []domain.Peer { + out := make([]domain.Peer, 0, len(peers)) + seen := make(map[domain.Peer]struct{}, len(peers)) + for _, peer := range peers { + if peer.ID == 0 || (peer.Type != domain.PeerTypeUser && peer.Type != domain.PeerTypeChannel) { + continue + } + if _, ok := seen[peer]; ok { + continue + } + seen[peer] = struct{}{} + out = append(out, peer) + } + return out +} diff --git a/internal/rpc/story_sparse_projection_cache_test.go b/internal/rpc/story_sparse_projection_cache_test.go new file mode 100644 index 00000000..bc43b980 --- /dev/null +++ b/internal/rpc/story_sparse_projection_cache_test.go @@ -0,0 +1,145 @@ +package rpc + +import ( + "context" + "errors" + "testing" + + appreadmodel "telesrv/internal/app/readmodel" + "telesrv/internal/domain" + "telesrv/internal/store" +) + +type fakeStorySparseProjectionProvider struct { + expirations map[domain.Peer]int + hidden map[int64][]domain.Peer + activeCalls int + hiddenCalls int + err error +} + +func (f *fakeStorySparseProjectionProvider) ActiveStoryPeerExpirations(_ context.Context, peers []domain.Peer, _ int) (map[domain.Peer]int, error) { + f.activeCalls++ + if f.err != nil { + return nil, f.err + } + out := make(map[domain.Peer]int, len(peers)) + for _, peer := range peers { + if expireAt := f.expirations[peer]; expireAt != 0 { + out[peer] = expireAt + } + } + return out, nil +} + +func (f *fakeStorySparseProjectionProvider) ListHiddenStoryPeers(_ context.Context, viewerUserID int64) ([]domain.Peer, error) { + f.hiddenCalls++ + if f.err != nil { + return nil, f.err + } + return append([]domain.Peer(nil), f.hidden[viewerUserID]...), nil +} + +func storyPeerVersionKey(peer domain.Peer) store.ReadModelKey { + return store.ReadModelKey{Model: appreadmodel.ModelStoryPeer, PeerType: peer.Type, PeerID: peer.ID} +} + +func storyHiddenListVersionKey(viewerUserID int64) store.ReadModelKey { + return store.ReadModelKey{ + Model: appreadmodel.ModelStoryHiddenList, OwnerUserID: viewerUserID, + PeerType: domain.PeerTypeUser, PeerID: viewerUserID, + } +} + +func TestStorySparseProjectionCacheSharesNegativeCandidatesAndExpiresPositiveFacts(t *testing.T) { + ctx := context.Background() + active := domain.Peer{Type: domain.PeerTypeUser, ID: 11} + inactive := domain.Peer{Type: domain.PeerTypeChannel, ID: 22} + versions := &fakeRPCReadModelVersions{hashes: map[store.ReadModelKey]int64{ + storyPeerVersionKey(active): 101, + storyPeerVersionKey(inactive): 102, + }} + provider := &fakeStorySparseProjectionProvider{expirations: map[domain.Peer]int{active: 200}} + cache := newStorySparseProjectionCache(versions, 10, 10, 1024) + + for i := 0; i < 2; i++ { + got, err := cache.activePeers(ctx, provider, []domain.Peer{active, inactive, active}, 100) + if err != nil || len(got) != 1 || got[0] != active { + t.Fatalf("activePeers(%d) = %+v, %v", i, got, err) + } + } + if provider.activeCalls != 1 { + t.Fatalf("shared positive/negative candidate loads = %d, want 1", provider.activeCalls) + } + + delete(provider.expirations, active) + got, err := cache.activePeers(ctx, provider, []domain.Peer{active, inactive}, 200) + if err != nil || len(got) != 0 { + t.Fatalf("activePeers at expire boundary = %+v, %v", got, err) + } + if provider.activeCalls != 2 { + t.Fatalf("expired positive candidate loads = %d, want 2", provider.activeCalls) + } +} + +func TestStorySparseProjectionCacheVersionsHiddenViewerSnapshot(t *testing.T) { + ctx := context.Background() + const viewerID int64 = 77 + hiddenPeer := domain.Peer{Type: domain.PeerTypeUser, ID: 88} + key := storyHiddenListVersionKey(viewerID) + versions := &fakeRPCReadModelVersions{hashes: map[store.ReadModelKey]int64{key: 201}} + provider := &fakeStorySparseProjectionProvider{hidden: map[int64][]domain.Peer{viewerID: {hiddenPeer}}} + cache := newStorySparseProjectionCache(versions, 10, 10, 1024) + + for i := 0; i < 2; i++ { + got, err := cache.hiddenPeers(ctx, provider, viewerID) + if err != nil { + t.Fatalf("hiddenPeers(%d): %v", i, err) + } + if _, ok := got[hiddenPeer]; !ok { + t.Fatalf("hiddenPeers(%d) = %+v, want hidden peer", i, got) + } + } + if provider.hiddenCalls != 1 { + t.Fatalf("hidden snapshot loads = %d, want 1", provider.hiddenCalls) + } + + provider.hidden[viewerID] = nil + versions.hashes[key] = 202 + got, err := cache.hiddenPeers(ctx, provider, viewerID) + if err != nil || len(got) != 0 { + t.Fatalf("hiddenPeers after version bump = %+v, %v", got, err) + } + if provider.hiddenCalls != 2 { + t.Fatalf("hidden snapshot loads after version bump = %d, want 2", provider.hiddenCalls) + } +} + +func TestStorySparseProjectionCacheDoesNotCacheBackendErrors(t *testing.T) { + ctx := context.Background() + peer := domain.Peer{Type: domain.PeerTypeUser, ID: 99} + const viewerID int64 = 100 + versions := &fakeRPCReadModelVersions{hashes: map[store.ReadModelKey]int64{ + storyPeerVersionKey(peer): 301, + storyHiddenListVersionKey(viewerID): 302, + }} + provider := &fakeStorySparseProjectionProvider{expirations: map[domain.Peer]int{peer: 500}, err: errors.New("backend unavailable")} + cache := newStorySparseProjectionCache(versions, 10, 10, 1024) + + if _, err := cache.activePeers(ctx, provider, []domain.Peer{peer}, 100); err == nil { + t.Fatal("active candidate error = nil") + } + if _, err := cache.hiddenPeers(ctx, provider, viewerID); err == nil { + t.Fatal("hidden snapshot error = nil") + } + provider.err = nil + if got, err := cache.activePeers(ctx, provider, []domain.Peer{peer}, 100); err != nil || len(got) != 1 { + t.Fatalf("active candidate recovery = %+v, %v", got, err) + } + if got, err := cache.hiddenPeers(ctx, provider, viewerID); err != nil || len(got) != 0 { + t.Fatalf("hidden snapshot recovery = %+v, %v", got, err) + } + if provider.activeCalls != 2 || provider.hiddenCalls != 2 { + t.Fatalf("backend retries active=%d hidden=%d, want 2/2", provider.activeCalls, provider.hiddenCalls) + } +} diff --git a/internal/rpc/suggested_post_dispatcher.go b/internal/rpc/suggested_post_dispatcher.go index 0ef6ae07..101d165b 100644 --- a/internal/rpc/suggested_post_dispatcher.go +++ b/internal/rpc/suggested_post_dispatcher.go @@ -2,6 +2,7 @@ package rpc import ( "context" + "errors" "time" "go.uber.org/zap" @@ -11,19 +12,26 @@ import ( // SuggestedPostDispatcher publishes scheduled suggestions and resolves paid // escrow after the minimum live age (or refunds it when the post is deleted). -// Store-side row locks make multiple server instances safe. +// Store-side per-key claims and row locks make multiple server instances safe. type SuggestedPostDispatcher struct { router *Router log *zap.Logger interval time.Duration batch int + enqueue func(context.Context, int64, domain.ToggleSuggestedPostApprovalResult) error } func NewSuggestedPostDispatcher(router *Router, log *zap.Logger) *SuggestedPostDispatcher { if log == nil { log = zap.NewNop() } - return &SuggestedPostDispatcher{router: router, log: log, interval: time.Second, batch: 50} + return &SuggestedPostDispatcher{ + router: router, log: log, interval: time.Second, batch: 50, + enqueue: func(ctx context.Context, originUserID int64, result domain.ToggleSuggestedPostApprovalResult) error { + router.enqueueSuggestedPostApprovalFanout(ctx, originUserID, result) + return nil + }, + } } func (d *SuggestedPostDispatcher) Run(ctx context.Context) { @@ -47,13 +55,17 @@ func (d *SuggestedPostDispatcher) DispatchOnce(ctx context.Context) bool { if !ok { return false } - results, err := service.ProcessSuggestedPostLifecycle(ctx, domain.SuggestedPostLifecycleRequest{Now: int(d.router.clock.Now().Unix()), Limit: d.batch}) - if err != nil { - d.log.Warn("process suggested post lifecycle", zap.Error(err)) - return false - } + results, dispatchErr := service.ProcessSuggestedPostLifecycle(ctx, domain.SuggestedPostLifecycleRequest{Now: int(d.router.clock.Now().Unix()), Limit: d.batch}) + enqueued := false for _, result := range results { - d.router.enqueueSuggestedPostApprovalFanout(ctx, 0, result) + if err := d.enqueue(ctx, 0, result); err != nil { + dispatchErr = errors.Join(dispatchErr, err) + continue + } + enqueued = true } - return len(results) > 0 + if dispatchErr != nil { + d.log.Warn("dispatch suggested post lifecycle", zap.Error(dispatchErr)) + } + return enqueued } diff --git a/internal/rpc/suggested_post_dispatcher_test.go b/internal/rpc/suggested_post_dispatcher_test.go new file mode 100644 index 00000000..e60f5086 --- /dev/null +++ b/internal/rpc/suggested_post_dispatcher_test.go @@ -0,0 +1,62 @@ +package rpc + +import ( + "context" + "errors" + "testing" + + "telesrv/internal/domain" +) + +type partialSuggestedPostChannels struct { + ChannelsService + results []domain.ToggleSuggestedPostApprovalResult + err error +} + +func (s *partialSuggestedPostChannels) ProcessSuggestedPostLifecycle(context.Context, domain.SuggestedPostLifecycleRequest) ([]domain.ToggleSuggestedPostApprovalResult, error) { + return s.results, s.err +} + +func (s *partialSuggestedPostChannels) ToggleSuggestedPostApproval(ctx context.Context, req domain.ToggleSuggestedPostApprovalRequest) (domain.ToggleSuggestedPostApprovalResult, error) { + return s.ChannelsService.(suggestedPostApprovalService).ToggleSuggestedPostApproval(ctx, req) +} + +func TestSuggestedPostDispatcherFansOutSuccessfulPrefixWhenAnotherAggregateFails(t *testing.T) { + fixture := newRPCChannelFixture(t) + fixture.router.deps.Channels = &partialSuggestedPostChannels{ + ChannelsService: fixture.router.deps.Channels, + results: []domain.ToggleSuggestedPostApprovalResult{{}}, + err: errors.New("poisoned lifecycle row"), + } + if !NewSuggestedPostDispatcher(fixture.router, nil).DispatchOnce(context.Background()) { + t.Fatal("DispatchOnce = false, want successful result preserved despite sibling failure") + } +} + +func TestSuggestedPostDispatcherContinuesAfterFanoutFailure(t *testing.T) { + fixture := newRPCChannelFixture(t) + fixture.router.deps.Channels = &partialSuggestedPostChannels{ + ChannelsService: fixture.router.deps.Channels, + results: []domain.ToggleSuggestedPostApprovalResult{ + {State: domain.SuggestedPostStateCompleted}, + {State: domain.SuggestedPostStateRefunded}, + }, + } + dispatcher := NewSuggestedPostDispatcher(fixture.router, nil) + attempts := 0 + dispatcher.enqueue = func(_ context.Context, _ int64, result domain.ToggleSuggestedPostApprovalResult) error { + attempts++ + if result.State == domain.SuggestedPostStateCompleted { + return errors.New("first committed result cannot be projected online") + } + return nil + } + + if !dispatcher.DispatchOnce(context.Background()) { + t.Fatal("DispatchOnce = false, want later committed result enqueued") + } + if attempts != 2 { + t.Fatalf("fanout attempts = %d, want 2", attempts) + } +} diff --git a/internal/rpc/temp_key_cache.go b/internal/rpc/temp_key_cache.go index 7767846c..9a49b81b 100644 --- a/internal/rpc/temp_key_cache.go +++ b/internal/rpc/temp_key_cache.go @@ -60,6 +60,30 @@ func (c *tempKeyResolveCache) Get(rawAuthKeyID, expectedPermAuthKeyID [8]byte, n return item.entry.perm, true } +// GetResolved returns a previously-authoritative positive temp→permanent +// binding when the caller does not yet have a session-local permanent identity +// to compare against. Missing bindings are never stored in this cache, so a hit +// always names the durable identity observed by an earlier resolver or the +// successful bind transaction itself. +func (c *tempKeyResolveCache) GetResolved(rawAuthKeyID [8]byte, now time.Time) ([8]byte, bool) { + if c == nil { + return [8]byte{}, false + } + c.mu.Lock() + defer c.mu.Unlock() + el := c.entries[rawAuthKeyID] + if el == nil { + return [8]byte{}, false + } + item := el.Value.(tempKeyResolveCacheItem) + if !item.entry.expireAt.After(now) { + c.removeElementLocked(el) + return [8]byte{}, false + } + c.order.MoveToBack(el) + return item.entry.perm, true +} + func (c *tempKeyResolveCache) Store(rawAuthKeyID, permAuthKeyID [8]byte, expireAt, _ time.Time) { if c == nil || c.max <= 0 || rawAuthKeyID == ([8]byte{}) || permAuthKeyID == ([8]byte{}) { return diff --git a/internal/rpc/update_peer_refs.go b/internal/rpc/update_peer_refs.go index febbfb28..41f8195c 100644 --- a/internal/rpc/update_peer_refs.go +++ b/internal/rpc/update_peer_refs.go @@ -19,13 +19,18 @@ func (r *Router) enrichUpdateEventsWithPeerCache(ctx context.Context, viewerUser if len(events) == 0 { return events } - if cache == nil { - cache = newViewerPeerCache(r) + return r.enrichPreparedUpdateEventsWithPeerCache(ctx, viewerUserID, r.prepareUpdateEventsForViewer(ctx, viewerUserID, events), cache) +} + +func (r *Router) enrichUpdateEventsWithPeerCacheStrict(ctx context.Context, viewerUserID int64, events []domain.UpdateEvent, cache *viewerPeerCache) ([]domain.UpdateEvent, error) { + if len(events) == 0 { + return events, nil } + return r.enrichPreparedUpdateEventsWithPeerCacheStrict(ctx, viewerUserID, r.prepareUpdateEventsForViewer(ctx, viewerUserID, events), cache) +} + +func (r *Router) prepareUpdateEventsForViewer(ctx context.Context, viewerUserID int64, events []domain.UpdateEvent) []domain.UpdateEvent { out := append([]domain.UpdateEvent(nil), events...) - refs := make([]updateEventPeerRefs, len(out)) - allUserIDs := make(map[int64]struct{}) - allChannelIDs := make(map[int64]struct{}) for i := range out { if out[i].Type == domain.UpdateEventChannelState { if service, ok := r.deps.Channels.(ChannelAuthoritativeProjectionService); ok { @@ -51,6 +56,31 @@ func (r *Router) enrichUpdateEventsWithPeerCache(ctx context.Context, viewerUser if out[i].Type == domain.UpdateEventDraftMessage { out[i] = r.enrichDraftMessageEvent(ctx, viewerUserID, out[i]) } + } + return out +} + +func (r *Router) enrichPreparedUpdateEventsWithPeerCache(ctx context.Context, viewerUserID int64, events []domain.UpdateEvent, cache *viewerPeerCache) []domain.UpdateEvent { + out, _ := r.enrichPreparedUpdateEvents(ctx, viewerUserID, events, cache, false) + return out +} + +func (r *Router) enrichPreparedUpdateEventsWithPeerCacheStrict(ctx context.Context, viewerUserID int64, events []domain.UpdateEvent, cache *viewerPeerCache) ([]domain.UpdateEvent, error) { + return r.enrichPreparedUpdateEvents(ctx, viewerUserID, events, cache, true) +} + +func (r *Router) enrichPreparedUpdateEvents(ctx context.Context, viewerUserID int64, events []domain.UpdateEvent, cache *viewerPeerCache, strictUsers bool) ([]domain.UpdateEvent, error) { + if len(events) == 0 { + return events, nil + } + if cache == nil { + cache = newViewerPeerCache(r) + } + out := append([]domain.UpdateEvent(nil), events...) + refs := make([]updateEventPeerRefs, len(out)) + allUserIDs := make(map[int64]struct{}) + allChannelIDs := make(map[int64]struct{}) + for i := range out { userIDs := make(map[int64]struct{}) channelIDs := make(map[int64]struct{}) addDomainPeerRef(out[i].Peer, 0, userIDs, channelIDs) @@ -71,6 +101,17 @@ func (r *Router) enrichUpdateEventsWithPeerCache(ctx context.Context, viewerUser if out[i].BotCallbackQuery != nil && out[i].BotCallbackQuery.UserID != 0 { userIDs[out[i].BotCallbackQuery.UserID] = struct{}{} } + collectDialogDraftPeerRefs(out[i].Draft, userIDs, channelIDs) + if strictUsers { + // Durable envelopes may contain raw base users that older event + // constructors did not expose through payload refs. Their IDs are + // expected, but their account-scoped fields must never survive. + for _, user := range out[i].Users { + if user.ID != 0 { + userIDs[user.ID] = struct{}{} + } + } + } removeKnownChannelRefs(channelIDs, out[i].Channels) refs[i] = updateEventPeerRefs{userIDs: userIDs, channelIDs: channelIDs} for id := range userIDs { @@ -80,13 +121,39 @@ func (r *Router) enrichUpdateEventsWithPeerCache(ctx context.Context, viewerUser allChannelIDs[id] = struct{}{} } } - cache.usersForIDs(ctx, viewerUserID, mapKeys(allUserIDs)) + if strictUsers { + if _, err := cache.usersForIDsStrict(ctx, viewerUserID, mapKeys(allUserIDs)); err != nil { + return nil, err + } + } else { + cache.usersForIDs(ctx, viewerUserID, mapKeys(allUserIDs)) + } cache.channelsForIDs(ctx, viewerUserID, mapKeys(allChannelIDs)) for i := range out { - out[i].Users = r.withUsersPresence(mergeDomainUsers(out[i].Users, cache.usersForIDs(ctx, viewerUserID, mapKeys(refs[i].userIDs))...)) + if strictUsers { + users, err := cache.usersForIDsStrict(ctx, viewerUserID, mapKeys(refs[i].userIDs)) + if err != nil { + return nil, err + } + out[i].Users = users + } else { + out[i].Users = r.withUsersPresence(mergeDomainUsers(out[i].Users, cache.usersForIDs(ctx, viewerUserID, mapKeys(refs[i].userIDs))...)) + } out[i].Channels = mergeDomainChannels(out[i].Channels, cache.channelsForIDs(ctx, viewerUserID, mapKeys(refs[i].channelIDs))...) } - return out + return out, nil +} + +func collectDialogDraftPeerRefs(draft *domain.DialogDraft, userIDs, channelIDs map[int64]struct{}) { + if draft == nil { + return + } + addDomainPeerRef(draft.Peer, 0, userIDs, channelIDs) + for _, entity := range draft.Entities { + if entity.UserID != 0 { + userIDs[entity.UserID] = struct{}{} + } + } } func collectEphemeralMessagePeerRefs(message domain.EphemeralMessage, userIDs, channelIDs map[int64]struct{}) { @@ -156,6 +223,15 @@ func (r *Router) enrichDraftMessageEvent(ctx context.Context, viewerUserID int64 } func (r *Router) enrichChannelDifference(ctx context.Context, viewerUserID int64, diff domain.ChannelDifference) domain.ChannelDifference { + out, _ := r.enrichChannelDifferenceUsers(ctx, viewerUserID, diff, false) + return out +} + +func (r *Router) enrichChannelDifferenceStrict(ctx context.Context, viewerUserID int64, diff domain.ChannelDifference) (domain.ChannelDifference, error) { + return r.enrichChannelDifferenceUsers(ctx, viewerUserID, diff, true) +} + +func (r *Router) enrichChannelDifferenceUsers(ctx context.Context, viewerUserID int64, diff domain.ChannelDifference, strictUsers bool) (domain.ChannelDifference, error) { userIDs := make(map[int64]struct{}) channelIDs := make(map[int64]struct{}) for _, event := range diff.Events { @@ -167,11 +243,26 @@ func (r *Router) enrichChannelDifference(ctx context.Context, viewerUserID int64 for _, event := range diff.OtherUpdates { collectChannelUpdatePeerRefs(event, diff.Channel.ID, userIDs, channelIDs) } + if strictUsers { + for _, user := range diff.Users { + if user.ID != 0 { + userIDs[user.ID] = struct{}{} + } + } + } removeKnownChannelRefs(channelIDs, diff.Channels) cache := newViewerPeerCache(r) - diff.Users = r.withUsersPresence(mergeDomainUsers(diff.Users, cache.usersForIDs(ctx, viewerUserID, mapKeys(userIDs))...)) + if strictUsers { + users, err := cache.usersForIDsStrict(ctx, viewerUserID, mapKeys(userIDs)) + if err != nil { + return domain.ChannelDifference{}, err + } + diff.Users = users + } else { + diff.Users = r.withUsersPresence(mergeDomainUsers(diff.Users, cache.usersForIDs(ctx, viewerUserID, mapKeys(userIDs))...)) + } diff.Channels = mergeDomainChannels(diff.Channels, cache.channelsForIDs(ctx, viewerUserID, mapKeys(channelIDs))...) - return diff + return diff, nil } func (r *Router) enrichChannelHistory(ctx context.Context, viewerUserID int64, history domain.ChannelHistory) domain.ChannelHistory { @@ -215,21 +306,43 @@ func (r *Router) enrichMessageList(ctx context.Context, viewerUserID int64, list collectMessagePeerRefs(msg, 0, userIDs, channelIDs) } cache := newViewerPeerCache(r) + if r.messageUsersAreViewerProjected() { + cache.primeUsers(viewerUserID, list.Users) + } list.Users = r.withUsersPresence(mergeDomainUsers(list.Users, cache.usersForIDs(ctx, viewerUserID, mapKeys(userIDs))...)) return list } +type viewerProjectedMessageUsers interface { + ProjectsMessageUsersForViewer() bool +} + +func (r *Router) messageUsersAreViewerProjected() bool { + projected, ok := r.deps.Messages.(viewerProjectedMessageUsers) + return ok && projected.ProjectsMessageUsersForViewer() +} + +func (r *Router) preloadedMessageUsers(list domain.MessageList) []domain.User { + if !r.messageUsersAreViewerProjected() { + return nil + } + return list.Users +} + func collectMessagePeerRefs(msg domain.Message, currentChannelID int64, userIDs, channelIDs map[int64]struct{}) { addDomainPeerRef(msg.From, currentChannelID, userIDs, channelIDs) addDomainPeerRef(msg.Peer, currentChannelID, userIDs, channelIDs) if msg.Forward != nil { addDomainPeerRef(msg.Forward.From, currentChannelID, userIDs, channelIDs) + addDomainPeerRef(msg.Forward.SavedFrom, currentChannelID, userIDs, channelIDs) } if msg.ViaBotID != 0 { userIDs[msg.ViaBotID] = struct{}{} } + collectMessageEntityUserRefs(msg.Entities, userIDs) if msg.ReplyTo != nil { addDomainPeerRef(msg.ReplyTo.Peer, currentChannelID, userIDs, channelIDs) + collectMessageEntityUserRefs(msg.ReplyTo.QuoteEntities, userIDs) } if msg.Media != nil && msg.Media.Contact != nil && msg.Media.Contact.UserID != 0 { userIDs[msg.Media.Contact.UserID] = struct{}{} @@ -304,21 +417,33 @@ func collectChannelMessagePeerRefs(msg domain.ChannelMessage, currentChannelID i if msg.SendAs != nil { addDomainPeerRef(*msg.SendAs, currentChannelID, userIDs, channelIDs) } + addDomainPeerRef(msg.SavedPeer, currentChannelID, userIDs, channelIDs) if msg.Forward != nil { addDomainPeerRef(msg.Forward.From, currentChannelID, userIDs, channelIDs) + addDomainPeerRef(msg.Forward.SavedFrom, currentChannelID, userIDs, channelIDs) } if msg.ViaBotID != 0 { userIDs[msg.ViaBotID] = struct{}{} } + collectMessageEntityUserRefs(msg.Entities, userIDs) if msg.ReplyTo != nil { addDomainPeerRef(msg.ReplyTo.Peer, currentChannelID, userIDs, channelIDs) + collectMessageEntityUserRefs(msg.ReplyTo.QuoteEntities, userIDs) } if msg.Media != nil && msg.Media.Contact != nil && msg.Media.Contact.UserID != 0 { userIDs[msg.Media.Contact.UserID] = struct{}{} } collectPollMediaUserRefs(msg.Media, userIDs) collectTodoMediaUserRefs(msg.Media, userIDs) + if msg.Replies != nil { + for _, peer := range msg.Replies.RecentRepliers { + addDomainPeerRef(peer, currentChannelID, userIDs, channelIDs) + } + } if msg.Action != nil { + if msg.Action.InviterUserID != 0 { + userIDs[msg.Action.InviterUserID] = struct{}{} + } for _, id := range msg.Action.UserIDs { if id != 0 { userIDs[id] = struct{}{} @@ -334,6 +459,14 @@ func collectChannelMessagePeerRefs(msg domain.ChannelMessage, currentChannelID i } } +func collectMessageEntityUserRefs(entities []domain.MessageEntity, userIDs map[int64]struct{}) { + for _, entity := range entities { + if entity.UserID != 0 { + userIDs[entity.UserID] = struct{}{} + } + } +} + func collectServiceActionPeerRefs(media *domain.MessageMedia, currentChannelID int64, userIDs, channelIDs map[int64]struct{}) { if media == nil || media.ServiceAction == nil { return diff --git a/internal/rpc/update_peer_refs_test.go b/internal/rpc/update_peer_refs_test.go index f43c44b2..4eff380a 100644 --- a/internal/rpc/update_peer_refs_test.go +++ b/internal/rpc/update_peer_refs_test.go @@ -1,8 +1,12 @@ package rpc import ( + "context" "testing" + "github.com/iamxvbaba/td/clock" + "go.uber.org/zap/zaptest" + "telesrv/internal/domain" ) @@ -28,3 +32,138 @@ func TestRemoveKnownChannelRefs(t *testing.T) { } } } +func TestCollectChannelMessagePeerRefsIncludesNestedWireUsers(t *testing.T) { + const currentChannelID = int64(3001) + users := map[int64]struct{}{} + channels := map[int64]struct{}{} + collectChannelMessagePeerRefs(domain.ChannelMessage{ + SavedPeer: domain.Peer{Type: domain.PeerTypeUser, ID: 1005}, + Forward: &domain.MessageForward{ + From: domain.Peer{Type: domain.PeerTypeUser, ID: 1001}, + SavedFrom: domain.Peer{Type: domain.PeerTypeUser, ID: 1002}, + }, + Replies: &domain.ChannelMessageReplies{RecentRepliers: []domain.Peer{ + {Type: domain.PeerTypeUser, ID: 1003}, + {Type: domain.PeerTypeChannel, ID: 4001}, + {Type: domain.PeerTypeChannel, ID: currentChannelID}, + }}, + Action: &domain.ChannelMessageAction{InviterUserID: 1004}, + }, currentChannelID, users, channels) + + for _, id := range []int64{1001, 1002, 1003, 1004, 1005} { + if _, ok := users[id]; !ok { + t.Fatalf("channel message user refs=%v, missing %d", users, id) + } + } + if _, ok := channels[4001]; !ok { + t.Fatalf("channel message channel refs=%v, missing recent replier channel", channels) + } + if _, ok := channels[currentChannelID]; ok { + t.Fatalf("current channel leaked into external refs=%v", channels) + } +} + +func TestMessageMentionNameUsersAreProjectedInStrictAndNonStrictEnvelopes(t *testing.T) { + const ( + viewerID = int64(1001) + entityUser = int64(2001) + quoteUser = int64(2002) + channelID = int64(3001) + ) + entities := []domain.MessageEntity{{ + Type: domain.MessageEntityMentionName, + UserID: entityUser, + }} + reply := &domain.MessageReply{ + MessageID: 1, + QuoteEntities: []domain.MessageEntity{{ + Type: domain.MessageEntityMentionName, + UserID: quoteUser, + }}, + } + users := mapUsersService{users: map[int64]domain.User{ + entityUser: {ID: entityUser, FirstName: "Projected entity mention"}, + quoteUser: {ID: quoteUser, FirstName: "Projected quote mention"}, + }} + r := New(Config{}, Deps{Users: users}, zaptest.NewLogger(t), clock.System) + ctx := context.Background() + + tests := []struct { + name string + enrich func() ([]domain.User, error) + }{ + { + name: "private non-strict", + enrich: func() ([]domain.User, error) { + list := r.enrichMessageList(ctx, viewerID, domain.MessageList{Messages: []domain.Message{{ + Entities: entities, + ReplyTo: reply, + }}}) + return list.Users, nil + }, + }, + { + name: "private strict", + enrich: func() ([]domain.User, error) { + events, err := r.enrichUpdateEventsWithPeerCacheStrict(ctx, viewerID, []domain.UpdateEvent{{ + Type: domain.UpdateEventNewMessage, + Message: domain.Message{ + Entities: entities, + ReplyTo: reply, + }, + }}, nil) + if err != nil { + return nil, err + } + return events[0].Users, nil + }, + }, + { + name: "channel non-strict", + enrich: func() ([]domain.User, error) { + history := r.enrichChannelHistory(ctx, viewerID, domain.ChannelHistory{ + Channel: domain.Channel{ID: channelID}, + Messages: []domain.ChannelMessage{{ + ChannelID: channelID, + Entities: entities, + ReplyTo: reply, + }}, + }) + return history.Users, nil + }, + }, + { + name: "channel strict", + enrich: func() ([]domain.User, error) { + diff, err := r.enrichChannelDifferenceStrict(ctx, viewerID, domain.ChannelDifference{ + Channel: domain.Channel{ID: channelID}, + NewMessages: []domain.ChannelMessage{{ + ChannelID: channelID, + Entities: entities, + ReplyTo: reply, + }}, + }) + return diff.Users, err + }, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + got, err := tt.enrich() + if err != nil { + t.Fatalf("enrich: %v", err) + } + byID := make(map[int64]domain.User, len(got)) + for _, user := range got { + byID[user.ID] = user + } + if user := byID[entityUser]; user.FirstName != "Projected entity mention" { + t.Fatalf("entity mention user = %+v, want viewer projection", user) + } + if user := byID[quoteUser]; user.FirstName != "Projected quote mention" { + t.Fatalf("quote mention user = %+v, want viewer projection", user) + } + }) + } +} diff --git a/internal/rpc/updates.go b/internal/rpc/updates.go index eab8fd6a..52e9aa52 100644 --- a/internal/rpc/updates.go +++ b/internal/rpc/updates.go @@ -4,6 +4,7 @@ import ( "context" "github.com/iamxvbaba/td/tg" + "go.uber.org/zap" "github.com/iamxvbaba/td/tlprofile" "telesrv/internal/domain" @@ -118,20 +119,45 @@ func (r *Router) onUpdatesGetDifference(ctx context.Context, req *tg.UpdatesGetD } } // 密聊设备级 qts 消息（独立于账号级 pts 事件）：按当前设备 req.Qts 补回。 - encMsgs, newQts := r.encryptedDifference(ctx, req.Qts) + encMsgs, newQts, encryptedPartial, err := r.encryptedDifference(ctx, req.Qts) + if err != nil { + r.log.Error("load secret chat qts difference", zap.Error(err)) + return nil, internalErr() + } // 密聊握手/已读状态事件（无 qts）：按未投递标记补回 OtherUpdates。 - stateUpdates, statePeerUserIDs, stateEventIDs := r.encryptedStateUpdates(ctx, userID) + stateUpdates, statePeerUserIDs, stateEventIDs, encryptedStatePartial, err := r.encryptedStateUpdates(ctx, userID) + if err != nil { + r.log.Error("load secret chat state difference", zap.Error(err)) + return nil, internalErr() + } + // 账号 pts、设备 qts 和无序号状态事件任一被截断，都必须返回 differenceSlice。 + st.Partial = st.Partial || encryptedPartial || encryptedStatePartial if !st.Partial && len(st.Events) == 0 && len(st.ChannelNudges) == 0 && len(encMsgs) == 0 && len(stateUpdates) == 0 { // differenceEmpty carries no pts/qts. Both audited clients retain their // request cursor, so only that normalized cursor is proven delivered. emptyCursor := domain.UpdateState{Pts: from.Pts, Qts: from.Qts, Date: st.State.Date, Seq: st.State.Seq} - r.stageUpdatesBaselineAfterDelivery(ctx, userID, &emptyCursor, domain.UpdateStateCommitDeliveredOnly, nil, true) + // 账号级密聊邀请在 accept 后对获胜 auth key 是可确认但无可见 update 的收敛事件； + // 即使返回 differenceEmpty，也必须在 rpc_result 成功投递后登记这些 event id。 + r.stageUpdatesBaselineAfterDelivery(ctx, userID, &emptyCursor, domain.UpdateStateCommitDeliveredOnly, stateEventIDs, true) return &tg.UpdatesDifferenceEmpty{Date: st.State.Date, Seq: st.State.Seq}, nil } - st.Events = r.enrichUpdateEvents(ctx, userID, st.Events) + peerCache := newViewerPeerCache(r) + st.Events, err = r.enrichUpdateEventsWithPeerCacheStrict(ctx, userID, st.Events, peerCache) + if err != nil { + r.log.Error("project durable account difference users", + zap.Int64("viewer_user_id", userID), + zap.Error(err)) + return nil, internalErr() + } diff := r.tgUpdatesDifference(ctx, userID, st) diff = injectEncryptedMessages(diff, encMsgs, newQts) - diff = r.injectEncryptedOtherUpdates(ctx, userID, diff, stateUpdates, statePeerUserIDs) + diff, err = r.injectEncryptedOtherUpdatesStrict(ctx, userID, diff, stateUpdates, statePeerUserIDs, peerCache) + if err != nil { + r.log.Error("project durable encrypted difference users", + zap.Int64("viewer_user_id", userID), + zap.Error(err)) + return nil, internalErr() + } returnedCursor := st.State returnedCursor.Qts = newQts r.stageUpdatesBaselineAfterDelivery(ctx, userID, &returnedCursor, domain.UpdateStateCommitDeliveredOnly, stateEventIDs, true) diff --git a/internal/rpc/updates_delivery.go b/internal/rpc/updates_delivery.go index 3458213a..5436c61c 100644 --- a/internal/rpc/updates_delivery.go +++ b/internal/rpc/updates_delivery.go @@ -35,9 +35,17 @@ type updatesDeliveryPlan struct { markSessionReady bool readyUserID int64 + activation SessionUpdatesActivationProvider + activationRaw [8]byte + activationSess int64 + activationToken uint64 publishBootstrap bool bootstrapUserID int64 + bootstrapProbe SessionBootstrapProbeProvider + bootstrapRaw [8]byte + bootstrapSess int64 + bootstrapToken uint64 } func withUpdatesDeliveryPlan(ctx context.Context) (context.Context, *updatesDeliveryPlan) { @@ -79,6 +87,63 @@ func (p *updatesDeliveryPlan) stageSessionReady(userID int64) { p.readyUserID = userID } +func (p *updatesDeliveryPlan) ownSessionActivation(provider SessionUpdatesActivationProvider, rawAuthKeyID [8]byte, sessionID int64, token uint64) { + if p == nil || provider == nil || token == 0 { + return + } + p.activation = provider + p.activationRaw = rawAuthKeyID + p.activationSess = sessionID + p.activationToken = token +} + +func (p *updatesDeliveryPlan) disownSessionActivation() { + if p == nil { + return + } + p.activation = nil + p.activationRaw = [8]byte{} + p.activationSess = 0 + p.activationToken = 0 +} + +func (p *updatesDeliveryPlan) releaseSessionActivation() { + if p == nil || p.activation == nil || p.activationToken == 0 { + return + } + provider := p.activation + rawAuthKeyID := p.activationRaw + sessionID := p.activationSess + token := p.activationToken + p.disownSessionActivation() + provider.EndSessionUpdatesActivation(rawAuthKeyID, sessionID, token) +} + +func (p *updatesDeliveryPlan) ownBootstrapProbe(provider SessionBootstrapProbeProvider, rawAuthKeyID [8]byte, sessionID int64, token uint64) { + if p == nil || provider == nil || token == 0 { + return + } + p.bootstrapProbe = provider + p.bootstrapRaw = rawAuthKeyID + p.bootstrapSess = sessionID + p.bootstrapToken = token +} + +func (p *updatesDeliveryPlan) finishBootstrapProbe(success bool) { + if p == nil || p.bootstrapProbe == nil || p.bootstrapToken == 0 { + return + } + provider := p.bootstrapProbe + rawAuthKeyID := p.bootstrapRaw + sessionID := p.bootstrapSess + token := p.bootstrapToken + p.bootstrapProbe = nil + p.bootstrapRaw = [8]byte{} + p.bootstrapSess = 0 + p.bootstrapToken = 0 + provider.EndSessionBootstrapProbe(rawAuthKeyID, sessionID, token, success) +} + // suppressSessionActivation removes only effects which would make the current // physical session eligible for proactive updates. Delivery-gated cursor and // secret-event facts remain valid for a generated wire-invariant RPC result. @@ -87,13 +152,34 @@ func (p *updatesDeliveryPlan) suppressSessionActivation() { if p == nil { return } + p.releaseSessionActivation() + p.finishBootstrapProbe(false) p.markSessionReady = false p.readyUserID = 0 p.publishBootstrap = false p.bootstrapUserID = 0 } -func (p *updatesDeliveryPlan) stageBaseline(userID, secretDeviceKey int64, secretEventIDs []int64, subscribe, bootstrap bool) { +func (r *Router) tryStageBootstrapProbe(ctx context.Context, plan *updatesDeliveryPlan, userID int64) { + if plan == nil || userID == 0 || plan.publishBootstrap || r.deps.BootstrapUpdates == nil { + return + } + if provider, ok := r.deps.Sessions.(SessionBootstrapProbeProvider); ok { + rawAuthKeyID, hasRaw := RawAuthKeyIDFrom(ctx) + sessionID, hasSession := SessionIDFrom(ctx) + if hasRaw && hasSession { + token, claimed := provider.BeginSessionBootstrapProbe(rawAuthKeyID, sessionID) + if !claimed { + return + } + plan.ownBootstrapProbe(provider, rawAuthKeyID, sessionID, token) + } + } + plan.publishBootstrap = true + plan.bootstrapUserID = userID +} + +func (p *updatesDeliveryPlan) stageBaseline(secretDeviceKey int64, secretEventIDs []int64) { if p == nil { return } @@ -102,14 +188,6 @@ func (p *updatesDeliveryPlan) stageBaseline(userID, secretDeviceKey int64, secre p.secretDeviceKey = secretDeviceKey p.secretEventIDs = appendUniqueInt64s(p.secretEventIDs, secretEventIDs...) } - if !subscribe { - return - } - p.stageSessionReady(userID) - if bootstrap && userID != 0 { - p.publishBootstrap = true - p.bootstrapUserID = userID - } } func appendUniqueInt64s(dst []int64, values ...int64) []int64 { @@ -148,14 +226,32 @@ func (r *Router) stageSessionUpdatesReadyAfterDelivery(ctx context.Context, user return } if plan, ok := updatesDeliveryPlanFrom(ctx); ok { - plan.stageSessionReady(userID) + r.tryStageSessionUpdatesReady(ctx, plan, userID) return } plan := updatesDeliveryPlan{baseCtx: context.WithoutCancel(ctx)} - plan.stageSessionReady(userID) + r.tryStageSessionUpdatesReady(ctx, &plan, userID) r.registerUpdatesDeliveryPlan(ctx, &plan) } +func (r *Router) tryStageSessionUpdatesReady(ctx context.Context, plan *updatesDeliveryPlan, userID int64) { + if plan == nil || userID == 0 || plan.markSessionReady { + return + } + if provider, ok := r.deps.Sessions.(SessionUpdatesActivationProvider); ok { + rawAuthKeyID, hasRaw := RawAuthKeyIDFrom(ctx) + sessionID, hasSession := SessionIDFrom(ctx) + if hasRaw && hasSession { + token, claimed := provider.BeginSessionUpdatesActivation(rawAuthKeyID, sessionID) + if !claimed { + return + } + plan.ownSessionActivation(provider, rawAuthKeyID, sessionID, token) + } + } + plan.stageSessionReady(userID) +} + // stageUpdatesBaselineAfterDelivery adds the extra actions justified by a // successful getState/getDifference result. A single plan also deduplicates the // ordinary bare-RPC readiness declaration made by the common router path. @@ -177,7 +273,13 @@ func (r *Router) stageUpdatesBaselineAfterDelivery( authKeyID, _ := AuthKeyIDFrom(ctx) plan.stageCursor(authKeyID, userID, *cursor, mode) } - plan.stageBaseline(userID, secretDeviceKey, secretEventIDs, subscribe, bootstrap) + plan.stageBaseline(secretDeviceKey, secretEventIDs) + if subscribe { + r.tryStageSessionUpdatesReady(ctx, plan, userID) + if bootstrap && userID != 0 { + r.tryStageBootstrapProbe(ctx, plan, userID) + } + } } if plan, ok := updatesDeliveryPlanFrom(ctx); ok { stage(plan) @@ -189,13 +291,23 @@ func (r *Router) stageUpdatesBaselineAfterDelivery( } func (r *Router) registerUpdatesDeliveryPlan(ctx context.Context, plan *updatesDeliveryPlan) { - if plan == nil || !plan.hasWork() { + if plan == nil { + return + } + if !plan.hasWork() { + plan.releaseSessionActivation() + plan.finishBootstrapProbe(false) return } snapshot := plan.snapshot() - postresponse.Register(ctx, func() { + if !postresponse.Register(ctx, func() { r.runUpdatesDeliveryPlan(snapshot) - }) + }) { + snapshot.releaseSessionActivation() + snapshot.finishBootstrapProbe(false) + return + } + plan.disownSessionActivation() } // runUpdatesDeliveryPlan is ordered deliberately: @@ -207,6 +319,8 @@ func (r *Router) registerUpdatesDeliveryPlan(ctx context.Context, plan *updatesD // Each phase gets an independent timeout so one failed side effect cannot starve // the remaining delivery-safe transitions. func (r *Router) runUpdatesDeliveryPlan(plan updatesDeliveryPlan) { + defer plan.releaseSessionActivation() + defer plan.finishBootstrapProbe(false) baseCtx := plan.baseCtx if baseCtx == nil { baseCtx = context.Background() @@ -240,6 +354,8 @@ func (r *Router) runUpdatesDeliveryPlan(plan updatesDeliveryPlan) { cancel() } if plan.publishBootstrap { - r.publishBootstrapAfterBaseline(baseCtx, plan.bootstrapUserID) + if r.publishBootstrapAfterBaseline(baseCtx, plan.bootstrapUserID) { + plan.finishBootstrapProbe(true) + } } } diff --git a/internal/rpc/updates_rpc_test.go b/internal/rpc/updates_rpc_test.go index dd31aaf1..fa45e99b 100644 --- a/internal/rpc/updates_rpc_test.go +++ b/internal/rpc/updates_rpc_test.go @@ -558,6 +558,51 @@ func TestUpdatesDifferenceMarksViewerUserAsSelf(t *testing.T) { } } +func TestUpdatesDifferenceSuppressesDeletedNewMessageSnapshot(t *testing.T) { + const viewerID int64 = 1000000001 + msg := domain.Message{ + ID: 547, + OwnerUserID: viewerID, + Out: true, + Peer: domain.Peer{Type: domain.PeerTypeUser, ID: 1000000002}, + From: domain.Peer{Type: domain.PeerTypeUser, ID: viewerID}, + Date: 1700000103, + Body: "deleted while web was offline", + Deleted: true, + } + got, ok := tgUpdatesDifference(viewerID, domain.UpdateDifference{ + State: domain.UpdateState{Pts: 2036, Date: msg.Date}, + Events: []domain.UpdateEvent{ + { + UserID: viewerID, + Type: domain.UpdateEventNewMessage, + Pts: 2035, + PtsCount: 1, + Date: msg.Date, + Message: msg, + }, + { + UserID: viewerID, + Type: domain.UpdateEventDeleteMessages, + Pts: 2036, + PtsCount: 1, + Date: msg.Date + 1, + MessageIDs: []int{msg.ID}, + }, + }, + }).(*tg.UpdatesDifference) + if !ok { + t.Fatalf("difference = %T, want *tg.UpdatesDifference", got) + } + if got.State.Pts != 2036 || len(got.NewMessages) != 0 || len(got.OtherUpdates) != 1 { + t.Fatalf("difference = %+v, want no resurrecting new_messages and one delete update", got) + } + del, ok := got.OtherUpdates[0].(*tg.UpdateDeleteMessages) + if !ok || del.Pts != 2036 || del.PtsCount != 1 || len(del.Messages) != 1 || del.Messages[0] != msg.ID { + t.Fatalf("delete update = %#v, want message %d at pts=2036", got.OtherUpdates[0], msg.ID) + } +} + func TestUpdatesDifferenceIncludesForwardSourceChannelChat(t *testing.T) { source := domain.Channel{ ID: 2000000001, diff --git a/internal/rpc/upload.go b/internal/rpc/upload.go index a7eaa8a1..769b639b 100644 --- a/internal/rpc/upload.go +++ b/internal/rpc/upload.go @@ -88,7 +88,10 @@ func (r *Router) onUploadGetFile(ctx context.Context, req *tg.UploadGetFileReque if r.deps.Files == nil { return nil, notImplementedErr() } - key, ok := fileLocationKey(req.Location) + key, ok, err := r.authorizedFileLocationKey(ctx, req.Location) + if err != nil { + return nil, err + } if !ok { return nil, locationInvalidErr() } @@ -110,6 +113,33 @@ func (r *Router) onUploadGetFile(ctx context.Context, req *tg.UploadGetFileReque return nil, locationInvalidErr() } +// authorizedFileLocationKey applies the authorization/capability checks which cannot be +// expressed by a plain location-key conversion. Secret-chat blobs are addressed internally by +// id, but the wire capability is the pair (id, access_hash); accepting id alone would let any +// authenticated caller who learned or guessed an id download ciphertext which was never +// delivered to that caller. +func (r *Router) authorizedFileLocationKey(ctx context.Context, location tg.InputFileLocationClass) (string, bool, error) { + loc, encrypted := location.(*tg.InputEncryptedFileLocation) + if !encrypted { + key, ok := fileLocationKey(location) + return key, ok, nil + } + if loc.ID == 0 || loc.AccessHash == 0 || r.deps.SecretChats == nil { + return "", false, nil + } + if _, err := r.secretChatRequireUser(ctx); err != nil { + return "", false, err + } + ref, found, err := r.deps.SecretChats.GetEncryptedFile(ctx, loc.ID, loc.AccessHash) + if err != nil { + return "", false, internalErr() + } + if !found || ref.ID != loc.ID || ref.AccessHash != loc.AccessHash { + return "", false, nil + } + return fmt.Sprintf("enc:%d", loc.ID), true, nil +} + // onUploadGetGroupCallStream 处理 RTMP 直播观众拉流：按 time_ms/scale 取一段打包好的 // tgcalls broadcast part，再按 offset/limit 切片返回。错误语义对齐 TDesktop 消费点 // （calls_group_call.cpp broadcastPartStart）： @@ -221,13 +251,6 @@ func fileLocationKey(location tg.InputFileLocationClass) (string, bool) { size = "c" } return fmt.Sprintf("photo:%d:%s", photoID, size), true - case *tg.InputEncryptedFileLocation: - // 密聊文件（P2）：盲 blob，location_key "enc:"。access_hash 不强校验 - // （沿用现有媒体 dev 姿态，依赖不可枚举 id）。 - if loc.ID == 0 { - return "", false - } - return fmt.Sprintf("enc:%d", loc.ID), true default: // InputStickerSetThumb / secure / takeout 等本阶段不生成对应资源。 return "", false diff --git a/internal/rpc/upload_test.go b/internal/rpc/upload_test.go index 27a9aa49..3c923b77 100644 --- a/internal/rpc/upload_test.go +++ b/internal/rpc/upload_test.go @@ -6,8 +6,17 @@ import ( "github.com/iamxvbaba/td/tg" "github.com/iamxvbaba/td/tgerr" + + "telesrv/internal/domain" ) +func TestFileSaveErrMapsStorageCapacityWithoutFloodWait(t *testing.T) { + err := fileSaveErr(domain.ErrStorageFull) + if !tgerr.Is(err, "STORAGE_FULL") { + t.Fatalf("fileSaveErr = %v, want STORAGE_FULL", err) + } +} + func TestStorageFileTypePrefersMagicOverMime(t *testing.T) { webp := []byte{'R', 'I', 'F', 'F', 0, 0, 0, 0, 'W', 'E', 'B', 'P'} if _, ok := storageFileType("image/jpeg", webp).(*tg.StorageFileWebp); !ok { diff --git a/internal/rpc/user_projection_fact_invalidation_test.go b/internal/rpc/user_projection_fact_invalidation_test.go new file mode 100644 index 00000000..541ccee8 --- /dev/null +++ b/internal/rpc/user_projection_fact_invalidation_test.go @@ -0,0 +1,41 @@ +package rpc + +import ( + "context" + "testing" + + "github.com/iamxvbaba/td/clock" + "go.uber.org/zap/zaptest" + + "telesrv/internal/domain" +) + +type recordingUserProjectionFactInvalidator struct { + freezes []int64 + phones []int64 +} + +func (r *recordingUserProjectionFactInvalidator) InvalidateAccountFreezeFact(userID int64) { + r.freezes = append(r.freezes, userID) +} + +func (r *recordingUserProjectionFactInvalidator) InvalidateCollectiblePhoneFact(userID int64) { + r.phones = append(r.phones, userID) +} + +func TestAdminUserFactHooksInvalidateBeforeProjectionRefresh(t *testing.T) { + facts := &recordingUserProjectionFactInvalidator{} + router := New(Config{}, Deps{UserProjectionFacts: facts}, zaptest.NewLogger(t), clock.System) + if err := router.NotifyAccountFreezeChanged(context.Background(), domain.AccountFreeze{UserID: 77, Frozen: true}); err != nil { + t.Fatalf("NotifyAccountFreezeChanged: %v", err) + } + if err := router.NotifyUserChanged(context.Background(), domain.User{ID: 88}); err != nil { + t.Fatalf("NotifyUserChanged: %v", err) + } + if len(facts.freezes) != 1 || facts.freezes[0] != 77 { + t.Fatalf("freeze invalidations = %v, want [77]", facts.freezes) + } + if len(facts.phones) != 1 || facts.phones[0] != 88 { + t.Fatalf("phone invalidations = %v, want [88]", facts.phones) + } +} diff --git a/internal/rpc/users.go b/internal/rpc/users.go index a1ed4637..87a27a8b 100644 --- a/internal/rpc/users.go +++ b/internal/rpc/users.go @@ -30,10 +30,7 @@ func (r *Router) registerUsers(d *tlprofile.Dispatcher) { return r.onUsersGetRequirementsToContact(ctx, layerRequest. ID) }) - registerRPC[*tg.UsersGetSavedMusicRequest](d, tlprofile.SemanticMethodUsersGetSavedMusic, func(ctx context.Context, layerRequest *tg.UsersGetSavedMusicRequest) ( - - // onUsersGetUsers 处理 users.getUsers：支持 self 和已知 user peer（含 777000 官方账号）。 - any, error) { + registerRPC[*tg.UsersGetSavedMusicRequest](d, tlprofile.SemanticMethodUsersGetSavedMusic, func(ctx context.Context, layerRequest *tg.UsersGetSavedMusicRequest) (any, error) { return r.onUsersGetSavedMusic(ctx, layerRequest) }) registerRPC[*tg.UsersGetSavedMusicByIDRequest](d, tlprofile.SemanticMethodUsersGetSavedMusicByID, func(ctx context.Context, layerRequest *tg.UsersGetSavedMusicByIDRequest) (any, error) { @@ -41,6 +38,7 @@ func (r *Router) registerUsers(d *tlprofile.Dispatcher) { }) } +// onUsersGetUsers 处理 users.getUsers：支持 self 和已知 user peer（含 777000 官方账号）。 func (r *Router) onUsersGetUsers(ctx context.Context, ids []tg.InputUserClass) ([]tg.UserClass, error) { currentUserID, authorized, err := r.currentUserID(ctx) if err != nil { @@ -151,6 +149,12 @@ func (r *Router) onUsersGetFullUser(ctx context.Context, id tg.InputUserClass) ( if _, ok := id.(*tg.InputUserSelf); ok || u.ID == currentUserID { user = r.tgSelfUser(u) } + // A deleted account is a durable peer tombstone. Its retained rows keep + // message and membership references resolvable, but none of those private + // read models belong in users.getFullUser after deletion. + if u.Deleted { + return deletedUserFull(u.ID, user), nil + } if err := r.applyBotCanEditToUser(ctx, currentUserID, u, user); err != nil { return nil, err } @@ -165,6 +169,9 @@ func (r *Router) onUsersGetFullUser(ctx context.Context, id tg.InputUserClass) ( if !applyContactNoteToUserFull(u, &full) { return nil, internalErr() } + if err := r.applyContactPeerStateToUserFull(ctx, currentUserID, u.ID, &full); err != nil { + return nil, err + } if err := r.applyTranslationDisabledToUserFull(ctx, currentUserID, u.ID, &full); err != nil { return nil, err } @@ -187,6 +194,9 @@ func (r *Router) onUsersGetFullUser(ctx context.Context, id tg.InputUserClass) ( if !applyContactNoteToUserFull(u, &full) { return nil, internalErr() } + if err := r.applyContactPeerStateToUserFull(ctx, currentUserID, u.ID, &full); err != nil { + return nil, err + } if err := r.applyTranslationDisabledToUserFull(ctx, currentUserID, u.ID, &full); err != nil { return nil, err } @@ -205,6 +215,49 @@ func (r *Router) onUsersGetFullUser(ctx context.Context, id tg.InputUserClass) ( }, nil } +// applyContactPeerStateToUserFull keeps users.getFullUser on the same +// owner-scoped contact read model as contacts.getBlocked and +// messages.getPeerSettings. Official clients treat UserFull.blocked as an +// authoritative replacement for their local block state, so omitting these +// fields can undo a block learned from contacts.getBlocked or updatePeerBlocked. +// +// The contact service guarantees BlockContact == !blocked for a non-self user. +// Reusing the peer-settings projection avoids a second block-store lookup while +// retaining the shared viewer/peer cache and its mutation invalidation rules. +func (r *Router) applyContactPeerStateToUserFull(ctx context.Context, viewerUserID, targetUserID int64, full *tg.UserFull) error { + if full == nil { + return internalErr() + } + full.SetBlocked(false) + full.SetBlockedMyStoriesFrom(false) + full.Settings = tg.PeerSettings{} + if viewerUserID == 0 || targetUserID == 0 || viewerUserID == targetUserID { + return nil + } + + peer := domain.Peer{Type: domain.PeerTypeUser, ID: targetUserID} + loadEpoch := r.peerSettingsProjectionCache.LoadEpoch() + settings, ok := r.peerSettingsProjectionCache.Lookup(viewerUserID, peer) + if !ok { + var err error + settings, err = r.buildPeerSettingsProjection(ctx, viewerUserID, peer) + if err != nil { + return err + } + r.peerSettingsProjectionCache.StoreIfEpoch(viewerUserID, peer, settings, loadEpoch) + } + full.Settings = tgPeerSettings(settings) + if r.deps.Contacts != nil { + blocked := !settings.BlockContact + full.SetBlocked(blocked) + // telesrv currently models the main and stories block switches as one + // durable relation. Keep both wire flags consistent until independent + // stories-only blocking is introduced. + full.SetBlockedMyStoriesFrom(blocked) + } + return nil +} + // applyContactNoteToUserFull overlays the viewer-scoped contact note after the // expensive UserFull projection cache. This keeps private notes out of the // large LRU while reusing the contact projection already loaded by Users.ByID, @@ -432,7 +485,6 @@ func (r *Router) userFullPrivacyVisibility(ctx context.Context, viewerUserID, ow return out, nil } - // tgBirthday 把 domain 生日转 tg.Birthday（Year 可选，0 表示不含年份）。 func tgBirthday(b domain.Birthday) tg.Birthday { out := tg.Birthday{Day: b.Day, Month: b.Month} @@ -850,6 +902,14 @@ func emptyUserFull() *tg.UsersUserFull { } } +func deletedUserFull(userID int64, user tg.UserClass) *tg.UsersUserFull { + out := emptyUserFull() + out.FullUser.ID = userID + out.Users = []tg.UserClass{user} + out.Chats = []tg.ChatClass{} + return out +} + func (r *Router) userFromInput(ctx context.Context, currentUserID int64, id tg.InputUserClass) (domain.User, bool, error) { switch v := id.(type) { case *tg.InputUserSelf: diff --git a/internal/rpc/webpage_resolver.go b/internal/rpc/webpage_resolver.go index 7d89086b..64fc9cdd 100644 --- a/internal/rpc/webpage_resolver.go +++ b/internal/rpc/webpage_resolver.go @@ -25,14 +25,23 @@ const ( ) type webPageResolveJob struct { - senderID int64 - peer domain.Peer - msgID int - expectedID int64 - url string - invertMedia bool - forceLarge bool - forceSmall bool + senderID int64 + peer domain.Peer + msgID int + expectedID int64 + url string + invertMedia bool + forceLarge bool + forceSmall bool + timeout time.Duration + emptyOnFailure bool +} + +type webPageResolveKey struct { + peerType domain.PeerType + scopeID int64 + msgID int + expectedID int64 } // maybeEnqueueWebPageResolve 若刚发出的消息（私聊或频道）携带 pending 链接预览占位， @@ -70,7 +79,11 @@ func (r *Router) enqueueWebPageResolve(job webPageResolveJob) { } go func() { defer func() { <-r.webPageResolveSem }() - ctx, cancel := context.WithTimeout(context.Background(), webPageResolveTimeout) + timeout := job.timeout + if timeout <= 0 { + timeout = webPageResolveTimeout + } + ctx, cancel := context.WithTimeout(context.Background(), timeout) defer cancel() if err := r.resolvePendingWebPage(ctx, job); err != nil { r.log.Debug("web page resolve failed", @@ -90,9 +103,22 @@ func (r *Router) resolvePendingWebPage(ctx context.Context, job webPageResolveJo } resolved, err := r.deps.Files.ResolveWebPage(ctx, job.url) if err != nil { - return err + if !job.emptyOnFailure { + return err + } + resolved = emptyWebPageForResolveJob(job) + r.log.Info("web page pending finalized as empty", + zap.Int64("sender_id", job.senderID), + zap.String("peer_type", string(job.peer.Type)), + zap.Int64("peer_id", job.peer.ID), + zap.Int("msg_id", job.msgID), + zap.Int64("expected_id", job.expectedID), + zap.Error(err)) } // 保留发送时占位上的 wrapper 偏好（force large/small），它们不在抓取结果里。 + if job.expectedID != 0 { + resolved.ID = job.expectedID + } resolved.ForceLargeMedia = job.forceLarge resolved.ForceSmallMedia = job.forceSmall media := &domain.MessageMedia{ @@ -142,3 +168,101 @@ func (r *Router) resolvePendingWebPage(ctx context.Context, job webPageResolveJo return nil } } + +func emptyWebPageForResolveJob(job webPageResolveJob) domain.MessageWebPage { + url := job.url + id := job.expectedID + if normalized, ok := domain.NormalizeWebPageURL(url); ok { + url = normalized + if id == 0 { + id = domain.WebPageURLHash(normalized) + } + } + return domain.MessageWebPage{State: domain.MessageWebPageStateEmpty, ID: id, URL: url} +} + +func (r *Router) maybeEnqueueExpiredPrivateWebPageResolves(messages []domain.Message) { + now := int(r.clock.Now().Unix()) + seen := make(map[webPageResolveKey]struct{}) + for _, msg := range messages { + job, ok := expiredPrivateWebPageResolveJob(msg, now) + if !ok { + continue + } + key := webPageResolveKey{peerType: domain.PeerTypeUser, scopeID: msg.OwnerUserID, msgID: msg.ID, expectedID: job.expectedID} + if _, dup := seen[key]; dup { + continue + } + seen[key] = struct{}{} + r.enqueueWebPageResolve(job) + } +} + +func (r *Router) maybeEnqueueExpiredChannelWebPageResolves(userID int64, messages []domain.ChannelMessage) { + now := int(r.clock.Now().Unix()) + seen := make(map[webPageResolveKey]struct{}) + for _, msg := range messages { + job, ok := expiredChannelWebPageResolveJob(userID, msg, now) + if !ok { + continue + } + key := webPageResolveKey{peerType: domain.PeerTypeChannel, scopeID: msg.ChannelID, msgID: msg.ID, expectedID: job.expectedID} + if _, dup := seen[key]; dup { + continue + } + seen[key] = struct{}{} + r.enqueueWebPageResolve(job) + } +} + +func expiredPrivateWebPageResolveJob(msg domain.Message, now int) (webPageResolveJob, bool) { + wp, ok := expiredPendingWebPage(msg.Media, now) + if !ok || msg.OwnerUserID == 0 || msg.ID <= 0 || msg.Peer.ID == 0 { + return webPageResolveJob{}, false + } + return webPageResolveJob{ + senderID: msg.OwnerUserID, + peer: msg.Peer, + msgID: msg.ID, + expectedID: wp.ID, + url: wp.URL, + invertMedia: msg.Media.InvertMedia, + forceLarge: wp.ForceLargeMedia, + forceSmall: wp.ForceSmallMedia, + timeout: webpageRequestResolveBudget, + emptyOnFailure: true, + }, true +} + +func expiredChannelWebPageResolveJob(userID int64, msg domain.ChannelMessage, now int) (webPageResolveJob, bool) { + wp, ok := expiredPendingWebPage(msg.Media, now) + if !ok || msg.ChannelID == 0 || msg.ID <= 0 { + return webPageResolveJob{}, false + } + senderID := msg.SenderUserID + if senderID == 0 { + senderID = userID + } + return webPageResolveJob{ + senderID: senderID, + peer: domain.Peer{Type: domain.PeerTypeChannel, ID: msg.ChannelID}, + msgID: msg.ID, + expectedID: wp.ID, + url: wp.URL, + invertMedia: msg.Media.InvertMedia, + forceLarge: wp.ForceLargeMedia, + forceSmall: wp.ForceSmallMedia, + timeout: webpageRequestResolveBudget, + emptyOnFailure: true, + }, true +} + +func expiredPendingWebPage(media *domain.MessageMedia, now int) (*domain.MessageWebPage, bool) { + if media == nil || media.WebPage == nil || media.WebPage.State != domain.MessageWebPageStatePending { + return nil, false + } + if media.WebPage.Date > now { + return nil, false + } + return media.WebPage, true +} diff --git a/internal/rpc/webpage_resolver_test.go b/internal/rpc/webpage_resolver_test.go index cea371eb..7f1035c2 100644 --- a/internal/rpc/webpage_resolver_test.go +++ b/internal/rpc/webpage_resolver_test.go @@ -2,7 +2,9 @@ package rpc import ( "context" + "errors" "testing" + "time" "github.com/iamxvbaba/td/tg" @@ -128,3 +130,116 @@ func TestResolvePendingWebPageSwapsCard(t *testing.T) { t.Errorf("edit_date = %d, want 0 (no 'edited' marker)", got.EditDate) } } + +func TestResolveExpiredPendingWebPageFailureSwapsEmpty(t *testing.T) { + ctx := context.Background() + r, owner, friend := newMediaTestRouter(t) + f := r.deps.Files.(*fakeFiles) + f.webPagePreviewOn = true + f.resolveWebPageFn = func(string) (domain.MessageWebPage, error) { + return domain.MessageWebPage{}, errors.New("dial timeout") + } + + const url = "https://example.com/slow" + urlHash := domain.WebPageURLHash(url) + updates, err := r.onMessagesSendMessage(WithUserID(ctx, owner.ID), &tg.MessagesSendMessageRequest{ + Peer: &tg.InputPeerUser{UserID: friend.ID, AccessHash: friend.AccessHash}, + Message: "see " + url, + Entities: []tg.MessageEntityClass{&tg.MessageEntityURL{Offset: 4, Length: len(url)}}, + RandomID: 6002, + }) + if err != nil { + t.Fatalf("sendMessage: %v", err) + } + msg := newMessageFromUpdates(t, updates) + + err = r.resolvePendingWebPage(ctx, webPageResolveJob{ + senderID: owner.ID, + peer: domain.Peer{Type: domain.PeerTypeUser, ID: friend.ID}, + msgID: msg.ID, + expectedID: urlHash, + url: url, + emptyOnFailure: true, + }) + if err != nil { + t.Fatalf("resolvePendingWebPage(emptyOnFailure): %v", err) + } + + got, found, err := r.lookupOwnerMessage(ctx, owner.ID, msg.ID) + if err != nil || !found { + t.Fatalf("lookupOwnerMessage: found=%v err=%v", found, err) + } + if got.Media == nil || got.Media.WebPage == nil || got.Media.WebPage.State != domain.MessageWebPageStateEmpty { + t.Fatalf("owner media = %+v, want empty webpage", got.Media) + } + if got.Media.WebPage.ID != urlHash { + t.Fatalf("empty webpage id = %d, want %d", got.Media.WebPage.ID, urlHash) + } +} + +func TestGetMessagesExpiredPendingWebPageConvergesToEmpty(t *testing.T) { + ctx := context.Background() + r, owner, friend := newMediaTestRouter(t) + f := r.deps.Files.(*fakeFiles) + f.webPagePreviewOn = true + f.resolveWebPageFn = func(string) (domain.MessageWebPage, error) { + return domain.MessageWebPage{}, errors.New("temporary fetch failure") + } + + const url = "https://example.com/retry" + urlHash := domain.WebPageURLHash(url) + body := "see " + url + entities := []tg.MessageEntityClass{&tg.MessageEntityURL{Offset: 4, Length: len(url)}} + updates, err := r.onMessagesSendMessage(WithUserID(ctx, owner.ID), &tg.MessagesSendMessageRequest{ + Peer: &tg.InputPeerUser{UserID: friend.ID, AccessHash: friend.AccessHash}, + Message: body, + Entities: entities, + RandomID: 6003, + }) + if err != nil { + t.Fatalf("sendMessage: %v", err) + } + msg := newMessageFromUpdates(t, updates) + + pastPending := &domain.MessageMedia{ + Kind: domain.MessageMediaKindWebPage, + WebPage: &domain.MessageWebPage{ + State: domain.MessageWebPageStatePending, + ID: urlHash, + URL: url, + Date: int(r.clock.Now().Add(-time.Minute).Unix()), + }, + } + if _, err := r.deps.Messages.EditMessage(ctx, owner.ID, domain.EditMessageRequest{ + OwnerUserID: owner.ID, + Peer: domain.Peer{Type: domain.PeerTypeUser, ID: friend.ID}, + ID: msg.ID, + Message: body, + Entities: domainMessageEntities(entities), + Media: pastPending, + }); err != nil { + t.Fatalf("force expired pending: %v", err) + } + + if _, err := r.onMessagesGetMessages(WithUserID(ctx, owner.ID), []tg.InputMessageClass{&tg.InputMessageID{ID: msg.ID}}); err != nil { + t.Fatalf("getMessages: %v", err) + } + waitForOwnerMessageWebPageState(t, r, owner.ID, msg.ID, domain.MessageWebPageStateEmpty) +} + +func waitForOwnerMessageWebPageState(t *testing.T, r *Router, ownerID int64, msgID int, want domain.MessageWebPageState) { + t.Helper() + deadline := time.Now().Add(2 * time.Second) + for time.Now().Before(deadline) { + got, found, err := r.lookupOwnerMessage(context.Background(), ownerID, msgID) + if err == nil && found && got.Media != nil && got.Media.WebPage != nil && got.Media.WebPage.State == want { + return + } + time.Sleep(10 * time.Millisecond) + } + got, found, err := r.lookupOwnerMessage(context.Background(), ownerID, msgID) + if err != nil || !found || got.Media == nil || got.Media.WebPage == nil { + t.Fatalf("message webpage state not found: found=%v err=%v media=%+v", found, err, got.Media) + } + t.Fatalf("message webpage state = %q, want %q", got.Media.WebPage.State, want) +} diff --git a/internal/rpc/webpage_url_extract.go b/internal/rpc/webpage_url_extract.go index 6b89e77f..6abf14e3 100644 --- a/internal/rpc/webpage_url_extract.go +++ b/internal/rpc/webpage_url_extract.go @@ -3,10 +3,13 @@ package rpc import ( "context" "regexp" + "sort" + "strconv" "strings" "unicode/utf16" "github.com/iamxvbaba/td/tg" + "golang.org/x/net/publicsuffix" "telesrv/internal/domain" "telesrv/internal/links" @@ -17,43 +20,165 @@ import ( // foo:// 都提升为服务端认证的可点击实体。 var urlInTextRe = regexp.MustCompile(`(?i)[a-z][a-z0-9+.-]*://[^\s<>"'）】]+`) +// bareURLInTextRe 匹配官方客户端会本地识别的裸域名 URL（例如 github.com/@alice）。 +// 前导边界排除 email、已有 scheme URL 内部和域名中间；候选命中后仍由 publicsuffix +// 校验 TLD，避免把普通带点文本误升为链接。 +var bareURLInTextRe = regexp.MustCompile(`(?i)(^|[^a-z0-9_@./:+-])((?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+(?:[a-z]{2,63}|xn--[a-z0-9-]{2,59})(?::[0-9]{1,5})?(?:[/?#][^\s<>"'）】]*)?)`) + // urlTrailingPunct 是不属于 URL 的句末标点（'/' 是合法路径末尾，保留）。 const urlTrailingPunct = ".,;:!?)]}'\"。，、！？" -// detectURLEntities 服务端扫描消息文本生成 url 高亮实体（MessageEntityURL）。除 http(s) -// 外，仅接受当前 Router 配置允许的 app-link scheme/host。偏移/长度按 UTF-16 码元 -// （Telegram 实体口径）。自定义 scheme 只参与 entity，不改变网页预览的 http(s) 边界。 +type byteSpan struct { + start int + end int + scheme string +} + +func rawURLByteSpans(message string) []byteSpan { + if !strings.Contains(message, "://") && !strings.Contains(message, ".") { + return nil + } + var out []byteSpan + if strings.Contains(message, "://") { + for _, loc := range urlInTextRe.FindAllStringIndex(message, -1) { + raw := strings.TrimRight(message[loc[0]:loc[1]], urlTrailingPunct) + if raw == "" { + continue + } + schemeEnd := strings.Index(raw, "://") + if schemeEnd <= 0 { + continue + } + out = append(out, byteSpan{ + start: loc[0], + end: loc[0] + len(raw), + scheme: strings.ToLower(raw[:schemeEnd]), + }) + } + } + if strings.Contains(message, ".") { + for _, loc := range bareURLInTextRe.FindAllStringSubmatchIndex(message, -1) { + if len(loc) < 6 || loc[4] < 0 || loc[5] <= loc[4] { + continue + } + start, end := loc[4], loc[5] + raw := strings.TrimRight(message[start:end], urlTrailingPunct) + end = start + len(raw) + if raw == "" || overlapsByteSpan(out, start, end) || !bareURLCandidateValid(raw) { + continue + } + out = append(out, byteSpan{start: start, end: end}) + } + } + if len(out) == 0 { + return nil + } + sort.Slice(out, func(i, j int) bool { + if out[i].start == out[j].start { + return out[i].end < out[j].end + } + return out[i].start < out[j].start + }) + return out +} + +func overlapsByteSpan(spans []byteSpan, start, end int) bool { + for _, span := range spans { + if start < span.end && span.start < end { + return true + } + } + return false +} + +// detectURLEntities 服务端扫描消息文本生成 url 高亮实体（MessageEntityURL）。裸域名 +// URL（github.com/@alice）按官方客户端行为接纳；带 scheme URL 除 http(s) 外，仅接受当前 +// Router 配置允许的 app-link scheme/host。偏移/长度按 UTF-16 码元（Telegram 实体口径）。 +// 自定义 scheme 只参与 entity，不改变网页预览的 http(s) 边界。 func detectURLEntities(message string, appLinks links.AppLinkBuilder) []tg.MessageEntityClass { - if !strings.Contains(message, "://") { + spans := rawURLByteSpans(message) + if len(spans) == 0 { return nil } - locs := urlInTextRe.FindAllStringIndex(message, -1) - if len(locs) == 0 { - return nil - } - out := make([]tg.MessageEntityClass, 0, len(locs)) - for _, loc := range locs { - raw := strings.TrimRight(message[loc[0]:loc[1]], urlTrailingPunct) - if raw == "" { - continue - } - schemeEnd := strings.Index(raw, "://") - if schemeEnd <= 0 { - continue - } - scheme := raw[:schemeEnd] - if !strings.EqualFold(scheme, "http") && !strings.EqualFold(scheme, "https") && !appLinks.AcceptsEntityURL(raw) { + out := make([]tg.MessageEntityClass, 0, len(spans)) + for _, span := range spans { + raw := message[span.start:span.end] + if span.scheme != "" && span.scheme != "http" && span.scheme != "https" && !appLinks.AcceptsEntityURL(raw) { continue } out = append(out, &tg.MessageEntityURL{ - Offset: utf16CodeUnitLen(message[:loc[0]]), + Offset: utf16CodeUnitLen(message[:span.start]), Length: utf16CodeUnitLen(raw), }) } return out } -// firstPreviewableURL 从消息文本+实体中提取首个可预览的 http/https 链接，用于链接预览： +func bareURLCandidateValid(raw string) bool { + if raw == "" || strings.Contains(raw, "://") || strings.ContainsAny(raw, " \t\r\n<>\"'") { + return false + } + hostPort := raw + if cut := strings.IndexAny(hostPort, "/?#"); cut >= 0 { + hostPort = hostPort[:cut] + } + if hostPort == "" || strings.Contains(hostPort, "@") { + return false + } + host := hostPort + if h, port, ok := splitBareHostPort(hostPort); ok { + host = h + n, err := strconv.Atoi(port) + if err != nil || n <= 0 || n > 65535 { + return false + } + } + host = strings.ToLower(strings.TrimSuffix(host, ".")) + if !bareDomainHostValid(host) { + return false + } + return bareDomainTLDValid(host) +} + +func splitBareHostPort(hostPort string) (string, string, bool) { + idx := strings.LastIndexByte(hostPort, ':') + if idx < 0 { + return hostPort, "", false + } + return hostPort[:idx], hostPort[idx+1:], true +} + +func bareDomainHostValid(host string) bool { + if host == "" || strings.Contains(host, ":") || strings.HasPrefix(host, ".") || strings.HasSuffix(host, ".") { + return false + } + labels := strings.Split(host, ".") + if len(labels) < 2 { + return false + } + for _, label := range labels { + if len(label) == 0 || len(label) > 63 || label[0] == '-' || label[len(label)-1] == '-' { + return false + } + for i := 0; i < len(label); i++ { + c := label[i] + if (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || c == '-' { + continue + } + return false + } + } + return true +} + +func bareDomainTLDValid(host string) bool { + tld := host[strings.LastIndexByte(host, '.')+1:] + suffix, icann := publicsuffix.PublicSuffix("x." + tld) + return icann && suffix == tld +} + +// firstPreviewableURL 从消息文本+实体中提取首个可预览链接，用于链接预览；裸域名会按 +// https:// 规范化： // - MessageEntityTextURL：URL 直接在实体里（markdown 风格 [text](url)）。 // - MessageEntityURL：URL 是文本里 [offset,offset+length) 的子串（Telegram 实体偏移以 // UTF-16 码元计，需按 UTF-16 切片，不能按 rune/byte）。 @@ -76,31 +201,38 @@ func firstPreviewableURL(message string, entities []tg.MessageEntityClass) (stri default: continue } - if normalized, ok := domain.NormalizeWebPageURL(candidate); ok { + if normalized, ok := normalizePreviewURLCandidate(candidate); ok { return normalized, true } } - // 回退扫原始文本：绝大多数消息无链接，无 "://" 子串则直接跳过正则与分配。 - // firstURLInText 会继续限定为 http(s)，自定义 app-link 永不进入网页预览。 - if !strings.Contains(message, "://") { + // 回退扫原始文本：绝大多数消息无链接，无 URL 触发字符则直接跳过正则与分配。 + // firstURLInText 会继续限定为 http(s)/裸域名，自定义 app-link 永不进入网页预览。 + if !strings.Contains(message, "://") && !strings.Contains(message, ".") { return "", false } if raw, ok := firstURLInText(message); ok { - if normalized, ok := domain.NormalizeWebPageURL(raw); ok { - return normalized, true - } + return raw, true } return "", false } -// firstURLInText 扫描原始文本里的首个 http(s) 链接，剥掉句末标点。 +func normalizePreviewURLCandidate(candidate string) (string, bool) { + candidate = strings.TrimRight(strings.TrimSpace(candidate), urlTrailingPunct) + if normalized, ok := domain.NormalizeWebPageURL(candidate); ok { + return normalized, true + } + if !bareURLCandidateValid(candidate) { + return "", false + } + return domain.NormalizeWebPageURL("https://" + candidate) +} + +// firstURLInText 扫描原始文本里的首个可预览 http(s)/裸域名链接，剥掉句末标点。 func firstURLInText(message string) (string, bool) { - for _, match := range urlInTextRe.FindAllString(message, -1) { - // 句末标点不属于 URL（"见 https://example.com。" / "...go)."）。'/' 是合法路径末尾，保留。 - match = strings.TrimRight(match, urlTrailingPunct) - schemeEnd := strings.Index(match, "://") - if schemeEnd > 0 && (strings.EqualFold(match[:schemeEnd], "http") || strings.EqualFold(match[:schemeEnd], "https")) { - return match, true + for _, span := range rawURLByteSpans(message) { + raw := message[span.start:span.end] + if normalized, ok := normalizePreviewURLCandidate(raw); ok { + return normalized, true } } return "", false @@ -130,14 +262,19 @@ func (r *Router) webPagePendingOrCachedMedia(ctx context.Context, rawURL string, if r.deps.Files == nil || !r.deps.Files.WebPagePreviewEnabled() { return nil } - normalized, ok := domain.NormalizeWebPageURL(rawURL) + normalized, ok := normalizePreviewURLCandidate(rawURL) if !ok { return nil } - if page, found := r.deps.Files.LookupWebPage(ctx, normalized); found && page.State == domain.MessageWebPageStateDone { - page.ForceLargeMedia = forceLarge - page.ForceSmallMedia = forceSmall - return &domain.MessageMedia{Kind: domain.MessageMediaKindWebPage, InvertMedia: invertMedia, WebPage: &page} + if page, found := r.deps.Files.LookupWebPage(ctx, normalized); found { + if page.State == domain.MessageWebPageStateEmpty { + return nil + } + if page.State == domain.MessageWebPageStateDone { + page.ForceLargeMedia = forceLarge + page.ForceSmallMedia = forceSmall + return &domain.MessageMedia{Kind: domain.MessageMediaKindWebPage, InvertMedia: invertMedia, WebPage: &page} + } } return &domain.MessageMedia{ Kind: domain.MessageMediaKindWebPage, diff --git a/internal/rpc/webpage_url_extract_test.go b/internal/rpc/webpage_url_extract_test.go index abd4d893..5a0bca05 100644 --- a/internal/rpc/webpage_url_extract_test.go +++ b/internal/rpc/webpage_url_extract_test.go @@ -1,6 +1,7 @@ package rpc import ( + "reflect" "testing" "github.com/iamxvbaba/td/tg" @@ -84,6 +85,13 @@ func TestFirstPreviewableURL(t *testing.T) { } }) + t.Run("raw-text-naked-domain-url", func(t *testing.T) { + got, ok := firstPreviewableURL("check github.com/@alice", nil) + if !ok || got != "https://github.com/@alice" { + t.Fatalf("naked domain fallback got (%q,%v), want https://github.com/@alice", got, ok) + } + }) + t.Run("no-url-no-extract", func(t *testing.T) { if got, ok := firstPreviewableURL("plain text without any link", nil); ok { t.Fatalf("text without url should not extract, got %q", got) @@ -168,6 +176,61 @@ func TestAugmentAutoEntitiesURL(t *testing.T) { t.Errorf("length = %d, want %d (trailing 。 excluded)", e.Length, utf16CodeUnitLen("https://example.com")) } }) + t.Run("at-path-segment-is-url-only", func(t *testing.T) { + message := "https://github.com/@11" + got := testAugmentAutoEntities(message, nil) + if len(got) != 1 { + t.Fatalf("entities = %d, want one URL entity: %#v", len(got), got) + } + e := urlEntity(t, got[0]) + if e.Offset != 0 || e.Length != utf16CodeUnitLen(message) { + t.Fatalf("offset/length = %d/%d, want 0/%d", e.Offset, e.Length, utf16CodeUnitLen(message)) + } + }) + t.Run("bare-domain-at-path-segment-is-url-only", func(t *testing.T) { + message := "github.com/@alice" + got := testAugmentAutoEntities(message, nil) + if len(got) != 1 { + t.Fatalf("entities = %d, want one URL entity: %#v", len(got), got) + } + e := urlEntity(t, got[0]) + if e.Offset != 0 || e.Length != utf16CodeUnitLen(message) { + t.Fatalf("offset/length = %d/%d, want 0/%d", e.Offset, e.Length, utf16CodeUnitLen(message)) + } + }) + t.Run("bare-domain-query-fragment-at-is-url-only", func(t *testing.T) { + message := "github.com/path?u=@alice#@bob" + got := testAugmentAutoEntities(message, nil) + if len(got) != 1 { + t.Fatalf("entities = %d, want one URL entity: %#v", len(got), got) + } + e := urlEntity(t, got[0]) + if e.Offset != 0 || e.Length != utf16CodeUnitLen(message) { + t.Fatalf("offset/length = %d/%d, want 0/%d", e.Offset, e.Length, utf16CodeUnitLen(message)) + } + }) + t.Run("bare-domain-without-path", func(t *testing.T) { + got := testAugmentAutoEntities("see github.com now", nil) + if len(got) != 1 { + t.Fatalf("entities = %d, want one bare-domain URL entity: %#v", len(got), got) + } + e := urlEntity(t, got[0]) + if e.Offset != 4 || e.Length != utf16CodeUnitLen("github.com") { + t.Fatalf("offset/length = %d/%d, want 4/%d", e.Offset, e.Length, utf16CodeUnitLen("github.com")) + } + }) + t.Run("email-domain-not-url", func(t *testing.T) { + for _, e := range testAugmentAutoEntities("mail bob@example.com please", nil) { + if _, ok := e.(*tg.MessageEntityURL); ok { + t.Fatalf("email domain must not yield URL entity: %#v", e) + } + } + }) + t.Run("unknown-tld-not-url", func(t *testing.T) { + if got := testAugmentAutoEntities("see foo.invalidtldzz now", nil); len(got) != 0 { + t.Fatalf("unknown TLD should not be URL, got %#v", got) + } + }) t.Run("no-url-no-entities", func(t *testing.T) { if got := testAugmentAutoEntities("plain text", nil); len(got) != 0 { t.Fatalf("entities = %d, want 0", len(got)) @@ -211,6 +274,26 @@ func TestAugmentAutoEntitiesURL(t *testing.T) { }) } +func TestExtractMentionUsernamesSkipsURLSpans(t *testing.T) { + got := extractMentionUsernames("https://github.com/@11 hi @alice https://example.com/@bob?x=@carol github.com/@dave github.com/path?u=@erin#@frank", 10, nil) + want := []string{"alice"} + if !reflect.DeepEqual(got, want) { + t.Fatalf("extractMentionUsernames = %#v, want %#v", got, want) + } +} + +func TestExtractMentionUsernamesSkipsClientURLSpans(t *testing.T) { + message := "github.com/@alice hi @bob" + blocked := mentionScanBlockedSpansFromTGEntities(message, []tg.MessageEntityClass{ + &tg.MessageEntityURL{Offset: 0, Length: utf16CodeUnitLen("github.com/@alice")}, + }) + got := extractMentionUsernames(message, 10, blocked) + want := []string{"bob"} + if !reflect.DeepEqual(got, want) { + t.Fatalf("extractMentionUsernames = %#v, want %#v", got, want) + } +} + // BenchmarkAugmentAutoEntities 量化发送热路径:纯文本(无触发字符)应零分配走快路径短路; // 含 @mention/#hashtag/url 时才进入检测+分配。 func BenchmarkAugmentAutoEntities(b *testing.B) { diff --git a/internal/rpc/welcome_delivery_dispatcher.go b/internal/rpc/welcome_delivery_dispatcher.go new file mode 100644 index 00000000..9e14cdaf --- /dev/null +++ b/internal/rpc/welcome_delivery_dispatcher.go @@ -0,0 +1,288 @@ +package rpc + +import ( + "context" + "crypto/rand" + "encoding/hex" + "errors" + "fmt" + "time" + + "github.com/iamxvbaba/td/proto" + "github.com/iamxvbaba/td/tg" + "github.com/iamxvbaba/td/tlprofile" + "go.uber.org/zap" + + "telesrv/internal/domain" + "telesrv/internal/store" +) + +const ( + defaultWelcomeDeliveryBatch = 100 + defaultWelcomeDeliveryLease = 15 * time.Second + defaultWelcomeDeliveryInterval = 250 * time.Millisecond + defaultWelcomeDeliveryMaxRetry = time.Minute + defaultWelcomeDeliverySweep = time.Minute +) + +var errWelcomeDeliveryMembershipSuperseded = errors.New("welcome delivery membership epoch is no longer active") + +type WelcomeDeliveryDispatcher struct { + router *Router + store store.WelcomeMessageDeliveryStore + log *zap.Logger + owner string + batch int + lease time.Duration + nextSweep time.Time +} + +func NewWelcomeDeliveryDispatcher(router *Router, deliveries store.WelcomeMessageDeliveryStore, log *zap.Logger) *WelcomeDeliveryDispatcher { + if log == nil { + log = zap.NewNop() + } + return &WelcomeDeliveryDispatcher{ + router: router, store: deliveries, log: log, + owner: welcomeDeliveryOwner(), batch: defaultWelcomeDeliveryBatch, + lease: defaultWelcomeDeliveryLease, + } +} + +func (d *WelcomeDeliveryDispatcher) Run(ctx context.Context) { + if d == nil || d.router == nil || d.store == nil { + return + } + runIdleBackoffLoop(ctx, defaultWelcomeDeliveryInterval, defaultIdleDispatchMaxInterval, d.DispatchOnce) +} + +func (d *WelcomeDeliveryDispatcher) DispatchOnce(ctx context.Context) bool { + if d == nil || d.router == nil || d.store == nil { + return false + } + now := d.router.clock.Now() + deleted := 0 + if d.nextSweep.IsZero() || !now.Before(d.nextSweep) { + var err error + deleted, err = d.store.DeleteExpiredWelcomeMessageDeliveries(ctx, now, d.batch*10) + switch { + case err != nil: + d.nextSweep = now.Add(defaultWelcomeDeliveryInterval) + d.log.Warn("delete expired welcome deliveries", zap.Error(err)) + case deleted == d.batch*10: + d.nextSweep = now + default: + d.nextSweep = now.Add(defaultWelcomeDeliverySweep) + } + } + deliveries, err := d.store.ClaimWelcomeMessageDeliveries(ctx, d.owner, now, d.batch, d.lease) + if err != nil { + d.log.Warn("claim welcome deliveries", zap.Error(err)) + return deleted > 0 + } + for _, group := range groupWelcomeMessageDeliveries(deliveries) { + d.dispatchGroup(ctx, group) + } + return deleted > 0 || len(deliveries) > 0 +} + +func (d *WelcomeDeliveryDispatcher) dispatchGroup(ctx context.Context, deliveries []domain.WelcomeMessageDelivery) { + if len(deliveries) == 0 { + return + } + delivery := deliveries[0] + ids := welcomeDeliveryIDs(deliveries) + now := d.router.clock.Now() + if !delivery.ExpiresAt.After(now) { + return + } + if online, ok := d.router.deps.Sessions.(OnlineUserProvider); ok && !online.IsUserOnline(delivery.TargetUserID) { + d.retry(ctx, deliveries, now, "target has no online session") + return + } + binder, ok := d.router.deps.Sessions.(SemanticTransientSessionBinder) + if !ok { + d.retry(ctx, deliveries, now, "semantic transient session binder is unavailable") + return + } + updates, err := d.router.welcomeDeliveryUpdates(ctx, deliveries) + if errors.Is(err, errWelcomeDeliveryMembershipSuperseded) { + if _, ackErr := d.store.AckWelcomeMessageDeliveries(ctx, d.owner, ids, now); ackErr != nil { + d.log.Warn("discard superseded welcome delivery", zap.Int64("join_event_id", delivery.JoinEventID), zap.Error(ackErr)) + } + return + } + if err != nil { + d.retry(ctx, deliveries, now, err.Error()) + return + } + sent, sendErr := binder.PushToUserTransientCompatible( + ctx, delivery.TargetUserID, tlprofile.SemanticTypeUpdateNewEphemeralMessage, + proto.MessageFromServer, updates, d.router.cfg.OutboundPushTimeout, + ) + if sent <= 0 { + reason := "no ready exact profile can represent welcome delivery" + if sendErr != nil { + reason = sendErr.Error() + } + d.retry(ctx, deliveries, now, reason) + return + } + acked, err := d.store.AckWelcomeMessageDeliveries(ctx, d.owner, ids, now) + if err != nil || acked != len(ids) { + d.log.Warn("ack welcome delivery", + zap.Int64("join_event_id", delivery.JoinEventID), zap.Int64("target_user_id", delivery.TargetUserID), + zap.Int("templates", len(ids)), zap.Int("sent_sessions", sent), zap.Int("acked", acked), zap.Error(err)) + } +} + +func (d *WelcomeDeliveryDispatcher) retry(ctx context.Context, deliveries []domain.WelcomeMessageDelivery, now time.Time, reason string) { + if len(deliveries) == 0 { + return + } + delivery := deliveries[0] + attempt := delivery.AttemptCount + expiresAt := delivery.ExpiresAt + for _, item := range deliveries[1:] { + if item.AttemptCount > attempt { + attempt = item.AttemptCount + } + if item.ExpiresAt.Before(expiresAt) { + expiresAt = item.ExpiresAt + } + } + delay := welcomeDeliveryRetryDelay(attempt) + next := now.Add(delay) + if next.After(expiresAt) { + next = expiresAt + } + ids := welcomeDeliveryIDs(deliveries) + updated, err := d.store.RetryWelcomeMessageDeliveries(ctx, d.owner, ids, next, reason) + if err != nil || updated != len(ids) { + d.log.Warn("retry welcome delivery", + zap.Int64("join_event_id", delivery.JoinEventID), zap.Int64("target_user_id", delivery.TargetUserID), + zap.Int("templates", len(ids)), zap.Int("updated", updated), zap.Error(err)) + } +} + +func (r *Router) welcomeDeliveryUpdates(ctx context.Context, deliveries []domain.WelcomeMessageDelivery) (*tg.Updates, error) { + if r == nil || r.deps.Channels == nil { + return nil, errors.New("channel projection is unavailable") + } + if err := validateWelcomeDeliveryGroup(deliveries); err != nil { + return nil, err + } + delivery := deliveries[0] + view, err := r.deps.Channels.ResolveChannel(ctx, delivery.TargetUserID, delivery.ChannelID) + if err != nil { + return nil, err + } + if view.Self.Status != domain.ChannelMemberActive || view.Self.JoinedAt != delivery.JoinedAt { + return nil, errWelcomeDeliveryMembershipSuperseded + } + updates := make([]tg.UpdateClass, 0, len(deliveries)) + for _, item := range deliveries { + wire := tg.EphemeralMessage{ + Out: false, WelcomeTemplate: false, + InvertMedia: item.Content.InvertMedia, Noforwards: item.Content.NoForwards, + ID: item.EphemeralID, + FromID: tgPeer(domain.Peer{Type: domain.PeerTypeChannel, ID: item.ChannelID}), + PeerID: tgPeer(domain.Peer{Type: domain.PeerTypeChannel, ID: item.ChannelID}), + ReceiverID: 0, + Date: item.JoinedAt, + Message: item.Content.Message, + } + if len(item.Content.Entities) != 0 { + wire.SetEntities(tgMessageEntities(item.Content.Entities)) + } + if item.Content.Media != nil && !item.Content.Media.IsZero() { + wire.SetMedia(tgMessageMedia(item.Content.Media)) + } + if item.Content.ReplyMarkup != nil && !item.Content.ReplyMarkup.IsZero() { + wire.SetReplyMarkup(tgReplyMarkup(item.Content.ReplyMarkup)) + } + rich, err := tgRichMessage(item.Content.RichMessage) + if err != nil { + return nil, fmt.Errorf("project welcome rich message: %w", err) + } + if rich != nil { + wire.SetRichMessage(*rich) + } + updates = append(updates, &tg.UpdateNewEphemeralMessage{Message: wire}) + } + return &tg.Updates{ + Updates: updates, + Chats: []tg.ChatClass{tgChannelChatForView(delivery.TargetUserID, view)}, + Date: delivery.JoinedAt, + Seq: 0, + }, nil +} + +func groupWelcomeMessageDeliveries(deliveries []domain.WelcomeMessageDelivery) [][]domain.WelcomeMessageDelivery { + groups := make([][]domain.WelcomeMessageDelivery, 0, len(deliveries)) + positions := make(map[int64]int, len(deliveries)) + for _, delivery := range deliveries { + position, ok := positions[delivery.JoinEventID] + if !ok { + position = len(groups) + positions[delivery.JoinEventID] = position + groups = append(groups, nil) + } + groups[position] = append(groups[position], delivery) + } + return groups +} + +func validateWelcomeDeliveryGroup(deliveries []domain.WelcomeMessageDelivery) error { + if len(deliveries) == 0 || len(deliveries) > domain.MaxWelcomeMessagesPerPeer { + return errors.New("invalid welcome delivery group size") + } + first := deliveries[0] + seenTemplates := make(map[int]struct{}, len(deliveries)) + seenEphemeral := make(map[int]struct{}, len(deliveries)) + for _, delivery := range deliveries { + if delivery.JoinEventID != first.JoinEventID || delivery.ChannelID != first.ChannelID || + delivery.TargetUserID != first.TargetUserID || delivery.JoinedAt != first.JoinedAt { + return errors.New("inconsistent welcome delivery group") + } + if _, duplicate := seenTemplates[delivery.TemplateID]; duplicate { + return errors.New("duplicate welcome delivery template") + } + if _, duplicate := seenEphemeral[delivery.EphemeralID]; duplicate { + return errors.New("duplicate welcome delivery ephemeral id") + } + seenTemplates[delivery.TemplateID] = struct{}{} + seenEphemeral[delivery.EphemeralID] = struct{}{} + } + return nil +} + +func welcomeDeliveryIDs(deliveries []domain.WelcomeMessageDelivery) []int64 { + ids := make([]int64, len(deliveries)) + for i, delivery := range deliveries { + ids[i] = delivery.ID + } + return ids +} + +func welcomeDeliveryRetryDelay(attempt int) time.Duration { + if attempt < 1 { + attempt = 1 + } + shift := attempt - 1 + if shift > 6 { + shift = 6 + } + delay := time.Second * time.Duration(1< defaultWelcomeDeliveryMaxRetry { + return defaultWelcomeDeliveryMaxRetry + } + return delay +} + +func welcomeDeliveryOwner() string { + var value [16]byte + if _, err := rand.Read(value[:]); err == nil { + return "welcome-" + hex.EncodeToString(value[:]) + } + return fmt.Sprintf("welcome-%d", time.Now().UnixNano()) +} diff --git a/internal/rpc/welcome_delivery_dispatcher_test.go b/internal/rpc/welcome_delivery_dispatcher_test.go new file mode 100644 index 00000000..cd52d5e6 --- /dev/null +++ b/internal/rpc/welcome_delivery_dispatcher_test.go @@ -0,0 +1,145 @@ +package rpc + +import ( + "context" + "testing" + "time" + + "github.com/iamxvbaba/td/clock" + "github.com/iamxvbaba/td/proto" + "github.com/iamxvbaba/td/tg" + "github.com/iamxvbaba/td/tlprofile" + "go.uber.org/zap/zaptest" + + "telesrv/internal/domain" +) + +type welcomeDeliveryTestStore struct { + acked []int64 + retried []int64 + next time.Time + reason string +} + +func (*welcomeDeliveryTestStore) ClaimWelcomeMessageDeliveries(context.Context, string, time.Time, int, time.Duration) ([]domain.WelcomeMessageDelivery, error) { + return nil, nil +} +func (s *welcomeDeliveryTestStore) AckWelcomeMessageDeliveries(_ context.Context, _ string, ids []int64, _ time.Time) (int, error) { + s.acked = append(s.acked, ids...) + return len(ids), nil +} +func (s *welcomeDeliveryTestStore) RetryWelcomeMessageDeliveries(_ context.Context, _ string, ids []int64, next time.Time, reason string) (int, error) { + s.retried = append(s.retried, ids...) + s.next, s.reason = next, reason + return len(ids), nil +} +func (*welcomeDeliveryTestStore) DeleteExpiredWelcomeMessageDeliveries(context.Context, time.Time, int) (int, error) { + return 0, nil +} + +type welcomeDeliveryTestChannels struct { + ChannelsService + view domain.ChannelView +} + +func (s *welcomeDeliveryTestChannels) ResolveChannel(context.Context, int64, int64) (domain.ChannelView, error) { + return s.view, nil +} + +type welcomeDeliveryTestSessions struct { + SessionBinder + OnlineUserProvider + online bool + sent int + semantic tlprofile.SemanticID + updates tg.UpdatesClass +} + +func (s *welcomeDeliveryTestSessions) IsUserOnline(int64) bool { return s.online } +func (s *welcomeDeliveryTestSessions) PushToUserTransientCompatible(_ context.Context, _ int64, semantic tlprofile.SemanticID, _ proto.MessageType, updates tg.UpdatesClass, _ time.Duration) (int, error) { + s.semantic, s.updates = semantic, updates + return s.sent, nil +} +func (*welcomeDeliveryTestSessions) PushToUserAuthKeyTransientCompatible(context.Context, int64, [8]byte, tlprofile.SemanticID, proto.MessageType, tg.UpdatesClass, time.Duration) (int, error) { + return 0, nil +} + +func TestWelcomeDeliveryTargetsOnlyJoiningMemberAndAcksFirstCompatibleFanout(t *testing.T) { + now := time.Now() + delivery := domain.WelcomeMessageDelivery{ + ID: 11, JoinEventID: 12, ChannelID: 3001, TargetUserID: 2001, + TemplateID: 3, EphemeralID: 77, JoinedAt: int(now.Unix()), + Content: domain.WelcomeMessageContent{Message: "welcome"}, + AttemptCount: 1, ExpiresAt: now.Add(time.Hour), + } + second := delivery + second.ID = 13 + second.TemplateID = 4 + second.EphemeralID = 78 + second.Content.Message = "second welcome" + channels := &welcomeDeliveryTestChannels{view: domain.ChannelView{ + Channel: domain.Channel{ID: delivery.ChannelID, AccessHash: 9, Title: "Group", Megagroup: true}, + Self: domain.ChannelMember{ChannelID: delivery.ChannelID, UserID: delivery.TargetUserID, Status: domain.ChannelMemberActive, JoinedAt: delivery.JoinedAt}, + }} + sessions := &welcomeDeliveryTestSessions{online: true, sent: 2} + store := &welcomeDeliveryTestStore{} + router := New(Config{OutboundPushTimeout: time.Second}, Deps{Channels: channels, Sessions: sessions}, zaptest.NewLogger(t), clock.System) + dispatcher := NewWelcomeDeliveryDispatcher(router, store, zaptest.NewLogger(t)) + dispatcher.dispatchGroup(context.Background(), []domain.WelcomeMessageDelivery{delivery, second}) + + if len(store.acked) != 2 || store.acked[0] != delivery.ID || store.acked[1] != second.ID || len(store.retried) != 0 { + t.Fatalf("acked=%v retried=%v", store.acked, store.retried) + } + if sessions.semantic != tlprofile.SemanticTypeUpdateNewEphemeralMessage { + t.Fatalf("semantic=%#x", sessions.semantic) + } + updates, ok := sessions.updates.(*tg.Updates) + if !ok || updates.Seq != 0 || len(updates.Updates) != 2 || len(updates.Chats) != 1 || len(updates.Users) != 0 { + t.Fatalf("updates=%#v", sessions.updates) + } + added, ok := updates.Updates[0].(*tg.UpdateNewEphemeralMessage) + if !ok { + t.Fatalf("update=%T", updates.Updates[0]) + } + message := added.Message + from, fromOK := message.FromID.(*tg.PeerChannel) + peer, peerOK := message.PeerID.(*tg.PeerChannel) + if message.ID != delivery.EphemeralID || message.Message != "welcome" || message.Out || message.WelcomeTemplate || + message.ReceiverID != 0 || !fromOK || !peerOK || from.ChannelID != delivery.ChannelID || peer.ChannelID != delivery.ChannelID { + t.Fatalf("welcome message=%#v", message) + } + secondAdded, ok := updates.Updates[1].(*tg.UpdateNewEphemeralMessage) + if !ok || secondAdded.Message.ID != second.EphemeralID || secondAdded.Message.Message != second.Content.Message { + t.Fatalf("second update=%#v", updates.Updates[1]) + } +} + +func TestWelcomeDeliveryRetriesOfflineAndDiscardsSupersededMembership(t *testing.T) { + now := time.Now() + delivery := domain.WelcomeMessageDelivery{ + ID: 21, JoinEventID: 22, ChannelID: 3001, TargetUserID: 2001, + TemplateID: 1, EphemeralID: 88, JoinedAt: int(now.Unix()), + Content: domain.WelcomeMessageContent{Message: "welcome"}, + AttemptCount: 3, ExpiresAt: now.Add(time.Hour), + } + store := &welcomeDeliveryTestStore{} + sessions := &welcomeDeliveryTestSessions{online: false, sent: 1} + channels := &welcomeDeliveryTestChannels{view: domain.ChannelView{ + Channel: domain.Channel{ID: delivery.ChannelID, Megagroup: true}, + Self: domain.ChannelMember{ChannelID: delivery.ChannelID, UserID: delivery.TargetUserID, Status: domain.ChannelMemberActive, JoinedAt: delivery.JoinedAt}, + }} + router := New(Config{}, Deps{Channels: channels, Sessions: sessions}, zaptest.NewLogger(t), clock.System) + dispatcher := NewWelcomeDeliveryDispatcher(router, store, zaptest.NewLogger(t)) + dispatcher.dispatchGroup(context.Background(), []domain.WelcomeMessageDelivery{delivery}) + if len(store.retried) != 1 || len(store.acked) != 0 || store.reason == "" || !store.next.After(now) { + t.Fatalf("offline acked=%v retried=%v next=%v reason=%q", store.acked, store.retried, store.next, store.reason) + } + + sessions.online = true + channels.view.Self.JoinedAt++ + store.retried = nil + dispatcher.dispatchGroup(context.Background(), []domain.WelcomeMessageDelivery{delivery}) + if len(store.acked) != 1 || len(store.retried) != 0 || sessions.updates != nil { + t.Fatalf("superseded acked=%v retried=%v updates=%#v", store.acked, store.retried, sessions.updates) + } +} diff --git a/internal/rpc/welcome_messages.go b/internal/rpc/welcome_messages.go new file mode 100644 index 00000000..b2f3a265 --- /dev/null +++ b/internal/rpc/welcome_messages.go @@ -0,0 +1,359 @@ +package rpc + +import ( + "context" + "errors" + "unicode/utf8" + + "github.com/iamxvbaba/td/tg" + "github.com/iamxvbaba/td/tgerr" + + "telesrv/internal/domain" +) + +func (r *Router) onEphemeralSendWelcomeMessage(ctx context.Context, request *tg.EphemeralSendMessageRequest) (tg.UpdatesClass, error) { + if request == nil { + return nil, inputRequestInvalidErr() + } + _, hasQueryID := request.GetQueryID() + _, hasReplyTo := request.GetReplyTo() + if !request.Welcome || r.deps.WelcomeMessages == nil || request.Peer == nil || + request.Anchor || hasReplyTo || hasQueryID || request.RandomID == 0 || + !welcomeReceiverEmpty(request.ReceiverID) { + return nil, inputRequestInvalidErr() + } + userID, peer, err := r.welcomeActorAndPeer(ctx, request.Peer) + if err != nil { + return nil, err + } + if err := r.deps.WelcomeMessages.Authorize(ctx, userID, peer); err != nil { + return nil, welcomeMessageRPCError(err) + } + content, err := r.domainWelcomeSendContent(ctx, userID, request) + if err != nil { + return nil, err + } + message, _, err := r.deps.WelcomeMessages.Create(ctx, userID, peer, request.RandomID, content) + if err != nil { + return nil, welcomeMessageRPCError(err) + } + return r.welcomeMessageUpdates(ctx, userID, message, false) +} + +func (r *Router) onEphemeralEditWelcomeMessage(ctx context.Context, request *tg.EphemeralEditMessageRequest) (tg.UpdatesClass, error) { + if request == nil || !request.Welcome || r.deps.WelcomeMessages == nil || request.Peer == nil || + request.ID <= 0 || request.ID > domain.MaxMessageBoxID || !welcomeReceiverEmpty(request.ReceiverID) { + return nil, inputRequestInvalidErr() + } + userID, peer, err := r.welcomeActorAndPeer(ctx, request.Peer) + if err != nil { + return nil, err + } + if err := r.deps.WelcomeMessages.Authorize(ctx, userID, peer); err != nil { + return nil, welcomeMessageRPCError(err) + } + fields, err := r.domainWelcomeEditFields(ctx, userID, request) + if err != nil { + return nil, err + } + message, err := r.deps.WelcomeMessages.Edit(ctx, userID, peer, request.ID, fields) + if err != nil { + return nil, welcomeMessageRPCError(err) + } + return r.welcomeMessageUpdates(ctx, userID, message, true) +} + +func (r *Router) onEphemeralDeleteWelcomeMessage(ctx context.Context, request *tg.EphemeralDeleteWelcomeMessageRequest) (bool, error) { + if request == nil || r.deps.WelcomeMessages == nil || request.Peer == nil || + request.ID <= 0 || request.ID > domain.MaxMessageBoxID { + return false, messageIDInvalidErr() + } + userID, peer, err := r.welcomeActorAndPeer(ctx, request.Peer) + if err != nil { + return false, err + } + ok, err := r.deps.WelcomeMessages.Delete(ctx, userID, peer, request.ID) + if err != nil { + return false, welcomeMessageRPCError(err) + } + return ok, nil +} + +func (r *Router) onEphemeralDeleteAllWelcomeMessages(ctx context.Context, request *tg.EphemeralDeleteAllWelcomeMessagesRequest) (bool, error) { + if request == nil || r.deps.WelcomeMessages == nil || request.Peer == nil { + return false, inputRequestInvalidErr() + } + userID, peer, err := r.welcomeActorAndPeer(ctx, request.Peer) + if err != nil { + return false, err + } + ok, err := r.deps.WelcomeMessages.DeleteAll(ctx, userID, peer) + if err != nil { + return false, welcomeMessageRPCError(err) + } + return ok, nil +} + +func (r *Router) onEphemeralGetWelcomeMessages(ctx context.Context, request *tg.EphemeralGetWelcomeMessagesRequest) (tg.EphemeralWelcomeMessagesClass, error) { + if request == nil || r.deps.WelcomeMessages == nil || request.Peer == nil || request.Hash < 0 { + return nil, inputRequestInvalidErr() + } + userID, peer, err := r.welcomeActorAndPeer(ctx, request.Peer) + if err != nil { + return nil, err + } + result, err := r.deps.WelcomeMessages.List(ctx, userID, peer, request.Hash) + if err != nil { + return nil, welcomeMessageRPCError(err) + } + if result.NotModified { + return &tg.EphemeralWelcomeMessagesNotModified{}, nil + } + messages := make([]tg.EphemeralMessage, 0, len(result.Messages)) + for _, message := range result.Messages { + wire, err := tgWelcomeMessage(message) + if err != nil { + return nil, internalErr() + } + messages = append(messages, wire) + } + return &tg.EphemeralWelcomeMessages{Hash: result.Hash, Messages: messages}, nil +} + +func (r *Router) welcomeActorAndPeer(ctx context.Context, input tg.InputPeerClass) (int64, domain.Peer, error) { + userID, _, err := r.currentUserID(ctx) + if err != nil || userID <= 0 { + return 0, domain.Peer{}, internalErr() + } + peer, err := r.checkedDomainPeerFromInputPeer(ctx, userID, input) + if err != nil { + return 0, domain.Peer{}, err + } + if peer.Type != domain.PeerTypeChannel || peer.ID <= 0 { + return 0, domain.Peer{}, peerIDInvalidErr() + } + return userID, peer, nil +} + +func welcomeReceiverEmpty(receiver tg.InputUserClass) bool { + _, ok := receiver.(*tg.InputUserEmpty) + return ok +} + +func (r *Router) domainWelcomeSendContent(ctx context.Context, userID int64, request *tg.EphemeralSendMessageRequest) (domain.WelcomeMessageContent, error) { + entities, err := welcomeEntities(userID, request.Message, request.Entities) + if err != nil { + return domain.WelcomeMessageContent{}, err + } + media, err := r.welcomeInputMedia(ctx, userID, request.Media) + if err != nil { + return domain.WelcomeMessageContent{}, err + } + markup, err := welcomeReplyMarkup(request.ReplyMarkup) + if err != nil { + return domain.WelcomeMessageContent{}, err + } + rich, err := r.domainRichMessageFromInput(ctx, request.RichMessage) + if err != nil { + return domain.WelcomeMessageContent{}, err + } + content := domain.WelcomeMessageContent{ + Message: request.Message, Entities: entities, Media: media, ReplyMarkup: markup, + RichMessage: rich, InvertMedia: request.InvertMedia, NoForwards: request.Noforwards, + } + if err := content.Validate(); err != nil { + if request.Message == "" && media == nil && rich.IsZero() { + return domain.WelcomeMessageContent{}, messageEmptyErr() + } + return domain.WelcomeMessageContent{}, inputRequestInvalidErr() + } + return content, nil +} + +func (r *Router) domainWelcomeEditFields(ctx context.Context, userID int64, request *tg.EphemeralEditMessageRequest) (domain.WelcomeMessageEditFields, error) { + var fields domain.WelcomeMessageEditFields + if message, ok := request.GetMessage(); ok { + if !utf8.ValidString(message) || utf8.RuneCountInString(message) > domain.MaxMessageTextLength { + return fields, messageTooLongErr() + } + fields.SetMessage = true + fields.Message = message + // TDesktop omits f_entities for an empty vector; a text edit therefore + // replaces, rather than accidentally retains, the old entity vector. + fields.SetEntities = true + fields.Entities = nil + } + if entities, ok := request.GetEntities(); ok { + text := request.Message + if !fields.SetMessage { + text = "" + } + converted := domainMessageEntitiesForViewer(userID, entities) + if len(converted) != len(entities) || (fields.SetMessage && !validEphemeralEntityBounds(text, converted)) { + return fields, entityBoundsInvalidErr() + } + fields.SetEntities = true + fields.Entities = converted + } + if media, ok := request.GetMedia(); ok { + resolved, err := r.welcomeInputMedia(ctx, userID, media) + if err != nil { + return fields, err + } + fields.SetMedia = true + fields.Media = resolved + fields.SetInvertMedia = true + fields.InvertMedia = request.InvertMedia + } else if request.InvertMedia { + fields.SetInvertMedia = true + fields.InvertMedia = true + } + if markup, ok := request.GetReplyMarkup(); ok { + converted, err := welcomeReplyMarkup(markup) + if err != nil { + return fields, err + } + fields.SetReplyMarkup = true + fields.ReplyMarkup = converted + } + if rich, ok := request.GetRichMessage(); ok { + converted, err := r.domainRichMessageFromInput(ctx, rich) + if err != nil { + return fields, err + } + fields.SetRichMessage = true + fields.RichMessage = converted + } + if fields.Empty() { + return fields, inputRequestInvalidErr() + } + return fields, nil +} + +func welcomeEntities(userID int64, text string, input []tg.MessageEntityClass) ([]domain.MessageEntity, error) { + if !utf8.ValidString(text) || utf8.RuneCountInString(text) > domain.MaxMessageTextLength || len(input) > domain.MaxMessageEntityCount { + return nil, messageTooLongErr() + } + entities := domainMessageEntitiesForViewer(userID, input) + if len(entities) != len(input) || !validEphemeralEntityBounds(text, entities) { + return nil, entityBoundsInvalidErr() + } + return entities, nil +} + +func (r *Router) welcomeInputMedia(ctx context.Context, userID int64, input tg.InputMediaClass) (*domain.MessageMedia, error) { + if input == nil { + return nil, nil + } + media, err := r.resolveInputMedia(ctx, userID, input) + if err != nil { + return nil, err + } + if media != nil && !ephemeralMediaAllowed(media) { + return nil, mediaTypeInvalidErr() + } + return media, nil +} + +func welcomeReplyMarkup(input tg.ReplyMarkupClass) (*domain.MessageReplyMarkup, error) { + if input == nil { + return nil, nil + } + markup, err := domainReplyMarkupForSender(input, true) + if err != nil { + return nil, replyMarkupErr(err) + } + return markup, nil +} + +func (r *Router) welcomeMessageUpdates(ctx context.Context, viewerUserID int64, message domain.WelcomeMessage, edited bool) (*tg.Updates, error) { + if r.deps.Users == nil || r.deps.Channels == nil { + return nil, internalErr() + } + users, err := r.deps.Users.ByIDs(ctx, viewerUserID, []int64{message.CreatorUserID}) + if err != nil { + return nil, internalErr() + } + view, err := r.deps.Channels.ResolveChannel(ctx, viewerUserID, message.Peer.ID) + if err != nil { + return nil, channelInvalidErr(err) + } + wire, err := tgWelcomeMessage(message) + if err != nil { + return nil, internalErr() + } + var update tg.UpdateClass = &tg.UpdateNewEphemeralMessage{Message: wire} + if edited { + update = &tg.UpdateEditEphemeralMessage{Message: wire} + } + date := message.Date + if edited && message.EditDate > 0 { + date = message.EditDate + } + return &tg.Updates{ + Updates: []tg.UpdateClass{update}, + Users: tgUsersForViewer(viewerUserID, users), + Chats: []tg.ChatClass{tgChannelChatForView(viewerUserID, view)}, + Date: date, + Seq: 0, + }, nil +} + +func tgWelcomeMessage(message domain.WelcomeMessage) (tg.EphemeralMessage, error) { + out := tg.EphemeralMessage{ + Out: true, + WelcomeTemplate: true, + InvertMedia: message.Content.InvertMedia, + Noforwards: message.Content.NoForwards, + ID: message.ID, + FromID: &tg.PeerUser{UserID: message.CreatorUserID}, + PeerID: tgPeer(message.Peer), + ReceiverID: 0, + Date: message.Date, + Message: message.Content.Message, + } + if len(message.Content.Entities) != 0 { + out.SetEntities(tgMessageEntities(message.Content.Entities)) + } + if message.Content.Media != nil && !message.Content.Media.IsZero() { + out.SetMedia(tgMessageMedia(message.Content.Media)) + } + if message.Content.ReplyMarkup != nil && !message.Content.ReplyMarkup.IsZero() { + out.SetReplyMarkup(tgReplyMarkup(message.Content.ReplyMarkup)) + } + rich, err := tgRichMessage(message.Content.RichMessage) + if err != nil { + return tg.EphemeralMessage{}, err + } + if rich != nil { + out.SetRichMessage(*rich) + } + return out, nil +} + +func welcomeMessageRPCError(err error) error { + switch { + case errors.Is(err, domain.ErrWelcomeMessageForbidden): + return tgerr.New(400, "CHAT_ADMIN_REQUIRED") + case errors.Is(err, domain.ErrWelcomeMessagePeerInvalid): + return peerIDInvalidErr() + case errors.Is(err, domain.ErrWelcomeMessageNotFound): + return messageIDInvalidErr() + case errors.Is(err, domain.ErrWelcomeMessageNotModified): + return messageNotModifiedErr() + case errors.Is(err, domain.ErrWelcomeMessageLimit): + return limitInvalidErr() + case errors.Is(err, domain.ErrWelcomeMessageInvalid), + errors.Is(err, domain.ErrWelcomeMessageRandomIDConflict): + return inputRequestInvalidErr() + case errors.Is(err, domain.ErrUserFrozen), + errors.Is(err, domain.ErrChannelInvalid), + errors.Is(err, domain.ErrChannelPrivate), + errors.Is(err, domain.ErrChannelUserBanned), + errors.Is(err, domain.ErrChannelAdminRequired), + errors.Is(err, domain.ErrChannelMonoforumUnsupported): + return channelInvalidErr(err) + default: + return internalErr() + } +} diff --git a/internal/rpc/welcome_messages_rpc_test.go b/internal/rpc/welcome_messages_rpc_test.go new file mode 100644 index 00000000..4e786034 --- /dev/null +++ b/internal/rpc/welcome_messages_rpc_test.go @@ -0,0 +1,332 @@ +package rpc + +import ( + "context" + "testing" + + "github.com/iamxvbaba/td/bin" + "github.com/iamxvbaba/td/clock" + "github.com/iamxvbaba/td/tg" + "github.com/iamxvbaba/td/tgerr" + "github.com/iamxvbaba/td/tlprofile" + "go.uber.org/zap/zaptest" + + "telesrv/internal/domain" +) + +type welcomeRPCService struct { + messages []domain.WelcomeMessage + hash int64 + hasAny bool + authorizeErr error +} + +func (s *welcomeRPCService) Authorize(context.Context, int64, domain.Peer) error { + return s.authorizeErr +} + +func (s *welcomeRPCService) Create(_ context.Context, userID int64, peer domain.Peer, randomID int64, content domain.WelcomeMessageContent) (domain.WelcomeMessage, bool, error) { + s.hash++ + message := domain.WelcomeMessage{ + ID: len(s.messages) + 1, Peer: peer, CreatorUserID: userID, Date: 1700000100, + RandomID: randomID, Content: content, CreateFingerprint: [32]byte{1}, Version: 1, + } + s.messages = append(s.messages, message) + s.hasAny = true + return message, true, nil +} +func (s *welcomeRPCService) Edit(_ context.Context, _ int64, _ domain.Peer, id int, fields domain.WelcomeMessageEditFields) (domain.WelcomeMessage, error) { + for index := range s.messages { + if s.messages[index].ID == id { + content, err := fields.Apply(s.messages[index].Content) + if err != nil { + return domain.WelcomeMessage{}, err + } + s.messages[index].Content = content + s.messages[index].EditDate = 1700000101 + s.messages[index].Version++ + s.hash++ + return s.messages[index], nil + } + } + return domain.WelcomeMessage{}, domain.ErrWelcomeMessageNotFound +} +func (s *welcomeRPCService) List(_ context.Context, _ int64, _ domain.Peer, hash int64) (domain.WelcomeMessageList, error) { + if hash == s.hash { + return domain.WelcomeMessageList{Hash: s.hash, NotModified: true}, nil + } + return domain.WelcomeMessageList{Hash: s.hash, Messages: append([]domain.WelcomeMessage(nil), s.messages...)}, nil +} +func (s *welcomeRPCService) Delete(_ context.Context, _ int64, _ domain.Peer, id int) (bool, error) { + for index := range s.messages { + if s.messages[index].ID == id { + s.messages = append(s.messages[:index], s.messages[index+1:]...) + s.hash++ + s.hasAny = len(s.messages) != 0 + return true, nil + } + } + return true, nil +} +func (s *welcomeRPCService) DeleteAll(context.Context, int64, domain.Peer) (bool, error) { + if len(s.messages) != 0 { + s.messages = nil + s.hash++ + } + s.hasAny = false + return true, nil +} +func (s *welcomeRPCService) HasAny(context.Context, domain.Peer) (bool, error) { + return s.hasAny, nil +} + +type welcomeRPCChannels struct { + ChannelsService + view domain.ChannelView +} + +func (s *welcomeRPCChannels) ResolveChannel(context.Context, int64, int64) (domain.ChannelView, error) { + return s.view, nil +} +func (s *welcomeRPCChannels) GetChannel(context.Context, int64, int64) (domain.ChannelView, error) { + return s.view, nil +} + +type welcomeRPCUsers struct { + user domain.User +} + +func (s *welcomeRPCUsers) Self(context.Context, int64) (domain.User, error) { + return s.user, nil +} +func (s *welcomeRPCUsers) ByID(context.Context, int64, int64) (domain.User, bool, error) { + return s.user, true, nil +} +func (s *welcomeRPCUsers) ByIDs(context.Context, int64, []int64) ([]domain.User, error) { + return []domain.User{s.user}, nil +} + +func newWelcomeRPCRouter(t *testing.T) (*Router, *welcomeRPCService, context.Context, *tg.InputPeerChannel) { + t.Helper() + const userID, channelID, accessHash = int64(9), int64(77), int64(88) + service := &welcomeRPCService{hash: domain.InitialWelcomeRevision} + channels := &welcomeRPCChannels{view: domain.ChannelView{ + Channel: domain.Channel{ID: channelID, AccessHash: accessHash, Title: "Welcome", Megagroup: true, Pts: 1}, + Self: domain.ChannelMember{ + ChannelID: channelID, UserID: userID, Role: domain.ChannelRoleCreator, Status: domain.ChannelMemberActive, + }, + }} + users := &welcomeRPCUsers{user: domain.User{ID: userID, AccessHash: 99, FirstName: "Owner"}} + router := New(Config{DC: 2}, Deps{WelcomeMessages: service, Channels: channels, Users: users}, zaptest.NewLogger(t), clock.System) + return router, service, WithUserID(context.Background(), userID), &tg.InputPeerChannel{ChannelID: channelID, AccessHash: accessHash} +} + +func TestWelcomeMessageRPCTextMediaRichAndCRUD(t *testing.T) { + router, service, ctx, peer := newWelcomeRPCRouter(t) + tests := []struct { + name string + request *tg.EphemeralSendMessageRequest + assert func(*testing.T, tg.EphemeralMessage) + }{ + { + name: "text", + request: &tg.EphemeralSendMessageRequest{ + Welcome: true, Peer: peer, ReceiverID: &tg.InputUserEmpty{}, Message: "Hello", RandomID: 1001, + }, + assert: func(t *testing.T, message tg.EphemeralMessage) { + if message.Message != "Hello" || message.Media != nil || !message.RichMessage.Zero() { + t.Fatalf("text welcome = %+v", message) + } + }, + }, + { + name: "media", + request: &tg.EphemeralSendMessageRequest{ + Welcome: true, Peer: peer, ReceiverID: &tg.InputUserEmpty{}, Message: "Contact", RandomID: 1002, + Media: &tg.InputMediaContact{PhoneNumber: "+10000000000", FirstName: "Guest"}, + }, + assert: func(t *testing.T, message tg.EphemeralMessage) { + if message.Media == nil { + t.Fatalf("media welcome = %+v", message) + } + }, + }, + { + name: "rich", + request: &tg.EphemeralSendMessageRequest{ + Welcome: true, Peer: peer, ReceiverID: &tg.InputUserEmpty{}, RandomID: 1003, + RichMessage: &tg.InputRichMessage{Blocks: []tg.PageBlockClass{ + &tg.PageBlockParagraph{Text: &tg.TextPlain{Text: "Rich welcome"}}, + }}, + }, + assert: func(t *testing.T, message tg.EphemeralMessage) { + if message.RichMessage.Zero() || len(message.RichMessage.Blocks) != 1 { + t.Fatalf("rich welcome = %+v", message) + } + }, + }, + } + for _, test := range tests { + t.Run(test.name, func(t *testing.T) { + updates, err := router.onEphemeralSendMessage(ctx, test.request) + if err != nil { + t.Fatal(err) + } + result, ok := updates.(*tg.Updates) + if !ok || len(result.Updates) != 1 || result.Seq != 0 { + t.Fatalf("send updates = %#v", updates) + } + created, ok := result.Updates[0].(*tg.UpdateNewEphemeralMessage) + if !ok || !created.Message.WelcomeTemplate || created.Message.PeerID == nil || + created.Message.ReceiverID != 0 || !created.Message.Out { + t.Fatalf("new welcome update = %#v", result.Updates[0]) + } + test.assert(t, created.Message) + }) + } + + edit := &tg.EphemeralEditMessageRequest{ + Welcome: true, Peer: peer, ReceiverID: &tg.InputUserEmpty{}, ID: 1, + } + edit.SetMessage("Edited") + editedUpdates, err := router.onEphemeralEditWelcomeMessage(ctx, edit) + if err != nil { + t.Fatal(err) + } + edited := editedUpdates.(*tg.Updates).Updates[0].(*tg.UpdateEditEphemeralMessage).Message + if edited.Message != "Edited" || !edited.WelcomeTemplate { + t.Fatalf("edited welcome = %+v", edited) + } + + listed, err := router.onEphemeralGetWelcomeMessages(ctx, &tg.EphemeralGetWelcomeMessagesRequest{Peer: peer, Hash: 0}) + if err != nil { + t.Fatal(err) + } + modified, ok := listed.(*tg.EphemeralWelcomeMessages) + if !ok || len(modified.Messages) != 3 || modified.Hash != service.hash { + t.Fatalf("listed welcomes = %#v", listed) + } + if same, err := router.onEphemeralGetWelcomeMessages(ctx, &tg.EphemeralGetWelcomeMessagesRequest{Peer: peer, Hash: service.hash}); err != nil { + t.Fatal(err) + } else if _, ok := same.(*tg.EphemeralWelcomeMessagesNotModified); !ok { + t.Fatalf("same hash = %#v", same) + } + if ok, err := router.onEphemeralDeleteWelcomeMessage(ctx, &tg.EphemeralDeleteWelcomeMessageRequest{Peer: peer, ID: 1}); err != nil || !ok { + t.Fatalf("delete = %v,%v", ok, err) + } + if ok, err := router.onEphemeralDeleteAllWelcomeMessages(ctx, &tg.EphemeralDeleteAllWelcomeMessagesRequest{Peer: peer}); err != nil || !ok { + t.Fatalf("delete all = %v,%v", ok, err) + } +} + +func TestWelcomeMessageFullChatProjectionAndAdminRight(t *testing.T) { + router, service, ctx, _ := newWelcomeRPCRouter(t) + channelFull := &tg.ChannelFull{} + chatFull := &tg.ChatFull{} + service.hasAny = true + if err := router.applyWelcomeMessagesToFullChat(ctx, 77, channelFull); err != nil { + t.Fatal(err) + } + if err := router.applyWelcomeMessagesToFullChat(ctx, 77, chatFull); err != nil { + t.Fatal(err) + } + if !channelFull.HasWelcomeMessages || !chatFull.HasWelcomeMessages { + t.Fatalf("full projections channel=%v chat=%v", channelFull.HasWelcomeMessages, chatFull.HasWelcomeMessages) + } + service.hasAny = false + if err := router.applyWelcomeMessagesToFullChat(ctx, 77, channelFull); err != nil { + t.Fatal(err) + } + if channelFull.HasWelcomeMessages { + t.Fatal("deleted templates left stale channelFull.has_welcome_messages") + } + rights := tgChatAdminRights(domain.ChannelAdminRights{ManageWelcomeMessages: true}) + if !rights.ManageWelcomeMessages || !domainChannelAdminRights(rights).ManageWelcomeMessages { + t.Fatalf("manage_welcome_messages conversion = %+v", rights) + } +} + +func TestWelcomeMessageAuthorizationPrecedesRichMaterialization(t *testing.T) { + router, service, ctx, peer := newWelcomeRPCRouter(t) + service.authorizeErr = domain.ErrWelcomeMessageForbidden + request := &tg.EphemeralSendMessageRequest{ + Welcome: true, Peer: peer, ReceiverID: &tg.InputUserEmpty{}, RandomID: 1001, + // This rich payload is deliberately invalid. CHAT_ADMIN_REQUIRED proves + // the permission gate ran before rich parsing or media resolution. + RichMessage: &tg.InputRichMessage{}, + } + if _, err := router.onEphemeralSendMessage(ctx, request); err == nil || !tgerr.Is(err, "CHAT_ADMIN_REQUIRED") { + t.Fatalf("unauthorized invalid rich send err=%v, want CHAT_ADMIN_REQUIRED", err) + } +} + +func TestWelcomeMessagesExactLayer229Only(t *testing.T) { + router := New(Config{DC: 2}, Deps{}, zaptest.NewLogger(t), clock.System) + peer := &tg.InputPeerChannel{ChannelID: 77, AccessHash: 88} + methods := []struct { + name string + request bin.Object + semantic tlprofile.SemanticID + }{ + {"send", &tg.EphemeralSendMessageRequest{Welcome: true, Peer: peer, ReceiverID: &tg.InputUserEmpty{}, Message: "Hello", RandomID: 1001}, tlprofile.SemanticMethodEphemeralSendMessage}, + {"edit", &tg.EphemeralEditMessageRequest{Welcome: true, Peer: peer, ReceiverID: &tg.InputUserEmpty{}, ID: 1}, tlprofile.SemanticMethodEphemeralEditMessage}, + {"delete", &tg.EphemeralDeleteWelcomeMessageRequest{Peer: peer, ID: 1}, tlprofile.SemanticMethodEphemeralDeleteWelcomeMessage}, + {"delete-all", &tg.EphemeralDeleteAllWelcomeMessagesRequest{Peer: peer}, tlprofile.SemanticMethodEphemeralDeleteAllWelcomeMessages}, + {"get", &tg.EphemeralGetWelcomeMessagesRequest{Peer: peer, Hash: 0}, tlprofile.SemanticMethodEphemeralGetWelcomeMessages}, + } + var getAdmission tlprofile.Admission + hasGetAdmission := false + for _, method := range methods { + t.Run(method.name, func(t *testing.T) { + body := encodeExactLayerRPC(t, tlprofile.Profile229, method.request) + raw := body.Copy() + admission, err := router.AdmitLayer(tlprofile.Profile229, &body, tlprofile.Limits{}) + if err != nil || admission.Call().Method() != method.semantic || body.Len() != 0 { + t.Fatalf("Layer 229 admission method=%#x want=%#x remaining=%d err=%v", admission.Call().Method(), method.semantic, body.Len(), err) + } + if method.semantic == tlprofile.SemanticMethodEphemeralGetWelcomeMessages { + getAdmission = admission + hasGetAdmission = true + } + for _, profile := range []tlprofile.Profile{tlprofile.Profile225, tlprofile.Profile226, tlprofile.Profile227, tlprofile.Profile228} { + older := bin.Buffer{Buf: append([]byte(nil), raw...)} + if _, err := router.AdmitLayer(profile, &older, tlprofile.Limits{}); err == nil { + t.Fatalf("exact Layer %d admitted Layer 229 %s RPC", profile, method.name) + } + } + }) + } + if !hasGetAdmission { + t.Fatal("missing Layer 229 getWelcomeMessages admission") + } + + message := domain.WelcomeMessage{ + ID: 1, Peer: domain.Peer{Type: domain.PeerTypeChannel, ID: 77}, CreatorUserID: 9, + Date: 1700000100, RandomID: 1001, Content: domain.WelcomeMessageContent{Message: "Hello"}, + CreateFingerprint: [32]byte{1}, Version: 1, + } + wire, err := tgWelcomeMessage(message) + if err != nil { + t.Fatal(err) + } + result := &tg.EphemeralWelcomeMessages{Hash: 2, Messages: []tg.EphemeralMessage{wire}} + var encoded229 bin.Buffer + if err := getAdmission.Call().EncodeResult(result, &encoded229); err != nil { + t.Fatalf("encode Layer 229 welcome result: %v", err) + } + for _, profile := range []tlprofile.Profile{tlprofile.Profile225, tlprofile.Profile226, tlprofile.Profile227, tlprofile.Profile228} { + var older bin.Buffer + if err := tlprofile.EncodeObject(profile, result, &older); err == nil { + t.Fatalf("exact Layer %d encoded Layer 229 welcome result", profile) + } + for _, update := range []tg.UpdateClass{ + &tg.UpdateNewEphemeralMessage{Message: wire}, + &tg.UpdateEditEphemeralMessage{Message: wire}, + } { + var olderUpdate bin.Buffer + if err := tlprofile.EncodeObject(profile, update, &olderUpdate); err == nil { + t.Fatalf("exact Layer %d encoded Layer 229 welcome update %T", profile, update) + } + } + } +} diff --git a/internal/store/account.go b/internal/store/account.go index 4f4fcf04..6157b6f3 100644 --- a/internal/store/account.go +++ b/internal/store/account.go @@ -78,6 +78,7 @@ type SavedMusicStore interface { // BusinessAutomationStore persists account-local Telegram Business settings. type BusinessAutomationStore interface { + HasBusinessAutomation(ctx context.Context, userID int64) (bool, error) GetBusinessProfile(ctx context.Context, userID int64) (domain.BusinessProfile, bool, error) SaveBusinessProfile(ctx context.Context, profile domain.BusinessProfile) error ListBusinessChatLinks(ctx context.Context, ownerUserID int64) ([]domain.BusinessChatLink, error) diff --git a/internal/store/account_lifecycle.go b/internal/store/account_lifecycle.go index cfa0d2ac..f7b26d15 100644 --- a/internal/store/account_lifecycle.go +++ b/internal/store/account_lifecycle.go @@ -7,9 +7,8 @@ import ( "telesrv/internal/domain" ) -// AccountLifecycleStore owns the atomic boundary between tombstoning a user, -// purging private account state, revoking authorizations and enqueueing -// non-pts updateUser notifications. +// AccountLifecycleStore owns the durable account-deletion decision and logical +// tombstone boundary. type AccountLifecycleStore interface { AccountDeletionSnapshot(ctx context.Context, userID int64) (domain.AccountDeletionSnapshot, bool, error) ScheduleAccountDeletion(ctx context.Context, req domain.ScheduleAccountDeletion) (domain.AccountDeletionRequest, bool, error) @@ -17,6 +16,4 @@ type AccountLifecycleStore interface { ExecuteAccountDeletion(ctx context.Context, userID int64, source domain.AccountDeletionSource, reason string, now time.Time) (domain.AccountDeletionResult, error) CancelAccountDeletion(ctx context.Context, userID int64, digest [32]byte, now time.Time) ([]domain.Authorization, error) DueAccountDeletions(ctx context.Context, now time.Time, limit int) ([]domain.AccountDeletionCandidate, error) - ClaimAccountDeletionNotifications(ctx context.Context, now time.Time, limit int, lease time.Duration) ([]domain.AccountDeletionNotification, error) - CompleteAccountDeletionNotification(ctx context.Context, id int64, now time.Time) error } diff --git a/internal/store/active_channel_ids_cache.go b/internal/store/active_channel_ids_cache.go new file mode 100644 index 00000000..7ab9b6e2 --- /dev/null +++ b/internal/store/active_channel_ids_cache.go @@ -0,0 +1,28 @@ +package store + +import "context" + +// ActiveChannelIDsPageKey identifies one immutable page of the durable +// owner-scoped active membership read model. Generation is the exact +// channel_active_memberships hash, or the documented missing-generation +// sentinel used before an owner has any membership row. +type ActiveChannelIDsPageKey struct { + UserID int64 + Generation int64 + AfterChannelID int64 + Limit int +} + +// ActiveChannelIDsPageCache is a rebuildable shared L2. Redis errors are +// returned so callers cannot silently turn an outage into a PostgreSQL +// stampede. +type ActiveChannelIDsPageCache interface { + GetActiveChannelIDsPage(context.Context, ActiveChannelIDsPageKey) ([]int64, bool, error) + PutActiveChannelIDsPage(context.Context, ActiveChannelIDsPageKey, []int64) error +} + +// ActiveChannelIDsPageLoader is the bounded authoritative cold source used +// only after a shared-cache miss. +type ActiveChannelIDsPageLoader interface { + ListActiveChannelIDsForUser(context.Context, int64, int64, int) ([]int64, error) +} diff --git a/internal/store/allocator.go b/internal/store/allocator.go index 46b03298..13ec62d1 100644 --- a/internal/store/allocator.go +++ b/internal/store/allocator.go @@ -5,10 +5,24 @@ import "context" // BoxIDAllocator 分配用户视角 message box id。box_id 允许空洞，但不能回退。 type BoxIDAllocator interface { NextBoxID(ctx context.Context, userID int64) (int, error) + // NextBoxIDs allocates one monotonic id for every distinct user in one + // backend batch. Implementations reject invalid users before allocation and + // must not turn this operation into a per-user network loop. + NextBoxIDs(ctx context.Context, userIDs []int64) (map[int64]int, error) CurrentBoxID(ctx context.Context, userID int64) (int, error) } +// DistributedBoxIDAllocator marks an allocator whose per-owner reservations +// remain atomic across processes and are safe before a PostgreSQL transaction. +// The private-send microbatch path requires this capability; local and test +// allocators stay on the single-command transaction path. +type DistributedBoxIDAllocator interface { + BoxIDAllocator + DistributedBoxIDAllocation() +} + // CounterSource 用于 Redis 计数器冷启动时从 PostgreSQL durable log 恢复当前值。 type CounterSource interface { Current(ctx context.Context, userID int64) (int, error) + CurrentBatch(ctx context.Context, userIDs []int64) (map[int64]int, error) } diff --git a/internal/store/authkey.go b/internal/store/authkey.go index c37ab88f..4e49761b 100644 --- a/internal/store/authkey.go +++ b/internal/store/authkey.go @@ -70,6 +70,17 @@ type AuthKeyClientInfo struct { AppVersion string } +// AuthKeyBindingKeys is the authoritative pair used to verify one +// auth.bindTempAuthKey proof. Stores load and activity-touch both requested +// rows in one database statement so orphan collection cannot split proof +// validation across two independent leases. +type AuthKeyBindingKeys struct { + Temporary AuthKeyData + TemporaryFound bool + Permanent AuthKeyData + PermanentFound bool +} + // MergeAuthKeyLayerObservations resolves the inherited default when a raw // temporary key is bound to its permanent identity. Positive observation IDs // are globally ordered durable evidence. Equal positive IDs must describe the @@ -104,13 +115,21 @@ func MergeAuthKeyLayerObservations( type AuthKeyStore interface { // Save 保存一条 auth key 记录；同 ID 重试只能保持 key body 与协议类型/寿命不变。 Save(ctx context.Context, k AuthKeyData) error - // Get 按 auth_key_id 查询；不存在时 found=false。 + // Get 按 auth_key_id 查询并刷新 durable orphan-activity lease；不存在时 + // found=false。只用于 physical connection 首次取得 key 或其它确需建立 + // 新 lease 的边界。 Get(ctx context.Context, id [8]byte) (data AuthKeyData, found bool, err error) + // Revalidate 在 activation claim 已可见后重新读取权威 row，但不重复刷新 + // last_used_at。首次 Get 与 active-key heartbeat 已负责跨实例 orphan lease。 + Revalidate(ctx context.Context, id [8]byte) (data AuthKeyData, found bool, err error) + // LoadBindingKeys 在一个权威调用中取得并 touch temp/permanent proof key。 + LoadBindingKeys(ctx context.Context, tempID, permID [8]byte) (AuthKeyBindingKeys, error) // UpdateClientInfo 合并更新 auth key 的客户端协商元数据。目标 key 不存在时 // 必须返回 ErrAuthKeyNotFound，禁止把缺失 primary 当成成功后继续更新 mirror。 // 空字段不覆盖已有值，layer/api_id 为 0 时不覆盖。 UpdateClientInfo(ctx context.Context, id [8]byte, info AuthKeyClientInfo) error // Delete 删除一条 auth key 记录（destroy_auth_key）。不存在时静默成功。 - // 连接层每帧按 auth_key_id 回查本接口，删除后该 key 的入站帧立即失效。 + // SessionManager/control fabric 负责 fence active connection；activation + // claim 仍通过 Revalidate 关闭首次取得与注册之间的竞态。 Delete(ctx context.Context, id [8]byte) error } diff --git a/internal/store/authkey_session_layer.go b/internal/store/authkey_session_layer.go index 77fd382f..39f3a38a 100644 --- a/internal/store/authkey_session_layer.go +++ b/internal/store/authkey_session_layer.go @@ -40,9 +40,12 @@ type AuthKeySessionLayer struct { // processes and restarts. AdvanceSessionLayer never replaces a live row with a // lower msg_id. applied is true only for an insert, a strictly newer msg_id, or // replacement of an expired row; duplicate/older evidence returns the current -// row with applied=false. A successful advance and the auth-key-wide default -// update share one store transaction and one globally ordered ObservationID; -// callers must not persist the default in a second best-effort write. +// row with applied=false. A strictly newer selector at the same Layer advances +// only the exact-session msg_id/expiry and retains its ObservationID because no +// shared profile generation changed. Inserts, expiry replacements and Layer +// changes update the auth-key-wide default in the same transaction and allocate +// one globally ordered ObservationID; callers must not persist the default in a +// second best-effort write. // AdvanceSessionLayer derives ExpiresAt from a fresh client msg_id at the store // boundary; no caller-controlled retention duration is accepted. type AuthKeySessionLayerStore interface { diff --git a/internal/store/authorization.go b/internal/store/authorization.go index bed176a7..055f76eb 100644 --- a/internal/store/authorization.go +++ b/internal/store/authorization.go @@ -2,10 +2,13 @@ package store import ( "context" + "errors" "telesrv/internal/domain" ) +var ErrAuthorizationStateChanged = errors.New("authorization state changed") + // AuthorizationStore 持久化设备授权（auth_key ↔ user 绑定）。实现见 store/memory（测试替身）、store/postgres。 type AuthorizationStore interface { Bind(ctx context.Context, a domain.Authorization) error @@ -16,8 +19,9 @@ type AuthorizationStore interface { Delete(ctx context.Context, authKeyID [8]byte) error DeleteByHash(ctx context.Context, userID, hash int64) (domain.Authorization, bool, error) DeleteByUserExcept(ctx context.Context, userID int64, keepAuthKeyID [8]byte) ([]domain.Authorization, error) - // MarkPasswordPassed 清除 auth_key 的 password_pending 标记，使其转为完全授权（两步验证通过后调用）。 - MarkPasswordPassed(ctx context.Context, authKeyID [8]byte) error + // MarkPasswordPassed 仅在 auth_key 仍属于 expectedUserID 且仍为 + // password_pending 时提升为完全授权，避免旧用户的密码 proof 提升重绑后的账号。 + MarkPasswordPassed(ctx context.Context, authKeyID [8]byte, expectedUserID int64) error } // AuthKeyAuthorityLinker is an optional in-process store-composition boundary. diff --git a/internal/store/channel.go b/internal/store/channel.go index 2c8a619e..e612c5da 100644 --- a/internal/store/channel.go +++ b/internal/store/channel.go @@ -2,11 +2,18 @@ package store import ( "context" + "errors" "time" "telesrv/internal/domain" ) +// MaxActiveChannelMemberPairs bounds every exact channel-membership store +// request independently of caller-side privacy projection admission. +const MaxActiveChannelMemberPairs = 65536 + +var ErrActiveChannelMemberPairsLimit = errors.New("active channel membership pair limit exceeded") + // ChannelStore persists Telegram channels/supergroups and their single-copy messages. type ChannelStore interface { CreateChannel(ctx context.Context, req domain.CreateChannelRequest) (domain.CreateChannelResult, error) @@ -189,6 +196,10 @@ type ChannelStore interface { ListActiveChannelMembers(ctx context.Context, viewerUserID, channelID int64, limit int) (domain.Channel, domain.ChannelMember, []domain.ChannelMember, error) ListChannelInviteAdminMemberIDs(ctx context.Context, channelID int64, limit int) ([]int64, error) FilterActiveChannelMemberIDs(ctx context.Context, channelID int64, userIDs []int64) ([]int64, error) + // FilterActiveChannelMemberPairs intersects only the supplied channel->user + // edges. Implementations must keep this as one bounded batch rather than + // widening it into channels x users or issuing one query per channel. + FilterActiveChannelMemberPairs(ctx context.Context, userIDsByChannel map[int64][]int64) (map[int64][]int64, error) // FilterChannelMessageAudienceIDs authoritatively intersects a bounded online // candidate set with users allowed to receive channel message-box updates: // active members plus non-banned public-channel preview subscribers. diff --git a/internal/store/code.go b/internal/store/code.go index a2363933..4a94d533 100644 --- a/internal/store/code.go +++ b/internal/store/code.go @@ -38,9 +38,10 @@ func LoginCodeChannelTakeable(channel string) bool { } // PhoneCodeVersionCurrent is the only version accepted by the atomic login -// state machine. Version zero is the pre-state-machine shape and deliberately -// fails closed instead of being normalized on read. -const PhoneCodeVersionCurrent = 1 +// state machine. Version 2 binds every scope to an E.164 canonical identity; +// version 1 records are invalidated across rollout instead of being normalized +// on read and accidentally authorizing a different phone owner. +const PhoneCodeVersionCurrent = 2 // PhoneCode 是一条验证码记录（与某次 sendCode 的 phone_code_hash 或邮箱验证键关联）。 // Purpose/UserID/AuthKeyID/SessionID 为已登录敏感操作提供作用域；登录验证码保持零值。 diff --git a/internal/store/contact.go b/internal/store/contact.go index 653e3110..5cb61537 100644 --- a/internal/store/contact.go +++ b/internal/store/contact.go @@ -12,6 +12,7 @@ type ContactStore interface { Get(ctx context.Context, userID, contactUserID int64) (domain.Contact, bool, error) GetMany(ctx context.Context, userID int64, contactUserIDs []int64) (map[int64]domain.Contact, error) GetReverseContacts(ctx context.Context, userID int64, ownerUserIDs []int64) (map[int64]domain.Contact, error) + ContactProjectionForViewers(ctx context.Context, viewerUserIDs, contactUserIDs []int64) (domain.ContactProjectionBatch, error) Upsert(ctx context.Context, userID int64, input domain.ContactInput) (domain.Contact, error) UpsertMany(ctx context.Context, userID int64, inputs []domain.ContactInput) ([]domain.Contact, error) UpdateNote(ctx context.Context, userID, contactUserID int64, note string, entities []domain.MessageEntity) (domain.Contact, bool, error) @@ -24,3 +25,19 @@ type ContactStore interface { IsBlocked(ctx context.Context, userID, blockedUserID int64) (bool, error) ListBlocked(ctx context.Context, userID int64, offset, limit int) (domain.BlockedContactList, error) } + +// SparseContactProjectionStore reads only the explicitly requested +// viewer->contact pairs. Unlike ContactProjectionForViewers, the two dimensions +// are not crossed: a target listed for one viewer is never read for another +// viewer unless that pair is also present in contactUserIDsByViewer. +type SparseContactProjectionStore interface { + ContactProjectionForViewerUserIDs(ctx context.Context, contactUserIDsByViewer map[int64][]int64) (domain.ContactProjectionBatch, error) +} + +// SparseReverseContactStore reads only explicitly requested owner->viewer +// relationship pairs. It is the database-facing primitive behind batched +// privacy projection: unlike GetReverseContacts it can combine different +// viewers in one query without broadening the request into a cross product. +type SparseReverseContactStore interface { + GetReverseContactsForViewerUserIDs(ctx context.Context, viewerUserIDsByOwner map[int64][]int64) (map[int64]map[int64]domain.Contact, error) +} diff --git a/internal/store/contact_reverse_batch.go b/internal/store/contact_reverse_batch.go new file mode 100644 index 00000000..b1dc83b8 --- /dev/null +++ b/internal/store/contact_reverse_batch.go @@ -0,0 +1,318 @@ +package store + +import ( + "context" + "errors" + "fmt" + "sort" + "sync" + "time" + + "telesrv/internal/domain" +) + +// ReverseContactBatchConfig bounds synchronous cross-request batching of the +// exact owner->viewer relationship facts used by privacy projection. MaxPairs +// limits the union sent to one database query; QueueSize limits accepted RPC +// requests rather than individual pairs. +type ReverseContactBatchConfig struct { + MaxPairs int + MaxWait time.Duration + QueueSize int + QueryTimeout time.Duration +} + +type reverseContactPair struct { + ownerUserID int64 + viewerUserID int64 +} + +type reverseContactBatchRequest struct { + ctx context.Context + viewerUserID int64 + ownerUserIDs []int64 + result chan reverseContactBatchResult +} + +type reverseContactBatchResult struct { + contacts map[int64]domain.Contact + err error +} + +// BatchedReverseContactStore preserves ContactStore while replacing +// GetReverseContacts with an exact-pair batch coordinator. The embedded base +// remains authoritative for writes and all other reads. There is deliberately +// no direct-query fallback: overload and shared-query failures stay visible to +// callers instead of recreating the PostgreSQL connection storm this layer is +// intended to prevent. +type BatchedReverseContactStore struct { + ContactStore + sparse SparseReverseContactStore + cfg ReverseContactBatchConfig + + queue chan reverseContactBatchRequest + stop chan struct{} + done chan struct{} + cancel context.CancelFunc + once sync.Once + gate sync.RWMutex + closed bool +} + +func NewBatchedReverseContactStore(base ContactStore, cfg ReverseContactBatchConfig) (*BatchedReverseContactStore, error) { + if base == nil { + return nil, errors.New("initialize reverse-contact batcher: nil store") + } + sparse, ok := base.(SparseReverseContactStore) + if !ok { + return nil, errors.New("initialize reverse-contact batcher: store does not support sparse reverse reads") + } + if cfg.MaxPairs <= 0 || cfg.MaxPairs > 1<<16 { + return nil, fmt.Errorf("initialize reverse-contact batcher: max pairs %d outside [1,65536]", cfg.MaxPairs) + } + if cfg.MaxWait <= 0 || cfg.MaxWait > 10*time.Millisecond { + return nil, fmt.Errorf("initialize reverse-contact batcher: max wait %v outside (0,10ms]", cfg.MaxWait) + } + if cfg.QueueSize <= 0 || cfg.QueueSize > 1<<20 { + return nil, fmt.Errorf("initialize reverse-contact batcher: queue size %d outside [1,1048576]", cfg.QueueSize) + } + if cfg.QueryTimeout <= 0 || cfg.QueryTimeout > 30*time.Second { + return nil, fmt.Errorf("initialize reverse-contact batcher: query timeout %v outside (0,30s]", cfg.QueryTimeout) + } + workerCtx, cancel := context.WithCancel(context.Background()) + s := &BatchedReverseContactStore{ + ContactStore: base, + sparse: sparse, + cfg: cfg, + queue: make(chan reverseContactBatchRequest, cfg.QueueSize), + stop: make(chan struct{}), + done: make(chan struct{}), + cancel: cancel, + } + go s.run(workerCtx) + return s, nil +} + +func (s *BatchedReverseContactStore) GetReverseContacts( + ctx context.Context, + viewerUserID int64, + ownerUserIDs []int64, +) (map[int64]domain.Contact, error) { + out := make(map[int64]domain.Contact, len(ownerUserIDs)) + if viewerUserID == 0 || len(ownerUserIDs) == 0 { + return out, nil + } + if ctx == nil { + ctx = context.Background() + } + owners := canonicalPositiveInt64(ownerUserIDs) + for start := 0; start < len(owners); start += s.cfg.MaxPairs { + end := start + s.cfg.MaxPairs + if end > len(owners) { + end = len(owners) + } + loaded, err := s.readChunk(ctx, viewerUserID, owners[start:end]) + if err != nil { + return nil, err + } + for ownerID, contact := range loaded { + out[ownerID] = contact + } + } + return out, nil +} + +// ContactProjectionForViewerUserIDs preserves the optional sparse projection +// capability through this wrapper so the outer contact cache does not fall +// back to a dense viewers x targets query. +func (s *BatchedReverseContactStore) ContactProjectionForViewerUserIDs( + ctx context.Context, + requested map[int64][]int64, +) (domain.ContactProjectionBatch, error) { + projection, ok := s.ContactStore.(SparseContactProjectionStore) + if !ok { + return domain.ContactProjectionBatch{}, errors.New("contact store does not support sparse projection") + } + return projection.ContactProjectionForViewerUserIDs(ctx, requested) +} + +func (s *BatchedReverseContactStore) readChunk( + ctx context.Context, + viewerUserID int64, + ownerUserIDs []int64, +) (map[int64]domain.Contact, error) { + request := reverseContactBatchRequest{ + ctx: ctx, + viewerUserID: viewerUserID, + ownerUserIDs: append([]int64(nil), ownerUserIDs...), + result: make(chan reverseContactBatchResult, 1), + } + s.gate.RLock() + if s.closed { + s.gate.RUnlock() + return nil, context.Canceled + } + select { + case s.queue <- request: + case <-ctx.Done(): + s.gate.RUnlock() + return nil, ctx.Err() + } + s.gate.RUnlock() + + select { + case result := <-request.result: + return result.contacts, result.err + case <-ctx.Done(): + return nil, ctx.Err() + } +} + +func (s *BatchedReverseContactStore) Close() { + if s == nil { + return + } + s.once.Do(func() { + s.gate.Lock() + s.closed = true + close(s.stop) + s.cancel() + s.gate.Unlock() + <-s.done + }) +} + +func (s *BatchedReverseContactStore) run(ctx context.Context) { + defer close(s.done) + var carry *reverseContactBatchRequest + for { + batch := make([]reverseContactBatchRequest, 0, 32) + pairCount := 0 + if carry != nil { + batch = append(batch, *carry) + pairCount = len(carry.ownerUserIDs) + carry = nil + } else { + select { + case request := <-s.queue: + batch = append(batch, request) + pairCount = len(request.ownerUserIDs) + case <-s.stop: + s.failQueued(context.Canceled, nil) + return + } + } + + timer := time.NewTimer(s.cfg.MaxWait) + collect: + for pairCount < s.cfg.MaxPairs { + select { + case request := <-s.queue: + if pairCount+len(request.ownerUserIDs) > s.cfg.MaxPairs { + carry = &request + break collect + } + batch = append(batch, request) + pairCount += len(request.ownerUserIDs) + case <-timer.C: + break collect + case <-s.stop: + if !timer.Stop() { + select { + case <-timer.C: + default: + } + } + if carry != nil { + batch = append(batch, *carry) + carry = nil + } + s.failQueued(context.Canceled, batch) + return + } + } + if !timer.Stop() { + select { + case <-timer.C: + default: + } + } + s.execute(ctx, batch) + } +} + +func (s *BatchedReverseContactStore) execute(ctx context.Context, batch []reverseContactBatchRequest) { + active := batch[:0] + seen := make(map[reverseContactPair]struct{}) + requested := make(map[int64][]int64) + for _, request := range batch { + if err := request.ctx.Err(); err != nil { + request.result <- reverseContactBatchResult{err: err} + continue + } + active = append(active, request) + for _, ownerID := range request.ownerUserIDs { + pair := reverseContactPair{ownerUserID: ownerID, viewerUserID: request.viewerUserID} + if _, duplicate := seen[pair]; duplicate { + continue + } + seen[pair] = struct{}{} + requested[ownerID] = append(requested[ownerID], request.viewerUserID) + } + } + if len(active) == 0 { + return + } + queryCtx, cancel := context.WithTimeout(ctx, s.cfg.QueryTimeout) + loaded, err := s.sparse.GetReverseContactsForViewerUserIDs(queryCtx, requested) + cancel() + if err != nil { + for _, request := range active { + request.result <- reverseContactBatchResult{err: err} + } + return + } + for _, request := range active { + contacts := make(map[int64]domain.Contact, len(request.ownerUserIDs)) + for _, ownerID := range request.ownerUserIDs { + if contact, found := loaded[ownerID][request.viewerUserID]; found { + contacts[ownerID] = contact + } + } + request.result <- reverseContactBatchResult{contacts: contacts} + } +} + +func (s *BatchedReverseContactStore) failQueued(err error, pending []reverseContactBatchRequest) { + for _, request := range pending { + request.result <- reverseContactBatchResult{err: err} + } + for { + select { + case request := <-s.queue: + request.result <- reverseContactBatchResult{err: err} + default: + return + } + } +} + +func canonicalPositiveInt64(values []int64) []int64 { + seen := make(map[int64]struct{}, len(values)) + out := make([]int64, 0, len(values)) + for _, value := range values { + if value == 0 { + continue + } + if _, duplicate := seen[value]; duplicate { + continue + } + seen[value] = struct{}{} + out = append(out, value) + } + sort.Slice(out, func(i, j int) bool { return out[i] < out[j] }) + return out +} + +var _ ContactStore = (*BatchedReverseContactStore)(nil) +var _ SparseContactProjectionStore = (*BatchedReverseContactStore)(nil) diff --git a/internal/store/contact_reverse_batch_test.go b/internal/store/contact_reverse_batch_test.go new file mode 100644 index 00000000..2a6a8d06 --- /dev/null +++ b/internal/store/contact_reverse_batch_test.go @@ -0,0 +1,146 @@ +package store_test + +import ( + "context" + "errors" + "sync" + "testing" + "time" + + "telesrv/internal/domain" + "telesrv/internal/store" + "telesrv/internal/store/memory" +) + +type recordingSparseReverseStore struct { + store.ContactStore + + mu sync.Mutex + calls int + pairCount int +} + +func (s *recordingSparseReverseStore) GetReverseContactsForViewerUserIDs( + ctx context.Context, + requested map[int64][]int64, +) (map[int64]map[int64]domain.Contact, error) { + out := make(map[int64]map[int64]domain.Contact, len(requested)) + pairs := 0 + for ownerID, viewerIDs := range requested { + for _, viewerID := range viewerIDs { + pairs++ + contact, found, err := s.ContactStore.Get(ctx, ownerID, viewerID) + if err != nil { + return nil, err + } + if found { + if out[ownerID] == nil { + out[ownerID] = make(map[int64]domain.Contact) + } + out[ownerID][viewerID] = contact + } + } + } + s.mu.Lock() + s.calls++ + s.pairCount += pairs + s.mu.Unlock() + return out, nil +} + +func (s *recordingSparseReverseStore) stats() (int, int) { + s.mu.Lock() + defer s.mu.Unlock() + return s.calls, s.pairCount +} + +func TestBatchedReverseContactStoreCombinesExactPairs(t *testing.T) { + ctx := context.Background() + base := memory.NewContactStore() + const requestCount = 32 + for index := 0; index < requestCount; index++ { + viewerID := int64(10_000 + index) + ownerID := int64(20_000 + index) + if _, err := base.Upsert(ctx, ownerID, domain.ContactInput{ + ContactUserID: viewerID, + FirstName: "viewer", + }); err != nil { + t.Fatal(err) + } + if index%2 == 0 { + if _, err := base.SetCloseFriends(ctx, ownerID, []int64{viewerID}); err != nil { + t.Fatal(err) + } + } + } + recording := &recordingSparseReverseStore{ContactStore: base} + batched, err := store.NewBatchedReverseContactStore(recording, store.ReverseContactBatchConfig{ + MaxPairs: 128, MaxWait: 10 * time.Millisecond, QueueSize: 64, QueryTimeout: time.Second, + }) + if err != nil { + t.Fatal(err) + } + t.Cleanup(batched.Close) + + start := make(chan struct{}) + errs := make(chan error, requestCount) + var wg sync.WaitGroup + for index := 0; index < requestCount; index++ { + index := index + wg.Add(1) + go func() { + defer wg.Done() + <-start + viewerID := int64(10_000 + index) + ownerID := int64(20_000 + index) + contacts, getErr := batched.GetReverseContacts(ctx, viewerID, []int64{ownerID, 99_999, ownerID}) + if getErr != nil { + errs <- getErr + return + } + contact, found := contacts[ownerID] + if !found || contact.User.ID != viewerID || contact.CloseFriend != (index%2 == 0) { + errs <- errors.New("batched reverse-contact result mismatch") + } + if _, found := contacts[99_999]; found { + errs <- errors.New("negative reverse-contact pair returned a value") + } + }() + } + close(start) + wg.Wait() + close(errs) + for err := range errs { + t.Fatal(err) + } + calls, pairs := recording.stats() + if calls <= 0 || calls > 4 { + t.Fatalf("sparse reverse calls = %d, want 1..4 for %d concurrent requests", calls, requestCount) + } + // Every request contributes exactly one positive and one negative pair; + // duplicate owner ids must be canonicalized before queue admission. + if pairs != requestCount*2 { + t.Fatalf("queried pairs = %d, want %d exact pairs", pairs, requestCount*2) + } + + batched.Close() + if _, err := batched.GetReverseContacts(ctx, 10_000, []int64{20_000}); !errors.Is(err, context.Canceled) { + t.Fatalf("GetReverseContacts after close err = %v", err) + } +} + +func TestNewBatchedReverseContactStoreRejectsInvalidConfig(t *testing.T) { + base := &recordingSparseReverseStore{ContactStore: memory.NewContactStore()} + for _, cfg := range []store.ReverseContactBatchConfig{ + {}, + {MaxPairs: 1, MaxWait: 11 * time.Millisecond, QueueSize: 1, QueryTimeout: time.Second}, + {MaxPairs: 1, MaxWait: time.Microsecond, QueueSize: 0, QueryTimeout: time.Second}, + {MaxPairs: 1, MaxWait: time.Microsecond, QueueSize: 1, QueryTimeout: 31 * time.Second}, + } { + batcher, err := store.NewBatchedReverseContactStore(base, cfg) + if err == nil { + batcher.Close() + t.Fatalf("invalid config accepted: %+v", cfg) + } + } +} diff --git a/internal/store/dialog.go b/internal/store/dialog.go index 86f9b1e9..c92630fc 100644 --- a/internal/store/dialog.go +++ b/internal/store/dialog.go @@ -18,6 +18,7 @@ type DialogStore interface { GetDraft(ctx context.Context, userID int64, peer domain.Peer, topMessageID int) (domain.DialogDraft, bool, error) DeleteDraft(ctx context.Context, userID int64, peer domain.Peer, topMessageID int) (bool, error) ListDrafts(ctx context.Context, userID int64, limit int) ([]domain.DialogDraft, error) + ListDraftsByPeers(ctx context.Context, userID int64, peers []domain.Peer) ([]domain.DialogDraft, error) ClearDrafts(ctx context.Context, userID int64, limit int) ([]domain.DialogDraft, error) MarkRead(ctx context.Context, userID int64, peer domain.Peer, maxID int) (domain.ReadHistoryResult, error) // SetPinned 置顶/取消置顶一条会话；order 在会话当前 folder 内分配， diff --git a/internal/store/dialog_list_snapshot_cache.go b/internal/store/dialog_list_snapshot_cache.go new file mode 100644 index 00000000..c68e3ff2 --- /dev/null +++ b/internal/store/dialog_list_snapshot_cache.go @@ -0,0 +1,39 @@ +package store + +import ( + "context" + + "telesrv/internal/domain" +) + +// DialogListSnapshotCacheKey identifies one all-built-in-folders owner header +// base. OwnerHash is the durable dialog_owner generation and is part of the +// shared cache key; shared channel generations are validated from Value. +type DialogListSnapshotCacheKey struct { + UserID int64 + OwnerHash int64 +} + +// DialogListSnapshotCacheValue is a domain-only materialized owner projection. +// It contains owner dialog facts and private top-message/peer payloads covered +// by dialog_owner plus the recorded channel_base dependency hash. Shared +// channel rows/top messages are hydrated through their channel-keyed caches so +// they are not duplicated once per member. Cloud drafts are owner-scoped and +// covered by dialog_owner, so they are materialized with Dialogs; presence, +// privacy, notify settings and TL values remain response-time overlays. +type DialogListSnapshotCacheValue struct { + DependencyHash int64 + Dialogs []domain.Dialog + Messages []domain.Message + Users []domain.User + State domain.UpdateState + ArchiveSummary *domain.DialogArchiveSummary +} + +// DialogListSnapshotCache is a rebuildable shared L2. Transport, decode and +// write failures are returned to the caller so production does not silently +// stampede PostgreSQL through an unversioned fallback. +type DialogListSnapshotCache interface { + GetDialogListSnapshot(context.Context, DialogListSnapshotCacheKey) (DialogListSnapshotCacheValue, bool, error) + PutDialogListSnapshot(context.Context, DialogListSnapshotCacheKey, DialogListSnapshotCacheValue) error +} diff --git a/internal/store/memory/auth.go b/internal/store/memory/auth.go index d5bd0cb6..c52fa777 100644 --- a/internal/store/memory/auth.go +++ b/internal/store/memory/auth.go @@ -79,6 +79,23 @@ func (s *AuthKeyStore) Get(_ context.Context, id [8]byte) (store.AuthKeyData, bo return k, ok, nil } +func (s *AuthKeyStore) Revalidate(ctx context.Context, id [8]byte) (store.AuthKeyData, bool, error) { + return s.Get(ctx, id) +} + +func (s *AuthKeyStore) LoadBindingKeys(_ context.Context, tempID, permID [8]byte) (store.AuthKeyBindingKeys, error) { + s.state.mu.RLock() + temp, tempFound := s.state.keys[tempID] + perm, permFound := s.state.keys[permID] + s.state.mu.RUnlock() + return store.AuthKeyBindingKeys{ + Temporary: temp, + TemporaryFound: tempFound, + Permanent: perm, + PermanentFound: permFound, + }, nil +} + func (s *AuthKeyStore) UpdateClientInfo(_ context.Context, id [8]byte, info store.AuthKeyClientInfo) error { s.state.mu.Lock() k, ok := s.state.keys[id] @@ -198,19 +215,24 @@ func NewTempAuthKeyBindingStore(authKeys *AuthKeyStore) *TempAuthKeyBindingStore return &TempAuthKeyBindingStore{state: authKeys.state} } -func (s *TempAuthKeyBindingStore) Save(_ context.Context, b domain.TempAuthKeyBinding) error { +func (s *TempAuthKeyBindingStore) Save(ctx context.Context, b domain.TempAuthKeyBinding) error { + _, err := s.SaveWithState(ctx, b) + return err +} + +func (s *TempAuthKeyBindingStore) SaveWithState(_ context.Context, b domain.TempAuthKeyBinding) (domain.TempAuthKeyBindingResult, error) { b.EncryptedMessage = append([]byte(nil), b.EncryptedMessage...) s.state.mu.Lock() defer s.state.mu.Unlock() if current, ok := s.state.bindings[b.TempAuthKeyID]; ok && current.PermAuthKeyID != b.PermAuthKeyID { - return store.ErrTempAuthKeyAlreadyBound + return domain.TempAuthKeyBindingResult{}, store.ErrTempAuthKeyAlreadyBound } temp, tempFound := s.state.keys[b.TempAuthKeyID] var permID [8]byte binary.LittleEndian.PutUint64(permID[:], uint64(b.PermAuthKeyID)) perm, permFound := s.state.keys[permID] if !tempFound || !permFound || temp.ExpiresAt <= 0 || perm.ExpiresAt != 0 || b.ExpiresAt != temp.ExpiresAt { - return store.ErrAuthKeyBindingInvalid + return domain.TempAuthKeyBindingResult{}, store.ErrAuthKeyBindingInvalid } // Binding and Layer-default normalization are one state transition. Exact // session evidence remains keyed by the raw temp key; only the inherited @@ -220,7 +242,7 @@ func (s *TempAuthKeyBindingStore) Save(_ context.Context, b domain.TempAuthKeyBi perm.Layer, perm.LayerObservationID, ) if err != nil { - return err + return domain.TempAuthKeyBindingResult{}, err } temp.Layer, temp.LayerObservationID = layer, observationID perm.Layer, perm.LayerObservationID = layer, observationID @@ -228,7 +250,7 @@ func (s *TempAuthKeyBindingStore) Save(_ context.Context, b domain.TempAuthKeyBi s.state.keys[permID] = perm s.state.bindings[b.TempAuthKeyID] = b s.state.mirrorAuthorizationLayersLocked([][8]byte{b.TempAuthKeyID, permID}, layer) - return nil + return domain.TempAuthKeyBindingResult{Layer: layer, LayerObservationID: observationID}, nil } func (s *TempAuthKeyBindingStore) GetByTemp(_ context.Context, tempAuthKeyID [8]byte) (domain.TempAuthKeyBinding, bool, error) { @@ -319,9 +341,9 @@ func (s *AuthorizationStore) Bind(_ context.Context, a domain.Authorization) err if a.Hash == 0 { a.Hash = int64(binary.LittleEndian.Uint64(a.AuthKeyID[:])) } - if a.CreatedAt.IsZero() { - a.CreatedAt = now - } + // Bind is an explicit login boundary. Metadata-only refreshes use + // UpdateClientInfo and must not reset the session age. + a.CreatedAt = now a.ActiveAt = now s.linkMu.RLock() if s.authKeys != nil { @@ -353,9 +375,6 @@ func (s *AuthorizationStore) Bind(_ context.Context, a domain.Authorization) err } func (s *AuthorizationStore) bindLocked(a domain.Authorization) { - if existing, ok := s.m[a.AuthKeyID]; ok && !existing.CreatedAt.IsZero() { - a.CreatedAt = existing.CreatedAt - } s.m[a.AuthKeyID] = a } @@ -419,14 +438,18 @@ func mergeAuthorizationClientInfo(a *domain.Authorization, info domain.AuthKeyCl a.ActiveAt = time.Now() } -func (s *AuthorizationStore) MarkPasswordPassed(_ context.Context, id [8]byte) error { +func (s *AuthorizationStore) MarkPasswordPassed(_ context.Context, id [8]byte, expectedUserID int64) error { s.mu.Lock() - if a, ok := s.m[id]; ok { - a.PasswordPending = false - a.ActiveAt = time.Now() - s.m[id] = a + defer s.mu.Unlock() + a, ok := s.m[id] + if !ok || expectedUserID == 0 || a.UserID != expectedUserID || !a.PasswordPending { + return store.ErrAuthorizationStateChanged } - s.mu.Unlock() + now := time.Now() + a.PasswordPending = false + a.CreatedAt = now + a.ActiveAt = now + s.m[id] = a return nil } diff --git a/internal/store/memory/authkey_session_layer.go b/internal/store/memory/authkey_session_layer.go index a4594855..c42f0d6b 100644 --- a/internal/store/memory/authkey_session_layer.go +++ b/internal/store/memory/authkey_session_layer.go @@ -80,6 +80,15 @@ func (s *AuthKeyStore) AdvanceSessionLayer( return store.AuthKeySessionLayer{}, false, store.ErrAuthKeyBindingInvalid } } + if found && now.Before(current.ExpiresAt) && layer == current.Layer { + current.MessageID = msgID + current.ExpiresAt = expiresAt + stored := current + stored.SharedDefault = false + s.state.sessionLayers[key] = stored + current.SharedDefault = s.state.sessionLayerIsSharedDefaultLocked(rawAuthKeyID, current) + return current, true, nil + } if s.state.nextLayerObservation == math.MaxInt64 { return store.AuthKeySessionLayer{}, false, store.ErrAuthKeySessionLayerInvalid } diff --git a/internal/store/memory/authkey_session_layer_test.go b/internal/store/memory/authkey_session_layer_test.go index 74195bf1..c5ae97d6 100644 --- a/internal/store/memory/authkey_session_layer_test.go +++ b/internal/store/memory/authkey_session_layer_test.go @@ -26,8 +26,9 @@ func TestAuthKeySessionLayerOrdersRestartEvidenceAndBindingDefaults(t *testing.T } now := time.Now().UTC() firstMsgID := authKeySessionLayerTestMsgID(now, 1) - newerMsgID := authKeySessionLayerTestMsgID(now, 2) - otherMsgID := authKeySessionLayerTestMsgID(now, 3) + sameLayerMsgID := authKeySessionLayerTestMsgID(now, 2) + newerMsgID := authKeySessionLayerTestMsgID(now, 3) + otherMsgID := authKeySessionLayerTestMsgID(now, 4) first, applied, err := keys.AdvanceSessionLayer(ctx, temp, 10, 220, firstMsgID) if err != nil || !applied || !first.SharedDefault || first.ObservationID <= 0 { @@ -48,6 +49,17 @@ func TestAuthKeySessionLayerOrdersRestartEvidenceAndBindingDefaults(t *testing.T t.Fatalf("bound default %x = (%+v,%v,%v)", id, got, found, err) } } + sameLayer, applied, err := keys.AdvanceSessionLayer(ctx, temp, 10, 220, sameLayerMsgID) + if err != nil || !applied || !sameLayer.SharedDefault || sameLayer.MessageID != sameLayerMsgID || + sameLayer.ObservationID != first.ObservationID { + t.Fatalf("same-Layer high-water advance = (%+v,%v,%v)", sameLayer, applied, err) + } + for _, id := range [][8]byte{temp, perm} { + got, found, err := keys.Get(ctx, id) + if err != nil || !found || got.Layer != 220 || got.LayerObservationID != first.ObservationID { + t.Fatalf("same-Layer default rewrite %x = (%+v,%v,%v)", id, got, found, err) + } + } newer, applied, err := keys.AdvanceSessionLayer(ctx, temp, 10, 227, newerMsgID) if err != nil || !applied || !newer.SharedDefault || newer.ObservationID <= first.ObservationID { diff --git a/internal/store/memory/authorization_test.go b/internal/store/memory/authorization_test.go new file mode 100644 index 00000000..05f33760 --- /dev/null +++ b/internal/store/memory/authorization_test.go @@ -0,0 +1,63 @@ +package memory + +import ( + "context" + "errors" + "testing" + "time" + + "telesrv/internal/domain" + "telesrv/internal/store" +) + +func TestAuthorizationLoginAgeAndPasswordPromotionCAS(t *testing.T) { + ctx := context.Background() + auths := NewAuthorizationStore() + key := [8]byte{0x91} + old := time.Now().Add(-48 * time.Hour) + + if err := auths.Bind(ctx, domain.Authorization{ + AuthKeyID: key, UserID: 101, CreatedAt: old, + }); err != nil { + t.Fatal(err) + } + first, found, err := auths.ByAuthKey(ctx, key) + if err != nil || !found || !first.CreatedAt.After(old) { + t.Fatalf("first login authorization=%+v found=%v err=%v", first, found, err) + } + time.Sleep(2 * time.Millisecond) + if err := auths.Bind(ctx, domain.Authorization{AuthKeyID: key, UserID: 101}); err != nil { + t.Fatal(err) + } + second, _, _ := auths.ByAuthKey(ctx, key) + if !second.CreatedAt.After(first.CreatedAt) { + t.Fatalf("same-owner login kept created_at=%v, want newer than %v", second.CreatedAt, first.CreatedAt) + } + + if err := auths.Bind(ctx, domain.Authorization{ + AuthKeyID: key, UserID: 101, PasswordPending: true, + }); err != nil { + t.Fatal(err) + } + if err := auths.Bind(ctx, domain.Authorization{ + AuthKeyID: key, UserID: 202, PasswordPending: true, + }); err != nil { + t.Fatal(err) + } + pendingB, _, _ := auths.ByAuthKey(ctx, key) + if err := auths.MarkPasswordPassed(ctx, key, 101); !errors.Is(err, store.ErrAuthorizationStateChanged) { + t.Fatalf("stale A proof err=%v, want state changed", err) + } + stillPendingB, _, _ := auths.ByAuthKey(ctx, key) + if stillPendingB.UserID != 202 || !stillPendingB.PasswordPending { + t.Fatalf("stale A proof changed B authorization: %+v", stillPendingB) + } + time.Sleep(2 * time.Millisecond) + if err := auths.MarkPasswordPassed(ctx, key, 202); err != nil { + t.Fatalf("promote B: %v", err) + } + passedB, _, _ := auths.ByAuthKey(ctx, key) + if passedB.PasswordPending || !passedB.CreatedAt.After(pendingB.CreatedAt) { + t.Fatalf("promoted B authorization=%+v, want fresh fully-authorized session", passedB) + } +} diff --git a/internal/store/memory/bot.go b/internal/store/memory/bot.go index ef0b31bc..3bcf0625 100644 --- a/internal/store/memory/bot.go +++ b/internal/store/memory/bot.go @@ -62,6 +62,10 @@ func NewBotStore(users *UserStore) *BotStore { s.byID[domain.BotFatherUserID] = botFatherSeedProfile() s.byID[domain.StickersBotUserID] = stickersSeedProfile() s.byID[domain.ChatBotUserID] = chatBotSeedProfile() + s.byID[domain.GifBotUserID] = domain.BotProfile{ + BotUserID: domain.GifBotUserID, OwnerUserID: domain.GifBotUserID, + Description: "Search the server-curated GIF catalog.", InlinePlaceholder: "Search GIFs", + } return s } @@ -89,7 +93,7 @@ func stickersSeedProfile() domain.BotProfile { return domain.BotProfile{ BotUserID: domain.StickersBotUserID, OwnerUserID: domain.StickersBotUserID, - Description: "Create custom sticker and emoji packs for telesrv.", + Description: domain.StickersBotDescription(), Commands: []domain.BotCommand{ {Command: "start", Description: "start the sticker pack assistant"}, {Command: "help", Description: "show help"}, @@ -108,7 +112,7 @@ func chatBotSeedProfile() domain.BotProfile { return domain.BotProfile{ BotUserID: domain.ChatBotUserID, OwnerUserID: domain.ChatBotUserID, - Description: "Chat with the configured telesrv AI provider.", + Description: domain.ChatBotDescription(), Commands: []domain.BotCommand{ {Command: "start", Description: "start chatting"}, {Command: "help", Description: "show help"}, diff --git a/internal/store/memory/business.go b/internal/store/memory/business.go index f24eb4df..89d13bc3 100644 --- a/internal/store/memory/business.go +++ b/internal/store/memory/business.go @@ -9,6 +9,14 @@ import ( "telesrv/internal/domain" ) +func (s *PasswordStore) HasBusinessAutomation(_ context.Context, userID int64) (bool, error) { + s.mu.RLock() + profile, hasProfile := s.businessProfiles[userID] + bot, hasBot := s.connectedBusinessBots[userID] + s.mu.RUnlock() + return hasProfile && (profile.Greeting != nil || profile.Away != nil) || hasBot && bot.BotUserID != 0, nil +} + func (s *PasswordStore) GetBusinessProfile(_ context.Context, userID int64) (domain.BusinessProfile, bool, error) { s.mu.RLock() profile, ok := s.businessProfiles[userID] diff --git a/internal/store/memory/channel_core.go b/internal/store/memory/channel_core.go index b0214ff5..61810fb7 100644 --- a/internal/store/memory/channel_core.go +++ b/internal/store/memory/channel_core.go @@ -56,6 +56,13 @@ func (s *ChannelStore) CreateChannel(_ context.Context, req domain.CreateChannel AdminRights: domain.CreatorChannelAdminRights(), } s.channels[channelID] = channel + // Channel clients initialize an unknown message box at PTS 1. Reserve that + // state without emitting an event so the real create service message is 2/1. + s.ptsSeq[channelID] = domain.InitialChannelPts + s.retention[channelID] = domain.ChannelUpdateRetentionCheckpoint{ + ChannelID: channelID, + RetainedThroughPts: domain.InitialChannelPts, + } s.invites[inviteHash] = domain.ChannelInvite{ ChannelID: channelID, InviteID: inviteID, diff --git a/internal/store/memory/channel_members.go b/internal/store/memory/channel_members.go index 00daed7c..d003deff 100644 --- a/internal/store/memory/channel_members.go +++ b/internal/store/memory/channel_members.go @@ -3,10 +3,13 @@ package memory import ( "context" "errors" + "fmt" "sort" "strconv" "strings" + "telesrv/internal/domain" + "telesrv/internal/store" ) func (s *ChannelStore) GetParticipants(_ context.Context, viewerUserID, channelID int64, filter domain.ChannelParticipantsFilter, offset, limit int) (domain.ChannelParticipantList, error) { @@ -892,6 +895,45 @@ func (s *ChannelStore) FilterActiveChannelMemberIDs(_ context.Context, channelID return out, nil } +func (s *ChannelStore) FilterActiveChannelMemberPairs(_ context.Context, userIDsByChannel map[int64][]int64) (map[int64][]int64, error) { + requested := make(map[int64][]int64) + seen := make(map[[2]int64]struct{}) + for channelID, userIDs := range userIDsByChannel { + if channelID == 0 { + continue + } + for _, userID := range userIDs { + if userID == 0 { + continue + } + pair := [2]int64{channelID, userID} + if _, ok := seen[pair]; ok { + continue + } + if len(seen) >= store.MaxActiveChannelMemberPairs { + return nil, fmt.Errorf("%w: maximum %d", store.ErrActiveChannelMemberPairsLimit, store.MaxActiveChannelMemberPairs) + } + seen[pair] = struct{}{} + requested[channelID] = append(requested[channelID], userID) + } + } + + s.mu.RLock() + defer s.mu.RUnlock() + out := make(map[int64][]int64, len(requested)) + for channelID, userIDs := range requested { + members := s.members[channelID] + for _, userID := range userIDs { + member, ok := members[userID] + if ok && member.Status == domain.ChannelMemberActive { + out[channelID] = append(out[channelID], userID) + } + } + sort.Slice(out[channelID], func(i, j int) bool { return out[channelID][i] < out[channelID][j] }) + } + return out, nil +} + func (s *ChannelStore) FilterChannelMessageAudienceIDs(_ context.Context, channelID int64, userIDs []int64) ([]int64, error) { s.mu.RLock() defer s.mu.RUnlock() diff --git a/internal/store/memory/channel_members_sparse_test.go b/internal/store/memory/channel_members_sparse_test.go new file mode 100644 index 00000000..ae8a9df0 --- /dev/null +++ b/internal/store/memory/channel_members_sparse_test.go @@ -0,0 +1,60 @@ +package memory + +import ( + "context" + "errors" + "testing" + + "telesrv/internal/domain" + "telesrv/internal/store" +) + +func TestFilterActiveChannelMemberPairsKeepsExactEdges(t *testing.T) { + ctx := context.Background() + channels := NewChannelStore() + first, err := channels.CreateChannel(ctx, domain.CreateChannelRequest{ + CreatorUserID: 1, + MemberUserIDs: []int64{11, 12}, + Title: "first", + Megagroup: true, + Date: 1700000000, + }) + if err != nil { + t.Fatalf("CreateChannel(first): %v", err) + } + second, err := channels.CreateChannel(ctx, domain.CreateChannelRequest{ + CreatorUserID: 2, + MemberUserIDs: []int64{11, 12}, + Title: "second", + Megagroup: true, + Date: 1700000001, + }) + if err != nil { + t.Fatalf("CreateChannel(second): %v", err) + } + + got, err := channels.FilterActiveChannelMemberPairs(ctx, map[int64][]int64{ + first.Channel.ID: {11}, + second.Channel.ID: {12}, + }) + if err != nil { + t.Fatalf("FilterActiveChannelMemberPairs: %v", err) + } + if len(got[first.Channel.ID]) != 1 || got[first.Channel.ID][0] != 11 { + t.Fatalf("first channel result = %+v, want [11]", got[first.Channel.ID]) + } + if len(got[second.Channel.ID]) != 1 || got[second.Channel.ID][0] != 12 { + t.Fatalf("second channel result = %+v, want [12]", got[second.Channel.ID]) + } +} + +func TestFilterActiveChannelMemberPairsRejectsOverLimit(t *testing.T) { + userIDs := make([]int64, store.MaxActiveChannelMemberPairs+1) + for i := range userIDs { + userIDs[i] = int64(i + 1) + } + _, err := NewChannelStore().FilterActiveChannelMemberPairs(context.Background(), map[int64][]int64{1: userIDs}) + if !errors.Is(err, store.ErrActiveChannelMemberPairsLimit) { + t.Fatalf("FilterActiveChannelMemberPairs error = %v, want ErrActiveChannelMemberPairsLimit", err) + } +} diff --git a/internal/store/memory/channel_message_views.go b/internal/store/memory/channel_message_views.go index bbc6f0ae..5d7e7aec 100644 --- a/internal/store/memory/channel_message_views.go +++ b/internal/store/memory/channel_message_views.go @@ -3,6 +3,7 @@ package memory import ( "context" "telesrv/internal/domain" + "time" ) func (s *ChannelStore) GetChannelMessageViews(_ context.Context, req domain.ChannelMessageViewsRequest) (domain.ChannelMessageViewsResult, error) { @@ -43,16 +44,25 @@ func (s *ChannelStore) GetChannelMessageViews(_ context.Context, req domain.Chan s.msgViews[req.ChannelID] = make(map[int]int) } if s.msgViewers[req.ChannelID] == nil { - s.msgViewers[req.ChannelID] = make(map[int]map[int64]struct{}) + s.msgViewers[req.ChannelID] = make(map[int]map[int64]int) + } + viewedAt := req.Date + if viewedAt <= 0 { + viewedAt = int(time.Now().Unix()) } for id := range visible { if req.Increment { if s.msgViewers[req.ChannelID][id] == nil { - s.msgViewers[req.ChannelID][id] = make(map[int64]struct{}) + s.msgViewers[req.ChannelID][id] = make(map[int64]int) } if _, seen := s.msgViewers[req.ChannelID][id][req.UserID]; !seen { - s.msgViewers[req.ChannelID][id][req.UserID] = struct{}{} + s.msgViewers[req.ChannelID][id][req.UserID] = viewedAt s.msgViews[req.ChannelID][id]++ + if idx, ok := s.findMessageIndexLocked(req.ChannelID, id); ok { + msg := s.messages[req.ChannelID][idx] + msg.ViewsCount = s.msgViews[req.ChannelID][id] + s.messages[req.ChannelID][idx] = msg + } } } } diff --git a/internal/store/memory/channel_settings.go b/internal/store/memory/channel_settings.go index 08134f56..961f6bb1 100644 --- a/internal/store/memory/channel_settings.go +++ b/internal/store/memory/channel_settings.go @@ -310,7 +310,7 @@ func (s *ChannelStore) SetChannelEmojiStatusAdmin(_ context.Context, channelID i } func (s *ChannelStore) SetChannelPhotoAdmin(_ context.Context, channelID int64, photo domain.Photo) (domain.Channel, error) { - if channelID == 0 { + if channelID == 0 || photo.ID == 0 { return domain.Channel{}, domain.ErrChannelInvalid } s.mu.Lock() diff --git a/internal/store/memory/channel_stats.go b/internal/store/memory/channel_stats.go new file mode 100644 index 00000000..d80194db --- /dev/null +++ b/internal/store/memory/channel_stats.go @@ -0,0 +1,392 @@ +package memory + +import ( + "context" + "sort" + "strings" + "unicode/utf8" + + "telesrv/internal/domain" +) + +func (s *ChannelStore) GetChannelStats(_ context.Context, req domain.ChannelStatsRequest) (domain.ChannelStats, error) { + if req.ViewerUserID == 0 || req.ChannelID == 0 || !req.Period.Valid() { + return domain.ChannelStats{}, domain.ErrChannelInvalid + } + s.mu.RLock() + defer s.mu.RUnlock() + channel, _, err := s.statsAdminChannelLocked(req.ViewerUserID, req.ChannelID) + if err != nil { + return domain.ChannelStats{}, err + } + + stats := domain.ChannelStats{Channel: cloneChannel(channel), Period: req.Period} + days, dayIndex := newMemoryStatsDays(req.Period) + prevMin := req.Period.PreviousMinDate() + var currentMessages, previousMessages int + var currentViews, previousViews int + currentPosters := make(map[int64]struct{}) + previousPosters := make(map[int64]struct{}) + currentMessageDay := make(map[int]int) + previousMessageIDs := make(map[int]struct{}) + currentMessageIDs := make(map[int]struct{}) + top := make(map[int64]struct{ messages, chars int }) + + for _, member := range s.members[req.ChannelID] { + if memoryStatsMemberActiveAt(member, req.Period.MaxDate-1) { + stats.Members.Current++ + } + if memoryStatsMemberActiveAt(member, req.Period.MinDate-1) { + stats.Members.Previous++ + } + if i, ok := dayIndex[memoryStatsDay(member.JoinedAt)]; ok && member.JoinedAt >= req.Period.MinDate && member.JoinedAt < req.Period.MaxDate { + days[i].NewMembers++ + } + } + for i := range days { + at := days[i].Date + 86400 - 1 + if at >= req.Period.MaxDate { + at = req.Period.MaxDate - 1 + } + for _, member := range s.members[req.ChannelID] { + if memoryStatsMemberActiveAt(member, at) { + days[i].Members++ + } + } + } + + for _, msg := range s.messages[req.ChannelID] { + if msg.Deleted || msg.Action != nil { + continue + } + switch { + case msg.Date >= req.Period.MinDate && msg.Date < req.Period.MaxDate: + currentMessages++ + currentViews += msg.ViewsCount + currentPosters[msg.SenderUserID] = struct{}{} + currentMessageIDs[msg.ID] = struct{}{} + if i, ok := dayIndex[memoryStatsDay(msg.Date)]; ok { + currentMessageDay[msg.ID] = i + days[i].Messages++ + days[i].Views += msg.ViewsCount + } + entry := top[msg.SenderUserID] + entry.messages++ + entry.chars += utf8.RuneCountInString(msg.Body) + top[msg.SenderUserID] = entry + case msg.Date >= prevMin && msg.Date < req.Period.MinDate: + previousMessages++ + previousViews += msg.ViewsCount + previousPosters[msg.SenderUserID] = struct{}{} + previousMessageIDs[msg.ID] = struct{}{} + } + } + + currentViewerIDs := make(map[int64]struct{}) + previousViewerIDs := make(map[int64]struct{}) + dayViewerIDs := make(map[int]map[int64]struct{}, len(days)) + for _, viewers := range s.msgViewers[req.ChannelID] { + for userID, viewedAt := range viewers { + switch { + case viewedAt >= req.Period.MinDate && viewedAt < req.Period.MaxDate: + currentViewerIDs[userID] = struct{}{} + if i, ok := dayIndex[memoryStatsDay(viewedAt)]; ok { + if dayViewerIDs[i] == nil { + dayViewerIDs[i] = make(map[int64]struct{}) + } + dayViewerIDs[i][userID] = struct{}{} + } + case viewedAt >= prevMin && viewedAt < req.Period.MinDate: + previousViewerIDs[userID] = struct{}{} + } + } + } + + var currentReactions, previousReactions int + for messageID, byUser := range s.reactions[req.ChannelID] { + _, current := currentMessageIDs[messageID] + _, previous := previousMessageIDs[messageID] + for _, rows := range byUser { + for _, row := range rows { + if current { + currentReactions++ + if i, ok := currentMessageDay[messageID]; ok { + days[i].Reactions++ + addMemoryStatsReaction(&days[i], row.Reaction) + } + } else if previous { + previousReactions++ + } + } + } + } + + forwardCounts := s.publicForwardCountsLocked(req.ChannelID) + currentShares, previousShares := 0, 0 + for messageID, count := range forwardCounts { + if _, ok := currentMessageIDs[messageID]; ok { + currentShares += count + if i, ok := currentMessageDay[messageID]; ok { + days[i].Shares += count + } + } else if _, ok := previousMessageIDs[messageID]; ok { + previousShares += count + } + } + + for i := range days { + days[i].Viewers = len(dayViewerIDs[i]) + posters := make(map[int64]struct{}) + start, end := days[i].Date, days[i].Date+86400 + for _, msg := range s.messages[req.ChannelID] { + if !msg.Deleted && msg.Action == nil && msg.Date >= start && msg.Date < end { + posters[msg.SenderUserID] = struct{}{} + } + } + days[i].Posters = len(posters) + sort.Slice(days[i].ByReaction, func(a, b int) bool { + return days[i].ByReaction[a].Reaction.Key() < days[i].ByReaction[b].Reaction.Key() + }) + } + + stats.Messages = domain.StatsValueAndPrev{Current: float64(currentMessages), Previous: float64(previousMessages)} + stats.Viewers = domain.StatsValueAndPrev{Current: float64(len(currentViewerIDs)), Previous: float64(len(previousViewerIDs))} + stats.Posters = domain.StatsValueAndPrev{Current: float64(len(currentPosters)), Previous: float64(len(previousPosters))} + stats.ViewsPerPost = memoryStatsAverage(currentViews, currentMessages, previousViews, previousMessages) + stats.SharesPerPost = memoryStatsAverage(currentShares, currentMessages, previousShares, previousMessages) + stats.ReactionsPerPost = memoryStatsAverage(currentReactions, currentMessages, previousReactions, previousMessages) + stats.Days = days + + for userID, entry := range top { + if userID == 0 || entry.messages == 0 { + continue + } + stats.TopPosters = append(stats.TopPosters, domain.ChannelStatsTopPoster{ + UserID: userID, Messages: entry.messages, AvgChars: entry.chars / entry.messages, + }) + } + sort.Slice(stats.TopPosters, func(i, j int) bool { + if stats.TopPosters[i].Messages != stats.TopPosters[j].Messages { + return stats.TopPosters[i].Messages > stats.TopPosters[j].Messages + } + return stats.TopPosters[i].UserID < stats.TopPosters[j].UserID + }) + if len(stats.TopPosters) > domain.MaxChannelStatsTopPosters { + stats.TopPosters = stats.TopPosters[:domain.MaxChannelStatsTopPosters] + } + + messages := append([]domain.ChannelMessage(nil), s.messages[req.ChannelID]...) + sort.Slice(messages, func(i, j int) bool { + if messages[i].Date != messages[j].Date { + return messages[i].Date > messages[j].Date + } + return messages[i].ID > messages[j].ID + }) + for _, msg := range messages { + if msg.Deleted || msg.Action != nil { + continue + } + stats.RecentPosts = append(stats.RecentPosts, domain.ChannelStatsRecentPost{ + MessageID: msg.ID, + Views: msg.ViewsCount, + Forwards: forwardCounts[msg.ID], + Reactions: memoryStatsReactionCount(s.reactions[req.ChannelID][msg.ID]), + }) + if len(stats.RecentPosts) == domain.MaxChannelStatsRecentPosts { + break + } + } + return stats, nil +} + +func (s *ChannelStore) GetChannelMessageStats(_ context.Context, req domain.ChannelMessageStatsRequest) (domain.ChannelMessageStats, error) { + if req.ViewerUserID == 0 || req.ChannelID == 0 || req.MessageID <= 0 || + req.MessageID > domain.MaxMessageBoxID || !req.Period.Valid() { + return domain.ChannelMessageStats{}, domain.ErrMessageIDInvalid + } + s.mu.RLock() + defer s.mu.RUnlock() + channel, _, err := s.statsAdminChannelLocked(req.ViewerUserID, req.ChannelID) + if err != nil { + return domain.ChannelMessageStats{}, err + } + message, ok := s.findMessageLocked(req.ChannelID, req.MessageID) + if !ok || message.Deleted { + return domain.ChannelMessageStats{}, domain.ErrMessageIDInvalid + } + days, dayIndex := newMemoryStatsDays(req.Period) + for _, viewedAt := range s.msgViewers[req.ChannelID][req.MessageID] { + if i, ok := dayIndex[memoryStatsDay(viewedAt)]; ok && viewedAt >= req.Period.MinDate && viewedAt < req.Period.MaxDate { + days[i].Views++ + } + } + for _, rows := range s.reactions[req.ChannelID][req.MessageID] { + for _, row := range rows { + if i, ok := dayIndex[memoryStatsDay(row.Date)]; ok && row.Date >= req.Period.MinDate && row.Date < req.Period.MaxDate { + days[i].Reactions++ + addMemoryStatsReaction(&days[i], row.Reaction) + } + } + } + for i := range days { + sort.Slice(days[i].ByReaction, func(a, b int) bool { + return days[i].ByReaction[a].Reaction.Key() < days[i].ByReaction[b].Reaction.Key() + }) + } + return domain.ChannelMessageStats{ + Channel: cloneChannel(channel), Message: cloneChannelMessage(message), Period: req.Period, Days: days, + }, nil +} + +func (s *ChannelStore) ListChannelMessagePublicForwards(_ context.Context, req domain.ChannelMessagePublicForwardListRequest) (domain.ChannelMessagePublicForwardList, error) { + if req.ViewerUserID == 0 || req.ChannelID == 0 || req.MessageID <= 0 || + req.MessageID > domain.MaxMessageBoxID || req.Limit <= 0 || req.Limit > domain.MaxChannelMessagePublicForwards { + return domain.ChannelMessagePublicForwardList{}, domain.ErrChannelInvalid + } + cursor, err := domain.ParseChannelMessagePublicForwardCursor(req.Offset) + if err != nil { + return domain.ChannelMessagePublicForwardList{}, err + } + s.mu.RLock() + defer s.mu.RUnlock() + if _, _, err := s.statsAdminChannelLocked(req.ViewerUserID, req.ChannelID); err != nil { + return domain.ChannelMessagePublicForwardList{}, err + } + source, ok := s.findMessageLocked(req.ChannelID, req.MessageID) + if !ok || source.Deleted { + return domain.ChannelMessagePublicForwardList{}, domain.ErrMessageIDInvalid + } + all := make([]domain.ChannelMessage, 0) + for channelID, channel := range s.channels { + if !memoryStatsPublicChannel(channel) { + continue + } + for _, msg := range s.messages[channelID] { + if memoryStatsForwardsPost(msg, req.ChannelID, req.MessageID) { + all = append(all, cloneChannelMessage(msg)) + } + } + } + sort.Slice(all, func(i, j int) bool { return memoryStatsForwardBefore(all[i], all[j]) }) + page := make([]domain.ChannelMessage, 0, req.Limit) + for _, msg := range all { + if cursor.Date != 0 && !memoryStatsForwardAfterCursor(msg, cursor) { + continue + } + page = append(page, msg) + if len(page) == req.Limit+1 { + break + } + } + next := "" + if len(page) > req.Limit { + page = page[:req.Limit] + next = domain.FormatChannelMessagePublicForwardCursor(page[len(page)-1]) + } + return domain.ChannelMessagePublicForwardList{Count: len(all), Messages: page, NextOffset: next}, nil +} + +func (s *ChannelStore) statsAdminChannelLocked(userID, channelID int64) (domain.Channel, domain.ChannelMember, error) { + channel, member, err := s.channelAndMemberLocked(userID, channelID) + if err != nil { + return domain.Channel{}, domain.ChannelMember{}, err + } + if member.Role != domain.ChannelRoleCreator && member.Role != domain.ChannelRoleAdmin { + return domain.Channel{}, domain.ChannelMember{}, domain.ErrChannelAdminRequired + } + return channel, member, nil +} + +func newMemoryStatsDays(period domain.StatsPeriod) ([]domain.ChannelStatsDay, map[int]int) { + start := memoryStatsDay(period.MinDate) + end := memoryStatsDay(period.MaxDate - 1) + days := make([]domain.ChannelStatsDay, 0, (end-start)/86400+1) + index := make(map[int]int) + for date := start; date <= end; date += 86400 { + index[date] = len(days) + days = append(days, domain.ChannelStatsDay{Date: date}) + } + return days, index +} + +func memoryStatsDay(date int) int { + if date <= 0 { + return 0 + } + return date - date%86400 +} + +func memoryStatsMemberActiveAt(member domain.ChannelMember, at int) bool { + return member.JoinedAt > 0 && member.JoinedAt <= at && (member.LeftAt == 0 || member.LeftAt > at) +} + +func memoryStatsAverage(current, currentCount, previous, previousCount int) domain.StatsValueAndPrev { + var out domain.StatsValueAndPrev + if currentCount > 0 { + out.Current = float64(current) / float64(currentCount) + } + if previousCount > 0 { + out.Previous = float64(previous) / float64(previousCount) + } + return out +} + +func addMemoryStatsReaction(day *domain.ChannelStatsDay, reaction domain.MessageReaction) { + for i := range day.ByReaction { + if day.ByReaction[i].Reaction.Key() == reaction.Key() { + day.ByReaction[i].Count++ + return + } + } + day.ByReaction = append(day.ByReaction, domain.StatsReactionCount{Reaction: reaction, Count: 1}) +} + +func memoryStatsReactionCount(byUser map[int64][]domain.ChannelMessagePeerReaction) int { + count := 0 + for _, rows := range byUser { + count += len(rows) + } + return count +} + +func (s *ChannelStore) publicForwardCountsLocked(sourceChannelID int64) map[int]int { + counts := make(map[int]int) + for channelID, channel := range s.channels { + if !memoryStatsPublicChannel(channel) { + continue + } + for _, msg := range s.messages[channelID] { + if msg.Deleted || msg.Forward == nil || msg.Forward.From.Type != domain.PeerTypeChannel || + msg.Forward.From.ID != sourceChannelID || msg.Forward.ChannelPost <= 0 { + continue + } + counts[msg.Forward.ChannelPost]++ + } + } + return counts +} + +func memoryStatsPublicChannel(channel domain.Channel) bool { + return !channel.Deleted && strings.TrimSpace(channel.Username) != "" && (channel.Broadcast || channel.Megagroup) +} + +func memoryStatsForwardsPost(msg domain.ChannelMessage, channelID int64, messageID int) bool { + return !msg.Deleted && msg.Forward != nil && msg.Forward.From.Type == domain.PeerTypeChannel && + msg.Forward.From.ID == channelID && msg.Forward.ChannelPost == messageID +} + +func memoryStatsForwardBefore(a, b domain.ChannelMessage) bool { + if a.Date != b.Date { + return a.Date > b.Date + } + if a.ChannelID != b.ChannelID { + return a.ChannelID < b.ChannelID + } + return a.ID > b.ID +} + +func memoryStatsForwardAfterCursor(msg domain.ChannelMessage, cursor domain.ChannelMessagePublicForwardCursor) bool { + return msg.Date < cursor.Date || + (msg.Date == cursor.Date && (msg.ChannelID > cursor.ChannelID || + (msg.ChannelID == cursor.ChannelID && msg.ID < cursor.MessageID))) +} diff --git a/internal/store/memory/channel_stats_test.go b/internal/store/memory/channel_stats_test.go new file mode 100644 index 00000000..c54753ae --- /dev/null +++ b/internal/store/memory/channel_stats_test.go @@ -0,0 +1,133 @@ +package memory + +import ( + "context" + "errors" + "testing" + + "telesrv/internal/domain" +) + +func TestChannelStatsUseDurableFactsAndPagePublicForwards(t *testing.T) { + ctx := context.Background() + store := NewChannelStore() + const owner, viewer int64 = 1, 2 + period := domain.StatsPeriod{MinDate: 1_700_006_400, MaxDate: 1_700_611_200} + + source, err := store.CreateChannel(ctx, domain.CreateChannelRequest{ + CreatorUserID: owner, + Title: "stats source", + Broadcast: true, + MemberUserIDs: []int64{viewer}, + Date: period.MinDate - 100, + }) + if err != nil { + t.Fatalf("create source: %v", err) + } + previous, err := store.SendChannelMessage(ctx, domain.SendChannelMessageRequest{ + UserID: owner, ChannelID: source.Channel.ID, RandomID: 100, Message: "previous", Date: period.MinDate - 10, + }) + if err != nil { + t.Fatalf("send previous: %v", err) + } + _ = previous + post, err := store.SendChannelMessage(ctx, domain.SendChannelMessageRequest{ + UserID: owner, ChannelID: source.Channel.ID, RandomID: 101, Message: "current post", Date: period.MinDate + 10, + }) + if err != nil { + t.Fatalf("send current: %v", err) + } + if _, err := store.GetChannelMessageViews(ctx, domain.ChannelMessageViewsRequest{ + UserID: viewer, ChannelID: source.Channel.ID, IDs: []int{post.Message.ID}, Increment: true, Date: period.MinDate + 20, + }); err != nil { + t.Fatalf("increment view: %v", err) + } + reaction := domain.MessageReaction{Type: domain.MessageReactionEmoji, Emoticon: "👍"} + if _, err := store.SetChannelMessageReactions(ctx, domain.SetChannelMessageReactionsRequest{ + UserID: viewer, ChannelID: source.Channel.ID, MessageID: post.Message.ID, Reactions: []domain.MessageReaction{reaction}, Date: period.MinDate + 30, + }); err != nil { + t.Fatalf("react: %v", err) + } + + publicCreated, err := store.CreateChannel(ctx, domain.CreateChannelRequest{ + CreatorUserID: owner, Title: "public destination", Broadcast: true, Date: period.MinDate + 40, + }) + if err != nil { + t.Fatalf("create public destination: %v", err) + } + publicChannel, err := store.UpdateUsername(ctx, domain.UpdateChannelUsernameRequest{ + UserID: owner, ChannelID: publicCreated.Channel.ID, Username: "stats_forward_memory", + }) + if err != nil { + t.Fatalf("make public destination: %v", err) + } + privateChannel, err := store.CreateChannel(ctx, domain.CreateChannelRequest{ + CreatorUserID: owner, Title: "private destination", Broadcast: true, Date: period.MinDate + 40, + }) + if err != nil { + t.Fatalf("create private destination: %v", err) + } + forward := &domain.MessageForward{ + From: domain.Peer{Type: domain.PeerTypeChannel, ID: source.Channel.ID}, Date: post.Message.Date, ChannelPost: post.Message.ID, + } + for i, date := range []int{period.MinDate + 50, period.MinDate + 60} { + if _, err := store.SendChannelMessage(ctx, domain.SendChannelMessageRequest{ + UserID: owner, ChannelID: publicChannel.ID, RandomID: int64(200 + i), Message: "public forward", Forward: forward, Date: date, + }); err != nil { + t.Fatalf("send public forward %d: %v", i, err) + } + } + if _, err := store.SendChannelMessage(ctx, domain.SendChannelMessageRequest{ + UserID: owner, ChannelID: privateChannel.Channel.ID, RandomID: 300, Message: "private forward", Forward: forward, Date: period.MinDate + 70, + }); err != nil { + t.Fatalf("send private forward: %v", err) + } + + stats, err := store.GetChannelStats(ctx, domain.ChannelStatsRequest{ + ViewerUserID: owner, ChannelID: source.Channel.ID, Period: period, + }) + if err != nil { + t.Fatalf("get stats: %v", err) + } + if stats.Members.Current != 2 || stats.Messages.Current != 1 || stats.Messages.Previous != 1 || + stats.Viewers.Current != 1 || stats.Posters.Current != 1 || stats.ViewsPerPost.Current != 1 || + stats.SharesPerPost.Current != 2 || stats.ReactionsPerPost.Current != 1 { + t.Fatalf("stats = %+v, want durable current/previous aggregates", stats) + } + if len(stats.Days) == 0 || len(stats.Days[0].ByReaction) != 1 || stats.Days[0].Shares != 2 { + t.Fatalf("stats days = %+v, want view/share/reaction buckets", stats.Days) + } + messageStats, err := store.GetChannelMessageStats(ctx, domain.ChannelMessageStatsRequest{ + ViewerUserID: owner, ChannelID: source.Channel.ID, MessageID: post.Message.ID, Period: period, + }) + if err != nil { + t.Fatalf("get message stats: %v", err) + } + if len(messageStats.Days) == 0 || messageStats.Days[0].Views != 1 || messageStats.Days[0].Reactions != 1 { + t.Fatalf("message stats days = %+v, want one view and reaction", messageStats.Days) + } + + first, err := store.ListChannelMessagePublicForwards(ctx, domain.ChannelMessagePublicForwardListRequest{ + ViewerUserID: owner, ChannelID: source.Channel.ID, MessageID: post.Message.ID, Limit: 1, + }) + if err != nil { + t.Fatalf("list first forward page: %v", err) + } + if first.Count != 2 || len(first.Messages) != 1 || first.NextOffset == "" || first.Messages[0].ChannelID != publicChannel.ID { + t.Fatalf("first forward page = %+v, want one of two public forwards", first) + } + second, err := store.ListChannelMessagePublicForwards(ctx, domain.ChannelMessagePublicForwardListRequest{ + ViewerUserID: owner, ChannelID: source.Channel.ID, MessageID: post.Message.ID, Offset: first.NextOffset, Limit: 1, + }) + if err != nil { + t.Fatalf("list second forward page: %v", err) + } + if second.Count != 2 || len(second.Messages) != 1 || second.Messages[0].ID == first.Messages[0].ID || second.NextOffset != "" { + t.Fatalf("second forward page = %+v, want remaining public forward", second) + } + if _, err := store.ListChannelMessagePublicForwards(ctx, domain.ChannelMessagePublicForwardListRequest{ + ViewerUserID: owner, ChannelID: source.Channel.ID, MessageID: post.Message.ID, Offset: "bad", Limit: 1, + }); !errors.Is(err, domain.ErrStatsOffsetInvalid) { + t.Fatalf("invalid cursor err = %v, want ErrStatsOffsetInvalid", err) + } +} diff --git a/internal/store/memory/channel_store.go b/internal/store/memory/channel_store.go index e7d3c652..4d4cbd2c 100644 --- a/internal/store/memory/channel_store.go +++ b/internal/store/memory/channel_store.go @@ -63,20 +63,23 @@ func (w channelReadWatermark) advance(userID int64, maxID int) channelReadWaterm // ChannelStore is an in-memory channel/supergroup store for tests and local development. type ChannelStore struct { - mu sync.RWMutex - nextID int64 - nextHash int64 - channels map[int64]domain.Channel - members map[int64]map[int64]domain.ChannelMember - dialogs map[int64]map[int64]domain.ChannelDialog - topics map[int64]map[int]domain.ChannelForumTopic - messages map[int64][]domain.ChannelMessage - reactions map[int64]map[int]map[int64][]domain.ChannelMessagePeerReaction - top map[int64]map[string]domain.TopMessageReaction - recent map[int64]map[string]domain.RecentMessageReaction - mentions map[int64]map[int64]map[int]memoryMention - msgViews map[int64]map[int]int - msgViewers map[int64]map[int]map[int64]struct{} + mu sync.RWMutex + nextID int64 + nextHash int64 + channels map[int64]domain.Channel + members map[int64]map[int64]domain.ChannelMember + dialogs map[int64]map[int64]domain.ChannelDialog + topics map[int64]map[int]domain.ChannelForumTopic + messages map[int64][]domain.ChannelMessage + reactions map[int64]map[int]map[int64][]domain.ChannelMessagePeerReaction + top map[int64]map[string]domain.TopMessageReaction + recent map[int64]map[string]domain.RecentMessageReaction + mentions map[int64]map[int64]map[int]memoryMention + msgViews map[int64]map[int]int + // msgViewers stores the first durable view time for each unique viewer. + // Keeping the timestamp (instead of only a set membership bit) lets stats + // produce real event-time graphs while preserving idempotent view counts. + msgViewers map[int64]map[int]map[int64]int events map[int64][]domain.ChannelUpdateEvent retention map[int64]domain.ChannelUpdateRetentionCheckpoint // historyClearDates is the no-PTS recovery timestamp for a future @@ -136,7 +139,7 @@ func NewChannelStore() *ChannelStore { recent: make(map[int64]map[string]domain.RecentMessageReaction), mentions: make(map[int64]map[int64]map[int]memoryMention), msgViews: make(map[int64]map[int]int), - msgViewers: make(map[int64]map[int]map[int64]struct{}), + msgViewers: make(map[int64]map[int]map[int64]int), events: make(map[int64][]domain.ChannelUpdateEvent), retention: make(map[int64]domain.ChannelUpdateRetentionCheckpoint), historyClearDates: make(map[int64]map[int64]int), diff --git a/internal/store/memory/channel_test.go b/internal/store/memory/channel_test.go index 0e7a3580..b4a66376 100644 --- a/internal/store/memory/channel_test.go +++ b/internal/store/memory/channel_test.go @@ -10,6 +10,46 @@ import ( "telesrv/internal/domain" ) +func TestChannelCreateInitialPtsBaseline(t *testing.T) { + ctx := context.Background() + store := NewChannelStore() + created, err := store.CreateChannel(ctx, domain.CreateChannelRequest{ + CreatorUserID: 1, + Title: "initial pts", + Megagroup: true, + Date: 1_700_000_080, + }) + if err != nil { + t.Fatalf("create channel: %v", err) + } + if created.Channel.Pts != domain.FirstChannelEventPts || created.Message.Pts != domain.FirstChannelEventPts || + created.Event.Pts != domain.FirstChannelEventPts || created.Event.PtsCount != 1 { + t.Fatalf("create result = channel:%+v message:%+v event:%+v, want first event 2/1", created.Channel, created.Message, created.Event) + } + checkpoint := store.retention[created.Channel.ID] + if checkpoint.RetainedThroughPts != domain.InitialChannelPts || checkpoint.LatestPts != domain.FirstChannelEventPts { + t.Fatalf("checkpoint = %+v, want floor/latest 1/2", checkpoint) + } + fromBaseline, err := store.ListChannelDifference(ctx, domain.ChannelDifferenceRequest{ + UserID: 1, ChannelID: created.Channel.ID, Pts: domain.InitialChannelPts, Limit: 10, + }) + if err != nil { + t.Fatalf("difference from baseline: %v", err) + } + if fromBaseline.TooLong || len(fromBaseline.Events) != 1 || fromBaseline.Events[0].Pts != domain.FirstChannelEventPts { + t.Fatalf("difference from baseline = %+v, want create event at pts=2", fromBaseline) + } + fromZero, err := store.ListChannelDifference(ctx, domain.ChannelDifferenceRequest{ + UserID: 1, ChannelID: created.Channel.ID, Pts: 0, Limit: 10, + }) + if err != nil { + t.Fatalf("difference from zero: %v", err) + } + if !fromZero.TooLong || fromZero.Pts != domain.FirstChannelEventPts || len(fromZero.NewMessages) != 1 { + t.Fatalf("difference from zero = %+v, want complete snapshot at pts=2", fromZero) + } +} + func TestChannelCreateCreatesPermanentInviteAndHasLink(t *testing.T) { ctx := context.Background() store := NewChannelStore() diff --git a/internal/store/memory/channel_update_retention_test.go b/internal/store/memory/channel_update_retention_test.go index fc9ae772..0a0885b8 100644 --- a/internal/store/memory/channel_update_retention_test.go +++ b/internal/store/memory/channel_update_retention_test.go @@ -144,7 +144,7 @@ func TestDeleteExpiredChannelUpdateEventsIsBoundedMemory(t *testing.T) { t.Fatalf("deleted = %d, want bounded batch 2", deleted) } checkpoint := store.retention[created.Channel.ID] - if checkpoint.RetainedThroughPts != 2 || len(store.events[created.Channel.ID]) != 2 { - t.Fatalf("after bounded prune checkpoint=%+v events=%d, want floor=2 and 2 rows", checkpoint, len(store.events[created.Channel.ID])) + if checkpoint.RetainedThroughPts != 3 || len(store.events[created.Channel.ID]) != 2 { + t.Fatalf("after bounded prune checkpoint=%+v events=%d, want floor=3 and 2 rows", checkpoint, len(store.events[created.Channel.ID])) } } diff --git a/internal/store/memory/contacts.go b/internal/store/memory/contacts.go index 9831588f..5cda296f 100644 --- a/internal/store/memory/contacts.go +++ b/internal/store/memory/contacts.go @@ -91,6 +91,122 @@ func (s *ContactStore) GetReverseContacts(_ context.Context, userID int64, owner return out, nil } +func (s *ContactStore) ContactProjectionForViewers(_ context.Context, viewerUserIDs, contactUserIDs []int64) (domain.ContactProjectionBatch, error) { + out := domain.ContactProjectionBatch{ + Contacts: make(map[int64]map[int64]domain.Contact, len(viewerUserIDs)), + PersonalPhotos: make(map[int64]map[int64]domain.ProfilePhotoRef, len(viewerUserIDs)), + } + if len(viewerUserIDs) == 0 || len(contactUserIDs) == 0 { + return out, nil + } + viewers := make(map[int64]struct{}, len(viewerUserIDs)) + for _, id := range viewerUserIDs { + if id != 0 { + viewers[id] = struct{}{} + } + } + targets := make(map[int64]struct{}, len(contactUserIDs)) + for _, id := range contactUserIDs { + if id != 0 { + targets[id] = struct{}{} + } + } + if len(viewers) == 0 || len(targets) == 0 { + return out, nil + } + s.mu.RLock() + defer s.mu.RUnlock() + for viewerID := range viewers { + list := s.m[viewerID] + for _, contact := range list.Contacts { + targetID := contact.User.ID + if _, ok := targets[targetID]; !ok { + continue + } + if out.Contacts[viewerID] == nil { + out.Contacts[viewerID] = make(map[int64]domain.Contact, len(targets)) + } + out.Contacts[viewerID][targetID] = domain.Contact{ + User: domain.User{ID: targetID}, + FirstName: contact.FirstName, + LastName: contact.LastName, + Phone: contact.Phone, + Note: contact.Note, + NoteEntities: append([]domain.MessageEntity(nil), contact.NoteEntities...), + Mutual: contact.Mutual || contact.User.Mutual, + CloseFriend: contact.CloseFriend || contact.User.CloseFriend, + } + if contact.User.PhotoID == 0 { + continue + } + if out.PersonalPhotos[viewerID] == nil { + out.PersonalPhotos[viewerID] = make(map[int64]domain.ProfilePhotoRef, len(targets)) + } + out.PersonalPhotos[viewerID][targetID] = cloneProfilePhotoRef(domain.ProfilePhotoRef{ + PhotoID: contact.User.PhotoID, + DCID: contact.User.PhotoDCID, + Stripped: contact.User.PhotoStripped, + Personal: true, + HasVideo: contact.User.PhotoHasVideo, + }) + } + } + return out, nil +} + +func (s *ContactStore) ContactProjectionForViewerUserIDs(_ context.Context, contactUserIDsByViewer map[int64][]int64) (domain.ContactProjectionBatch, error) { + out := domain.ContactProjectionBatch{ + Contacts: make(map[int64]map[int64]domain.Contact, len(contactUserIDsByViewer)), + PersonalPhotos: make(map[int64]map[int64]domain.ProfilePhotoRef, len(contactUserIDsByViewer)), + } + if len(contactUserIDsByViewer) == 0 { + return out, nil + } + s.mu.RLock() + defer s.mu.RUnlock() + for viewerID, contactUserIDs := range contactUserIDsByViewer { + if viewerID == 0 || len(contactUserIDs) == 0 { + continue + } + want := make(map[int64]struct{}, len(contactUserIDs)) + for _, id := range contactUserIDs { + if id != 0 { + want[id] = struct{}{} + } + } + for _, contact := range s.m[viewerID].Contacts { + targetID := contact.User.ID + if _, ok := want[targetID]; !ok { + continue + } + if out.Contacts[viewerID] == nil { + out.Contacts[viewerID] = make(map[int64]domain.Contact, len(want)) + } + out.Contacts[viewerID][targetID] = domain.Contact{ + User: domain.User{ID: targetID}, + FirstName: contact.FirstName, + LastName: contact.LastName, + Phone: contact.Phone, + Note: contact.Note, + NoteEntities: append([]domain.MessageEntity(nil), contact.NoteEntities...), + Mutual: contact.Mutual || contact.User.Mutual, + CloseFriend: contact.CloseFriend || contact.User.CloseFriend, + } + if contact.User.PhotoID == 0 { + continue + } + if out.PersonalPhotos[viewerID] == nil { + out.PersonalPhotos[viewerID] = make(map[int64]domain.ProfilePhotoRef, len(want)) + } + out.PersonalPhotos[viewerID][targetID] = cloneProfilePhotoRef(domain.ProfilePhotoRef{ + PhotoID: contact.User.PhotoID, DCID: contact.User.PhotoDCID, + Stripped: contact.User.PhotoStripped, Personal: true, HasVideo: contact.User.PhotoHasVideo, + }) + } + } + return out, nil +} + func (s *ContactStore) Upsert(_ context.Context, userID int64, input domain.ContactInput) (domain.Contact, error) { contact := domain.Contact{ User: domain.User{ @@ -391,9 +507,15 @@ func cloneContacts(contacts []domain.Contact) []domain.Contact { func cloneContact(contact domain.Contact) domain.Contact { contact.NoteEntities = append([]domain.MessageEntity(nil), contact.NoteEntities...) + contact.User.PhotoStripped = append([]byte(nil), contact.User.PhotoStripped...) return contact } +func cloneProfilePhotoRef(ref domain.ProfilePhotoRef) domain.ProfilePhotoRef { + ref.Stripped = append([]byte(nil), ref.Stripped...) + return ref +} + func contactListHash(contacts []domain.Contact) int64 { if len(contacts) == 0 { return 0 diff --git a/internal/store/memory/contacts_sparse_test.go b/internal/store/memory/contacts_sparse_test.go new file mode 100644 index 00000000..7d468b02 --- /dev/null +++ b/internal/store/memory/contacts_sparse_test.go @@ -0,0 +1,92 @@ +package memory + +import ( + "context" + "reflect" + "testing" + + "telesrv/internal/domain" +) + +func TestContactProjectionForViewerUserIDsDoesNotCrossPairs(t *testing.T) { + ctx := context.Background() + contacts := NewContactStore() + const ( + viewerA = int64(11) + viewerB = int64(12) + ownerA = int64(21) + ownerB = int64(22) + ) + for _, row := range []struct { + viewer int64 + owner int64 + name string + photo int64 + }{ + {viewerA, ownerA, "A expected", 101}, + {viewerA, ownerB, "B cross", 102}, + {viewerB, ownerA, "A cross", 103}, + {viewerB, ownerB, "B expected", 104}, + } { + if _, err := contacts.Upsert(ctx, row.viewer, domain.ContactInput{ + ContactUserID: row.owner, + FirstName: row.name, + Phone: "known-phone", + Note: "private note", + NoteEntities: []domain.MessageEntity{{ + Type: domain.MessageEntityBold, Length: 7, + }}, + }); err != nil { + t.Fatal(err) + } + if _, found, err := contacts.SetPersonalPhoto(ctx, row.viewer, row.owner, row.photo, 1); err != nil || !found { + t.Fatalf("SetPersonalPhoto %d->%d: found=%v err=%v", row.viewer, row.owner, found, err) + } + } + got, err := contacts.ContactProjectionForViewerUserIDs(ctx, map[int64][]int64{ + viewerA: {ownerA}, + viewerB: {ownerB}, + }) + if err != nil { + t.Fatal(err) + } + if len(got.Contacts[viewerA]) != 1 || got.Contacts[viewerA][ownerA].FirstName != "A expected" { + t.Fatalf("viewer A contacts = %+v", got.Contacts[viewerA]) + } + contactA := got.Contacts[viewerA][ownerA] + if !reflect.DeepEqual(contactA.User, domain.User{ID: ownerA}) { + t.Fatalf("viewer A sparse projection retained base user data: %+v", contactA.User) + } + if contactA.Phone != "known-phone" || contactA.Note != "private note" || len(contactA.NoteEntities) != 1 || contactA.NoteEntities[0].Length != 7 { + t.Fatalf("viewer A sparse overlay = %+v", contactA) + } + if len(got.Contacts[viewerB]) != 1 || got.Contacts[viewerB][ownerB].FirstName != "B expected" { + t.Fatalf("viewer B contacts = %+v", got.Contacts[viewerB]) + } + if _, ok := got.Contacts[viewerA][ownerB]; ok { + t.Fatal("viewer A unexpectedly received viewer B's requested owner") + } + if _, ok := got.Contacts[viewerB][ownerA]; ok { + t.Fatal("viewer B unexpectedly received viewer A's requested owner") + } + if len(got.PersonalPhotos[viewerA]) != 1 || got.PersonalPhotos[viewerA][ownerA].PhotoID != 101 { + t.Fatalf("viewer A personal photos = %+v", got.PersonalPhotos[viewerA]) + } + if len(got.PersonalPhotos[viewerB]) != 1 || got.PersonalPhotos[viewerB][ownerB].PhotoID != 104 { + t.Fatalf("viewer B personal photos = %+v", got.PersonalPhotos[viewerB]) + } + + // Returned overlay slices are caller-owned, and the personal photo remains + // in its dedicated projection map rather than leaking through Contact.User. + contactA.NoteEntities[0].Length = 99 + gotAgain, err := contacts.ContactProjectionForViewerUserIDs(ctx, map[int64][]int64{viewerA: {ownerA}}) + if err != nil { + t.Fatal(err) + } + if gotAgain.Contacts[viewerA][ownerA].NoteEntities[0].Length != 7 { + t.Fatalf("sparse overlay shared NoteEntities with caller: %+v", gotAgain.Contacts[viewerA][ownerA]) + } + if !reflect.DeepEqual(gotAgain.Contacts[viewerA][ownerA].User, domain.User{ID: ownerA}) { + t.Fatalf("sparse projection reintroduced base user data: %+v", gotAgain.Contacts[viewerA][ownerA].User) + } +} diff --git a/internal/store/memory/dialogs.go b/internal/store/memory/dialogs.go index 66054389..9a97cbeb 100644 --- a/internal/store/memory/dialogs.go +++ b/internal/store/memory/dialogs.go @@ -98,6 +98,39 @@ func (s *DialogStore) ListByPeers(_ context.Context, userID int64, peers []domai return out, nil } +// ListPrivateDialogPeerIDs returns the bounded private-dialog peer set used by +// presence fan-out. Keep this narrow read available in the in-memory +// production-shaped fake as well: callers must not fall back to hydrating a +// complete dialog page when a store implementation lacks the optimized path. +func (s *DialogStore) ListPrivateDialogPeerIDs(_ context.Context, userID int64, limit int) ([]int64, error) { + s.mu.RLock() + dialogs := cloneDialogs(s.m[userID].Dialogs) + s.mu.RUnlock() + + sort.SliceStable(dialogs, func(i, j int) bool { + return dialogLess(dialogs[i], dialogs[j]) + }) + if limit <= 0 || limit > 4096 { + limit = 4096 + } + out := make([]int64, 0, min(limit, len(dialogs))) + seen := make(map[int64]struct{}, min(limit, len(dialogs))) + for _, dialog := range dialogs { + if dialog.Peer.Type != domain.PeerTypeUser || dialog.Peer.ID == 0 || dialog.Peer.ID == userID { + continue + } + if _, ok := seen[dialog.Peer.ID]; ok { + continue + } + seen[dialog.Peer.ID] = struct{}{} + out = append(out, dialog.Peer.ID) + if len(out) == limit { + break + } + } + return out, nil +} + // SaveList 保存一份用户会话列表，供测试和本地替身使用。 func (s *DialogStore) SaveList(_ context.Context, userID int64, list domain.DialogList) error { list.Dialogs = cloneDialogs(list.Dialogs) @@ -217,6 +250,27 @@ func (s *DialogStore) ListDrafts(_ context.Context, userID int64, limit int) ([] return out, nil } +func (s *DialogStore) ListDraftsByPeers(_ context.Context, userID int64, peers []domain.Peer) ([]domain.DialogDraft, error) { + s.mu.RLock() + items := s.drafts[userID] + out := make([]domain.DialogDraft, 0, len(peers)) + seen := make(map[domain.Peer]struct{}, len(peers)) + for _, peer := range peers { + if peer.ID == 0 { + continue + } + if _, ok := seen[peer]; ok { + continue + } + seen[peer] = struct{}{} + if draft, ok := items[draftKey(peer, 0)]; ok { + out = append(out, cloneDialogDraft(draft)) + } + } + s.mu.RUnlock() + return out, nil +} + func (s *DialogStore) ClearDrafts(_ context.Context, userID int64, limit int) ([]domain.DialogDraft, error) { if limit <= 0 || limit > domain.MaxDialogDraftsPerUser { limit = domain.MaxDialogDraftsPerUser diff --git a/internal/store/memory/media_search.go b/internal/store/memory/media_search.go index 1bd42dde..7bd2e589 100644 --- a/internal/store/memory/media_search.go +++ b/internal/store/memory/media_search.go @@ -3,6 +3,7 @@ package memory import ( "context" "sort" + "strings" "telesrv/internal/domain" ) @@ -29,6 +30,38 @@ func mediaCategoryMatches(media *domain.MessageMedia, entities []domain.MessageE return false } +func mediaSearchCommonMatches(id, date int, body string, reply *domain.MessageReply, req domain.MediaSearchRequest) bool { + if req.Query != "" && !strings.Contains(strings.ToLower(body), strings.ToLower(req.Query)) { + return false + } + if req.MinDate > 0 && date <= req.MinDate { + return false + } + if req.MaxDate > 0 && date >= req.MaxDate { + return false + } + if req.TopMsgID != 0 && id != req.TopMsgID && (reply == nil || reply.TopMessageID != req.TopMsgID) { + return false + } + return true +} + +func savedMessageHasAnyTag(tags []domain.MessageReaction, wanted []domain.MessageReaction) bool { + if len(wanted) == 0 { + return true + } + have := make(map[string]struct{}, len(tags)) + for _, reaction := range tags { + have[reaction.Key()] = struct{}{} + } + for _, reaction := range wanted { + if _, ok := have[reaction.Key()]; ok { + return true + } + } + return false +} + // pageMediaIDs 把全部匹配 id 按 newest-first 分页(返回本页 id + 满足 max/min 的总数)。 func pageMediaIDs(ids []int, req domain.MediaSearchRequest) ([]int, int) { sort.Sort(sort.Reverse(sort.IntSlice(ids))) @@ -80,7 +113,19 @@ func (s *MessageStore) SearchPrivateMedia(ctx context.Context, ownerUserID, peer s.mu.RLock() matched := make([]int, 0, len(s.m[ownerUserID])) for _, msg := range s.m[ownerUserID] { - if msg.Peer.Type != domain.PeerTypeUser || msg.Peer.ID != peerID { + if msg.Deleted || msg.Peer.Type != domain.PeerTypeUser || msg.Peer.ID != peerID { + continue + } + if req.SenderUserID != 0 && (msg.From.Type != domain.PeerTypeUser || msg.From.ID != req.SenderUserID) { + continue + } + if !mediaSearchCommonMatches(msg.ID, msg.Date, msg.Body, msg.ReplyTo, req) { + continue + } + if req.SavedPeer.ID != 0 && msg.SavedPeer != req.SavedPeer { + continue + } + if !savedMessageHasAnyTag(s.savedMessageTags[ownerUserID][msg.ID], req.SavedReactions) { continue } if mediaCategoryMatches(msg.Media, msg.Entities, set) { @@ -110,7 +155,7 @@ func (s *MessageStore) CountPrivateMediaCategories(_ context.Context, ownerUserI defer s.mu.RUnlock() out := domain.MediaCategoryCounts{} for _, msg := range s.m[ownerUserID] { - if msg.Peer.Type != domain.PeerTypeUser || msg.Peer.ID != peerID { + if msg.Deleted || msg.Peer.Type != domain.PeerTypeUser || msg.Peer.ID != peerID { continue } for _, category := range domain.ClassifyMediaCategories(msg.Media, msg.Entities) { @@ -129,7 +174,7 @@ func (s *ChannelStore) SearchChannelMedia(ctx context.Context, viewerUserID, cha return domain.ChannelHistory{}, nil } s.mu.RLock() - _, member, err := s.channelAndMemberLocked(viewerUserID, channelID) + channel, member, err := s.channelAndMemberLocked(viewerUserID, channelID) if err != nil { s.mu.RUnlock() return domain.ChannelHistory{}, err @@ -139,6 +184,20 @@ func (s *ChannelStore) SearchChannelMedia(ctx context.Context, viewerUserID, cha if msg.Deleted || msg.ID <= member.AvailableMinID { continue } + if channel.Monoforum { + if member.CanManageDirectMessages() && msg.SavedPeer.ID != 0 { + continue + } + if !member.CanManageDirectMessages() && msg.SavedPeer != (domain.Peer{Type: domain.PeerTypeUser, ID: viewerUserID}) { + continue + } + } + if req.SenderUserID != 0 && msg.SenderUserID != req.SenderUserID { + continue + } + if !mediaSearchCommonMatches(msg.ID, msg.Date, msg.Body, msg.ReplyTo, req) { + continue + } if mediaCategoryMatches(msg.Media, msg.Entities, set) { matched = append(matched, msg.ID) } @@ -165,7 +224,7 @@ func (s *ChannelStore) CountChannelMediaCategories(_ context.Context, viewerUser } s.mu.RLock() defer s.mu.RUnlock() - _, member, err := s.channelAndMemberLocked(viewerUserID, channelID) + channel, member, err := s.channelAndMemberLocked(viewerUserID, channelID) if err != nil { return domain.MediaCategoryCounts{}, err } @@ -174,6 +233,14 @@ func (s *ChannelStore) CountChannelMediaCategories(_ context.Context, viewerUser if msg.Deleted || msg.ID <= member.AvailableMinID { continue } + if channel.Monoforum { + if member.CanManageDirectMessages() && msg.SavedPeer.ID != 0 { + continue + } + if !member.CanManageDirectMessages() && msg.SavedPeer != (domain.Peer{Type: domain.PeerTypeUser, ID: viewerUserID}) { + continue + } + } for _, category := range domain.ClassifyMediaCategories(msg.Media, msg.Entities) { if category != domain.MediaCategoryNone { out[category]++ diff --git a/internal/store/memory/media_search_test.go b/internal/store/memory/media_search_test.go new file mode 100644 index 00000000..31b3e6f4 --- /dev/null +++ b/internal/store/memory/media_search_test.go @@ -0,0 +1,92 @@ +package memory + +import ( + "context" + "testing" + + "telesrv/internal/domain" +) + +func testPhotoMedia(id int64) *domain.MessageMedia { + return &domain.MessageMedia{ + Kind: domain.MessageMediaKindPhoto, + Photo: &domain.Photo{ID: id, AccessHash: id + 100}, + } +} + +func TestPrivateMediaSearchCombinesQuerySenderAndDate(t *testing.T) { + ctx := context.Background() + store := NewMessageStore() + const alice, bob = int64(1001), int64(1002) + send := func(sender, recipient, randomID int64, body string, date int) { + t.Helper() + if _, err := store.SendPrivateText(ctx, domain.SendPrivateTextRequest{ + SenderUserID: sender, RecipientUserID: recipient, RandomID: randomID, + Message: body, Media: testPhotoMedia(randomID), Date: date, + }); err != nil { + t.Fatalf("send private media: %v", err) + } + } + send(alice, bob, 1, "needle outside date", 100) + send(alice, bob, 2, "needle wanted", 200) + send(bob, alice, 3, "needle wrong sender", 210) + send(alice, bob, 4, "other text", 220) + + got, err := store.SearchPrivateMedia(ctx, bob, alice, domain.MediaSearchRequest{ + Categories: []domain.MediaCategory{domain.MediaCategoryPhoto}, + Query: "NEEDLE", + SenderUserID: alice, + MinDate: 150, + MaxDate: 205, + Limit: 10, + }) + if err != nil { + t.Fatalf("search private media: %v", err) + } + if got.Count != 1 || len(got.Messages) != 1 || got.Messages[0].Body != "needle wanted" { + t.Fatalf("combined private media = count %d messages %+v", got.Count, got.Messages) + } +} + +func TestChannelMediaSearchCombinesQuerySenderAndDate(t *testing.T) { + ctx := context.Background() + store := NewChannelStore() + created, err := store.CreateChannel(ctx, domain.CreateChannelRequest{ + CreatorUserID: 1, + Title: "combined media", + Megagroup: true, + MemberUserIDs: []int64{2}, + Date: 100, + }) + if err != nil { + t.Fatalf("create channel: %v", err) + } + send := func(sender, randomID int64, body string, date int) { + t.Helper() + if _, err := store.SendChannelMessage(ctx, domain.SendChannelMessageRequest{ + UserID: sender, ChannelID: created.Channel.ID, RandomID: randomID, + Message: body, Media: testPhotoMedia(randomID), Date: date, + }); err != nil { + t.Fatalf("send channel media: %v", err) + } + } + send(1, 11, "needle outside date", 110) + send(2, 12, "needle wrong sender", 210) + send(1, 13, "needle wanted", 220) + send(1, 14, "other text", 230) + + got, err := store.SearchChannelMedia(ctx, 1, created.Channel.ID, domain.MediaSearchRequest{ + Categories: []domain.MediaCategory{domain.MediaCategoryPhoto}, + Query: "NEEDLE", + SenderUserID: 1, + MinDate: 200, + MaxDate: 225, + Limit: 10, + }) + if err != nil { + t.Fatalf("search channel media: %v", err) + } + if got.Count != 1 || len(got.Messages) != 1 || got.Messages[0].Body != "needle wanted" { + t.Fatalf("combined channel media = count %d messages %+v", got.Count, got.Messages) + } +} diff --git a/internal/store/memory/phone_change.go b/internal/store/memory/phone_change.go index 6642d0bb..21151645 100644 --- a/internal/store/memory/phone_change.go +++ b/internal/store/memory/phone_change.go @@ -2,14 +2,13 @@ package memory import ( "context" - "time" "telesrv/internal/domain" "telesrv/internal/store" ) -// PhoneChangeStore 是测试用内存实现。用户唯一性在 UserStore 锁内维护；事件写入 -// 共享 UpdateEventStore 后可由 updates.getDifference 重放。 +// PhoneChangeStore 是测试用内存实现。用户唯一性在 UserStore 锁内维护； +// updateUserPhone 无 PTS，所以不向 UpdateEventStore 写 durable event。 type PhoneChangeStore struct { users *UserStore events store.UpdateEventStore @@ -19,9 +18,7 @@ func NewPhoneChangeStore(users *UserStore, events store.UpdateEventStore) *Phone return &PhoneChangeStore{users: users, events: events} } -func (*PhoneChangeStore) UsesReliableDispatch() bool { return false } - -func (s *PhoneChangeStore) ChangePhone(ctx context.Context, req domain.PhoneChangeRequest) (domain.PhoneChangeResult, error) { +func (s *PhoneChangeStore) ChangePhone(_ context.Context, req domain.PhoneChangeRequest) (domain.PhoneChangeResult, error) { if s == nil || s.users == nil || req.UserID == 0 || !domain.ValidPhone(req.Phone) { return domain.PhoneChangeResult{}, domain.ErrPhoneNumberInvalid } @@ -41,37 +38,8 @@ func (s *PhoneChangeStore) ChangePhone(ctx context.Context, req domain.PhoneChan return domain.PhoneChangeResult{}, domain.ErrPhoneNumberOccupied } } - currentPhone := u.Phone - currentSignupEmail := u.SignupEmail u.Phone = req.Phone - if req.SignupEmail != "" { - u.SignupEmail = req.SignupEmail - } s.users.byID[req.UserID] = u - - date := req.Date - if date == 0 { - date = int(time.Now().Unix()) - } - event := domain.UpdateEvent{ - UserID: req.UserID, - Type: domain.UpdateEventUserPhone, - Date: date, - Phone: req.Phone, - PtsCount: 1, - } - if s.events != nil { - var err error - event, err = s.events.AppendAllocated(ctx, req.UserID, event) - if err != nil { - // 保持内存替身与 PG 的 user+event 原子可见语义。 - u.Phone = currentPhone - u.SignupEmail = currentSignupEmail - s.users.byID[req.UserID] = u - s.users.mu.Unlock() - return domain.PhoneChangeResult{}, err - } - } s.users.mu.Unlock() - return domain.PhoneChangeResult{User: u, Event: event, Changed: true}, nil + return domain.PhoneChangeResult{User: u, Changed: true}, nil } diff --git a/internal/store/memory/secretchat.go b/internal/store/memory/secretchat.go index 569a5dea..06fabdbe 100644 --- a/internal/store/memory/secretchat.go +++ b/internal/store/memory/secretchat.go @@ -28,13 +28,13 @@ func cloneSecretChat(c domain.SecretChat) domain.SecretChat { } func (s *SecretChatStore) CreateSecretChat(_ context.Context, chat domain.SecretChat) error { - if chat.ID == 0 { - return domain.ErrSecretChatNotFound + if chat.ID == 0 || chat.ID != int(chat.RandomID) { + return domain.ErrSecretChatRandomIDDuplicate } s.mu.Lock() defer s.mu.Unlock() if _, exists := s.chats[chat.ID]; exists { - return domain.ErrSecretChatIDConflict + return domain.ErrSecretChatRandomIDDuplicate } if chat.State == "" { chat.State = domain.SecretChatStateRequested @@ -53,18 +53,6 @@ func (s *SecretChatStore) GetSecretChat(_ context.Context, chatID int) (domain.S return cloneSecretChat(c), true, nil } -func (s *SecretChatStore) GetByAdminRandom(_ context.Context, adminAuthKeyID int64, randomID int32) (domain.SecretChat, bool, error) { - s.mu.Lock() - defer s.mu.Unlock() - // 仅返回非终态匹配（与部分唯一索引 WHERE state <> 'discarded' 一致）。 - for _, c := range s.chats { - if c.AdminAuthKeyID == adminAuthKeyID && c.RandomID == randomID && !c.Terminal() { - return cloneSecretChat(c), true, nil - } - } - return domain.SecretChat{}, false, nil -} - func (s *SecretChatStore) AcceptSecretChat(_ context.Context, chatID int, participantAuthKeyID int64, gb []byte, keyFingerprint int64) (domain.SecretChat, error) { s.mu.Lock() defer s.mu.Unlock() @@ -126,18 +114,6 @@ func (s *SecretChatStore) ListActiveSecretChatsByAuthKey(_ context.Context, auth return out, nil } -func (s *SecretChatStore) MaxSecretChatID(_ context.Context) (int, error) { - s.mu.Lock() - defer s.mu.Unlock() - max := 0 - for id := range s.chats { - if id > max { - max = id - } - } - return max, nil -} - // EncryptedQueueStore 是 store.EncryptedQueueStore 的进程内实现。 type EncryptedQueueStore struct { mu sync.Mutex diff --git a/internal/store/memory/story.go b/internal/store/memory/story.go index 86c6e7fc..8d7a0f7c 100644 --- a/internal/store/memory/story.go +++ b/internal/store/memory/story.go @@ -549,6 +549,52 @@ func (s *StoryStore) GetPeerStoryProjections(_ context.Context, viewerUserID int return out, nil } +func (s *StoryStore) ActiveStoryPeerExpirations(_ context.Context, peers []domain.Peer, now int) (map[domain.Peer]int, error) { + if len(peers) > domain.MaxStoryIDs { + return nil, domain.ErrStoryIDInvalid + } + requested := make(map[domain.Peer]struct{}, len(peers)) + for _, peer := range peers { + if err := validateStoryPeer(peer); err != nil { + return nil, err + } + requested[peer] = struct{}{} + } + out := make(map[domain.Peer]int, len(peers)) + s.mu.RLock() + for _, story := range s.stories { + if _, ok := requested[story.Owner]; !ok || !story.Active(now) { + continue + } + if story.ExpireDate > out[story.Owner] { + out[story.Owner] = story.ExpireDate + } + } + s.mu.RUnlock() + return out, nil +} + +func (s *StoryStore) ListHiddenStoryPeers(_ context.Context, viewerUserID int64) ([]domain.Peer, error) { + if viewerUserID == 0 { + return nil, domain.ErrStoryPeerInvalid + } + out := make([]domain.Peer, 0) + s.mu.RLock() + for key, hidden := range s.hidden { + if key.viewerID == viewerUserID && hidden { + out = append(out, domain.Peer{Type: key.peerType, ID: key.peerID}) + } + } + s.mu.RUnlock() + sort.Slice(out, func(i, j int) bool { + if out[i].Type != out[j].Type { + return out[i].Type < out[j].Type + } + return out[i].ID < out[j].ID + }) + return out, nil +} + func (s *StoryStore) MarkRead(_ context.Context, viewerUserID int64, peer domain.Peer, maxID, date int) (domain.StoryReadResult, error) { if viewerUserID == 0 { return domain.StoryReadResult{}, domain.ErrStoryPeerInvalid diff --git a/internal/store/memory/users.go b/internal/store/memory/users.go index 196851a7..6cb25cd0 100644 --- a/internal/store/memory/users.go +++ b/internal/store/memory/users.go @@ -6,8 +6,10 @@ import ( "sort" "strings" "sync" - "telesrv/internal/domain" "time" + + "telesrv/internal/domain" + "telesrv/internal/store" ) // UserStore 是 store.UserStore 的内存实现。ID 与 PG identity 使用同一业务起点。 @@ -18,11 +20,11 @@ type UserStore struct { usernameRegistry *CollectibleUsernameStore } -// NewUserStore 创建内存 UserStore。内置系统账号（777000 / BotFather / Stickers / ChatBot） +// NewUserStore 创建内存 UserStore。内置系统账号 // 预置进表，与 postgres 的迁移种子保持双 store 行为一致。 func NewUserStore() *UserStore { s := &UserStore{byID: make(map[int64]domain.User), nextID: domain.UserIDSequenceBase} - for _, id := range []int64{domain.OfficialSystemUserID, domain.BotFatherUserID, domain.StickersBotUserID, domain.ChatBotUserID, domain.GifBotUserID} { + for _, id := range domain.SystemUserIDs() { if u, ok := domain.SystemUserByID(id); ok { s.byID[u.ID] = u } @@ -453,6 +455,24 @@ func (s *UserStore) UpdateLastSeen(_ context.Context, userID int64, lastSeenAt i return nil } +func (s *UserStore) UpdateLastSeenBatch(ctx context.Context, updates []store.UserLastSeenUpdate) error { + latest := make(map[int64]int, len(updates)) + for _, update := range updates { + if update.UserID == 0 || update.LastSeenAt <= 0 { + continue + } + if current := latest[update.UserID]; update.LastSeenAt > current { + latest[update.UserID] = update.LastSeenAt + } + } + for userID, lastSeenAt := range latest { + if err := s.UpdateLastSeen(ctx, userID, lastSeenAt); err != nil { + return err + } + } + return nil +} + func userMatchesSearch(u domain.User, query, phoneQuery string) bool { if phoneQuery != "" && strings.HasPrefix(u.Phone, phoneQuery) { return true diff --git a/internal/store/postgres/account.go b/internal/store/postgres/account.go index 075a69db..88df1071 100644 --- a/internal/store/postgres/account.go +++ b/internal/store/postgres/account.go @@ -232,7 +232,9 @@ func (s *PasswordStore) GetAccountSettings(ctx context.Context, userID int64) (d row := s.db.QueryRow(ctx, ` SELECT archive_and_mute_new_noncontact_peers, keep_archived_unmuted, keep_archived_folders, hide_read_marks, new_noncontact_peers_require_premium, display_gifts_button, - noncontact_peers_paid_stars, account_ttl_days, sensitive_content_enabled, contact_signup_silent + noncontact_peers_paid_stars, disallow_unlimited_stargifts, disallow_limited_stargifts, + disallow_unique_stargifts, disallow_premium_gifts, disallow_stargifts_from_channels, + account_ttl_days, sensitive_content_enabled, contact_signup_silent FROM account_settings WHERE user_id = $1`, userID) settings := domain.DefaultAccountSettings() @@ -240,7 +242,11 @@ WHERE user_id = $1`, userID) if err := row.Scan( &gp.ArchiveAndMuteNewNoncontactPeers, &gp.KeepArchivedUnmuted, &gp.KeepArchivedFolders, &gp.HideReadMarks, &gp.NewNoncontactPeersRequirePremium, &gp.DisplayGiftsButton, - &gp.NoncontactPeersPaidStars, &settings.AccountTTLDays, &settings.SensitiveContentEnabled, &settings.ContactSignUpSilent, + &gp.NoncontactPeersPaidStars, + &gp.DisallowedGifts.UnlimitedStargifts, &gp.DisallowedGifts.LimitedStargifts, + &gp.DisallowedGifts.UniqueStargifts, &gp.DisallowedGifts.PremiumGifts, + &gp.DisallowedGifts.StargiftsFromChannel, + &settings.AccountTTLDays, &settings.SensitiveContentEnabled, &settings.ContactSignUpSilent, ); err != nil { if errors.Is(err, pgx.ErrNoRows) { return domain.AccountSettings{}, false, nil @@ -258,7 +264,9 @@ func (s *PasswordStore) GetAccountSettingsBatch(ctx context.Context, userIDs []i rows, err := s.db.Query(ctx, ` SELECT user_id, archive_and_mute_new_noncontact_peers, keep_archived_unmuted, keep_archived_folders, hide_read_marks, new_noncontact_peers_require_premium, display_gifts_button, - noncontact_peers_paid_stars, account_ttl_days, sensitive_content_enabled, contact_signup_silent + noncontact_peers_paid_stars, disallow_unlimited_stargifts, disallow_limited_stargifts, + disallow_unique_stargifts, disallow_premium_gifts, disallow_stargifts_from_channels, + account_ttl_days, sensitive_content_enabled, contact_signup_silent FROM account_settings WHERE user_id = ANY($1::bigint[])`, userIDs) if err != nil { @@ -273,7 +281,11 @@ WHERE user_id = ANY($1::bigint[])`, userIDs) &userID, &gp.ArchiveAndMuteNewNoncontactPeers, &gp.KeepArchivedUnmuted, &gp.KeepArchivedFolders, &gp.HideReadMarks, &gp.NewNoncontactPeersRequirePremium, &gp.DisplayGiftsButton, - &gp.NoncontactPeersPaidStars, &settings.AccountTTLDays, &settings.SensitiveContentEnabled, &settings.ContactSignUpSilent, + &gp.NoncontactPeersPaidStars, + &gp.DisallowedGifts.UnlimitedStargifts, &gp.DisallowedGifts.LimitedStargifts, + &gp.DisallowedGifts.UniqueStargifts, &gp.DisallowedGifts.PremiumGifts, + &gp.DisallowedGifts.StargiftsFromChannel, + &settings.AccountTTLDays, &settings.SensitiveContentEnabled, &settings.ContactSignUpSilent, ); err != nil { return nil, fmt.Errorf("scan account settings batch: %w", err) } @@ -291,8 +303,10 @@ func (s *PasswordStore) SaveAccountSettings(ctx context.Context, userID int64, s INSERT INTO account_settings ( user_id, archive_and_mute_new_noncontact_peers, keep_archived_unmuted, keep_archived_folders, hide_read_marks, new_noncontact_peers_require_premium, display_gifts_button, - noncontact_peers_paid_stars, account_ttl_days, sensitive_content_enabled, contact_signup_silent -) VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11) + noncontact_peers_paid_stars, disallow_unlimited_stargifts, disallow_limited_stargifts, + disallow_unique_stargifts, disallow_premium_gifts, disallow_stargifts_from_channels, + account_ttl_days, sensitive_content_enabled, contact_signup_silent +) VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16) ON CONFLICT (user_id) DO UPDATE SET archive_and_mute_new_noncontact_peers = EXCLUDED.archive_and_mute_new_noncontact_peers, keep_archived_unmuted = EXCLUDED.keep_archived_unmuted, @@ -301,6 +315,11 @@ ON CONFLICT (user_id) DO UPDATE SET new_noncontact_peers_require_premium = EXCLUDED.new_noncontact_peers_require_premium, display_gifts_button = EXCLUDED.display_gifts_button, noncontact_peers_paid_stars = EXCLUDED.noncontact_peers_paid_stars, + disallow_unlimited_stargifts = EXCLUDED.disallow_unlimited_stargifts, + disallow_limited_stargifts = EXCLUDED.disallow_limited_stargifts, + disallow_unique_stargifts = EXCLUDED.disallow_unique_stargifts, + disallow_premium_gifts = EXCLUDED.disallow_premium_gifts, + disallow_stargifts_from_channels = EXCLUDED.disallow_stargifts_from_channels, account_ttl_days = EXCLUDED.account_ttl_days, sensitive_content_enabled = EXCLUDED.sensitive_content_enabled, contact_signup_silent = EXCLUDED.contact_signup_silent, @@ -308,7 +327,11 @@ ON CONFLICT (user_id) DO UPDATE SET userID, gp.ArchiveAndMuteNewNoncontactPeers, gp.KeepArchivedUnmuted, gp.KeepArchivedFolders, gp.HideReadMarks, gp.NewNoncontactPeersRequirePremium, gp.DisplayGiftsButton, - gp.NoncontactPeersPaidStars, settings.NormalizedTTLDays(), settings.SensitiveContentEnabled, settings.ContactSignUpSilent, + gp.NoncontactPeersPaidStars, + gp.DisallowedGifts.UnlimitedStargifts, gp.DisallowedGifts.LimitedStargifts, + gp.DisallowedGifts.UniqueStargifts, gp.DisallowedGifts.PremiumGifts, + gp.DisallowedGifts.StargiftsFromChannel, + settings.NormalizedTTLDays(), settings.SensitiveContentEnabled, settings.ContactSignUpSilent, ); err != nil { return fmt.Errorf("save account settings: %w", err) } diff --git a/internal/store/postgres/account_lifecycle.go b/internal/store/postgres/account_lifecycle.go index 1514f977..ae10d5bb 100644 --- a/internal/store/postgres/account_lifecycle.go +++ b/internal/store/postgres/account_lifecycle.go @@ -16,7 +16,7 @@ import ( ) // AccountLifecycleStore is the PostgreSQL implementation of the unified -// account tombstone, delayed deletion and deletion notification boundary. +// account tombstone and delayed deletion boundary. type AccountLifecycleStore struct { pool *pgxpool.Pool } @@ -157,19 +157,15 @@ func (s *AccountLifecycleStore) ExecuteAccountDeletion(ctx context.Context, user if !due { return domain.AccountDeletionResult{User: u, Changed: false}, nil } - if err := enqueueAccountDeletionNotifications(ctx, tx, userID); err != nil { - return domain.AccountDeletionResult{}, err - } - if err := settleDeletedAccountFinancialState(ctx, tx, userID, now); err != nil { - return domain.AccountDeletionResult{}, err - } + // Human account deletion is deliberately a short logical tombstone boundary. + // Relationships, history, memberships, settings and financial rows remain + // attached to the stable user id; reads project that id as Deleted Account. + // The physical cleanup helpers remain available only to the separate bot- + // deletion boundary, whose lifecycle semantics are intentionally different. revoked, err := revokeByUserExceptTx(ctx, tx, userID, 0) if err != nil { return domain.AccountDeletionResult{}, fmt.Errorf("revoke deleted account authorizations: %w", err) } - if err := purgeDeletedAccountPrivateState(ctx, tx, userID, now); err != nil { - return domain.AccountDeletionResult{}, err - } if err := replacePeerUsernameTx(ctx, tx, peerUsernameTypeUser, userID, "", ""); err != nil { return domain.AccountDeletionResult{}, fmt.Errorf("release deleted account username: %w", err) } @@ -281,45 +277,6 @@ SELECT user_id, source, due_at FROM dedup ORDER BY due_at, user_id LIMIT $2`, no return out, rows.Err() } -func (s *AccountLifecycleStore) ClaimAccountDeletionNotifications(ctx context.Context, now time.Time, limit int, lease time.Duration) ([]domain.AccountDeletionNotification, error) { - if s == nil || s.pool == nil || limit <= 0 || lease <= 0 { - return nil, nil - } - rows, err := s.pool.Query(ctx, ` -WITH claim AS ( - SELECT id FROM account_deletion_notifications - WHERE (status = 'pending' AND next_attempt_at <= $1) - OR (status = 'dispatching' AND lease_until <= $1) - ORDER BY next_attempt_at, id FOR UPDATE SKIP LOCKED LIMIT $2 -) -UPDATE account_deletion_notifications n -SET status = 'dispatching', attempts = attempts + 1, lease_until = $3, updated_at = $1 -FROM claim WHERE n.id = claim.id -RETURNING n.id, n.target_user_id, n.deleted_user_id, n.attempts`, now, limit, now.Add(lease)) - if err != nil { - return nil, fmt.Errorf("claim account deletion notifications: %w", err) - } - defer rows.Close() - out := make([]domain.AccountDeletionNotification, 0) - for rows.Next() { - var n domain.AccountDeletionNotification - if err := rows.Scan(&n.ID, &n.TargetUserID, &n.DeletedUserID, &n.Attempts); err != nil { - return nil, fmt.Errorf("scan account deletion notification: %w", err) - } - out = append(out, n) - } - return out, rows.Err() -} - -func (s *AccountLifecycleStore) CompleteAccountDeletionNotification(ctx context.Context, id int64, now time.Time) error { - _, err := s.pool.Exec(ctx, `UPDATE account_deletion_notifications -SET status = 'delivered', lease_until = NULL, last_error = '', updated_at = $2 WHERE id = $1`, id, now) - if err != nil { - return fmt.Errorf("complete account deletion notification: %w", err) - } - return nil -} - type accountDeletionRowScanner interface { Scan(dest ...any) error } @@ -448,38 +405,6 @@ func truncateUTF8Bytes(value string, maxBytes int) string { return value[:cut] } -func enqueueAccountDeletionNotifications(ctx context.Context, tx pgx.Tx, userID int64) error { - const maxAccountDeletionNotificationAudience = 4096 - _, err := tx.Exec(ctx, ` -INSERT INTO account_deletion_notifications (target_user_id, deleted_user_id) -SELECT audience.user_id, $1 -FROM ( - SELECT user_id - FROM ( - SELECT contact_user_id AS user_id, 0 AS priority, 0 AS activity - FROM contacts WHERE user_id = $1 - UNION ALL - SELECT user_id, 0, 0 FROM contacts WHERE contact_user_id = $1 - UNION ALL - SELECT peer_id, 1, top_message_date - FROM dialogs WHERE user_id = $1 AND peer_type = 'user' - UNION ALL - SELECT user_id, 1, top_message_date - FROM dialogs WHERE peer_type = 'user' AND peer_id = $1 - ) candidates - GROUP BY user_id - ORDER BY min(priority), max(activity) DESC, user_id - LIMIT $2 -) audience -JOIN users u ON u.id = audience.user_id -WHERE audience.user_id <> $1 AND u.deleted_at IS NULL -ON CONFLICT (target_user_id, deleted_user_id) DO NOTHING`, userID, maxAccountDeletionNotificationAudience) - if err != nil { - return fmt.Errorf("enqueue account deletion notifications: %w", err) - } - return nil -} - func revokeOneAuthorizationTx(ctx context.Context, tx pgx.Tx, userID int64, authKeyID [8]byte) ([]domain.Authorization, error) { id := authKeyIDToInt64(authKeyID) if id == 0 { @@ -514,10 +439,16 @@ FROM authorizations WHERE auth_key_id = $1 AND user_id = $2 FOR UPDATE`, id, use return []domain.Authorization{a}, nil } -func purgeDeletedAccountPrivateState(ctx context.Context, tx pgx.Tx, userID int64, now time.Time) error { +func purgeDeletedBotPrivateState(ctx context.Context, tx pgx.Tx, userID int64, now time.Time) error { // Leave shared private_messages/channel_messages and immutable transaction // ledgers intact. Only the deleted user's private projections and settings are // removed; other users continue to reference the tombstone sender. + // The purge can empty the durable delivery lane. Fence concurrent appends + // before deleting its outbox/head/event facts so no committed task becomes + // undiscoverable during the account lifecycle transition. + if err := lockDispatchOutboxLanesExclusive(ctx, tx, []int64{userID}); err != nil { + return fmt.Errorf("lock deleted bot dispatch lane: %w", err) + } statements := []string{ `DELETE FROM account_privacy_rules WHERE owner_user_id = $1`, `DELETE FROM account_reaction_settings WHERE user_id = $1`, @@ -580,6 +511,7 @@ func purgeDeletedAccountPrivateState(ctx context.Context, tx pgx.Tx, userID int6 `DELETE FROM group_call_invites WHERE inviter_user_id = $1 OR invitee_user_id = $1`, `DELETE FROM channel_boost_slots WHERE user_id = $1`, `DELETE FROM channel_invite_importers WHERE user_id = $1`, + `DELETE FROM welcome_message_deliveries WHERE target_user_id = $1`, `DELETE FROM channel_topic_read WHERE user_id = $1`, `DELETE FROM channel_unread_mentions WHERE user_id = $1`, `DELETE FROM channel_unread_mention_index WHERE user_id = $1`, @@ -621,121 +553,3 @@ WHERE admin_user_id = $1 OR participant_user_id = $1`, userID); err != nil { } return nil } - -func settleDeletedAccountFinancialState(ctx context.Context, tx pgx.Tx, userID int64, now time.Time) error { - nowUnix := int(now.Unix()) - rows, err := tx.Query(ctx, ` -SELECT id, buyer_user_id, currency, amount -FROM star_gift_offers -WHERE owner_peer_type = 'user' AND owner_peer_id = $1 AND status = 'pending' -ORDER BY id FOR UPDATE`, userID) - if err != nil { - return fmt.Errorf("lock deleted account gift offers: %w", err) - } - type offer struct { - id, buyer, amount int64 - currency string - } - offers := make([]offer, 0) - for rows.Next() { - var o offer - if err := rows.Scan(&o.id, &o.buyer, &o.currency, &o.amount); err != nil { - rows.Close() - return fmt.Errorf("scan deleted account gift offer: %w", err) - } - offers = append(offers, o) - } - if err := rows.Err(); err != nil { - rows.Close() - return err - } - rows.Close() - for _, o := range offers { - var balance int64 - if o.currency == "XTR" { - if err := tx.QueryRow(ctx, ` -INSERT INTO stars_balances (user_id, balance) VALUES ($1, $2) -ON CONFLICT (user_id) DO UPDATE SET balance = stars_balances.balance + EXCLUDED.balance, updated_at = now() -RETURNING balance`, o.buyer, o.amount).Scan(&balance); err != nil { - return fmt.Errorf("refund deleted account stars offer: %w", err) - } - if _, err := tx.Exec(ctx, `INSERT INTO stars_transactions -(user_id, peer_type, peer_id, amount, reason, title, description, date) -VALUES ($1, 'user', $2, $3, 'gift_offer_refund_account_deleted', 'Gift offer refunded', '', $4)`, o.buyer, userID, o.amount, nowUnix); err != nil { - return fmt.Errorf("record deleted account stars refund: %w", err) - } - } else { - if err := tx.QueryRow(ctx, ` -INSERT INTO ton_balances (user_id, balance_nanoton) VALUES ($1, $2) -ON CONFLICT (user_id) DO UPDATE SET balance_nanoton = ton_balances.balance_nanoton + EXCLUDED.balance_nanoton, updated_at = now() -RETURNING balance_nanoton`, o.buyer, o.amount).Scan(&balance); err != nil { - return fmt.Errorf("refund deleted account TON offer: %w", err) - } - if _, err := tx.Exec(ctx, `INSERT INTO ton_transactions -(user_id, amount_nanoton, reason, peer_type, peer_id, date) -VALUES ($1, $2, 'gift_offer_refund_account_deleted', 'user', $3, $4)`, o.buyer, o.amount, userID, nowUnix); err != nil { - return fmt.Errorf("record deleted account TON refund: %w", err) - } - } - if _, err := tx.Exec(ctx, `UPDATE star_gift_offers -SET status = 'cancelled', resolved_at = $2, balance_after = $3 -WHERE id = $1 AND status = 'pending'`, o.id, nowUnix, balance); err != nil { - return fmt.Errorf("cancel deleted account gift offer: %w", err) - } - } - if _, err := tx.Exec(ctx, `UPDATE star_gift_offers -SET status = 'cancelled', resolved_at = $2, balance_after = 0 -WHERE buyer_user_id = $1 AND status = 'pending'`, userID, nowUnix); err != nil { - return fmt.Errorf("cancel deleted buyer gift offers: %w", err) - } - if _, err := tx.Exec(ctx, `UPDATE star_gift_withdrawal_requests -SET status = 'failed', completed_at = $2 WHERE owner_user_id = $1 AND status = 'pending'`, userID, nowUnix); err != nil { - return fmt.Errorf("fail deleted account withdrawals: %w", err) - } - if _, err := tx.Exec(ctx, `UPDATE star_gift_auction_bids SET active = false, version = version + 1 -WHERE bidder_user_id = $1 AND active = true`, userID); err != nil { - return fmt.Errorf("deactivate deleted account auction bids: %w", err) - } - if _, err := tx.Exec(ctx, `UPDATE unique_star_gifts -SET burned = true, owner_name = '', updated_at = $2 -WHERE owner_peer_type = 'user' AND owner_peer_id = $1`, userID, now); err != nil { - return fmt.Errorf("burn deleted account unique gifts: %w", err) - } - if _, err := tx.Exec(ctx, `UPDATE peer_star_gifts -SET lifecycle_status = 'burned', unsaved = true, pinned_order = 0 -WHERE owner_peer_type = 'user' AND owner_peer_id = $1 AND unique_gift_id IS NOT NULL`, userID); err != nil { - return fmt.Errorf("burn deleted account saved gifts: %w", err) - } - if _, err := tx.Exec(ctx, `DELETE FROM peer_star_gifts -WHERE owner_peer_type = 'user' AND owner_peer_id = $1 AND unique_gift_id IS NULL`, userID); err != nil { - return fmt.Errorf("delete deleted account regular gifts: %w", err) - } - var stars int64 - if err := tx.QueryRow(ctx, `SELECT balance FROM stars_balances WHERE user_id = $1 FOR UPDATE`, userID).Scan(&stars); err != nil && !errors.Is(err, pgx.ErrNoRows) { - return fmt.Errorf("lock deleted account stars balance: %w", err) - } - if stars != 0 { - if _, err := tx.Exec(ctx, `UPDATE stars_balances SET balance = 0, updated_at = $2 WHERE user_id = $1`, userID, now); err != nil { - return fmt.Errorf("zero deleted account stars: %w", err) - } - if _, err := tx.Exec(ctx, `INSERT INTO stars_transactions -(user_id, peer_type, peer_id, amount, reason, title, description, date) -VALUES ($1, 'user', $1, $2, 'account_deleted', 'Account deleted', '', $3)`, userID, -stars, nowUnix); err != nil { - return fmt.Errorf("record deleted account stars clearing: %w", err) - } - } - var ton int64 - if err := tx.QueryRow(ctx, `SELECT balance_nanoton FROM ton_balances WHERE user_id = $1 FOR UPDATE`, userID).Scan(&ton); err != nil && !errors.Is(err, pgx.ErrNoRows) { - return fmt.Errorf("lock deleted account TON balance: %w", err) - } - if ton != 0 { - if _, err := tx.Exec(ctx, `UPDATE ton_balances SET balance_nanoton = 0, updated_at = $2 WHERE user_id = $1`, userID, now); err != nil { - return fmt.Errorf("zero deleted account TON: %w", err) - } - if _, err := tx.Exec(ctx, `INSERT INTO ton_transactions -(user_id, amount_nanoton, reason, date) VALUES ($1, $2, 'account_deleted', $3)`, userID, -ton, nowUnix); err != nil { - return fmt.Errorf("record deleted account TON clearing: %w", err) - } - } - return nil -} diff --git a/internal/store/postgres/account_lifecycle_integration_test.go b/internal/store/postgres/account_lifecycle_integration_test.go index 69565cbe..b5eae6f4 100644 --- a/internal/store/postgres/account_lifecycle_integration_test.go +++ b/internal/store/postgres/account_lifecycle_integration_test.go @@ -23,7 +23,15 @@ func TestAccountLifecycleScheduleCancelAndTombstonePostgres(t *testing.T) { users := NewUserStore(pool) deleted := createTestUser(t, ctx, users, fmt.Sprintf("15571%d", nonce), "Delete", "Me") peer := createTestUser(t, ctx, users, fmt.Sprintf("15572%d", nonce), "Keep", "Peer") + var channelID int64 + var collectiblePhoneID int64 t.Cleanup(func() { + if channelID != 0 { + _, _ = pool.Exec(ctx, `DELETE FROM channels WHERE id = $1`, channelID) + } + if collectiblePhoneID != 0 { + _, _ = pool.Exec(ctx, `DELETE FROM collectible_phones WHERE id = $1`, collectiblePhoneID) + } _, _ = pool.Exec(ctx, `DELETE FROM stars_transactions WHERE user_id = ANY($1)`, []int64{deleted.ID, peer.ID}) _, _ = pool.Exec(ctx, `DELETE FROM ton_transactions WHERE user_id = ANY($1)`, []int64{deleted.ID, peer.ID}) _, _ = pool.Exec(ctx, `DELETE FROM stars_balances WHERE user_id = ANY($1)`, []int64{deleted.ID, peer.ID}) @@ -33,6 +41,11 @@ func TestAccountLifecycleScheduleCancelAndTombstonePostgres(t *testing.T) { _, _ = pool.Exec(ctx, `DELETE FROM private_messages WHERE sender_user_id = ANY($1) OR recipient_user_id = ANY($1)`, []int64{deleted.ID, peer.ID}) _, _ = pool.Exec(ctx, `DELETE FROM users WHERE id = ANY($1)`, []int64{deleted.ID, peer.ID}) }) + deletedUsername := fmt.Sprintf("deleteme%d", nonce) + deleted, err := users.UpdateUsername(ctx, deleted.ID, deletedUsername) + if err != nil { + t.Fatalf("set deleted user username: %v", err) + } authOne := saveLifecycleTestAuthorization(t, ctx, pool, deleted.ID, 1) authTwo := saveLifecycleTestAuthorization(t, ctx, pool, deleted.ID, 2) @@ -55,6 +68,36 @@ VALUES ($1, $2, 'stale-phone', 'Stale', 'Alias')`, peer.ID, deleted.ID); err != if _, err := pool.Exec(ctx, `INSERT INTO ton_balances (user_id, balance_nanoton) VALUES ($1, 100)`, deleted.ID); err != nil { t.Fatalf("insert TON balance: %v", err) } + collectiblePhone := fmt.Sprintf("888%010d", nonce%10_000_000_000) + if err := pool.QueryRow(ctx, `INSERT INTO collectible_phones +(phone, tier, status, owner_user_id, purchase_date, currency, amount, created_at, updated_at) +VALUES ($1, 'standard', 'owned', $2, $3, 'XTR', 100, $3, $3) +RETURNING id`, collectiblePhone, deleted.ID, time.Now().UTC()).Scan(&collectiblePhoneID); err != nil { + t.Fatalf("insert collectible phone: %v", err) + } + createdChannel, err := NewChannelStore(pool).CreateChannel(ctx, domain.CreateChannelRequest{ + CreatorUserID: deleted.ID, + Title: "Retained deletion membership", + Megagroup: true, + Date: int(time.Now().Unix()), + }) + if err != nil { + t.Fatalf("create retained channel membership: %v", err) + } + channelID = createdChannel.Channel.ID + var contactVersionBefore, channelParticipantsVersionBefore int64 + if err := pool.QueryRow(ctx, ` +SELECT COALESCE((SELECT version FROM read_model_versions + WHERE model = 'contact_account' AND owner_user_id = $1 + AND peer_type = 'user' AND peer_id = $1), 0)`, peer.ID).Scan(&contactVersionBefore); err != nil { + t.Fatal(err) + } + if err := pool.QueryRow(ctx, ` +SELECT COALESCE((SELECT version FROM read_model_versions + WHERE model = 'channel_participants' AND owner_user_id = 0 + AND peer_type = 'channel' AND peer_id = $1), 0)`, channelID).Scan(&channelParticipantsVersionBefore); err != nil { + t.Fatal(err) + } lifecycle := NewAccountLifecycleStore(pool) now := time.Now().UTC().Truncate(time.Second) @@ -80,6 +123,15 @@ VALUES ($1, $2, 'stale-phone', 'Stale', 'Alias')`, peer.ID, deleted.ID); err != if _, found, err := NewAuthKeyStore(pool).Get(ctx, authTwo); err != nil || !found { t.Fatalf("other auth key after cancel found=%v err=%v, want retained", found, err) } + digestTwo := sha256.Sum256([]byte("confirm-two")) + pendingBeforeDelete, created, err := lifecycle.ScheduleAccountDeletion(ctx, domain.ScheduleAccountDeletion{ + UserID: deleted.ID, RequesterAuthKeyID: authTwo, Reason: "Delete account", + ConfirmHashDigest: digestTwo, ServiceMessage: "tg://confirmphone?phone=hidden&hash=confirm-two", + RequestedAt: now.Add(time.Minute), ExecuteAt: now.Add(7 * 24 * time.Hour), + }) + if err != nil || !created { + t.Fatalf("schedule deletion before tombstone = %+v created=%v err=%v", pendingBeforeDelete, created, err) + } result, err := lifecycle.ExecuteAccountDeletion(ctx, deleted.ID, domain.AccountDeletionManual, "manual", now.Add(2*time.Minute)) if err != nil { @@ -91,9 +143,48 @@ VALUES ($1, $2, 'stale-phone', 'Stale', 'Alias')`, peer.ID, deleted.ID); err != if _, found, err := users.ByPhone(ctx, deleted.Phone); err != nil || found { t.Fatalf("released phone found=%v err=%v", found, err) } + if _, found, err := users.ByUsername(ctx, deletedUsername); err != nil || found { + t.Fatalf("released username found=%v err=%v", found, err) + } if tombstone, found, err := users.ByID(ctx, deleted.ID); err != nil || !found || !tombstone.Deleted || tombstone.FirstName != "" { t.Fatalf("tombstone = %+v found=%v err=%v", tombstone, found, err) } + if _, found, err := NewAuthorizationStore(pool).ByAuthKey(ctx, authTwo); err != nil || found { + t.Fatalf("authorization after tombstone found=%v err=%v, want revoked", found, err) + } + if _, found, err := NewAuthKeyStore(pool).Get(ctx, authTwo); err != nil || !found { + t.Fatalf("permanent protocol auth key after tombstone found=%v err=%v, want retained", found, err) + } + var requestState string + if err := pool.QueryRow(ctx, `SELECT state FROM account_deletion_requests WHERE id = $1`, pendingBeforeDelete.ID).Scan(&requestState); err != nil { + t.Fatal(err) + } + if requestState != "executed" { + t.Fatalf("pending request state after tombstone = %q, want executed", requestState) + } + var deletedVersion, contactVersionAfter, channelParticipantsVersionAfter int64 + if err := pool.QueryRow(ctx, ` +SELECT version FROM read_model_versions +WHERE model = 'user_deleted' AND owner_user_id = $1 + AND peer_type = 'user' AND peer_id = $1`, deleted.ID).Scan(&deletedVersion); err != nil { + t.Fatal(err) + } + if err := pool.QueryRow(ctx, ` +SELECT COALESCE((SELECT version FROM read_model_versions + WHERE model = 'contact_account' AND owner_user_id = $1 + AND peer_type = 'user' AND peer_id = $1), 0)`, peer.ID).Scan(&contactVersionAfter); err != nil { + t.Fatal(err) + } + if err := pool.QueryRow(ctx, ` +SELECT COALESCE((SELECT version FROM read_model_versions + WHERE model = 'channel_participants' AND owner_user_id = 0 + AND peer_type = 'channel' AND peer_id = $1), 0)`, channelID).Scan(&channelParticipantsVersionAfter); err != nil { + t.Fatal(err) + } + if deletedVersion < 1 || contactVersionAfter != contactVersionBefore || channelParticipantsVersionAfter != channelParticipantsVersionBefore { + t.Fatalf("logical-delete read-model fanout deleted=%d contact=%d->%d channel=%d->%d", + deletedVersion, contactVersionBefore, contactVersionAfter, channelParticipantsVersionBefore, channelParticipantsVersionAfter) + } if _, err := users.UpdateProfile(ctx, deleted.ID, "Resurrected", "", ""); err == nil { t.Fatal("deleted account profile mutation unexpectedly succeeded") } @@ -105,7 +196,10 @@ VALUES ($1, $2, 'stale-phone', 'Stale', 'Alias')`, peer.ID, deleted.ID); err != if err != nil || len(history.Messages) != 1 || history.Messages[0].Body != "keep shared history" || history.Messages[0].From.ID != deleted.ID { t.Fatalf("peer history after deletion = %+v err=%v", history, err) } - var peerBoxes, settings, contacts, notifications int + var ownerBoxes, peerBoxes, settings, contacts, notifications int + if err := pool.QueryRow(ctx, `SELECT count(*) FROM message_boxes WHERE owner_user_id = $1`, deleted.ID).Scan(&ownerBoxes); err != nil { + t.Fatal(err) + } if err := pool.QueryRow(ctx, `SELECT count(*) FROM message_boxes WHERE owner_user_id = $1 AND from_user_id = $2`, peer.ID, deleted.ID).Scan(&peerBoxes); err != nil { t.Fatal(err) } @@ -118,8 +212,13 @@ VALUES ($1, $2, 'stale-phone', 'Stale', 'Alias')`, peer.ID, deleted.ID); err != if err := pool.QueryRow(ctx, `SELECT count(*) FROM account_deletion_notifications WHERE target_user_id = $1 AND deleted_user_id = $2`, peer.ID, deleted.ID).Scan(¬ifications); err != nil { t.Fatal(err) } - if peerBoxes != 1 || settings != 0 || contacts != 0 || notifications != 1 { - t.Fatalf("post-delete state peerBoxes=%d settings=%d contacts=%d notifications=%d", peerBoxes, settings, contacts, notifications) + var memberStatus string + if err := pool.QueryRow(ctx, `SELECT status FROM channel_members WHERE channel_id = $1 AND user_id = $2`, channelID, deleted.ID).Scan(&memberStatus); err != nil { + t.Fatal(err) + } + if ownerBoxes == 0 || peerBoxes != 1 || settings != 1 || contacts != 1 || notifications != 0 || memberStatus != "active" { + t.Fatalf("logical-delete retained state ownerBoxes=%d peerBoxes=%d settings=%d contacts=%d notifications=%d memberStatus=%q", + ownerBoxes, peerBoxes, settings, contacts, notifications, memberStatus) } var stars, ton, starClear, tonClear int64 if err := pool.QueryRow(ctx, `SELECT balance FROM stars_balances WHERE user_id = $1`, deleted.ID).Scan(&stars); err != nil { @@ -134,8 +233,16 @@ VALUES ($1, $2, 'stale-phone', 'Stale', 'Alias')`, peer.ID, deleted.ID); err != if err := pool.QueryRow(ctx, `SELECT COALESCE(sum(amount_nanoton), 0) FROM ton_transactions WHERE user_id = $1 AND reason = 'account_deleted'`, deleted.ID).Scan(&tonClear); err != nil { t.Fatal(err) } - if stars != 0 || ton != 0 || starClear != -50 || tonClear != -100 { - t.Fatalf("financial clearing stars=%d ton=%d star_tx=%d ton_tx=%d", stars, ton, starClear, tonClear) + if stars != 50 || ton != 100 || starClear != 0 || tonClear != 0 { + t.Fatalf("logical-delete retained finances stars=%d ton=%d star_tx=%d ton_tx=%d", stars, ton, starClear, tonClear) + } + var collectibleStatus string + var collectibleOwner int64 + if err := pool.QueryRow(ctx, `SELECT status, owner_user_id FROM collectible_phones WHERE id = $1`, collectiblePhoneID).Scan(&collectibleStatus, &collectibleOwner); err != nil { + t.Fatal(err) + } + if collectibleStatus != "owned" || collectibleOwner != deleted.ID { + t.Fatalf("logical-delete collectible phone status=%q owner=%d, want owned by tombstone %d", collectibleStatus, collectibleOwner, deleted.ID) } } diff --git a/internal/store/postgres/account_settings_integration_test.go b/internal/store/postgres/account_settings_integration_test.go index d00e7bec..ff8f30f7 100644 --- a/internal/store/postgres/account_settings_integration_test.go +++ b/internal/store/postgres/account_settings_integration_test.go @@ -36,6 +36,10 @@ func TestAccountSettingsRoundTripPostgres(t *testing.T) { HideReadMarks: true, DisplayGiftsButton: true, NoncontactPeersPaidStars: 75, + DisallowedGifts: domain.DisallowedGifts{ + UnlimitedStargifts: true, + PremiumGifts: true, + }, }, AccountTTLDays: 30, SensitiveContentEnabled: true, diff --git a/internal/store/postgres/active_channel_ids_batch.go b/internal/store/postgres/active_channel_ids_batch.go new file mode 100644 index 00000000..d7682534 --- /dev/null +++ b/internal/store/postgres/active_channel_ids_batch.go @@ -0,0 +1,379 @@ +package postgres + +import ( + "context" + "errors" + "fmt" + "sync" + "time" + + "telesrv/internal/domain" +) + +// ActiveChannelIDsBatchMetrics exposes bounded aggregate cold-loader signals; +// owner identities never become metric labels. +type ActiveChannelIDsBatchMetrics interface { + ActiveChannelIDsBatch(selectors int, rows int, d time.Duration, err error) + ActiveChannelIDsPending(delta int) +} + +type ActiveChannelIDsBatchConfig struct { + MaxSize int + MaxWait time.Duration + QueueSize int + QueryTimeout time.Duration + Metrics ActiveChannelIDsBatchMetrics +} + +type activeChannelIDsSelector struct { + userID int64 + afterChannelID int64 + limit int +} + +type activeChannelIDsBatchRequest struct { + selector activeChannelIDsSelector + result chan activeChannelIDsBatchResult +} + +type activeChannelIDsBatchResult struct { + channelIDs []int64 + err error +} + +type activeChannelIDsBatchBackend interface { + listActiveChannelIDPages(context.Context, []activeChannelIDsSelector) ([][]int64, error) +} + +// ActiveChannelIDsPageBatcher combines independent readiness cache misses into +// one PostgreSQL call. It is a synchronous bounded read source: failures are +// returned to every selector and never fall back to one query per account. +type ActiveChannelIDsPageBatcher struct { + base activeChannelIDsBatchBackend + cfg ActiveChannelIDsBatchConfig + queue chan activeChannelIDsBatchRequest + stop chan struct{} + done chan struct{} + cancel context.CancelFunc + once sync.Once + gate sync.RWMutex + closed bool +} + +func NewActiveChannelIDsPageBatcher( + base *ChannelStore, + cfg ActiveChannelIDsBatchConfig, +) (*ActiveChannelIDsPageBatcher, error) { + if base == nil || base.db == nil { + return nil, errors.New("initialize active channel IDs batcher: nil store") + } + return newActiveChannelIDsPageBatcher(base, cfg) +} + +func newActiveChannelIDsPageBatcher( + base activeChannelIDsBatchBackend, + cfg ActiveChannelIDsBatchConfig, +) (*ActiveChannelIDsPageBatcher, error) { + if base == nil { + return nil, errors.New("initialize active channel IDs batcher: nil backend") + } + if cfg.MaxSize <= 0 || cfg.MaxSize > 4096 { + return nil, fmt.Errorf("initialize active channel IDs batcher: max size %d outside [1,4096]", cfg.MaxSize) + } + if cfg.MaxWait <= 0 || cfg.MaxWait > time.Second { + return nil, fmt.Errorf("initialize active channel IDs batcher: max wait %v outside (0,1s]", cfg.MaxWait) + } + if cfg.QueueSize < cfg.MaxSize || cfg.QueueSize > 1<<20 { + return nil, fmt.Errorf("initialize active channel IDs batcher: queue size %d outside [%d,%d]", cfg.QueueSize, cfg.MaxSize, 1<<20) + } + if cfg.QueryTimeout <= 0 || cfg.QueryTimeout > 30*time.Second { + return nil, fmt.Errorf("initialize active channel IDs batcher: query timeout %v outside (0,30s]", cfg.QueryTimeout) + } + workerCtx, cancel := context.WithCancel(context.Background()) + b := &ActiveChannelIDsPageBatcher{ + base: base, cfg: cfg, + queue: make(chan activeChannelIDsBatchRequest, cfg.QueueSize), + stop: make(chan struct{}), done: make(chan struct{}), cancel: cancel, + } + go b.run(workerCtx) + return b, nil +} + +func (b *ActiveChannelIDsPageBatcher) ListActiveChannelIDsForUser( + ctx context.Context, + userID, afterChannelID int64, + limit int, +) ([]int64, error) { + if userID == 0 || afterChannelID < 0 { + return nil, domain.ErrChannelInvalid + } + if limit <= 0 || limit > domain.MaxSynchronousChannelDialogFanout { + limit = domain.MaxSynchronousChannelDialogFanout + } + if ctx == nil { + ctx = context.Background() + } + request := activeChannelIDsBatchRequest{ + selector: activeChannelIDsSelector{userID: userID, afterChannelID: afterChannelID, limit: limit}, + result: make(chan activeChannelIDsBatchResult, 1), + } + b.gate.RLock() + if b.closed { + b.gate.RUnlock() + return nil, context.Canceled + } + select { + case b.queue <- request: + if b.cfg.Metrics != nil { + b.cfg.Metrics.ActiveChannelIDsPending(1) + } + case <-ctx.Done(): + b.gate.RUnlock() + return nil, ctx.Err() + } + b.gate.RUnlock() + + select { + case result := <-request.result: + return result.channelIDs, result.err + case <-ctx.Done(): + return nil, ctx.Err() + } +} + +func (b *ActiveChannelIDsPageBatcher) Close() { + if b == nil { + return + } + b.once.Do(func() { + b.gate.Lock() + b.closed = true + close(b.stop) + b.cancel() + b.gate.Unlock() + <-b.done + }) +} + +func (b *ActiveChannelIDsPageBatcher) run(ctx context.Context) { + defer close(b.done) + pending := make([]activeChannelIDsBatchRequest, 0, b.cfg.MaxSize) + for { + if len(pending) == 0 { + select { + case request := <-b.queue: + pending = append(pending, request) + case <-b.stop: + b.failQueued(context.Canceled, pending) + return + } + } + if len(pending) < b.cfg.MaxSize { + timer := time.NewTimer(b.cfg.MaxWait) + collect: + for len(pending) < b.cfg.MaxSize { + select { + case request := <-b.queue: + pending = append(pending, request) + case <-timer.C: + break collect + case <-b.stop: + stopAndDrainTimer(timer) + b.failQueued(context.Canceled, pending) + return + } + } + stopAndDrainTimer(timer) + } + batch, remaining := selectDistinctActiveChannelIDsBatch(pending, b.cfg.MaxSize) + pending = remaining + b.execute(ctx, batch) + } +} + +func selectDistinctActiveChannelIDsBatch( + pending []activeChannelIDsBatchRequest, + maxSize int, +) ([]activeChannelIDsBatchRequest, []activeChannelIDsBatchRequest) { + batch := make([]activeChannelIDsBatchRequest, 0, min(maxSize, len(pending))) + remaining := make([]activeChannelIDsBatchRequest, 0, len(pending)) + seen := make(map[activeChannelIDsSelector]struct{}, min(maxSize, len(pending))) + for _, request := range pending { + if len(batch) >= maxSize { + remaining = append(remaining, request) + continue + } + if _, duplicate := seen[request.selector]; duplicate { + remaining = append(remaining, request) + continue + } + seen[request.selector] = struct{}{} + batch = append(batch, request) + } + return batch, remaining +} + +func (b *ActiveChannelIDsPageBatcher) execute(ctx context.Context, batch []activeChannelIDsBatchRequest) { + if len(batch) == 0 { + return + } + selectors := make([]activeChannelIDsSelector, len(batch)) + for index, request := range batch { + selectors[index] = request.selector + } + started := time.Now() + queryCtx, cancel := context.WithTimeout(ctx, b.cfg.QueryTimeout) + pages, err := b.base.listActiveChannelIDPages(queryCtx, selectors) + cancel() + rows := 0 + if err == nil { + if len(pages) != len(batch) { + err = fmt.Errorf("list active channel IDs batch: result count %d, want %d", len(pages), len(batch)) + } else { + for _, page := range pages { + rows += len(page) + } + } + } + if b.cfg.Metrics != nil { + b.cfg.Metrics.ActiveChannelIDsBatch(len(batch), rows, time.Since(started), err) + } + for index, request := range batch { + result := activeChannelIDsBatchResult{err: err} + if err == nil { + result.channelIDs = pages[index] + } + request.result <- result + if b.cfg.Metrics != nil { + b.cfg.Metrics.ActiveChannelIDsPending(-1) + } + } +} + +func (b *ActiveChannelIDsPageBatcher) failQueued(err error, pending []activeChannelIDsBatchRequest) { + for _, request := range pending { + b.failRequest(request, err) + } + for { + select { + case request := <-b.queue: + b.failRequest(request, err) + default: + return + } + } +} + +func (b *ActiveChannelIDsPageBatcher) failRequest(request activeChannelIDsBatchRequest, err error) { + request.result <- activeChannelIDsBatchResult{err: err} + if b.cfg.Metrics != nil { + b.cfg.Metrics.ActiveChannelIDsPending(-1) + } +} + +func (s *ChannelStore) listActiveChannelIDPages( + ctx context.Context, + selectors []activeChannelIDsSelector, +) ([][]int64, error) { + pages := make([][]int64, len(selectors)) + if len(selectors) == 0 { + return pages, nil + } + userIDs := make([]int64, len(selectors)) + afterChannelIDs := make([]int64, len(selectors)) + limits := make([]int32, len(selectors)) + seen := make(map[activeChannelIDsSelector]struct{}, len(selectors)) + for index, selector := range selectors { + if selector.userID == 0 || selector.afterChannelID < 0 || selector.limit <= 0 || + selector.limit > domain.MaxSynchronousChannelDialogFanout { + return nil, fmt.Errorf("list active channel IDs batch: invalid selector at index %d", index) + } + if _, duplicate := seen[selector]; duplicate { + return nil, fmt.Errorf("list active channel IDs batch: duplicate selector at index %d", index) + } + seen[selector] = struct{}{} + userIDs[index] = selector.userID + afterChannelIDs[index] = selector.afterChannelID + limits[index] = int32(selector.limit) + } + rows, err := s.db.Query(ctx, ` +WITH input AS ( + SELECT * + FROM unnest($1::bigint[], $2::bigint[], $3::integer[]) + WITH ORDINALITY AS value(user_id, after_channel_id, page_limit, ordinal) +) +SELECT input.ordinal, visible.channel_id +FROM input +JOIN LATERAL ( + SELECT channel_id + FROM ( + SELECT membership.channel_id + FROM user_channel_member_index AS membership + WHERE membership.user_id = input.user_id + AND membership.status = 'active' + AND NOT membership.deleted + UNION + SELECT mono.id + FROM channels AS mono + JOIN channels AS parent + ON parent.id = mono.linked_monoforum_id + AND NOT parent.deleted + AND parent.broadcast_messages_allowed + AND parent.linked_monoforum_id = mono.id + WHERE mono.monoforum + AND NOT mono.deleted + AND ( + EXISTS ( + SELECT 1 + FROM channel_members AS admin + WHERE admin.channel_id = parent.id + AND admin.user_id = input.user_id + AND admin.status = 'active' + AND ( + admin.role = 'creator' + OR ( + admin.role = 'admin' + AND COALESCE((admin.admin_rights->>'ManageDirectMessages')::boolean, false) + ) + ) + ) + OR EXISTS ( + SELECT 1 + FROM channel_messages AS message + WHERE message.channel_id = mono.id + AND message.saved_peer_type = 'user' + AND message.saved_peer_id = input.user_id + AND NOT message.deleted + ) + ) + ) AS visible_channels + WHERE channel_id > input.after_channel_id + ORDER BY channel_id + LIMIT input.page_limit +) AS visible ON true +ORDER BY input.ordinal, visible.channel_id`, userIDs, afterChannelIDs, limits) + if err != nil { + return nil, fmt.Errorf("list active channel IDs batch: %w", err) + } + defer rows.Close() + for rows.Next() { + var ordinal int64 + var channelID int64 + if err := rows.Scan(&ordinal, &channelID); err != nil { + return nil, err + } + if ordinal <= 0 || ordinal > int64(len(pages)) { + return nil, fmt.Errorf("list active channel IDs batch: invalid ordinal %d", ordinal) + } + page := pages[ordinal-1] + selector := selectors[ordinal-1] + if channelID <= selector.afterChannelID || (len(page) > 0 && channelID <= page[len(page)-1]) || len(page) >= selector.limit { + return nil, fmt.Errorf("list active channel IDs batch: invalid page row for ordinal %d", ordinal) + } + pages[ordinal-1] = append(page, channelID) + } + if err := rows.Err(); err != nil { + return nil, err + } + return pages, nil +} diff --git a/internal/store/postgres/active_channel_ids_batch_integration_test.go b/internal/store/postgres/active_channel_ids_batch_integration_test.go new file mode 100644 index 00000000..9f2106f7 --- /dev/null +++ b/internal/store/postgres/active_channel_ids_batch_integration_test.go @@ -0,0 +1,60 @@ +package postgres + +import ( + "context" + "slices" + "testing" + + "telesrv/internal/domain" +) + +func TestChannelStoreListActiveChannelIDPagesPreservesSelectorOrdinality(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + suffix := randomSuffix(t) + users := NewUserStore(pool) + owner, err := users.Create(ctx, domain.User{AccessHash: 901, Phone: "+1887" + suffix + "01", FirstName: "BatchOwner"}) + if err != nil { + t.Fatalf("create owner: %v", err) + } + member, err := users.Create(ctx, domain.User{AccessHash: 902, Phone: "+1887" + suffix + "02", FirstName: "BatchMember"}) + if err != nil { + t.Fatalf("create member: %v", err) + } + channels := NewChannelStore(pool) + first, err := channels.CreateChannel(ctx, domain.CreateChannelRequest{ + CreatorUserID: owner.ID, Title: "Batch First " + suffix, Megagroup: true, + MemberUserIDs: []int64{member.ID}, Date: 1700007010, + }) + if err != nil { + t.Fatalf("create first channel: %v", err) + } + second, err := channels.CreateChannel(ctx, domain.CreateChannelRequest{ + CreatorUserID: owner.ID, Title: "Batch Second " + suffix, Megagroup: true, Date: 1700007011, + }) + if err != nil { + t.Fatalf("create second channel: %v", err) + } + t.Cleanup(func() { + _, _ = pool.Exec(ctx, "DELETE FROM channels WHERE id = ANY($1::bigint[])", []int64{first.Channel.ID, second.Channel.ID}) + _, _ = pool.Exec(ctx, "DELETE FROM users WHERE id = ANY($1::bigint[])", []int64{owner.ID, member.ID}) + }) + selectors := []activeChannelIDsSelector{ + {userID: owner.ID, afterChannelID: 0, limit: 1}, + {userID: member.ID, afterChannelID: 0, limit: 1000}, + {userID: owner.ID, afterChannelID: first.Channel.ID, limit: 1000}, + } + pages, err := channels.listActiveChannelIDPages(ctx, selectors) + if err != nil { + t.Fatalf("list batch: %v", err) + } + for index, selector := range selectors { + want, err := channels.ListActiveChannelIDsForUser(ctx, selector.userID, selector.afterChannelID, selector.limit) + if err != nil { + t.Fatalf("list direct selector %d: %v", index, err) + } + if !slices.Equal(pages[index], want) { + t.Fatalf("page %d = %v, want %v", index, pages[index], want) + } + } +} diff --git a/internal/store/postgres/active_channel_ids_batch_test.go b/internal/store/postgres/active_channel_ids_batch_test.go new file mode 100644 index 00000000..0016e743 --- /dev/null +++ b/internal/store/postgres/active_channel_ids_batch_test.go @@ -0,0 +1,148 @@ +package postgres + +import ( + "context" + "errors" + "slices" + "sync" + "sync/atomic" + "testing" + "time" +) + +func TestSelectDistinctActiveChannelIDsBatchDefersDuplicate(t *testing.T) { + selector := activeChannelIDsSelector{userID: 1, limit: 1000} + first := activeChannelIDsBatchRequest{selector: selector} + duplicate := activeChannelIDsBatchRequest{selector: selector} + other := activeChannelIDsBatchRequest{selector: activeChannelIDsSelector{userID: 2, limit: 1000}} + batch, remaining := selectDistinctActiveChannelIDsBatch([]activeChannelIDsBatchRequest{first, duplicate, other}, 3) + if len(batch) != 2 || batch[0].selector.userID != 1 || batch[1].selector.userID != 2 { + t.Fatalf("batch = %#v", batch) + } + if len(remaining) != 1 || remaining[0].selector != selector { + t.Fatalf("remaining = %#v", remaining) + } +} + +func TestActiveChannelIDsPageBatcherCoalescesSelectors(t *testing.T) { + const count = 32 + backend := &fakeActiveChannelIDsBatchBackend{} + batcher, err := newActiveChannelIDsPageBatcher(backend, ActiveChannelIDsBatchConfig{ + MaxSize: count, MaxWait: 100 * time.Millisecond, QueueSize: count * 2, QueryTimeout: time.Second, + }) + if err != nil { + t.Fatal(err) + } + t.Cleanup(batcher.Close) + start := make(chan struct{}) + errs := make(chan error, count) + var wg sync.WaitGroup + for index := range count { + index := index + wg.Add(1) + go func() { + defer wg.Done() + <-start + got, err := batcher.ListActiveChannelIDsForUser(context.Background(), int64(index+1), 0, 1000) + if err != nil { + errs <- err + } else if !slices.Equal(got, []int64{int64(index + 1)}) { + errs <- errors.New("unexpected active channel IDs page") + } + }() + } + close(start) + wg.Wait() + close(errs) + for err := range errs { + t.Fatal(err) + } + if backend.calls.Load() != 1 || backend.inputs.Load() != count { + t.Fatalf("backend calls=%d inputs=%d", backend.calls.Load(), backend.inputs.Load()) + } +} + +func TestActiveChannelIDsPageBatcherCapacityAndShutdownAreExplicit(t *testing.T) { + started := make(chan struct{}) + backend := &fakeActiveChannelIDsBatchBackend{started: started, block: true} + metrics := &fakeActiveChannelIDsBatchMetrics{} + batcher, err := newActiveChannelIDsPageBatcher(backend, ActiveChannelIDsBatchConfig{ + MaxSize: 1, MaxWait: time.Millisecond, QueueSize: 1, QueryTimeout: time.Second, Metrics: metrics, + }) + if err != nil { + t.Fatal(err) + } + results := make(chan error, 2) + go func() { + _, err := batcher.ListActiveChannelIDsForUser(context.Background(), 1, 0, 1000) + results <- err + }() + select { + case <-started: + case <-time.After(time.Second): + t.Fatal("first batch did not start") + } + go func() { + _, err := batcher.ListActiveChannelIDsForUser(context.Background(), 2, 0, 1000) + results <- err + }() + deadline := time.Now().Add(time.Second) + for metrics.pending.Load() != 2 && time.Now().Before(deadline) { + time.Sleep(time.Millisecond) + } + ctx, cancel := context.WithTimeout(context.Background(), 20*time.Millisecond) + defer cancel() + if _, err := batcher.ListActiveChannelIDsForUser(ctx, 3, 0, 1000); !errors.Is(err, context.DeadlineExceeded) { + t.Fatalf("capacity wait err = %v", err) + } + batcher.Close() + for range 2 { + if err := <-results; !errors.Is(err, context.Canceled) { + t.Fatalf("shutdown result = %v", err) + } + } + if metrics.pending.Load() != 0 { + t.Fatalf("pending = %d", metrics.pending.Load()) + } + if _, err := batcher.ListActiveChannelIDsForUser(context.Background(), 4, 0, 1000); !errors.Is(err, context.Canceled) { + t.Fatalf("post-close err = %v", err) + } +} + +type fakeActiveChannelIDsBatchBackend struct { + calls atomic.Int64 + inputs atomic.Int64 + started chan struct{} + block bool + once sync.Once +} + +func (f *fakeActiveChannelIDsBatchBackend) listActiveChannelIDPages( + ctx context.Context, + selectors []activeChannelIDsSelector, +) ([][]int64, error) { + f.calls.Add(1) + f.inputs.Add(int64(len(selectors))) + if f.started != nil { + f.once.Do(func() { close(f.started) }) + } + if f.block { + <-ctx.Done() + return nil, ctx.Err() + } + pages := make([][]int64, len(selectors)) + for index, selector := range selectors { + pages[index] = []int64{selector.userID} + } + return pages, nil +} + +type fakeActiveChannelIDsBatchMetrics struct { + pending atomic.Int64 +} + +func (*fakeActiveChannelIDsBatchMetrics) ActiveChannelIDsBatch(int, int, time.Duration, error) {} + +func (m *fakeActiveChannelIDsBatchMetrics) ActiveChannelIDsPending(delta int) { + m.pending.Add(int64(delta)) +} diff --git a/internal/store/postgres/auth_identity_lock_integration_test.go b/internal/store/postgres/auth_identity_lock_integration_test.go index 89122ad8..1e07d27f 100644 --- a/internal/store/postgres/auth_identity_lock_integration_test.go +++ b/internal/store/postgres/auth_identity_lock_integration_test.go @@ -39,22 +39,15 @@ func TestAuthIdentitySelectorRetriesUncommittedFirstBindSnapshotPostgres(t *test if err := advanceConn.QueryRow(ctx, `SELECT pg_backend_pid()`).Scan(&advancePID); err != nil { t.Fatal(err) } - barrier := newAuthStoreQueryBarrier(advanceConn, "auth_identity_hint", "") msgID := authKeySessionLayerTestMsgID(time.Now().UTC(), 1) type advanceResult struct { value store.AuthKeySessionLayer applied bool err error } - result := make(chan advanceResult, 1) - go func() { - value, applied, err := NewAuthKeyStore(barrier).AdvanceSessionLayer(ctx, temp, 8703, 227, msgID) - result <- advanceResult{value: value, applied: applied, err: err} - }() - <-barrier.observed - - // The selector already read "unbound". Stage a committed binding behind - // its statement snapshot while retaining P/raw row locks in the outer tx. + // Stage the first binding but do not commit it. Save holds the permanent + // identity gate and raw row, so the selector sees the old unbound hint and + // then waits on the raw row inside the server-side advance function. bindTx, err := pool.Begin(ctx) if err != nil { t.Fatal(err) @@ -63,7 +56,11 @@ func TestAuthIdentitySelectorRetriesUncommittedFirstBindSnapshotPostgres(t *test if err := NewTempAuthKeyBindingStore(bindTx).Save(ctx, binding); err != nil { t.Fatalf("stage first bind: %v", err) } - close(barrier.release) + result := make(chan advanceResult, 1) + go func() { + value, applied, err := NewAuthKeyStore(advanceConn).AdvanceSessionLayer(ctx, temp, 8703, 227, msgID) + result <- advanceResult{value: value, applied: applied, err: err} + }() waitForPostgresBackendLockWait(t, ctx, pool, advancePID) if err := bindTx.Commit(ctx); err != nil { t.Fatalf("commit first bind: %v", err) @@ -166,11 +163,22 @@ func TestAuthIdentitySelectorSerializesWithPermanentRevocationAndDeletePostgres( if err := <-opResult; err != nil { t.Fatalf("%s error = %v", op, err) } + assertRevokeTestNoAuthorization(t, ctx, auths, perm) + if op == "revoke" { + // Remote authorization revocation deliberately preserves protocol + // keys and their binding so reconnect reaches the RPC authorization + // gate and receives AUTH_KEY_UNREGISTERED rather than transport -404. + assertRevokeTestPresentAuthKey(t, ctx, keys, temp) + assertRevokeTestPresentAuthKey(t, ctx, keys, perm) + if _, found, err := bindings.GetByTemp(ctx, temp); err != nil || !found { + t.Fatalf("binding after revoke found=%v err=%v, want present", found, err) + } + return + } assertTempIdentityAuthKeyMissing(t, ctx, keys, temp) assertTempIdentityAuthKeyMissing(t, ctx, keys, perm) - assertRevokeTestNoAuthorization(t, ctx, auths, perm) if _, found, err := bindings.GetByTemp(ctx, temp); err != nil || found { - t.Fatalf("binding after %s found=%v err=%v", op, found, err) + t.Fatalf("binding after delete found=%v err=%v, want absent", found, err) } }) } diff --git a/internal/store/postgres/auth_key_expiry_migration_integration_test.go b/internal/store/postgres/auth_key_expiry_migration_integration_test.go index a29f7772..c579968f 100644 --- a/internal/store/postgres/auth_key_expiry_migration_integration_test.go +++ b/internal/store/postgres/auth_key_expiry_migration_integration_test.go @@ -446,7 +446,7 @@ INSERT INTO public.secret_chats ( ) VALUES ( 860086, 86, 87, $1, $2, $3, $4, - 'waiting', 86, 1 + 'waiting', 860086, 1 )`, adminUserID, adminAuthKeyID, participantUserID, participantAuthKeyID); err != nil { t.Fatalf("insert temporary-key secret chat fixture: %v", err) } diff --git a/internal/store/postgres/authkey.go b/internal/store/postgres/authkey.go index 76c61c11..a258d320 100644 --- a/internal/store/postgres/authkey.go +++ b/internal/store/postgres/authkey.go @@ -54,11 +54,104 @@ WHERE auth_keys.body = EXCLUDED.body // 完成，GC 的 cutoff/final predicate 会看到新水位并跳过。这样连接不会在“读到旧 key、尚未 // 注册进 SessionManager”的窗口被后台清理。 func (s *AuthKeyStore) Get(ctx context.Context, id [8]byte) (store.AuthKeyData, bool, error) { + data, err := scanAuthKeyData(s.db.QueryRow(ctx, ` +UPDATE auth_keys +SET last_used_at = now() +WHERE auth_key_id = $1 +RETURNING auth_key_id, body, server_salt, created_at, + expires_at, layer, layer_observation_id, + device_model, platform, system_version, api_id, app_version +`, authKeyIDToInt64(id))) + if err != nil { + if errors.Is(err, pgx.ErrNoRows) { + return store.AuthKeyData{}, false, nil + } + return store.AuthKeyData{}, false, fmt.Errorf("get auth key: %w", err) + } + if data.ID != id { + return store.AuthKeyData{}, false, fmt.Errorf("get auth key returned id %x, want %x", data.ID, id) + } + return data, true, nil +} + +// Revalidate reads the immutable key/protocol tuple after an activation claim +// is visible. It deliberately does not touch last_used_at: the physical +// connection's initial Get already established the orphan lease and the claim +// is now the local delete/revoke serialization boundary. +func (s *AuthKeyStore) Revalidate(ctx context.Context, id [8]byte) (store.AuthKeyData, bool, error) { + data, err := scanAuthKeyData(s.db.QueryRow(ctx, ` +SELECT auth_key_id, body, server_salt, created_at, + expires_at, layer, layer_observation_id, + device_model, platform, system_version, api_id, app_version +FROM auth_keys +WHERE auth_key_id = $1 +`, authKeyIDToInt64(id))) + if err != nil { + if errors.Is(err, pgx.ErrNoRows) { + return store.AuthKeyData{}, false, nil + } + return store.AuthKeyData{}, false, fmt.Errorf("revalidate auth key: %w", err) + } + if data.ID != id { + return store.AuthKeyData{}, false, fmt.Errorf("revalidate auth key returned id %x, want %x", data.ID, id) + } + return data, true, nil +} + +// LoadBindingKeys touches and returns both cryptographic proof keys in one +// statement. Missing rows remain explicit in the result so the application can +// preserve its temp-rotation versus invalid-encrypted-proof error split. +func (s *AuthKeyStore) LoadBindingKeys(ctx context.Context, tempID, permID [8]byte) (store.AuthKeyBindingKeys, error) { + rows, err := s.db.Query(ctx, ` +UPDATE auth_keys +SET last_used_at = now() +WHERE auth_key_id = ANY($1::bigint[]) +RETURNING auth_key_id, body, server_salt, created_at, + expires_at, layer, layer_observation_id, + device_model, platform, system_version, api_id, app_version +`, []int64{authKeyIDToInt64(tempID), authKeyIDToInt64(permID)}) + if err != nil { + return store.AuthKeyBindingKeys{}, fmt.Errorf("load auth key binding pair: %w", err) + } + defer rows.Close() + var result store.AuthKeyBindingKeys + for rows.Next() { + data, scanErr := scanAuthKeyData(rows) + if scanErr != nil { + return store.AuthKeyBindingKeys{}, fmt.Errorf("scan auth key binding pair: %w", scanErr) + } + switch data.ID { + case tempID: + result.Temporary = data + result.TemporaryFound = true + case permID: + result.Permanent = data + result.PermanentFound = true + default: + return store.AuthKeyBindingKeys{}, fmt.Errorf("load auth key binding pair returned unexpected id %x", data.ID) + } + } + if err := rows.Err(); err != nil { + return store.AuthKeyBindingKeys{}, fmt.Errorf("iterate auth key binding pair: %w", err) + } + if tempID == permID && result.TemporaryFound { + result.Permanent = result.Temporary + result.PermanentFound = true + } + return result, nil +} + +type authKeyDataScanner interface { + Scan(dest ...any) error +} + +func scanAuthKeyData(row authKeyDataScanner) (store.AuthKeyData, error) { var ( + storedID int64 body []byte serverSalt int64 - expiresAt int createdAt pgtype.Timestamptz + expiresAt int layer int layerObservationID int64 deviceModel string @@ -67,25 +160,18 @@ func (s *AuthKeyStore) Get(ctx context.Context, id [8]byte) (store.AuthKeyData, apiID int appVersion string ) - err := s.db.QueryRow(ctx, ` -UPDATE auth_keys -SET last_used_at = now() -WHERE auth_key_id = $1 -RETURNING auth_key_id, body, server_salt, created_at, - expires_at, layer, layer_observation_id, - device_model, platform, system_version, api_id, app_version -`, authKeyIDToInt64(id)).Scan(new(int64), &body, &serverSalt, &createdAt, &expiresAt, &layer, &layerObservationID, &deviceModel, &platform, &systemVersion, &apiID, &appVersion) - if err != nil { - if errors.Is(err, pgx.ErrNoRows) { - return store.AuthKeyData{}, false, nil - } - return store.AuthKeyData{}, false, fmt.Errorf("get auth key: %w", err) + if err := row.Scan( + &storedID, &body, &serverSalt, &createdAt, + &expiresAt, &layer, &layerObservationID, + &deviceModel, &platform, &systemVersion, &apiID, &appVersion, + ); err != nil { + return store.AuthKeyData{}, err } if len(body) != len(store.AuthKeyData{}.Value) { - return store.AuthKeyData{}, false, fmt.Errorf("auth key body length = %d, want 256", len(body)) + return store.AuthKeyData{}, fmt.Errorf("auth key body length = %d, want 256", len(body)) } data := store.AuthKeyData{ - ID: id, + ID: authKeyIDFromInt64(storedID), ServerSalt: serverSalt, ExpiresAt: expiresAt, Layer: layer, @@ -100,7 +186,7 @@ RETURNING auth_key_id, body, server_salt, created_at, if createdAt.Valid { data.CreatedAt = createdAt.Time.Unix() } - return data, true, nil + return data, nil } const activeAuthKeyHeartbeatBatch = 4096 diff --git a/internal/store/postgres/authkey_get_batch.go b/internal/store/postgres/authkey_get_batch.go new file mode 100644 index 00000000..2a760d4d --- /dev/null +++ b/internal/store/postgres/authkey_get_batch.go @@ -0,0 +1,344 @@ +package postgres + +import ( + "context" + "errors" + "fmt" + "sync" + "time" + + "telesrv/internal/store" +) + +// AuthKeyGetBatchConfig bounds the synchronous first-frame auth-key lookup. +// Every accepted Get waits until its durable last_used_at touch has completed; +// this is not an asynchronous activity update. +type AuthKeyGetBatchConfig struct { + MaxSize int + MaxWait time.Duration + QueueSize int + QueryTimeout time.Duration +} + +type authKeyGetBatchRequest struct { + ctx context.Context + id [8]byte + result chan authKeyGetBatchResult +} + +type authKeyGetBatchResult struct { + data store.AuthKeyData + found bool + err error +} + +// BatchedAuthKeyStore preserves store.AuthKeyStore semantics while combining +// contemporaneous first-frame Get calls into one PostgreSQL UPDATE ... +// RETURNING statement. Save/revalidate/bind/client-info/delete remain direct +// authority operations on the base store. +type BatchedAuthKeyStore struct { + base *AuthKeyStore + cfg AuthKeyGetBatchConfig + + touchQueue chan authKeyGetBatchRequest + revalidateQueue chan authKeyGetBatchRequest + stop chan struct{} + cancel context.CancelFunc + once sync.Once + workers sync.WaitGroup + gate sync.RWMutex + closed bool +} + +func NewBatchedAuthKeyStore(base *AuthKeyStore, cfg AuthKeyGetBatchConfig) (*BatchedAuthKeyStore, error) { + if base == nil || base.db == nil { + return nil, errors.New("initialize auth-key get batcher: nil store") + } + if cfg.MaxSize <= 0 || cfg.MaxSize > 4096 { + return nil, fmt.Errorf("initialize auth-key get batcher: max size %d outside [1,4096]", cfg.MaxSize) + } + if cfg.MaxWait <= 0 || cfg.MaxWait > 10*time.Millisecond { + return nil, fmt.Errorf("initialize auth-key get batcher: max wait %v outside (0,10ms]", cfg.MaxWait) + } + if cfg.QueueSize < cfg.MaxSize || cfg.QueueSize > 1<<20 { + return nil, fmt.Errorf("initialize auth-key get batcher: queue size %d outside [%d,%d]", cfg.QueueSize, cfg.MaxSize, 1<<20) + } + if cfg.QueryTimeout <= 0 || cfg.QueryTimeout > 30*time.Second { + return nil, fmt.Errorf("initialize auth-key get batcher: query timeout %v outside (0,30s]", cfg.QueryTimeout) + } + workerCtx, cancel := context.WithCancel(context.Background()) + s := &BatchedAuthKeyStore{ + base: base, cfg: cfg, + touchQueue: make(chan authKeyGetBatchRequest, cfg.QueueSize), + revalidateQueue: make(chan authKeyGetBatchRequest, cfg.QueueSize), + stop: make(chan struct{}), cancel: cancel, + } + s.workers.Add(2) + go s.run(workerCtx, s.touchQueue, true) + go s.run(workerCtx, s.revalidateQueue, false) + return s, nil +} + +func (s *BatchedAuthKeyStore) Save(ctx context.Context, key store.AuthKeyData) error { + return s.base.Save(ctx, key) +} + +func (s *BatchedAuthKeyStore) Get(ctx context.Context, id [8]byte) (store.AuthKeyData, bool, error) { + return s.lookup(ctx, id, s.touchQueue, true) +} + +func (s *BatchedAuthKeyStore) lookup( + ctx context.Context, + id [8]byte, + queue chan authKeyGetBatchRequest, + waitDefinitive bool, +) (store.AuthKeyData, bool, error) { + if ctx == nil { + ctx = context.Background() + } + request := authKeyGetBatchRequest{ctx: ctx, id: id, result: make(chan authKeyGetBatchResult, 1)} + s.gate.RLock() + if s.closed { + s.gate.RUnlock() + return store.AuthKeyData{}, false, context.Canceled + } + select { + case queue <- request: + case <-ctx.Done(): + s.gate.RUnlock() + return store.AuthKeyData{}, false, ctx.Err() + } + s.gate.RUnlock() + + if waitDefinitive { + // Get owns a durable activity touch. Once admitted, wait for its + // definitive result even if the transport context is canceled, so a + // submitted write is never left as unobserved best effort. + result := <-request.result + return result.data, result.found, result.err + } + select { + case result := <-request.result: + return result.data, result.found, result.err + case <-ctx.Done(): + return store.AuthKeyData{}, false, ctx.Err() + } +} + +func (s *BatchedAuthKeyStore) Revalidate(ctx context.Context, id [8]byte) (store.AuthKeyData, bool, error) { + return s.lookup(ctx, id, s.revalidateQueue, false) +} + +func (s *BatchedAuthKeyStore) LoadBindingKeys(ctx context.Context, tempID, permID [8]byte) (store.AuthKeyBindingKeys, error) { + return s.base.LoadBindingKeys(ctx, tempID, permID) +} + +func (s *BatchedAuthKeyStore) UpdateClientInfo(ctx context.Context, id [8]byte, info store.AuthKeyClientInfo) error { + return s.base.UpdateClientInfo(ctx, id, info) +} + +func (s *BatchedAuthKeyStore) Delete(ctx context.Context, id [8]byte) error { + return s.base.Delete(ctx, id) +} + +func (s *BatchedAuthKeyStore) Close() { + if s == nil { + return + } + s.once.Do(func() { + s.gate.Lock() + s.closed = true + close(s.stop) + s.cancel() + s.gate.Unlock() + s.workers.Wait() + }) +} + +func (s *BatchedAuthKeyStore) run( + ctx context.Context, + queue chan authKeyGetBatchRequest, + touch bool, +) { + defer s.workers.Done() + pending := make([]authKeyGetBatchRequest, 0, s.cfg.MaxSize) + for { + if len(pending) == 0 { + select { + case request := <-queue: + pending = append(pending, request) + case <-s.stop: + failAuthKeyGetQueued(queue, context.Canceled, nil) + return + } + } + if len(pending) < s.cfg.MaxSize { + timer := time.NewTimer(s.cfg.MaxWait) + collect: + for len(pending) < s.cfg.MaxSize { + select { + case request := <-queue: + pending = append(pending, request) + case <-timer.C: + break collect + case <-s.stop: + if !timer.Stop() { + select { + case <-timer.C: + default: + } + } + failAuthKeyGetQueued(queue, context.Canceled, pending) + return + } + } + if !timer.Stop() { + select { + case <-timer.C: + default: + } + } + } + batch := append([]authKeyGetBatchRequest(nil), pending...) + pending = pending[:0] + s.execute(ctx, batch, touch) + } +} + +func (s *BatchedAuthKeyStore) execute(ctx context.Context, batch []authKeyGetBatchRequest, touch bool) { + active := batch[:0] + ids := make([][8]byte, 0, len(batch)) + seen := make(map[[8]byte]struct{}, len(batch)) + for _, request := range batch { + if err := request.ctx.Err(); err != nil { + request.result <- authKeyGetBatchResult{err: err} + continue + } + active = append(active, request) + if _, duplicate := seen[request.id]; duplicate { + continue + } + seen[request.id] = struct{}{} + ids = append(ids, request.id) + } + if len(active) == 0 { + return + } + queryCtx, cancel := context.WithTimeout(ctx, s.cfg.QueryTimeout) + var ( + loaded map[[8]byte]store.AuthKeyData + err error + ) + if touch { + loaded, err = s.base.getManyAndTouch(queryCtx, ids) + } else { + loaded, err = s.base.getMany(queryCtx, ids) + } + cancel() + if err != nil { + for _, request := range active { + request.result <- authKeyGetBatchResult{err: err} + } + return + } + for _, request := range active { + data, found := loaded[request.id] + request.result <- authKeyGetBatchResult{data: data, found: found} + } +} + +func failAuthKeyGetQueued(queue chan authKeyGetBatchRequest, err error, pending []authKeyGetBatchRequest) { + for _, request := range pending { + request.result <- authKeyGetBatchResult{err: err} + } + for { + select { + case request := <-queue: + request.result <- authKeyGetBatchResult{err: err} + default: + return + } + } +} + +func (s *AuthKeyStore) getManyAndTouch(ctx context.Context, ids [][8]byte) (map[[8]byte]store.AuthKeyData, error) { + if len(ids) == 0 { + return map[[8]byte]store.AuthKeyData{}, nil + } + keyIDs, requested := authKeyBatchIDs(ids) + rows, err := s.db.Query(ctx, ` +/* auth_key_get_batch */ +UPDATE auth_keys +SET last_used_at = now() +WHERE auth_key_id = ANY($1::bigint[]) +RETURNING auth_key_id, body, server_salt, created_at, + expires_at, layer, layer_observation_id, + device_model, platform, system_version, api_id, app_version +`, keyIDs) + if err != nil { + return nil, fmt.Errorf("batch get auth keys: %w", err) + } + return scanAuthKeyBatch(rows, requested, "batched auth key") +} + +func (s *AuthKeyStore) getMany(ctx context.Context, ids [][8]byte) (map[[8]byte]store.AuthKeyData, error) { + if len(ids) == 0 { + return map[[8]byte]store.AuthKeyData{}, nil + } + keyIDs, requested := authKeyBatchIDs(ids) + rows, err := s.db.Query(ctx, ` +/* auth_key_revalidate_batch */ +SELECT auth_key_id, body, server_salt, created_at, + expires_at, layer, layer_observation_id, + device_model, platform, system_version, api_id, app_version +FROM auth_keys +WHERE auth_key_id = ANY($1::bigint[]) +`, keyIDs) + if err != nil { + return nil, fmt.Errorf("batch revalidate auth keys: %w", err) + } + return scanAuthKeyBatch(rows, requested, "revalidated auth key") +} + +func authKeyBatchIDs(ids [][8]byte) ([]int64, map[[8]byte]struct{}) { + keyIDs := make([]int64, 0, len(ids)) + requested := make(map[[8]byte]struct{}, len(ids)) + for _, id := range ids { + if _, duplicate := requested[id]; duplicate { + continue + } + requested[id] = struct{}{} + keyIDs = append(keyIDs, authKeyIDToInt64(id)) + } + return keyIDs, requested +} + +func scanAuthKeyBatch( + rows interface { + Next() bool + Scan(...any) error + Err() error + Close() + }, + requested map[[8]byte]struct{}, + operation string, +) (map[[8]byte]store.AuthKeyData, error) { + defer rows.Close() + out := make(map[[8]byte]store.AuthKeyData, len(requested)) + for rows.Next() { + data, scanErr := scanAuthKeyData(rows) + if scanErr != nil { + return nil, fmt.Errorf("scan %s: %w", operation, scanErr) + } + if _, expected := requested[data.ID]; !expected { + return nil, fmt.Errorf("%s returned unexpected id %x", operation, data.ID) + } + out[data.ID] = data + } + if err := rows.Err(); err != nil { + return nil, fmt.Errorf("iterate %s: %w", operation, err) + } + return out, nil +} + +var _ store.AuthKeyStore = (*BatchedAuthKeyStore)(nil) diff --git a/internal/store/postgres/authkey_get_batch_test.go b/internal/store/postgres/authkey_get_batch_test.go new file mode 100644 index 00000000..1c238354 --- /dev/null +++ b/internal/store/postgres/authkey_get_batch_test.go @@ -0,0 +1,189 @@ +package postgres + +import ( + "context" + "errors" + "strings" + "sync" + "sync/atomic" + "testing" + "time" + + "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgconn" + + "telesrv/internal/store" + "telesrv/internal/store/postgres/sqlcgen" +) + +func TestBatchedAuthKeyStorePostgres(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + const keyCount = 32 + keys := NewAuthKeyStore(pool) + ids := make([][8]byte, 0, keyCount) + old := time.Now().Add(-time.Hour) + for index := 0; index < keyCount; index++ { + id := randomLayerTestAuthKeyID(t) + data := store.AuthKeyData{ID: id, ServerSalt: int64(index + 1)} + data.Value[0] = byte(index + 1) + if err := keys.Save(ctx, data); err != nil { + t.Fatal(err) + } + if _, err := pool.Exec(ctx, `UPDATE auth_keys SET last_used_at = $2 WHERE auth_key_id = $1`, authKeyIDToInt64(id), old); err != nil { + t.Fatal(err) + } + ids = append(ids, id) + } + t.Cleanup(func() { + for _, id := range ids { + _ = keys.Delete(ctx, id) + } + }) + + counted := &authKeyGetCountingDB{db: pool} + batcher, err := NewBatchedAuthKeyStore(NewAuthKeyStore(counted), AuthKeyGetBatchConfig{ + MaxSize: keyCount, MaxWait: 10 * time.Millisecond, + QueueSize: keyCount * 2, QueryTimeout: 5 * time.Second, + }) + if err != nil { + t.Fatal(err) + } + t.Cleanup(batcher.Close) + + start := make(chan struct{}) + errs := make(chan error, keyCount) + var wg sync.WaitGroup + for index, id := range ids { + index, id := index, id + wg.Add(1) + go func() { + defer wg.Done() + <-start + data, found, getErr := batcher.Get(ctx, id) + if getErr != nil { + errs <- getErr + return + } + if !found || data.ID != id || data.ServerSalt != int64(index+1) || data.Value[0] != byte(index+1) { + errs <- errors.New("batched auth-key result mismatch") + } + }() + } + close(start) + wg.Wait() + close(errs) + for err := range errs { + t.Fatal(err) + } + if calls := counted.batchQueries.Load(); calls <= 0 || calls > 4 { + t.Fatalf("batch SQL calls = %d, want 1..4 for %d concurrent keys", calls, keyCount) + } + for _, id := range ids { + var touched time.Time + if err := pool.QueryRow(ctx, `SELECT last_used_at FROM auth_keys WHERE auth_key_id = $1`, authKeyIDToInt64(id)).Scan(&touched); err != nil { + t.Fatal(err) + } + if !touched.After(old) { + t.Fatalf("auth key %x was not touched: %v", id, touched) + } + } + + readMarker := time.Now().Add(-2 * time.Hour).Truncate(time.Microsecond) + for _, id := range ids { + if _, err := pool.Exec(ctx, `UPDATE auth_keys SET last_used_at = $2 WHERE auth_key_id = $1`, authKeyIDToInt64(id), readMarker); err != nil { + t.Fatal(err) + } + } + errs = make(chan error, keyCount) + start = make(chan struct{}) + for _, id := range ids { + id := id + wg.Add(1) + go func() { + defer wg.Done() + <-start + data, found, getErr := batcher.Revalidate(ctx, id) + if getErr != nil || !found || data.ID != id { + errs <- errors.New("batched auth-key revalidate mismatch") + } + }() + } + close(start) + wg.Wait() + close(errs) + for err := range errs { + t.Fatal(err) + } + if calls := counted.revalidateQueries.Load(); calls <= 0 || calls > 4 { + t.Fatalf("revalidate SQL calls = %d, want 1..4 for %d concurrent keys", calls, keyCount) + } + for _, id := range ids { + var lastUsed time.Time + if err := pool.QueryRow(ctx, `SELECT last_used_at FROM auth_keys WHERE auth_key_id = $1`, authKeyIDToInt64(id)).Scan(&lastUsed); err != nil { + t.Fatal(err) + } + if !lastUsed.Equal(readMarker) { + t.Fatalf("revalidate touched auth key %x: got %v want %v", id, lastUsed, readMarker) + } + } + + missing := randomLayerTestAuthKeyID(t) + if _, found, err := batcher.Get(ctx, missing); err != nil || found { + t.Fatalf("missing Get = found %v err %v", found, err) + } + batcher.Close() + if _, _, err := batcher.Get(ctx, ids[0]); !errors.Is(err, context.Canceled) { + t.Fatalf("Get after close err = %v", err) + } +} + +func TestNewBatchedAuthKeyStoreRejectsInvalidConfig(t *testing.T) { + pool := testPool(t) + base := NewAuthKeyStore(pool) + for _, cfg := range []AuthKeyGetBatchConfig{ + {}, + {MaxSize: 1, MaxWait: 11 * time.Millisecond, QueueSize: 1, QueryTimeout: time.Second}, + {MaxSize: 2, MaxWait: time.Microsecond, QueueSize: 1, QueryTimeout: time.Second}, + {MaxSize: 1, MaxWait: time.Microsecond, QueueSize: 1, QueryTimeout: 31 * time.Second}, + } { + if batcher, err := NewBatchedAuthKeyStore(base, cfg); err == nil { + batcher.Close() + t.Fatalf("invalid config accepted: %+v", cfg) + } + } +} + +type authKeyGetCountingDB struct { + db sqlcgen.DBTX + batchQueries atomic.Int64 + revalidateQueries atomic.Int64 +} + +func (db *authKeyGetCountingDB) Exec(ctx context.Context, sql string, args ...any) (pgconn.CommandTag, error) { + return db.db.Exec(ctx, sql, args...) +} + +func (db *authKeyGetCountingDB) Query(ctx context.Context, sql string, args ...any) (pgx.Rows, error) { + if strings.Contains(sql, "auth_key_get_batch") { + db.batchQueries.Add(1) + } + if strings.Contains(sql, "auth_key_revalidate_batch") { + db.revalidateQueries.Add(1) + } + return db.db.Query(ctx, sql, args...) +} + +func (db *authKeyGetCountingDB) QueryRow(ctx context.Context, sql string, args ...any) pgx.Row { + return db.db.QueryRow(ctx, sql, args...) +} + +func (db *authKeyGetCountingDB) Begin(ctx context.Context) (pgx.Tx, error) { + beginner, ok := db.db.(txBeginner) + if !ok { + return nil, errors.New("counted database does not support transactions") + } + return beginner.Begin(ctx) +} + +var _ sqlcgen.DBTX = (*authKeyGetCountingDB)(nil) diff --git a/internal/store/postgres/authkey_integration_test.go b/internal/store/postgres/authkey_integration_test.go index b5a7071e..68a74d04 100644 --- a/internal/store/postgres/authkey_integration_test.go +++ b/internal/store/postgres/authkey_integration_test.go @@ -7,7 +7,10 @@ import ( "os" "strings" "testing" + "time" + "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgconn" "github.com/jackc/pgx/v5/pgxpool" "telesrv/internal/store" @@ -94,6 +97,80 @@ func TestAuthKeyStoreRoundTrip(t *testing.T) { } } +func TestAuthKeyStoreSeparatesActivationRevalidationAndBindingPairTouchPostgres(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + keys := NewAuthKeyStore(pool) + temp := saveTempIdentityTestAuthKey(t, ctx, pool, keys, int(time.Now().Add(time.Hour).Unix())) + perm := saveTempIdentityTestAuthKey(t, ctx, pool, keys, 0) + old := time.Now().Add(-48 * time.Hour).UTC().Truncate(time.Microsecond) + + if _, err := pool.Exec(ctx, ` +UPDATE auth_keys SET last_used_at = $2 +WHERE auth_key_id = ANY($1::bigint[])`, + []int64{authKeyIDToInt64(temp), authKeyIDToInt64(perm)}, old, + ); err != nil { + t.Fatalf("seed old auth-key activity: %v", err) + } + got, found, err := keys.Revalidate(ctx, temp) + if err != nil || !found || got.ID != temp { + t.Fatalf("revalidate temp auth key = (%+v,%v,%v)", got, found, err) + } + var revalidatedAt time.Time + if err := pool.QueryRow(ctx, `SELECT last_used_at FROM auth_keys WHERE auth_key_id = $1`, authKeyIDToInt64(temp)).Scan(&revalidatedAt); err != nil { + t.Fatalf("read activity after revalidate: %v", err) + } + if !revalidatedAt.Equal(old) { + t.Fatalf("activation revalidate touched last_used_at: got %s want %s", revalidatedAt, old) + } + + counter := &authKeyStatementCounter{Pool: pool} + pair, err := NewAuthKeyStore(counter).LoadBindingKeys(ctx, temp, perm) + if err != nil { + t.Fatalf("load binding keys: %v", err) + } + if counter.statements != 1 { + t.Fatalf("binding key load statements = %d, want 1", counter.statements) + } + if !pair.TemporaryFound || pair.Temporary.ID != temp || + !pair.PermanentFound || pair.Permanent.ID != perm { + t.Fatalf("binding key pair = %+v", pair) + } + var touched int + if err := pool.QueryRow(ctx, ` +SELECT count(*)::int +FROM auth_keys +WHERE auth_key_id = ANY($1::bigint[]) + AND last_used_at > $2`, + []int64{authKeyIDToInt64(temp), authKeyIDToInt64(perm)}, old, + ).Scan(&touched); err != nil { + t.Fatalf("read paired activity: %v", err) + } + if touched != 2 { + t.Fatalf("binding key rows touched = %d, want 2", touched) + } +} + +type authKeyStatementCounter struct { + *pgxpool.Pool + statements int +} + +func (c *authKeyStatementCounter) Exec(ctx context.Context, sql string, arguments ...any) (pgconn.CommandTag, error) { + c.statements++ + return c.Pool.Exec(ctx, sql, arguments...) +} + +func (c *authKeyStatementCounter) Query(ctx context.Context, sql string, args ...any) (pgx.Rows, error) { + c.statements++ + return c.Pool.Query(ctx, sql, args...) +} + +func (c *authKeyStatementCounter) QueryRow(ctx context.Context, sql string, args ...any) pgx.Row { + c.statements++ + return c.Pool.QueryRow(ctx, sql, args...) +} + func TestAuthKeyStoreClientInfoRoundTrip(t *testing.T) { pool := testPool(t) ctx := context.Background() diff --git a/internal/store/postgres/authkey_session_layer.go b/internal/store/postgres/authkey_session_layer.go index c45b2567..87326a08 100644 --- a/internal/store/postgres/authkey_session_layer.go +++ b/internal/store/postgres/authkey_session_layer.go @@ -66,6 +66,26 @@ func (s *AuthKeyStore) AdvanceSessionLayer( if layer <= 0 || !validMessageID { return store.AuthKeySessionLayer{}, false, store.ErrAuthKeySessionLayerInvalid } + current, advanced, err := s.tryAdvanceSessionLayerSameLayer( + ctx, authKeyIDToInt64(rawAuthKeyID), sessionID, layer, msgID, expiresAt, + ) + if err != nil { + return store.AuthKeySessionLayer{}, false, err + } + if advanced { + return current, true, nil + } + return s.advanceSessionLayerFull(ctx, rawAuthKeyID, sessionID, layer, msgID, expiresAt) +} + +func (s *AuthKeyStore) advanceSessionLayerFull( + ctx context.Context, + rawAuthKeyID [8]byte, + sessionID int64, + layer int, + msgID int64, + expiresAt time.Time, +) (store.AuthKeySessionLayer, bool, error) { var ( current store.AuthKeySessionLayer applied bool @@ -83,6 +103,81 @@ func (s *AuthKeyStore) AdvanceSessionLayer( return current, applied, nil } +// tryAdvanceSessionLayerSameLayer is the common invokeWithLayer path once an +// exact session has established its profile generation. It keeps the durable +// msg_id high-water mark exact while avoiding the identity gate, observation +// allocation and shared-default rewrites that are only needed when the Layer +// itself changes. The identity CTE admits only a structurally valid raw/bound +// key; every miss falls through to the full locked state machine. +func (s *AuthKeyStore) tryAdvanceSessionLayerSameLayer( + ctx context.Context, + rawID int64, + sessionID int64, + layer int, + msgID int64, + expiresAt time.Time, +) (store.AuthKeySessionLayer, bool, error) { + var current store.AuthKeySessionLayer + err := s.db.QueryRow(ctx, ` +WITH identity AS MATERIALIZED ( + SELECT raw.auth_key_id, + defaults.layer AS default_layer, + defaults.layer_observation_id AS default_observation_id + FROM auth_keys AS raw + LEFT JOIN temp_auth_key_bindings AS binding + ON binding.temp_auth_key_id = raw.auth_key_id + JOIN auth_keys AS defaults + ON defaults.auth_key_id = COALESCE(binding.perm_auth_key_id, raw.auth_key_id) + WHERE raw.auth_key_id = $1 + AND ( + binding.temp_auth_key_id IS NULL + OR (raw.expires_at > 0 AND defaults.expires_at = 0) + ) +), advanced AS ( + UPDATE auth_key_session_layers AS evidence + SET msg_id = $4, + expires_at = $5 + FROM identity + WHERE evidence.raw_auth_key_id = $1 + AND evidence.session_id = $2 + AND evidence.layer = $3 + AND evidence.msg_id < $4 + AND evidence.expires_at > now() + AND $3 > 0 + AND $4 > 0 + AND $4 % 4 = 0 + AND ($4 & 4294967295) <> 0 + AND $5 > now() + AND $5 - interval '301 seconds' <= now() + interval '30 seconds' + RETURNING evidence.layer, + evidence.msg_id, + evidence.observation_id, + evidence.expires_at +) +SELECT advanced.layer, + advanced.msg_id, + advanced.observation_id, + advanced.expires_at, + identity.default_layer = advanced.layer + AND identity.default_observation_id = advanced.observation_id +FROM advanced +CROSS JOIN identity +`, rawID, sessionID, layer, msgID, expiresAt).Scan( + ¤t.Layer, + ¤t.MessageID, + ¤t.ObservationID, + ¤t.ExpiresAt, + ¤t.SharedDefault, + ) + if errors.Is(err, pgx.ErrNoRows) { + return store.AuthKeySessionLayer{}, false, nil + } + if err != nil { + return store.AuthKeySessionLayer{}, false, fmt.Errorf("advance same-Layer auth key session watermark: %w", err) + } + return current, true, nil +} + func advanceSessionLayerTx( ctx context.Context, tx pgx.Tx, @@ -92,109 +187,48 @@ func advanceSessionLayerTx( msgID int64, expiresAt time.Time, ) (store.AuthKeySessionLayer, bool, error) { - _, permID, _, err := lockRawAuthKeyInIdentityOrder(ctx, tx, rawID) - if err != nil { - return store.AuthKeySessionLayer{}, false, err - } var ( + status string current store.AuthKeySessionLayer - now time.Time + applied bool ) - err = tx.QueryRow(ctx, ` -SELECT layer, msg_id, observation_id, expires_at, now() -FROM auth_key_session_layers -WHERE raw_auth_key_id = $1 AND session_id = $2 -FOR UPDATE -`, rawID, sessionID).Scan( + err := tx.QueryRow(ctx, ` +SELECT advance_status, + current_layer, + current_msg_id, + current_observation_id, + current_expires_at, + shared_default, + applied +FROM public.telesrv_advance_auth_session_layer($1, $2, $3, $4, $5) +`, rawID, sessionID, layer, msgID, expiresAt).Scan( + &status, ¤t.Layer, ¤t.MessageID, ¤t.ObservationID, ¤t.ExpiresAt, - &now, + ¤t.SharedDefault, + &applied, ) - if errors.Is(err, pgx.ErrNoRows) { - if err := tx.QueryRow(ctx, `SELECT now()`).Scan(&now); err != nil { - return store.AuthKeySessionLayer{}, false, fmt.Errorf("read session layer database time: %w", err) - } - current = store.AuthKeySessionLayer{} - } else if err != nil { - return store.AuthKeySessionLayer{}, false, fmt.Errorf("lock auth key session layer: %w", err) + if err != nil { + return store.AuthKeySessionLayer{}, false, fmt.Errorf("advance auth key session layer: %w", err) } - if _, fresh := store.AuthKeySessionLayerEvidenceFresh(now, msgID); !fresh { + switch status { + case "ok": + return current, applied, nil + case "identity_changed": + return store.AuthKeySessionLayer{}, false, errAuthIdentityChanged + case "auth_key_not_found": + return store.AuthKeySessionLayer{}, false, store.ErrAuthKeyNotFound + case "binding_invalid": + return store.AuthKeySessionLayer{}, false, store.ErrAuthKeyBindingInvalid + case "evidence_invalid": return store.AuthKeySessionLayer{}, false, store.ErrAuthKeySessionLayerInvalid + case "conflict": + return current, false, store.ErrAuthKeySessionLayerConflict + default: + return store.AuthKeySessionLayer{}, false, fmt.Errorf("advance auth key session layer: unknown database status %q", status) } - if current.MessageID != 0 && now.Before(current.ExpiresAt) { - switch { - case msgID < current.MessageID: - if err := tx.QueryRow(ctx, ` -SELECT layer = $2 AND layer_observation_id = $3 -FROM auth_keys WHERE auth_key_id = $1 -`, permID, current.Layer, current.ObservationID).Scan(¤t.SharedDefault); err != nil { - return store.AuthKeySessionLayer{}, false, fmt.Errorf("compare older session layer with shared default: %w", err) - } - return current, false, nil - case msgID == current.MessageID: - if layer != current.Layer { - return current, false, store.ErrAuthKeySessionLayerConflict - } - if err := tx.QueryRow(ctx, ` -SELECT layer = $2 AND layer_observation_id = $3 -FROM auth_keys WHERE auth_key_id = $1 -`, permID, current.Layer, current.ObservationID).Scan(¤t.SharedDefault); err != nil { - return store.AuthKeySessionLayer{}, false, fmt.Errorf("compare duplicate session layer with shared default: %w", err) - } - return current, false, nil - } - } - - var observationID int64 - if err := tx.QueryRow(ctx, `SELECT nextval('auth_key_layer_observation_seq')`).Scan(&observationID); err != nil { - return store.AuthKeySessionLayer{}, false, fmt.Errorf("allocate auth key layer observation: %w", err) - } - err = tx.QueryRow(ctx, ` -INSERT INTO auth_key_session_layers ( - raw_auth_key_id, session_id, layer, msg_id, observation_id, expires_at -) VALUES ($1, $2, $3, $4, $5, $6) -ON CONFLICT (raw_auth_key_id, session_id) DO UPDATE SET - layer = EXCLUDED.layer, - msg_id = EXCLUDED.msg_id, - observation_id = EXCLUDED.observation_id, - expires_at = EXCLUDED.expires_at -RETURNING layer, msg_id, observation_id, expires_at -`, rawID, sessionID, layer, msgID, observationID, expiresAt).Scan( - ¤t.Layer, - ¤t.MessageID, - ¤t.ObservationID, - ¤t.ExpiresAt, - ) - if err != nil { - return store.AuthKeySessionLayer{}, false, fmt.Errorf("upsert auth key session layer: %w", err) - } - keyIDs := []int64{rawID} - if permID != rawID { - keyIDs = append(keyIDs, permID) - } - tag, err := tx.Exec(ctx, ` -UPDATE auth_keys -SET layer = $2, layer_observation_id = $3 -WHERE auth_key_id = ANY($1::bigint[]) - AND layer_observation_id < $3 -`, keyIDs, layer, observationID) - if err != nil { - return store.AuthKeySessionLayer{}, false, fmt.Errorf("publish auth key session layer defaults: %w", err) - } - if tag.RowsAffected() != int64(len(keyIDs)) { - return store.AuthKeySessionLayer{}, false, fmt.Errorf("publish auth key session layer defaults: updated %d of %d locked keys", tag.RowsAffected(), len(keyIDs)) - } - if _, err := tx.Exec(ctx, ` -UPDATE authorizations -SET layer = $2 -WHERE auth_key_id = ANY($1::bigint[]) -`, keyIDs, layer); err != nil { - return store.AuthKeySessionLayer{}, false, fmt.Errorf("mirror auth key session layer defaults: %w", err) - } - current.SharedDefault = true - return current, true, nil } func (s *AuthKeyStore) DeleteSessionLayer( diff --git a/internal/store/postgres/authkey_session_layer_batch.go b/internal/store/postgres/authkey_session_layer_batch.go new file mode 100644 index 00000000..ba3f5201 --- /dev/null +++ b/internal/store/postgres/authkey_session_layer_batch.go @@ -0,0 +1,408 @@ +package postgres + +import ( + "context" + "errors" + "fmt" + "sync" + "time" + + "telesrv/internal/store" +) + +// AuthKeySessionLayerBatchConfig bounds the synchronous cross-session batch. +// A batch never contains the same raw auth-key/session identity twice and a +// caller does not return until its batch has committed or failed. +type AuthKeySessionLayerBatchConfig struct { + MaxSize int + MaxWait time.Duration + QueueSize int + QueryTimeout time.Duration +} + +type authKeySessionLayerBatchKey struct { + rawAuthKeyID [8]byte + sessionID int64 +} + +type authKeySessionLayerBatchRequest struct { + ctx context.Context + rawAuthKeyID [8]byte + sessionID int64 + layer int + msgID int64 + expiresAt time.Time + result chan authKeySessionLayerBatchResult +} + +type authKeySessionLayerBatchResult struct { + current store.AuthKeySessionLayer + fast bool + err error +} + +// BatchedAuthKeySessionLayerStore preserves AuthKeySessionLayerStore semantics +// while combining contemporaneous same-Layer fast attempts for distinct +// sessions into one PostgreSQL statement. A miss is resolved synchronously by +// the original full identity transaction before the caller returns. +type BatchedAuthKeySessionLayerStore struct { + base *AuthKeyStore + cfg AuthKeySessionLayerBatchConfig + queue chan authKeySessionLayerBatchRequest + stop chan struct{} + done chan struct{} + cancel context.CancelFunc + once sync.Once + gate sync.RWMutex + closed bool +} + +func NewBatchedAuthKeySessionLayerStore( + base *AuthKeyStore, + cfg AuthKeySessionLayerBatchConfig, +) (*BatchedAuthKeySessionLayerStore, error) { + if base == nil || base.db == nil { + return nil, errors.New("initialize auth key session Layer batcher: nil store") + } + if cfg.MaxSize <= 0 || cfg.MaxSize > 4096 { + return nil, fmt.Errorf("initialize auth key session Layer batcher: max size %d outside [1,4096]", cfg.MaxSize) + } + if cfg.MaxWait <= 0 || cfg.MaxWait > 10*time.Millisecond { + return nil, fmt.Errorf("initialize auth key session Layer batcher: max wait %v outside (0,10ms]", cfg.MaxWait) + } + if cfg.QueueSize < cfg.MaxSize || cfg.QueueSize > 1<<20 { + return nil, fmt.Errorf("initialize auth key session Layer batcher: queue size %d outside [%d,%d]", cfg.QueueSize, cfg.MaxSize, 1<<20) + } + if cfg.QueryTimeout <= 0 || cfg.QueryTimeout > 30*time.Second { + return nil, fmt.Errorf("initialize auth key session Layer batcher: query timeout %v outside (0,30s]", cfg.QueryTimeout) + } + workerCtx, cancel := context.WithCancel(context.Background()) + s := &BatchedAuthKeySessionLayerStore{ + base: base, cfg: cfg, + queue: make(chan authKeySessionLayerBatchRequest, cfg.QueueSize), + stop: make(chan struct{}), done: make(chan struct{}), cancel: cancel, + } + go s.run(workerCtx) + return s, nil +} + +func (s *BatchedAuthKeySessionLayerStore) GetSessionLayer( + ctx context.Context, + rawAuthKeyID [8]byte, + sessionID int64, +) (store.AuthKeySessionLayer, bool, error) { + return s.base.GetSessionLayer(ctx, rawAuthKeyID, sessionID) +} + +func (s *BatchedAuthKeySessionLayerStore) AdvanceSessionLayer( + ctx context.Context, + rawAuthKeyID [8]byte, + sessionID int64, + layer int, + msgID int64, +) (store.AuthKeySessionLayer, bool, error) { + if ctx == nil { + ctx = context.Background() + } + expiresAt, validMessageID := store.AuthKeySessionLayerExpiry(msgID) + if layer <= 0 || !validMessageID { + return store.AuthKeySessionLayer{}, false, store.ErrAuthKeySessionLayerInvalid + } + request := authKeySessionLayerBatchRequest{ + ctx: ctx, rawAuthKeyID: rawAuthKeyID, sessionID: sessionID, + layer: layer, msgID: msgID, expiresAt: expiresAt, + result: make(chan authKeySessionLayerBatchResult, 1), + } + s.gate.RLock() + if s.closed { + s.gate.RUnlock() + return store.AuthKeySessionLayer{}, false, context.Canceled + } + select { + case s.queue <- request: + case <-ctx.Done(): + s.gate.RUnlock() + return store.AuthKeySessionLayer{}, false, ctx.Err() + } + s.gate.RUnlock() + + // Once accepted by the bounded queue, wait for the worker's definitive + // commit/error. This prevents a canceled caller from turning the submitted + // selector into an unobserved asynchronous best-effort write. + result := <-request.result + if result.err != nil { + return store.AuthKeySessionLayer{}, false, result.err + } + if result.fast { + return result.current, true, nil + } + if err := ctx.Err(); err != nil { + return store.AuthKeySessionLayer{}, false, err + } + return s.base.advanceSessionLayerFull(ctx, rawAuthKeyID, sessionID, layer, msgID, expiresAt) +} + +func (s *BatchedAuthKeySessionLayerStore) DeleteSessionLayer( + ctx context.Context, + rawAuthKeyID [8]byte, + sessionID int64, +) (bool, error) { + return s.base.DeleteSessionLayer(ctx, rawAuthKeyID, sessionID) +} + +func (s *BatchedAuthKeySessionLayerStore) DeleteExpiredSessionLayers(ctx context.Context, limit int) (int, error) { + return s.base.DeleteExpiredSessionLayers(ctx, limit) +} + +func (s *BatchedAuthKeySessionLayerStore) Close() { + s.once.Do(func() { + s.gate.Lock() + s.closed = true + close(s.stop) + s.cancel() + s.gate.Unlock() + <-s.done + }) +} + +func (s *BatchedAuthKeySessionLayerStore) run(ctx context.Context) { + defer close(s.done) + pending := make([]authKeySessionLayerBatchRequest, 0, s.cfg.MaxSize) + for { + if len(pending) == 0 { + select { + case request := <-s.queue: + pending = append(pending, request) + case <-s.stop: + s.failQueued(context.Canceled, pending) + return + } + } + + if len(pending) < s.cfg.MaxSize { + timer := time.NewTimer(s.cfg.MaxWait) + collect: + for len(pending) < s.cfg.MaxSize { + select { + case request := <-s.queue: + pending = append(pending, request) + case <-timer.C: + break collect + case <-s.stop: + if !timer.Stop() { + select { + case <-timer.C: + default: + } + } + s.failQueued(context.Canceled, pending) + return + } + } + if !timer.Stop() { + select { + case <-timer.C: + default: + } + } + } + + batch, remaining := selectDistinctLayerAdvanceBatch(pending, s.cfg.MaxSize) + pending = remaining + s.execute(ctx, batch) + } +} + +func selectDistinctLayerAdvanceBatch( + pending []authKeySessionLayerBatchRequest, + maxSize int, +) ([]authKeySessionLayerBatchRequest, []authKeySessionLayerBatchRequest) { + batch := make([]authKeySessionLayerBatchRequest, 0, min(maxSize, len(pending))) + remaining := make([]authKeySessionLayerBatchRequest, 0, len(pending)) + seen := make(map[authKeySessionLayerBatchKey]struct{}, min(maxSize, len(pending))) + for _, request := range pending { + if len(batch) >= maxSize { + remaining = append(remaining, request) + continue + } + key := authKeySessionLayerBatchKey{rawAuthKeyID: request.rawAuthKeyID, sessionID: request.sessionID} + if _, exists := seen[key]; exists { + remaining = append(remaining, request) + continue + } + seen[key] = struct{}{} + batch = append(batch, request) + } + return batch, remaining +} + +func (s *BatchedAuthKeySessionLayerStore) execute(ctx context.Context, batch []authKeySessionLayerBatchRequest) { + active := batch[:0] + for _, request := range batch { + if err := request.ctx.Err(); err != nil { + request.result <- authKeySessionLayerBatchResult{err: err} + continue + } + active = append(active, request) + } + if len(active) == 0 { + return + } + queryCtx, cancel := context.WithTimeout(ctx, s.cfg.QueryTimeout) + results, err := s.base.tryAdvanceSessionLayersSameLayer(queryCtx, active) + cancel() + if err != nil { + for _, request := range active { + request.result <- authKeySessionLayerBatchResult{err: err} + } + return + } + for index, request := range active { + request.result <- results[index] + } +} + +func (s *BatchedAuthKeySessionLayerStore) failQueued(err error, pending []authKeySessionLayerBatchRequest) { + for _, request := range pending { + request.result <- authKeySessionLayerBatchResult{err: err} + } + for { + select { + case request := <-s.queue: + request.result <- authKeySessionLayerBatchResult{err: err} + default: + return + } + } +} + +func (s *AuthKeyStore) tryAdvanceSessionLayersSameLayer( + ctx context.Context, + requests []authKeySessionLayerBatchRequest, +) ([]authKeySessionLayerBatchResult, error) { + results := make([]authKeySessionLayerBatchResult, len(requests)) + if len(requests) == 0 { + return results, nil + } + rawIDs := make([]int64, len(requests)) + sessionIDs := make([]int64, len(requests)) + layers := make([]int32, len(requests)) + msgIDs := make([]int64, len(requests)) + expiresAts := make([]time.Time, len(requests)) + seen := make(map[authKeySessionLayerBatchKey]struct{}, len(requests)) + for index, request := range requests { + key := authKeySessionLayerBatchKey{rawAuthKeyID: request.rawAuthKeyID, sessionID: request.sessionID} + if _, duplicate := seen[key]; duplicate { + return nil, fmt.Errorf("advance same-Layer auth key session batch: duplicate identity at index %d", index) + } + seen[key] = struct{}{} + rawIDs[index] = authKeyIDToInt64(request.rawAuthKeyID) + sessionIDs[index] = request.sessionID + layers[index] = int32(request.layer) + msgIDs[index] = request.msgID + expiresAts[index] = request.expiresAt + } + rows, err := s.db.Query(ctx, ` +WITH input AS ( + SELECT * + FROM unnest( + $1::bigint[], + $2::bigint[], + $3::integer[], + $4::bigint[], + $5::timestamptz[] + ) WITH ORDINALITY AS value(raw_id, session_id, layer, msg_id, expires_at, ordinal) +), identity AS MATERIALIZED ( + SELECT input.*, + defaults.layer AS default_layer, + defaults.layer_observation_id AS default_observation_id + FROM input + JOIN auth_keys AS raw + ON raw.auth_key_id = input.raw_id + LEFT JOIN temp_auth_key_bindings AS binding + ON binding.temp_auth_key_id = raw.auth_key_id + JOIN auth_keys AS defaults + ON defaults.auth_key_id = COALESCE(binding.perm_auth_key_id, raw.auth_key_id) + WHERE binding.temp_auth_key_id IS NULL + OR (raw.expires_at > 0 AND defaults.expires_at = 0) +), candidates AS MATERIALIZED ( + SELECT identity.ordinal, + identity.msg_id, + identity.expires_at, + identity.default_layer, + identity.default_observation_id, + evidence.raw_auth_key_id, + evidence.session_id, + evidence.layer, + evidence.observation_id + FROM identity + JOIN auth_key_session_layers AS evidence + ON evidence.raw_auth_key_id = identity.raw_id + AND evidence.session_id = identity.session_id + WHERE evidence.layer = identity.layer + AND evidence.msg_id < identity.msg_id + AND evidence.expires_at > now() + AND identity.layer > 0 + AND identity.msg_id > 0 + AND identity.msg_id % 4 = 0 + AND (identity.msg_id & 4294967295) <> 0 + AND identity.expires_at > now() + AND identity.expires_at - interval '301 seconds' <= now() + interval '30 seconds' + ORDER BY evidence.raw_auth_key_id, evidence.session_id + FOR UPDATE OF evidence +), advanced AS ( + UPDATE auth_key_session_layers AS evidence + SET msg_id = candidates.msg_id, + expires_at = candidates.expires_at + FROM candidates + WHERE evidence.raw_auth_key_id = candidates.raw_auth_key_id + AND evidence.session_id = candidates.session_id + RETURNING candidates.ordinal, + candidates.default_layer, + candidates.default_observation_id, + evidence.layer, + evidence.msg_id, + evidence.observation_id, + evidence.expires_at +) +SELECT ordinal, + layer, + msg_id, + observation_id, + expires_at, + default_layer = layer AND default_observation_id = observation_id +FROM advanced +ORDER BY ordinal +`, rawIDs, sessionIDs, layers, msgIDs, expiresAts) + if err != nil { + return nil, fmt.Errorf("advance same-Layer auth key session batch: %w", err) + } + defer rows.Close() + for rows.Next() { + var ( + ordinal int64 + current store.AuthKeySessionLayer + ) + if err := rows.Scan( + &ordinal, + ¤t.Layer, + ¤t.MessageID, + ¤t.ObservationID, + ¤t.ExpiresAt, + ¤t.SharedDefault, + ); err != nil { + return nil, fmt.Errorf("scan same-Layer auth key session batch: %w", err) + } + index := int(ordinal - 1) + if index < 0 || index >= len(results) || results[index].fast { + return nil, fmt.Errorf("advance same-Layer auth key session batch: invalid ordinal %d", ordinal) + } + results[index] = authKeySessionLayerBatchResult{current: current, fast: true} + } + if err := rows.Err(); err != nil { + return nil, fmt.Errorf("advance same-Layer auth key session batch rows: %w", err) + } + return results, nil +} + +var _ store.AuthKeySessionLayerStore = (*BatchedAuthKeySessionLayerStore)(nil) diff --git a/internal/store/postgres/authkey_session_layer_batch_test.go b/internal/store/postgres/authkey_session_layer_batch_test.go new file mode 100644 index 00000000..f609dd0b --- /dev/null +++ b/internal/store/postgres/authkey_session_layer_batch_test.go @@ -0,0 +1,159 @@ +package postgres + +import ( + "context" + "errors" + "strings" + "sync" + "sync/atomic" + "testing" + "time" + + "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgconn" + + "telesrv/internal/store" + "telesrv/internal/store/postgres/sqlcgen" +) + +func TestSelectDistinctLayerAdvanceBatchDefersSameSession(t *testing.T) { + first := authKeySessionLayerBatchRequest{rawAuthKeyID: [8]byte{1}, sessionID: 7} + duplicate := authKeySessionLayerBatchRequest{rawAuthKeyID: [8]byte{1}, sessionID: 7} + other := authKeySessionLayerBatchRequest{rawAuthKeyID: [8]byte{1}, sessionID: 8} + batch, remaining := selectDistinctLayerAdvanceBatch( + []authKeySessionLayerBatchRequest{first, duplicate, other}, + 3, + ) + if len(batch) != 2 || batch[0].sessionID != 7 || batch[1].sessionID != 8 { + t.Fatalf("batch = %#v", batch) + } + if len(remaining) != 1 || remaining[0].sessionID != 7 { + t.Fatalf("remaining = %#v", remaining) + } +} + +func TestBatchedAuthKeySessionLayerStorePostgres(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + const accountCount = 32 + now := time.Now().UTC() + keys := NewAuthKeyStore(pool) + type seeded struct { + id [8]byte + sessionID int64 + observationID int64 + msgID int64 + } + seededKeys := make([]seeded, 0, accountCount) + for index := 0; index < accountCount; index++ { + id := randomLayerTestAuthKeyID(t) + sessionID := int64(91000 + index) + if err := keys.Save(ctx, store.AuthKeyData{ID: id}); err != nil { + t.Fatal(err) + } + firstMsgID := authKeySessionLayerTestMsgID(now, uint32(index+1)) + first, applied, err := keys.AdvanceSessionLayer(ctx, id, sessionID, 227, firstMsgID) + if err != nil || !applied || first.ObservationID <= 0 { + t.Fatalf("seed %d = (%+v,%v,%v)", index, first, applied, err) + } + seededKeys = append(seededKeys, seeded{ + id: id, sessionID: sessionID, observationID: first.ObservationID, + msgID: authKeySessionLayerTestMsgID(now, uint32(accountCount+index+1)), + }) + } + t.Cleanup(func() { + for _, item := range seededKeys { + _ = keys.Delete(ctx, item.id) + } + }) + + counted := &layerBatchCountingDB{db: pool} + batchedBase := NewAuthKeyStore(counted) + batcher, err := NewBatchedAuthKeySessionLayerStore(batchedBase, AuthKeySessionLayerBatchConfig{ + MaxSize: accountCount, MaxWait: 10 * time.Millisecond, + QueueSize: accountCount * 2, QueryTimeout: 5 * time.Second, + }) + if err != nil { + t.Fatal(err) + } + t.Cleanup(batcher.Close) + + start := make(chan struct{}) + errs := make(chan error, accountCount) + var wg sync.WaitGroup + for _, item := range seededKeys { + item := item + wg.Add(1) + go func() { + defer wg.Done() + <-start + current, applied, err := batcher.AdvanceSessionLayer(ctx, item.id, item.sessionID, 227, item.msgID) + if err != nil { + errs <- err + return + } + if !applied || current.MessageID != item.msgID || current.ObservationID != item.observationID { + errs <- errors.New("same-Layer batch changed durable generation or failed to advance") + } + }() + } + close(start) + wg.Wait() + close(errs) + for err := range errs { + t.Fatal(err) + } + if calls := counted.batchQueries.Load(); calls <= 0 || calls > 4 { + t.Fatalf("batch SQL calls = %d, want 1..4 for %d concurrent sessions", calls, accountCount) + } + for _, item := range seededKeys { + current, found, err := keys.GetSessionLayer(ctx, item.id, item.sessionID) + if err != nil || !found || current.MessageID != item.msgID || current.ObservationID != item.observationID { + t.Fatalf("durable result %x/%d = (%+v,%v,%v)", item.id, item.sessionID, current, found, err) + } + } + + // A fast miss must synchronously execute the original full state machine, + // rather than treating a successful batch statement as success for every row. + missingSession := int64(99001) + missingMsgID := authKeySessionLayerTestMsgID(now, 1000) + created, applied, err := batcher.AdvanceSessionLayer(ctx, seededKeys[0].id, missingSession, 225, missingMsgID) + if err != nil || !applied || created.Layer != 225 || created.MessageID != missingMsgID || created.ObservationID <= 0 { + t.Fatalf("batch miss full fallback = (%+v,%v,%v)", created, applied, err) + } + + batcher.Close() + if _, _, err := batcher.AdvanceSessionLayer(ctx, seededKeys[0].id, missingSession, 225, missingMsgID); !errors.Is(err, context.Canceled) { + t.Fatalf("advance after close err = %v", err) + } +} + +type layerBatchCountingDB struct { + db sqlcgen.DBTX + batchQueries atomic.Int64 +} + +func (db *layerBatchCountingDB) Exec(ctx context.Context, sql string, args ...any) (pgconn.CommandTag, error) { + return db.db.Exec(ctx, sql, args...) +} + +func (db *layerBatchCountingDB) Query(ctx context.Context, sql string, args ...any) (pgx.Rows, error) { + if strings.Contains(sql, "WITH input AS") && strings.Contains(sql, "candidates AS MATERIALIZED") { + db.batchQueries.Add(1) + } + return db.db.Query(ctx, sql, args...) +} + +func (db *layerBatchCountingDB) QueryRow(ctx context.Context, sql string, args ...any) pgx.Row { + return db.db.QueryRow(ctx, sql, args...) +} + +func (db *layerBatchCountingDB) Begin(ctx context.Context) (pgx.Tx, error) { + beginner, ok := db.db.(txBeginner) + if !ok { + return nil, errors.New("counted database does not support transactions") + } + return beginner.Begin(ctx) +} + +var _ sqlcgen.DBTX = (*layerBatchCountingDB)(nil) diff --git a/internal/store/postgres/authkey_session_layer_integration_test.go b/internal/store/postgres/authkey_session_layer_integration_test.go index 55d89bda..5608b27d 100644 --- a/internal/store/postgres/authkey_session_layer_integration_test.go +++ b/internal/store/postgres/authkey_session_layer_integration_test.go @@ -37,9 +37,10 @@ func TestAuthKeySessionLayerTransactionAndRestartPostgres(t *testing.T) { } now := time.Now().UTC() firstMsgID := authKeySessionLayerTestMsgID(now, 1) - newerMsgID := authKeySessionLayerTestMsgID(now, 2) - concurrentLowMsgID := authKeySessionLayerTestMsgID(now, 3) - concurrentHighMsgID := authKeySessionLayerTestMsgID(now, 4) + sameLayerMsgID := authKeySessionLayerTestMsgID(now, 2) + newerMsgID := authKeySessionLayerTestMsgID(now, 3) + concurrentLowMsgID := authKeySessionLayerTestMsgID(now, 4) + concurrentHighMsgID := authKeySessionLayerTestMsgID(now, 5) for _, invalidMsgID := range []int64{ authKeySessionLayerTestMsgID(now.Add(-302*time.Second), 1), authKeySessionLayerTestMsgID(now.Add(31*time.Second), 1), @@ -72,6 +73,24 @@ func TestAuthKeySessionLayerTransactionAndRestartPostgres(t *testing.T) { t.Fatalf("bound default %x = (%+v,%v,%v)", id, got, found, err) } } + futureSameLayerMsgID := authKeySessionLayerTestMsgID(now.Add(31*time.Second), 1) + if _, _, err := NewAuthKeyStore(pool).AdvanceSessionLayer(ctx, temp, sessionID, 220, futureSameLayerMsgID); !errors.Is(err, store.ErrAuthKeySessionLayerInvalid) { + t.Fatalf("future same-Layer fast advance err = %v", err) + } + if got, found, err := NewAuthKeyStore(pool).GetSessionLayer(ctx, temp, sessionID); err != nil || !found || got.MessageID != firstMsgID || got.ObservationID != first.ObservationID { + t.Fatalf("rejected future same-Layer advance changed row = (%+v,%v,%v)", got, found, err) + } + sameLayer, applied, err := NewAuthKeyStore(pool).AdvanceSessionLayer(ctx, temp, sessionID, 220, sameLayerMsgID) + if err != nil || !applied || !sameLayer.SharedDefault || sameLayer.MessageID != sameLayerMsgID || + sameLayer.ObservationID != first.ObservationID { + t.Fatalf("same-Layer high-water advance = (%+v,%v,%v)", sameLayer, applied, err) + } + for _, id := range [][8]byte{temp, perm} { + got, found, err := NewAuthKeyStore(pool).Get(ctx, id) + if err != nil || !found || got.Layer != 220 || got.LayerObservationID != first.ObservationID { + t.Fatalf("same-Layer default rewrite %x = (%+v,%v,%v)", id, got, found, err) + } + } newer, applied, err := NewAuthKeyStore(pool).AdvanceSessionLayer(ctx, temp, sessionID, 227, newerMsgID) if err != nil || !applied || !newer.SharedDefault || newer.ObservationID <= first.ObservationID { @@ -124,6 +143,27 @@ func TestAuthKeySessionLayerTransactionAndRestartPostgres(t *testing.T) { t.Fatalf("transactional shared default %x = (%+v,%v,%v)", id, got, found, err) } } + + // Expiry ends the old row's ordering authority. A still-fresh selector with + // a lower msg_id may replace it and must publish one new shared observation. + if _, err := pool.Exec(ctx, ` +UPDATE auth_key_session_layers +SET expires_at = now() - interval '1 second' +WHERE raw_auth_key_id = $1 AND session_id = $2 +`, authKeyIDToInt64(temp), sessionID); err != nil { + t.Fatalf("expire session Layer row: %v", err) + } + replacement, applied, err := restarted.AdvanceSessionLayer(ctx, temp, sessionID, 225, firstMsgID) + if err != nil || !applied || replacement.Layer != 225 || replacement.MessageID != firstMsgID || + !replacement.SharedDefault || replacement.ObservationID <= current.ObservationID { + t.Fatalf("expired-row replacement = (%+v,%v,%v)", replacement, applied, err) + } + for _, id := range [][8]byte{temp, perm} { + got, found, err := restarted.Get(ctx, id) + if err != nil || !found || got.Layer != 225 || got.LayerObservationID != replacement.ObservationID { + t.Fatalf("replacement shared default %x = (%+v,%v,%v)", id, got, found, err) + } + } } func authKeySessionLayerTestMsgID(at time.Time, order uint32) int64 { diff --git a/internal/store/postgres/authorization.go b/internal/store/postgres/authorization.go index 3cd11265..9f1e94ed 100644 --- a/internal/store/postgres/authorization.go +++ b/internal/store/postgres/authorization.go @@ -40,17 +40,37 @@ func (s *AuthorizationStore) Bind(ctx context.Context, a domain.Authorization) e // bindAuthorization 把 auth_key→user 绑定和设备 update baseline 作为同一个状态边界提交。 // -// 锁顺序固定为：auth_keys 母行 → 目标 user_update_watermarks → -// user_update_retention → 目标 update_states。前两个 user 锁与 -// pruneConfirmedUserPrefixTx 一致，使新授权的 observed baseline 和 retained floor 不会 -// 交叉提交成静默空洞。母行锁又能在首次 authorization 尚不存在时串行化同一 -// raw auth key 的并发登录/换号。 +// 锁顺序固定为：目标 user advisory/row → auth_keys 母行 → +// user_update_watermarks → user_update_retention → 目标 update_states。其中 watermark +// 与 retention 两个 row lock 的顺序和 pruneConfirmedUserPrefixTx 一致，使新授权的 +// observed baseline 和 retained floor 不会交叉提交成静默空洞。母行锁又能在首次 +// authorization 尚不存在时串行化同一 +// raw auth key 的并发登录/换号。user 锁与账号 tombstone 使用同一顺序；因此 Bind +// 要么先提交并被随后删除事务撤销，要么等删除提交后看见 tombstone 并拒绝，不能在 +// 删除事务枚举 authorization 之后重新绑定账号。 func bindAuthorization(ctx context.Context, db sqlcgen.DBTX, a domain.Authorization) error { keyID := authKeyIDToInt64(a.AuthKeyID) tx, ok := db.(pgx.Tx) if !ok { return fmt.Errorf("bind authorization requires a transaction") } + if err := lockUsersForUpdate(ctx, tx, a.UserID); err != nil { + return fmt.Errorf("lock authorization user: %w", err) + } + var active bool + if err := db.QueryRow(ctx, ` +SELECT deleted_at IS NULL +FROM users +WHERE id = $1 +FOR UPDATE`, a.UserID).Scan(&active); err != nil { + if errors.Is(err, pgx.ErrNoRows) { + return domain.ErrUserNotFound + } + return fmt.Errorf("lock authorization user row: %w", err) + } + if !active { + return domain.ErrAccountDeleted + } if err := lockPermanentAuthIdentities(ctx, tx, []int64{keyID}); err != nil { return err } @@ -160,6 +180,7 @@ ON CONFLICT (auth_key_id) DO UPDATE SET app_version = EXCLUDED.app_version, ip = EXCLUDED.ip, password_pending = EXCLUDED.password_pending, + created_at = now(), active_at = now()`, keyID, a.UserID, a.Hash, int32(authLayer), a.DeviceModel, a.Platform, a.SystemVersion, int32(a.APIID), a.AppVersion, a.IP, a.PasswordPending, ); err != nil { @@ -204,12 +225,19 @@ WHERE auth_key_id = $1`, return nil } -// MarkPasswordPassed 在两步验证通过后清除 password_pending，使 auth_key 转为完全授权。 -func (s *AuthorizationStore) MarkPasswordPassed(ctx context.Context, id [8]byte) error { - if _, err := s.db.Exec(ctx, ` -UPDATE authorizations SET password_pending = false, active_at = now() WHERE auth_key_id = $1`, authKeyIDToInt64(id)); err != nil { +// MarkPasswordPassed atomically promotes only the pending identity whose +// password was just verified. A concurrent cross-user Bind must not let A's +// proof clear B's password_pending flag. +func (s *AuthorizationStore) MarkPasswordPassed(ctx context.Context, id [8]byte, expectedUserID int64) error { + tag, err := s.db.Exec(ctx, ` + UPDATE authorizations SET password_pending = false, created_at = now(), active_at = now() + WHERE auth_key_id = $1 AND user_id = $2 AND password_pending`, authKeyIDToInt64(id), expectedUserID) + if err != nil { return fmt.Errorf("mark authorization password passed: %w", err) } + if tag.RowsAffected() != 1 { + return store.ErrAuthorizationStateChanged + } return nil } diff --git a/internal/store/postgres/authorization_revoke_integration_test.go b/internal/store/postgres/authorization_revoke_integration_test.go index 83384a00..5adc6676 100644 --- a/internal/store/postgres/authorization_revoke_integration_test.go +++ b/internal/store/postgres/authorization_revoke_integration_test.go @@ -2,6 +2,7 @@ package postgres import ( "context" + "errors" "fmt" "testing" "time" @@ -159,6 +160,99 @@ func TestAuthorizationStoreUpdateClientInfoMergesPostgres(t *testing.T) { } } +func TestAuthorizationStoreLoginAndPasswordCompletionRefreshSessionAgePostgres(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + userA := createRevokeTestUser(t, ctx, pool, "session-age-a") + userB := createRevokeTestUser(t, ctx, pool, "session-age-b") + keys := NewAuthKeyStore(pool) + auths := NewAuthorizationStore(pool) + key := saveTempIdentityTestAuthKey(t, ctx, pool, keys, 0) + + if err := auths.Bind(ctx, domain.Authorization{AuthKeyID: key, UserID: userA, Hash: 9251}); err != nil { + t.Fatalf("bind initial authorization: %v", err) + } + var oldCreatedAt time.Time + if err := pool.QueryRow(ctx, `UPDATE authorizations SET created_at=now()-interval '48 hours' +WHERE auth_key_id=$1 RETURNING created_at`, authKeyIDToInt64(key)).Scan(&oldCreatedAt); err != nil { + t.Fatalf("backdate initial authorization: %v", err) + } + + // Bind is an explicit login boundary, not a metadata refresh. Even a login + // to the same account must start a new withdrawal freshness window. + if err := auths.Bind(ctx, domain.Authorization{AuthKeyID: key, UserID: userA, Hash: 9252}); err != nil { + t.Fatalf("rebind same owner: %v", err) + } + assertFreshAuthorizationCreatedAt(t, ctx, pool, key, userA, oldCreatedAt) + + if _, err := pool.Exec(ctx, `UPDATE authorizations SET created_at=now()-interval '48 hours' +WHERE auth_key_id=$1`, authKeyIDToInt64(key)); err != nil { + t.Fatalf("backdate authorization before owner change: %v", err) + } + if err := auths.Bind(ctx, domain.Authorization{ + AuthKeyID: key, UserID: userB, Hash: 9253, PasswordPending: true, + }); err != nil { + t.Fatalf("bind new owner pending password: %v", err) + } + assertFreshAuthorizationCreatedAt(t, ctx, pool, key, userB, oldCreatedAt) + + // A pending login may wait longer than 24 hours before auth.checkPassword. + // Full authorization starts only when that proof succeeds, so its age must + // be reset here rather than inheriting the pending row's old timestamp. + if _, err := pool.Exec(ctx, `UPDATE authorizations SET created_at=now()-interval '48 hours' +WHERE auth_key_id=$1`, authKeyIDToInt64(key)); err != nil { + t.Fatalf("backdate pending authorization: %v", err) + } + if err := auths.MarkPasswordPassed(ctx, key, userB); err != nil { + t.Fatalf("mark password passed: %v", err) + } + got, found, err := auths.ByAuthKey(ctx, key) + if err != nil || !found || got.PasswordPending { + t.Fatalf("completed password authorization = %+v found=%v err=%v", got, found, err) + } + assertFreshAuthorizationCreatedAt(t, ctx, pool, key, userB, oldCreatedAt) + + // Model the exact proof/promote race: A's password was verified, then the + // same auth key was rebound to B in password_pending state before promotion. + // A's proof must not promote B or turn Router's stale A identity into a cache + // fact for this key. + raceKey := saveTempIdentityTestAuthKey(t, ctx, pool, keys, 0) + if err := auths.Bind(ctx, domain.Authorization{ + AuthKeyID: raceKey, UserID: userA, Hash: 9254, PasswordPending: true, + }); err != nil { + t.Fatalf("bind proof owner A: %v", err) + } + if err := auths.Bind(ctx, domain.Authorization{ + AuthKeyID: raceKey, UserID: userB, Hash: 9255, PasswordPending: true, + }); err != nil { + t.Fatalf("rebind pending owner B: %v", err) + } + if err := auths.MarkPasswordPassed(ctx, raceKey, userA); !errors.Is(err, store.ErrAuthorizationStateChanged) { + t.Fatalf("stale A proof promotion err=%v, want authorization state changed", err) + } + raced, found, err := auths.ByAuthKey(ctx, raceKey) + if err != nil || !found || raced.UserID != userB || !raced.PasswordPending { + t.Fatalf("authorization after stale A proof = %+v found=%v err=%v, want pending B", raced, found, err) + } +} + +func assertFreshAuthorizationCreatedAt(t *testing.T, ctx context.Context, pool *pgxpool.Pool, key [8]byte, userID int64, old time.Time) { + t.Helper() + var ( + actualUserID int64 + createdAt time.Time + fresh bool + ) + if err := pool.QueryRow(ctx, `SELECT user_id,created_at,created_at > now()-interval '1 minute' +FROM authorizations WHERE auth_key_id=$1`, authKeyIDToInt64(key)).Scan(&actualUserID, &createdAt, &fresh); err != nil { + t.Fatalf("read refreshed authorization: %v", err) + } + if actualUserID != userID || !fresh || !createdAt.After(old) { + t.Fatalf("authorization session age user=%d created_at=%v fresh=%v, want user=%d newer than %v", + actualUserID, createdAt, fresh, userID, old) + } +} + func TestAuthorizationStoreRevokeByHashConcurrentTempBindKeepsProtocolIdentityPostgres(t *testing.T) { pool := testPool(t) ctx := context.Background() @@ -258,9 +352,10 @@ func TestAuthorizationStoreRevokeByHashSkipsKeyTransferredAfterCandidateReadPost t.Fatalf("save temp binding before owner transfer: %v", err) } - // Bind B performs the auth_keys-first ownership change inside an open - // transaction. Its uncommitted row is invisible to A's candidate lookup, but - // the parent FOR UPDATE lock is the deterministic barrier for revocation. + // Bind B locks its target user before performing the auth-key ownership change + // inside an open transaction. Its uncommitted row is invisible to A's candidate + // lookup, while the parent auth-key FOR UPDATE lock remains the deterministic + // barrier for revocation. bindB, err := pool.Begin(testCtx) if err != nil { t.Fatalf("begin B bind transaction: %v", err) diff --git a/internal/store/postgres/authorization_tombstone_integration_test.go b/internal/store/postgres/authorization_tombstone_integration_test.go new file mode 100644 index 00000000..746dd0a1 --- /dev/null +++ b/internal/store/postgres/authorization_tombstone_integration_test.go @@ -0,0 +1,89 @@ +package postgres + +import ( + "context" + "errors" + "testing" + "time" + + "telesrv/internal/domain" +) + +const tombstoneAuthorizationTestUserSQL = ` +UPDATE users SET + phone = '', first_name = '', last_name = '', username = '', country_code = '', about = '', + verified = false, support = false, last_seen_at = 0, + premium_expires_at = NULL, emoji_status_document_id = 0, emoji_status_until = 0, + emoji_status_collectible_id = NULL, emoji_status_collectible = '{}'::jsonb, + color_set = false, color = 0, color_background_emoji_id = 0, + profile_color_set = false, profile_color = 0, profile_color_background_emoji_id = 0, + birthday_day = 0, birthday_month = 0, birthday_year = 0, personal_channel_id = 0, + deleted_at = $2, deletion_source = 'manual', deletion_reason = '', + account_delete_at = NULL, updated_at = $2 +WHERE id = $1 AND deleted_at IS NULL` + +func TestAuthorizationStoreBindRejectsTombstonePostgres(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + userID := createRevokeTestUser(t, ctx, pool, "bind-tombstone") + key := saveTempIdentityTestAuthKey(t, ctx, pool, NewAuthKeyStore(pool), 0) + + if _, err := pool.Exec(ctx, tombstoneAuthorizationTestUserSQL, userID, time.Now().UTC()); err != nil { + t.Fatalf("tombstone user: %v", err) + } + err := NewAuthorizationStore(pool).Bind(ctx, domain.Authorization{AuthKeyID: key, UserID: userID}) + if !errors.Is(err, domain.ErrAccountDeleted) { + t.Fatalf("Bind tombstone err = %v, want ErrAccountDeleted", err) + } + assertRevokeTestNoAuthorization(t, ctx, NewAuthorizationStore(pool), key) + assertRevokeTestTableCount(t, ctx, pool, "update_states", "auth_key_id", authKeyIDToInt64(key), 0) +} + +func TestAuthorizationStoreBindWaitsForTombstoneThenRejectsPostgres(t *testing.T) { + pool := testPool(t) + testCtx, cancel := context.WithTimeout(context.Background(), 15*time.Second) + t.Cleanup(cancel) + userID := createRevokeTestUser(t, testCtx, pool, "bind-tombstone-race") + key := saveTempIdentityTestAuthKey(t, testCtx, pool, NewAuthKeyStore(pool), 0) + + deleteTx, err := pool.Begin(testCtx) + if err != nil { + t.Fatalf("begin tombstone transaction: %v", err) + } + defer func() { _ = deleteTx.Rollback(context.Background()) }() + if err := lockUsersForUpdate(testCtx, deleteTx, userID); err != nil { + t.Fatalf("lock tombstone user: %v", err) + } + if _, err := deleteTx.Exec(testCtx, tombstoneAuthorizationTestUserSQL, userID, time.Now().UTC()); err != nil { + t.Fatalf("stage tombstone: %v", err) + } + + bindConn, err := pool.Acquire(testCtx) + if err != nil { + t.Fatalf("acquire bind connection: %v", err) + } + t.Cleanup(bindConn.Release) + var bindPID int + if err := bindConn.QueryRow(testCtx, "SELECT pg_backend_pid()").Scan(&bindPID); err != nil { + t.Fatalf("get bind backend pid: %v", err) + } + bindResult := make(chan error, 1) + go func() { + bindResult <- NewAuthorizationStore(bindConn).Bind(testCtx, domain.Authorization{AuthKeyID: key, UserID: userID}) + }() + waitForPostgresBackendLockWait(t, testCtx, pool, bindPID) + + if err := deleteTx.Commit(testCtx); err != nil { + t.Fatalf("commit tombstone: %v", err) + } + select { + case err := <-bindResult: + if !errors.Is(err, domain.ErrAccountDeleted) { + t.Fatalf("Bind after tombstone lock err = %v, want ErrAccountDeleted", err) + } + case <-testCtx.Done(): + t.Fatalf("Bind did not finish after tombstone commit: %v", testCtx.Err()) + } + assertRevokeTestNoAuthorization(t, testCtx, NewAuthorizationStore(pool), key) + assertRevokeTestTableCount(t, testCtx, pool, "update_states", "auth_key_id", authKeyIDToInt64(key), 0) +} diff --git a/internal/store/postgres/blob_migration.go b/internal/store/postgres/blob_migration.go new file mode 100644 index 00000000..e8d17f53 --- /dev/null +++ b/internal/store/postgres/blob_migration.go @@ -0,0 +1,111 @@ +package postgres + +import ( + "context" + "encoding/hex" + "fmt" + + "telesrv/internal/domain" +) + +// BlobMigrationObject is one immutable content-addressed object referenced by +// one or more logical file locations on the same permanent backend. +type BlobMigrationObject struct { + ObjectKey string + Size int64 + SHA256 []byte + LocationRows int64 +} + +// ListBlobMigrationObjects keyset-pages distinct objects. Inconsistent size or +// digest metadata for one content key is returned as an error, never guessed. +func (s *MediaStore) ListBlobMigrationObjects( + ctx context.Context, + backend domain.MediaBackend, + afterObjectKey string, + limit int, +) ([]BlobMigrationObject, error) { + if limit <= 0 { + return nil, nil + } + rows, err := s.db.Query(ctx, ` +SELECT + object_key, + min(size)::bigint, + count(DISTINCT size)::bigint, + min(encode(sha256, 'hex')), + count(DISTINCT encode(sha256, 'hex'))::bigint, + count(*)::bigint +FROM file_blobs +WHERE backend = $1 AND object_key > $2 +GROUP BY object_key +ORDER BY object_key +LIMIT $3`, string(backend), afterObjectKey, limit) + if err != nil { + return nil, fmt.Errorf("list %s blob migration objects: %w", backend, err) + } + defer rows.Close() + objects := make([]BlobMigrationObject, 0, limit) + for rows.Next() { + var ( + object BlobMigrationObject + sizeVariants int64 + digestHex string + digestVariants int64 + ) + if err := rows.Scan( + &object.ObjectKey, + &object.Size, + &sizeVariants, + &digestHex, + &digestVariants, + &object.LocationRows, + ); err != nil { + return nil, fmt.Errorf("scan blob migration object: %w", err) + } + if sizeVariants != 1 || digestVariants != 1 { + return nil, fmt.Errorf("blob %q has inconsistent persisted size or SHA-256 metadata", object.ObjectKey) + } + digest, err := hex.DecodeString(digestHex) + if err != nil || len(digest) != 32 { + return nil, fmt.Errorf("blob %q has invalid persisted SHA-256 metadata", object.ObjectKey) + } + if object.ObjectKey != digestHex { + return nil, fmt.Errorf("blob %q object key does not match persisted SHA-256 %q", object.ObjectKey, digestHex) + } + object.SHA256 = digest + objects = append(objects, object) + } + if err := rows.Err(); err != nil { + return nil, fmt.Errorf("iterate blob migration objects: %w", err) + } + return objects, nil +} + +// MoveFileBlobBackendForObject atomically relabels every logical location for a +// verified immutable object. It refuses partial/racing changes. +func (s *MediaStore) MoveFileBlobBackendForObject( + ctx context.Context, + from domain.MediaBackend, + to domain.MediaBackend, + objectKey string, + expectedRows int64, +) error { + if expectedRows <= 0 { + return fmt.Errorf("blob %q expected row count must be positive", objectKey) + } + result, err := s.db.Exec(ctx, ` +UPDATE file_blobs +SET backend = $1 +WHERE backend = $2 AND object_key = $3`, string(to), string(from), objectKey) + if err != nil { + return fmt.Errorf("move blob %q metadata from %s to %s: %w", objectKey, from, to, err) + } + if result.RowsAffected() != expectedRows { + return fmt.Errorf( + "move blob %q metadata changed %d rows, want %d", + objectKey, result.RowsAffected(), expectedRows, + ) + } + return nil +} diff --git a/internal/store/postgres/blob_storage_integration_test.go b/internal/store/postgres/blob_storage_integration_test.go new file mode 100644 index 00000000..9cca1ff6 --- /dev/null +++ b/internal/store/postgres/blob_storage_integration_test.go @@ -0,0 +1,95 @@ +package postgres + +import ( + "context" + "os" + "testing" + "time" + + "telesrv/internal/domain" +) + +func TestBlobStorageAdvisoryLock(t *testing.T) { + dsn := os.Getenv("TELESRV_TEST_POSTGRES_DSN") + if dsn == "" { + t.Skip("set TELESRV_TEST_POSTGRES_DSN to run postgres integration test") + } + ctx := context.Background() + runtimeLock, err := AcquireBlobRuntimeLock(ctx, dsn) + if err != nil { + t.Fatalf("acquire runtime lock: %v", err) + } + if _, err := AcquireBlobMigrationLock(ctx, dsn); err == nil { + t.Fatal("exclusive migration lock acquired while runtime shared lock was held") + } + if err := runtimeLock.Close(); err != nil { + t.Fatalf("close runtime lock: %v", err) + } + migrationLock, err := AcquireBlobMigrationLock(ctx, dsn) + if err != nil { + t.Fatalf("acquire migration lock after runtime stopped: %v", err) + } + if err := migrationLock.Close(); err != nil { + t.Fatalf("close migration lock: %v", err) + } +} + +func TestBlobMigrationMetadataRoundTrip(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + media := NewMediaStore(pool) + uniqueBefore, err := media.UniqueFileBlobBytes(ctx, domain.MediaBackendLocalFS) + if err != nil { + t.Fatalf("unique blob bytes before insert: %v", err) + } + suffix := time.Now().UnixNano() + first := postgresTestBlob("blob-migration:first:"+time.Unix(0, suffix).Format("150405.000000000"), "shared-migration", 4096, "application/octet-stream") + second := first + second.LocationKey = "blob-migration:second:" + time.Unix(0, suffix).Format("150405.000000000") + for _, blob := range []domain.FileBlob{first, second} { + if err := media.PutFileBlob(ctx, blob); err != nil { + t.Fatalf("put %s: %v", blob.LocationKey, err) + } + } + t.Cleanup(func() { + _, _ = pool.Exec(context.Background(), "DELETE FROM file_blobs WHERE location_key = ANY($1::text[])", []string{first.LocationKey, second.LocationKey}) + }) + + counts, err := media.FileBlobBackendCounts(ctx) + if err != nil || counts[domain.MediaBackendLocalFS] < 2 { + t.Fatalf("backend counts=%v err=%v", counts, err) + } + uniqueBytes, err := media.UniqueFileBlobBytes(ctx, domain.MediaBackendLocalFS) + if err != nil { + t.Fatalf("unique blob bytes: %v", err) + } + if uniqueBytes-uniqueBefore != first.Size { + t.Fatalf("unique blob byte delta=%d, want shared object counted once as %d", uniqueBytes-uniqueBefore, first.Size) + } + objects, err := media.ListBlobMigrationObjects(ctx, domain.MediaBackendLocalFS, first.ObjectKey[:len(first.ObjectKey)-1], 10) + if err != nil { + t.Fatalf("list migration objects: %v", err) + } + var found *BlobMigrationObject + for i := range objects { + if objects[i].ObjectKey == first.ObjectKey { + found = &objects[i] + break + } + } + if found == nil || found.LocationRows != 2 || found.Size != first.Size { + t.Fatalf("migration object=%+v", found) + } + if err := media.MoveFileBlobBackendForObject( + ctx, domain.MediaBackendLocalFS, domain.MediaBackendS3, + found.ObjectKey, found.LocationRows, + ); err != nil { + t.Fatalf("move backend: %v", err) + } + for _, key := range []string{first.LocationKey, second.LocationKey} { + blob, ok, err := media.GetFileBlob(ctx, key) + if err != nil || !ok || blob.Backend != domain.MediaBackendS3 { + t.Fatalf("get %s backend=%q ok=%v err=%v", key, blob.Backend, ok, err) + } + } +} diff --git a/internal/store/postgres/blob_storage_lock.go b/internal/store/postgres/blob_storage_lock.go new file mode 100644 index 00000000..04ac9db6 --- /dev/null +++ b/internal/store/postgres/blob_storage_lock.go @@ -0,0 +1,79 @@ +package postgres + +import ( + "context" + "fmt" + "time" + + "github.com/jackc/pgx/v5" +) + +// blobStorageAdvisoryLockKey is the signed int64 encoding of "telesrvb". Every +// running server holds a shared session lock; the offline migration tool needs +// the exclusive form, which proves no server using this database is active. +const blobStorageAdvisoryLockKey int64 = 0x74656c6573727662 + +type BlobStorageLock struct { + conn *pgx.Conn + shared bool +} + +func AcquireBlobRuntimeLock(ctx context.Context, dsn string) (*BlobStorageLock, error) { + return acquireBlobStorageLock(ctx, dsn, true) +} + +func AcquireBlobMigrationLock(ctx context.Context, dsn string) (*BlobStorageLock, error) { + return acquireBlobStorageLock(ctx, dsn, false) +} + +func acquireBlobStorageLock(ctx context.Context, dsn string, shared bool) (*BlobStorageLock, error) { + conn, err := pgx.Connect(ctx, dsn) + if err != nil { + return nil, fmt.Errorf("connect for blob storage lock: %w", err) + } + query := "SELECT pg_try_advisory_lock($1)" + kind := "exclusive migration" + if shared { + query = "SELECT pg_try_advisory_lock_shared($1)" + kind = "shared runtime" + } + var acquired bool + if err := conn.QueryRow(ctx, query, blobStorageAdvisoryLockKey).Scan(&acquired); err != nil { + _ = conn.Close(context.Background()) + return nil, fmt.Errorf("acquire %s blob storage lock: %w", kind, err) + } + if !acquired { + _ = conn.Close(context.Background()) + if shared { + return nil, fmt.Errorf("blob migration lock is active; wait for the offline migration to finish before starting telesrv") + } + return nil, fmt.Errorf("one or more telesrv processes are active; stop every process using this PostgreSQL database before migrating blobs") + } + return &BlobStorageLock{conn: conn, shared: shared}, nil +} + +func (l *BlobStorageLock) Close() error { + if l == nil || l.conn == nil { + return nil + } + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) + defer cancel() + query := "SELECT pg_advisory_unlock($1)" + if l.shared { + query = "SELECT pg_advisory_unlock_shared($1)" + } + var unlocked bool + err := l.conn.QueryRow(ctx, query, blobStorageAdvisoryLockKey).Scan(&unlocked) + closeErr := l.conn.Close(ctx) + l.conn = nil + if err != nil { + return fmt.Errorf("release blob storage lock: %w", err) + } + if !unlocked { + return fmt.Errorf("blob storage advisory lock was not held by its session") + } + if closeErr != nil { + return fmt.Errorf("close blob storage lock connection: %w", closeErr) + } + return nil +} diff --git a/internal/store/postgres/blob_test_helpers_test.go b/internal/store/postgres/blob_test_helpers_test.go new file mode 100644 index 00000000..a5d67a17 --- /dev/null +++ b/internal/store/postgres/blob_test_helpers_test.go @@ -0,0 +1,25 @@ +package postgres + +import ( + "crypto/sha256" + "encoding/hex" + + "telesrv/internal/domain" +) + +func postgresTestBlob(locationKey, label string, size int64, mimeType string) domain.FileBlob { + data := make([]byte, size) + seed := sha256.Sum256([]byte(label)) + for i := range data { + data[i] = seed[i%len(seed)] + } + digest := sha256.Sum256(data) + return domain.FileBlob{ + LocationKey: locationKey, + Backend: domain.MediaBackendLocalFS, + ObjectKey: hex.EncodeToString(digest[:]), + Size: size, + SHA256: append([]byte(nil), digest[:]...), + MimeType: mimeType, + } +} diff --git a/internal/store/postgres/bootstrap_update_job_batch.go b/internal/store/postgres/bootstrap_update_job_batch.go new file mode 100644 index 00000000..8d83389c --- /dev/null +++ b/internal/store/postgres/bootstrap_update_job_batch.go @@ -0,0 +1,376 @@ +package postgres + +import ( + "context" + "errors" + "fmt" + "sync" + "time" + + "telesrv/internal/domain" + "telesrv/internal/store" +) + +// BootstrapReadyBatchMetrics exposes only bounded aggregate signals. Selector +// identities are deliberately excluded from metrics. +type BootstrapReadyBatchMetrics interface { + BootstrapReadyBatch(inputs int, matched int, d time.Duration, err error) + BootstrapReadyPending(delta int) +} + +type BootstrapReadyBatchConfig struct { + MaxSize int + MaxWait time.Duration + QueueSize int + QueryTimeout time.Duration + Metrics BootstrapReadyBatchMetrics +} + +type bootstrapReadyBatchKey struct { + userID int64 + authKeyID [8]byte +} + +type bootstrapReadyBatchRequest struct { + userID int64 + authKeyID [8]byte + sessionID int64 + result chan bootstrapReadyBatchResult +} + +type bootstrapReadyBatchResult struct { + matched int + err error +} + +type bootstrapReadyBatchBackend interface { + store.BootstrapUpdateJobStore + markReadyForSessions(context.Context, []bootstrapReadyBatchRequest) ([]int, error) +} + +// BatchedBootstrapUpdateJobStore preserves the synchronous post-response +// delivery fence while combining independent readiness selectors into one +// PostgreSQL statement. Once accepted, a selector waits for a definitive +// commit/error; it is never converted into an unobserved background write. +type BatchedBootstrapUpdateJobStore struct { + base bootstrapReadyBatchBackend + cfg BootstrapReadyBatchConfig + queue chan bootstrapReadyBatchRequest + stop chan struct{} + done chan struct{} + cancel context.CancelFunc + once sync.Once + gate sync.RWMutex + closed bool +} + +func NewBatchedBootstrapUpdateJobStore( + base *BootstrapUpdateJobStore, + cfg BootstrapReadyBatchConfig, +) (*BatchedBootstrapUpdateJobStore, error) { + if base == nil || base.db == nil { + return nil, errors.New("initialize bootstrap readiness batcher: nil store") + } + return newBatchedBootstrapUpdateJobStore(base, cfg) +} + +func newBatchedBootstrapUpdateJobStore( + base bootstrapReadyBatchBackend, + cfg BootstrapReadyBatchConfig, +) (*BatchedBootstrapUpdateJobStore, error) { + if base == nil { + return nil, errors.New("initialize bootstrap readiness batcher: nil backend") + } + if cfg.MaxSize <= 0 || cfg.MaxSize > 4096 { + return nil, fmt.Errorf("initialize bootstrap readiness batcher: max size %d outside [1,4096]", cfg.MaxSize) + } + if cfg.MaxWait <= 0 || cfg.MaxWait > time.Second { + return nil, fmt.Errorf("initialize bootstrap readiness batcher: max wait %v outside (0,1s]", cfg.MaxWait) + } + if cfg.QueueSize < cfg.MaxSize || cfg.QueueSize > 1<<20 { + return nil, fmt.Errorf("initialize bootstrap readiness batcher: queue size %d outside [%d,%d]", cfg.QueueSize, cfg.MaxSize, 1<<20) + } + if cfg.QueryTimeout <= 0 || cfg.QueryTimeout > 30*time.Second { + return nil, fmt.Errorf("initialize bootstrap readiness batcher: query timeout %v outside (0,30s]", cfg.QueryTimeout) + } + workerCtx, cancel := context.WithCancel(context.Background()) + s := &BatchedBootstrapUpdateJobStore{ + base: base, cfg: cfg, + queue: make(chan bootstrapReadyBatchRequest, cfg.QueueSize), + stop: make(chan struct{}), done: make(chan struct{}), cancel: cancel, + } + go s.run(workerCtx) + return s, nil +} + +func (s *BatchedBootstrapUpdateJobStore) EnqueueLoginMessage( + ctx context.Context, + job domain.BootstrapUpdateJob, +) (domain.BootstrapUpdateJob, error) { + return s.base.EnqueueLoginMessage(ctx, job) +} + +func (s *BatchedBootstrapUpdateJobStore) MarkReadyForSession( + ctx context.Context, + userID int64, + authKeyID [8]byte, + sessionID int64, +) (int, error) { + if ctx == nil { + ctx = context.Background() + } + request := bootstrapReadyBatchRequest{ + userID: userID, authKeyID: authKeyID, sessionID: sessionID, + result: make(chan bootstrapReadyBatchResult, 1), + } + s.gate.RLock() + if s.closed { + s.gate.RUnlock() + return 0, context.Canceled + } + select { + case s.queue <- request: + if s.cfg.Metrics != nil { + s.cfg.Metrics.BootstrapReadyPending(1) + } + case <-ctx.Done(): + s.gate.RUnlock() + return 0, ctx.Err() + } + s.gate.RUnlock() + + // Accepted work ignores later caller cancellation and waits for the worker's + // definitive result. This prevents a physically delivered baseline from + // leaving an unknown asynchronous readiness mutation behind. + result := <-request.result + return result.matched, result.err +} + +func (s *BatchedBootstrapUpdateJobStore) ClaimReady( + ctx context.Context, + limit int, + leaseTimeout time.Duration, +) ([]domain.BootstrapUpdateJob, error) { + return s.base.ClaimReady(ctx, limit, leaseTimeout) +} + +func (s *BatchedBootstrapUpdateJobStore) MarkPublished(ctx context.Context, id int64) error { + return s.base.MarkPublished(ctx, id) +} + +func (s *BatchedBootstrapUpdateJobStore) MarkFailed(ctx context.Context, id int64, lastError string) error { + return s.base.MarkFailed(ctx, id, lastError) +} + +func (s *BatchedBootstrapUpdateJobStore) Close() { + s.once.Do(func() { + s.gate.Lock() + s.closed = true + close(s.stop) + s.cancel() + s.gate.Unlock() + <-s.done + }) +} + +func (s *BatchedBootstrapUpdateJobStore) run(ctx context.Context) { + defer close(s.done) + pending := make([]bootstrapReadyBatchRequest, 0, s.cfg.MaxSize) + for { + if len(pending) == 0 { + select { + case request := <-s.queue: + pending = append(pending, request) + case <-s.stop: + s.failQueued(context.Canceled, pending) + return + } + } + + if len(pending) < s.cfg.MaxSize { + timer := time.NewTimer(s.cfg.MaxWait) + collect: + for len(pending) < s.cfg.MaxSize { + select { + case request := <-s.queue: + pending = append(pending, request) + case <-timer.C: + break collect + case <-s.stop: + stopAndDrainTimer(timer) + s.failQueued(context.Canceled, pending) + return + } + } + stopAndDrainTimer(timer) + } + + batch, remaining := selectDistinctBootstrapReadyBatch(pending, s.cfg.MaxSize) + pending = remaining + s.execute(ctx, batch) + } +} + +func stopAndDrainTimer(timer *time.Timer) { + if timer != nil && !timer.Stop() { + select { + case <-timer.C: + default: + } + } +} + +func selectDistinctBootstrapReadyBatch( + pending []bootstrapReadyBatchRequest, + maxSize int, +) ([]bootstrapReadyBatchRequest, []bootstrapReadyBatchRequest) { + batch := make([]bootstrapReadyBatchRequest, 0, min(maxSize, len(pending))) + remaining := make([]bootstrapReadyBatchRequest, 0, len(pending)) + seen := make(map[bootstrapReadyBatchKey]struct{}, min(maxSize, len(pending))) + for _, request := range pending { + if len(batch) >= maxSize { + remaining = append(remaining, request) + continue + } + key := bootstrapReadyBatchKey{userID: request.userID, authKeyID: request.authKeyID} + if _, exists := seen[key]; exists { + remaining = append(remaining, request) + continue + } + seen[key] = struct{}{} + batch = append(batch, request) + } + return batch, remaining +} + +func (s *BatchedBootstrapUpdateJobStore) execute(ctx context.Context, batch []bootstrapReadyBatchRequest) { + if len(batch) == 0 { + return + } + started := time.Now() + queryCtx, cancel := context.WithTimeout(ctx, s.cfg.QueryTimeout) + results, err := s.base.markReadyForSessions(queryCtx, batch) + cancel() + matched := 0 + if err == nil { + if len(results) != len(batch) { + err = fmt.Errorf("mark bootstrap readiness batch: result count %d, want %d", len(results), len(batch)) + } else { + for _, count := range results { + matched += count + } + } + } + if s.cfg.Metrics != nil { + s.cfg.Metrics.BootstrapReadyBatch(len(batch), matched, time.Since(started), err) + } + for index, request := range batch { + result := bootstrapReadyBatchResult{err: err} + if err == nil { + result.matched = results[index] + } + request.result <- result + if s.cfg.Metrics != nil { + s.cfg.Metrics.BootstrapReadyPending(-1) + } + } +} + +func (s *BatchedBootstrapUpdateJobStore) failQueued(err error, pending []bootstrapReadyBatchRequest) { + for _, request := range pending { + s.failRequest(request, err) + } + for { + select { + case request := <-s.queue: + s.failRequest(request, err) + default: + return + } + } +} + +func (s *BatchedBootstrapUpdateJobStore) failRequest(request bootstrapReadyBatchRequest, err error) { + request.result <- bootstrapReadyBatchResult{err: err} + if s.cfg.Metrics != nil { + s.cfg.Metrics.BootstrapReadyPending(-1) + } +} + +func (s *BootstrapUpdateJobStore) markReadyForSessions( + ctx context.Context, + requests []bootstrapReadyBatchRequest, +) ([]int, error) { + results := make([]int, len(requests)) + if len(requests) == 0 { + return results, nil + } + userIDs := make([]int64, len(requests)) + authKeyIDs := make([]int64, len(requests)) + sessionIDs := make([]int64, len(requests)) + seen := make(map[bootstrapReadyBatchKey]struct{}, len(requests)) + for index, request := range requests { + key := bootstrapReadyBatchKey{userID: request.userID, authKeyID: request.authKeyID} + if _, duplicate := seen[key]; duplicate { + return nil, fmt.Errorf("mark bootstrap readiness batch: duplicate fence at index %d", index) + } + seen[key] = struct{}{} + userIDs[index] = request.userID + authKeyIDs[index] = authKeyIDToInt64(request.authKeyID) + sessionIDs[index] = request.sessionID + } + rows, err := s.db.Query(ctx, ` +WITH input AS ( + SELECT * + FROM unnest( + $1::bigint[], + $2::bigint[], + $3::bigint[] + ) WITH ORDINALITY AS value(user_id, auth_key_id, session_id, ordinal) +), candidates AS MATERIALIZED ( + SELECT input.ordinal, + input.session_id, + jobs.id + FROM input + JOIN bootstrap_update_jobs AS jobs + ON jobs.user_id = input.user_id + AND jobs.auth_key_id = input.auth_key_id + AND jobs.status = 'pending' + ORDER BY jobs.id, input.ordinal + FOR UPDATE OF jobs +), updated AS ( + UPDATE bootstrap_update_jobs AS jobs + SET status = 'ready', + session_id = candidates.session_id, + ready_at = now(), + updated_at = now() + FROM candidates + WHERE jobs.id = candidates.id + RETURNING candidates.ordinal +) +SELECT ordinal, count(*)::bigint +FROM updated +GROUP BY ordinal +ORDER BY ordinal`, userIDs, authKeyIDs, sessionIDs) + if err != nil { + return nil, fmt.Errorf("mark bootstrap readiness batch: %w", err) + } + defer rows.Close() + for rows.Next() { + var ordinal, count int64 + if err := rows.Scan(&ordinal, &count); err != nil { + return nil, fmt.Errorf("scan bootstrap readiness batch: %w", err) + } + index := int(ordinal - 1) + if index < 0 || index >= len(results) || results[index] != 0 || count <= 0 { + return nil, fmt.Errorf("mark bootstrap readiness batch: invalid ordinal/count %d/%d", ordinal, count) + } + results[index] = int(count) + } + if err := rows.Err(); err != nil { + return nil, fmt.Errorf("mark bootstrap readiness batch rows: %w", err) + } + return results, nil +} + +var _ store.BootstrapUpdateJobStore = (*BatchedBootstrapUpdateJobStore)(nil) diff --git a/internal/store/postgres/bootstrap_update_job_batch_test.go b/internal/store/postgres/bootstrap_update_job_batch_test.go new file mode 100644 index 00000000..2fa36917 --- /dev/null +++ b/internal/store/postgres/bootstrap_update_job_batch_test.go @@ -0,0 +1,172 @@ +package postgres + +import ( + "context" + "errors" + "sync" + "sync/atomic" + "testing" + "time" + + "telesrv/internal/domain" +) + +func TestSelectDistinctBootstrapReadyBatchDefersSameFence(t *testing.T) { + first := bootstrapReadyBatchRequest{userID: 1, authKeyID: [8]byte{1}, sessionID: 10} + duplicate := bootstrapReadyBatchRequest{userID: 1, authKeyID: [8]byte{1}, sessionID: 11} + other := bootstrapReadyBatchRequest{userID: 1, authKeyID: [8]byte{2}, sessionID: 12} + batch, remaining := selectDistinctBootstrapReadyBatch( + []bootstrapReadyBatchRequest{first, duplicate, other}, + 3, + ) + if len(batch) != 2 || batch[0].sessionID != 10 || batch[1].sessionID != 12 { + t.Fatalf("batch = %#v", batch) + } + if len(remaining) != 1 || remaining[0].sessionID != 11 { + t.Fatalf("remaining = %#v", remaining) + } +} + +func TestBatchedBootstrapUpdateJobStoreCoalescesSynchronousSelectors(t *testing.T) { + const count = 16 + backend := &fakeBootstrapReadyBackend{} + batcher, err := newBatchedBootstrapUpdateJobStore(backend, BootstrapReadyBatchConfig{ + MaxSize: count, MaxWait: 100 * time.Millisecond, + QueueSize: count * 2, QueryTimeout: time.Second, + }) + if err != nil { + t.Fatal(err) + } + t.Cleanup(batcher.Close) + + start := make(chan struct{}) + errs := make(chan error, count) + var wg sync.WaitGroup + for index := 0; index < count; index++ { + index := index + wg.Add(1) + go func() { + defer wg.Done() + <-start + matched, err := batcher.MarkReadyForSession( + context.Background(), int64(index+1), [8]byte{byte(index + 1)}, int64(index+100), + ) + if err != nil { + errs <- err + } else if matched != 0 { + errs <- errors.New("unexpected bootstrap readiness match") + } + }() + } + close(start) + wg.Wait() + close(errs) + for err := range errs { + t.Fatal(err) + } + if calls := backend.calls.Load(); calls != 1 { + t.Fatalf("batch calls = %d, want 1", calls) + } + if inputs := backend.inputs.Load(); inputs != count { + t.Fatalf("batch inputs = %d, want %d", inputs, count) + } +} + +func TestBatchedBootstrapUpdateJobStoreCapacityAndShutdownAreExplicit(t *testing.T) { + started := make(chan struct{}) + backend := &fakeBootstrapReadyBackend{started: started, block: true} + metrics := &fakeBootstrapReadyMetrics{} + batcher, err := newBatchedBootstrapUpdateJobStore(backend, BootstrapReadyBatchConfig{ + MaxSize: 1, MaxWait: time.Millisecond, QueueSize: 1, QueryTimeout: time.Second, Metrics: metrics, + }) + if err != nil { + t.Fatal(err) + } + + results := make(chan error, 2) + go func() { + _, err := batcher.MarkReadyForSession(context.Background(), 1, [8]byte{1}, 1) + results <- err + }() + select { + case <-started: + case <-time.After(time.Second): + t.Fatal("first batch did not start") + } + go func() { + _, err := batcher.MarkReadyForSession(context.Background(), 2, [8]byte{2}, 2) + results <- err + }() + deadline := time.Now().Add(time.Second) + for metrics.pending.Load() != 2 && time.Now().Before(deadline) { + time.Sleep(time.Millisecond) + } + if metrics.pending.Load() != 2 { + t.Fatalf("pending = %d, want 2", metrics.pending.Load()) + } + + ctx, cancel := context.WithTimeout(context.Background(), 20*time.Millisecond) + defer cancel() + if _, err := batcher.MarkReadyForSession(ctx, 3, [8]byte{3}, 3); !errors.Is(err, context.DeadlineExceeded) { + t.Fatalf("capacity wait err = %v, want deadline exceeded", err) + } + batcher.Close() + for range 2 { + if err := <-results; !errors.Is(err, context.Canceled) { + t.Fatalf("shutdown result = %v, want canceled", err) + } + } + if pending := metrics.pending.Load(); pending != 0 { + t.Fatalf("pending after shutdown = %d", pending) + } + if _, err := batcher.MarkReadyForSession(context.Background(), 4, [8]byte{4}, 4); !errors.Is(err, context.Canceled) { + t.Fatalf("mark after close err = %v, want canceled", err) + } +} + +type fakeBootstrapReadyBackend struct { + calls atomic.Int64 + inputs atomic.Int64 + started chan struct{} + block bool + once sync.Once +} + +func (s *fakeBootstrapReadyBackend) markReadyForSessions(ctx context.Context, requests []bootstrapReadyBatchRequest) ([]int, error) { + s.calls.Add(1) + s.inputs.Add(int64(len(requests))) + if s.started != nil { + s.once.Do(func() { close(s.started) }) + } + if s.block { + <-ctx.Done() + return nil, ctx.Err() + } + return make([]int, len(requests)), nil +} + +func (*fakeBootstrapReadyBackend) EnqueueLoginMessage(context.Context, domain.BootstrapUpdateJob) (domain.BootstrapUpdateJob, error) { + return domain.BootstrapUpdateJob{}, nil +} + +func (*fakeBootstrapReadyBackend) MarkReadyForSession(context.Context, int64, [8]byte, int64) (int, error) { + return 0, nil +} + +func (*fakeBootstrapReadyBackend) ClaimReady(context.Context, int, time.Duration) ([]domain.BootstrapUpdateJob, error) { + return nil, nil +} + +func (*fakeBootstrapReadyBackend) MarkPublished(context.Context, int64) error { return nil } + +func (*fakeBootstrapReadyBackend) MarkFailed(context.Context, int64, string) error { return nil } + +type fakeBootstrapReadyMetrics struct { + pending atomic.Int64 +} + +func (*fakeBootstrapReadyMetrics) BootstrapReadyBatch(int, int, time.Duration, error) {} + +func (m *fakeBootstrapReadyMetrics) BootstrapReadyPending(delta int) { + m.pending.Add(int64(delta)) +} diff --git a/internal/store/postgres/bootstrap_update_job_integration_test.go b/internal/store/postgres/bootstrap_update_job_integration_test.go index 7cffb304..371c8fe9 100644 --- a/internal/store/postgres/bootstrap_update_job_integration_test.go +++ b/internal/store/postgres/bootstrap_update_job_integration_test.go @@ -51,3 +51,60 @@ func TestBootstrapUpdateJobPostgresSameAuthKeyReconnectTakesOverPendingSession(t t.Fatalf("bootstrap status/session = %s/%d, want ready/%d", status, sessionID, newSessionID) } } + +func TestBootstrapUpdateJobPostgresMarksReadinessBatchByOrdinal(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + user := createLoginCodeDeliveryTestUser(t, ctx, pool, "bootstrap-batch") + messages := NewMessageStore(pool) + bootstrap := NewBootstrapUpdateJobStore(pool) + authKeyID := [8]byte{2, 4, 6, 8} + for index := 0; index < 2; index++ { + msg, err := messages.Create(ctx, domain.Message{ + OwnerUserID: user.ID, + Peer: domain.Peer{Type: domain.PeerTypeUser, ID: domain.OfficialSystemUserID}, + From: domain.Peer{Type: domain.PeerTypeUser, ID: domain.OfficialSystemUserID}, + Date: int(time.Now().Unix()) + index, + Body: "Login code batch", + }) + if err != nil { + t.Fatalf("create bootstrap message %d: %v", index, err) + } + if _, err := bootstrap.EnqueueLoginMessage(ctx, domain.BootstrapUpdateJob{ + Kind: domain.BootstrapUpdateJobLoginMessage, UserID: user.ID, + AuthKeyID: authKeyID, SessionID: int64(100 + index), MessageBoxID: msg.ID, + }); err != nil { + t.Fatalf("enqueue bootstrap %d: %v", index, err) + } + } + + results, err := bootstrap.markReadyForSessions(ctx, []bootstrapReadyBatchRequest{ + {userID: user.ID + 1, authKeyID: authKeyID, sessionID: 700}, + {userID: user.ID, authKeyID: [8]byte{9}, sessionID: 701}, + {userID: user.ID, authKeyID: authKeyID, sessionID: 702}, + }) + if err != nil { + t.Fatal(err) + } + if len(results) != 3 || results[0] != 0 || results[1] != 0 || results[2] != 2 { + t.Fatalf("batch results = %#v, want [0 0 2]", results) + } + var count int + if err := pool.QueryRow(ctx, ` +SELECT count(*) +FROM bootstrap_update_jobs +WHERE user_id = $1 AND auth_key_id = $2 AND status = 'ready' AND session_id = $3`, + user.ID, authKeyIDToInt64(authKeyID), int64(702)).Scan(&count); err != nil { + t.Fatal(err) + } + if count != 2 { + t.Fatalf("ready jobs = %d, want 2", count) + } + + if _, err := bootstrap.markReadyForSessions(ctx, []bootstrapReadyBatchRequest{ + {userID: user.ID, authKeyID: authKeyID, sessionID: 1}, + {userID: user.ID, authKeyID: authKeyID, sessionID: 2}, + }); err == nil { + t.Fatal("duplicate fence accepted in one batch") + } +} diff --git a/internal/store/postgres/bot.go b/internal/store/postgres/bot.go index 8fe06653..164676e9 100644 --- a/internal/store/postgres/bot.go +++ b/internal/store/postgres/bot.go @@ -130,13 +130,10 @@ func (s *BotStore) DeleteBotAccount(ctx context.Context, botUserID int64) (domai } now := time.Now().UTC() - if err := enqueueAccountDeletionNotifications(ctx, tx, botUserID); err != nil { - return domain.User{}, err - } if _, err := revokeByUserExceptTx(ctx, tx, botUserID, 0); err != nil { return domain.User{}, fmt.Errorf("delete bot account: revoke sessions: %w", err) } - if err := purgeDeletedAccountPrivateState(ctx, tx, botUserID, now); err != nil { + if err := purgeDeletedBotPrivateState(ctx, tx, botUserID, now); err != nil { return domain.User{}, err } if err := replacePeerUsernameTx(ctx, tx, peerUsernameTypeUser, botUserID, "", ""); err != nil { diff --git a/internal/store/postgres/bot_verification.go b/internal/store/postgres/bot_verification.go index 2caa6dec..4f09d458 100644 --- a/internal/store/postgres/bot_verification.go +++ b/internal/store/postgres/bot_verification.go @@ -74,11 +74,11 @@ const ( maxVerificationIconNameBytes = 512 maxVerifierCompanyBytes = 512 // Rune-counting domain limits use their worst-case UTF-8 byte size in SQL. - // The final generated description may be longer than the 70-rune custom input. - maxVerifierDescriptionBytes = 280 + // The final generated description may be longer than the custom-input limit. + maxVerifierDescriptionBytes = 4 * domain.MaxCustomVerificationDescriptionLength maxVerifierGrantReasonBytes = 4096 maxCustomVerificationDescriptionBytes = 4096 - maxCustomVerificationInputBytes = 280 + maxCustomVerificationInputBytes = 4 * domain.MaxCustomVerificationDescriptionLength maxCustomVerificationTitleBytes = 1024 maxCustomVerificationUsernameBytes = 64 maxCustomVerificationReasonBytes = 16384 diff --git a/internal/store/postgres/bot_verification_integration_test.go b/internal/store/postgres/bot_verification_integration_test.go index 9f60e8e6..32a03c5d 100644 --- a/internal/store/postgres/bot_verification_integration_test.go +++ b/internal/store/postgres/bot_verification_integration_test.go @@ -1006,7 +1006,7 @@ func TestCustomVerificationRequestQueuePostgres(t *testing.T) { } // TestBotVerificationDescriptionsAcceptEmojiPostgres pins the app-configured -// 70-rune custom-description limit against UTF-8 byte constraints. +// configured custom-description limit against UTF-8 byte constraints. func TestBotVerificationDescriptionsAcceptEmojiPostgres(t *testing.T) { pool := testPool(t) ctx := context.Background() diff --git a/internal/store/postgres/business.go b/internal/store/postgres/business.go index ef08e18f..8cf808e5 100644 --- a/internal/store/postgres/business.go +++ b/internal/store/postgres/business.go @@ -13,6 +13,25 @@ import ( "telesrv/internal/domain" ) +func (s *PasswordStore) HasBusinessAutomation(ctx context.Context, userID int64) (bool, error) { + var exists bool + err := s.db.QueryRow(ctx, ` +SELECT EXISTS ( + SELECT 1 + FROM user_business_profiles + WHERE user_id = $1 + AND (greeting_message <> '{}'::jsonb OR away_message <> '{}'::jsonb) + UNION ALL + SELECT 1 + FROM business_connected_bots + WHERE owner_user_id = $1 +)`, userID).Scan(&exists) + if err != nil { + return false, fmt.Errorf("check business automation: %w", err) + } + return exists, nil +} + func (s *PasswordStore) GetBusinessProfile(ctx context.Context, userID int64) (domain.BusinessProfile, bool, error) { row := s.db.QueryRow(ctx, ` SELECT diff --git a/internal/store/postgres/business_integration_test.go b/internal/store/postgres/business_integration_test.go index 489f0317..12e49748 100644 --- a/internal/store/postgres/business_integration_test.go +++ b/internal/store/postgres/business_integration_test.go @@ -296,6 +296,46 @@ func TestBusinessStoresRoundTrip(t *testing.T) { } } +func TestHasBusinessAutomationUsesConfiguredGreetingOrAwayState(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + suffix := randomSuffix(t) + owner, err := NewUserStore(pool).Create(ctx, domain.User{ + AccessHash: 51, + Phone: "+1999" + suffix + "01", + FirstName: "AutomationOwner", + }) + if err != nil { + t.Fatalf("create owner: %v", err) + } + t.Cleanup(func() { + _, _ = pool.Exec(ctx, "DELETE FROM users WHERE id = $1", owner.ID) + }) + + business := NewPasswordStore(pool) + if got, err := business.HasBusinessAutomation(ctx, owner.ID); err != nil || got { + t.Fatalf("empty HasBusinessAutomation = %v, %v; want false, nil", got, err) + } + if err := business.SaveBusinessProfile(ctx, domain.BusinessProfile{ + UserID: owner.ID, + Intro: &domain.BusinessIntro{Title: "profile only"}, + }); err != nil { + t.Fatalf("save non-automation profile: %v", err) + } + if got, err := business.HasBusinessAutomation(ctx, owner.ID); err != nil || got { + t.Fatalf("profile-only HasBusinessAutomation = %v, %v; want false, nil", got, err) + } + if err := business.SaveBusinessProfile(ctx, domain.BusinessProfile{ + UserID: owner.ID, + Greeting: &domain.BusinessGreetingMessage{ShortcutID: 7}, + }); err != nil { + t.Fatalf("save greeting profile: %v", err) + } + if got, err := business.HasBusinessAutomation(ctx, owner.ID); err != nil || !got { + t.Fatalf("greeting HasBusinessAutomation = %v, %v; want true, nil", got, err) + } +} + func randomSuffix(t *testing.T) string { t.Helper() var b [4]byte diff --git a/internal/store/postgres/channel_active_monoforum_invalidation_integration_test.go b/internal/store/postgres/channel_active_monoforum_invalidation_integration_test.go new file mode 100644 index 00000000..495bba91 --- /dev/null +++ b/internal/store/postgres/channel_active_monoforum_invalidation_integration_test.go @@ -0,0 +1,118 @@ +package postgres + +import ( + "context" + "testing" + + "telesrv/internal/domain" +) + +func TestChannelActiveMembershipGenerationCoversMonoforumVisibility(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + suffix := randomSuffix(t) + users := NewUserStore(pool) + owner, err := users.Create(ctx, domain.User{AccessHash: 971, Phone: "+1886" + suffix + "01", FirstName: "MonoVersionOwner"}) + if err != nil { + t.Fatalf("create owner: %v", err) + } + subscriber, err := users.Create(ctx, domain.User{AccessHash: 972, Phone: "+1886" + suffix + "02", FirstName: "MonoVersionSubscriber"}) + if err != nil { + t.Fatalf("create subscriber: %v", err) + } + channels := NewChannelStore(pool) + created, err := channels.CreateChannel(ctx, domain.CreateChannelRequest{ + CreatorUserID: owner.ID, Title: "Mono Version " + suffix, Broadcast: true, Date: 1700007110, + }) + if err != nil { + t.Fatalf("create parent: %v", err) + } + enabled, err := channels.SetPaidMessagesPrice(ctx, owner.ID, created.Channel.ID, 0, true) + if err != nil { + t.Fatalf("enable monoforum: %v", err) + } + monoID := enabled.Channel.LinkedMonoforumID + t.Cleanup(func() { + _, _ = pool.Exec(ctx, "DELETE FROM channels WHERE id = ANY($1::bigint[])", []int64{created.Channel.ID, monoID}) + _, _ = pool.Exec(ctx, "DELETE FROM users WHERE id = ANY($1::bigint[])", []int64{owner.ID, subscriber.ID}) + }) + version := func(userID int64) int64 { + t.Helper() + var value int64 + if err := pool.QueryRow(ctx, ` +SELECT COALESCE(( + SELECT version + FROM read_model_versions + WHERE model = 'channel_active_memberships' + AND owner_user_id = $1 AND peer_type = 'user' AND peer_id = $1 +), 0)`, userID).Scan(&value); err != nil { + t.Fatalf("read generation for %d: %v", userID, err) + } + return value + } + + beforeSend := version(subscriber.ID) + sent, err := channels.SendMonoforumMessage(ctx, domain.SendMonoforumMessageRequest{ + MonoforumID: monoID, SenderUserID: subscriber.ID, + SavedPeer: domain.Peer{Type: domain.PeerTypeUser, ID: subscriber.ID}, + RandomID: 7711, Message: "visibility", Date: 1700007111, + }) + if err != nil { + t.Fatalf("send monoforum message: %v", err) + } + if after := version(subscriber.ID); after <= beforeSend { + t.Fatalf("subscriber generation after send = %d, want > %d", after, beforeSend) + } + active, err := channels.ListActiveChannelIDsForUser(ctx, subscriber.ID, 0, 1000) + if err != nil { + t.Fatalf("list subscriber active IDs: %v", err) + } + if !containsInt64(active, monoID) { + t.Fatalf("subscriber active IDs = %v, want monoforum %d", active, monoID) + } + + beforeDelete := version(subscriber.ID) + if _, err := pool.Exec(ctx, ` +UPDATE channel_messages +SET deleted = true +WHERE channel_id = $1 AND id = $2`, monoID, sent.Message.ID); err != nil { + t.Fatalf("delete saved-peer message: %v", err) + } + if after := version(subscriber.ID); after <= beforeDelete { + t.Fatalf("subscriber generation after delete = %d, want > %d", after, beforeDelete) + } + active, err = channels.ListActiveChannelIDsForUser(ctx, subscriber.ID, 0, 1000) + if err != nil { + t.Fatalf("list subscriber active IDs after delete: %v", err) + } + if containsInt64(active, monoID) { + t.Fatalf("subscriber active IDs after last message delete = %v, monoforum remained", active) + } + + beforeRights := version(owner.ID) + if _, err := pool.Exec(ctx, ` +UPDATE channel_members +SET admin_rights = admin_rights || '{"ManageDirectMessages": true}'::jsonb, + updated_at = now() +WHERE channel_id = $1 AND user_id = $2`, created.Channel.ID, owner.ID); err != nil { + t.Fatalf("update manager rights: %v", err) + } + if after := version(owner.ID); after <= beforeRights { + t.Fatalf("manager generation after rights = %d, want > %d", after, beforeRights) + } + + beforeToggleOwner := version(owner.ID) + beforeToggleSubscriber := version(subscriber.ID) + if _, err := channels.SetPaidMessagesPrice(ctx, owner.ID, created.Channel.ID, 0, false); err != nil { + t.Fatalf("disable monoforum: %v", err) + } + if after := version(owner.ID); after <= beforeToggleOwner { + t.Fatalf("manager generation after disable = %d, want > %d", after, beforeToggleOwner) + } + // The subscriber no longer has a live message, so it is intentionally not + // part of the toggle fan-out. A previous deleted row cannot manufacture a + // new active-page dependency. + if after := version(subscriber.ID); after != beforeToggleSubscriber { + t.Fatalf("deleted-only subscriber generation after disable = %d, want %d", after, beforeToggleSubscriber) + } +} diff --git a/internal/store/postgres/channel_core.go b/internal/store/postgres/channel_core.go index 1369293d..d03a7817 100644 --- a/internal/store/postgres/channel_core.go +++ b/internal/store/postgres/channel_core.go @@ -115,7 +115,9 @@ func (s *ChannelStore) CreateChannel(ctx context.Context, req domain.CreateChann if err != nil { return domain.CreateChannelResult{}, fmt.Errorf("allocate channel message id: %w", err) } - pts := 1 + // PTS 1 is the empty channel message-box baseline. The create service + // message is the first real event, so its post-event state is 2. + pts := domain.FirstChannelEventPts channel := domain.Channel{ ID: channelID, AccessHash: accessHash, @@ -167,6 +169,13 @@ func (s *ChannelStore) CreateChannel(ctx context.Context, req domain.CreateChann if err := insertChannelEventTx(ctx, tx, event); err != nil { return domain.CreateChannelResult{}, err } + if _, err := tx.Exec(ctx, ` +UPDATE channel_update_checkpoints +SET retained_through_pts = $2, + updated_at = now() +WHERE channel_id = $1`, channelID, domain.InitialChannelPts); err != nil { + return domain.CreateChannelResult{}, fmt.Errorf("initialize channel pts baseline: %w", err) + } for _, member := range members { readMax := 0 if member.UserID == req.CreatorUserID { @@ -301,6 +310,13 @@ func (s *ChannelStore) ResolveChannel(ctx context.Context, viewerUserID, channel return view, nil } +// AuthoritativeResolveChannelCache declares that ResolveChannel is already +// protected by ChannelRowCache + ChannelMemberCache. Both consume exact +// channel_base/channel_member invalidations, reject stale in-flight writes by +// epoch, and flush after listener reconnect. The app layer must therefore not +// place a second read_model_versions gate in front of this store path. +func (*ChannelStore) AuthoritativeResolveChannelCache() {} + func (s *ChannelStore) GetChannels(ctx context.Context, viewerUserID int64, channelIDs []int64) ([]domain.ChannelView, error) { if viewerUserID == 0 || len(channelIDs) == 0 { return nil, nil @@ -573,19 +589,6 @@ WHERE id = $1`, channel.ID, participants, admins, kicked, banned); err != nil { return channel, nil } -func addPeerRef(peer domain.Peer, currentChannelID int64, userRefs, channelRefs map[int64]struct{}) { - switch peer.Type { - case domain.PeerTypeUser: - if peer.ID != 0 { - userRefs[peer.ID] = struct{}{} - } - case domain.PeerTypeChannel: - if peer.ID != 0 && peer.ID != currentChannelID { - channelRefs[peer.ID] = struct{}{} - } - } -} - func mapKeysInt64(items map[int64]struct{}) []int64 { if len(items) == 0 { return nil diff --git a/internal/store/postgres/channel_core_integration_test.go b/internal/store/postgres/channel_core_integration_test.go index 10b49971..cf6220e8 100644 --- a/internal/store/postgres/channel_core_integration_test.go +++ b/internal/store/postgres/channel_core_integration_test.go @@ -7,6 +7,74 @@ import ( "telesrv/internal/domain" ) +func TestChannelCreateInitialPtsBaselinePostgres(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + suffix := randomSuffix(t) + users := NewUserStore(pool) + owner := createTestUser(t, ctx, users, "+1887"+suffix+"80", "PtsOwner", "") + var channelID int64 + t.Cleanup(func() { + if channelID != 0 { + _, _ = pool.Exec(ctx, "DELETE FROM channels WHERE id = $1", channelID) + } + _, _ = pool.Exec(ctx, "DELETE FROM users WHERE id = $1", owner.ID) + }) + + channels := NewChannelStore(pool) + created, err := channels.CreateChannel(ctx, domain.CreateChannelRequest{ + CreatorUserID: owner.ID, + Title: "Initial pts " + suffix, + Megagroup: true, + Date: 1_700_001_180, + }) + if err != nil { + t.Fatalf("create channel: %v", err) + } + channelID = created.Channel.ID + if created.Channel.Pts != domain.FirstChannelEventPts || created.Message.Pts != domain.FirstChannelEventPts || + created.Event.Pts != domain.FirstChannelEventPts || created.Event.PtsCount != 1 { + t.Fatalf("create result = channel:%+v message:%+v event:%+v, want first event 2/1", created.Channel, created.Message, created.Event) + } + + var channelPts, messagePts, eventPts, eventPtsCount, retainedFloor, latestPts int + if err := pool.QueryRow(ctx, ` +SELECT c.pts, m.pts, e.pts, e.pts_count, cp.retained_through_pts, cp.latest_pts +FROM channels c +JOIN channel_messages m ON m.channel_id = c.id AND m.id = c.top_message_id +JOIN channel_update_events e ON e.channel_id = c.id AND e.message_id = m.id +JOIN channel_update_checkpoints cp ON cp.channel_id = c.id +WHERE c.id = $1`, channelID).Scan( + &channelPts, &messagePts, &eventPts, &eventPtsCount, &retainedFloor, &latestPts, + ); err != nil { + t.Fatalf("read persisted initial pts: %v", err) + } + if channelPts != domain.FirstChannelEventPts || messagePts != domain.FirstChannelEventPts || + eventPts != domain.FirstChannelEventPts || eventPtsCount != 1 || + retainedFloor != domain.InitialChannelPts || latestPts != domain.FirstChannelEventPts { + t.Fatalf("persisted pts = channel:%d message:%d event:%d/%d checkpoint:%d/%d, want 2/2/2/1/1/2", + channelPts, messagePts, eventPts, eventPtsCount, retainedFloor, latestPts) + } + fromBaseline, err := channels.ListChannelDifference(ctx, domain.ChannelDifferenceRequest{ + UserID: owner.ID, ChannelID: channelID, Pts: domain.InitialChannelPts, Limit: 10, + }) + if err != nil { + t.Fatalf("difference from baseline: %v", err) + } + if fromBaseline.TooLong || len(fromBaseline.Events) != 1 || fromBaseline.Events[0].Pts != domain.FirstChannelEventPts { + t.Fatalf("difference from baseline = %+v, want create event at pts=2", fromBaseline) + } + fromZero, err := channels.ListChannelDifference(ctx, domain.ChannelDifferenceRequest{ + UserID: owner.ID, ChannelID: channelID, Pts: 0, Limit: 10, + }) + if err != nil { + t.Fatalf("difference from zero: %v", err) + } + if !fromZero.TooLong || fromZero.Pts != domain.FirstChannelEventPts || len(fromZero.NewMessages) != 1 { + t.Fatalf("difference from zero = %+v, want complete snapshot at pts=2", fromZero) + } +} + func TestChannelStoreGetChannelsBatchesVisibleAndPublicPreview(t *testing.T) { pool := testPool(t) ctx := context.Background() diff --git a/internal/store/postgres/channel_dialog_cache.go b/internal/store/postgres/channel_dialog_cache.go index d92c0582..a0f9edff 100644 --- a/internal/store/postgres/channel_dialog_cache.go +++ b/internal/store/postgres/channel_dialog_cache.go @@ -2,6 +2,7 @@ package postgres import ( "context" + "sync" "telesrv/internal/domain" "telesrv/internal/readmodelcache" @@ -12,6 +13,14 @@ type channelDialogCacheKey struct { channelID int64 } +type channelDialogCacheEntry struct { + dialog domain.ChannelDialog + listVisible bool + topMentioned bool + topMediaUnread bool + topUnreadProjected bool +} + // ChannelDialogCache 缓存 viewer 作用域的频道 dialog 投影,由统一缓存原语 // readmodelcache.Cache 承载(LRU 单条驱逐 / epoch 守卫 / singleflight 内建)。 // @@ -19,39 +28,59 @@ type channelDialogCacheKey struct { // dialog_light(viewer,channel) 三个 read model;ReadModelChangeListener 在写侧 NOTIFY 时 // 失效对应键,重连时 flush。warm-from-list 经 put 回填(含 DefaultSendAs)。 type ChannelDialogCache struct { - cache *readmodelcache.Cache[channelDialogCacheKey, domain.ChannelDialog] + cache *readmodelcache.Cache[channelDialogCacheKey, channelDialogCacheEntry] + + indexMu sync.Mutex + channelKeys map[int64]map[channelDialogCacheKey]struct{} } func NewChannelDialogCache(max int) *ChannelDialogCache { - cache := readmodelcache.New[channelDialogCacheKey, domain.ChannelDialog](readmodelcache.Config[channelDialogCacheKey, domain.ChannelDialog]{ + c := &ChannelDialogCache{channelKeys: make(map[int64]map[channelDialogCacheKey]struct{})} + cache := readmodelcache.New[channelDialogCacheKey, channelDialogCacheEntry](readmodelcache.Config[channelDialogCacheKey, channelDialogCacheEntry]{ MaxEntries: max, - Clone: cloneChannelDialog, + Clone: cloneChannelDialogCacheEntry, + OnStore: c.indexEntry, + OnRemove: c.unindexEntry, }) if cache == nil { return nil } - return &ChannelDialogCache{cache: cache} + c.cache = cache + return c } func (c *ChannelDialogCache) get(userID, channelID int64) (domain.ChannelDialog, bool) { if c == nil || userID == 0 || channelID == 0 { return domain.ChannelDialog{}, false } - return c.cache.Peek(channelDialogCacheKey{userID: userID, channelID: channelID}) + entry, ok := c.cache.Peek(channelDialogCacheKey{userID: userID, channelID: channelID}) + return entry.dialog, ok +} + +func (c *ChannelDialogCache) getListProjection(userID, channelID int64) (channelDialogCacheEntry, bool) { + if c == nil || userID == 0 || channelID == 0 { + return channelDialogCacheEntry{}, false + } + entry, ok := c.cache.Peek(channelDialogCacheKey{userID: userID, channelID: channelID}) + return entry, ok && entry.listVisible } func (c *ChannelDialogCache) getOrLoad(ctx context.Context, userID, channelID int64, load func() (domain.ChannelDialog, error)) (domain.ChannelDialog, error) { if c == nil || userID == 0 || channelID == 0 { return load() } - return c.cache.GetOrLoad(ctx, channelDialogCacheKey{userID: userID, channelID: channelID}, load) + entry, err := c.cache.GetOrLoad(ctx, channelDialogCacheKey{userID: userID, channelID: channelID}, func() (channelDialogCacheEntry, error) { + dialog, err := load() + return channelDialogCacheEntry{dialog: dialog}, err + }) + return entry.dialog, err } func (c *ChannelDialogCache) put(dialog domain.ChannelDialog) { if c == nil || dialog.UserID == 0 || dialog.ChannelID == 0 { return } - c.cache.Store(channelDialogCacheKey{userID: dialog.UserID, channelID: dialog.ChannelID}, dialog) + c.cache.Store(channelDialogCacheKey{userID: dialog.UserID, channelID: dialog.ChannelID}, channelDialogCacheEntry{dialog: dialog}) } // cacheEpoch 在「列表暖写回」前快照 epoch；配合 putIfEpoch 堵住 warm-vs-invalidation @@ -67,7 +96,30 @@ func (c *ChannelDialogCache) putIfEpoch(dialog domain.ChannelDialog, loadEpoch u if c == nil || dialog.UserID == 0 || dialog.ChannelID == 0 { return } - c.cache.StoreIfEpoch(channelDialogCacheKey{userID: dialog.UserID, channelID: dialog.ChannelID}, dialog, loadEpoch) + c.cache.StoreIfEpoch(channelDialogCacheKey{userID: dialog.UserID, channelID: dialog.ChannelID}, channelDialogCacheEntry{dialog: dialog}, loadEpoch) +} + +func (c *ChannelDialogCache) putListProjectionIfEpoch( + dialog domain.ChannelDialog, + topMentioned bool, + topMediaUnread bool, + topUnreadProjected bool, + loadEpoch uint64, +) { + if c == nil || dialog.UserID == 0 || dialog.ChannelID == 0 { + return + } + c.cache.StoreIfEpoch( + channelDialogCacheKey{userID: dialog.UserID, channelID: dialog.ChannelID}, + channelDialogCacheEntry{ + dialog: dialog, + listVisible: true, + topMentioned: topMentioned, + topMediaUnread: topMediaUnread, + topUnreadProjected: topUnreadProjected, + }, + loadEpoch, + ) } func (c *ChannelDialogCache) delete(userID, channelID int64) { @@ -81,7 +133,14 @@ func (c *ChannelDialogCache) deleteChannel(channelID int64) { if c == nil || channelID == 0 { return } - c.cache.InvalidateWhere(func(k channelDialogCacheKey) bool { return k.channelID == channelID }) + c.indexMu.Lock() + indexed := c.channelKeys[channelID] + keys := make([]channelDialogCacheKey, 0, len(indexed)) + for key := range indexed { + keys = append(keys, key) + } + c.indexMu.Unlock() + c.cache.Invalidate(keys...) } func (c *ChannelDialogCache) flush() { @@ -89,12 +148,36 @@ func (c *ChannelDialogCache) flush() { return } c.cache.Flush() + c.indexMu.Lock() + c.channelKeys = make(map[int64]map[channelDialogCacheKey]struct{}) + c.indexMu.Unlock() } -func cloneChannelDialog(dialog domain.ChannelDialog) domain.ChannelDialog { - if dialog.DefaultSendAs != nil { - peer := *dialog.DefaultSendAs - dialog.DefaultSendAs = &peer +func (c *ChannelDialogCache) indexEntry(key channelDialogCacheKey, _ channelDialogCacheEntry) { + c.indexMu.Lock() + keys := c.channelKeys[key.channelID] + if keys == nil { + keys = make(map[channelDialogCacheKey]struct{}) + c.channelKeys[key.channelID] = keys } - return dialog + keys[key] = struct{}{} + c.indexMu.Unlock() +} + +func (c *ChannelDialogCache) unindexEntry(key channelDialogCacheKey, _ channelDialogCacheEntry) { + c.indexMu.Lock() + keys := c.channelKeys[key.channelID] + delete(keys, key) + if len(keys) == 0 { + delete(c.channelKeys, key.channelID) + } + c.indexMu.Unlock() +} + +func cloneChannelDialogCacheEntry(entry channelDialogCacheEntry) channelDialogCacheEntry { + if entry.dialog.DefaultSendAs != nil { + peer := *entry.dialog.DefaultSendAs + entry.dialog.DefaultSendAs = &peer + } + return entry } diff --git a/internal/store/postgres/channel_dialog_cache_test.go b/internal/store/postgres/channel_dialog_cache_test.go index d61aac74..eb69adf5 100644 --- a/internal/store/postgres/channel_dialog_cache_test.go +++ b/internal/store/postgres/channel_dialog_cache_test.go @@ -67,6 +67,26 @@ func TestChannelDialogCachePutGetDeleteFlushAndClone(t *testing.T) { } } +func TestChannelDialogCacheSeparatesAuthoritativeListProjection(t *testing.T) { + c := NewChannelDialogCache(16) + dialog := domain.ChannelDialog{UserID: 10, ChannelID: 20, TopMessageID: 9} + c.put(dialog) + if _, ok := c.getListProjection(10, 20); ok { + t.Fatal("single-channel cache entry without active-list proof must not enter getDialogs") + } + epoch := c.cacheEpoch() + c.putListProjectionIfEpoch(dialog, true, true, true, epoch) + entry, ok := c.getListProjection(10, 20) + if !ok || !entry.listVisible || !entry.topMentioned || !entry.topMediaUnread || !entry.topUnreadProjected { + t.Fatalf("list projection = %+v,%v", entry, ok) + } + entry.dialog.TopMessageID = 99 + again, ok := c.getListProjection(10, 20) + if !ok || again.dialog.TopMessageID != 9 { + t.Fatalf("list projection clone isolation = %+v,%v", again, ok) + } +} + func TestChannelDialogCacheDeleteChannelAndCap(t *testing.T) { c := NewChannelDialogCache(2) c.put(domain.ChannelDialog{UserID: 1, ChannelID: 10, TopMessageID: 1}) diff --git a/internal/store/postgres/channel_dialog_integration_test.go b/internal/store/postgres/channel_dialog_integration_test.go index f3e5cc75..c3b100e6 100644 --- a/internal/store/postgres/channel_dialog_integration_test.go +++ b/internal/store/postgres/channel_dialog_integration_test.go @@ -96,7 +96,8 @@ func TestChannelStoreListDialogsWarmsDialogCache(t *testing.T) { }) cache := NewChannelDialogCache(16) - channels := NewChannelStore(pool, WithChannelDialogCache(cache)) + memberCache := NewChannelMemberCache(16) + channels := NewChannelStore(pool, WithChannelDialogCache(cache), WithChannelMemberCache(memberCache)) created, err := channels.CreateChannel(ctx, domain.CreateChannelRequest{ CreatorUserID: owner.ID, Title: "Dialog Warm " + suffix, @@ -127,6 +128,80 @@ func TestChannelStoreListDialogsWarmsDialogCache(t *testing.T) { } } +func TestChannelStoreMaterializedSnapshotWarmsExactDialogCache(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + suffix := randomSuffix(t) + + users := NewUserStore(pool) + owner, err := users.Create(ctx, domain.User{ + AccessHash: 37, + Phone: "+1777" + suffix + "14", + FirstName: "SnapshotWarmOwner", + }) + if err != nil { + t.Fatalf("create owner: %v", err) + } + var channelID int64 + t.Cleanup(func() { + if channelID != 0 { + _, _ = pool.Exec(ctx, "DELETE FROM channels WHERE id = $1", channelID) + } + _, _ = pool.Exec(ctx, "DELETE FROM users WHERE id = $1", owner.ID) + }) + + cache := NewChannelDialogCache(16) + memberCache := NewChannelMemberCache(16) + channels := NewChannelStore(pool, WithChannelDialogCache(cache), WithChannelMemberCache(memberCache)) + created, err := channels.CreateChannel(ctx, domain.CreateChannelRequest{ + CreatorUserID: owner.ID, + Title: "Snapshot Warm " + suffix, + Megagroup: true, + Date: 1700000326, + }) + if err != nil { + t.Fatalf("create channel: %v", err) + } + channelID = created.Channel.ID + if _, err := pool.Exec(ctx, ` +UPDATE channel_dialogs +SET default_send_as_peer_type = 'channel', default_send_as_peer_id = $2 +WHERE user_id = $1 AND channel_id = $2`, owner.ID, channelID); err != nil { + t.Fatalf("seed default send as: %v", err) + } + + ownerSnapshot, err := channels.ListAllBuiltinChannelDialogSnapshot(ctx, owner.ID) + if err != nil { + t.Fatalf("list materialized owner snapshot: %v", err) + } + if len(ownerSnapshot.Dialogs) != 1 || ownerSnapshot.Dialogs[0].DefaultSendAs == nil || + ownerSnapshot.Dialogs[0].DefaultSendAs.Type != domain.PeerTypeChannel || + ownerSnapshot.Dialogs[0].DefaultSendAs.ID != channelID || + ownerSnapshot.Dialogs[0].ChannelMember == nil || + ownerSnapshot.Dialogs[0].ChannelMember.UserID != owner.ID || + ownerSnapshot.Dialogs[0].ChannelMember.ChannelID != channelID || + ownerSnapshot.Dialogs[0].ChannelMember.Status != domain.ChannelMemberActive { + t.Fatalf("owner snapshot default send as = %+v", ownerSnapshot.Dialogs) + } + if _, ok := cache.get(owner.ID, channelID); ok { + t.Fatal("owner snapshot scan alone must not warm cache before shared hydration") + } + if _, err := channels.HydrateChannelDialogSnapshot(ctx, owner.ID, ownerSnapshot.Dialogs); err != nil { + t.Fatalf("hydrate materialized owner snapshot: %v", err) + } + cached, ok := cache.get(owner.ID, channelID) + if !ok || cached.TopMessageID != ownerSnapshot.Dialogs[0].TopMessage || + cached.DefaultSendAs == nil || cached.DefaultSendAs.Type != domain.PeerTypeChannel || + cached.DefaultSendAs.ID != channelID { + t.Fatalf("exact warmed dialog = %+v ok=%v", cached, ok) + } + warmedMember, ok := memberCache.get(channelID, owner.ID) + if !ok || warmedMember.ChannelID != channelID || warmedMember.UserID != owner.ID || + warmedMember.Status != domain.ChannelMemberActive || warmedMember.Role != domain.ChannelRoleCreator { + t.Fatalf("exact warmed member = %+v ok=%v", warmedMember, ok) + } +} + func TestChannelStoreListDialogsScansChannelWallpaper(t *testing.T) { pool := testPool(t) ctx := context.Background() @@ -315,6 +390,18 @@ FROM unnest($1::bigint[]) AS t(id)`, ids, owner.ID); err != nil { } channels := NewChannelStore(pool) + headers, err := channels.ListChannelDialogSnapshotHeaders(ctx, owner.ID, domain.DialogFilter{}) + if err != nil { + t.Fatalf("list channel dialog snapshot headers: %v", err) + } + if len(headers.Dialogs) != count || headers.Count != count || len(headers.Messages) != 0 || len(headers.Channels) != 0 { + t.Fatalf("snapshot headers dialogs=%d count=%d messages=%d channels=%d, want %d lightweight headers", + len(headers.Dialogs), headers.Count, len(headers.Messages), len(headers.Channels), count) + } + if headers.Dialogs[0].Peer.ID != ids[len(ids)-1] || headers.Dialogs[len(headers.Dialogs)-1].Peer.ID != ids[0] { + t.Fatalf("snapshot header bounds = %d..%d, want %d..%d", + headers.Dialogs[0].Peer.ID, headers.Dialogs[len(headers.Dialogs)-1].Peer.ID, ids[len(ids)-1], ids[0]) + } var cursor domain.Dialog var sixth domain.ChannelDialogList for page := 0; page < 6; page++ { @@ -332,6 +419,9 @@ FROM unnest($1::bigint[]) AS t(id)`, ids, owner.ID); err != nil { if len(got.Dialogs) == 0 { t.Fatalf("page %d unexpectedly empty after cursor %+v", page+1, cursor) } + if page < 5 && got.Count <= len(got.Dialogs) { + t.Fatalf("page %d count = %d dialogs = %d, want bounded has-more signal", page+1, got.Count, len(got.Dialogs)) + } cursor = got.Dialogs[len(got.Dialogs)-1] if page == 5 { sixth = got @@ -423,4 +513,31 @@ VALUES ($1, $2, $3, 1, 1700000500)`, owner.ID, archivedID, domain.DialogArchiveF if len(archive.Dialogs) != 1 || archive.Dialogs[0].Peer.ID != archivedID { t.Fatalf("archive dialogs = %+v, want archived channel beyond first query window", archive.Dialogs) } + archiveHeaders, err := NewChannelStore(pool).ListChannelDialogSnapshotHeaders(ctx, owner.ID, domain.DialogFilter{ + HasFolderID: true, + FolderID: domain.DialogArchiveFolderID, + }) + if err != nil { + t.Fatalf("list archive channel snapshot headers: %v", err) + } + if len(archiveHeaders.Dialogs) != 1 || archiveHeaders.Dialogs[0].Peer.ID != archivedID { + t.Fatalf("archive snapshot headers = %+v, want archived channel", archiveHeaders.Dialogs) + } + allHeaders, err := NewChannelStore(pool).ListAllBuiltinChannelDialogSnapshot(ctx, owner.ID) + if err != nil { + t.Fatalf("list all built-in channel snapshot headers: %v", err) + } + if len(allHeaders.Dialogs) != count { + t.Fatalf("all built-in snapshot headers = %d, want %d", len(allHeaders.Dialogs), count) + } + foundArchived := false + for _, dialog := range allHeaders.Dialogs { + if dialog.Peer.ID == archivedID { + foundArchived = dialog.FolderID == domain.DialogArchiveFolderID + break + } + } + if !foundArchived { + t.Fatalf("all built-in snapshot did not retain archived channel %d", archivedID) + } } diff --git a/internal/store/postgres/channel_dialog_mention_integration_test.go b/internal/store/postgres/channel_dialog_mention_integration_test.go index e2f052a8..7b8a2e49 100644 --- a/internal/store/postgres/channel_dialog_mention_integration_test.go +++ b/internal/store/postgres/channel_dialog_mention_integration_test.go @@ -29,7 +29,7 @@ func TestChannelDialogTopMessageCarriesMentionFlags(t *testing.T) { _, _ = pool.Exec(ctx, "DELETE FROM users WHERE id = ANY($1::bigint[])", []int64{owner.ID, member.ID}) }) - channels := NewChannelStore(pool) + channels := NewChannelStore(pool, WithChannelTopMessageCache(NewChannelTopMessageCache(32))) created, err := channels.CreateChannel(ctx, domain.CreateChannelRequest{ CreatorUserID: owner.ID, Title: "MentionDialog " + suffix, diff --git a/internal/store/postgres/channel_dialogs.go b/internal/store/postgres/channel_dialogs.go index 413eb2a9..025b7439 100644 --- a/internal/store/postgres/channel_dialogs.go +++ b/internal/store/postgres/channel_dialogs.go @@ -3,6 +3,7 @@ package postgres import ( "context" "database/sql" + "encoding/json" "errors" "fmt" "github.com/jackc/pgx/v5" @@ -13,9 +14,13 @@ import ( ) type channelDialogListItem struct { - channel domain.Channel - dialog domain.Dialog - defaultSendAs *domain.Peer + channel domain.Channel + dialog domain.Dialog + defaultSendAs *domain.Peer + topMentioned bool + topMediaUnread bool + topUnreadProjected bool + listCacheable bool } func channelDialogVisibleTopIDSQL() string { @@ -39,6 +44,10 @@ END` } func (s *ChannelStore) ListChannelDialogs(ctx context.Context, viewerUserID int64, filter domain.DialogFilter) (domain.ChannelDialogList, error) { + return s.listChannelDialogs(ctx, viewerUserID, filter) +} + +func (s *ChannelStore) listChannelDialogs(ctx context.Context, viewerUserID int64, filter domain.DialogFilter) (domain.ChannelDialogList, error) { if viewerUserID == 0 { return domain.ChannelDialogList{}, nil } @@ -59,6 +68,21 @@ func (s *ChannelStore) ListChannelDialogs(ctx context.Context, viewerUserID int6 visibleUnreadCount := channelDialogVisibleUnreadCountSQL(visibleReadInbox, visibleTopID) args := []any{viewerUserID, channelIDs} where := []string{"m.user_id = $1", "m.channel_id = ANY($2::bigint[])", "m.status = 'active'"} + from := `FROM channel_members m +JOIN channels c ON c.id = m.channel_id AND c.id = ANY($2::bigint[]) AND NOT c.deleted +LEFT JOIN channel_messages top_msg ON top_msg.channel_id = m.channel_id AND top_msg.channel_id = ANY($2::bigint[]) AND top_msg.id = c.top_message_id AND NOT top_msg.deleted +LEFT JOIN channel_dialogs d ON d.user_id = m.user_id AND d.channel_id = m.channel_id` + // archive 与 pinned 集合必然有显式 channel_dialogs 行。以该 owner 索引为入口， + // 避免 archive summary(limit=1) 和 getPinnedDialogs 为一个通常为空/很小的集合 + // 仍扫描账号全部 active memberships。保留 $2 的 typed no-op，后续动态条件的 + // placeholder 编号无需分叉；monoforum 仍在主查询后按原权限路径合并。 + if (filter.HasFolderID && filter.FolderID == domain.DialogArchiveFolderID) || filter.PinnedOnly { + from = `FROM channel_dialogs d +JOIN channel_members m ON m.user_id = d.user_id AND m.channel_id = d.channel_id AND m.status = 'active' +JOIN channels c ON c.id = d.channel_id AND NOT c.deleted +LEFT JOIN channel_messages top_msg ON top_msg.channel_id = d.channel_id AND top_msg.id = c.top_message_id AND NOT top_msg.deleted` + where = []string{"d.user_id = $1", "cardinality($2::bigint[]) >= 0"} + } if filter.HasFolderID && filter.FolderID < domain.DialogCustomFolderMinID { args = append(args, filter.FolderID) where = append(where, fmt.Sprintf("COALESCE(d.folder_id, 0) = $%d", len(args))) @@ -138,7 +162,13 @@ func (s *ChannelStore) ListChannelDialogs(ctx context.Context, viewerUserID int6 where = append(where, "false") } } - args = append(args, channelDialogQueryLimit) + // 只多取一行作为 has-more 证据。旧实现无视 RPC limit 固定读取 500 个完整 + // channel + viewer dialog，并对每行动态派生 unread；getDialogs(limit=100) + // 因而最多水合 5 倍对象，archive summary(limit=1) 最坏放大 500 倍。 + // 所有 folder/offset 条件已经在 SQL LIMIT 前完成，monoforum 结果也会在下方 + // 合并排序，所以每个来源取 limit+1 足以构造正确的合并页和继续分页信号。 + queryLimit := limit + 1 + args = append(args, queryLimit) limitArg := fmt.Sprintf("$%d", len(args)) // 暖写回的 epoch 守卫:在加载前快照,写回时若期间收到失效(epoch 变更)则拒绝陈旧投影, // 避免 scan→put 窗口内的并发失效被裸 Store 覆盖回(@角标/未读 lost-update)。 @@ -162,10 +192,7 @@ SELECT `+channelColumns+`, d.default_send_as_peer_id, m.history_clear_anchor_id, m.history_clear_anchor_date -FROM channel_members m -JOIN channels c ON c.id = m.channel_id AND c.id = ANY($2::bigint[]) AND NOT c.deleted -LEFT JOIN channel_messages top_msg ON top_msg.channel_id = m.channel_id AND top_msg.channel_id = ANY($2::bigint[]) AND top_msg.id = c.top_message_id AND NOT top_msg.deleted -LEFT JOIN channel_dialogs d ON d.user_id = m.user_id AND d.channel_id = m.channel_id + `+from+` WHERE `+strings.Join(where, " AND ")+` ORDER BY COALESCE(d.pinned, false) DESC, COALESCE(d.pinned_order, 0) DESC, @@ -243,7 +270,7 @@ LIMIT `+limitArg, args...) // default_send_as，否则 getFullChannel/getSendAs 命中暖缓存会丢失「以频道发言」默认值。 cd := channelDialogFromDialog(viewerUserID, item.dialog) cd.DefaultSendAs = item.defaultSendAs - s.dialogCache.putIfEpoch(cd, dialogCacheEpoch) + s.dialogCache.putListProjectionIfEpoch(cd, false, false, false, dialogCacheEpoch) } out.Dialogs = append(out.Dialogs, item.dialog) out.Channels = append(out.Channels, item.channel) @@ -251,13 +278,308 @@ LIMIT `+limitArg, args...) // getDialogs 的 top message 必须按 viewer 补 mentioned/media_unread 与 // reactions：TDesktop 把它先入缓存且不被后续 difference/getHistory 的 // 完整版覆盖，缺标志会让客户端永不上报 contents-read，@ 角标重启回潮。 - if err := s.populateChannelMessagesReactions(ctx, s.db, viewerUserID, out.Channels, out.Messages); err != nil { + if err := s.populateChannelDialogTopMessageReactions(ctx, s.db, viewerUserID, out.Channels, out.Messages, false); err != nil { return domain.ChannelDialogList{}, err } projectChannelDialogHistoryClearMessages(out.Dialogs, out.Messages) return out, nil } +// ListChannelDialogSnapshotHeaders builds the bounded owner-specific ordering +// index used by app pagination. It intentionally excludes channel metadata and +// top-message payloads; those are hydrated per page through versioned peer read +// models, so one owner snapshot remains lightweight and shared channel facts do +// not get duplicated for every online account. +func (s *ChannelStore) ListChannelDialogSnapshotHeaders(ctx context.Context, viewerUserID int64, filter domain.DialogFilter) (domain.ChannelDialogList, error) { + if viewerUserID == 0 { + return domain.ChannelDialogList{}, nil + } + if filter.Folder != nil || (filter.HasFolderID && filter.FolderID >= domain.DialogCustomFolderMinID) || + filter.OffsetDate != 0 || filter.OffsetID != 0 || filter.HasOffsetPeer { + return domain.ChannelDialogList{}, errors.New("channel dialog snapshot headers require an offset-free built-in folder") + } + channelIDs, hasBroadcastAdmin, err := s.listActiveChannelDialogCandidateIDs(ctx, viewerUserID, false) + if err != nil { + return domain.ChannelDialogList{}, err + } + if len(channelIDs) == 0 { + return domain.ChannelDialogList{}, nil + } + visibleTopID := channelDialogVisibleTopIDSQL() + visibleTopDate := channelDialogVisibleTopDateSQL("COALESCE(top_msg.message_date, d.top_message_date, c.date)", "0") + args := []any{viewerUserID} + where := []string{"i.user_id = $1", "i.status = 'active'", "NOT i.deleted", "m.status = 'active'"} + from := `FROM user_channel_member_index i +JOIN channel_members m ON m.user_id = i.user_id AND m.channel_id = i.channel_id +JOIN channels c ON c.id = i.channel_id AND NOT c.deleted +LEFT JOIN channel_messages top_msg ON top_msg.channel_id = i.channel_id AND top_msg.id = c.top_message_id AND NOT top_msg.deleted +LEFT JOIN channel_dialogs d ON d.user_id = m.user_id AND d.channel_id = m.channel_id` + if (filter.HasFolderID && filter.FolderID == domain.DialogArchiveFolderID) || filter.PinnedOnly { + from = `FROM channel_dialogs d +JOIN user_channel_member_index i ON i.user_id = d.user_id AND i.channel_id = d.channel_id +JOIN channel_members m ON m.user_id = i.user_id AND m.channel_id = i.channel_id +JOIN channels c ON c.id = d.channel_id AND NOT c.deleted +LEFT JOIN channel_messages top_msg ON top_msg.channel_id = d.channel_id AND top_msg.id = c.top_message_id AND NOT top_msg.deleted` + where = []string{"d.user_id = $1", "i.status = 'active'", "NOT i.deleted", "m.status = 'active'"} + } + if filter.HasFolderID { + args = append(args, filter.FolderID) + where = append(where, fmt.Sprintf("COALESCE(d.folder_id, 0) = $%d", len(args))) + } else { + where = append(where, "COALESCE(d.folder_id, 0) = 0") + } + if filter.PinnedOnly { + where = append(where, "COALESCE(d.pinned, false)") + } + if filter.ExcludePinned { + where = append(where, "NOT COALESCE(d.pinned, false)") + } + args = append(args, channelDialogCandidateLimit) + rows, err := s.db.Query(ctx, ` +WITH dependency_peers AS MATERIALIZED ( + SELECT i.channel_id AS id + FROM user_channel_member_index i + WHERE i.user_id = $1 + AND i.status = 'active' + AND NOT i.deleted + UNION + SELECT parent.linked_monoforum_id + FROM user_channel_member_index i + JOIN channels parent ON parent.id = i.channel_id + WHERE i.user_id = $1 + AND i.status = 'active' + AND NOT i.deleted + AND parent.linked_monoforum_id <> 0 +), +dependency AS MATERIALIZED ( + SELECT COALESCE(bit_xor(v.hash), 0)::bigint AS hash + FROM read_model_versions v + JOIN dependency_peers peer ON peer.id = v.peer_id + WHERE v.peer_type = 'channel' + AND ( + (v.model = 'channel_base' AND v.owner_user_id = 0) + OR + (v.model IN ('channel_member', 'dialog_light') AND v.owner_user_id = $1) + ) +) +SELECT c.id, + `+visibleTopID+`, + `+visibleTopDate+`, + COALESCE(d.folder_id, 0), + COALESCE(d.pinned, false), + COALESCE(d.pinned_order, 0), + dependency.hash +`+from+` +CROSS JOIN dependency +WHERE `+strings.Join(where, " AND ")+` +ORDER BY COALESCE(d.pinned, false) DESC, + COALESCE(d.pinned_order, 0) DESC, + `+visibleTopDate+` DESC, + `+visibleTopID+` DESC, + c.id DESC +LIMIT $`+fmt.Sprint(len(args)), args...) + if err != nil { + return domain.ChannelDialogList{}, fmt.Errorf("list channel dialog snapshot headers: %w", err) + } + defer rows.Close() + dialogs := make([]domain.Dialog, 0, minInt(len(channelIDs), 1024)) + seenChannels := make(map[int64]struct{}, len(channelIDs)) + var dependencyHash int64 + for rows.Next() { + var dialog domain.Dialog + var channelID int64 + if err := rows.Scan( + &channelID, + &dialog.TopMessage, + &dialog.TopMessageDate, + &dialog.FolderID, + &dialog.Pinned, + &dialog.PinnedOrder, + &dependencyHash, + ); err != nil { + return domain.ChannelDialogList{}, err + } + dialog.Peer = domain.Peer{Type: domain.PeerTypeChannel, ID: channelID} + dialogs = append(dialogs, dialog) + seenChannels[channelID] = struct{}{} + } + if err := rows.Err(); err != nil { + return domain.ChannelDialogList{}, err + } + if hasBroadcastAdmin { + items, err := s.listMonoforumAdminDialogItems(ctx, viewerUserID, channelIDs, filter, seenChannels) + if err != nil { + return domain.ChannelDialogList{}, err + } + for _, item := range items { + dialogs = append(dialogs, item.dialog) + } + } + if len(dialogs) > channelDialogCandidateLimit { + return domain.ChannelDialogList{}, fmt.Errorf("channel dialog snapshot exceeds %d entries", channelDialogCandidateLimit) + } + sort.SliceStable(dialogs, func(i, j int) bool { + if dialogs[i].Pinned != dialogs[j].Pinned { + return dialogs[i].Pinned + } + if dialogs[i].PinnedOrder != dialogs[j].PinnedOrder { + return dialogs[i].PinnedOrder > dialogs[j].PinnedOrder + } + if dialogs[i].TopMessageDate != dialogs[j].TopMessageDate { + return dialogs[i].TopMessageDate > dialogs[j].TopMessageDate + } + if dialogs[i].TopMessage != dialogs[j].TopMessage { + return dialogs[i].TopMessage > dialogs[j].TopMessage + } + return dialogs[i].Peer.ID > dialogs[j].Peer.ID + }) + return domain.ChannelDialogList{ + Dialogs: dialogs, + Count: len(dialogs), + Hash: mixDialogListDependencyHash(dialogListHash(dialogs), dependencyHash), + }, nil +} + +// ListAllBuiltinChannelDialogSnapshot loads every owner-varying dialog fact +// needed to derive main/archive/pinned pages in one bounded scan. Shared +// channel rows and top-message payloads remain channel-keyed response overlays. +func (s *ChannelStore) ListAllBuiltinChannelDialogSnapshot(ctx context.Context, viewerUserID int64) (domain.ChannelDialogList, error) { + if viewerUserID == 0 { + return domain.ChannelDialogList{}, nil + } + visibleTopID := channelDialogVisibleTopIDSQL() + visibleTopDate := channelDialogVisibleTopDateSQL("COALESCE(top_msg.message_date, d.top_message_date, c.date)", "0") + visibleReadInbox := "GREATEST(COALESCE(d.read_inbox_max_id, 0), m.read_inbox_max_id)" + visibleUnreadCount := channelDialogVisibleUnreadCountSQL(visibleReadInbox, visibleTopID) + rows, err := s.db.Query(ctx, ` +SELECT c.id, + `+visibleTopID+`, + `+visibleTopDate+`, + COALESCE(d.folder_id, 0), + `+visibleReadInbox+`, + LEAST(GREATEST(c.top_message_id, 0), GREATEST(COALESCE(d.read_outbox_max_id, 0), m.read_outbox_max_id, CASE WHEN c.read_inbox_top1_user_id = m.user_id THEN c.read_inbox_top2 ELSE c.read_inbox_top1 END)), + `+visibleUnreadCount+`, + COALESCE(d.pinned, false), + COALESCE(d.pinned_order, 0), + COALESCE(d.unread_mark, m.unread_mark), + COALESCE(d.unread_mentions_count, 0), + COALESCE(d.unread_reactions_count, 0), + COALESCE(d.view_forum_as_messages, false), + COALESCE(d.has_scheduled, false), + d.default_send_as_peer_type, + d.default_send_as_peer_id, + m.history_clear_anchor_id, + m.history_clear_anchor_date, + top_unread.message_id IS NOT NULL, + COALESCE(top_unread.unread, false), + m.user_id, + m.inviter_user_id, + m.role, + m.status, + m.joined_at, + m.left_at, + m.admin_rights::text, + m.banned_rights::text, + m.rank, + m.available_min_id, + m.available_min_pts, + m.read_inbox_max_id, + m.read_outbox_max_id, + m.unread_mark, + m.slowmode_last_send_date, + bool_or(i.broadcast AND i.role IN ('creator', 'admin')) OVER () +FROM user_channel_member_index AS i +JOIN channel_members AS m + ON m.user_id = i.user_id + AND m.channel_id = i.channel_id + AND m.status = 'active' +JOIN channels AS c + ON c.id = i.channel_id + AND NOT c.deleted +LEFT JOIN channel_messages AS top_msg + ON top_msg.channel_id = i.channel_id + AND top_msg.id = c.top_message_id + AND NOT top_msg.deleted +LEFT JOIN channel_dialogs AS d + ON d.user_id = i.user_id + AND d.channel_id = i.channel_id +LEFT JOIN channel_unread_mentions AS top_unread + ON top_unread.user_id = i.user_id + AND top_unread.channel_id = i.channel_id + AND top_unread.message_id = `+visibleTopID+` +WHERE i.user_id = $1 + AND i.status = 'active' + AND NOT i.deleted + AND COALESCE(d.folder_id, 0) IN (0, 1) +ORDER BY COALESCE(d.pinned, false) DESC, + COALESCE(d.pinned_order, 0) DESC, + `+visibleTopDate+` DESC, + `+visibleTopID+` DESC, + c.id DESC +LIMIT $2`, viewerUserID, channelDialogCandidateLimit+1) + if err != nil { + return domain.ChannelDialogList{}, fmt.Errorf("list all built-in channel dialog snapshot: %w", err) + } + defer rows.Close() + dialogs := make([]domain.Dialog, 0, 128) + parentChannelIDs := make([]int64, 0, 128) + seenChannels := make(map[int64]struct{}, 128) + hasBroadcastAdmin := false + for rows.Next() { + var values channelDialogProjectionValues + var rowHasBroadcastAdmin bool + destinations := append(values.scanDestinations(), &rowHasBroadcastAdmin) + if err := rows.Scan(destinations...); err != nil { + return domain.ChannelDialogList{}, fmt.Errorf("scan all built-in channel dialog snapshot: %w", err) + } + channelID, dialog, defaultSendAs, _, _ := values.result() + dialog.DefaultSendAs = defaultSendAs + dialogs = append(dialogs, dialog) + parentChannelIDs = append(parentChannelIDs, channelID) + seenChannels[channelID] = struct{}{} + hasBroadcastAdmin = hasBroadcastAdmin || rowHasBroadcastAdmin + } + if err := rows.Err(); err != nil { + return domain.ChannelDialogList{}, fmt.Errorf("list all built-in channel dialog snapshot rows: %w", err) + } + if len(dialogs) > channelDialogCandidateLimit { + return domain.ChannelDialogList{}, fmt.Errorf("channel dialog snapshot exceeds %d entries", channelDialogCandidateLimit) + } + if hasBroadcastAdmin { + items, err := s.listMonoforumAdminDialogItems( + ctx, viewerUserID, parentChannelIDs, domain.DialogFilter{}, seenChannels, + ) + if err != nil { + return domain.ChannelDialogList{}, err + } + for _, item := range items { + if item.dialog.FolderID == domain.DialogMainFolderID || item.dialog.FolderID == domain.DialogArchiveFolderID { + item.dialog.DefaultSendAs = item.defaultSendAs + dialogs = append(dialogs, item.dialog) + } + } + } + if len(dialogs) > channelDialogCandidateLimit { + return domain.ChannelDialogList{}, fmt.Errorf("channel dialog snapshot exceeds %d entries", channelDialogCandidateLimit) + } + sort.SliceStable(dialogs, func(i, j int) bool { + if dialogs[i].Pinned != dialogs[j].Pinned { + return dialogs[i].Pinned + } + if dialogs[i].PinnedOrder != dialogs[j].PinnedOrder { + return dialogs[i].PinnedOrder > dialogs[j].PinnedOrder + } + if dialogs[i].TopMessageDate != dialogs[j].TopMessageDate { + return dialogs[i].TopMessageDate > dialogs[j].TopMessageDate + } + if dialogs[i].TopMessage != dialogs[j].TopMessage { + return dialogs[i].TopMessage > dialogs[j].TopMessage + } + return dialogs[i].Peer.ID > dialogs[j].Peer.ID + }) + return domain.ChannelDialogList{Dialogs: dialogs, Count: len(dialogs)}, nil +} + func (s *ChannelStore) listMonoforumAdminDialogItems(ctx context.Context, viewerUserID int64, parentChannelIDs []int64, filter domain.DialogFilter, seen map[int64]struct{}) ([]channelDialogListItem, error) { if viewerUserID == 0 || len(parentChannelIDs) == 0 { return nil, nil @@ -331,7 +653,7 @@ type channelMessageLookupKey struct { func (s *ChannelStore) channelDialogTopMessages(ctx context.Context, db sqlcgen.DBTX, dialogs []domain.Dialog) (map[channelMessageLookupKey]domain.ChannelMessage, error) { seen := make(map[channelMessageLookupKey]struct{}, len(dialogs)) - idsByChannel := make(map[int64][]int, len(dialogs)) + keys := make([]channelMessageLookupKey, 0, len(dialogs)) for _, dialog := range dialogs { if dialog.Peer.Type != domain.PeerTypeChannel || dialog.Peer.ID == 0 || dialog.TopMessage <= 0 { continue @@ -341,10 +663,55 @@ func (s *ChannelStore) channelDialogTopMessages(ctx context.Context, db sqlcgen. continue } seen[key] = struct{}{} - idsByChannel[dialog.Peer.ID] = append(idsByChannel[dialog.Peer.ID], dialog.TopMessage) + keys = append(keys, key) + } + if len(keys) == 0 { + return nil, nil + } + load := func(ctx context.Context, missing []channelMessageLookupKey) (map[channelMessageLookupKey]domain.ChannelMessage, error) { + return loadChannelDialogTopMessages(ctx, db, missing) + } + var ( + out map[channelMessageLookupKey]domain.ChannelMessage + err error + ) + if s.topMessageCacheActive(db) { + out, err = s.topMsgCache.getOrLoadBatch(ctx, keys, load) + } else { + out, err = load(ctx, keys) + } + if err != nil { + return nil, err + } + // History-clear anchors are owner-local projections and must never enter + // the shared cache. Apply them to the cloned result after cache hydration. + for _, dialog := range dialogs { + if dialog.Peer.Type != domain.PeerTypeChannel || + dialog.TopMessage <= 0 || + dialog.TopMessage != dialog.HistoryClearAnchorID { + continue + } + key := channelMessageLookupKey{channelID: dialog.Peer.ID, id: dialog.TopMessage} + out[key] = domain.ProjectChannelHistoryClearMessage( + out[key], + dialog.Peer.ID, + dialog.HistoryClearAnchorID, + dialog.HistoryClearAnchorDate, + ) + } + return out, nil +} + +func loadChannelDialogTopMessages(ctx context.Context, db sqlcgen.DBTX, keys []channelMessageLookupKey) (map[channelMessageLookupKey]domain.ChannelMessage, error) { + idsByChannel := make(map[int64][]int, len(keys)) + for _, key := range keys { + if key.channelID == 0 || key.id <= 0 { + continue + } + idsByChannel[key.channelID] = append(idsByChannel[key.channelID], key.id) } if len(idsByChannel) == 0 { - return nil, nil + return map[channelMessageLookupKey]domain.ChannelMessage{}, nil } channelIDs := make([]int64, 0, len(idsByChannel)) for channelID := range idsByChannel { @@ -371,7 +738,7 @@ WHERE `+where.String(), args...) return nil, fmt.Errorf("list channel dialog top messages: %w", err) } defer rows.Close() - out := make(map[channelMessageLookupKey]domain.ChannelMessage, len(seen)) + out := make(map[channelMessageLookupKey]domain.ChannelMessage, len(keys)) for rows.Next() { msg, err := scanChannelMessage(rows) if err != nil { @@ -382,25 +749,14 @@ WHERE `+where.String(), args...) if err := rows.Err(); err != nil { return nil, fmt.Errorf("scan channel dialog top messages: %w", err) } - for _, dialog := range dialogs { - if dialog.Peer.Type != domain.PeerTypeChannel || - dialog.TopMessage <= 0 || - dialog.TopMessage != dialog.HistoryClearAnchorID { - continue - } - key := channelMessageLookupKey{channelID: dialog.Peer.ID, id: dialog.TopMessage} - out[key] = domain.ProjectChannelHistoryClearMessage( - out[key], - dialog.Peer.ID, - dialog.HistoryClearAnchorID, - dialog.HistoryClearAnchorDate, - ) - } return out, nil } func (s *ChannelStore) GetChannelDialogs(ctx context.Context, viewerUserID int64, channelIDs []int64) (domain.ChannelDialogList, error) { - out := domain.ChannelDialogList{} + if viewerUserID == 0 || len(channelIDs) == 0 { + return domain.ChannelDialogList{}, nil + } + orderedIDs := make([]int64, 0, len(channelIDs)) seen := make(map[int64]struct{}, len(channelIDs)) for _, channelID := range channelIDs { if channelID == 0 { @@ -410,6 +766,79 @@ func (s *ChannelStore) GetChannelDialogs(ctx context.Context, viewerUserID int64 continue } seen[channelID] = struct{}{} + orderedIDs = append(orderedIDs, channelID) + } + if len(orderedIDs) == 0 { + return domain.ChannelDialogList{}, nil + } + itemsByID := make(map[int64]channelDialogListItem, len(orderedIDs)) + loadedIDs := make([]int64, 0, len(orderedIDs)) + misses := make([]int64, 0, len(orderedIDs)) + dialogCacheActive := s.dialogCacheActive(s.db) + memberCacheActive := s.memberCacheActive(s.db) + var dialogCacheEpoch uint64 + var memberCacheEpoch uint64 + if dialogCacheActive { + dialogCacheEpoch = s.dialogCache.cacheEpoch() + } + if memberCacheActive { + memberCacheEpoch = s.memberCache.cacheEpoch() + } + for _, channelID := range orderedIDs { + if dialogCacheActive { + if cached, ok := s.dialogCache.getListProjection(viewerUserID, channelID); ok { + itemsByID[channelID] = channelDialogListItem{ + dialog: channelDialogToDialog(cached.dialog, 0), + defaultSendAs: cached.dialog.DefaultSendAs, + topMentioned: cached.topMentioned, + topMediaUnread: cached.topMediaUnread, + topUnreadProjected: cached.topUnreadProjected, + listCacheable: true, + } + loadedIDs = append(loadedIDs, channelID) + continue + } + } + misses = append(misses, channelID) + } + if len(misses) > 0 { + loaded, err := s.loadChannelDialogListItems(ctx, viewerUserID, misses) + if err != nil { + return domain.ChannelDialogList{}, err + } + for _, channelID := range misses { + if item, ok := loaded[channelID]; ok { + itemsByID[channelID] = item + loadedIDs = append(loadedIDs, channelID) + } + } + } + channelsByID, err := s.channelsByIDs(ctx, s.db, loadedIDs) + if err != nil { + return domain.ChannelDialogList{}, err + } + for _, channelID := range loadedIDs { + item := itemsByID[channelID] + channel := channelsByID[channelID] + if channel.ID == 0 { + // The shared row was deleted after the owner-state snapshot. Treat + // it as absent instead of returning a half-hydrated dialog. + delete(itemsByID, channelID) + continue + } + item.channel = channel + item.dialog.Pts = channel.Pts + itemsByID[channelID] = item + } + + out := domain.ChannelDialogList{} + // A requested monoforum preview can be absent from channel_members. Keep the + // rare admission path exact, but only pay its per-peer checks for IDs missed + // by the normal batch query. + for _, channelID := range orderedIDs { + if _, ok := itemsByID[channelID]; ok { + continue + } channel, member, err := s.getChannelForMember(ctx, s.db, viewerUserID, channelID) synthetic := false if err != nil { @@ -451,31 +880,248 @@ func (s *ChannelStore) GetChannelDialogs(ctx context.Context, viewerUserID int64 return domain.ChannelDialogList{}, err } } - msg, _ := s.getChannelMessage(ctx, s.db, channelID, dialog.TopMessageID) - if dialog.TopMessageID > 0 && dialog.TopMessageID == dialog.HistoryClearAnchorID { - msg = domain.ProjectChannelHistoryClearMessage( - msg, - channelID, - dialog.HistoryClearAnchorID, - dialog.HistoryClearAnchorDate, - ) + itemsByID[channelID] = channelDialogListItem{ + channel: channel, + dialog: channelDialogToDialog(dialog, channel.Pts), + defaultSendAs: dialog.DefaultSendAs, + listCacheable: !synthetic, } + } + + dialogs := make([]domain.Dialog, 0, len(itemsByID)) + for _, channelID := range orderedIDs { + if item, ok := itemsByID[channelID]; ok { + item.dialog.TopMessageMentioned = item.topMentioned + item.dialog.TopMessageMediaUnread = item.topMediaUnread + item.dialog.TopMessageUnreadProjected = item.topUnreadProjected + itemsByID[channelID] = item + dialogs = append(dialogs, item.dialog) + } + } + topMessages, err := s.channelDialogTopMessages(ctx, s.db, dialogs) + if err != nil { + return domain.ChannelDialogList{}, err + } + allTopUnreadProjected := true + for _, channelID := range orderedIDs { + item, ok := itemsByID[channelID] + if !ok { + continue + } + msg := topMessages[channelMessageLookupKey{channelID: channelID, id: item.dialog.TopMessage}] if msg.ID != 0 { - dialog.TopMessageDate = msg.Date + if item.topUnreadProjected { + msg.Mentioned = item.topMentioned + msg.MediaUnread = item.topMediaUnread + } else { + allTopUnreadProjected = false + } + item.dialog.TopMessageDate = msg.Date out.Messages = append(out.Messages, msg) } - out.Dialogs = append(out.Dialogs, channelDialogToDialog(dialog, channel.Pts)) - out.Channels = append(out.Channels, channel) + if dialogCacheActive && item.listCacheable { + cached := channelDialogFromDialog(viewerUserID, item.dialog) + cached.DefaultSendAs = item.defaultSendAs + s.dialogCache.putListProjectionIfEpoch( + cached, + item.topMentioned, + item.topMediaUnread, + item.topUnreadProjected, + dialogCacheEpoch, + ) + } + if memberCacheActive && item.dialog.ChannelMember != nil { + s.memberCache.putIfEpoch(*item.dialog.ChannelMember, memberCacheEpoch) + } + out.Dialogs = append(out.Dialogs, item.dialog) + out.Channels = append(out.Channels, item.channel) } out.Count = len(out.Dialogs) // 与 ListChannelDialogs 同因：top message 按 viewer 补未读标志与 reactions。 - if err := s.populateChannelMessagesReactions(ctx, s.db, viewerUserID, out.Channels, out.Messages); err != nil { + if err := s.populateChannelDialogTopMessageReactions(ctx, s.db, viewerUserID, out.Channels, out.Messages, allTopUnreadProjected); err != nil { return domain.ChannelDialogList{}, err } projectChannelDialogHistoryClearMessages(out.Dialogs, out.Messages) return out, nil } +// HydrateChannelDialogSnapshot attaches viewer-independent channel rows/top +// messages and the small viewer reaction overlay to already materialized +// owner dialog facts. It deliberately does not read channel_members or +// channel_dialogs: dialog_owner + channel_base generations protecting the +// caller's snapshot are the authority for those fields. +func (s *ChannelStore) HydrateChannelDialogSnapshot( + ctx context.Context, + viewerUserID int64, + dialogs []domain.Dialog, +) (domain.ChannelDialogList, error) { + if viewerUserID == 0 || len(dialogs) == 0 { + return domain.ChannelDialogList{}, nil + } + ordered := make([]domain.Dialog, 0, len(dialogs)) + ids := make([]int64, 0, len(dialogs)) + seen := make(map[int64]struct{}, len(dialogs)) + for _, dialog := range dialogs { + if dialog.Peer.Type != domain.PeerTypeChannel || dialog.Peer.ID == 0 { + continue + } + if _, duplicate := seen[dialog.Peer.ID]; duplicate { + continue + } + seen[dialog.Peer.ID] = struct{}{} + ordered = append(ordered, dialog) + ids = append(ids, dialog.Peer.ID) + } + if len(ordered) == 0 { + return domain.ChannelDialogList{}, nil + } + dialogCacheActive := s.dialogCacheActive(s.db) + memberCacheActive := s.memberCacheActive(s.db) + var dialogCacheEpoch uint64 + var memberCacheEpoch uint64 + if dialogCacheActive { + // Snapshot the epoch before any shared hydration. A concurrent + // dialog_light/channel_member/channel_base invalidation must prevent + // the owner projection from being written back after it became stale. + dialogCacheEpoch = s.dialogCache.cacheEpoch() + } + if memberCacheActive { + memberCacheEpoch = s.memberCache.cacheEpoch() + } + channelsByID, err := s.channelsByIDs(ctx, s.db, ids) + if err != nil { + return domain.ChannelDialogList{}, err + } + for index := range ordered { + channel := channelsByID[ordered[index].Peer.ID] + if channel.ID == 0 { + return domain.ChannelDialogList{}, fmt.Errorf("hydrate channel dialog snapshot %d: %w", ordered[index].Peer.ID, domain.ErrChannelInvalid) + } + ordered[index].Pts = channel.Pts + } + topMessages, err := s.channelDialogTopMessages(ctx, s.db, ordered) + if err != nil { + return domain.ChannelDialogList{}, err + } + out := domain.ChannelDialogList{Dialogs: make([]domain.Dialog, 0, len(ordered))} + allTopUnreadProjected := true + for _, dialog := range ordered { + channel := channelsByID[dialog.Peer.ID] + message := topMessages[channelMessageLookupKey{channelID: dialog.Peer.ID, id: dialog.TopMessage}] + if message.ID != 0 { + if dialog.TopMessageUnreadProjected { + message.Mentioned = dialog.TopMessageMentioned + message.MediaUnread = dialog.TopMessageMediaUnread + } else { + allTopUnreadProjected = false + } + dialog.TopMessageDate = message.Date + out.Messages = append(out.Messages, message) + } + if dialogCacheActive { + cached := channelDialogFromDialog(viewerUserID, dialog) + cached.DefaultSendAs = clonePeer(dialog.DefaultSendAs) + s.dialogCache.putListProjectionIfEpoch( + cached, + dialog.TopMessageMentioned, + dialog.TopMessageMediaUnread, + dialog.TopMessageUnreadProjected, + dialogCacheEpoch, + ) + } + if memberCacheActive && dialog.ChannelMember != nil { + s.memberCache.putIfEpoch(*dialog.ChannelMember, memberCacheEpoch) + } + out.Dialogs = append(out.Dialogs, dialog) + out.Channels = append(out.Channels, channel) + } + out.Count = len(out.Dialogs) + if err := s.populateChannelDialogTopMessageReactions( + ctx, s.db, viewerUserID, out.Channels, out.Messages, allTopUnreadProjected, + ); err != nil { + return domain.ChannelDialogList{}, err + } + projectChannelDialogHistoryClearMessages(out.Dialogs, out.Messages) + return out, nil +} + +func (s *ChannelStore) loadChannelDialogListItems(ctx context.Context, viewerUserID int64, channelIDs []int64) (map[int64]channelDialogListItem, error) { + visibleTopID := channelDialogVisibleTopIDSQL() + visibleTopDate := channelDialogVisibleTopDateSQL("COALESCE(top_msg.message_date, d.top_message_date, c.date)", "0") + visibleReadInbox := "GREATEST(COALESCE(d.read_inbox_max_id, 0), m.read_inbox_max_id)" + visibleUnreadCount := channelDialogVisibleUnreadCountSQL(visibleReadInbox, visibleTopID) + rows, err := s.db.Query(ctx, ` +SELECT c.id, + `+visibleTopID+`, + `+visibleTopDate+`, + COALESCE(d.folder_id, 0), + `+visibleReadInbox+`, + LEAST(GREATEST(c.top_message_id, 0), GREATEST(COALESCE(d.read_outbox_max_id, 0), m.read_outbox_max_id, CASE WHEN c.read_inbox_top1_user_id = m.user_id THEN c.read_inbox_top2 ELSE c.read_inbox_top1 END)), + `+visibleUnreadCount+`, + COALESCE(d.pinned, false), + COALESCE(d.pinned_order, 0), + COALESCE(d.unread_mark, m.unread_mark), + COALESCE(d.unread_mentions_count, 0), + COALESCE(d.unread_reactions_count, 0), + COALESCE(d.view_forum_as_messages, false), + COALESCE(d.has_scheduled, false), + d.default_send_as_peer_type, + d.default_send_as_peer_id, + m.history_clear_anchor_id, + m.history_clear_anchor_date, + top_unread.message_id IS NOT NULL, + COALESCE(top_unread.unread, false), + m.user_id, + m.inviter_user_id, + m.role, + m.status, + m.joined_at, + m.left_at, + m.admin_rights::text, + m.banned_rights::text, + m.rank, + m.available_min_id, + m.available_min_pts, + m.read_inbox_max_id, + m.read_outbox_max_id, + m.unread_mark, + m.slowmode_last_send_date +FROM channel_members m +JOIN channels c ON c.id = m.channel_id AND NOT c.deleted +LEFT JOIN channel_messages top_msg ON top_msg.channel_id = m.channel_id AND top_msg.id = c.top_message_id AND NOT top_msg.deleted +LEFT JOIN channel_dialogs d ON d.user_id = m.user_id AND d.channel_id = m.channel_id +LEFT JOIN channel_unread_mentions top_unread + ON top_unread.user_id = m.user_id + AND top_unread.channel_id = m.channel_id + AND top_unread.message_id = `+visibleTopID+` +WHERE m.user_id = $1 + AND m.channel_id = ANY($2::bigint[]) + AND m.status = 'active'`, viewerUserID, channelIDs) + if err != nil { + return nil, fmt.Errorf("batch get channel dialogs: %w", err) + } + defer rows.Close() + itemsByID := make(map[int64]channelDialogListItem, len(channelIDs)) + for rows.Next() { + channelID, dialog, defaultSendAs, topMentioned, topMediaUnread, err := scanChannelDialogProjectionRow(rows) + if err != nil { + return nil, err + } + itemsByID[channelID] = channelDialogListItem{ + dialog: dialog, + defaultSendAs: defaultSendAs, + topMentioned: topMentioned, + topMediaUnread: topMediaUnread, + topUnreadProjected: true, + listCacheable: true, + } + } + if err := rows.Err(); err != nil { + return nil, err + } + return itemsByID, nil +} + func projectChannelDialogHistoryClearMessages(dialogs []domain.Dialog, messages []domain.ChannelMessage) { anchors := make(map[channelMessageLookupKey]domain.Dialog) for _, dialog := range dialogs { @@ -1325,6 +1971,106 @@ func scanChannelDialogRow(row rowScanner, userID int64) (domain.Channel, domain. return ch, dialog, defaultSendAs, nil } +type channelDialogProjectionValues struct { + channelID int64 + topID, topDate, folderID, readInbox, readOutbox int + unreadCount, pinnedOrder, unreadMentions, unreadReactions int + historyClearAnchorID, historyClearAnchorDate int + pinned, unreadMark, viewForumAsMessages, hasScheduled bool + defaultSendAsType sql.NullString + defaultSendAsID sql.NullInt64 + topMentioned, topMediaUnread bool + memberUserID, memberInviterUserID int64 + memberRole, memberStatus string + memberJoinedAt, memberLeftAt int + memberAdminRights, memberBannedRights, memberRank string + memberAvailableMinID, memberAvailableMinPts int + memberReadInboxMaxID, memberReadOutboxMaxID int + memberUnreadMark bool + memberSlowmodeLastSendDate int +} + +func (v *channelDialogProjectionValues) scanDestinations() []any { + return []any{ + &v.channelID, + &v.topID, &v.topDate, + &v.folderID, &v.readInbox, &v.readOutbox, &v.unreadCount, &v.pinned, &v.pinnedOrder, &v.unreadMark, &v.unreadMentions, &v.unreadReactions, &v.viewForumAsMessages, &v.hasScheduled, + &v.defaultSendAsType, &v.defaultSendAsID, + &v.historyClearAnchorID, &v.historyClearAnchorDate, + &v.topMentioned, &v.topMediaUnread, + &v.memberUserID, &v.memberInviterUserID, + &v.memberRole, &v.memberStatus, + &v.memberJoinedAt, &v.memberLeftAt, + &v.memberAdminRights, &v.memberBannedRights, &v.memberRank, + &v.memberAvailableMinID, &v.memberAvailableMinPts, + &v.memberReadInboxMaxID, &v.memberReadOutboxMaxID, + &v.memberUnreadMark, &v.memberSlowmodeLastSendDate, + } +} + +func (v *channelDialogProjectionValues) result() (int64, domain.Dialog, *domain.Peer, bool, bool) { + dialog := domain.Dialog{ + Peer: domain.Peer{Type: domain.PeerTypeChannel, ID: v.channelID}, + FolderID: v.folderID, + TopMessage: v.topID, + TopMessageDate: v.topDate, + HistoryClearAnchorID: v.historyClearAnchorID, + HistoryClearAnchorDate: v.historyClearAnchorDate, + ReadInboxMaxID: v.readInbox, + ReadOutboxMaxID: v.readOutbox, + UnreadCount: v.unreadCount, + UnreadMentions: v.unreadMentions, + UnreadReactions: v.unreadReactions, + Pinned: v.pinned, + PinnedOrder: v.pinnedOrder, + UnreadMark: v.unreadMark, + ViewForumAsMessages: v.viewForumAsMessages, + HasScheduled: v.hasScheduled, + TopMessageMentioned: v.topMentioned, + TopMessageMediaUnread: v.topMediaUnread, + TopMessageUnreadProjected: true, + } + var defaultSendAs *domain.Peer + if v.defaultSendAsType.Valid && v.defaultSendAsID.Valid && v.defaultSendAsID.Int64 != 0 { + defaultSendAs = &domain.Peer{Type: domain.PeerType(v.defaultSendAsType.String), ID: v.defaultSendAsID.Int64} + } + member := domain.ChannelMember{ + ChannelID: v.channelID, + UserID: v.memberUserID, + InviterUserID: v.memberInviterUserID, + Role: domain.ChannelMemberRole(v.memberRole), + Status: domain.ChannelMemberStatus(v.memberStatus), + JoinedAt: v.memberJoinedAt, + LeftAt: v.memberLeftAt, + Rank: v.memberRank, + AvailableMinID: v.memberAvailableMinID, + AvailableMinPts: v.memberAvailableMinPts, + HistoryClearAnchorID: v.historyClearAnchorID, + HistoryClearAnchorDate: v.historyClearAnchorDate, + ReadInboxMaxID: v.memberReadInboxMaxID, + ReadOutboxMaxID: v.memberReadOutboxMaxID, + UnreadMark: v.memberUnreadMark, + SlowmodeLastSendDate: v.memberSlowmodeLastSendDate, + } + _ = json.Unmarshal([]byte(v.memberAdminRights), &member.AdminRights) + _ = json.Unmarshal([]byte(v.memberBannedRights), &member.BannedRights) + dialog.ChannelMember = &member + return v.channelID, dialog, defaultSendAs, v.topMentioned, v.topMediaUnread +} + +// scanChannelDialogProjectionRow scans only owner-varying channel dialog +// state. Shared channel metadata is hydrated separately through ChannelRowCache +// so a page containing the same channel for many online owners does not decode +// and transfer the wide channels row repeatedly. +func scanChannelDialogProjectionRow(row rowScanner) (int64, domain.Dialog, *domain.Peer, bool, bool, error) { + var values channelDialogProjectionValues + if err := row.Scan(values.scanDestinations()...); err != nil { + return 0, domain.Dialog{}, nil, false, false, err + } + channelID, dialog, defaultSendAs, topMentioned, topMediaUnread := values.result() + return channelID, dialog, defaultSendAs, topMentioned, topMediaUnread, nil +} + func channelDialogToDialog(dialog domain.ChannelDialog, channelPts int) domain.Dialog { return domain.Dialog{ Peer: domain.Peer{Type: domain.PeerTypeChannel, ID: dialog.ChannelID}, @@ -1343,6 +2089,7 @@ func channelDialogToDialog(dialog domain.ChannelDialog, channelPts int) domain.D UnreadMark: dialog.UnreadMark, ViewForumAsMessages: dialog.ViewForumAsMessages, HasScheduled: dialog.HasScheduled, + DefaultSendAs: clonePeer(dialog.DefaultSendAs), Pts: channelPts, } } @@ -1366,9 +2113,18 @@ func channelDialogFromDialog(userID int64, dialog domain.Dialog) domain.ChannelD UnreadMark: dialog.UnreadMark, ViewForumAsMessages: dialog.ViewForumAsMessages, HasScheduled: dialog.HasScheduled, + DefaultSendAs: clonePeer(dialog.DefaultSendAs), } } +func clonePeer(peer *domain.Peer) *domain.Peer { + if peer == nil { + return nil + } + cloned := *peer + return &cloned +} + func channelDialogMatchesFilter(dialog domain.Dialog, channel domain.Channel, filter domain.DialogFilter) bool { if filter.HasFolderID { if filter.FolderID < domain.DialogCustomFolderMinID { diff --git a/internal/store/postgres/channel_difference_cache.go b/internal/store/postgres/channel_difference_cache.go new file mode 100644 index 00000000..596f89f9 --- /dev/null +++ b/internal/store/postgres/channel_difference_cache.go @@ -0,0 +1,174 @@ +package postgres + +import ( + "context" + "strconv" + "sync/atomic" + "time" + + "telesrv/internal/domain" + "telesrv/internal/readmodelcache" +) + +type channelDifferenceBaseKey struct { + channelID int64 + requestPts int + capturedPts int + capturedTopID int + limit int +} + +// channelDifferenceBase contains only viewer-independent durable facts. Access, +// available-min, monoforum visibility, unread flags and dialog state are applied +// after the cache lookup by ListChannelDifference. +type channelDifferenceBase struct { + retainedThroughPts int + lastPts int + tooLong bool + events []domain.ChannelUpdateEvent + messages []domain.ChannelMessage + // mentionCandidateIDs is a viewer-independent sparse gate sourced from + // channel_unread_mention_index. When candidatesKnown is true, messages not + // present in this set cannot have a viewer mention overlay and must not cause + // a channel_unread_mentions query. + mentionCandidateIDs map[int]struct{} + candidatesKnown bool +} + +type ChannelDifferenceCacheSnapshot struct { + Entries int + Weight int64 + Hits uint64 + Misses uint64 + Loads uint64 + LoadErrors uint64 +} + +// ChannelDifferenceBaseCache deduplicates immutable channel event/message pages +// shared by many viewers catching up from the same cursor. It never stores a +// permission decision or a final ChannelDifference response. +type ChannelDifferenceBaseCache struct { + cache *readmodelcache.Cache[channelDifferenceBaseKey, channelDifferenceBase] + + hits atomic.Uint64 + misses atomic.Uint64 + loads atomic.Uint64 + loadErrors atomic.Uint64 +} + +func NewChannelDifferenceBaseCache(maxEntries int, maxWeight int64, ttl time.Duration) *ChannelDifferenceBaseCache { + cache := readmodelcache.New[channelDifferenceBaseKey, channelDifferenceBase](readmodelcache.Config[channelDifferenceBaseKey, channelDifferenceBase]{ + MaxEntries: maxEntries, + MaxWeight: maxWeight, + TTL: ttl, + Clone: cloneChannelDifferenceBase, + Weight: channelDifferenceBaseWeight, + KeyString: func(key channelDifferenceBaseKey) string { + return strconv.FormatInt(key.channelID, 10) + ":" + + strconv.Itoa(key.requestPts) + ":" + strconv.Itoa(key.capturedPts) + ":" + + strconv.Itoa(key.capturedTopID) + ":" + strconv.Itoa(key.limit) + }, + }) + if cache == nil { + return nil + } + return &ChannelDifferenceBaseCache{cache: cache} +} + +func (c *ChannelDifferenceBaseCache) getOrLoad( + ctx context.Context, + key channelDifferenceBaseKey, + load func() (channelDifferenceBase, error), +) (channelDifferenceBase, error) { + if c == nil { + return load() + } + if _, ok := c.cache.Peek(key); ok { + c.hits.Add(1) + } else { + c.misses.Add(1) + } + return c.cache.GetOrLoad(ctx, key, func() (channelDifferenceBase, error) { + c.loads.Add(1) + value, err := load() + if err != nil { + c.loadErrors.Add(1) + } + return value, err + }) +} + +func (c *ChannelDifferenceBaseCache) deleteChannel(channelID int64) { + if c == nil || channelID == 0 { + return + } + c.cache.InvalidateWhere(func(key channelDifferenceBaseKey) bool { return key.channelID == channelID }) +} + +func (c *ChannelDifferenceBaseCache) flush() { + if c == nil { + return + } + c.cache.Flush() +} + +func (c *ChannelDifferenceBaseCache) Snapshot() ChannelDifferenceCacheSnapshot { + if c == nil { + return ChannelDifferenceCacheSnapshot{} + } + return ChannelDifferenceCacheSnapshot{ + Entries: c.cache.Len(), + Weight: c.cache.Weight(), + Hits: c.hits.Load(), + Misses: c.misses.Load(), + Loads: c.loads.Load(), + LoadErrors: c.loadErrors.Load(), + } +} + +func cloneChannelDifferenceBase(base channelDifferenceBase) channelDifferenceBase { + candidates := base.mentionCandidateIDs + base.events = append([]domain.ChannelUpdateEvent(nil), base.events...) + for i := range base.events { + base.events[i].MessageIDs = append([]int(nil), base.events[i].MessageIDs...) + base.events[i].UserIDs = append([]int64(nil), base.events[i].UserIDs...) + base.events[i].Message = cloneChannelTopMessage(base.events[i].Message) + } + base.messages = append([]domain.ChannelMessage(nil), base.messages...) + for i := range base.messages { + base.messages[i] = cloneChannelTopMessage(base.messages[i]) + } + if base.mentionCandidateIDs != nil { + base.mentionCandidateIDs = make(map[int]struct{}, len(base.mentionCandidateIDs)) + for id := range candidates { + base.mentionCandidateIDs[id] = struct{}{} + } + } + return base +} + +func channelDifferenceBaseWeight(base channelDifferenceBase) int64 { + weight := int64(96 + len(base.events)*192 + len(base.messages)*192 + len(base.mentionCandidateIDs)*16) + for _, event := range base.events { + weight += int64(len(event.MessageIDs)*8 + len(event.UserIDs)*8) + weight += channelDifferenceMessageWeight(event.Message) + } + for _, message := range base.messages { + weight += channelDifferenceMessageWeight(message) + } + return weight +} + +func channelDifferenceMessageWeight(message domain.ChannelMessage) int64 { + if message.ID == 0 { + return 0 + } + weight := int64(len(message.Body) + len(message.PostAuthor) + len(message.Entities)*48) + if message.RichMessage != nil { + weight += int64(len(message.RichMessage.Blocks) + len(message.RichMessage.BotAPIProjection)) + } + if message.Action != nil { + weight += int64(len(message.Action.Title) + len(message.Action.UserIDs)*8 + len(message.Action.TodoItems)*64) + } + return weight +} diff --git a/internal/store/postgres/channel_difference_cache_integration_test.go b/internal/store/postgres/channel_difference_cache_integration_test.go new file mode 100644 index 00000000..af30603a --- /dev/null +++ b/internal/store/postgres/channel_difference_cache_integration_test.go @@ -0,0 +1,205 @@ +package postgres + +import ( + "context" + "errors" + "testing" + "time" + + "telesrv/internal/domain" +) + +func TestChannelDifferenceBaseLoaderRejectsChangedStableCutPostgres(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + suffix := randomSuffix(t) + owner, err := NewUserStore(pool).Create(ctx, domain.User{ + AccessHash: 721, Phone: "+1993" + suffix + "01", FirstName: "DiffCutOwner", + }) + if err != nil { + t.Fatal(err) + } + var channelID int64 + t.Cleanup(func() { + if channelID != 0 { + _, _ = pool.Exec(ctx, "DELETE FROM channels WHERE id = $1", channelID) + } + _, _ = pool.Exec(ctx, "DELETE FROM users WHERE id = $1", owner.ID) + }) + channels := NewChannelStore(pool) + created, err := channels.CreateChannel(ctx, domain.CreateChannelRequest{ + CreatorUserID: owner.ID, Title: "Difference Cut " + suffix, Megagroup: true, Date: 1701000200, + }) + if err != nil { + t.Fatal(err) + } + channelID = created.Channel.ID + first, err := channels.SendChannelMessage(ctx, domain.SendChannelMessageRequest{ + UserID: owner.ID, ChannelID: channelID, RandomID: 1701000201, Message: "first cut", Date: 1701000201, + }) + if err != nil { + t.Fatal(err) + } + captured, member, _, err := channels.getChannelForViewer(ctx, pool, owner.ID, channelID) + if err != nil { + t.Fatal(err) + } + if _, err := channels.SendChannelMessage(ctx, domain.SendChannelMessageRequest{ + UserID: owner.ID, ChannelID: channelID, RandomID: 1701000202, Message: "future cut", Date: 1701000202, + }); err != nil { + t.Fatal(err) + } + _, err = channels.loadChannelDifferenceBase(ctx, captured, member, owner.ID, created.Channel.Pts, 100, true) + if !errors.Is(err, errChannelDifferenceCutChanged) { + t.Fatalf("load against captured pts %d after new event = %v, want stable-cut retry", first.Event.Pts, err) + } + diff, err := channels.ListChannelDifference(ctx, domain.ChannelDifferenceRequest{ + UserID: owner.ID, ChannelID: channelID, Pts: created.Channel.Pts, Limit: 100, + }) + if err != nil { + t.Fatal(err) + } + if !diff.Final || len(diff.Events) != 2 || diff.Events[0].Pts != first.Event.Pts { + t.Fatalf("retried difference = %+v, want both stable events", diff) + } +} + +func TestChannelDifferenceBaseCacheSharesDurablePageAcrossViewersPostgres(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + suffix := randomSuffix(t) + users := NewUserStore(pool) + owner, err := users.Create(ctx, domain.User{AccessHash: 701, Phone: "+1991" + suffix + "01", FirstName: "DiffCacheOwner"}) + if err != nil { + t.Fatal(err) + } + memberA, err := users.Create(ctx, domain.User{AccessHash: 702, Phone: "+1991" + suffix + "02", FirstName: "DiffCacheA"}) + if err != nil { + t.Fatal(err) + } + memberB, err := users.Create(ctx, domain.User{AccessHash: 703, Phone: "+1991" + suffix + "03", FirstName: "DiffCacheB"}) + if err != nil { + t.Fatal(err) + } + var channelID int64 + t.Cleanup(func() { + if channelID != 0 { + _, _ = pool.Exec(ctx, "DELETE FROM channels WHERE id = $1", channelID) + } + _, _ = pool.Exec(ctx, "DELETE FROM users WHERE id = ANY($1::bigint[])", []int64{owner.ID, memberA.ID, memberB.ID}) + }) + + cache := NewChannelDifferenceBaseCache(32, 8<<20, time.Minute) + channels := NewChannelStore(pool, WithChannelDifferenceBaseCache(cache)) + created, err := channels.CreateChannel(ctx, domain.CreateChannelRequest{ + CreatorUserID: owner.ID, + Title: "Shared Difference " + suffix, + Megagroup: true, + MemberUserIDs: []int64{memberA.ID, memberB.ID}, + Date: 1701000000, + }) + if err != nil { + t.Fatal(err) + } + channelID = created.Channel.ID + sent, err := channels.SendChannelMessage(ctx, domain.SendChannelMessageRequest{ + UserID: owner.ID, ChannelID: channelID, RandomID: 1701000001, + Message: "shared immutable page", MentionUserIDs: []int64{memberA.ID}, Date: 1701000001, + }) + if err != nil { + t.Fatal(err) + } + + request := func(userID int64) domain.ChannelDifference { + t.Helper() + diff, err := channels.ListChannelDifference(ctx, domain.ChannelDifferenceRequest{ + UserID: userID, ChannelID: channelID, Pts: created.Channel.Pts, Limit: 100, + }) + if err != nil { + t.Fatal(err) + } + if !diff.Final || diff.Pts != sent.Event.Pts || len(diff.NewMessages) != 1 || diff.NewMessages[0].Body != "shared immutable page" { + t.Fatalf("difference for %d = %+v", userID, diff) + } + if diff.Self.UserID != userID || diff.Dialog.UserID != userID { + t.Fatalf("viewer overlay crossed accounts: self=%d dialog=%d want=%d", diff.Self.UserID, diff.Dialog.UserID, userID) + } + return diff + } + first := request(memberA.ID) + if !first.NewMessages[0].Mentioned { + t.Fatalf("member A mention overlay missing: %+v", first.NewMessages[0]) + } + second := request(memberB.ID) + if second.NewMessages[0].Mentioned || second.NewMessages[0].MediaUnread { + t.Fatalf("member B received member A mention overlay: %+v", second.NewMessages[0]) + } + snapshot := cache.Snapshot() + if snapshot.Loads != 1 || snapshot.Entries != 1 || snapshot.Hits < 1 { + t.Fatalf("shared base snapshot = %+v, want one load and a hit", snapshot) + } + first.NewMessages[0].Body = "caller mutation" + third := request(memberA.ID) + if third.NewMessages[0].Body != "shared immutable page" { + t.Fatalf("caller mutation leaked into cache: %+v", third.NewMessages[0]) + } +} + +func TestChannelDifferenceRetentionInvalidatesSharedBasePostgres(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + suffix := randomSuffix(t) + owner, err := NewUserStore(pool).Create(ctx, domain.User{ + AccessHash: 711, Phone: "+1992" + suffix + "01", FirstName: "DiffRetentionOwner", + }) + if err != nil { + t.Fatal(err) + } + var channelID int64 + t.Cleanup(func() { + if channelID != 0 { + _, _ = pool.Exec(ctx, "DELETE FROM channels WHERE id = $1", channelID) + } + _, _ = pool.Exec(ctx, "DELETE FROM users WHERE id = $1", owner.ID) + }) + + cache := NewChannelDifferenceBaseCache(32, 8<<20, time.Minute) + channels := NewChannelStore(pool, WithChannelDifferenceBaseCache(cache)) + created, err := channels.CreateChannel(ctx, domain.CreateChannelRequest{ + CreatorUserID: owner.ID, Title: "Difference Retention " + suffix, Megagroup: true, Date: 1701000100, + }) + if err != nil { + t.Fatal(err) + } + channelID = created.Channel.ID + first, err := channels.SendChannelMessage(ctx, domain.SendChannelMessageRequest{ + UserID: owner.ID, ChannelID: channelID, RandomID: 1701000101, Message: "first", Date: 1701000101, + }) + if err != nil { + t.Fatal(err) + } + if _, err := channels.ListChannelDifference(ctx, domain.ChannelDifferenceRequest{ + UserID: owner.ID, ChannelID: channelID, Pts: created.Channel.Pts, Limit: 100, + }); err != nil { + t.Fatal(err) + } + if cache.Snapshot().Entries != 1 { + t.Fatalf("entries before prune = %d, want 1", cache.Snapshot().Entries) + } + pruned, err := channels.PruneChannelUpdateEvents(ctx, channelID, first.Event.Pts, 100) + if err != nil { + t.Fatal(err) + } + if pruned.Deleted == 0 || cache.Snapshot().Entries != 0 { + t.Fatalf("prune/cache = %+v/%+v, want deletion and immediate invalidation", pruned, cache.Snapshot()) + } + diff, err := channels.ListChannelDifference(ctx, domain.ChannelDifferenceRequest{ + UserID: owner.ID, ChannelID: channelID, Pts: created.Channel.Pts, Limit: 100, + }) + if err != nil { + t.Fatal(err) + } + if !diff.TooLong || diff.Pts != first.Event.Pts { + t.Fatalf("difference after retained floor = %+v, want tooLong at pts %d", diff, first.Event.Pts) + } +} diff --git a/internal/store/postgres/channel_difference_cache_test.go b/internal/store/postgres/channel_difference_cache_test.go new file mode 100644 index 00000000..776bd733 --- /dev/null +++ b/internal/store/postgres/channel_difference_cache_test.go @@ -0,0 +1,147 @@ +package postgres + +import ( + "context" + "errors" + "sync" + "sync/atomic" + "testing" + "time" + + "telesrv/internal/domain" +) + +func TestChannelDifferenceBaseCacheSingleflightAndCloneIsolation(t *testing.T) { + cache := NewChannelDifferenceBaseCache(16, 1<<20, time.Minute) + key := channelDifferenceBaseKey{channelID: 7, requestPts: 10, capturedPts: 11, capturedTopID: 3, limit: 100} + var loads atomic.Int32 + load := func() (channelDifferenceBase, error) { + loads.Add(1) + time.Sleep(10 * time.Millisecond) + return channelDifferenceBase{ + lastPts: 11, + candidatesKnown: true, + mentionCandidateIDs: map[int]struct{}{3: {}}, + events: []domain.ChannelUpdateEvent{{ + ChannelID: 7, + Pts: 11, + PtsCount: 1, + Type: domain.ChannelUpdateNewMessage, + MessageIDs: []int{3}, + Message: domain.ChannelMessage{ + ChannelID: 7, + ID: 3, + Body: "immutable", + Entities: []domain.MessageEntity{{Offset: 1}}, + }, + }}, + }, nil + } + + const callers = 64 + values := make([]channelDifferenceBase, callers) + errs := make([]error, callers) + var wg sync.WaitGroup + wg.Add(callers) + for i := range callers { + go func(i int) { + defer wg.Done() + values[i], errs[i] = cache.getOrLoad(context.Background(), key, load) + }(i) + } + wg.Wait() + for i, err := range errs { + if err != nil { + t.Fatalf("caller %d: %v", i, err) + } + } + if loads.Load() != 1 { + t.Fatalf("loads = %d, want 1", loads.Load()) + } + values[0].events[0].MessageIDs[0] = 99 + values[0].events[0].Message.Entities[0].Offset = 99 + delete(values[0].mentionCandidateIDs, 3) + got, err := cache.getOrLoad(context.Background(), key, load) + if err != nil { + t.Fatal(err) + } + if got.events[0].MessageIDs[0] != 3 || got.events[0].Message.Entities[0].Offset != 1 { + t.Fatalf("cached value was aliased: %+v", got.events[0]) + } + if _, ok := got.mentionCandidateIDs[3]; !ok { + t.Fatalf("cached mention candidates were aliased: %+v", got.mentionCandidateIDs) + } + snapshot := cache.Snapshot() + if snapshot.Entries != 1 || snapshot.Loads != 1 || snapshot.Hits == 0 || snapshot.Weight <= 0 { + t.Fatalf("snapshot = %+v", snapshot) + } +} + +func TestChannelDifferenceBaseCacheSeparatesCutsAndInvalidatesChannel(t *testing.T) { + cache := NewChannelDifferenceBaseCache(16, 1<<20, time.Minute) + var loads atomic.Int32 + load := func() (channelDifferenceBase, error) { + loads.Add(1) + return channelDifferenceBase{lastPts: 2}, nil + } + keys := []channelDifferenceBaseKey{ + {channelID: 9, requestPts: 1, capturedPts: 2, capturedTopID: 1, limit: 100}, + {channelID: 9, requestPts: 1, capturedPts: 3, capturedTopID: 2, limit: 100}, + {channelID: 10, requestPts: 1, capturedPts: 2, capturedTopID: 1, limit: 100}, + } + for _, key := range keys { + if _, err := cache.getOrLoad(context.Background(), key, load); err != nil { + t.Fatal(err) + } + } + if loads.Load() != 3 || cache.Snapshot().Entries != 3 { + t.Fatalf("loads/entries = %d/%d, want 3/3", loads.Load(), cache.Snapshot().Entries) + } + cache.deleteChannel(9) + if cache.Snapshot().Entries != 1 { + t.Fatalf("entries after channel invalidation = %d, want 1", cache.Snapshot().Entries) + } +} + +func TestChannelDifferenceBaseCacheDoesNotCacheErrors(t *testing.T) { + cache := NewChannelDifferenceBaseCache(4, 1<<20, time.Minute) + key := channelDifferenceBaseKey{channelID: 12, requestPts: 1, capturedPts: 2, limit: 100} + want := errors.New("load failed") + for range 2 { + if _, err := cache.getOrLoad(context.Background(), key, func() (channelDifferenceBase, error) { + return channelDifferenceBase{}, want + }); !errors.Is(err, want) { + t.Fatalf("err = %v, want %v", err, want) + } + } + snapshot := cache.Snapshot() + if snapshot.Entries != 0 || snapshot.Loads != 2 || snapshot.LoadErrors != 2 { + t.Fatalf("snapshot = %+v", snapshot) + } +} + +func TestChannelDifferenceUnreadFlagsSkipDatabaseWithoutMentionCandidates(t *testing.T) { + messages := []domain.ChannelMessage{{ChannelID: 12, ID: 7}} + base := channelDifferenceBase{candidatesKnown: true, mentionCandidateIDs: map[int]struct{}{}} + if err := populateChannelDifferenceUnreadFlags(context.Background(), nil, 99, messages, base); err != nil { + t.Fatal(err) + } + if messages[0].Mentioned || messages[0].MediaUnread { + t.Fatalf("empty candidate gate changed message flags: %+v", messages[0]) + } +} + +func TestReadModelListenerInvalidatesChannelDifferenceBase(t *testing.T) { + cache := NewChannelDifferenceBaseCache(4, 1<<20, time.Minute) + key := channelDifferenceBaseKey{channelID: 14, requestPts: 1, capturedPts: 2, limit: 100} + if _, err := cache.getOrLoad(context.Background(), key, func() (channelDifferenceBase, error) { + return channelDifferenceBase{lastPts: 2}, nil + }); err != nil { + t.Fatal(err) + } + listener := NewReadModelChangeListener("", ReadModelCacheSet{ChannelDifferences: cache}, nil) + listener.handlePayload(`{"model":"channel_difference_base","peer_type":"channel","peer_id":14}`) + if cache.Snapshot().Entries != 0 { + t.Fatalf("entries after retention invalidation = %d, want 0", cache.Snapshot().Entries) + } +} diff --git a/internal/store/postgres/channel_helpers.go b/internal/store/postgres/channel_helpers.go index 6edb8d60..ab160e28 100644 --- a/internal/store/postgres/channel_helpers.go +++ b/internal/store/postgres/channel_helpers.go @@ -132,6 +132,14 @@ func (s *ChannelStore) DeleteChannel(ctx context.Context, req domain.DeleteChann linkedMono = &mono } } + if err := deleteChannelWelcomeMessageDeliveriesTx(ctx, tx, channel.ID); err != nil { + return domain.DeleteChannelResult{}, err + } + if linkedMono != nil { + if err := deleteChannelWelcomeMessageDeliveriesTx(ctx, tx, linkedMono.ID); err != nil { + return domain.DeleteChannelResult{}, err + } + } if err := tx.Commit(ctx); err != nil { return domain.DeleteChannelResult{}, fmt.Errorf("commit delete channel: %w", err) } @@ -556,6 +564,27 @@ func listChannelsByIDs(ctx context.Context, db sqlcgen.DBTX, ids []int64) ([]dom return out, nil } +// channelsByIDs hydrates viewer-independent channel rows in one batch and +// reuses them across owners. The per-viewer member/dialog state stays outside +// this cache and is read by its own owner-scoped query. +func (s *ChannelStore) channelsByIDs(ctx context.Context, db sqlcgen.DBTX, ids []int64) (map[int64]domain.Channel, error) { + load := func(ctx context.Context, missing []int64) (map[int64]domain.Channel, error) { + channels, err := listChannelsByIDs(ctx, db, missing) + if err != nil { + return nil, err + } + out := make(map[int64]domain.Channel, len(channels)) + for _, channel := range channels { + out[channel.ID] = channel + } + return out, nil + } + if s.cacheActive(db) { + return s.rowCache.getOrLoadBatch(ctx, ids, load) + } + return load(ctx, ids) +} + func listChannelsByIDsInOrder(ctx context.Context, db sqlcgen.DBTX, ids []int64) ([]domain.Channel, error) { channels, err := listChannelsByIDs(ctx, db, ids) if err != nil { @@ -789,7 +818,33 @@ func (s *ChannelStore) resolveChannelReply(ctx context.Context, db sqlcgen.DBTX, peer = channelPeer } if peer != channelPeer { - return nil, domain.ErrReplyMessageIDInvalid + // inputReplyToMessage.reply_to_peer_id may deliberately reference a + // message from another dialog (the official clients expose this as + // "Reply in another chat"). Keep that source pair intact instead of + // resolving it as a destination-channel thread reply. + if req.ReplyTo.MessageID <= 0 { + return nil, domain.ErrReplyMessageIDInvalid + } + switch peer.Type { + case domain.PeerTypeUser: + var exists bool + if err := db.QueryRow(ctx, `SELECT EXISTS ( +SELECT 1 FROM message_boxes +WHERE owner_user_id=$1 AND peer_type='user' AND peer_id=$2 AND box_id=$3 AND NOT deleted +)`, req.UserID, peer.ID, req.ReplyTo.MessageID).Scan(&exists); err != nil || !exists { + return nil, domain.ErrReplyMessageIDInvalid + } + case domain.PeerTypeChannel: + target, err := s.getChannelMessage(ctx, db, peer.ID, req.ReplyTo.MessageID) + if err != nil || target.Deleted { + return nil, domain.ErrReplyMessageIDInvalid + } + default: + return nil, domain.ErrReplyMessageIDInvalid + } + reply := cloneMessageReply(req.ReplyTo) + reply.Peer = peer + return reply, nil } if req.ReplyTo.MessageID == 0 { if req.ReplyTo.TopMessageID <= 0 || !channel.Forum { diff --git a/internal/store/postgres/channel_invite_batch_integration_test.go b/internal/store/postgres/channel_invite_batch_integration_test.go new file mode 100644 index 00000000..a552ea43 --- /dev/null +++ b/internal/store/postgres/channel_invite_batch_integration_test.go @@ -0,0 +1,130 @@ +package postgres + +import ( + "context" + "fmt" + "testing" + + "telesrv/internal/domain" +) + +func TestChannelStoreInviteBatchAdvancesDistinctReadModelsOncePostgres(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + suffix := randomSuffix(t) + users := NewUserStore(pool) + + owner, err := users.Create(ctx, domain.User{ + AccessHash: 960001, + Phone: "+1960" + suffix + "00", + FirstName: "BatchInviteOwner", + }) + if err != nil { + t.Fatalf("create owner: %v", err) + } + members := make([]domain.User, 8) + userIDs := make([]int64, len(members)) + for i := range members { + members[i], err = users.Create(ctx, domain.User{ + AccessHash: int64(960100 + i), + Phone: fmt.Sprintf("+1960%s%02d", suffix, i+1), + FirstName: fmt.Sprintf("BatchInvite%02d", i+1), + }) + if err != nil { + t.Fatalf("create member %d: %v", i, err) + } + // Deliberately reverse the input. The store must establish one canonical + // lock/write order independent of the request order. + userIDs[len(members)-1-i] = members[i].ID + } + allUserIDs := append([]int64{owner.ID}, userIDs...) + var channelID int64 + t.Cleanup(func() { + if channelID != 0 { + _, _ = pool.Exec(ctx, `DELETE FROM channels WHERE id = $1`, channelID) + } + _, _ = pool.Exec(ctx, `DELETE FROM users WHERE id = ANY($1::bigint[])`, allUserIDs) + }) + + channels := NewChannelStore(pool) + created, err := channels.CreateChannel(ctx, domain.CreateChannelRequest{ + CreatorUserID: owner.ID, + Title: "Batch Invite " + suffix, + Megagroup: true, + Date: 1700019600, + }) + if err != nil { + t.Fatalf("create channel: %v", err) + } + channelID = created.Channel.ID + + version := func(model string, ownerID int64, peerType string, peerID int64) int64 { + t.Helper() + var got int64 + err := pool.QueryRow(ctx, ` +SELECT version +FROM read_model_versions +WHERE model=$1 AND owner_user_id=$2 AND peer_type=$3 AND peer_id=$4`, model, ownerID, peerType, peerID).Scan(&got) + if err != nil { + return 0 + } + return got + } + participantsBefore := version("channel_participants", 0, "channel", channelID) + dialogOwnerBefore := make(map[int64]int64, len(userIDs)) + for _, userID := range userIDs { + dialogOwnerBefore[userID] = version("dialog_owner", userID, "user", userID) + } + + invited, err := channels.InviteToChannel(ctx, channelID, owner.ID, userIDs, 1700019601) + if err != nil { + t.Fatalf("batch invite: %v", err) + } + if len(invited.Members) != len(userIDs) { + t.Fatalf("invited members = %d, want %d", len(invited.Members), len(userIDs)) + } + if len(invited.Recipients) != 0 { + t.Fatalf("durable invite recipients = %v, want realtime audience derived from session fabric", invited.Recipients) + } + if invited.Event.Pts != created.Channel.Pts+1 || invited.Event.PtsCount != 1 || invited.Channel.Pts != invited.Event.Pts { + t.Fatalf("invite pts=(event:%d/%d channel:%d), want one slot after %d", invited.Event.Pts, invited.Event.PtsCount, invited.Channel.Pts, created.Channel.Pts) + } + if invited.Message.Action == nil || invited.Message.Action.Type != domain.ChannelActionChatAddUser || len(invited.Message.Action.UserIDs) != len(userIDs) { + t.Fatalf("invite service action = %+v, want all invited users", invited.Message.Action) + } + + if got := version("channel_participants", 0, "channel", channelID); got != participantsBefore+1 { + t.Fatalf("channel participants version = %d, want %d", got, participantsBefore+1) + } + for _, userID := range userIDs { + if got := version("channel_member", userID, "channel", channelID); got != 1 { + t.Errorf("channel_member version user %d = %d, want 1", userID, got) + } + if got := version("dialog_light", userID, "channel", channelID); got != 1 { + t.Errorf("dialog_light version user %d = %d, want 1", userID, got) + } + if got := version("channel_active_memberships", userID, "user", userID); got != 1 { + t.Errorf("active memberships version user %d = %d, want 1", userID, got) + } + if got := version("dialog_owner", userID, "user", userID); got != dialogOwnerBefore[userID]+1 { + t.Errorf("dialog_owner version user %d = %d, want %d", userID, got, dialogOwnerBefore[userID]+1) + } + } + + var memberRows, indexRows, dialogRows, adminRows int + if err := pool.QueryRow(ctx, `SELECT count(*) FROM channel_members WHERE channel_id=$1 AND user_id=ANY($2::bigint[]) AND status='active'`, channelID, userIDs).Scan(&memberRows); err != nil { + t.Fatalf("count member rows: %v", err) + } + if err := pool.QueryRow(ctx, `SELECT count(*) FROM user_channel_member_index WHERE channel_id=$1 AND user_id=ANY($2::bigint[]) AND status='active'`, channelID, userIDs).Scan(&indexRows); err != nil { + t.Fatalf("count membership indexes: %v", err) + } + if err := pool.QueryRow(ctx, `SELECT count(*) FROM channel_dialogs WHERE channel_id=$1 AND user_id=ANY($2::bigint[]) AND unread_count=1 AND unread_reactions_count=0`, channelID, userIDs).Scan(&dialogRows); err != nil { + t.Fatalf("count dialog rows: %v", err) + } + if err := pool.QueryRow(ctx, `SELECT count(*) FROM channel_admin_log_events WHERE channel_id=$1 AND event_type='participant_invite'`, channelID).Scan(&adminRows); err != nil { + t.Fatalf("count invite admin logs: %v", err) + } + if memberRows != len(userIDs) || indexRows != len(userIDs) || dialogRows != len(userIDs) || adminRows != len(userIDs) { + t.Fatalf("batch rows member/index/dialog/admin = %d/%d/%d/%d, want %d each", memberRows, indexRows, dialogRows, adminRows, len(userIDs)) + } +} diff --git a/internal/store/postgres/channel_invite_import.go b/internal/store/postgres/channel_invite_import.go index 8cf5ceb9..acdd0012 100644 --- a/internal/store/postgres/channel_invite_import.go +++ b/internal/store/postgres/channel_invite_import.go @@ -222,6 +222,9 @@ WHERE channel_id = $1 AND user_id = $2`, channel.ID, userID, member.ReadInboxMax if err := refreshChannelUnreadReactionsCountTx(ctx, tx, userID, channel.ID); err != nil { return domain.CreateChannelResult{}, err } + if err := enqueueWelcomeMessageDeliveriesTx(ctx, tx, channel.ID, []domain.ChannelMember{member}); err != nil { + return domain.CreateChannelResult{}, err + } return domain.CreateChannelResult{Channel: channel, Members: []domain.ChannelMember{member}, Message: msg, Event: event}, nil } diff --git a/internal/store/postgres/channel_invite_members.go b/internal/store/postgres/channel_invite_members.go index ee546aaf..014ac0c6 100644 --- a/internal/store/postgres/channel_invite_members.go +++ b/internal/store/postgres/channel_invite_members.go @@ -2,8 +2,8 @@ package postgres import ( "context" - "errors" "fmt" + "sort" "telesrv/internal/domain" ) @@ -39,13 +39,18 @@ func (s *ChannelStore) InviteToChannel(ctx context.Context, channelID, inviterUs date = nowUnix() } requested := uniqueChannelUserIDs(userIDs, 0) + sort.Slice(requested, func(i, j int) bool { return requested[i] < requested[j] }) inviteOne := len(requested) == 1 canRestoreKicked := canBanChannelUsers(inviter) invitedIDs := make([]int64, 0, len(requested)) members := make([]domain.ChannelMember, 0, len(requested)) restoredKicked := 0 + existingMembers, err := channelMembersForUpdateBatchTx(ctx, tx, channelID, requested) + if err != nil { + return domain.CreateChannelResult{}, err + } for _, userID := range requested { - if existing, err := s.getChannelMember(ctx, tx, channelID, userID); err == nil { + if existing, ok := existingMembers[userID]; ok { if existing.Status == domain.ChannelMemberActive { if inviteOne { return domain.CreateChannelResult{}, domain.ErrUserAlreadyParticipant @@ -63,8 +68,6 @@ func (s *ChannelStore) InviteToChannel(ctx context.Context, channelID, inviterUs restoredKicked++ } } - } else if !errors.Is(err, domain.ErrChannelPrivate) { - return domain.CreateChannelResult{}, err } member := domain.ChannelMember{ ChannelID: channelID, @@ -77,22 +80,19 @@ func (s *ChannelStore) InviteToChannel(ctx context.Context, channelID, inviterUs AvailableMinPts: channelInitialAvailableMinPts(channel), ReadInboxMaxID: channel.TopMessageID, } - if err := upsertChannelMemberTx(ctx, tx, channel, member); err != nil { - return domain.CreateChannelResult{}, err - } - if err := s.insertChannelAdminLogTx(ctx, tx, domain.ChannelAdminLogEvent{ - ChannelID: channelID, - UserID: inviterUserID, - Date: date, - Type: domain.ChannelAdminLogParticipantInvite, - Participant: &member, - }); err != nil { - return domain.CreateChannelResult{}, err - } members = append(members, member) invitedIDs = append(invitedIDs, userID) } if len(members) > 0 { + if err := enableChannelMembershipBatchTx(ctx, tx); err != nil { + return domain.CreateChannelResult{}, err + } + if err := upsertChannelMembersBatchTx(ctx, tx, channel, members); err != nil { + return domain.CreateChannelResult{}, err + } + if err := insertChannelInviteAdminLogsBatchTx(ctx, tx, channelID, inviterUserID, date, members); err != nil { + return domain.CreateChannelResult{}, err + } if _, err := tx.Exec(ctx, `UPDATE channels SET participants_count = participants_count + $2, kicked_count = GREATEST(kicked_count - $3, 0), updated_at = now() WHERE id = $1`, channelID, len(members), restoredKicked); err != nil { return domain.CreateChannelResult{}, fmt.Errorf("update channel participants: %w", err) } @@ -112,21 +112,24 @@ func (s *ChannelStore) InviteToChannel(ctx context.Context, channelID, inviterUs channel.TopMessageID = msg.ID channel.Pts = event.Pts } - for _, member := range members { - if err := upsertChannelDialogTx(ctx, tx, member.UserID, channel, msg, member.ReadInboxMaxID, member.ReadOutboxMaxID); err != nil { - return domain.CreateChannelResult{}, err - } - // 被重新拉入群也是重进:按新 available_min_id 重算未读 reaction 计数清幽灵角标。 - if err := refreshChannelUnreadReactionsCountTx(ctx, tx, member.UserID, channel.ID); err != nil { - return domain.CreateChannelResult{}, err - } + if err := upsertChannelDialogsBatchTx(ctx, tx, channel, msg, members); err != nil { + return domain.CreateChannelResult{}, err + } + // 被重新拉入群也是重进:按新 available_min_id 集合重算未读 reaction 计数清幽灵角标。 + if err := refreshChannelUnreadReactionsCountsBatchTx(ctx, tx, channel.ID, invitedIDs); err != nil { + return domain.CreateChannelResult{}, err + } + if err := enqueueWelcomeMessageDeliveriesTx(ctx, tx, channel.ID, members); err != nil { + return domain.CreateChannelResult{}, err + } + if err := bumpChannelMembershipReadModelsBatchTx(ctx, tx, channel.ID, invitedIDs); err != nil { + return domain.CreateChannelResult{}, err } if err := tx.Commit(ctx); err != nil { return domain.CreateChannelResult{}, fmt.Errorf("commit invite channel: %w", err) } committed = true - recipients, _ := s.ListActiveChannelMemberIDs(ctx, inviterUserID, channelID, 0) - return domain.CreateChannelResult{Channel: channel, Members: members, Message: msg, Event: event, Recipients: recipients}, nil + return domain.CreateChannelResult{Channel: channel, Members: members, Message: msg, Event: event}, nil } func canInviteToChannel(channel domain.Channel, member domain.ChannelMember) bool { diff --git a/internal/store/postgres/channel_member_admin.go b/internal/store/postgres/channel_member_admin.go index f3c2eaff..e82efaf6 100644 --- a/internal/store/postgres/channel_member_admin.go +++ b/internal/store/postgres/channel_member_admin.go @@ -36,6 +36,7 @@ func (s *ChannelStore) EditChannelAdmin(ctx context.Context, req domain.EditChan return domain.EditChannelAdminResult{}, domain.ErrChannelAdminRequired } previous, err := s.getChannelMember(ctx, tx, req.ChannelID, req.MemberID) + membershipActivated := err != nil && errors.Is(err, domain.ErrChannelPrivate) if err != nil { if !errors.Is(err, domain.ErrChannelPrivate) { return domain.EditChannelAdminResult{}, err @@ -52,6 +53,9 @@ func (s *ChannelStore) EditChannelAdmin(ctx context.Context, req domain.EditChan ReadInboxMaxID: channel.TopMessageID, } } + if previous.Status != domain.ChannelMemberActive { + membershipActivated = true + } if previous.Role == domain.ChannelRoleCreator { if req.MemberID != req.UserID || channel.CreatorUserID != req.UserID || actor.Role != domain.ChannelRoleCreator { return domain.EditChannelAdminResult{}, domain.ErrChannelUserCreator @@ -100,6 +104,7 @@ func (s *ChannelStore) EditChannelAdmin(ctx context.Context, req domain.EditChan member.Rank = req.Rank } if previous.Status != domain.ChannelMemberActive { + member.JoinedAt = req.Date if minPts := channelInitialAvailableMinPts(channel); minPts > member.AvailableMinPts { member.AvailableMinPts = minPts } @@ -137,6 +142,11 @@ func (s *ChannelStore) EditChannelAdmin(ctx context.Context, req domain.EditChan if err := upsertChannelDialogTx(ctx, tx, member.UserID, channel, msg, member.ReadInboxMaxID, member.ReadOutboxMaxID); err != nil { return domain.EditChannelAdminResult{}, err } + if membershipActivated { + if err := enqueueWelcomeMessageDeliveriesTx(ctx, tx, channel.ID, []domain.ChannelMember{member}); err != nil { + return domain.EditChannelAdminResult{}, err + } + } if err := tx.Commit(ctx); err != nil { return domain.EditChannelAdminResult{}, fmt.Errorf("commit edit channel admin: %w", err) } @@ -449,6 +459,11 @@ func (s *ChannelStore) EditChannelBanned(ctx context.Context, req domain.EditCha return domain.EditChannelBannedResult{}, err } } + if previous.Status == domain.ChannelMemberActive && member.Status != domain.ChannelMemberActive { + if err := deleteWelcomeMessageDeliveriesTx(ctx, tx, req.ChannelID, []int64{req.Participant.ID}); err != nil { + return domain.EditChannelBannedResult{}, err + } + } var serviceMsg domain.ChannelMessage var serviceEvent domain.ChannelUpdateEvent if channel.Megagroup && previous.Status == domain.ChannelMemberActive && member.Status == domain.ChannelMemberKicked { diff --git a/internal/store/postgres/channel_member_cache.go b/internal/store/postgres/channel_member_cache.go index 82a18a0d..abccc14c 100644 --- a/internal/store/postgres/channel_member_cache.go +++ b/internal/store/postgres/channel_member_cache.go @@ -56,6 +56,27 @@ func (c *ChannelMemberCache) put(member domain.ChannelMember) { c.cache.Store(channelMemberCacheKey{channelID: member.ChannelID, userID: member.UserID}, member) } +func (c *ChannelMemberCache) cacheEpoch() uint64 { + if c == nil { + return 0 + } + return c.cache.LoadEpoch() +} + +// putIfEpoch prevents a materialized owner snapshot that raced a membership +// invalidation from restoring stale access rights after the listener advanced +// the cache epoch. +func (c *ChannelMemberCache) putIfEpoch(member domain.ChannelMember, loadEpoch uint64) { + if c == nil || member.ChannelID == 0 || member.UserID == 0 { + return + } + c.cache.StoreIfEpoch( + channelMemberCacheKey{channelID: member.ChannelID, userID: member.UserID}, + member, + loadEpoch, + ) +} + func (c *ChannelMemberCache) delete(channelID, userID int64) { if c == nil || channelID == 0 || userID == 0 { return diff --git a/internal/store/postgres/channel_member_cache_test.go b/internal/store/postgres/channel_member_cache_test.go index 53bb687b..2f755a60 100644 --- a/internal/store/postgres/channel_member_cache_test.go +++ b/internal/store/postgres/channel_member_cache_test.go @@ -55,6 +55,29 @@ func TestChannelMemberCachePutGetDeleteFlush(t *testing.T) { } } +func TestChannelMemberCachePutIfEpochRejectsStaleSnapshot(t *testing.T) { + c := NewChannelMemberCache(16) + epoch := c.cacheEpoch() + c.delete(10, 20) + c.putIfEpoch(domain.ChannelMember{ + ChannelID: 10, + UserID: 20, + Status: domain.ChannelMemberActive, + }, epoch) + if _, ok := c.get(10, 20); ok { + t.Fatal("stale materialized membership restored after invalidation") + } + freshEpoch := c.cacheEpoch() + c.putIfEpoch(domain.ChannelMember{ + ChannelID: 10, + UserID: 20, + Status: domain.ChannelMemberActive, + }, freshEpoch) + if member, ok := c.get(10, 20); !ok || member.Status != domain.ChannelMemberActive { + t.Fatalf("fresh materialized membership = %+v ok=%v", member, ok) + } +} + func TestChannelMemberCacheDeleteChannelAndCap(t *testing.T) { c := NewChannelMemberCache(2) c.put(domain.ChannelMember{ChannelID: 1, UserID: 10}) diff --git a/internal/store/postgres/channel_member_join.go b/internal/store/postgres/channel_member_join.go index 5a77bd45..67f3ac2f 100644 --- a/internal/store/postgres/channel_member_join.go +++ b/internal/store/postgres/channel_member_join.go @@ -126,6 +126,9 @@ WHERE channel_id = $1 AND user_id = $2`, channelID, userID, member.ReadInboxMaxI if err := refreshChannelUnreadReactionsCountTx(ctx, tx, userID, channelID); err != nil { return domain.CreateChannelResult{}, err } + if err := enqueueWelcomeMessageDeliveriesTx(ctx, tx, channelID, []domain.ChannelMember{member}); err != nil { + return domain.CreateChannelResult{}, err + } if err := tx.Commit(ctx); err != nil { return domain.CreateChannelResult{}, fmt.Errorf("commit join channel: %w", err) } @@ -242,6 +245,9 @@ WHERE id = $1`, channelID, channel.CreatorUserID, adminsDelta); err != nil { if err := clearChannelMentionsForUserTx(ctx, tx, channelID, userID); err != nil { return domain.CreateChannelResult{}, err } + if err := deleteWelcomeMessageDeliveriesTx(ctx, tx, channelID, []int64{userID}); err != nil { + return domain.CreateChannelResult{}, err + } var msg domain.ChannelMessage var event domain.ChannelUpdateEvent if channel.Megagroup { diff --git a/internal/store/postgres/channel_member_list.go b/internal/store/postgres/channel_member_list.go index ec7a943c..ced215d5 100644 --- a/internal/store/postgres/channel_member_list.go +++ b/internal/store/postgres/channel_member_list.go @@ -10,6 +10,7 @@ import ( "github.com/jackc/pgx/v5" "telesrv/internal/domain" + "telesrv/internal/store" ) func (s *ChannelStore) GetParticipants(ctx context.Context, viewerUserID, channelID int64, filter domain.ChannelParticipantsFilter, offset, limit int) (domain.ChannelParticipantList, error) { @@ -364,6 +365,70 @@ ORDER BY user_id`, channelID, candidates[start:end]) return out, nil } +func (s *ChannelStore) FilterActiveChannelMemberPairs(ctx context.Context, userIDsByChannel map[int64][]int64) (map[int64][]int64, error) { + channelIDs, userIDs, err := flattenActiveChannelMemberPairs(userIDsByChannel) + if err != nil { + return nil, err + } + out := make(map[int64][]int64) + if len(channelIDs) == 0 { + return out, nil + } + rows, err := s.db.Query(ctx, ` +WITH requested(channel_id, user_id) AS ( + SELECT * FROM unnest($1::bigint[], $2::bigint[]) +) +SELECT r.channel_id, r.user_id +FROM requested r +JOIN channel_members m + ON m.channel_id = r.channel_id + AND m.user_id = r.user_id +WHERE m.status = 'active' +ORDER BY r.channel_id, r.user_id`, channelIDs, userIDs) + if err != nil { + return nil, fmt.Errorf("filter active channel member pairs: %w", err) + } + defer rows.Close() + for rows.Next() { + var channelID, userID int64 + if err := rows.Scan(&channelID, &userID); err != nil { + return nil, err + } + out[channelID] = append(out[channelID], userID) + } + if err := rows.Err(); err != nil { + return nil, err + } + return out, nil +} + +func flattenActiveChannelMemberPairs(userIDsByChannel map[int64][]int64) ([]int64, []int64, error) { + channelIDs := make([]int64, 0) + userIDs := make([]int64, 0) + seen := make(map[[2]int64]struct{}) + for channelID, candidates := range userIDsByChannel { + if channelID == 0 { + continue + } + for _, userID := range candidates { + if userID == 0 { + continue + } + pair := [2]int64{channelID, userID} + if _, ok := seen[pair]; ok { + continue + } + if len(seen) >= store.MaxActiveChannelMemberPairs { + return nil, nil, fmt.Errorf("%w: maximum %d", store.ErrActiveChannelMemberPairsLimit, store.MaxActiveChannelMemberPairs) + } + seen[pair] = struct{}{} + channelIDs = append(channelIDs, channelID) + userIDs = append(userIDs, userID) + } + } + return channelIDs, userIDs, nil +} + func (s *ChannelStore) FilterChannelMessageAudienceIDs(ctx context.Context, channelID int64, userIDs []int64) ([]int64, error) { if channelID == 0 || len(userIDs) == 0 { return nil, nil diff --git a/internal/store/postgres/channel_member_pairs_integration_test.go b/internal/store/postgres/channel_member_pairs_integration_test.go new file mode 100644 index 00000000..1b0f7717 --- /dev/null +++ b/internal/store/postgres/channel_member_pairs_integration_test.go @@ -0,0 +1,64 @@ +package postgres + +import ( + "context" + "testing" + + "telesrv/internal/domain" +) + +func TestFilterActiveChannelMemberPairsPostgresKeepsExactEdges(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + suffix := randomSuffix(t) + users := NewUserStore(pool) + owner := createTestUser(t, ctx, users, "+1911"+suffix+"01", "Pair", "Owner") + memberA := createTestUser(t, ctx, users, "+1911"+suffix+"02", "Pair", "A") + memberB := createTestUser(t, ctx, users, "+1911"+suffix+"03", "Pair", "B") + userIDs := []int64{owner.ID, memberA.ID, memberB.ID} + var channelIDs []int64 + t.Cleanup(func() { + if len(channelIDs) > 0 { + _, _ = pool.Exec(ctx, "DELETE FROM channels WHERE id = ANY($1::bigint[])", channelIDs) + } + _, _ = pool.Exec(ctx, "DELETE FROM users WHERE id = ANY($1::bigint[])", userIDs) + }) + + channels := NewChannelStore(pool) + first, err := channels.CreateChannel(ctx, domain.CreateChannelRequest{ + CreatorUserID: owner.ID, + MemberUserIDs: []int64{memberA.ID, memberB.ID}, + Title: "pair first " + suffix, + Megagroup: true, + Date: 1700000000, + }) + if err != nil { + t.Fatalf("CreateChannel(first): %v", err) + } + channelIDs = append(channelIDs, first.Channel.ID) + second, err := channels.CreateChannel(ctx, domain.CreateChannelRequest{ + CreatorUserID: owner.ID, + MemberUserIDs: []int64{memberA.ID, memberB.ID}, + Title: "pair second " + suffix, + Megagroup: true, + Date: 1700000001, + }) + if err != nil { + t.Fatalf("CreateChannel(second): %v", err) + } + channelIDs = append(channelIDs, second.Channel.ID) + + got, err := channels.FilterActiveChannelMemberPairs(ctx, map[int64][]int64{ + first.Channel.ID: {memberA.ID}, + second.Channel.ID: {memberB.ID}, + }) + if err != nil { + t.Fatalf("FilterActiveChannelMemberPairs: %v", err) + } + if len(got[first.Channel.ID]) != 1 || got[first.Channel.ID][0] != memberA.ID { + t.Fatalf("first channel result = %+v, want [%d]", got[first.Channel.ID], memberA.ID) + } + if len(got[second.Channel.ID]) != 1 || got[second.Channel.ID][0] != memberB.ID { + t.Fatalf("second channel result = %+v, want [%d]", got[second.Channel.ID], memberB.ID) + } +} diff --git a/internal/store/postgres/channel_membership_batch.go b/internal/store/postgres/channel_membership_batch.go new file mode 100644 index 00000000..565d7cf1 --- /dev/null +++ b/internal/store/postgres/channel_membership_batch.go @@ -0,0 +1,274 @@ +package postgres + +import ( + "context" + "encoding/json" + "fmt" + + "github.com/jackc/pgx/v5" + + "telesrv/internal/domain" +) + +func channelMembersForUpdateBatchTx(ctx context.Context, tx pgx.Tx, channelID int64, userIDs []int64) (map[int64]domain.ChannelMember, error) { + rows, err := tx.Query(ctx, ` +SELECT channel_id, user_id, inviter_user_id, role, status, joined_at, left_at, + admin_rights::text, banned_rights::text, rank, available_min_id, available_min_pts, + history_clear_anchor_id, history_clear_anchor_date, + read_inbox_max_id, read_outbox_max_id, unread_mark, slowmode_last_send_date +FROM channel_members +WHERE channel_id = $1 AND user_id = ANY($2::bigint[]) +ORDER BY user_id +FOR UPDATE`, channelID, userIDs) + if err != nil { + return nil, fmt.Errorf("lock channel invite members: %w", err) + } + defer rows.Close() + out := make(map[int64]domain.ChannelMember, len(userIDs)) + for rows.Next() { + member, err := scanChannelMember(rows) + if err != nil { + return nil, err + } + out[member.UserID] = member + } + if err := rows.Err(); err != nil { + return nil, fmt.Errorf("lock channel invite members: %w", err) + } + return out, nil +} + +func enableChannelMembershipBatchTx(ctx context.Context, tx pgx.Tx) error { + if _, err := tx.Exec(ctx, `SELECT set_config('telesrv.membership_batch_mode', 'on', true)`); err != nil { + return fmt.Errorf("enable channel membership batch invalidation: %w", err) + } + return nil +} + +func upsertChannelMembersBatchTx(ctx context.Context, tx pgx.Tx, channel domain.Channel, members []domain.ChannelMember) error { + if len(members) == 0 { + return nil + } + userIDs := make([]int64, len(members)) + inviterIDs := make([]int64, len(members)) + joinedAt := make([]int32, len(members)) + availableMinIDs := make([]int32, len(members)) + availableMinPts := make([]int32, len(members)) + readInboxMaxIDs := make([]int32, len(members)) + for i, member := range members { + userIDs[i] = member.UserID + inviterIDs[i] = member.InviterUserID + joinedAt[i] = int32(member.JoinedAt) + availableMinIDs[i] = int32(member.AvailableMinID) + availableMinPts[i] = int32(member.AvailableMinPts) + readInboxMaxIDs[i] = int32(member.ReadInboxMaxID) + } + if _, err := tx.Exec(ctx, ` +WITH input AS MATERIALIZED ( + SELECT user_id, inviter_user_id, joined_at, available_min_id, available_min_pts, read_inbox_max_id + FROM unnest( + $2::bigint[], $3::bigint[], $4::integer[], $5::integer[], $6::integer[], $7::integer[] + ) AS value(user_id, inviter_user_id, joined_at, available_min_id, available_min_pts, read_inbox_max_id) +) +INSERT INTO channel_members ( + channel_id, user_id, inviter_user_id, role, status, joined_at, left_at, + admin_rights, banned_rights, rank, available_min_id, available_min_pts, + read_inbox_max_id, read_outbox_max_id, unread_mark, slowmode_last_send_date +) +SELECT $1, user_id, inviter_user_id, 'member', 'active', joined_at, 0, + '{}'::jsonb, '{}'::jsonb, '', available_min_id, available_min_pts, + read_inbox_max_id, 0, false, 0 +FROM input +ORDER BY user_id +ON CONFLICT (channel_id, user_id) DO UPDATE SET + inviter_user_id = EXCLUDED.inviter_user_id, + role = EXCLUDED.role, + status = EXCLUDED.status, + joined_at = EXCLUDED.joined_at, + left_at = EXCLUDED.left_at, + admin_rights = EXCLUDED.admin_rights, + banned_rights = EXCLUDED.banned_rights, + rank = EXCLUDED.rank, + available_min_id = GREATEST(channel_members.available_min_id, EXCLUDED.available_min_id), + available_min_pts = GREATEST(channel_members.available_min_pts, EXCLUDED.available_min_pts), + read_inbox_max_id = GREATEST(channel_members.read_inbox_max_id, EXCLUDED.read_inbox_max_id), + updated_at = now()`, channel.ID, userIDs, inviterIDs, joinedAt, availableMinIDs, availableMinPts, readInboxMaxIDs); err != nil { + return fmt.Errorf("batch upsert channel members: %w", err) + } + + if _, err := tx.Exec(ctx, ` +WITH input AS MATERIALIZED ( + SELECT user_id + FROM unnest($2::bigint[]) AS value(user_id) +) +INSERT INTO user_channel_member_index ( + user_id, channel_id, status, megagroup, broadcast, deleted, + role, left_at, forum, public_username, can_pin_messages +) +SELECT user_id, $1, 'active', $3, $4, $5, 'member', 0, $6, $7, false +FROM input +ORDER BY user_id +ON CONFLICT (user_id, channel_id) DO UPDATE SET + status = EXCLUDED.status, + megagroup = EXCLUDED.megagroup, + broadcast = EXCLUDED.broadcast, + deleted = EXCLUDED.deleted, + role = EXCLUDED.role, + left_at = EXCLUDED.left_at, + forum = EXCLUDED.forum, + public_username = EXCLUDED.public_username, + can_pin_messages = EXCLUDED.can_pin_messages, + updated_at = now()`, channel.ID, userIDs, channel.Megagroup, channel.Broadcast, channel.Deleted, channel.Forum, channel.Username != ""); err != nil { + return fmt.Errorf("batch upsert user channel member index: %w", err) + } + return nil +} + +func insertChannelInviteAdminLogsBatchTx(ctx context.Context, tx pgx.Tx, channelID, inviterUserID int64, date int, members []domain.ChannelMember) error { + if len(members) == 0 { + return nil + } + type row struct { + Ordinal int `json:"ordinal"` + Participant domain.ChannelMember `json:"participant"` + } + input := make([]row, len(members)) + for i, member := range members { + input[i] = row{Ordinal: i + 1, Participant: member} + } + payload, err := json.Marshal(input) + if err != nil { + return fmt.Errorf("marshal channel invite admin logs: %w", err) + } + if _, err := tx.Exec(ctx, ` +WITH input AS MATERIALIZED ( + SELECT ordinal, participant + FROM jsonb_to_recordset($5::jsonb) AS value(ordinal integer, participant jsonb) +), allocated AS MATERIALIZED ( + UPDATE channels + SET admin_log_seq = admin_log_seq + $4, updated_at = now() + WHERE id = $1 + RETURNING admin_log_seq +) +INSERT INTO channel_admin_log_events ( + channel_id, id, actor_user_id, event_date, event_type, participant, query +) +SELECT $1, allocated.admin_log_seq - $4 + input.ordinal, $2, $3, + 'participant_invite', input.participant, '' +FROM input +CROSS JOIN allocated +ORDER BY input.ordinal`, channelID, inviterUserID, date, len(members), string(payload)); err != nil { + return fmt.Errorf("batch insert channel invite admin logs: %w", err) + } + return nil +} + +func upsertChannelDialogsBatchTx(ctx context.Context, tx pgx.Tx, channel domain.Channel, top domain.ChannelMessage, members []domain.ChannelMember) error { + if len(members) == 0 { + return nil + } + topDate := top.Date + if topDate == 0 { + topDate = channel.Date + } + userIDs := make([]int64, len(members)) + readInboxMaxIDs := make([]int32, len(members)) + readOutboxMaxIDs := make([]int32, len(members)) + for i, member := range members { + userIDs[i] = member.UserID + readInboxMaxIDs[i] = int32(member.ReadInboxMaxID) + readOutboxMaxIDs[i] = int32(member.ReadOutboxMaxID) + } + if _, err := tx.Exec(ctx, ` +WITH input AS MATERIALIZED ( + SELECT user_id, read_inbox_max_id, read_outbox_max_id + FROM unnest($4::bigint[], $5::integer[], $6::integer[]) + AS value(user_id, read_inbox_max_id, read_outbox_max_id) +) +INSERT INTO channel_dialogs ( + user_id, channel_id, top_message_id, top_message_date, + read_inbox_max_id, read_outbox_max_id, unread_count, unread_mark +) +SELECT user_id, $1, $2, $3, read_inbox_max_id, read_outbox_max_id, 0, false +FROM input +ORDER BY user_id +ON CONFLICT (user_id, channel_id) DO UPDATE SET + top_message_id = GREATEST(channel_dialogs.top_message_id, EXCLUDED.top_message_id), + top_message_date = GREATEST(channel_dialogs.top_message_date, EXCLUDED.top_message_date), + read_inbox_max_id = GREATEST(channel_dialogs.read_inbox_max_id, EXCLUDED.read_inbox_max_id), + read_outbox_max_id = GREATEST(channel_dialogs.read_outbox_max_id, EXCLUDED.read_outbox_max_id), + unread_mark = false, + updated_at = now()`, channel.ID, channel.TopMessageID, topDate, userIDs, readInboxMaxIDs, readOutboxMaxIDs); err != nil { + return fmt.Errorf("batch upsert channel dialogs: %w", err) + } + if _, err := tx.Exec(ctx, ` +UPDATE channel_dialogs AS dialog +SET unread_count = ( + SELECT COUNT(*)::int + FROM ( + SELECT 1 + FROM channel_messages AS message + WHERE message.channel_id = dialog.channel_id + AND message.id > dialog.read_inbox_max_id + AND message.id <= dialog.top_message_id + AND message.sender_user_id <> dialog.user_id + AND NOT message.deleted + LIMIT $3 + ) AS capped + ), + updated_at = now() +WHERE dialog.channel_id = $1 + AND dialog.user_id = ANY($2::bigint[])`, channel.ID, userIDs, domain.MaxDialogUnreadCount); err != nil { + return fmt.Errorf("batch refresh channel dialog unread count: %w", err) + } + return nil +} + +func refreshChannelUnreadReactionsCountsBatchTx(ctx context.Context, tx pgx.Tx, channelID int64, userIDs []int64) error { + if len(userIDs) == 0 { + return nil + } + if _, err := tx.Exec(ctx, ` +WITH input AS MATERIALIZED ( + SELECT user_id FROM unnest($2::bigint[]) AS value(user_id) +), counts AS MATERIALIZED ( + SELECT input.user_id, + ( + SELECT COUNT(DISTINCT reaction.message_id)::int + FROM channel_message_reactions AS reaction + JOIN channel_messages AS message + ON message.channel_id = reaction.channel_id AND message.id = reaction.message_id + JOIN channel_members AS member + ON member.channel_id = reaction.channel_id AND member.user_id = input.user_id + WHERE reaction.sender_user_id = input.user_id + AND reaction.channel_id = $1 + AND reaction.unread + AND reaction.reacted_user_id <> input.user_id + AND message.id > member.available_min_id + AND NOT message.deleted + AND member.status = 'active' + AND NOT COALESCE((member.banned_rights->>'ViewMessages')::boolean, false) + ) AS count + FROM input +) +INSERT INTO channel_dialogs (user_id, channel_id, unread_reactions_count) +SELECT user_id, $1, count +FROM counts +ORDER BY user_id +ON CONFLICT (user_id, channel_id) DO UPDATE SET + unread_reactions_count = EXCLUDED.unread_reactions_count, + updated_at = now()`, channelID, userIDs); err != nil { + return fmt.Errorf("batch refresh channel unread reactions count: %w", err) + } + return nil +} + +func bumpChannelMembershipReadModelsBatchTx(ctx context.Context, tx pgx.Tx, channelID int64, userIDs []int64) error { + if len(userIDs) == 0 { + return nil + } + if _, err := tx.Exec(ctx, `SELECT public.telesrv_bump_channel_membership_read_models($1, $2::bigint[])`, channelID, userIDs); err != nil { + return fmt.Errorf("batch bump channel membership read models: %w", err) + } + return nil +} diff --git a/internal/store/postgres/channel_message_helpers.go b/internal/store/postgres/channel_message_helpers.go index 74679124..2c23243c 100644 --- a/internal/store/postgres/channel_message_helpers.go +++ b/internal/store/postgres/channel_message_helpers.go @@ -163,32 +163,6 @@ func channelMessageReplyFromColumns(reply *domain.MessageReply, msgID int, peerT return out } -func collectChannelMessageRefs(msg domain.ChannelMessage, currentChannelID int64, userRefs, channelRefs map[int64]struct{}) { - if msg.SenderUserID != 0 { - userRefs[msg.SenderUserID] = struct{}{} - } - addPeerRef(msg.From, currentChannelID, userRefs, channelRefs) - if msg.SendAs != nil { - addPeerRef(*msg.SendAs, currentChannelID, userRefs, channelRefs) - } - if msg.Forward != nil { - addPeerRef(msg.Forward.From, currentChannelID, userRefs, channelRefs) - } - if msg.ViaBotID != 0 { - userRefs[msg.ViaBotID] = struct{}{} - } - if msg.ReplyTo != nil { - addPeerRef(msg.ReplyTo.Peer, currentChannelID, userRefs, channelRefs) - } - if msg.Action != nil { - for _, id := range msg.Action.UserIDs { - if id != 0 { - userRefs[id] = struct{}{} - } - } - } -} - type pgChannelMessageIDAllocator struct { db sqlcgen.DBTX } diff --git a/internal/store/postgres/channel_message_history.go b/internal/store/postgres/channel_message_history.go index 18917d91..355f9483 100644 --- a/internal/store/postgres/channel_message_history.go +++ b/internal/store/postgres/channel_message_history.go @@ -1003,7 +1003,7 @@ WHERE channel_id = $1 AND user_id = $2`, req.ChannelID, req.UserID, maxID, req.D } msg, _ := s.getChannelMessage(ctx, tx, req.ChannelID, channel.TopMessageID) if changed { - outboxUpdates, err = advanceChannelReadOutboxTx(ctx, tx, channel, msg, req.UserID, previous, maxID) + outboxUpdates, err = advanceChannelReadOutboxTx(ctx, tx, channel.ID, req.UserID, previous, maxID) if err != nil { return domain.ReadChannelHistoryResult{}, err } diff --git a/internal/store/postgres/channel_reaction_helpers.go b/internal/store/postgres/channel_reaction_helpers.go index 6cea7b7d..77632495 100644 --- a/internal/store/postgres/channel_reaction_helpers.go +++ b/internal/store/postgres/channel_reaction_helpers.go @@ -46,6 +46,18 @@ func emptyChannelMessageReactions(channel domain.Channel) domain.ChannelMessageR } func (s *ChannelStore) populateChannelMessagesReactions(ctx context.Context, db sqlcgen.DBTX, viewerUserID int64, channels []domain.Channel, messages []domain.ChannelMessage) error { + return s.populateChannelMessagesReactionsWhere(ctx, db, viewerUserID, channels, messages, nil, false) +} + +func (s *ChannelStore) populateChannelMessagesReactionsWhere( + ctx context.Context, + db sqlcgen.DBTX, + viewerUserID int64, + channels []domain.Channel, + messages []domain.ChannelMessage, + reactionEligible func(domain.ChannelMessage) bool, + unreadAlreadyProjected bool, +) error { if len(messages) == 0 { return nil } @@ -53,8 +65,10 @@ func (s *ChannelStore) populateChannelMessagesReactions(ctx context.Context, db if err := s.populateChannelMessagesPolls(ctx, db, viewerUserID, messages); err != nil { return err } - if err := populateChannelMessageUnreadFlags(ctx, db, viewerUserID, messages); err != nil { - return err + if !unreadAlreadyProjected { + if err := populateChannelMessageUnreadFlags(ctx, db, viewerUserID, messages); err != nil { + return err + } } channelsByID := make(map[int64]domain.Channel, len(channels)) for _, ch := range channels { @@ -68,6 +82,9 @@ func (s *ChannelStore) populateChannelMessagesReactions(ctx context.Context, db if messages[i].ChannelID == 0 || messages[i].ID <= 0 { continue } + if reactionEligible != nil && !reactionEligible(messages[i]) { + continue + } key := channelReactionMessageKey{channelID: messages[i].ChannelID, messageID: messages[i].ID} if _, ok := indexes[key]; !ok { idsByChannel[messages[i].ChannelID] = append(idsByChannel[messages[i].ChannelID], int32(messages[i].ID)) @@ -202,6 +219,30 @@ ORDER BY channel_id ASC, message_id ASC, reaction_date DESC, reacted_user_id DES return nil } +// populateChannelDialogTopMessageReactions keeps poll and unread-mention +// enrichment exact for every message, but uses the shared top-message +// existence cache to avoid querying three reaction tables when no reaction row +// can possibly contribute to the viewer projection. +func (s *ChannelStore) populateChannelDialogTopMessageReactions( + ctx context.Context, + db sqlcgen.DBTX, + viewerUserID int64, + channels []domain.Channel, + messages []domain.ChannelMessage, + unreadAlreadyProjected bool, +) error { + if !s.topMessageCacheActive(db) || len(messages) == 0 { + return s.populateChannelMessagesReactions(ctx, db, viewerUserID, channels, messages) + } + presence, err := s.topMsgCache.reactionPresenceFor(ctx, db, messages) + if err != nil { + return fmt.Errorf("load channel top reaction presence: %w", err) + } + return s.populateChannelMessagesReactionsWhere(ctx, db, viewerUserID, channels, messages, func(msg domain.ChannelMessage) bool { + return presence[channelMessageLookupKey{channelID: msg.ChannelID, id: msg.ID}].any() + }, unreadAlreadyProjected) +} + func channelReactionOffset(row domain.ChannelMessagePeerReaction) string { return strconv.Itoa(row.Date) + ":" + strconv.FormatInt(row.UserID, 10) + ":" + string(row.Reaction.Type) + ":" + row.Reaction.Value() } diff --git a/internal/store/postgres/channel_reaction_messages.go b/internal/store/postgres/channel_reaction_messages.go index 3b3196c2..ecbdb1e2 100644 --- a/internal/store/postgres/channel_reaction_messages.go +++ b/internal/store/postgres/channel_reaction_messages.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "strings" + "telesrv/internal/domain" ) diff --git a/internal/store/postgres/channel_reaction_policy_integration_test.go b/internal/store/postgres/channel_reaction_policy_integration_test.go index fc75bae4..55b3dda2 100644 --- a/internal/store/postgres/channel_reaction_policy_integration_test.go +++ b/internal/store/postgres/channel_reaction_policy_integration_test.go @@ -3,11 +3,66 @@ package postgres import ( "context" "errors" + "os" "testing" + "time" "telesrv/internal/domain" ) +func TestChannelTopReactionPresenceNegativeCacheInvalidatesOnReaction(t *testing.T) { + env := newReactionPolicyTestEnv(t, false) + ctx := context.Background() + topCache := NewChannelTopMessageCache(32) + env.channels.topMsgCache = topCache + key := channelMessageLookupKey{channelID: env.channelID, id: env.messageID} + + // Observe listener readiness through a sentinel flush before warming the + // negative reaction-presence entry. + topCache.reactionPresence.Store(key, channelTopReactionPresence{Normal: true}) + lctx, cancel := context.WithCancel(ctx) + defer cancel() + listener := NewReadModelChangeListener(os.Getenv("TELESRV_TEST_POSTGRES_DSN"), ReadModelCacheSet{ + ChannelTopMessages: topCache, + }, nil) + go listener.Run(lctx) + if !waitUntil(2*time.Second, func() bool { + _, ok := topCache.reactionPresence.Peek(key) + return !ok + }) { + t.Fatal("read-model listener did not flush reaction sentinel") + } + + before, err := env.channels.GetChannelDialogs(ctx, env.ownerID, []int64{env.channelID}) + if err != nil { + t.Fatalf("warm no-reaction dialog: %v", err) + } + if len(before.Messages) != 1 || before.Messages[0].Reactions != nil { + t.Fatalf("before reaction messages = %+v", before.Messages) + } + if presence, ok := topCache.reactionPresence.Peek(key); !ok || presence.any() { + t.Fatalf("negative presence not cached: ok=%v value=%+v", ok, presence) + } + + if _, err := env.react(t, env.memberID, "U0001f44d"); err != nil { + t.Fatalf("add reaction: %v", err) + } + if !waitUntil(3*time.Second, func() bool { + _, ok := topCache.reactionPresence.Peek(key) + return !ok + }) { + t.Fatal("reaction write did not invalidate negative presence") + } + + after, err := env.channels.GetChannelDialogs(ctx, env.ownerID, []int64{env.channelID}) + if err != nil { + t.Fatalf("dialog after reaction: %v", err) + } + if len(after.Messages) != 1 || after.Messages[0].Reactions == nil || len(after.Messages[0].Reactions.Results) != 1 || after.Messages[0].Reactions.Results[0].Count != 1 { + t.Fatalf("after reaction messages = %+v", after.Messages) + } +} + type reactionPolicyTestEnv struct { channels *ChannelStore channelID int64 diff --git a/internal/store/postgres/channel_read.go b/internal/store/postgres/channel_read.go index 3923aa0d..8a608bf8 100644 --- a/internal/store/postgres/channel_read.go +++ b/internal/store/postgres/channel_read.go @@ -2,7 +2,6 @@ package postgres import ( "context" - "errors" "fmt" "github.com/jackc/pgx/v5" "sort" @@ -359,7 +358,7 @@ func (s *ChannelStore) ReadChannelHistory(ctx context.Context, req domain.ReadCh return domain.ReadChannelHistoryResult{}, lastErr } -func advanceChannelReadOutboxTx(ctx context.Context, tx pgx.Tx, channel domain.Channel, top domain.ChannelMessage, readerUserID int64, previous, maxID int) ([]domain.ChannelReadOutboxUpdate, error) { +func advanceChannelReadOutboxTx(ctx context.Context, tx pgx.Tx, channelID, readerUserID int64, previous, maxID int) ([]domain.ChannelReadOutboxUpdate, error) { if maxID <= previous { return nil, nil } @@ -368,7 +367,7 @@ func advanceChannelReadOutboxTx(ctx context.Context, tx pgx.Tx, channel domain.C lowerID = maxID - domain.MaxChannelReadOutboxScanMessages } rows, err := tx.Query(ctx, ` -WITH latest_sender_messages AS ( +WITH latest_sender_messages AS MATERIALIZED ( SELECT sender_user_id, MAX(id) AS max_id FROM channel_messages WHERE channel_id = $1 @@ -379,52 +378,35 @@ WITH latest_sender_messages AS ( GROUP BY sender_user_id ORDER BY max_id DESC LIMIT $5 +), updated AS ( + UPDATE channel_members AS member + SET read_outbox_max_id = GREATEST(member.read_outbox_max_id, latest.max_id), + updated_at = now() + FROM latest_sender_messages AS latest + WHERE member.channel_id = $1 + AND member.user_id = latest.sender_user_id + AND member.status = 'active' + AND member.read_outbox_max_id < latest.max_id + RETURNING member.user_id, member.read_outbox_max_id ) -SELECT sender_user_id, max_id -FROM latest_sender_messages -ORDER BY sender_user_id ASC`, channel.ID, lowerID, maxID, readerUserID, domain.MaxChannelReadOutboxFanout) +SELECT user_id, read_outbox_max_id +FROM updated +ORDER BY user_id ASC`, channelID, lowerID, maxID, readerUserID, domain.MaxChannelReadOutboxFanout) if err != nil { - return nil, fmt.Errorf("list channel read outbox senders: %w", err) + return nil, fmt.Errorf("advance channel sender read outbox: %w", err) } defer rows.Close() - type candidate struct { - userID int64 - maxID int - } - candidates := make([]candidate, 0, domain.MaxChannelReadOutboxFanout) + out := make([]domain.ChannelReadOutboxUpdate, 0, domain.MaxChannelReadOutboxFanout) for rows.Next() { - var item candidate - if err := rows.Scan(&item.userID, &item.maxID); err != nil { + var item domain.ChannelReadOutboxUpdate + if err := rows.Scan(&item.UserID, &item.MaxID); err != nil { return nil, err } - candidates = append(candidates, item) + out = append(out, item) } if err := rows.Err(); err != nil { return nil, err } - out := make([]domain.ChannelReadOutboxUpdate, 0, len(candidates)) - for _, item := range candidates { - var readOutboxMaxID, readInboxMaxID int - err := tx.QueryRow(ctx, ` -UPDATE channel_members -SET read_outbox_max_id = GREATEST(read_outbox_max_id, $3), - updated_at = now() -WHERE channel_id = $1 - AND user_id = $2 - AND status = 'active' - AND read_outbox_max_id < $3 -RETURNING read_outbox_max_id, read_inbox_max_id`, channel.ID, item.userID, item.maxID).Scan(&readOutboxMaxID, &readInboxMaxID) - if errors.Is(err, pgx.ErrNoRows) { - continue - } - if err != nil { - return nil, fmt.Errorf("update channel sender read outbox: %w", err) - } - if err := upsertChannelDialogTx(ctx, tx, item.userID, channel, top, readInboxMaxID, readOutboxMaxID); err != nil { - return nil, err - } - out = append(out, domain.ChannelReadOutboxUpdate{UserID: item.userID, MaxID: readOutboxMaxID}) - } return out, nil } diff --git a/internal/store/postgres/channel_read_integration_test.go b/internal/store/postgres/channel_read_integration_test.go index a006de7b..7e436fc3 100644 --- a/internal/store/postgres/channel_read_integration_test.go +++ b/internal/store/postgres/channel_read_integration_test.go @@ -2,12 +2,93 @@ package postgres import ( "context" + "fmt" "reflect" "telesrv/internal/domain" + "telesrv/internal/observability/dbtrace" "testing" "time" ) +func TestChannelStoreReadHistorySenderFanoutUsesConstantStatements(t *testing.T) { + pool := testPool(t) + baseCtx := context.Background() + suffix := randomSuffix(t) + users := NewUserStore(pool) + reader, err := users.Create(baseCtx, domain.User{ + AccessHash: 351, Phone: "+1776" + suffix + "00", FirstName: "SetReader", + }) + if err != nil { + t.Fatalf("create reader: %v", err) + } + const senderCount = 12 + senders := make([]domain.User, 0, senderCount) + userIDs := []int64{reader.ID} + for i := 0; i < senderCount; i++ { + sender, createErr := users.Create(baseCtx, domain.User{ + AccessHash: int64(352 + i), Phone: fmt.Sprintf("+1776%s%02d", suffix, i+1), FirstName: "SetSender", + }) + if createErr != nil { + t.Fatalf("create sender %d: %v", i, createErr) + } + senders = append(senders, sender) + userIDs = append(userIDs, sender.ID) + } + var channelID int64 + t.Cleanup(func() { + if channelID != 0 { + _, _ = pool.Exec(baseCtx, "DELETE FROM channels WHERE id = $1", channelID) + } + _, _ = pool.Exec(baseCtx, "DELETE FROM users WHERE id = ANY($1::bigint[])", userIDs) + }) + + channels := NewChannelStore(pool) + created, err := channels.CreateChannel(baseCtx, domain.CreateChannelRequest{ + CreatorUserID: reader.ID, Title: "Set Read Outbox " + suffix, Megagroup: true, + MemberUserIDs: userIDs[1:], Date: 1700000300, + }) + if err != nil { + t.Fatalf("create channel: %v", err) + } + channelID = created.Channel.ID + topID := 0 + for i, sender := range senders { + sent, sendErr := channels.SendChannelMessage(baseCtx, domain.SendChannelMessageRequest{ + UserID: sender.ID, ChannelID: channelID, RandomID: int64(936000 + i), + Message: "set-based channel read outbox", Date: 1700000310 + i, + }) + if sendErr != nil { + t.Fatalf("send %d: %v", i, sendErr) + } + topID = sent.Message.ID + } + + ctx, stats := dbtrace.WithStats(baseCtx) + read, err := channels.ReadChannelHistory(ctx, domain.ReadChannelHistoryRequest{ + UserID: reader.ID, ChannelID: channelID, MaxID: topID, Date: 1700000400, + }) + if err != nil { + t.Fatalf("read channel history: %v", err) + } + if len(read.OutboxUpdates) != senderCount { + t.Fatalf("outbox updates = %d, want %d: %+v", len(read.OutboxUpdates), senderCount, read.OutboxUpdates) + } + if snapshot := stats.Snapshot(); snapshot.Errors != 0 || snapshot.Queries > 16 { + t.Fatalf("read-history query stats = %+v, want constant <=16 queries for %d senders", snapshot, senderCount) + } + for i, sender := range senders { + var readOutbox int + if err := pool.QueryRow(baseCtx, ` +SELECT read_outbox_max_id FROM channel_members +WHERE channel_id=$1 AND user_id=$2`, channelID, sender.ID).Scan(&readOutbox); err != nil { + t.Fatalf("load sender %d read outbox: %v", i, err) + } + if readOutbox <= 0 || readOutbox > topID { + t.Fatalf("sender %d read outbox = %d, want 1..%d", i, readOutbox, topID) + } + } +} + func TestChannelStoreReadOutboxDoesNotRegressSenderDialogUnread(t *testing.T) { pool := testPool(t) ctx := context.Background() diff --git a/internal/store/postgres/channel_row_cache.go b/internal/store/postgres/channel_row_cache.go index 814f7af5..aecce214 100644 --- a/internal/store/postgres/channel_row_cache.go +++ b/internal/store/postgres/channel_row_cache.go @@ -49,6 +49,39 @@ func (c *ChannelRowCache) getOrLoad(ctx context.Context, id int64, load func() ( return c.cache.GetOrLoad(ctx, id, load) } +// getOrLoadBatch resolves a page of shared channel rows with one database read +// for all misses. A zero-ID Channel is the negative-cache sentinel for an ID +// that disappeared between the owner-state query and shared-row hydration; +// channel_base invalidation removes both positive and negative entries. +func (c *ChannelRowCache) getOrLoadBatch( + ctx context.Context, + ids []int64, + load func(context.Context, []int64) (map[int64]domain.Channel, error), +) (map[int64]domain.Channel, error) { + if c == nil { + return load(ctx, ids) + } + return c.cache.GetOrLoadBatch( + ctx, + ids, + func(int64) (int64, bool) { return 0, true }, + func(ctx context.Context, missing []int64) (map[int64]domain.Channel, error) { + loaded, err := load(ctx, missing) + if err != nil { + return nil, err + } + // GetOrLoadBatch requires an explicit value for every key so absent + // rows do not immediately stampede the database again. + for _, id := range missing { + if _, ok := loaded[id]; !ok { + loaded[id] = domain.Channel{} + } + } + return loaded, nil + }, + ) +} + func (c *ChannelRowCache) put(ch domain.Channel) { if c == nil || ch.ID == 0 { return diff --git a/internal/store/postgres/channel_row_cache_test.go b/internal/store/postgres/channel_row_cache_test.go index 133fe22e..6fb839db 100644 --- a/internal/store/postgres/channel_row_cache_test.go +++ b/internal/store/postgres/channel_row_cache_test.go @@ -164,3 +164,30 @@ func TestChannelRowCacheSingleflightsColdLoad(t *testing.T) { t.Fatalf("cache hit called load again: calls=%d", got) } } + +func TestChannelRowCacheBatchesMissesAndNegativeRows(t *testing.T) { + c := NewChannelRowCache(8) + loads := 0 + load := func(_ context.Context, ids []int64) (map[int64]domain.Channel, error) { + loads++ + out := make(map[int64]domain.Channel, len(ids)) + for _, id := range ids { + if id != 2 { + out[id] = domain.Channel{ID: id, Title: "channel"} + } + } + return out, nil + } + for i := 0; i < 2; i++ { + got, err := c.getOrLoadBatch(context.Background(), []int64{1, 2, 3}, load) + if err != nil { + t.Fatal(err) + } + if got[1].ID != 1 || got[2].ID != 0 || got[3].ID != 3 { + t.Fatalf("batch result = %+v", got) + } + } + if loads != 1 { + t.Fatalf("batch loads = %d, want 1", loads) + } +} diff --git a/internal/store/postgres/channel_settings.go b/internal/store/postgres/channel_settings.go index e2082476..1cca00ac 100644 --- a/internal/store/postgres/channel_settings.go +++ b/internal/store/postgres/channel_settings.go @@ -502,7 +502,7 @@ func (s *ChannelStore) SetChannelEmojiStatusAdmin(ctx context.Context, channelID // which requires an acting admin member and broadcasts to the channel's // timeline. Mirrors SetChannelColorAdmin/SetChannelEmojiStatusAdmin's shape. func (s *ChannelStore) SetChannelPhotoAdmin(ctx context.Context, channelID int64, photo domain.Photo) (domain.Channel, error) { - if channelID == 0 { + if channelID == 0 || photo.ID == 0 { return domain.Channel{}, domain.ErrChannelInvalid } channel, err := s.channelByID(ctx, s.db, channelID) @@ -513,10 +513,15 @@ func (s *ChannelStore) SetChannelPhotoAdmin(ctx context.Context, channelID int64 if stripped == nil { stripped = []byte{} } - if _, err := s.db.Exec(ctx, `UPDATE channels SET photo_id = $2, photo_dc_id = $3, photo_stripped = $4, updated_at = now() WHERE id = $1`, - channelID, photo.ID, photo.DCID, stripped); err != nil { + result, err := s.db.Exec(ctx, `UPDATE channels +SET photo_id = $2, photo_dc_id = $3, photo_stripped = $4, updated_at = now() +WHERE id = $1 AND NOT deleted`, channelID, photo.ID, photo.DCID, stripped) + if err != nil { return domain.Channel{}, fmt.Errorf("set channel photo admin: %w", err) } + if result.RowsAffected() != 1 { + return domain.Channel{}, domain.ErrChannelInvalid + } if s.rowCache != nil { s.rowCache.delete(channelID) } diff --git a/internal/store/postgres/channel_stats.go b/internal/store/postgres/channel_stats.go new file mode 100644 index 00000000..caab31a0 --- /dev/null +++ b/internal/store/postgres/channel_stats.go @@ -0,0 +1,531 @@ +package postgres + +import ( + "context" + "fmt" + "sort" + "strconv" + + "telesrv/internal/domain" +) + +func (s *ChannelStore) GetChannelStats(ctx context.Context, req domain.ChannelStatsRequest) (domain.ChannelStats, error) { + if req.ViewerUserID == 0 || req.ChannelID == 0 || !req.Period.Valid() { + return domain.ChannelStats{}, domain.ErrChannelInvalid + } + channel, member, err := s.getChannelForMember(ctx, s.db, req.ViewerUserID, req.ChannelID) + if err != nil { + return domain.ChannelStats{}, err + } + if member.Role != domain.ChannelRoleCreator && member.Role != domain.ChannelRoleAdmin { + return domain.ChannelStats{}, domain.ErrChannelAdminRequired + } + + stats := domain.ChannelStats{Channel: channel, Period: req.Period} + days, dayIndex := newPGStatsDays(req.Period) + previousMin := req.Period.PreviousMinDate() + + memberRows, err := s.db.Query(ctx, ` +SELECT joined_at, left_at +FROM channel_members +WHERE channel_id = $1 + AND joined_at > 0 + AND joined_at < $2 + AND (left_at = 0 OR left_at >= $3)`, req.ChannelID, req.Period.MaxDate, previousMin) + if err != nil { + return domain.ChannelStats{}, fmt.Errorf("query channel stats members: %w", err) + } + for memberRows.Next() { + var joinedAt, leftAt int + if err := memberRows.Scan(&joinedAt, &leftAt); err != nil { + memberRows.Close() + return domain.ChannelStats{}, err + } + if pgStatsMemberActiveAt(joinedAt, leftAt, req.Period.MaxDate-1) { + stats.Members.Current++ + } + if pgStatsMemberActiveAt(joinedAt, leftAt, req.Period.MinDate-1) { + stats.Members.Previous++ + } + if i, ok := dayIndex[pgStatsDay(joinedAt)]; ok && joinedAt >= req.Period.MinDate && joinedAt < req.Period.MaxDate { + days[i].NewMembers++ + } + for i := range days { + at := days[i].Date + 86400 - 1 + if at >= req.Period.MaxDate { + at = req.Period.MaxDate - 1 + } + if pgStatsMemberActiveAt(joinedAt, leftAt, at) { + days[i].Members++ + } + } + } + if err := memberRows.Err(); err != nil { + memberRows.Close() + return domain.ChannelStats{}, err + } + memberRows.Close() + + var currentMessages, previousMessages int + var currentViews, previousViews int64 + var currentPosters, previousPosters int + if err := s.db.QueryRow(ctx, ` +SELECT + count(*) FILTER (WHERE message_date >= $2)::int, + count(*) FILTER (WHERE message_date < $2)::int, + COALESCE(sum(views_count) FILTER (WHERE message_date >= $2), 0)::bigint, + COALESCE(sum(views_count) FILTER (WHERE message_date < $2), 0)::bigint, + count(DISTINCT sender_user_id) FILTER (WHERE message_date >= $2 AND sender_user_id <> 0)::int, + count(DISTINCT sender_user_id) FILTER (WHERE message_date < $2 AND sender_user_id <> 0)::int +FROM channel_messages +WHERE channel_id = $1 + AND NOT deleted + AND action = '{}'::jsonb + AND message_date >= $3 + AND message_date < $4`, req.ChannelID, req.Period.MinDate, previousMin, req.Period.MaxDate).Scan( + ¤tMessages, &previousMessages, ¤tViews, &previousViews, ¤tPosters, &previousPosters, + ); err != nil { + return domain.ChannelStats{}, fmt.Errorf("aggregate channel stats messages: %w", err) + } + + var currentViewers, previousViewers int + if err := s.db.QueryRow(ctx, ` +SELECT + count(DISTINCT viewer_user_id) FILTER (WHERE viewed_at >= $2)::int, + count(DISTINCT viewer_user_id) FILTER (WHERE viewed_at < $2)::int +FROM channel_message_viewers +WHERE channel_id = $1 + AND viewed_at >= $3 + AND viewed_at < $4`, req.ChannelID, req.Period.MinDate, previousMin, req.Period.MaxDate).Scan(¤tViewers, &previousViewers); err != nil { + return domain.ChannelStats{}, fmt.Errorf("aggregate channel stats viewers: %w", err) + } + + var currentReactions, previousReactions int + if err := s.db.QueryRow(ctx, ` +SELECT + count(*) FILTER (WHERE m.message_date >= $2)::int, + count(*) FILTER (WHERE m.message_date < $2)::int +FROM channel_message_reactions r +JOIN channel_messages m ON m.channel_id = r.channel_id AND m.id = r.message_id +WHERE m.channel_id = $1 + AND NOT m.deleted + AND m.action = '{}'::jsonb + AND m.message_date >= $3 + AND m.message_date < $4`, req.ChannelID, req.Period.MinDate, previousMin, req.Period.MaxDate).Scan(¤tReactions, &previousReactions); err != nil { + return domain.ChannelStats{}, fmt.Errorf("aggregate channel stats reactions: %w", err) + } + + var currentShares, previousShares int + if err := s.db.QueryRow(ctx, ` +SELECT + count(*) FILTER (WHERE src.message_date >= $2)::int, + count(*) FILTER (WHERE src.message_date < $2)::int +FROM channel_messages f +JOIN channels destination ON destination.id = f.channel_id +JOIN channel_messages src + ON src.channel_id = $1 + AND src.id::text = f.fwd_from #>> '{ChannelPost}' + AND NOT src.deleted + AND src.action = '{}'::jsonb +WHERE NOT f.deleted + AND NOT destination.deleted + AND (destination.broadcast OR destination.megagroup) + AND btrim(COALESCE(destination.username, '')) <> '' + AND f.fwd_from #>> '{From,Type}' = $5 + AND f.fwd_from #>> '{From,ID}' = $6 + AND src.message_date >= $3 + AND src.message_date < $4`, req.ChannelID, req.Period.MinDate, previousMin, req.Period.MaxDate, + string(domain.PeerTypeChannel), strconv.FormatInt(req.ChannelID, 10)).Scan(¤tShares, &previousShares); err != nil { + return domain.ChannelStats{}, fmt.Errorf("aggregate channel stats shares: %w", err) + } + + stats.Messages = domain.StatsValueAndPrev{Current: float64(currentMessages), Previous: float64(previousMessages)} + stats.Viewers = domain.StatsValueAndPrev{Current: float64(currentViewers), Previous: float64(previousViewers)} + stats.Posters = domain.StatsValueAndPrev{Current: float64(currentPosters), Previous: float64(previousPosters)} + stats.ViewsPerPost = pgStatsAverage(currentViews, currentMessages, previousViews, previousMessages) + stats.SharesPerPost = pgStatsAverage(int64(currentShares), currentMessages, int64(previousShares), previousMessages) + stats.ReactionsPerPost = pgStatsAverage(int64(currentReactions), currentMessages, int64(previousReactions), previousMessages) + + messageRows, err := s.db.Query(ctx, ` +SELECT (message_date / 86400) * 86400 AS day, + count(*)::int, + COALESCE(sum(views_count), 0)::int, + count(DISTINCT sender_user_id) FILTER (WHERE sender_user_id <> 0)::int +FROM channel_messages +WHERE channel_id = $1 AND NOT deleted AND action = '{}'::jsonb AND message_date >= $2 AND message_date < $3 +GROUP BY day +ORDER BY day`, req.ChannelID, req.Period.MinDate, req.Period.MaxDate) + if err != nil { + return domain.ChannelStats{}, fmt.Errorf("query channel stats days: %w", err) + } + for messageRows.Next() { + var date, messages, views, posters int + if err := messageRows.Scan(&date, &messages, &views, &posters); err != nil { + messageRows.Close() + return domain.ChannelStats{}, err + } + if i, ok := dayIndex[date]; ok { + days[i].Messages, days[i].Views, days[i].Posters = messages, views, posters + } + } + if err := messageRows.Err(); err != nil { + messageRows.Close() + return domain.ChannelStats{}, err + } + messageRows.Close() + + viewerRows, err := s.db.Query(ctx, ` +SELECT (viewed_at / 86400) * 86400 AS day, count(DISTINCT viewer_user_id)::int +FROM channel_message_viewers +WHERE channel_id = $1 AND viewed_at >= $2 AND viewed_at < $3 +GROUP BY day`, req.ChannelID, req.Period.MinDate, req.Period.MaxDate) + if err != nil { + return domain.ChannelStats{}, fmt.Errorf("query channel stats viewer days: %w", err) + } + for viewerRows.Next() { + var date, viewers int + if err := viewerRows.Scan(&date, &viewers); err != nil { + viewerRows.Close() + return domain.ChannelStats{}, err + } + if i, ok := dayIndex[date]; ok { + days[i].Viewers = viewers + } + } + if err := viewerRows.Err(); err != nil { + viewerRows.Close() + return domain.ChannelStats{}, err + } + viewerRows.Close() + + reactionRows, err := s.db.Query(ctx, ` +SELECT (m.message_date / 86400) * 86400 AS day, r.reaction_type, r.reaction_value, count(*)::int +FROM channel_message_reactions r +JOIN channel_messages m ON m.channel_id = r.channel_id AND m.id = r.message_id +WHERE m.channel_id = $1 AND NOT m.deleted AND m.action = '{}'::jsonb AND m.message_date >= $2 AND m.message_date < $3 +GROUP BY day, r.reaction_type, r.reaction_value +ORDER BY day, r.reaction_type, r.reaction_value`, req.ChannelID, req.Period.MinDate, req.Period.MaxDate) + if err != nil { + return domain.ChannelStats{}, fmt.Errorf("query channel stats reaction days: %w", err) + } + for reactionRows.Next() { + var date, count int + var reactionType, reactionValue string + if err := reactionRows.Scan(&date, &reactionType, &reactionValue, &count); err != nil { + reactionRows.Close() + return domain.ChannelStats{}, err + } + reaction, ok := domain.MessageReactionFromValue(domain.MessageReactionType(reactionType), reactionValue) + if !ok { + reactionRows.Close() + return domain.ChannelStats{}, fmt.Errorf("invalid persisted channel stats reaction %q/%q", reactionType, reactionValue) + } + if i, ok := dayIndex[date]; ok { + days[i].Reactions += count + days[i].ByReaction = append(days[i].ByReaction, domain.StatsReactionCount{Reaction: reaction, Count: count}) + } + } + if err := reactionRows.Err(); err != nil { + reactionRows.Close() + return domain.ChannelStats{}, err + } + reactionRows.Close() + + shareRows, err := s.db.Query(ctx, ` +SELECT (src.message_date / 86400) * 86400 AS day, count(*)::int +FROM channel_messages f +JOIN channels destination ON destination.id = f.channel_id +JOIN channel_messages src + ON src.channel_id = $1 + AND src.id::text = f.fwd_from #>> '{ChannelPost}' + AND NOT src.deleted + AND src.action = '{}'::jsonb +WHERE NOT f.deleted + AND NOT destination.deleted + AND (destination.broadcast OR destination.megagroup) + AND btrim(COALESCE(destination.username, '')) <> '' + AND f.fwd_from #>> '{From,Type}' = $4 + AND f.fwd_from #>> '{From,ID}' = $5 + AND src.message_date >= $2 AND src.message_date < $3 +GROUP BY day`, req.ChannelID, req.Period.MinDate, req.Period.MaxDate, + string(domain.PeerTypeChannel), strconv.FormatInt(req.ChannelID, 10)) + if err != nil { + return domain.ChannelStats{}, fmt.Errorf("query channel stats share days: %w", err) + } + for shareRows.Next() { + var date, shares int + if err := shareRows.Scan(&date, &shares); err != nil { + shareRows.Close() + return domain.ChannelStats{}, err + } + if i, ok := dayIndex[date]; ok { + days[i].Shares = shares + } + } + if err := shareRows.Err(); err != nil { + shareRows.Close() + return domain.ChannelStats{}, err + } + shareRows.Close() + sortPGStatsReactions(days) + stats.Days = days + + topRows, err := s.db.Query(ctx, ` +SELECT sender_user_id, count(*)::int, + CASE WHEN count(*) = 0 THEN 0 ELSE (sum(char_length(body)) / count(*))::int END +FROM channel_messages +WHERE channel_id = $1 AND NOT deleted AND action = '{}'::jsonb AND sender_user_id <> 0 + AND message_date >= $2 AND message_date < $3 +GROUP BY sender_user_id +ORDER BY count(*) DESC, sender_user_id +LIMIT $4`, req.ChannelID, req.Period.MinDate, req.Period.MaxDate, domain.MaxChannelStatsTopPosters) + if err != nil { + return domain.ChannelStats{}, fmt.Errorf("query channel stats top posters: %w", err) + } + for topRows.Next() { + var item domain.ChannelStatsTopPoster + if err := topRows.Scan(&item.UserID, &item.Messages, &item.AvgChars); err != nil { + topRows.Close() + return domain.ChannelStats{}, err + } + stats.TopPosters = append(stats.TopPosters, item) + } + if err := topRows.Err(); err != nil { + topRows.Close() + return domain.ChannelStats{}, err + } + topRows.Close() + + recentRows, err := s.db.Query(ctx, ` +SELECT src.id, src.views_count, + (SELECT count(*)::int + FROM channel_messages f + JOIN channels destination ON destination.id = f.channel_id + WHERE NOT f.deleted AND NOT destination.deleted + AND (destination.broadcast OR destination.megagroup) + AND btrim(COALESCE(destination.username, '')) <> '' + AND f.fwd_from #>> '{From,Type}' = $3 + AND f.fwd_from #>> '{From,ID}' = $4 + AND f.fwd_from #>> '{ChannelPost}' = src.id::text), + (SELECT count(*)::int FROM channel_message_reactions r + WHERE r.channel_id = src.channel_id AND r.message_id = src.id) +FROM channel_messages src +WHERE src.channel_id = $1 AND NOT src.deleted AND src.action = '{}'::jsonb +ORDER BY src.message_date DESC, src.id DESC +LIMIT $2`, req.ChannelID, domain.MaxChannelStatsRecentPosts, + string(domain.PeerTypeChannel), strconv.FormatInt(req.ChannelID, 10)) + if err != nil { + return domain.ChannelStats{}, fmt.Errorf("query channel stats recent posts: %w", err) + } + for recentRows.Next() { + var item domain.ChannelStatsRecentPost + if err := recentRows.Scan(&item.MessageID, &item.Views, &item.Forwards, &item.Reactions); err != nil { + recentRows.Close() + return domain.ChannelStats{}, err + } + stats.RecentPosts = append(stats.RecentPosts, item) + } + if err := recentRows.Err(); err != nil { + recentRows.Close() + return domain.ChannelStats{}, err + } + recentRows.Close() + return stats, nil +} + +func (s *ChannelStore) GetChannelMessageStats(ctx context.Context, req domain.ChannelMessageStatsRequest) (domain.ChannelMessageStats, error) { + if req.ViewerUserID == 0 || req.ChannelID == 0 || req.MessageID <= 0 || + req.MessageID > domain.MaxMessageBoxID || !req.Period.Valid() { + return domain.ChannelMessageStats{}, domain.ErrMessageIDInvalid + } + channel, member, err := s.getChannelForMember(ctx, s.db, req.ViewerUserID, req.ChannelID) + if err != nil { + return domain.ChannelMessageStats{}, err + } + if member.Role != domain.ChannelRoleCreator && member.Role != domain.ChannelRoleAdmin { + return domain.ChannelMessageStats{}, domain.ErrChannelAdminRequired + } + message, err := s.getChannelMessage(ctx, s.db, req.ChannelID, req.MessageID) + if err != nil || message.Deleted { + return domain.ChannelMessageStats{}, domain.ErrMessageIDInvalid + } + days, dayIndex := newPGStatsDays(req.Period) + viewRows, err := s.db.Query(ctx, ` +SELECT (viewed_at / 86400) * 86400 AS day, count(*)::int +FROM channel_message_viewers +WHERE channel_id = $1 AND message_id = $2 AND viewed_at >= $3 AND viewed_at < $4 +GROUP BY day`, req.ChannelID, req.MessageID, req.Period.MinDate, req.Period.MaxDate) + if err != nil { + return domain.ChannelMessageStats{}, fmt.Errorf("query channel message stats views: %w", err) + } + for viewRows.Next() { + var date, count int + if err := viewRows.Scan(&date, &count); err != nil { + viewRows.Close() + return domain.ChannelMessageStats{}, err + } + if i, ok := dayIndex[date]; ok { + days[i].Views = count + } + } + if err := viewRows.Err(); err != nil { + viewRows.Close() + return domain.ChannelMessageStats{}, err + } + viewRows.Close() + + reactionRows, err := s.db.Query(ctx, ` +SELECT (reaction_date / 86400) * 86400 AS day, reaction_type, reaction_value, count(*)::int +FROM channel_message_reactions +WHERE channel_id = $1 AND message_id = $2 AND reaction_date >= $3 AND reaction_date < $4 +GROUP BY day, reaction_type, reaction_value +ORDER BY day, reaction_type, reaction_value`, req.ChannelID, req.MessageID, req.Period.MinDate, req.Period.MaxDate) + if err != nil { + return domain.ChannelMessageStats{}, fmt.Errorf("query channel message stats reactions: %w", err) + } + for reactionRows.Next() { + var date, count int + var reactionType, reactionValue string + if err := reactionRows.Scan(&date, &reactionType, &reactionValue, &count); err != nil { + reactionRows.Close() + return domain.ChannelMessageStats{}, err + } + reaction, ok := domain.MessageReactionFromValue(domain.MessageReactionType(reactionType), reactionValue) + if !ok { + reactionRows.Close() + return domain.ChannelMessageStats{}, fmt.Errorf("invalid persisted message stats reaction %q/%q", reactionType, reactionValue) + } + if i, ok := dayIndex[date]; ok { + days[i].Reactions += count + days[i].ByReaction = append(days[i].ByReaction, domain.StatsReactionCount{Reaction: reaction, Count: count}) + } + } + if err := reactionRows.Err(); err != nil { + reactionRows.Close() + return domain.ChannelMessageStats{}, err + } + reactionRows.Close() + sortPGStatsReactions(days) + return domain.ChannelMessageStats{Channel: channel, Message: message, Period: req.Period, Days: days}, nil +} + +func (s *ChannelStore) ListChannelMessagePublicForwards(ctx context.Context, req domain.ChannelMessagePublicForwardListRequest) (domain.ChannelMessagePublicForwardList, error) { + if req.ViewerUserID == 0 || req.ChannelID == 0 || req.MessageID <= 0 || + req.MessageID > domain.MaxMessageBoxID || req.Limit <= 0 || req.Limit > domain.MaxChannelMessagePublicForwards { + return domain.ChannelMessagePublicForwardList{}, domain.ErrChannelInvalid + } + cursor, err := domain.ParseChannelMessagePublicForwardCursor(req.Offset) + if err != nil { + return domain.ChannelMessagePublicForwardList{}, err + } + _, member, err := s.getChannelForMember(ctx, s.db, req.ViewerUserID, req.ChannelID) + if err != nil { + return domain.ChannelMessagePublicForwardList{}, err + } + if member.Role != domain.ChannelRoleCreator && member.Role != domain.ChannelRoleAdmin { + return domain.ChannelMessagePublicForwardList{}, domain.ErrChannelAdminRequired + } + source, err := s.getChannelMessage(ctx, s.db, req.ChannelID, req.MessageID) + if err != nil || source.Deleted { + return domain.ChannelMessagePublicForwardList{}, domain.ErrMessageIDInvalid + } + + where := ` +NOT deleted +AND fwd_from #>> '{From,Type}' = $1 +AND fwd_from #>> '{From,ID}' = $2 +AND fwd_from #>> '{ChannelPost}' = $3 +AND EXISTS ( + SELECT 1 FROM channels c + WHERE c.id = channel_messages.channel_id + AND NOT c.deleted + AND (c.broadcast OR c.megagroup) + AND btrim(COALESCE(c.username, '')) <> '' +)` + args := []any{string(domain.PeerTypeChannel), strconv.FormatInt(req.ChannelID, 10), strconv.Itoa(req.MessageID)} + var count int + if err := s.db.QueryRow(ctx, `SELECT count(*)::int FROM channel_messages WHERE `+where, args...).Scan(&count); err != nil { + return domain.ChannelMessagePublicForwardList{}, fmt.Errorf("count channel message public forwards: %w", err) + } + cursorClause := "" + if cursor.Date != 0 { + args = append(args, cursor.Date, cursor.ChannelID, cursor.MessageID) + cursorClause = fmt.Sprintf(` +AND ( + message_date < $%d + OR (message_date = $%d AND ( + channel_id > $%d + OR (channel_id = $%d AND id < $%d) + )) +)`, len(args)-2, len(args)-2, len(args)-1, len(args)-1, len(args)) + } + args = append(args, req.Limit+1) + rows, err := s.db.Query(ctx, ` +SELECT `+channelMessageColumns+` +FROM channel_messages +WHERE `+where+cursorClause+` +ORDER BY message_date DESC, channel_id ASC, id DESC +LIMIT $`+strconv.Itoa(len(args)), args...) + if err != nil { + return domain.ChannelMessagePublicForwardList{}, fmt.Errorf("list channel message public forwards: %w", err) + } + defer rows.Close() + messages := make([]domain.ChannelMessage, 0, req.Limit+1) + for rows.Next() { + message, err := scanChannelMessage(rows) + if err != nil { + return domain.ChannelMessagePublicForwardList{}, err + } + messages = append(messages, message) + } + if err := rows.Err(); err != nil { + return domain.ChannelMessagePublicForwardList{}, err + } + next := "" + if len(messages) > req.Limit { + messages = messages[:req.Limit] + next = domain.FormatChannelMessagePublicForwardCursor(messages[len(messages)-1]) + } + return domain.ChannelMessagePublicForwardList{Count: count, Messages: messages, NextOffset: next}, nil +} + +func newPGStatsDays(period domain.StatsPeriod) ([]domain.ChannelStatsDay, map[int]int) { + start, end := pgStatsDay(period.MinDate), pgStatsDay(period.MaxDate-1) + days := make([]domain.ChannelStatsDay, 0, (end-start)/86400+1) + index := make(map[int]int) + for date := start; date <= end; date += 86400 { + index[date] = len(days) + days = append(days, domain.ChannelStatsDay{Date: date}) + } + return days, index +} + +func pgStatsDay(date int) int { + if date <= 0 { + return 0 + } + return date - date%86400 +} + +func pgStatsMemberActiveAt(joinedAt, leftAt, at int) bool { + return joinedAt > 0 && joinedAt <= at && (leftAt == 0 || leftAt > at) +} + +func pgStatsAverage(current int64, currentCount int, previous int64, previousCount int) domain.StatsValueAndPrev { + var out domain.StatsValueAndPrev + if currentCount > 0 { + out.Current = float64(current) / float64(currentCount) + } + if previousCount > 0 { + out.Previous = float64(previous) / float64(previousCount) + } + return out +} + +func sortPGStatsReactions(days []domain.ChannelStatsDay) { + for i := range days { + sort.Slice(days[i].ByReaction, func(a, b int) bool { + return days[i].ByReaction[a].Reaction.Key() < days[i].ByReaction[b].Reaction.Key() + }) + } +} diff --git a/internal/store/postgres/channel_stats_integration_test.go b/internal/store/postgres/channel_stats_integration_test.go new file mode 100644 index 00000000..bf7b3767 --- /dev/null +++ b/internal/store/postgres/channel_stats_integration_test.go @@ -0,0 +1,137 @@ +package postgres + +import ( + "context" + "testing" + + "telesrv/internal/domain" +) + +func TestChannelStatsPostgresAggregatesAndPagesPublicForwards(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + suffix := randomSuffix(t) + users := NewUserStore(pool) + owner, err := users.Create(ctx, domain.User{ + AccessHash: 99001, Phone: "+1888" + suffix + "01", FirstName: "StatsOwner", + }) + if err != nil { + t.Fatalf("create owner: %v", err) + } + channels := NewChannelStore(pool) + channelIDs := make([]int64, 0, 3) + t.Cleanup(func() { + if len(channelIDs) > 0 { + _, _ = pool.Exec(ctx, "DELETE FROM channels WHERE id = ANY($1::bigint[])", channelIDs) + } + _, _ = pool.Exec(ctx, "DELETE FROM users WHERE id = $1", owner.ID) + }) + period := domain.StatsPeriod{MinDate: 1_700_006_400, MaxDate: 1_700_611_200} + source, err := channels.CreateChannel(ctx, domain.CreateChannelRequest{ + CreatorUserID: owner.ID, Title: "PG stats source " + suffix, Broadcast: true, Date: period.MinDate - 100, + }) + if err != nil { + t.Fatalf("create source: %v", err) + } + channelIDs = append(channelIDs, source.Channel.ID) + if _, err := channels.SendChannelMessage(ctx, domain.SendChannelMessageRequest{ + UserID: owner.ID, ChannelID: source.Channel.ID, RandomID: 1, Message: "previous", Date: period.MinDate - 10, + }); err != nil { + t.Fatalf("send previous: %v", err) + } + post, err := channels.SendChannelMessage(ctx, domain.SendChannelMessageRequest{ + UserID: owner.ID, ChannelID: source.Channel.ID, RandomID: 2, Message: "current", Date: period.MinDate + 10, + }) + if err != nil { + t.Fatalf("send current: %v", err) + } + if _, err := channels.GetChannelMessageViews(ctx, domain.ChannelMessageViewsRequest{ + UserID: owner.ID, ChannelID: source.Channel.ID, IDs: []int{post.Message.ID}, Increment: true, Date: period.MinDate + 20, + }); err != nil { + t.Fatalf("increment view: %v", err) + } + if _, err := channels.SetChannelMessageReactions(ctx, domain.SetChannelMessageReactionsRequest{ + UserID: owner.ID, ChannelID: source.Channel.ID, MessageID: post.Message.ID, + Reactions: []domain.MessageReaction{{Type: domain.MessageReactionEmoji, Emoticon: "👍"}}, Date: period.MinDate + 30, + }); err != nil { + t.Fatalf("react: %v", err) + } + + publicCreated, err := channels.CreateChannel(ctx, domain.CreateChannelRequest{ + CreatorUserID: owner.ID, Title: "PG public destination " + suffix, Broadcast: true, Date: period.MinDate + 40, + }) + if err != nil { + t.Fatalf("create public destination: %v", err) + } + channelIDs = append(channelIDs, publicCreated.Channel.ID) + publicChannel, err := channels.UpdateUsername(ctx, domain.UpdateChannelUsernameRequest{ + UserID: owner.ID, ChannelID: publicCreated.Channel.ID, Username: "statsfw" + suffix, + }) + if err != nil { + t.Fatalf("make destination public: %v", err) + } + privateCreated, err := channels.CreateChannel(ctx, domain.CreateChannelRequest{ + CreatorUserID: owner.ID, Title: "PG private destination " + suffix, Broadcast: true, Date: period.MinDate + 40, + }) + if err != nil { + t.Fatalf("create private destination: %v", err) + } + channelIDs = append(channelIDs, privateCreated.Channel.ID) + forward := &domain.MessageForward{ + From: domain.Peer{Type: domain.PeerTypeChannel, ID: source.Channel.ID}, Date: post.Message.Date, ChannelPost: post.Message.ID, + } + for i, date := range []int{period.MinDate + 50, period.MinDate + 60} { + if _, err := channels.SendChannelMessage(ctx, domain.SendChannelMessageRequest{ + UserID: owner.ID, ChannelID: publicChannel.ID, RandomID: int64(10 + i), Message: "public forward", Forward: forward, Date: date, + }); err != nil { + t.Fatalf("send public forward %d: %v", i, err) + } + } + if _, err := channels.SendChannelMessage(ctx, domain.SendChannelMessageRequest{ + UserID: owner.ID, ChannelID: privateCreated.Channel.ID, RandomID: 20, Message: "private forward", Forward: forward, Date: period.MinDate + 70, + }); err != nil { + t.Fatalf("send private forward: %v", err) + } + + stats, err := channels.GetChannelStats(ctx, domain.ChannelStatsRequest{ + ViewerUserID: owner.ID, ChannelID: source.Channel.ID, Period: period, + }) + if err != nil { + t.Fatalf("get stats: %v", err) + } + if stats.Members.Current != 1 || stats.Messages.Current != 1 || stats.Messages.Previous != 1 || + stats.Viewers.Current != 1 || stats.ViewsPerPost.Current != 1 || stats.SharesPerPost.Current != 2 || + stats.ReactionsPerPost.Current != 1 { + t.Fatalf("stats = %+v, want persisted values", stats) + } + if len(stats.Days) == 0 || stats.Days[0].Views != 1 || stats.Days[0].Shares != 2 || stats.Days[0].Reactions != 1 { + t.Fatalf("stats days = %+v", stats.Days) + } + messageStats, err := channels.GetChannelMessageStats(ctx, domain.ChannelMessageStatsRequest{ + ViewerUserID: owner.ID, ChannelID: source.Channel.ID, MessageID: post.Message.ID, Period: period, + }) + if err != nil { + t.Fatalf("get message stats: %v", err) + } + if len(messageStats.Days) == 0 || messageStats.Days[0].Views != 1 || messageStats.Days[0].Reactions != 1 { + t.Fatalf("message stats days = %+v", messageStats.Days) + } + first, err := channels.ListChannelMessagePublicForwards(ctx, domain.ChannelMessagePublicForwardListRequest{ + ViewerUserID: owner.ID, ChannelID: source.Channel.ID, MessageID: post.Message.ID, Limit: 1, + }) + if err != nil { + t.Fatalf("list first page: %v", err) + } + if first.Count != 2 || len(first.Messages) != 1 || first.NextOffset == "" { + t.Fatalf("first page = %+v", first) + } + second, err := channels.ListChannelMessagePublicForwards(ctx, domain.ChannelMessagePublicForwardListRequest{ + ViewerUserID: owner.ID, ChannelID: source.Channel.ID, MessageID: post.Message.ID, Offset: first.NextOffset, Limit: 1, + }) + if err != nil { + t.Fatalf("list second page: %v", err) + } + if second.Count != 2 || len(second.Messages) != 1 || second.Messages[0].ID == first.Messages[0].ID || second.NextOffset != "" { + t.Fatalf("second page = %+v", second) + } +} diff --git a/internal/store/postgres/channel_store.go b/internal/store/postgres/channel_store.go index b7c3e329..1e88e86d 100644 --- a/internal/store/postgres/channel_store.go +++ b/internal/store/postgres/channel_store.go @@ -17,14 +17,16 @@ const retryableChannelTxAttempts = 3 // ChannelStore 用 PostgreSQL 实现 store.ChannelStore。 type ChannelStore struct { - db sqlcgen.DBTX - ids store.ChannelIDAllocator - msgIDs store.ChannelMessageIDAllocator - log *zap.Logger - rowCache *ChannelRowCache - memberCache *ChannelMemberCache - dialogCache *ChannelDialogCache - boostCache *ChannelBoostCache + db sqlcgen.DBTX + ids store.ChannelIDAllocator + msgIDs store.ChannelMessageIDAllocator + log *zap.Logger + rowCache *ChannelRowCache + topMsgCache *ChannelTopMessageCache + memberCache *ChannelMemberCache + dialogCache *ChannelDialogCache + boostCache *ChannelBoostCache + differenceCache *ChannelDifferenceBaseCache } // ChannelStoreOption 调整 PostgreSQL ChannelStore 依赖。 @@ -53,6 +55,14 @@ func WithChannelRowCache(cache *ChannelRowCache) ChannelStoreOption { } } +// WithChannelTopMessageCache injects the shared dialog-top message cache. The +// cache never contains viewer reaction/read overlays. +func WithChannelTopMessageCache(cache *ChannelTopMessageCache) ChannelStoreOption { + return func(s *ChannelStore) { + s.topMsgCache = cache + } +} + // WithChannelMemberCache 注入「频道成员/访问态」进程内缓存。 // 传 nil 等于禁用；事务内仍绕过，提交后由 read model listener 失效。 func WithChannelMemberCache(cache *ChannelMemberCache) ChannelStoreOption { @@ -77,12 +87,25 @@ func WithChannelBoostCache(cache *ChannelBoostCache) ChannelStoreOption { } } +// WithChannelDifferenceBaseCache injects the shared immutable event/message +// page cache used by updates.getChannelDifference. Viewer access and overlays +// remain outside this cache. +func WithChannelDifferenceBaseCache(cache *ChannelDifferenceBaseCache) ChannelStoreOption { + return func(s *ChannelStore) { + s.differenceCache = cache + } +} + // cacheActive 报告当前句柄是否可用频道行缓存：仅启用缓存且走连接池(非事务)时。 // 事务内(db != s.db)一律绕过缓存实时读，保证事务读己写。 func (s *ChannelStore) cacheActive(db sqlcgen.DBTX) bool { return s.rowCache != nil && db == s.db } +func (s *ChannelStore) topMessageCacheActive(db sqlcgen.DBTX) bool { + return s.topMsgCache != nil && db == s.db +} + func (s *ChannelStore) memberCacheActive(db sqlcgen.DBTX) bool { return s.memberCache != nil && db == s.db } diff --git a/internal/store/postgres/channel_suggested_post.go b/internal/store/postgres/channel_suggested_post.go index 069dcfbe..0c601fce 100644 --- a/internal/store/postgres/channel_suggested_post.go +++ b/internal/store/postgres/channel_suggested_post.go @@ -13,6 +13,12 @@ import ( const suggestedPostSettlementAge = 24 * 60 * 60 +// A claim is durable queue metadata, not a business transition. It prevents +// two dispatcher instances that selected the same due key from processing it +// concurrently. A crashed worker only delays that key; it does not block any +// sibling aggregate, and the bounded failure backoff may shorten the lease. +const suggestedPostLifecycleClaimSeconds = 5 * 60 + type persistedSuggestedPostApproval struct { monoforumID, parentID, actorID, payerID int64 messageID, scheduleDate, approvalServiceID, publishedMessageID, settlementDue, finalServiceID int @@ -62,9 +68,22 @@ func (s *ChannelStore) ToggleSuggestedPostApproval(ctx context.Context, req doma if parent.Deleted || !parent.Broadcast || parent.LinkedMonoforumID != mono.ID { return domain.ToggleSuggestedPostApprovalResult{}, domain.ErrSuggestedPostInvalid } + // All lifecycle/toggle paths lock an existing approval before its original + // message. A first command has no row to lock, so it rechecks after taking + // the message lock; this preserves single creation without a gap lock. + existing, found, err := loadSuggestedPostApprovalTx(ctx, tx, mono.ID, req.MessageID, true) + if err != nil { + return domain.ToggleSuggestedPostApprovalResult{}, err + } if _, err := tx.Exec(ctx, `SELECT 1 FROM channel_messages WHERE channel_id=$1 AND id=$2 FOR UPDATE`, mono.ID, req.MessageID); err != nil { return domain.ToggleSuggestedPostApprovalResult{}, err } + if !found { + existing, found, err = loadSuggestedPostApprovalTx(ctx, tx, mono.ID, req.MessageID, true) + if err != nil { + return domain.ToggleSuggestedPostApprovalResult{}, err + } + } original, err := s.getChannelMessage(ctx, tx, mono.ID, req.MessageID) if err != nil { if errors.Is(err, domain.ErrMessageIDInvalid) { @@ -92,10 +111,6 @@ func (s *ChannelStore) ToggleSuggestedPostApproval(ctx context.Context, req doma return domain.ToggleSuggestedPostApprovalResult{}, domain.ErrSuggestedPostApprovalForbidden } - existing, found, err := loadSuggestedPostApprovalTx(ctx, tx, mono.ID, original.ID, true) - if err != nil { - return domain.ToggleSuggestedPostApprovalResult{}, err - } if found && existing.state != domain.SuggestedPostStateBalanceLow { result, err := s.loadSuggestedPostResultTx(ctx, tx, existing, true) if err != nil { @@ -300,10 +315,21 @@ func upsertSuggestedPostApprovalTx(ctx context.Context, tx pgx.Tx, row persisted if row.price != nil { kind, amount, nanos = string(row.price.Kind), row.price.Amount, row.price.Nanos } - _, err := tx.Exec(ctx, `INSERT INTO suggested_post_approvals(monoforum_id,suggestion_message_id,parent_channel_id,actor_user_id,payer_user_id,state,price_kind,price_amount,price_nanos,schedule_date,approval_service_message_id,published_message_id,settlement_due,final_service_message_id,created_at,updated_at) -VALUES($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$15) -ON CONFLICT(monoforum_id,suggestion_message_id) DO UPDATE SET actor_user_id=EXCLUDED.actor_user_id,state=EXCLUDED.state,price_kind=EXCLUDED.price_kind,price_amount=EXCLUDED.price_amount,price_nanos=EXCLUDED.price_nanos,schedule_date=EXCLUDED.schedule_date,approval_service_message_id=EXCLUDED.approval_service_message_id,published_message_id=EXCLUDED.published_message_id,settlement_due=EXCLUDED.settlement_due,final_service_message_id=EXCLUDED.final_service_message_id,updated_at=EXCLUDED.updated_at`, - row.monoforumID, row.messageID, row.parentID, row.actorID, row.payerID, string(row.state), kind, amount, nanos, row.scheduleDate, row.approvalServiceID, row.publishedMessageID, row.settlementDue, row.finalServiceID, date) + nextAttemptAt := 0 + switch row.state { + case domain.SuggestedPostStateScheduled: + nextAttemptAt = row.scheduleDate + case domain.SuggestedPostStatePublished: + nextAttemptAt = row.settlementDue + } + _, err := tx.Exec(ctx, `INSERT INTO suggested_post_approvals(monoforum_id,suggestion_message_id,parent_channel_id,actor_user_id,payer_user_id,state,price_kind,price_amount,price_nanos,schedule_date,approval_service_message_id,published_message_id,settlement_due,final_service_message_id,next_attempt_at,created_at,updated_at) +VALUES($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$16) +ON CONFLICT(monoforum_id,suggestion_message_id) DO UPDATE SET actor_user_id=EXCLUDED.actor_user_id,state=EXCLUDED.state,price_kind=EXCLUDED.price_kind,price_amount=EXCLUDED.price_amount,price_nanos=EXCLUDED.price_nanos,schedule_date=EXCLUDED.schedule_date,approval_service_message_id=EXCLUDED.approval_service_message_id,published_message_id=EXCLUDED.published_message_id,settlement_due=EXCLUDED.settlement_due,final_service_message_id=EXCLUDED.final_service_message_id,lifecycle_attempts=0,next_attempt_at=EXCLUDED.next_attempt_at,last_lifecycle_error='',updated_at=EXCLUDED.updated_at`, + row.monoforumID, row.messageID, row.parentID, row.actorID, row.payerID, string(row.state), kind, amount, nanos, row.scheduleDate, row.approvalServiceID, row.publishedMessageID, row.settlementDue, row.finalServiceID, nextAttemptAt, date) + if err == nil { + _, err = tx.Exec(ctx, `DELETE FROM suggested_post_lifecycle_wakeups +WHERE monoforum_id=$1 AND suggestion_message_id=$2`, row.monoforumID, row.messageID) + } return err } @@ -393,17 +419,29 @@ func (s *ChannelStore) ProcessSuggestedPostLifecycle(ctx context.Context, req do req.Limit = 100 } rows, err := s.db.Query(ctx, ` +WITH timed AS MATERIALIZED ( + SELECT monoforum_id,suggestion_message_id,next_attempt_at AS due_at + FROM suggested_post_approvals + WHERE state IN ('scheduled','published') AND next_attempt_at <= $1 + ORDER BY next_attempt_at,monoforum_id,suggestion_message_id + LIMIT $2 +), woken AS MATERIALIZED ( + SELECT w.monoforum_id,w.suggestion_message_id,w.created_at AS due_at + FROM suggested_post_lifecycle_wakeups w + JOIN suggested_post_approvals a + ON a.monoforum_id=w.monoforum_id AND a.suggestion_message_id=w.suggestion_message_id + WHERE a.state IN ('scheduled','published') + ORDER BY w.created_at,w.monoforum_id,w.suggestion_message_id + LIMIT $2 +), due AS ( + SELECT * FROM timed + UNION ALL + SELECT * FROM woken +) SELECT monoforum_id,suggestion_message_id -FROM suggested_post_approvals a -WHERE (a.state='scheduled' AND a.schedule_date <= $1) - OR (a.state='scheduled' AND EXISTS ( - SELECT 1 FROM channel_messages sm - WHERE sm.channel_id=a.monoforum_id AND sm.id=a.suggestion_message_id AND sm.deleted)) - OR (a.state='published' AND (a.settlement_due <= $1 OR EXISTS ( - SELECT 1 FROM channel_messages m - WHERE m.channel_id=a.parent_channel_id AND m.id=a.published_message_id AND m.deleted))) -ORDER BY CASE WHEN a.state='scheduled' THEN a.schedule_date ELSE a.settlement_due END, - a.monoforum_id,a.suggestion_message_id +FROM due +GROUP BY monoforum_id,suggestion_message_id +ORDER BY MIN(due_at),monoforum_id,suggestion_message_id LIMIT $2`, req.Now, req.Limit) if err != nil { return nil, fmt.Errorf("list due suggested posts: %w", err) @@ -427,16 +465,76 @@ LIMIT $2`, req.Now, req.Limit) } rows.Close() out := make([]domain.ToggleSuggestedPostApprovalResult, 0, len(keys)) + var failures []error for _, k := range keys { - result, changed, err := s.processSuggestedPostLifecycleOne(ctx, k.mono, k.message, req.Now) + claimed, err := s.claimSuggestedPostLifecycle(ctx, k.mono, k.message, req.Now) if err != nil { - return out, err + failures = append(failures, fmt.Errorf("claim suggested post lifecycle %d/%d: %w", k.mono, k.message, err)) + continue } + if !claimed { + continue + } + result, changed, err := s.processSuggestedPostLifecycleOne(ctx, k.mono, k.message, req.Now) if changed { + // A post-commit reload can fail after the durable transition already + // succeeded. Preserve that result so its committed updates still reach + // the fanout layer; only pre-commit failures need retry metadata. out = append(out, result) } + if err != nil { + failures = append(failures, fmt.Errorf("suggested post lifecycle %d/%d: %w", k.mono, k.message, err)) + if !changed { + if recordErr := s.recordSuggestedPostLifecycleFailure(ctx, k.mono, k.message, req.Now, err); recordErr != nil { + failures = append(failures, fmt.Errorf("record suggested post lifecycle failure %d/%d: %w", k.mono, k.message, recordErr)) + } + } + continue + } } - return out, nil + return out, errors.Join(failures...) +} + +func (s *ChannelStore) claimSuggestedPostLifecycle(ctx context.Context, monoforumID int64, messageID, now int) (bool, error) { + if monoforumID <= 0 || messageID <= 0 || now <= 0 { + return false, domain.ErrSuggestedPostInvalid + } + var claimed bool + err := s.db.QueryRow(ctx, `WITH claimed AS ( + UPDATE suggested_post_approvals a + SET next_attempt_at=$3+$4, + updated_at=GREATEST(a.updated_at,$3) + WHERE a.monoforum_id=$1 AND a.suggestion_message_id=$2 + AND a.state IN ('scheduled','published') + AND (a.next_attempt_at <= $3 OR EXISTS ( + SELECT 1 FROM suggested_post_lifecycle_wakeups w + WHERE w.monoforum_id=a.monoforum_id AND w.suggestion_message_id=a.suggestion_message_id)) + RETURNING a.monoforum_id,a.suggestion_message_id +), cleared AS ( + DELETE FROM suggested_post_lifecycle_wakeups w + USING claimed c + WHERE w.monoforum_id=c.monoforum_id AND w.suggestion_message_id=c.suggestion_message_id +) +SELECT EXISTS(SELECT 1 FROM claimed)`, monoforumID, messageID, now, suggestedPostLifecycleClaimSeconds).Scan(&claimed) + return claimed, err +} + +func (s *ChannelStore) recordSuggestedPostLifecycleFailure(ctx context.Context, monoforumID int64, messageID, now int, cause error) error { + if monoforumID <= 0 || messageID <= 0 || now <= 0 || cause == nil { + return domain.ErrSuggestedPostInvalid + } + lastError := []rune(strings.TrimSpace(cause.Error())) + if len(lastError) > 512 { + lastError = lastError[:512] + } + _, err := s.db.Exec(ctx, `UPDATE suggested_post_approvals +SET lifecycle_attempts=LEAST(lifecycle_attempts+1,1000000), + next_attempt_at=$3+LEAST(300,5*(LEAST(lifecycle_attempts,59)+1)), + last_lifecycle_error=$4, + updated_at=GREATEST(updated_at,$3) +WHERE monoforum_id=$1 AND suggestion_message_id=$2 AND state IN ('scheduled','published')`, + monoforumID, messageID, now, string(lastError)) + return err } func (s *ChannelStore) processSuggestedPostLifecycleOne(ctx context.Context, monoID int64, messageID, now int) (domain.ToggleSuggestedPostApprovalResult, bool, error) { @@ -476,7 +574,10 @@ func (s *ChannelStore) processSuggestedPostLifecycleOne(ctx context.Context, mon if err != nil { return domain.ToggleSuggestedPostApprovalResult{}, false, err } - original, err := s.getChannelMessage(ctx, tx, row.monoforumID, row.messageID) + // Serialize a scheduled publish with deletion of the original suggestion. + // The delete trigger only reads the approval row and writes a wakeup, so + // taking approval -> message locks here does not introduce a reverse edge. + original, err := getSuggestedPostMessageForShare(ctx, tx, row.monoforumID, row.messageID) if err != nil { return domain.ToggleSuggestedPostApprovalResult{}, false, err } @@ -506,6 +607,15 @@ func (s *ChannelStore) processSuggestedPostLifecycleOne(ctx context.Context, mon changed = true } if !changed { + nextAttemptAt := row.scheduleDate + if row.state == domain.SuggestedPostStatePublished { + nextAttemptAt = row.settlementDue + } + if _, err := tx.Exec(ctx, `UPDATE suggested_post_approvals +SET lifecycle_attempts=0,next_attempt_at=$3,last_lifecycle_error='',updated_at=GREATEST(updated_at,$4) +WHERE monoforum_id=$1 AND suggestion_message_id=$2`, row.monoforumID, row.messageID, nextAttemptAt, now); err != nil { + return result, false, err + } if err := tx.Commit(ctx); err != nil { return result, false, err } @@ -519,17 +629,33 @@ func (s *ChannelStore) processSuggestedPostLifecycleOne(ctx context.Context, mon return result, false, err } committed = true - result.Monoforum, err = getChannelByID(ctx, s.db, row.monoforumID) + reloadedMonoforum, err := getChannelByID(ctx, s.db, row.monoforumID) if err != nil { return result, true, fmt.Errorf("reload lifecycle monoforum after commit: %w", err) } - result.Parent, err = getChannelByID(ctx, s.db, row.parentID) + result.Monoforum = reloadedMonoforum + reloadedParent, err := getChannelByID(ctx, s.db, row.parentID) if err != nil { return result, true, fmt.Errorf("reload lifecycle parent after commit: %w", err) } + result.Parent = reloadedParent return result, true, nil } +func getSuggestedPostMessageForShare(ctx context.Context, tx pgx.Tx, channelID int64, messageID int) (domain.ChannelMessage, error) { + if channelID <= 0 || messageID <= 0 { + return domain.ChannelMessage{}, domain.ErrMessageIDInvalid + } + msg, err := scanChannelMessage(tx.QueryRow(ctx, `SELECT `+channelMessageColumns+` +FROM channel_messages +WHERE channel_id=$1 AND id=$2 +FOR SHARE`, channelID, messageID)) + if errors.Is(err, pgx.ErrNoRows) { + return domain.ChannelMessage{}, domain.ErrMessageIDInvalid + } + return msg, err +} + func (r persistedSuggestedPostApproval) savedPeer() domain.Peer { return domain.Peer{Type: domain.PeerTypeUser, ID: r.payerID} } diff --git a/internal/store/postgres/channel_top_message_cache.go b/internal/store/postgres/channel_top_message_cache.go new file mode 100644 index 00000000..12ff3d09 --- /dev/null +++ b/internal/store/postgres/channel_top_message_cache.go @@ -0,0 +1,226 @@ +package postgres + +import ( + "context" + + "telesrv/internal/domain" + "telesrv/internal/readmodelcache" + "telesrv/internal/store/postgres/sqlcgen" +) + +// ChannelTopMessageCache stores the viewer-independent channel_messages row +// used as a dialog's top payload. Viewer overlays (mentioned/media_unread, +// normal/paid reactions) are deliberately applied after this cache. +// +// channel_base is the dependency token: edits/deletes/new tops and any other +// mutation that can alter the visible top payload bump it. The read-model +// listener invalidates every cached key for that channel and flushes on +// reconnect, while the cache epoch prevents a pre-invalidation batch load from +// being written back afterwards. +type ChannelTopMessageCache struct { + cache *readmodelcache.Cache[channelMessageLookupKey, domain.ChannelMessage] + reactionPresence *readmodelcache.Cache[channelMessageLookupKey, channelTopReactionPresence] +} + +type channelTopReactionPresence struct { + Normal bool + Paid bool +} + +func (p channelTopReactionPresence) any() bool { return p.Normal || p.Paid } + +func NewChannelTopMessageCache(max int) *ChannelTopMessageCache { + cache := readmodelcache.New[channelMessageLookupKey, domain.ChannelMessage](readmodelcache.Config[channelMessageLookupKey, domain.ChannelMessage]{ + MaxEntries: max, + Clone: cloneChannelTopMessage, + }) + if cache == nil { + return nil + } + return &ChannelTopMessageCache{ + cache: cache, + reactionPresence: readmodelcache.New[channelMessageLookupKey, channelTopReactionPresence](readmodelcache.Config[channelMessageLookupKey, channelTopReactionPresence]{ + MaxEntries: max, + }), + } +} + +func (c *ChannelTopMessageCache) getOrLoadBatch( + ctx context.Context, + keys []channelMessageLookupKey, + load func(context.Context, []channelMessageLookupKey) (map[channelMessageLookupKey]domain.ChannelMessage, error), +) (map[channelMessageLookupKey]domain.ChannelMessage, error) { + if c == nil { + return load(ctx, keys) + } + return c.cache.GetOrLoadBatch( + ctx, + keys, + func(channelMessageLookupKey) (int64, bool) { return 0, true }, + func(ctx context.Context, missing []channelMessageLookupKey) (map[channelMessageLookupKey]domain.ChannelMessage, error) { + loaded, err := load(ctx, missing) + if err != nil { + return nil, err + } + for _, key := range missing { + if _, ok := loaded[key]; !ok { + loaded[key] = domain.ChannelMessage{} + } + } + return loaded, nil + }, + ) +} + +func (c *ChannelTopMessageCache) deleteChannel(channelID int64) { + if c == nil || channelID == 0 { + return + } + c.cache.InvalidateWhere(func(key channelMessageLookupKey) bool { return key.channelID == channelID }) + c.reactionPresence.InvalidateWhere(func(key channelMessageLookupKey) bool { return key.channelID == channelID }) +} + +func (c *ChannelTopMessageCache) flush() { + if c == nil { + return + } + c.cache.Flush() + c.reactionPresence.Flush() +} + +// reactionPresenceFor returns only a shared existence bit. It never caches +// counts, chosen state, recent order or paid identities, all of which remain +// viewer/current-data projections. A negative bit is enough to skip three +// guaranteed-empty reaction queries for the many top messages with no +// reactions at all. +func (c *ChannelTopMessageCache) reactionPresenceFor( + ctx context.Context, + db sqlcgen.DBTX, + messages []domain.ChannelMessage, +) (map[channelMessageLookupKey]channelTopReactionPresence, error) { + keys := make([]channelMessageLookupKey, 0, len(messages)) + for _, msg := range messages { + if msg.ChannelID == 0 || msg.ID <= 0 || domain.IsChannelHistoryClearMessage(msg) { + continue + } + keys = append(keys, channelMessageLookupKey{channelID: msg.ChannelID, id: msg.ID}) + } + if len(keys) == 0 { + return map[channelMessageLookupKey]channelTopReactionPresence{}, nil + } + return c.reactionPresence.GetOrLoadBatch( + ctx, + keys, + func(channelMessageLookupKey) (int64, bool) { return 0, true }, + func(ctx context.Context, missing []channelMessageLookupKey) (map[channelMessageLookupKey]channelTopReactionPresence, error) { + channelIDs := make([]int64, 0, len(missing)) + messageIDs := make([]int32, 0, len(missing)) + for _, key := range missing { + channelIDs = append(channelIDs, key.channelID) + messageIDs = append(messageIDs, pgInt32NonNegative(key.id)) + } + rows, err := db.Query(ctx, ` +WITH requested AS ( + SELECT channel_id, message_id + FROM unnest($1::bigint[], $2::int[]) AS r(channel_id, message_id) +) +SELECT r.channel_id, r.message_id, + EXISTS ( + SELECT 1 FROM channel_message_reactions normal + WHERE normal.channel_id=r.channel_id AND normal.message_id=r.message_id + ), + EXISTS ( + SELECT 1 FROM channel_message_paid_reactions paid + WHERE paid.channel_id=r.channel_id AND paid.message_id=r.message_id + ) +FROM requested r`, channelIDs, messageIDs) + if err != nil { + return nil, err + } + defer rows.Close() + out := make(map[channelMessageLookupKey]channelTopReactionPresence, len(missing)) + for rows.Next() { + var key channelMessageLookupKey + var presence channelTopReactionPresence + if err := rows.Scan(&key.channelID, &key.id, &presence.Normal, &presence.Paid); err != nil { + return nil, err + } + out[key] = presence + } + if err := rows.Err(); err != nil { + return nil, err + } + for _, key := range missing { + if _, ok := out[key]; !ok { + out[key] = channelTopReactionPresence{} + } + } + return out, nil + }, + ) +} + +// cloneChannelTopMessage isolates every mutable field that is enriched by the +// dialog projection path. Media is an immutable decoded storage snapshot; the +// hot path only reads it and never mutates its nested objects. +func cloneChannelTopMessage(msg domain.ChannelMessage) domain.ChannelMessage { + msg.Entities = append([]domain.MessageEntity(nil), msg.Entities...) + msg.ReplyTo = cloneMessageReply(msg.ReplyTo) + msg.Forward = cloneMessageForward(msg.Forward) + msg.Action = cloneChannelMessageAction(msg.Action) + if msg.SendAs != nil { + peer := *msg.SendAs + msg.SendAs = &peer + } + if msg.SuggestedPost != nil { + suggested := *msg.SuggestedPost + if suggested.Price != nil { + price := *suggested.Price + suggested.Price = &price + } + msg.SuggestedPost = &suggested + } + if msg.Discussion != nil { + discussion := *msg.Discussion + msg.Discussion = &discussion + } + if msg.Replies != nil { + replies := *msg.Replies + replies.RecentRepliers = append([]domain.Peer(nil), msg.Replies.RecentRepliers...) + msg.Replies = &replies + } + if msg.Reactions != nil { + reactions := *msg.Reactions + reactions.Results = append([]domain.ChannelMessageReactionCount(nil), msg.Reactions.Results...) + reactions.Recent = append([]domain.ChannelMessagePeerReaction(nil), msg.Reactions.Recent...) + msg.Reactions = &reactions + } + if msg.RichMessage != nil { + rich := *msg.RichMessage + rich.Blocks = append([]byte(nil), msg.RichMessage.Blocks...) + rich.Photos = append([]domain.Photo(nil), msg.RichMessage.Photos...) + rich.Documents = append([]domain.Document(nil), msg.RichMessage.Documents...) + rich.BotAPIProjection = append([]byte(nil), msg.RichMessage.BotAPIProjection...) + msg.RichMessage = &rich + } + if msg.ReplyMarkup != nil { + markup := *msg.ReplyMarkup + if msg.ReplyMarkup.Inline != nil { + markup.Inline = make([][]domain.MarkupButton, len(msg.ReplyMarkup.Inline)) + for i, row := range msg.ReplyMarkup.Inline { + markup.Inline[i] = append([]domain.MarkupButton(nil), row...) + for j := range markup.Inline[i] { + markup.Inline[i][j].Data = append([]byte(nil), row[j].Data...) + } + } + } + if msg.ReplyMarkup.Keyboard != nil { + markup.Keyboard = make([][]domain.MarkupButton, len(msg.ReplyMarkup.Keyboard)) + for i, row := range msg.ReplyMarkup.Keyboard { + markup.Keyboard[i] = append([]domain.MarkupButton(nil), row...) + } + } + msg.ReplyMarkup = &markup + } + return msg +} diff --git a/internal/store/postgres/channel_top_message_cache_integration_test.go b/internal/store/postgres/channel_top_message_cache_integration_test.go new file mode 100644 index 00000000..f7b55bcc --- /dev/null +++ b/internal/store/postgres/channel_top_message_cache_integration_test.go @@ -0,0 +1,121 @@ +package postgres + +import ( + "context" + "os" + "testing" + "time" + + "telesrv/internal/domain" +) + +func TestChannelTopMessageCacheInvalidatesOnTopPayloadNotify(t *testing.T) { + pool := testPool(t) + dsn := os.Getenv("TELESRV_TEST_POSTGRES_DSN") + ctx := context.Background() + suffix := randomSuffix(t) + + users := NewUserStore(pool) + owner, err := users.Create(ctx, domain.User{ + AccessHash: 461, + Phone: "+1888" + suffix + "91", + FirstName: "TopCacheOwner", + }) + if err != nil { + t.Fatalf("create owner: %v", err) + } + var channelID int64 + t.Cleanup(func() { + if channelID != 0 { + _, _ = pool.Exec(ctx, "DELETE FROM channels WHERE id = $1", channelID) + } + _, _ = pool.Exec(ctx, "DELETE FROM users WHERE id = $1", owner.ID) + }) + + topCache := NewChannelTopMessageCache(32) + rowCache := NewChannelRowCache(32) + channels := NewChannelStore(pool, + WithChannelRowCache(rowCache), + WithChannelTopMessageCache(topCache), + ) + created, err := channels.CreateChannel(ctx, domain.CreateChannelRequest{ + CreatorUserID: owner.ID, + Title: "Top cache " + suffix, + Megagroup: true, + Date: 1700000760, + }) + if err != nil { + t.Fatalf("create channel: %v", err) + } + channelID = created.Channel.ID + sent, err := channels.SendChannelMessage(ctx, domain.SendChannelMessageRequest{ + UserID: owner.ID, + ChannelID: channelID, + RandomID: 761, + Message: "before cache invalidation", + Date: 1700000761, + }) + if err != nil { + t.Fatalf("send channel message: %v", err) + } + key := channelMessageLookupKey{channelID: channelID, id: sent.Message.ID} + + // Seed one sentinel so listener reconnect flush is an observable readiness + // barrier instead of a timing sleep. + topCache.cache.Store(key, domain.ChannelMessage{ChannelID: channelID, ID: sent.Message.ID, Body: "sentinel"}) + lctx, cancel := context.WithCancel(ctx) + defer cancel() + listener := NewReadModelChangeListener(dsn, ReadModelCacheSet{ + ChannelRows: rowCache, + ChannelTopMessages: topCache, + }, nil) + go listener.Run(lctx) + if !waitUntil(2*time.Second, func() bool { + _, ok := topCache.cache.Peek(key) + return !ok + }) { + t.Fatal("read-model listener did not establish LISTEN and flush sentinel") + } + + view, err := channels.GetChannelDialogs(ctx, owner.ID, []int64{channelID}) + if err != nil { + t.Fatalf("warm channel dialog: %v", err) + } + if len(view.Messages) != 1 || view.Messages[0].Body != "before cache invalidation" { + t.Fatalf("warm messages = %+v", view.Messages) + } + if cached, ok := topCache.cache.Peek(key); !ok || cached.Body != "before cache invalidation" { + t.Fatalf("top payload was not cached: ok=%v value=%+v", ok, cached) + } + materialized, err := channels.HydrateChannelDialogSnapshot(ctx, owner.ID, view.Dialogs) + if err != nil { + t.Fatalf("hydrate materialized owner dialog: %v", err) + } + if len(materialized.Dialogs) != 1 || len(materialized.Channels) != 1 || len(materialized.Messages) != 1 || + materialized.Dialogs[0].Peer.ID != channelID || materialized.Messages[0].Body != "before cache invalidation" { + t.Fatalf("materialized channel snapshot = dialogs:%+v channels:%+v messages:%+v", + materialized.Dialogs, materialized.Channels, materialized.Messages) + } + + const after = "after cache invalidation" + if _, err := pool.Exec(ctx, ` +UPDATE channel_messages +SET body=$3, edit_date=$4 +WHERE channel_id=$1 AND id=$2`, channelID, sent.Message.ID, after, 1700000762); err != nil { + t.Fatalf("update top payload: %v", err) + } + if !waitUntil(3*time.Second, func() bool { + _, ok := topCache.cache.Peek(key) + return !ok + }) { + t.Fatal("top channel message cache was not invalidated by channel_base") + } + + view, err = channels.GetChannelDialogs(ctx, owner.ID, []int64{channelID}) + if err != nil { + t.Fatalf("read channel dialog after invalidation: %v", err) + } + if len(view.Messages) != 1 || view.Messages[0].Body != after { + t.Fatalf("post-invalidation messages = %+v, want body %q", view.Messages, after) + } +} diff --git a/internal/store/postgres/channel_top_message_cache_test.go b/internal/store/postgres/channel_top_message_cache_test.go new file mode 100644 index 00000000..18e119e6 --- /dev/null +++ b/internal/store/postgres/channel_top_message_cache_test.go @@ -0,0 +1,90 @@ +package postgres + +import ( + "context" + "testing" + + "telesrv/internal/domain" +) + +func TestChannelTopMessageCacheBatchesClonesAndInvalidates(t *testing.T) { + cache := NewChannelTopMessageCache(8) + if cache == nil { + t.Fatal("NewChannelTopMessageCache returned nil") + } + keys := []channelMessageLookupKey{{channelID: 7, id: 11}, {channelID: 7, id: 12}, {channelID: 8, id: 21}} + loads := 0 + load := func(_ context.Context, missing []channelMessageLookupKey) (map[channelMessageLookupKey]domain.ChannelMessage, error) { + loads++ + out := make(map[channelMessageLookupKey]domain.ChannelMessage, len(missing)) + for _, key := range missing { + out[key] = domain.ChannelMessage{ + ChannelID: key.channelID, + ID: key.id, + Entities: []domain.MessageEntity{{Offset: 1, Length: 2}}, + Action: &domain.ChannelMessageAction{UserIDs: []int64{3}}, + RichMessage: &domain.MessageRichMessage{ + Blocks: []byte{4, 5}, + }, + } + } + return out, nil + } + + first, err := cache.getOrLoadBatch(context.Background(), keys, load) + if err != nil { + t.Fatal(err) + } + if loads != 1 { + t.Fatalf("cold batch loads = %d, want 1", loads) + } + first[keys[0]].Entities[0].Offset = 99 + first[keys[0]].Action.UserIDs[0] = 99 + first[keys[0]].RichMessage.Blocks[0] = 99 + + second, err := cache.getOrLoadBatch(context.Background(), keys, load) + if err != nil { + t.Fatal(err) + } + if loads != 1 { + t.Fatalf("warm batch loads = %d, want 1", loads) + } + if got := second[keys[0]]; got.Entities[0].Offset != 1 || got.Action.UserIDs[0] != 3 || got.RichMessage.Blocks[0] != 4 { + t.Fatalf("cached message alias-mutated: %+v", got) + } + + listener := NewReadModelChangeListener("", ReadModelCacheSet{ChannelTopMessages: cache}, nil) + cache.reactionPresence.Store(keys[0], channelTopReactionPresence{Normal: true}) + listener.handlePayload(`{"model":"channel_base","owner_user_id":0,"peer_type":"channel","peer_id":7}`) + if _, ok := cache.reactionPresence.Peek(keys[0]); ok { + t.Fatal("channel_base did not invalidate top reaction presence") + } + if _, err := cache.getOrLoadBatch(context.Background(), keys, load); err != nil { + t.Fatal(err) + } + if loads != 2 { + t.Fatalf("channel invalidation loads = %d, want 2", loads) + } +} + +func TestChannelTopMessageCacheNegativeResultIsCached(t *testing.T) { + cache := NewChannelTopMessageCache(4) + key := channelMessageLookupKey{channelID: 9, id: 1} + loads := 0 + load := func(context.Context, []channelMessageLookupKey) (map[channelMessageLookupKey]domain.ChannelMessage, error) { + loads++ + return map[channelMessageLookupKey]domain.ChannelMessage{}, nil + } + for i := 0; i < 2; i++ { + got, err := cache.getOrLoadBatch(context.Background(), []channelMessageLookupKey{key}, load) + if err != nil { + t.Fatal(err) + } + if got[key].ID != 0 { + t.Fatalf("negative result = %+v", got[key]) + } + } + if loads != 1 { + t.Fatalf("negative cache loads = %d, want 1", loads) + } +} diff --git a/internal/store/postgres/channel_update_retention.go b/internal/store/postgres/channel_update_retention.go index 6d776117..d3bebfc6 100644 --- a/internal/store/postgres/channel_update_retention.go +++ b/internal/store/postgres/channel_update_retention.go @@ -209,6 +209,15 @@ WHERE channel_id = $1`, channelID, cursor, checkpoint.LatestEventDate, checkpoin if tag.RowsAffected() != 1 { return fmt.Errorf("advance channel update retained floor: checkpoint row disappeared for channel %d", channelID) } + // Retention changes whether an old cursor receives a normal page or + // channelDifferenceTooLong without changing channel.pts. Publish a + // dedicated generation so every instance drops immutable pages built + // against the previous floor. + if _, err := tx.Exec(ctx, `SELECT telesrv_bump_read_model_version( + 'channel_difference_base', 0, 'channel', $1 +)`, channelID); err != nil { + return fmt.Errorf("bump channel difference retention read model: %w", err) + } checkpoint.RetainedThroughPts = cursor result = domain.ChannelUpdateRetentionResult{Checkpoint: checkpoint, Deleted: len(ptsToDelete)} return nil @@ -216,6 +225,9 @@ WHERE channel_id = $1`, channelID, cursor, checkpoint.LatestEventDate, checkpoin if err != nil { return domain.ChannelUpdateRetentionResult{}, err } + if result.Deleted > 0 && s.differenceCache != nil { + s.differenceCache.deleteChannel(channelID) + } return result, nil } diff --git a/internal/store/postgres/channel_updates.go b/internal/store/postgres/channel_updates.go index e18d84b9..c0d873da 100644 --- a/internal/store/postgres/channel_updates.go +++ b/internal/store/postgres/channel_updates.go @@ -3,6 +3,7 @@ package postgres import ( "context" "encoding/json" + "errors" "fmt" "github.com/jackc/pgx/v5" @@ -12,13 +13,31 @@ import ( "telesrv/internal/store/postgres/sqlcgen" ) +var errChannelDifferenceCutChanged = errors.New("channel difference stable cut changed") + func (s *ChannelStore) ListChannelDifference(ctx context.Context, req domain.ChannelDifferenceRequest) (domain.ChannelDifference, error) { + for attempt := 0; attempt < 3; attempt++ { + diff, retry, err := s.listChannelDifferenceAttempt(ctx, req) + if !retry { + return diff, err + } + if s.rowCache != nil { + s.rowCache.delete(req.ChannelID) + } + if s.differenceCache != nil { + s.differenceCache.deleteChannel(req.ChannelID) + } + } + return domain.ChannelDifference{}, fmt.Errorf("list channel difference: stable cut changed repeatedly for channel %d", req.ChannelID) +} + +func (s *ChannelStore) listChannelDifferenceAttempt(ctx context.Context, req domain.ChannelDifferenceRequest) (domain.ChannelDifference, bool, error) { channel, member, preview, err := s.getChannelForViewer(ctx, s.db, req.UserID, req.ChannelID) if err != nil { - return domain.ChannelDifference{}, err + return domain.ChannelDifference{}, false, err } if req.Pts < 0 || req.Pts > channel.Pts { - return domain.ChannelDifference{}, domain.ErrPersistentTimestamp + return domain.ChannelDifference{}, false, domain.ErrPersistentTimestamp } if !preview && member.AvailableMinPts > req.Pts { req.Pts = minInt(member.AvailableMinPts, channel.Pts) @@ -27,32 +46,53 @@ func (s *ChannelStore) ListChannelDifference(ctx context.Context, req domain.Cha if limit <= 0 || limit > domain.MaxChannelDifferenceLimit { limit = domain.MaxChannelDifferenceLimit } - checkpoint, err := getChannelUpdateCheckpoint(ctx, s.db, req.ChannelID) - if err != nil { - return domain.ChannelDifference{}, err + // A current-PTS request has no retention range to prove. Access, membership, + // available_min_pts and future/stale bounds were already checked above; do + // not spend two pool acquisitions reading a checkpoint and an empty event + // range during reconnect storms. + if req.Pts == channel.Pts { + diff := domain.ChannelDifference{ + Channel: channel, + Self: member, + Pts: channel.Pts, + Final: true, + Timeout: 30, + } + if preview { + diff.Dialog = previewChannelDialog(req.UserID, channel, member) + } else { + dialog, err := s.getChannelDialog(ctx, s.db, req.UserID, channel) + if err != nil { + return domain.ChannelDifference{}, false, err + } + diff.Dialog = dialog + } + return diff, false, nil } - if req.Pts < checkpoint.RetainedThroughPts || channel.Pts-req.Pts > limit { - args := []any{req.ChannelID} - where := "channel_id = $1 AND NOT deleted" - if member.AvailableMinID > 0 { - args = append(args, member.AvailableMinID) - where += fmt.Sprintf(" AND id > $%d", len(args)) - } - if channel.Monoforum && !member.CanManageDirectMessages() { - args = append(args, req.UserID) - where += fmt.Sprintf(" AND saved_peer_type = 'user' AND saved_peer_id = $%d", len(args)) - } - args = append(args, domain.MaxChannelDifferenceTooLongMessages) - rows, err := s.db.Query(ctx, ` -SELECT `+channelMessageColumns+` -FROM channel_messages -WHERE `+where+` -ORDER BY id DESC -LIMIT $`+fmt.Sprint(len(args)), args...) - if err != nil { - return domain.ChannelDifference{}, fmt.Errorf("list channel too long messages: %w", err) - } - defer rows.Close() + key := channelDifferenceBaseKey{ + channelID: req.ChannelID, + requestPts: req.Pts, + capturedPts: channel.Pts, + capturedTopID: channel.TopMessageID, + limit: limit, + } + sharedBase := !channel.Monoforum && s.differenceCache != nil + load := func() (channelDifferenceBase, error) { + return s.loadChannelDifferenceBase(ctx, channel, member, req.UserID, req.Pts, limit, sharedBase) + } + var base channelDifferenceBase + if channel.Monoforum || s.differenceCache == nil { + base, err = load() + } else { + base, err = s.differenceCache.getOrLoad(ctx, key, load) + } + if errors.Is(err, errChannelDifferenceCutChanged) { + return domain.ChannelDifference{}, true, nil + } + if err != nil { + return domain.ChannelDifference{}, false, err + } + if base.tooLong { diff := domain.ChannelDifference{ Channel: channel, Self: member, @@ -61,102 +101,42 @@ LIMIT $`+fmt.Sprint(len(args)), args...) TooLong: true, Timeout: 30, } - for rows.Next() { - msg, err := scanChannelMessage(rows) - if err != nil { - return domain.ChannelDifference{}, err + for _, msg := range base.messages { + if member.AvailableMinID > 0 && msg.ID <= member.AvailableMinID { + continue + } + if !channelMessageVisibleToViewer(channel, member, req.UserID, msg) { + continue } diff.NewMessages = append(diff.NewMessages, msg) } - if err := rows.Err(); err != nil { - return domain.ChannelDifference{}, err - } - if err := populateChannelMessageUnreadFlags(ctx, s.db, req.UserID, diff.NewMessages); err != nil { - return domain.ChannelDifference{}, err + if err := populateChannelDifferenceUnreadFlags(ctx, s.db, req.UserID, diff.NewMessages, base); err != nil { + return domain.ChannelDifference{}, false, err } if preview { diff.Dialog = previewChannelDialog(req.UserID, channel, member) } else { dialog, err := s.getChannelDialog(ctx, s.db, req.UserID, channel) if err != nil { - return domain.ChannelDifference{}, err + return domain.ChannelDifference{}, false, err } diff.Dialog = dialog } - return diff, nil - } - rows, err := s.db.Query(ctx, ` -SELECT channel_id, pts, pts_count, date, event_type, message_id, message_ids::text, sender_user_id, user_ids::text, payload::text -FROM channel_update_events -WHERE channel_id = $1 AND pts > $2 -ORDER BY pts ASC -LIMIT $3`, req.ChannelID, req.Pts, limit) - if err != nil { - return domain.ChannelDifference{}, fmt.Errorf("list channel difference: %w", err) + return diff, false, nil } diff := domain.ChannelDifference{Channel: channel, Self: member, Pts: channel.Pts, Final: true, Timeout: 30} - userRefs := make(map[int64]struct{}) - channelRefs := make(map[int64]struct{}) - lastPts := req.Pts - type differenceEventRow struct { - event domain.ChannelUpdateEvent - messageID int - } - eventRows := make([]differenceEventRow, 0, limit) - for rows.Next() { - event, messageID, err := scanChannelEvent(rows) - if err != nil { - return domain.ChannelDifference{}, err - } - ptsCount := event.PtsCount - if ptsCount <= 0 { - ptsCount = 1 - } - if event.Pts != lastPts+ptsCount { - s.log.Warn("channel_difference_stopped_at_gap", - zap.String("scope", "channel"), - zap.Int64("user_id", req.UserID), - zap.Int64("channel_id", req.ChannelID), - zap.Int("request_pts", req.Pts), - zap.Int("channel_pts", channel.Pts), - zap.Int("returned_pts", lastPts), - zap.Int("expected_pts", lastPts+ptsCount), - zap.Int("got_pts", event.Pts), - zap.Int("got_pts_count", ptsCount), - zap.String("event_type", string(event.Type)), - zap.Int("limit", limit), - ) - break - } - lastPts = event.Pts - eventRows = append(eventRows, differenceEventRow{event: event, messageID: messageID}) - } - if err := rows.Err(); err != nil { - rows.Close() - return domain.ChannelDifference{}, err - } - rows.Close() var visibleMonoforumMessageIDs map[int]struct{} if channel.Monoforum && !member.CanManageDirectMessages() { messageIDs := make([]int, 0) - for _, row := range eventRows { - messageIDs = append(messageIDs, row.event.MessageIDs...) + for _, event := range base.events { + messageIDs = append(messageIDs, event.MessageIDs...) } visibleMonoforumMessageIDs, err = s.monoforumVisibleMessageIDs(ctx, req.ChannelID, req.UserID, messageIDs) if err != nil { - return domain.ChannelDifference{}, err + return domain.ChannelDifference{}, false, err } } - for _, row := range eventRows { - event := row.event - messageID := row.messageID - if messageID != 0 && event.Message.ID == 0 { - msg, err := s.getChannelMessage(ctx, s.db, req.ChannelID, messageID) - if err != nil { - return domain.ChannelDifference{}, err - } - event.Message = msg - } + for _, event := range base.events { visibleEvent, ok := domain.FilterChannelUpdateEventForAvailableMinID(event, member.AvailableMinID) if !ok { continue @@ -171,7 +151,6 @@ LIMIT $3`, req.ChannelID, req.Pts, limit) if preview && event.Type == domain.ChannelUpdateParticipant { continue } - collectChannelEventRefs(event, req.ChannelID, userRefs, channelRefs) diff.Events = append(diff.Events, event) diff.Pts = event.Pts switch event.Type { @@ -182,12 +161,12 @@ LIMIT $3`, req.ChannelID, req.Pts, limit) } } if len(diff.Events) == 0 { - diff.Pts = lastPts - } else if lastPts > diff.Pts { - diff.Pts = lastPts + diff.Pts = base.lastPts + } else if base.lastPts > diff.Pts { + diff.Pts = base.lastPts } - if err := populateChannelMessageUnreadFlags(ctx, s.db, req.UserID, diff.NewMessages); err != nil { - return domain.ChannelDifference{}, err + if err := populateChannelDifferenceUnreadFlags(ctx, s.db, req.UserID, diff.NewMessages, base); err != nil { + return domain.ChannelDifference{}, false, err } // OtherUpdates 里带消息的事件未读/提及标记一次批量回填（原来逐事件一条 SQL 的 N+1）。 otherMsgs := make([]domain.ChannelMessage, 0, len(diff.OtherUpdates)) @@ -200,34 +179,259 @@ LIMIT $3`, req.ChannelID, req.Pts, limit) otherIdx = append(otherIdx, i) } if len(otherMsgs) > 0 { - if err := populateChannelMessageUnreadFlags(ctx, s.db, req.UserID, otherMsgs); err != nil { - return domain.ChannelDifference{}, err + if err := populateChannelDifferenceUnreadFlags(ctx, s.db, req.UserID, otherMsgs, base); err != nil { + return domain.ChannelDifference{}, false, err } for j, i := range otherIdx { diff.OtherUpdates[i].Message = otherMsgs[j] } } - users, err := listUsersByIDs(ctx, s.db, mapKeysInt64(userRefs)) - if err != nil { - return domain.ChannelDifference{}, err - } - channels, err := listChannelsByIDs(ctx, s.db, mapKeysInt64(channelRefs)) - if err != nil { - return domain.ChannelDifference{}, err - } - diff.Users = users - diff.Channels = channels if preview { diff.Dialog = previewChannelDialog(req.UserID, channel, member) } else { dialog, err := s.getChannelDialog(ctx, s.db, req.UserID, channel) if err != nil { - return domain.ChannelDifference{}, err + return domain.ChannelDifference{}, false, err } diff.Dialog = dialog } - diff.Final = lastPts >= channel.Pts - return diff, nil + diff.Final = base.lastPts >= channel.Pts + return diff, false, nil +} + +func (s *ChannelStore) loadChannelDifferenceBase( + ctx context.Context, + channel domain.Channel, + member domain.ChannelMember, + viewerUserID int64, + requestPts int, + limit int, + loadMentionCandidates bool, +) (channelDifferenceBase, error) { + checkpoint, err := getChannelUpdateCheckpoint(ctx, s.db, channel.ID) + if err != nil { + return channelDifferenceBase{}, err + } + base := channelDifferenceBase{ + retainedThroughPts: checkpoint.RetainedThroughPts, + lastPts: requestPts, + } + if requestPts < checkpoint.RetainedThroughPts || channel.Pts-requestPts > limit { + base.tooLong = true + args := []any{channel.ID, channel.TopMessageID} + where := "channel_id = $1 AND id <= $2 AND NOT deleted" + // Non-monoforum pages are viewer-independent: apply available_min after + // the shared lookup. Monoforum latest-100 selection is viewer-specific, + // so that path bypasses the shared cache and keeps its predicate here. + if channel.Monoforum { + if member.AvailableMinID > 0 { + args = append(args, member.AvailableMinID) + where += fmt.Sprintf(" AND id > $%d", len(args)) + } + if !member.CanManageDirectMessages() { + args = append(args, viewerUserID) + where += fmt.Sprintf(" AND saved_peer_type = 'user' AND saved_peer_id = $%d", len(args)) + } + } + args = append(args, domain.MaxChannelDifferenceTooLongMessages) + rows, err := s.db.Query(ctx, ` +SELECT `+channelMessageColumns+` +FROM channel_messages +WHERE `+where+` +ORDER BY id DESC +LIMIT $`+fmt.Sprint(len(args)), args...) + if err != nil { + return channelDifferenceBase{}, fmt.Errorf("list channel too long messages: %w", err) + } + for rows.Next() { + msg, err := scanChannelMessage(rows) + if err != nil { + rows.Close() + return channelDifferenceBase{}, err + } + base.messages = append(base.messages, msg) + } + if err := rows.Err(); err != nil { + rows.Close() + return channelDifferenceBase{}, err + } + rows.Close() + if loadMentionCandidates { + if err := s.loadChannelDifferenceMentionCandidates(ctx, channel.ID, &base); err != nil { + return channelDifferenceBase{}, err + } + } + if err := s.verifyChannelDifferenceCut(ctx, channel, checkpoint.RetainedThroughPts); err != nil { + return channelDifferenceBase{}, err + } + return base, nil + } + + rows, err := s.db.Query(ctx, ` +SELECT channel_id, pts, pts_count, date, event_type, message_id, message_ids::text, sender_user_id, user_ids::text, payload::text +FROM channel_update_events +WHERE channel_id = $1 AND pts > $2 AND pts <= $3 +ORDER BY pts ASC +LIMIT $4`, channel.ID, requestPts, channel.Pts, limit) + if err != nil { + return channelDifferenceBase{}, fmt.Errorf("list channel difference: %w", err) + } + for rows.Next() { + event, messageID, err := scanChannelEvent(rows) + if err != nil { + rows.Close() + return channelDifferenceBase{}, err + } + ptsCount := event.PtsCount + if ptsCount <= 0 { + ptsCount = 1 + } + if event.Pts != base.lastPts+ptsCount { + s.log.Warn("channel_difference_stopped_at_gap", + zap.String("scope", "channel"), + zap.Int64("channel_id", channel.ID), + zap.Int("request_pts", requestPts), + zap.Int("channel_pts", channel.Pts), + zap.Int("returned_pts", base.lastPts), + zap.Int("expected_pts", base.lastPts+ptsCount), + zap.Int("got_pts", event.Pts), + zap.Int("got_pts_count", ptsCount), + zap.String("event_type", string(event.Type)), + zap.Int("limit", limit), + ) + break + } + if messageID != 0 && event.Message.ID == 0 { + event.Message, err = s.getChannelMessageAtOrBeforePts(ctx, channel.ID, messageID, channel.Pts) + if err != nil { + rows.Close() + return channelDifferenceBase{}, err + } + } + base.lastPts = event.Pts + base.events = append(base.events, event) + } + if err := rows.Err(); err != nil { + rows.Close() + return channelDifferenceBase{}, err + } + rows.Close() + if loadMentionCandidates { + if err := s.loadChannelDifferenceMentionCandidates(ctx, channel.ID, &base); err != nil { + return channelDifferenceBase{}, err + } + } + if err := s.verifyChannelDifferenceCut(ctx, channel, checkpoint.RetainedThroughPts); err != nil { + return channelDifferenceBase{}, err + } + return base, nil +} + +func (s *ChannelStore) loadChannelDifferenceMentionCandidates(ctx context.Context, channelID int64, base *channelDifferenceBase) error { + if base == nil { + return nil + } + base.candidatesKnown = true + base.mentionCandidateIDs = make(map[int]struct{}) + messageIDs := make([]int, 0, len(base.messages)+len(base.events)) + seen := make(map[int]struct{}, cap(messageIDs)) + add := func(id int) { + if id <= 0 { + return + } + if _, ok := seen[id]; ok { + return + } + seen[id] = struct{}{} + messageIDs = append(messageIDs, id) + } + for _, message := range base.messages { + add(message.ID) + } + for _, event := range base.events { + add(event.Message.ID) + } + if len(messageIDs) == 0 { + return nil + } + rows, err := s.db.Query(ctx, ` +SELECT DISTINCT message_id +FROM channel_unread_mention_index +WHERE channel_id = $1 AND message_id = ANY($2::int[])`, channelID, int32s(messageIDs)) + if err != nil { + return fmt.Errorf("load channel difference mention candidates: %w", err) + } + defer rows.Close() + for rows.Next() { + var messageID int + if err := rows.Scan(&messageID); err != nil { + return err + } + base.mentionCandidateIDs[messageID] = struct{}{} + } + if err := rows.Err(); err != nil { + return fmt.Errorf("read channel difference mention candidates: %w", err) + } + return nil +} + +func populateChannelDifferenceUnreadFlags( + ctx context.Context, + db sqlcgen.DBTX, + viewerUserID int64, + messages []domain.ChannelMessage, + base channelDifferenceBase, +) error { + if !base.candidatesKnown { + return populateChannelMessageUnreadFlags(ctx, db, viewerUserID, messages) + } + selected := make([]domain.ChannelMessage, 0, len(messages)) + indexes := make([]int, 0, len(messages)) + for i, message := range messages { + if _, ok := base.mentionCandidateIDs[message.ID]; !ok { + continue + } + selected = append(selected, message) + indexes = append(indexes, i) + } + if len(selected) == 0 { + return nil + } + if err := populateChannelMessageUnreadFlags(ctx, db, viewerUserID, selected); err != nil { + return err + } + for i, messageIndex := range indexes { + messages[messageIndex].Mentioned = selected[i].Mentioned + messages[messageIndex].MediaUnread = selected[i].MediaUnread + } + return nil +} + +func (s *ChannelStore) verifyChannelDifferenceCut(ctx context.Context, captured domain.Channel, retainedThroughPts int) error { + var pts, topMessageID, floor int + err := s.db.QueryRow(ctx, ` +SELECT c.pts, c.top_message_id, cp.retained_through_pts +FROM channels c +JOIN channel_update_checkpoints cp ON cp.channel_id = c.id +WHERE c.id = $1 AND NOT c.deleted`, captured.ID).Scan(&pts, &topMessageID, &floor) + if err != nil { + return fmt.Errorf("verify channel difference cut: %w", err) + } + if pts != captured.Pts || topMessageID != captured.TopMessageID || floor != retainedThroughPts { + return errChannelDifferenceCutChanged + } + return nil +} + +func (s *ChannelStore) getChannelMessageAtOrBeforePts(ctx context.Context, channelID int64, messageID, capturedPts int) (domain.ChannelMessage, error) { + msg, err := scanChannelMessage(s.db.QueryRow(ctx, ` +SELECT `+channelMessageColumns+` +FROM channel_messages +WHERE channel_id = $1 AND id = $2 AND pts <= $3`, channelID, messageID, capturedPts)) + if err != nil { + return domain.ChannelMessage{}, fmt.Errorf("load channel difference legacy message at stable cut: %w", err) + } + return msg, nil } func (s *ChannelStore) monoforumVisibleMessageIDs(ctx context.Context, channelID, userID int64, ids []int) (map[int]struct{}, error) { @@ -493,23 +697,3 @@ func adminLogEventTypesForFilter(filter domain.ChannelAdminLogFilter) []string { add(filter.Send, domain.ChannelAdminLogSendMessage) return types } - -func collectChannelEventRefs(event domain.ChannelUpdateEvent, currentChannelID int64, userRefs, channelRefs map[int64]struct{}) { - if event.SenderUserID != 0 { - userRefs[event.SenderUserID] = struct{}{} - } - for _, id := range event.UserIDs { - if id != 0 { - userRefs[id] = struct{}{} - } - } - for _, member := range []domain.ChannelMember{event.Previous, event.Participant} { - if member.UserID != 0 { - userRefs[member.UserID] = struct{}{} - } - if member.InviterUserID != 0 { - userRefs[member.InviterUserID] = struct{}{} - } - } - collectChannelMessageRefs(event.Message, currentChannelID, userRefs, channelRefs) -} diff --git a/internal/store/postgres/community.go b/internal/store/postgres/community.go index b37e5b2c..67f6e52b 100644 --- a/internal/store/postgres/community.go +++ b/internal/store/postgres/community.go @@ -18,19 +18,30 @@ import ( ) type CommunityStore struct { - db sqlcgen.DBTX - ids store.ChannelIDAllocator - msgIDs store.ChannelMessageIDAllocator + db sqlcgen.DBTX + ids store.ChannelIDAllocator + msgIDs store.ChannelMessageIDAllocator + catalogCache *CommunityCatalogCache } -func NewCommunityStore(db sqlcgen.DBTX, ids store.ChannelIDAllocator, msgIDs store.ChannelMessageIDAllocator) *CommunityStore { +type CommunityStoreOption func(*CommunityStore) + +func WithCommunityCatalogCache(cache *CommunityCatalogCache) CommunityStoreOption { + return func(s *CommunityStore) { s.catalogCache = cache } +} + +func NewCommunityStore(db sqlcgen.DBTX, ids store.ChannelIDAllocator, msgIDs store.ChannelMessageIDAllocator, opts ...CommunityStoreOption) *CommunityStore { if ids == nil { ids = pgChannelIDAllocator{db: db} } if msgIDs == nil { msgIDs = pgChannelMessageIDAllocator{db: db} } - return &CommunityStore{db: db, ids: ids, msgIDs: msgIDs} + s := &CommunityStore{db: db, ids: ids, msgIDs: msgIDs} + for _, opt := range opts { + opt(s) + } + return s } func (s *CommunityStore) appendCommunityServiceMessageTx(ctx context.Context, tx pgx.Tx, peer domain.Peer, actorUserID int64, date int, communityID int64) (*domain.SendChannelMessageResult, error) { @@ -320,6 +331,18 @@ func (s *CommunityStore) GetCommunities(ctx context.Context, viewerUserID int64, } func (s *CommunityStore) ListJoinedCommunities(ctx context.Context, viewerUserID int64) ([]domain.CommunityView, error) { + if viewerUserID == 0 { + return nil, nil + } + if s.catalogCache != nil { + active, err := s.catalogCache.hasActive(ctx, s.db) + if err != nil { + return nil, fmt.Errorf("check community catalog: %w", err) + } + if !active { + return nil, nil + } + } rows, err := s.db.Query(ctx, ` SELECT DISTINCT c.id FROM communities c @@ -867,6 +890,9 @@ func (s *CommunityStore) banCommunityParticipantFromChannelTx(ctx context.Contex if err := clearChannelMentionsForUserTx(ctx, tx, channelID, participantUserID); err != nil { return domain.EditChannelBannedResult{}, false, err } + if err := deleteWelcomeMessageDeliveriesTx(ctx, tx, channelID, []int64{participantUserID}); err != nil { + return domain.EditChannelBannedResult{}, false, err + } var serviceMessage domain.ChannelMessage var serviceEvent domain.ChannelUpdateEvent if channel.Megagroup { diff --git a/internal/store/postgres/community_catalog_cache.go b/internal/store/postgres/community_catalog_cache.go new file mode 100644 index 00000000..ffc870f9 --- /dev/null +++ b/internal/store/postgres/community_catalog_cache.go @@ -0,0 +1,47 @@ +package postgres + +import ( + "context" + + "telesrv/internal/readmodelcache" + "telesrv/internal/store/postgres/sqlcgen" +) + +const communityCatalogPresenceKey = "active" + +// CommunityCatalogCache is the global, version-invalidated gate in front of +// owner-specific joined-Community reads. It caches only whether any non-deleted +// Community exists; it never caches membership, collapsed/pinned state or a +// Community payload. +type CommunityCatalogCache struct { + cache *readmodelcache.Cache[string, bool] +} + +func NewCommunityCatalogCache() *CommunityCatalogCache { + return &CommunityCatalogCache{cache: readmodelcache.New[string, bool](readmodelcache.Config[string, bool]{MaxEntries: 1})} +} + +func (c *CommunityCatalogCache) hasActive(ctx context.Context, db sqlcgen.DBTX) (bool, error) { + if c == nil { + var active bool + err := db.QueryRow(ctx, `SELECT EXISTS (SELECT 1 FROM communities WHERE NOT deleted)`).Scan(&active) + return active, err + } + return c.cache.GetOrLoad(ctx, communityCatalogPresenceKey, func() (bool, error) { + var active bool + err := db.QueryRow(ctx, `SELECT EXISTS (SELECT 1 FROM communities WHERE NOT deleted)`).Scan(&active) + return active, err + }) +} + +func (c *CommunityCatalogCache) invalidate() { + if c != nil { + c.cache.Invalidate(communityCatalogPresenceKey) + } +} + +func (c *CommunityCatalogCache) flush() { + if c != nil { + c.cache.Flush() + } +} diff --git a/internal/store/postgres/community_catalog_cache_integration_test.go b/internal/store/postgres/community_catalog_cache_integration_test.go new file mode 100644 index 00000000..ec707da7 --- /dev/null +++ b/internal/store/postgres/community_catalog_cache_integration_test.go @@ -0,0 +1,71 @@ +package postgres + +import ( + "context" + "os" + "testing" + "time" + + "telesrv/internal/domain" +) + +func TestCommunityCatalogCacheInvalidatesFromDatabaseTrigger(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + cache := NewCommunityCatalogCache() + + active, err := cache.hasActive(ctx, pool) + if err != nil { + t.Fatal(err) + } + if active { + t.Skip("test database already contains an active Community") + } + + // A sentinel is a deterministic LISTEN-ready barrier: the listener flushes + // it immediately after LISTEN succeeds. + cache.cache.Store(communityCatalogPresenceKey, true) + lctx, cancel := context.WithCancel(ctx) + defer cancel() + listener := NewReadModelChangeListener(os.Getenv("TELESRV_TEST_POSTGRES_DSN"), ReadModelCacheSet{CommunityCatalog: cache}, nil) + go listener.Run(lctx) + if !waitUntil(2*time.Second, func() bool { + _, ok := cache.cache.Peek(communityCatalogPresenceKey) + return !ok + }) { + t.Fatal("read-model listener did not flush Community sentinel") + } + if active, err = cache.hasActive(ctx, pool); err != nil || active { + t.Fatalf("re-warm empty catalog active=%v err=%v", active, err) + } + + users := NewUserStore(pool) + suffix := randomSuffix(t) + owner, err := users.Create(ctx, domain.User{AccessHash: 471, Phone: "+1887" + suffix + "01", FirstName: "CommunityGateOwner"}) + if err != nil { + t.Fatalf("create owner: %v", err) + } + communityID := time.Now().UnixNano() & 0x3fffffffffffffff + if communityID == 0 { + communityID = 1 + } + t.Cleanup(func() { + _, _ = pool.Exec(ctx, "DELETE FROM communities WHERE id=$1", communityID) + _, _ = pool.Exec(ctx, "DELETE FROM users WHERE id=$1", owner.ID) + }) + if _, err := pool.Exec(ctx, ` +INSERT INTO communities(id,access_hash,creator_user_id,title,date) +VALUES($1,$2,$3,$4,$5)`, communityID, -communityID, owner.ID, "Catalog trigger "+suffix, 1700000770); err != nil { + t.Fatalf("insert Community: %v", err) + } + if !waitUntil(3*time.Second, func() bool { + _, ok := cache.cache.Peek(communityCatalogPresenceKey) + return !ok + }) { + t.Fatal("communities trigger did not invalidate catalog presence") + } + active, err = cache.hasActive(ctx, pool) + if err != nil || !active { + t.Fatalf("catalog after insert active=%v err=%v, want true", active, err) + } +} diff --git a/internal/store/postgres/community_catalog_cache_test.go b/internal/store/postgres/community_catalog_cache_test.go new file mode 100644 index 00000000..6dea7dab --- /dev/null +++ b/internal/store/postgres/community_catalog_cache_test.go @@ -0,0 +1,18 @@ +package postgres + +import "testing" + +func TestCommunityCatalogCacheInvalidatesAndFlushes(t *testing.T) { + cache := NewCommunityCatalogCache() + cache.cache.Store(communityCatalogPresenceKey, false) + listener := NewReadModelChangeListener("", ReadModelCacheSet{CommunityCatalog: cache}, nil) + listener.handlePayload(`{"model":"community_catalog","owner_user_id":0,"peer_type":"community","peer_id":0}`) + if _, ok := cache.cache.Peek(communityCatalogPresenceKey); ok { + t.Fatal("community_catalog event did not invalidate presence gate") + } + cache.cache.Store(communityCatalogPresenceKey, true) + listener.flush("test") + if _, ok := cache.cache.Peek(communityCatalogPresenceKey); ok { + t.Fatal("listener flush did not clear community catalog gate") + } +} diff --git a/internal/store/postgres/community_integration_test.go b/internal/store/postgres/community_integration_test.go index e4f8d903..e50ce6fe 100644 --- a/internal/store/postgres/community_integration_test.go +++ b/internal/store/postgres/community_integration_test.go @@ -121,6 +121,33 @@ func TestCommunityStoreLifecycleIsAtomicInPostgres(t *testing.T) { }, 0, 100); !errors.Is(err, domain.ErrCommunityAdminRequired) { t.Fatalf("member Community banned list error = %v, want admin required", err) } + welcomeContent := domain.WelcomeMessageContent{Message: "community welcome cleanup"} + welcomePeer := domain.Peer{Type: domain.PeerTypeChannel, ID: initial.Channel.ID} + welcomeFingerprint, err := domain.WelcomeCreateFingerprint(welcomePeer, owner.ID, 8_020_005, welcomeContent) + if err != nil { + t.Fatal(err) + } + if _, _, err := NewWelcomeMessageStore(pool).CreateWelcomeMessage(ctx, domain.CreateWelcomeMessageRequest{ + Peer: welcomePeer, CreatorUserID: owner.ID, Date: 1_800_200_004, RandomID: 8_020_005, + Content: welcomeContent, CreateFingerprint: welcomeFingerprint, + }); err != nil { + t.Fatalf("create community cleanup welcome: %v", err) + } + memberRow, err := channels.getChannelMember(ctx, pool, initial.Channel.ID, member.ID) + if err != nil { + t.Fatal(err) + } + welcomeTx, err := pool.Begin(ctx) + if err != nil { + t.Fatal(err) + } + if err := enqueueWelcomeMessageDeliveriesTx(ctx, welcomeTx, initial.Channel.ID, []domain.ChannelMember{memberRow}); err != nil { + _ = welcomeTx.Rollback(ctx) + t.Fatal(err) + } + if err := welcomeTx.Commit(ctx); err != nil { + t.Fatal(err) + } ban, err := store.ToggleCommunityParticipantBanned(ctx, owner.ID, communityID, member.ID, false, 1_800_200_005) if err != nil { @@ -129,6 +156,10 @@ func TestCommunityStoreLifecycleIsAtomicInPostgres(t *testing.T) { if !ban.Changed || len(ban.ChannelBans) != 1 || len(ban.RemovedLinks) != 1 { t.Fatalf("ban result = %+v", ban) } + var welcomeDeliveries int + if err := pool.QueryRow(ctx, `SELECT count(*) FROM welcome_message_deliveries WHERE channel_id=$1 AND target_user_id=$2`, initial.Channel.ID, member.ID).Scan(&welcomeDeliveries); err != nil || welcomeDeliveries != 0 { + t.Fatalf("community ban welcome deliveries=%d err=%v", welcomeDeliveries, err) + } if err := pool.QueryRow(ctx, "SELECT linked_community_id FROM channels WHERE id=$1", owned.Channel.ID).Scan(&linkedID); err != nil || linkedID != 0 { t.Fatalf("owned linked_community_id after ban = %d err=%v, want 0", linkedID, err) } diff --git a/internal/store/postgres/contact.go b/internal/store/postgres/contact.go index f8e1786a..f8a4c697 100644 --- a/internal/store/postgres/contact.go +++ b/internal/store/postgres/contact.go @@ -164,6 +164,288 @@ WHERE c.contact_user_id = $1 return out, nil } +// GetReverseContactsForViewerUserIDs reads an exact set of owner->viewer +// relationship pairs for cross-request privacy batching. Privacy evaluation +// only consumes relationship facts (existence/close_friend), so this query must +// not join or copy viewer-independent users-table payloads into every pair. +func (s *ContactStore) GetReverseContactsForViewerUserIDs( + ctx context.Context, + viewerUserIDsByOwner map[int64][]int64, +) (map[int64]map[int64]domain.Contact, error) { + out := make(map[int64]map[int64]domain.Contact, len(viewerUserIDsByOwner)) + ownerIDs, viewerIDs := flattenContactProjectionPairs(viewerUserIDsByOwner) + if len(ownerIDs) == 0 { + return out, nil + } + rows, err := s.db.Query(ctx, ` +/* reverse_contact_pair_batch */ +WITH requested(owner_user_id, viewer_user_id) AS ( + SELECT * FROM unnest($1::bigint[], $2::bigint[]) +) +SELECT + c.user_id AS owner_user_id, + c.contact_user_id AS viewer_user_id, + c.mutual, + c.close_friend, + c.contact_phone, + c.contact_first_name, + c.contact_last_name, + c.note, + COALESCE(c.note_entities::text, '[]')::text AS note_entities_json +FROM requested r +JOIN contacts c + ON c.user_id = r.owner_user_id + AND c.contact_user_id = r.viewer_user_id +`, ownerIDs, viewerIDs) + if err != nil { + return nil, fmt.Errorf("get sparse reverse contacts: %w", err) + } + defer rows.Close() + for rows.Next() { + ownerID, contact, scanErr := scanSparseContactProjectionRows(rows) + if scanErr != nil { + return nil, scanErr + } + if out[ownerID] == nil { + out[ownerID] = make(map[int64]domain.Contact) + } + out[ownerID][contact.User.ID] = contact + } + if err := rows.Err(); err != nil { + return nil, err + } + return out, nil +} + +func (s *ContactStore) ContactProjectionForViewers(ctx context.Context, viewerUserIDs, contactUserIDs []int64) (domain.ContactProjectionBatch, error) { + out := domain.ContactProjectionBatch{ + Contacts: make(map[int64]map[int64]domain.Contact, len(viewerUserIDs)), + PersonalPhotos: make(map[int64]map[int64]domain.ProfilePhotoRef, len(viewerUserIDs)), + } + if len(viewerUserIDs) == 0 || len(contactUserIDs) == 0 { + return out, nil + } + viewers := dedupPositiveInt64(viewerUserIDs) + targets := dedupPositiveInt64(contactUserIDs) + if len(viewers) == 0 || len(targets) == 0 { + return out, nil + } + rows, err := s.db.Query(ctx, ` +SELECT + c.user_id AS viewer_user_id, + c.contact_user_id, + c.mutual, + c.close_friend, + c.contact_phone, + c.contact_first_name, + c.contact_last_name, + c.note, + COALESCE(c.note_entities::text, '[]')::text AS note_entities_json, + u.id, + u.access_hash, + COALESCE(NULLIF(c.contact_phone, ''), u.phone)::text AS phone, + COALESCE(NULLIF(c.contact_first_name, ''), u.first_name)::text AS first_name, + COALESCE(c.contact_last_name, u.last_name)::text AS last_name, + u.username, + u.country_code, + u.verified, + u.support, + COALESCE(EXTRACT(EPOCH FROM u.premium_expires_at), 0)::bigint AS premium_until, + u.emoji_status_document_id, + u.emoji_status_until, + u.emoji_status_collectible_id, + u.emoji_status_collectible, + u.last_seen_at +FROM contacts c +JOIN users u ON u.id = c.contact_user_id +WHERE c.user_id = ANY($1::bigint[]) + AND c.contact_user_id = ANY($2::bigint[]) +`, viewers, targets) + if err != nil { + return out, fmt.Errorf("get contact projection for viewers: %w", err) + } + for rows.Next() { + viewerID, contact, err := scanContactProjectionRows(rows) + if err != nil { + rows.Close() + return out, err + } + if out.Contacts[viewerID] == nil { + out.Contacts[viewerID] = make(map[int64]domain.Contact, len(targets)) + } + out.Contacts[viewerID][contact.User.ID] = contact + } + if err := rows.Err(); err != nil { + rows.Close() + return out, err + } + rows.Close() + + rows, err = s.db.Query(ctx, ` +SELECT + c.user_id AS viewer_user_id, + c.contact_user_id, + c.personal_photo_id, + ph.dc_id, + ph.sizes::text AS sizes_json +FROM contacts c +JOIN photos ph ON ph.id = c.personal_photo_id +WHERE c.user_id = ANY($1::bigint[]) + AND c.contact_user_id = ANY($2::bigint[]) + AND c.personal_photo_id <> 0 +`, viewers, targets) + if err != nil { + return out, fmt.Errorf("get contact projection personal photos: %w", err) + } + for rows.Next() { + var viewerID, contactUserID, photoID int64 + var dcID int32 + var sizesJSON string + if err := rows.Scan(&viewerID, &contactUserID, &photoID, &dcID, &sizesJSON); err != nil { + rows.Close() + return out, err + } + sizes, err := decodePhotoSizes(sizesJSON) + if err != nil { + rows.Close() + return out, err + } + if out.PersonalPhotos[viewerID] == nil { + out.PersonalPhotos[viewerID] = make(map[int64]domain.ProfilePhotoRef, len(targets)) + } + out.PersonalPhotos[viewerID][contactUserID] = domain.ProfilePhotoRef{ + PhotoID: photoID, + DCID: int(dcID), + Stripped: domain.StrippedFromSizes(sizes), + Personal: true, + HasVideo: domain.PhotoHasVideo(sizes), + } + } + if err := rows.Err(); err != nil { + rows.Close() + return out, err + } + rows.Close() + return out, nil +} + +func (s *ContactStore) ContactProjectionForViewerUserIDs(ctx context.Context, contactUserIDsByViewer map[int64][]int64) (domain.ContactProjectionBatch, error) { + out := domain.ContactProjectionBatch{ + Contacts: make(map[int64]map[int64]domain.Contact, len(contactUserIDsByViewer)), + PersonalPhotos: make(map[int64]map[int64]domain.ProfilePhotoRef, len(contactUserIDsByViewer)), + } + viewerIDs, contactUserIDs := flattenContactProjectionPairs(contactUserIDsByViewer) + if len(viewerIDs) == 0 { + return out, nil + } + rows, err := s.db.Query(ctx, ` +WITH requested(viewer_user_id, contact_user_id) AS ( + SELECT * FROM unnest($1::bigint[], $2::bigint[]) +) +SELECT + c.user_id AS viewer_user_id, + c.contact_user_id, + c.mutual, + c.close_friend, + c.contact_phone, + c.contact_first_name, + c.contact_last_name, + c.note, + COALESCE(c.note_entities::text, '[]')::text AS note_entities_json +FROM requested r +JOIN contacts c ON c.user_id = r.viewer_user_id AND c.contact_user_id = r.contact_user_id +`, viewerIDs, contactUserIDs) + if err != nil { + return out, fmt.Errorf("get sparse contact projection: %w", err) + } + for rows.Next() { + viewerID, contact, err := scanSparseContactProjectionRows(rows) + if err != nil { + rows.Close() + return out, err + } + if out.Contacts[viewerID] == nil { + out.Contacts[viewerID] = make(map[int64]domain.Contact) + } + out.Contacts[viewerID][contact.User.ID] = contact + } + if err := rows.Err(); err != nil { + rows.Close() + return out, err + } + rows.Close() + + rows, err = s.db.Query(ctx, ` +WITH requested(viewer_user_id, contact_user_id) AS ( + SELECT * FROM unnest($1::bigint[], $2::bigint[]) +) +SELECT + c.user_id AS viewer_user_id, + c.contact_user_id, + c.personal_photo_id, + ph.dc_id, + ph.sizes::text AS sizes_json +FROM requested r +JOIN contacts c ON c.user_id = r.viewer_user_id AND c.contact_user_id = r.contact_user_id +JOIN photos ph ON ph.id = c.personal_photo_id +WHERE c.personal_photo_id <> 0 +`, viewerIDs, contactUserIDs) + if err != nil { + return out, fmt.Errorf("get sparse contact projection personal photos: %w", err) + } + for rows.Next() { + var viewerID, contactUserID, photoID int64 + var dcID int32 + var sizesJSON string + if err := rows.Scan(&viewerID, &contactUserID, &photoID, &dcID, &sizesJSON); err != nil { + rows.Close() + return out, err + } + sizes, err := decodePhotoSizes(sizesJSON) + if err != nil { + rows.Close() + return out, err + } + if out.PersonalPhotos[viewerID] == nil { + out.PersonalPhotos[viewerID] = make(map[int64]domain.ProfilePhotoRef) + } + out.PersonalPhotos[viewerID][contactUserID] = domain.ProfilePhotoRef{ + PhotoID: photoID, DCID: int(dcID), Stripped: domain.StrippedFromSizes(sizes), + Personal: true, HasVideo: domain.PhotoHasVideo(sizes), + } + } + if err := rows.Err(); err != nil { + rows.Close() + return out, err + } + rows.Close() + return out, nil +} + +func flattenContactProjectionPairs(contactUserIDsByViewer map[int64][]int64) ([]int64, []int64) { + viewers := make([]int64, 0) + targets := make([]int64, 0) + seen := make(map[[2]int64]struct{}) + for viewerID, contactUserIDs := range contactUserIDsByViewer { + if viewerID == 0 { + continue + } + for _, targetID := range contactUserIDs { + if targetID == 0 { + continue + } + pair := [2]int64{viewerID, targetID} + if _, ok := seen[pair]; ok { + continue + } + seen[pair] = struct{}{} + viewers = append(viewers, viewerID) + targets = append(targets, targetID) + } + } + return viewers, targets +} + func (s *ContactStore) Upsert(ctx context.Context, userID int64, input domain.ContactInput) (domain.Contact, error) { entities, err := encodeMessageEntities(input.NoteEntities) if err != nil { @@ -756,6 +1038,111 @@ func scanReverseContactRows(row contactScanner) (int64, domain.Contact, error) { return ownerUserID, contact, nil } +func scanSparseContactProjectionRows(row contactScanner) (int64, domain.Contact, error) { + var ( + viewerUserID int64 + contactUserID int64 + mutual bool + closeFriend bool + contactPhone string + contactFirstName string + contactLastName string + note string + noteEntitiesJSON string + ) + if err := row.Scan( + &viewerUserID, + &contactUserID, + &mutual, + &closeFriend, + &contactPhone, + &contactFirstName, + &contactLastName, + ¬e, + ¬eEntitiesJSON, + ); err != nil { + return 0, domain.Contact{}, err + } + entities, err := decodeMessageEntities(noteEntitiesJSON) + if err != nil { + return 0, domain.Contact{}, fmt.Errorf("decode sparse contact note entities: %w", err) + } + return viewerUserID, domain.Contact{ + User: domain.User{ID: contactUserID}, + FirstName: contactFirstName, + LastName: contactLastName, + Phone: contactPhone, + Note: note, + NoteEntities: entities, + Mutual: mutual, + CloseFriend: closeFriend, + }, nil +} + +func scanContactProjectionRows(row contactScanner) (int64, domain.Contact, error) { + var ( + viewerUserID int64 + contactUserID int64 + mutual bool + closeFriend bool + contactPhone string + contactFirstName string + contactLastName string + note string + noteEntitiesJSON string + id int64 + accessHash int64 + phone string + firstName string + lastName string + username string + countryCode string + verified bool + support bool + premiumUntil int64 + emojiStatusDocID int64 + emojiStatusUntil int64 + emojiCollectibleID *int64 + emojiCollectibleJSON []byte + lastSeenAt int32 + ) + if err := row.Scan( + &viewerUserID, + &contactUserID, + &mutual, + &closeFriend, + &contactPhone, + &contactFirstName, + &contactLastName, + ¬e, + ¬eEntitiesJSON, + &id, + &accessHash, + &phone, + &firstName, + &lastName, + &username, + &countryCode, + &verified, + &support, + &premiumUntil, + &emojiStatusDocID, + &emojiStatusUntil, + &emojiCollectibleID, + &emojiCollectibleJSON, + &lastSeenAt, + ); err != nil { + return 0, domain.Contact{}, err + } + _ = contactUserID + entities, err := decodeMessageEntities(noteEntitiesJSON) + if err != nil { + return 0, domain.Contact{}, err + } + contact := contactFromFields(id, accessHash, phone, firstName, lastName, username, countryCode, verified, support, false, 0, int(premiumUntil), emojiStatusDocID, int(emojiStatusUntil), emojiCollectibleID, emojiCollectibleJSON, int(lastSeenAt), contactFirstName, contactLastName, contactPhone, note, entities, mutual, closeFriend) + return viewerUserID, contact, nil +} + func (s *ContactStore) Block(ctx context.Context, userID, blockedUserID int64, date int) (bool, error) { if userID == 0 || blockedUserID == 0 || userID == blockedUserID { return false, nil @@ -868,6 +1255,22 @@ LIMIT $3`, userID, offset, limit) return out, rows.Err() } +func dedupPositiveInt64(ids []int64) []int64 { + seen := make(map[int64]struct{}, len(ids)) + out := make([]int64, 0, len(ids)) + for _, id := range ids { + if id <= 0 { + continue + } + if _, ok := seen[id]; ok { + continue + } + seen[id] = struct{}{} + out = append(out, id) + } + return out +} + func contactListHash(contacts []domain.Contact) int64 { if len(contacts) == 0 { return 0 diff --git a/internal/store/postgres/contact_sparse_integration_test.go b/internal/store/postgres/contact_sparse_integration_test.go new file mode 100644 index 00000000..b26bb35d --- /dev/null +++ b/internal/store/postgres/contact_sparse_integration_test.go @@ -0,0 +1,157 @@ +package postgres + +import ( + "context" + "reflect" + "testing" + "time" + + "telesrv/internal/domain" +) + +func TestContactProjectionForViewerUserIDsPostgresDoesNotCrossPairs(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + suffix := randomSuffix(t) + users := NewUserStore(pool) + viewerA := createTestUser(t, ctx, users, "+1910"+suffix+"01", "Viewer", "A") + viewerB := createTestUser(t, ctx, users, "+1910"+suffix+"02", "Viewer", "B") + ownerA := createTestUser(t, ctx, users, "+1910"+suffix+"03", "Owner", "A") + ownerB := createTestUser(t, ctx, users, "+1910"+suffix+"04", "Owner", "B") + userIDs := []int64{viewerA.ID, viewerB.ID, ownerA.ID, ownerB.ID} + photoBase := time.Now().UnixNano() & 0x3fffffffffffffff + photoIDs := []int64{photoBase + 1, photoBase + 2, photoBase + 3, photoBase + 4} + t.Cleanup(func() { + _, _ = pool.Exec(ctx, "DELETE FROM users WHERE id = ANY($1::bigint[])", userIDs) + _, _ = pool.Exec(ctx, "DELETE FROM photos WHERE id = ANY($1::bigint[])", photoIDs) + }) + media := NewMediaStore(pool) + for _, photoID := range photoIDs { + if err := media.PutPhoto(ctx, domain.Photo{ + ID: photoID, AccessHash: photoID + 100, FileReference: []byte("sparse-ref"), Date: 1700000000, DCID: 2, + Sizes: []domain.PhotoSize{{Kind: domain.PhotoSizeKindStripped, Type: "i", Bytes: []byte{1, 2, byte(photoID)}}}, + }); err != nil { + t.Fatalf("PutPhoto(%d): %v", photoID, err) + } + } + contacts := NewContactStore(pool) + rows := []struct { + viewer int64 + owner int64 + name string + photo int64 + }{ + {viewerA.ID, ownerA.ID, "A expected", photoIDs[0]}, + {viewerA.ID, ownerB.ID, "B cross", photoIDs[1]}, + {viewerB.ID, ownerA.ID, "A cross", photoIDs[2]}, + {viewerB.ID, ownerB.ID, "B expected", photoIDs[3]}, + } + for _, row := range rows { + if _, err := contacts.Upsert(ctx, row.viewer, domain.ContactInput{ + ContactUserID: row.owner, + FirstName: row.name, + Phone: "known-phone", + Note: "private note", + NoteEntities: []domain.MessageEntity{{ + Type: domain.MessageEntityBold, Length: 7, + }}, + }); err != nil { + t.Fatalf("Upsert %d->%d: %v", row.viewer, row.owner, err) + } + if _, found, err := contacts.SetPersonalPhoto(ctx, row.viewer, row.owner, row.photo, 1700000001); err != nil || !found { + t.Fatalf("SetPersonalPhoto %d->%d: found=%v err=%v", row.viewer, row.owner, found, err) + } + } + got, err := contacts.ContactProjectionForViewerUserIDs(ctx, map[int64][]int64{ + viewerA.ID: {ownerA.ID}, + viewerB.ID: {ownerB.ID}, + }) + if err != nil { + t.Fatalf("ContactProjectionForViewerUserIDs: %v", err) + } + if len(got.Contacts[viewerA.ID]) != 1 || got.Contacts[viewerA.ID][ownerA.ID].FirstName != "A expected" { + t.Fatalf("viewer A contacts = %+v", got.Contacts[viewerA.ID]) + } + contactA := got.Contacts[viewerA.ID][ownerA.ID] + if !reflect.DeepEqual(contactA.User, domain.User{ID: ownerA.ID}) { + t.Fatalf("viewer A sparse projection retained joined base user data: %+v", contactA.User) + } + if contactA.Phone != "known-phone" || contactA.Note != "private note" || len(contactA.NoteEntities) != 1 || contactA.NoteEntities[0].Length != 7 { + t.Fatalf("viewer A sparse overlay = %+v", contactA) + } + if len(got.Contacts[viewerB.ID]) != 1 || got.Contacts[viewerB.ID][ownerB.ID].FirstName != "B expected" { + t.Fatalf("viewer B contacts = %+v", got.Contacts[viewerB.ID]) + } + if _, ok := got.Contacts[viewerA.ID][ownerB.ID]; ok { + t.Fatal("viewer A received crossed owner B") + } + if _, ok := got.Contacts[viewerB.ID][ownerA.ID]; ok { + t.Fatal("viewer B received crossed owner A") + } + if got.PersonalPhotos[viewerA.ID][ownerA.ID].PhotoID != photoIDs[0] || len(got.PersonalPhotos[viewerA.ID]) != 1 { + t.Fatalf("viewer A personal photos = %+v", got.PersonalPhotos[viewerA.ID]) + } + if got.PersonalPhotos[viewerB.ID][ownerB.ID].PhotoID != photoIDs[3] || len(got.PersonalPhotos[viewerB.ID]) != 1 { + t.Fatalf("viewer B personal photos = %+v", got.PersonalPhotos[viewerB.ID]) + } +} + +func TestGetReverseContactsForViewerUserIDsPostgresDoesNotCrossPairs(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + suffix := randomSuffix(t) + users := NewUserStore(pool) + viewerA := createTestUser(t, ctx, users, "+1911"+suffix+"01", "Viewer", "A") + viewerB := createTestUser(t, ctx, users, "+1911"+suffix+"02", "Viewer", "B") + ownerA := createTestUser(t, ctx, users, "+1911"+suffix+"03", "Owner", "A") + ownerB := createTestUser(t, ctx, users, "+1911"+suffix+"04", "Owner", "B") + userIDs := []int64{viewerA.ID, viewerB.ID, ownerA.ID, ownerB.ID} + t.Cleanup(func() { + _, _ = pool.Exec(ctx, "DELETE FROM users WHERE id = ANY($1::bigint[])", userIDs) + }) + + contacts := NewContactStore(pool) + for _, row := range []struct { + owner int64 + viewer int64 + name string + }{ + {ownerA.ID, viewerA.ID, "A expected"}, + {ownerA.ID, viewerB.ID, "A cross"}, + {ownerB.ID, viewerA.ID, "B cross"}, + {ownerB.ID, viewerB.ID, "B expected"}, + } { + if _, err := contacts.Upsert(ctx, row.owner, domain.ContactInput{ + ContactUserID: row.viewer, + FirstName: row.name, + Note: "relationship-only", + }); err != nil { + t.Fatalf("Upsert %d->%d: %v", row.owner, row.viewer, err) + } + } + if _, err := contacts.SetCloseFriends(ctx, ownerA.ID, []int64{viewerA.ID}); err != nil { + t.Fatal(err) + } + + got, err := contacts.GetReverseContactsForViewerUserIDs(ctx, map[int64][]int64{ + ownerA.ID: {viewerA.ID}, + ownerB.ID: {viewerB.ID}, + }) + if err != nil { + t.Fatalf("GetReverseContactsForViewerUserIDs: %v", err) + } + contactA, found := got[ownerA.ID][viewerA.ID] + if !found || contactA.User.ID != viewerA.ID || contactA.FirstName != "A expected" || !contactA.CloseFriend { + t.Fatalf("owner A exact relationship = %+v found=%v", contactA, found) + } + contactB, found := got[ownerB.ID][viewerB.ID] + if !found || contactB.User.ID != viewerB.ID || contactB.FirstName != "B expected" || contactB.CloseFriend { + t.Fatalf("owner B exact relationship = %+v found=%v", contactB, found) + } + if _, found := got[ownerA.ID][viewerB.ID]; found { + t.Fatal("owner A received crossed viewer B") + } + if _, found := got[ownerB.ID][viewerA.ID]; found { + t.Fatal("owner B received crossed viewer A") + } +} diff --git a/internal/store/postgres/contact_sparse_scanner_test.go b/internal/store/postgres/contact_sparse_scanner_test.go new file mode 100644 index 00000000..fbf01cdd --- /dev/null +++ b/internal/store/postgres/contact_sparse_scanner_test.go @@ -0,0 +1,40 @@ +package postgres + +import ( + "reflect" + "testing" + + "telesrv/internal/domain" +) + +type sparseContactProjectionScanValues []any + +func (values sparseContactProjectionScanValues) Scan(dest ...any) error { + for i := range dest { + reflect.ValueOf(dest[i]).Elem().Set(reflect.ValueOf(values[i])) + } + return nil +} + +func TestScanSparseContactProjectionRowsKeepsOnlyOverlay(t *testing.T) { + encoded, err := encodeMessageEntities([]domain.MessageEntity{{ + Type: domain.MessageEntityTextURL, Length: 4, URL: "https://example.test", + }}) + if err != nil { + t.Fatal(err) + } + viewerID, contact, err := scanSparseContactProjectionRows(sparseContactProjectionScanValues{ + int64(11), int64(22), true, true, "known-phone", "Local", "Name", "private note", string(encoded), + }) + if err != nil { + t.Fatal(err) + } + if viewerID != 11 || !reflect.DeepEqual(contact.User, domain.User{ID: 22}) { + t.Fatalf("sparse identity = viewer %d user %+v", viewerID, contact.User) + } + if contact.FirstName != "Local" || contact.LastName != "Name" || contact.Phone != "known-phone" || + contact.Note != "private note" || !contact.Mutual || !contact.CloseFriend || + len(contact.NoteEntities) != 1 || contact.NoteEntities[0].URL != "https://example.test" { + t.Fatalf("sparse overlay = %+v", contact) + } +} diff --git a/internal/store/postgres/counter_source.go b/internal/store/postgres/counter_source.go index a46ba918..1bf653b0 100644 --- a/internal/store/postgres/counter_source.go +++ b/internal/store/postgres/counter_source.go @@ -9,12 +9,44 @@ import ( // MessageBoxCounterSource 从 message_boxes durable log 恢复某 owner 的当前最大 box_id。 type MessageBoxCounterSource struct { - q *sqlcgen.Queries + db sqlcgen.DBTX + q *sqlcgen.Queries } // NewMessageBoxCounterSource 创建 Redis BoxIDAllocator 的 PG 恢复源。 func NewMessageBoxCounterSource(db sqlcgen.DBTX) *MessageBoxCounterSource { - return &MessageBoxCounterSource{q: sqlcgen.New(db)} + return &MessageBoxCounterSource{db: db, q: sqlcgen.New(db)} +} + +func (s *MessageBoxCounterSource) CurrentBatch(ctx context.Context, userIDs []int64) (map[int64]int, error) { + if len(userIDs) == 0 { + return map[int64]int{}, nil + } + rows, err := s.db.Query(ctx, ` +SELECT requested.user_id, COALESCE(MAX(m.box_id), 0)::integer +FROM unnest($1::bigint[]) AS requested(user_id) +LEFT JOIN message_boxes m ON m.owner_user_id = requested.user_id +GROUP BY requested.user_id`, userIDs) + if err != nil { + return nil, fmt.Errorf("batch max message box id: %w", err) + } + defer rows.Close() + out := make(map[int64]int, len(userIDs)) + for rows.Next() { + var userID int64 + var current int + if err := rows.Scan(&userID, ¤t); err != nil { + return nil, fmt.Errorf("scan batch max message box id: %w", err) + } + out[userID] = current + } + if err := rows.Err(); err != nil { + return nil, fmt.Errorf("iterate batch max message box id: %w", err) + } + if len(out) != len(userIDs) { + return nil, fmt.Errorf("batch max message box id: returned %d of %d counters", len(out), len(userIDs)) + } + return out, nil } func (s *MessageBoxCounterSource) Current(ctx context.Context, userID int64) (int, error) { @@ -43,22 +75,19 @@ func (s *ChannelIDCounterSource) Current(ctx context.Context, _ int64) (int, err return id, nil } -// SecretChatIDCounterSource 从 secret_chats 表恢复全局 secret chat id（迁移 0137）。 -type SecretChatIDCounterSource struct { - db sqlcgen.DBTX -} - -// NewSecretChatIDCounterSource 创建 Redis SecretChatIDAllocator 的 PG 恢复源。 -func NewSecretChatIDCounterSource(db sqlcgen.DBTX) *SecretChatIDCounterSource { - return &SecretChatIDCounterSource{db: db} -} - -func (s *SecretChatIDCounterSource) Current(ctx context.Context, _ int64) (int, error) { - var id int - if err := s.db.QueryRow(ctx, `SELECT COALESCE(MAX(chat_id), 0) FROM secret_chats`).Scan(&id); err != nil { - return 0, fmt.Errorf("max secret chat id: %w", err) +func (s *ChannelIDCounterSource) CurrentBatch(ctx context.Context, userIDs []int64) (map[int64]int, error) { + if len(userIDs) == 0 { + return map[int64]int{}, nil } - return id, nil + current, err := s.Current(ctx, 1) + if err != nil { + return nil, err + } + out := make(map[int64]int, len(userIDs)) + for _, userID := range userIDs { + out[userID] = current + } + return out, nil } // ChannelMessageIDCounterSource 从 channel_messages 恢复某 channel 的当前最大 message id。 @@ -77,3 +106,34 @@ func (s *ChannelMessageIDCounterSource) Current(ctx context.Context, channelID i } return id, nil } + +func (s *ChannelMessageIDCounterSource) CurrentBatch(ctx context.Context, channelIDs []int64) (map[int64]int, error) { + if len(channelIDs) == 0 { + return map[int64]int{}, nil + } + rows, err := s.db.Query(ctx, ` +SELECT requested.channel_id, COALESCE(MAX(m.id), 0)::integer +FROM unnest($1::bigint[]) AS requested(channel_id) +LEFT JOIN channel_messages m ON m.channel_id = requested.channel_id +GROUP BY requested.channel_id`, channelIDs) + if err != nil { + return nil, fmt.Errorf("batch max channel message id: %w", err) + } + defer rows.Close() + out := make(map[int64]int, len(channelIDs)) + for rows.Next() { + var channelID int64 + var current int + if err := rows.Scan(&channelID, ¤t); err != nil { + return nil, fmt.Errorf("scan batch max channel message id: %w", err) + } + out[channelID] = current + } + if err := rows.Err(); err != nil { + return nil, fmt.Errorf("iterate batch max channel message id: %w", err) + } + if len(out) != len(channelIDs) { + return nil, fmt.Errorf("batch max channel message id: returned %d of %d counters", len(out), len(channelIDs)) + } + return out, nil +} diff --git a/internal/store/postgres/dialog.go b/internal/store/postgres/dialog.go index 98dce078..f62226b3 100644 --- a/internal/store/postgres/dialog.go +++ b/internal/store/postgres/dialog.go @@ -20,6 +20,8 @@ type DialogStore struct { q *sqlcgen.Queries } +const dialogListSnapshotLimit = 10000 + // NewDialogStore 基于 pgx 连接池（或事务）创建 DialogStore。 func NewDialogStore(db sqlcgen.DBTX) *DialogStore { return &DialogStore{db: db, q: sqlcgen.New(db)} @@ -33,12 +35,19 @@ func (s *DialogStore) enrichDialogTopMessages(ctx context.Context, userID int64, } func (s *DialogStore) ListByUser(ctx context.Context, userID int64, filter domain.DialogFilter) (domain.DialogList, error) { + return s.listByUser(ctx, userID, filter, 500) +} + +func (s *DialogStore) listByUser(ctx context.Context, userID int64, filter domain.DialogFilter, maxLimit int) (domain.DialogList, error) { limit := filter.Limit if limit <= 0 { limit = 100 } - if limit > 500 { - limit = 500 + if maxLimit <= 0 { + maxLimit = 500 + } + if limit > maxLimit { + limit = maxLimit } offsetPeerID := int64(0) if filter.HasOffsetPeer { @@ -248,6 +257,195 @@ func (s *DialogStore) ListByUser(ctx context.Context, userID int64, filter domai return out, nil } +// ListDialogSnapshotHeaders returns the complete bounded private-dialog owner +// index without hydrating peer users or top-message payloads. Page payloads are +// resolved later through the versioned per-peer read model. +func (s *DialogStore) ListDialogSnapshotHeaders(ctx context.Context, userID int64, filter domain.DialogFilter) (domain.DialogList, error) { + folderParams := dialogFolderQueryParams(filter.Folder) + rows, err := s.q.ListDialogSummaryByUser(ctx, sqlcgen.ListDialogSummaryByUserParams{ + UserID: userID, + HasFolderID: filter.HasFolderID, + FolderID: pgInt32NonNegative(filter.FolderID), + FolderExcludeArchived: folderParams.excludeArchived, + FolderExcludeRead: folderParams.excludeRead, + FolderExcludePeerTypes: folderParams.excludeTypes, + FolderExcludePeerIds: folderParams.excludeIDs, + FolderIncludePeerTypes: folderParams.includeTypes, + FolderIncludePeerIds: folderParams.includeIDs, + FolderPinnedPeerTypes: folderParams.pinnedTypes, + FolderPinnedPeerIds: folderParams.pinnedIDs, + FolderContacts: folderParams.contacts, + FolderNonContacts: folderParams.nonContacts, + PinnedOnly: filter.PinnedOnly, + ExcludePinned: filter.ExcludePinned, + }) + if err != nil { + return domain.DialogList{}, fmt.Errorf("list dialog snapshot headers: %w", err) + } + if len(rows) > dialogListSnapshotLimit { + return domain.DialogList{}, fmt.Errorf("private dialog snapshot exceeds %d entries", dialogListSnapshotLimit) + } + dialogs := make([]domain.Dialog, 0, len(rows)) + peerTypes := make([]string, 0, len(rows)) + peerIDs := make([]int64, 0, len(rows)) + for _, row := range rows { + peerTypes = append(peerTypes, row.PeerType) + peerIDs = append(peerIDs, row.PeerID) + dialogs = append(dialogs, domain.Dialog{ + Peer: domain.Peer{Type: domain.PeerType(row.PeerType), ID: row.PeerID}, + FolderID: int(row.FolderID), + TopMessage: int(row.TopMessageID), + TopMessageDate: int(row.TopMessageDate), + ReadInboxMaxID: int(row.ReadInboxMaxID), + ReadOutboxMaxID: int(row.ReadOutboxMaxID), + UnreadCount: int(row.UnreadCount), + UnreadMentions: int(row.UnreadMentionsCount), + UnreadReactions: int(row.UnreadReactionsCount), + TTLPeriod: int(row.TtlPeriod), + ThemeEmoticon: row.ThemeEmoticon, + HasScheduled: row.HasScheduled, + Pinned: row.Pinned, + PinnedOrder: int(row.PinnedOrder), + UnreadMark: row.UnreadMark, + PeerSettingsBarHidden: row.HiddenPeerSettingsBar, + }) + } + var dependencyHash int64 + if len(peerIDs) > 0 { + if err := s.db.QueryRow(ctx, ` +WITH requested AS ( + SELECT peer_type, peer_id + FROM unnest($2::text[], $3::bigint[]) AS peer(peer_type, peer_id) +) +SELECT COALESCE(bit_xor(v.hash), 0)::bigint +FROM requested peer +JOIN read_model_versions v + ON v.model = 'dialog_light' + AND v.owner_user_id = $1 + AND v.peer_type = peer.peer_type + AND v.peer_id = peer.peer_id`, userID, peerTypes, peerIDs).Scan(&dependencyHash); err != nil { + return domain.DialogList{}, fmt.Errorf("read private dialog snapshot dependency hash: %w", err) + } + } + return domain.DialogList{ + Dialogs: dialogs, + Count: len(dialogs), + Hash: mixDialogListDependencyHash(dialogListHash(dialogs), dependencyHash), + }, nil +} + +// ListAllBuiltinDialogSnapshotHeaders loads one owner base across main and +// archive folders. Pinned/exclude-pinned/folder variants are derived by the app +// layer from this immutable base instead of repeating the owner scan. +func (s *DialogStore) ListAllBuiltinDialogSnapshotHeaders(ctx context.Context, userID int64) (domain.DialogList, error) { + if userID == 0 { + return domain.DialogList{}, nil + } + rows, err := s.db.Query(ctx, ` +SELECT d.peer_type, + d.peer_id, + d.folder_id, + d.top_message_id, + d.top_message_date, + d.read_inbox_max_id, + d.read_outbox_max_id, + d.unread_count, + d.unread_mentions_count, + d.unread_reactions_count, + d.ttl_period, + d.theme_emoticon, + d.has_scheduled, + d.pinned, + d.pinned_order, + d.unread_mark, + d.hidden_peer_settings_bar +FROM dialogs AS d +WHERE d.user_id = $1 + AND d.folder_id IN (0, 1) +ORDER BY d.pinned DESC, + CASE WHEN d.pinned THEN COALESCE(d.pinned_order, 0) ELSE 0 END DESC, + d.top_message_date DESC, + d.top_message_id DESC, + d.peer_id DESC +LIMIT $2`, userID, dialogListSnapshotLimit+1) + if err != nil { + return domain.DialogList{}, fmt.Errorf("list all built-in private dialog snapshot headers: %w", err) + } + defer rows.Close() + dialogs := make([]domain.Dialog, 0, 128) + for rows.Next() { + var dialog domain.Dialog + var peerType string + if err := rows.Scan( + &peerType, + &dialog.Peer.ID, + &dialog.FolderID, + &dialog.TopMessage, + &dialog.TopMessageDate, + &dialog.ReadInboxMaxID, + &dialog.ReadOutboxMaxID, + &dialog.UnreadCount, + &dialog.UnreadMentions, + &dialog.UnreadReactions, + &dialog.TTLPeriod, + &dialog.ThemeEmoticon, + &dialog.HasScheduled, + &dialog.Pinned, + &dialog.PinnedOrder, + &dialog.UnreadMark, + &dialog.PeerSettingsBarHidden, + ); err != nil { + return domain.DialogList{}, fmt.Errorf("scan all built-in private dialog snapshot headers: %w", err) + } + dialog.Peer.Type = domain.PeerType(peerType) + dialogs = append(dialogs, dialog) + } + if err := rows.Err(); err != nil { + return domain.DialogList{}, fmt.Errorf("list all built-in private dialog snapshot header rows: %w", err) + } + if len(dialogs) > dialogListSnapshotLimit { + return domain.DialogList{}, fmt.Errorf("private dialog snapshot exceeds %d entries", dialogListSnapshotLimit) + } + return domain.DialogList{Dialogs: dialogs, Count: len(dialogs)}, nil +} + +// ListPrivateDialogPeerIDs is the narrow presence-fanout read model. Presence +// needs only private peer IDs; routing it through GetDialogs would hydrate +// channels, top messages, drafts and viewer projections and can even omit +// private peers when the first page is channel-heavy. +func (s *DialogStore) ListPrivateDialogPeerIDs(ctx context.Context, userID int64, limit int) ([]int64, error) { + if userID == 0 { + return nil, nil + } + if limit <= 0 || limit > 4096 { + limit = 4096 + } + rows, err := s.db.Query(ctx, ` +SELECT peer_id +FROM dialogs +WHERE user_id = $1 + AND peer_type = 'user' + AND peer_id <> $1 +ORDER BY top_message_date DESC, top_message_id DESC, peer_id DESC +LIMIT $2`, userID, limit) + if err != nil { + return nil, fmt.Errorf("list private dialog peer ids: %w", err) + } + defer rows.Close() + ids := make([]int64, 0, minInt(limit, 128)) + for rows.Next() { + var id int64 + if err := rows.Scan(&id); err != nil { + return nil, err + } + ids = append(ids, id) + } + if err := rows.Err(); err != nil { + return nil, err + } + return ids, nil +} + func (s *DialogStore) ListByPeers(ctx context.Context, userID int64, peers []domain.Peer) (domain.DialogList, error) { if len(peers) == 0 { return domain.DialogList{}, nil @@ -634,6 +832,35 @@ func (s *DialogStore) ListUnreadMarked(ctx context.Context, userID int64) ([]dom return out, nil } +func (s *DialogStore) ListDraftsByPeers(ctx context.Context, userID int64, peers []domain.Peer) ([]domain.DialogDraft, error) { + peerTypes := make([]string, 0, len(peers)) + peerIDs := make([]int64, 0, len(peers)) + seen := make(map[domain.Peer]struct{}, len(peers)) + for _, peer := range peers { + if peer.ID == 0 { + continue + } + if _, ok := seen[peer]; ok { + continue + } + seen[peer] = struct{}{} + peerTypes = append(peerTypes, string(peer.Type)) + peerIDs = append(peerIDs, peer.ID) + } + if len(peerIDs) == 0 { + return nil, nil + } + rows, err := s.q.ListDialogDraftsByPeers(ctx, sqlcgen.ListDialogDraftsByPeersParams{ + UserID: userID, + PeerTypes: peerTypes, + PeerIds: peerIDs, + }) + if err != nil { + return nil, fmt.Errorf("list dialog drafts by peers: %w", err) + } + return decodeDialogDrafts(rows) +} + func (s *DialogStore) SetChatTheme(ctx context.Context, userID int64, peer domain.Peer, emoticon string) (bool, error) { if userID == 0 || peer.Type == "" || peer.ID == 0 { return false, nil @@ -1050,3 +1277,26 @@ func dialogListHash(dialogs []domain.Dialog) int64 { } return int64(h.Sum64()) } + +// mixDialogListDependencyHash turns durable read-model version tokens into the +// list hash without forcing the owner ordering scan to derive every mutable +// dialog field. A token change is sufficient to reject an old client hash; +// the page itself is then hydrated from the exact per-peer projection. +func mixDialogListDependencyHash(base int64, dependencies ...int64) int64 { + if base == 0 && len(dependencies) == 0 { + return 0 + } + h := fnv.New64a() + var buf [8]byte + binary.LittleEndian.PutUint64(buf[:], uint64(base)) + _, _ = h.Write(buf[:]) + for _, dependency := range dependencies { + binary.LittleEndian.PutUint64(buf[:], uint64(dependency)) + _, _ = h.Write(buf[:]) + } + sum := int64(h.Sum64() & 0x7fffffffffffffff) + if sum == 0 { + return 1 + } + return sum +} diff --git a/internal/store/postgres/dialog_draft_get_integration_test.go b/internal/store/postgres/dialog_draft_get_integration_test.go index 1cdce7ea..b890186c 100644 --- a/internal/store/postgres/dialog_draft_get_integration_test.go +++ b/internal/store/postgres/dialog_draft_get_integration_test.go @@ -47,3 +47,51 @@ func TestDialogDraftGetRoundTrip(t *testing.T) { t.Fatalf("get deleted draft = found %v err %v, want absent", found, err) } } + +func TestListDialogDraftsByPeersMatchesCompositePeerKeys(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + suffix := randomSuffix(t) + owner, err := NewUserStore(pool).Create(ctx, domain.User{AccessHash: 41, Phone: "+1888" + suffix + "01", FirstName: "DraftPageOwner"}) + if err != nil { + t.Fatalf("create owner: %v", err) + } + userID := owner.ID + requestedUser := domain.Peer{Type: domain.PeerTypeUser, ID: userID + 1} + requestedChannel := domain.Peer{Type: domain.PeerTypeChannel, ID: userID + 2} + crossProductPeer := domain.Peer{Type: domain.PeerTypeChannel, ID: requestedUser.ID} + t.Cleanup(func() { + _, _ = pool.Exec(ctx, "DELETE FROM dialog_drafts WHERE user_id = $1", userID) + _, _ = pool.Exec(ctx, "DELETE FROM users WHERE id = $1", userID) + }) + + dialogs := NewDialogStore(pool) + for _, draft := range []domain.DialogDraft{ + {Peer: requestedUser, Message: "requested user", Date: 101}, + {Peer: requestedChannel, Message: "requested channel", Date: 102}, + {Peer: crossProductPeer, Message: "must not leak", Date: 103}, + {Peer: requestedUser, TopMessageID: 77, Message: "topic draft", Date: 104}, + } { + if err := dialogs.SaveDraft(ctx, userID, draft); err != nil { + t.Fatalf("save draft %+v: %v", draft.Peer, err) + } + } + + got, err := dialogs.ListDraftsByPeers(ctx, userID, []domain.Peer{requestedUser, requestedChannel, requestedUser}) + if err != nil { + t.Fatalf("ListDraftsByPeers: %v", err) + } + if len(got) != 2 { + t.Fatalf("drafts = %+v, want exactly two requested top-level drafts", got) + } + want := map[domain.Peer]string{requestedUser: "requested user", requestedChannel: "requested channel"} + for _, draft := range got { + if want[draft.Peer] != draft.Message { + t.Fatalf("unexpected draft = %+v", draft) + } + delete(want, draft.Peer) + } + if len(want) != 0 { + t.Fatalf("missing drafts = %+v", want) + } +} diff --git a/internal/store/postgres/dialog_owner_listener_test.go b/internal/store/postgres/dialog_owner_listener_test.go new file mode 100644 index 00000000..d91ec0ad --- /dev/null +++ b/internal/store/postgres/dialog_owner_listener_test.go @@ -0,0 +1,26 @@ +package postgres + +import ( + "testing" + + "telesrv/internal/domain" +) + +type dialogOwnerListenerCache struct { + owners []int64 +} + +func (*dialogOwnerListenerCache) InvalidateDialog(int64, domain.Peer) {} +func (*dialogOwnerListenerCache) FlushReadModelCache() {} +func (c *dialogOwnerListenerCache) InvalidateDialogOwner(ownerUserID int64) { + c.owners = append(c.owners, ownerUserID) +} + +func TestReadModelListenerInvalidatesExactDialogOwner(t *testing.T) { + cache := &dialogOwnerListenerCache{} + listener := NewReadModelChangeListener("", ReadModelCacheSet{Dialogs: cache}, nil) + listener.handlePayload(`{"model":"dialog_owner","owner_user_id":1001,"peer_type":"user","peer_id":1001,"version":2,"hash":44}`) + if len(cache.owners) != 1 || cache.owners[0] != 1001 { + t.Fatalf("invalidated owners = %v, want [1001]", cache.owners) + } +} diff --git a/internal/store/postgres/dialog_owner_read_model_integration_test.go b/internal/store/postgres/dialog_owner_read_model_integration_test.go new file mode 100644 index 00000000..7071527b --- /dev/null +++ b/internal/store/postgres/dialog_owner_read_model_integration_test.go @@ -0,0 +1,100 @@ +package postgres + +import ( + "context" + "fmt" + "testing" + "time" + + "github.com/jackc/pgx/v5" +) + +func TestDialogOwnerReadModelSeedsAndAdvancesExactlyOnce(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + tx, err := pool.Begin(ctx) + if err != nil { + t.Fatalf("begin: %v", err) + } + t.Cleanup(func() { _ = tx.Rollback(ctx) }) + + suffix := time.Now().UnixNano() % 1_000_000_000 + ownerID := int64(7_100_000_000) + suffix + channelID := int64(8_100_000_000) + suffix + phone := fmt.Sprintf("199%011d", suffix) + if _, err := tx.Exec(ctx, ` +INSERT INTO users (id, access_hash, phone, first_name) +VALUES ($1, $2, $3, 'dialog-owner-test')`, ownerID, ownerID+17, phone); err != nil { + t.Fatalf("insert owner: %v", err) + } + assertDialogOwnerVersion(t, ctx, tx, ownerID, 1) + + if _, err := tx.Exec(ctx, ` +INSERT INTO dialogs (user_id, peer_type, peer_id, top_message_id, top_message_date) +VALUES ($1, 'user', $2, 1, 10)`, ownerID, ownerID+1); err != nil { + t.Fatalf("insert private dialog: %v", err) + } + assertDialogOwnerVersion(t, ctx, tx, ownerID, 2) + if _, err := tx.Exec(ctx, ` +UPDATE dialogs SET unread_count = 1, updated_at = now() +WHERE user_id = $1 AND peer_type = 'user' AND peer_id = $2`, ownerID, ownerID+1); err != nil { + t.Fatalf("update private dialog: %v", err) + } + assertDialogOwnerVersion(t, ctx, tx, ownerID, 3) + + if _, err := tx.Exec(ctx, ` +INSERT INTO dialog_drafts (user_id, peer_type, peer_id, date, draft) +VALUES ($1, 'user', $2, 11, '{"message":"draft"}'::jsonb)`, ownerID, ownerID+1); err != nil { + t.Fatalf("insert draft: %v", err) + } + assertDialogOwnerVersion(t, ctx, tx, ownerID, 4) + + if _, err := tx.Exec(ctx, ` +INSERT INTO channels (id, access_hash, creator_user_id, title, megagroup, date) +VALUES ($1, $2, $3, 'dialog-owner-channel', true, 12)`, channelID, channelID+19, ownerID); err != nil { + t.Fatalf("insert channel: %v", err) + } + if _, err := tx.Exec(ctx, ` +INSERT INTO channel_dialogs (user_id, channel_id, top_message_id, top_message_date) +VALUES ($1, $2, 1, 12)`, ownerID, channelID); err != nil { + t.Fatalf("insert channel dialog: %v", err) + } + assertDialogOwnerVersion(t, ctx, tx, ownerID, 5) + + if _, err := tx.Exec(ctx, ` +INSERT INTO channel_members (channel_id, user_id, role, status, joined_at) +VALUES ($1, $2, 'creator', 'active', 12)`, channelID, ownerID); err != nil { + t.Fatalf("insert channel member: %v", err) + } + assertDialogOwnerVersion(t, ctx, tx, ownerID, 6) + if _, err := tx.Exec(ctx, ` +UPDATE channel_members SET read_inbox_max_id = 1, updated_at = now() +WHERE channel_id = $1 AND user_id = $2`, channelID, ownerID); err != nil { + t.Fatalf("update channel member: %v", err) + } + assertDialogOwnerVersion(t, ctx, tx, ownerID, 7) + + // Every other exact-dialog dependency path (private top-message edits, + // reactions, contacts/profile fan-out) converges through this helper. + if _, err := tx.Exec(ctx, `SELECT public.telesrv_bump_dialog_light($1, 'user', $2)`, ownerID, ownerID+1); err != nil { + t.Fatalf("bump exact dialog dependency: %v", err) + } + assertDialogOwnerVersion(t, ctx, tx, ownerID, 8) +} + +func assertDialogOwnerVersion(t *testing.T, ctx context.Context, tx pgx.Tx, ownerID, want int64) { + t.Helper() + var got int64 + if err := tx.QueryRow(ctx, ` +SELECT version +FROM read_model_versions +WHERE model = 'dialog_owner' + AND owner_user_id = $1 + AND peer_type = 'user' + AND peer_id = $1`, ownerID).Scan(&got); err != nil { + t.Fatalf("read dialog_owner version: %v", err) + } + if got != want { + t.Fatalf("dialog_owner version = %d, want %d", got, want) + } +} diff --git a/internal/store/postgres/dialog_snapshot_hash_integration_test.go b/internal/store/postgres/dialog_snapshot_hash_integration_test.go new file mode 100644 index 00000000..c9155d8e --- /dev/null +++ b/internal/store/postgres/dialog_snapshot_hash_integration_test.go @@ -0,0 +1,190 @@ +package postgres + +import ( + "context" + "testing" + + "telesrv/internal/domain" +) + +func TestChannelDialogSnapshotHashTracksDependenciesWithoutWideHeaders(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + suffix := randomSuffix(t) + + owner, err := NewUserStore(pool).Create(ctx, domain.User{ + AccessHash: 51, + Phone: "+1778" + suffix + "01", + FirstName: "SnapshotHashOwner", + }) + if err != nil { + t.Fatalf("create owner: %v", err) + } + created, err := NewChannelStore(pool).CreateChannel(ctx, domain.CreateChannelRequest{ + CreatorUserID: owner.ID, + Title: "Snapshot Hash " + suffix, + Megagroup: true, + Date: 1700000600, + }) + if err != nil { + t.Fatalf("create channel: %v", err) + } + channelID := created.Channel.ID + t.Cleanup(func() { + _, _ = pool.Exec(ctx, "DELETE FROM channels WHERE id = $1", channelID) + _, _ = pool.Exec(ctx, "DELETE FROM users WHERE id = $1", owner.ID) + }) + + channels := NewChannelStore(pool) + load := func() domain.ChannelDialogList { + t.Helper() + list, err := channels.ListChannelDialogSnapshotHeaders(ctx, owner.ID, domain.DialogFilter{}) + if err != nil { + t.Fatalf("list snapshot headers: %v", err) + } + if len(list.Dialogs) != 1 || list.Hash == 0 { + t.Fatalf("snapshot = %+v, want one dialog and non-zero hash", list) + } + dialog := list.Dialogs[0] + if dialog.Peer.ID != channelID || dialog.TopMessage == 0 || dialog.TopMessageDate == 0 { + t.Fatalf("ordering header = %+v, want peer/top/date", dialog) + } + if dialog.ReadInboxMaxID != 0 || dialog.ReadOutboxMaxID != 0 || dialog.UnreadCount != 0 || + dialog.UnreadMentions != 0 || dialog.UnreadReactions != 0 || dialog.Pts != 0 { + t.Fatalf("snapshot header retained mutable hydration fields: %+v", dialog) + } + return list + } + + before := load() + changed, err := channels.SetChannelDialogUnreadMark(ctx, owner.ID, channelID, true) + if err != nil || !changed { + t.Fatalf("set unread mark = %v, %v", changed, err) + } + afterOwnerState := load() + if afterOwnerState.Hash == before.Hash { + t.Fatalf("owner-local dependency hash stayed %d after unread mark", before.Hash) + } + if afterOwnerState.Dialogs[0].TopMessage != before.Dialogs[0].TopMessage || + afterOwnerState.Dialogs[0].TopMessageDate != before.Dialogs[0].TopMessageDate { + t.Fatalf("unread mark changed ordering header: before=%+v after=%+v", before.Dialogs[0], afterOwnerState.Dialogs[0]) + } + + if _, err := pool.Exec(ctx, "UPDATE channels SET title = title || ' changed' WHERE id = $1", channelID); err != nil { + t.Fatalf("update channel title: %v", err) + } + afterSharedState := load() + if afterSharedState.Hash == afterOwnerState.Hash { + t.Fatalf("shared channel dependency hash stayed %d after channel-base change", afterOwnerState.Hash) + } +} + +func TestPrivateDialogSnapshotHashTracksDraftDependency(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + suffix := randomSuffix(t) + users := NewUserStore(pool) + owner, err := users.Create(ctx, domain.User{ + AccessHash: 52, + Phone: "+1778" + suffix + "02", + FirstName: "PrivateSnapshotOwner", + }) + if err != nil { + t.Fatalf("create owner: %v", err) + } + peer, err := users.Create(ctx, domain.User{ + AccessHash: 53, + Phone: "+1778" + suffix + "03", + FirstName: "PrivateSnapshotPeer", + }) + if err != nil { + t.Fatalf("create peer: %v", err) + } + t.Cleanup(func() { + _, _ = pool.Exec(ctx, "DELETE FROM users WHERE id = ANY($1::bigint[])", []int64{owner.ID, peer.ID}) + }) + + dialogs := NewDialogStore(pool) + dialogPeer := domain.Peer{Type: domain.PeerTypeUser, ID: peer.ID} + if err := dialogs.Upsert(ctx, owner.ID, domain.Dialog{ + Peer: dialogPeer, + TopMessage: 7, + TopMessageDate: 1700000610, + }); err != nil { + t.Fatalf("upsert dialog: %v", err) + } + before, err := dialogs.ListDialogSnapshotHeaders(ctx, owner.ID, domain.DialogFilter{}) + if err != nil { + t.Fatalf("list snapshot before draft: %v", err) + } + if len(before.Dialogs) != 1 || before.Hash == 0 { + t.Fatalf("snapshot before draft = %+v", before) + } + if err := dialogs.SaveDraft(ctx, owner.ID, domain.DialogDraft{ + Peer: dialogPeer, + Date: 1700000611, + Message: "draft changes hash without changing ordering", + }); err != nil { + t.Fatalf("save draft: %v", err) + } + after, err := dialogs.ListDialogSnapshotHeaders(ctx, owner.ID, domain.DialogFilter{}) + if err != nil { + t.Fatalf("list snapshot after draft: %v", err) + } + if after.Hash == before.Hash { + t.Fatalf("private snapshot hash stayed %d after draft change", before.Hash) + } + if after.Dialogs[0].TopMessage != before.Dialogs[0].TopMessage || after.Dialogs[0].TopMessageDate != before.Dialogs[0].TopMessageDate { + t.Fatalf("draft changed ordering header: before=%+v after=%+v", before.Dialogs[0], after.Dialogs[0]) + } +} + +func TestPrivateDialogAllBuiltinSnapshotIncludesMainAndArchive(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + suffix := randomSuffix(t) + users := NewUserStore(pool) + owner, err := users.Create(ctx, domain.User{AccessHash: 61, Phone: "+1778" + suffix + "11", FirstName: "AllFolderOwner"}) + if err != nil { + t.Fatal(err) + } + mainPeer, err := users.Create(ctx, domain.User{AccessHash: 62, Phone: "+1778" + suffix + "12", FirstName: "MainPeer"}) + if err != nil { + t.Fatal(err) + } + archivePeer, err := users.Create(ctx, domain.User{AccessHash: 63, Phone: "+1778" + suffix + "13", FirstName: "ArchivePeer"}) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { + _, _ = pool.Exec(ctx, "DELETE FROM users WHERE id = ANY($1::bigint[])", []int64{owner.ID, mainPeer.ID, archivePeer.ID}) + }) + dialogs := NewDialogStore(pool) + for index, peer := range []int64{mainPeer.ID, archivePeer.ID} { + if err := dialogs.Upsert(ctx, owner.ID, domain.Dialog{ + Peer: domain.Peer{Type: domain.PeerTypeUser, ID: peer}, + TopMessage: 10 + index, TopMessageDate: 1700000700 + index, + }); err != nil { + t.Fatal(err) + } + } + if err := dialogs.EditPeerFolders(ctx, owner.ID, []domain.FolderPeerUpdate{{ + Peer: domain.Peer{Type: domain.PeerTypeUser, ID: archivePeer.ID}, FolderID: domain.DialogArchiveFolderID, + }}); err != nil { + t.Fatal(err) + } + all, err := dialogs.ListAllBuiltinDialogSnapshotHeaders(ctx, owner.ID) + if err != nil { + t.Fatal(err) + } + if len(all.Dialogs) != 2 { + t.Fatalf("all built-in private dialogs = %+v", all.Dialogs) + } + folders := map[int64]int{} + for _, dialog := range all.Dialogs { + folders[dialog.Peer.ID] = dialog.FolderID + } + if folders[mainPeer.ID] != domain.DialogMainFolderID || folders[archivePeer.ID] != domain.DialogArchiveFolderID { + t.Fatalf("all built-in private folders = %#v", folders) + } +} diff --git a/internal/store/postgres/dialog_top_projection_invalidation_integration_test.go b/internal/store/postgres/dialog_top_projection_invalidation_integration_test.go new file mode 100644 index 00000000..fe408afb --- /dev/null +++ b/internal/store/postgres/dialog_top_projection_invalidation_integration_test.go @@ -0,0 +1,162 @@ +package postgres + +import ( + "context" + "testing" + "time" + + "github.com/jackc/pgx/v5/pgxpool" + + "telesrv/internal/domain" +) + +func TestDialogTopProjectionInvalidationTracksOnlyVisibleTopPayloads(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + suffix := randomSuffix(t) + + users := NewUserStore(pool) + owner, err := users.Create(ctx, domain.User{AccessHash: 1, Phone: "+1888" + suffix + "01", FirstName: "TopProjectionOwner"}) + if err != nil { + t.Fatalf("create owner: %v", err) + } + friend, err := users.Create(ctx, domain.User{AccessHash: 2, Phone: "+1888" + suffix + "02", FirstName: "TopProjectionFriend"}) + if err != nil { + t.Fatalf("create friend: %v", err) + } + var channelID int64 + t.Cleanup(func() { + if channelID != 0 { + _, _ = pool.Exec(ctx, "DELETE FROM channels WHERE id = $1", channelID) + } + _, _ = pool.Exec(ctx, "DELETE FROM private_message_reactions WHERE user_id = ANY($1::bigint[]) OR message_sender_id = ANY($1::bigint[])", []int64{owner.ID, friend.ID}) + _, _ = pool.Exec(ctx, "DELETE FROM message_boxes WHERE owner_user_id = ANY($1::bigint[])", []int64{owner.ID, friend.ID}) + _, _ = pool.Exec(ctx, "DELETE FROM private_messages WHERE sender_user_id = ANY($1::bigint[])", []int64{owner.ID, friend.ID}) + _, _ = pool.Exec(ctx, "DELETE FROM user_update_events WHERE user_id = ANY($1::bigint[])", []int64{owner.ID, friend.ID}) + _, _ = pool.Exec(ctx, "DELETE FROM dialogs WHERE user_id = ANY($1::bigint[])", []int64{owner.ID, friend.ID}) + _, _ = pool.Exec(ctx, "DELETE FROM read_model_versions WHERE owner_user_id = ANY($1::bigint[]) OR (peer_type = 'user' AND peer_id = ANY($1::bigint[]))", []int64{owner.ID, friend.ID}) + _, _ = pool.Exec(ctx, "DELETE FROM users WHERE id = ANY($1::bigint[])", []int64{owner.ID, friend.ID}) + }) + + messages := NewMessageStore(pool) + now := int(time.Now().Unix()) + older, err := messages.SendPrivateText(ctx, domain.SendPrivateTextRequest{ + SenderUserID: owner.ID, RecipientUserID: friend.ID, RandomID: time.Now().UnixNano(), Message: "older", Date: now, + }) + if err != nil { + t.Fatalf("send older private message: %v", err) + } + newer, err := messages.SendPrivateText(ctx, domain.SendPrivateTextRequest{ + SenderUserID: owner.ID, RecipientUserID: friend.ID, RandomID: time.Now().UnixNano() + 1, Message: "newer", Date: now + 1, + }) + if err != nil { + t.Fatalf("send newer private message: %v", err) + } + + ownerDialogVersion := func() int64 { + return testReadModelVersion(t, ctx, pool, "dialog_light", owner.ID, "user", friend.ID) + } + before := ownerDialogVersion() + if _, err := pool.Exec(ctx, "UPDATE message_boxes SET body = body || '-edited' WHERE owner_user_id = $1 AND box_id = $2", owner.ID, older.SenderMessage.ID); err != nil { + t.Fatalf("edit non-top private box: %v", err) + } + if got := ownerDialogVersion(); got != before { + t.Fatalf("non-top private edit bumped dialog_light: before=%d after=%d", before, got) + } + if _, err := pool.Exec(ctx, "UPDATE message_boxes SET body = body || '-edited' WHERE owner_user_id = $1 AND box_id = $2", owner.ID, newer.SenderMessage.ID); err != nil { + t.Fatalf("edit top private box: %v", err) + } + if got := ownerDialogVersion(); got <= before { + t.Fatalf("top private edit did not bump dialog_light: before=%d after=%d", before, got) + } + + before = ownerDialogVersion() + if _, err := pool.Exec(ctx, ` +INSERT INTO private_message_reactions + (message_sender_id, private_message_id, user_id, reaction_type, reaction_value, reaction_date, chosen_order) +VALUES ($1, $2, $3, 'emoji', 'non-top', $4, 1)`, owner.ID, older.SenderMessage.UID, friend.ID, now+2); err != nil { + t.Fatalf("insert non-top private reaction: %v", err) + } + if got := ownerDialogVersion(); got != before { + t.Fatalf("non-top private reaction bumped dialog_light: before=%d after=%d", before, got) + } + if _, err := pool.Exec(ctx, ` +INSERT INTO private_message_reactions + (message_sender_id, private_message_id, user_id, reaction_type, reaction_value, reaction_date, chosen_order) +VALUES ($1, $2, $3, 'emoji', 'top', $4, 1)`, owner.ID, newer.SenderMessage.UID, friend.ID, now+3); err != nil { + t.Fatalf("insert top private reaction: %v", err) + } + if got := ownerDialogVersion(); got <= before { + t.Fatalf("top private reaction did not bump dialog_light: before=%d after=%d", before, got) + } + + channels := NewChannelStore(pool) + created, err := channels.CreateChannel(ctx, domain.CreateChannelRequest{ + CreatorUserID: owner.ID, Title: "Top Projection " + suffix, Megagroup: true, MemberUserIDs: []int64{friend.ID}, Date: now + 4, + }) + if err != nil { + t.Fatalf("create channel: %v", err) + } + channelID = created.Channel.ID + oldChannelMessage, err := channels.SendChannelMessage(ctx, domain.SendChannelMessageRequest{ + UserID: owner.ID, ChannelID: channelID, RandomID: time.Now().UnixNano() + 2, Message: "older channel", Date: now + 5, + }) + if err != nil { + t.Fatalf("send older channel message: %v", err) + } + topChannelMessage, err := channels.SendChannelMessage(ctx, domain.SendChannelMessageRequest{ + UserID: owner.ID, ChannelID: channelID, RandomID: time.Now().UnixNano() + 3, Message: "top channel", Date: now + 6, + }) + if err != nil { + t.Fatalf("send top channel message: %v", err) + } + channelVersion := func() int64 { + return testReadModelVersion(t, ctx, pool, "channel_base", 0, "channel", channelID) + } + before = channelVersion() + if _, err := pool.Exec(ctx, "UPDATE channel_messages SET body = body || '-edited' WHERE channel_id = $1 AND id = $2", channelID, oldChannelMessage.Message.ID); err != nil { + t.Fatalf("edit non-top channel message: %v", err) + } + if got := channelVersion(); got != before { + t.Fatalf("non-top channel edit bumped channel_base: before=%d after=%d", before, got) + } + if _, err := pool.Exec(ctx, "UPDATE channel_messages SET body = body || '-edited' WHERE channel_id = $1 AND id = $2", channelID, topChannelMessage.Message.ID); err != nil { + t.Fatalf("edit top channel message: %v", err) + } + if got := channelVersion(); got <= before { + t.Fatalf("top channel edit did not bump channel_base: before=%d after=%d", before, got) + } + + before = channelVersion() + if _, err := pool.Exec(ctx, ` +INSERT INTO channel_message_reactions + (channel_id, message_id, reacted_user_id, sender_user_id, reaction_type, reaction_value, reaction_date, chosen_order) +VALUES ($1, $2, $3, $4, 'emoji', 'non-top', $5, 1)`, channelID, oldChannelMessage.Message.ID, friend.ID, owner.ID, now+7); err != nil { + t.Fatalf("insert non-top channel reaction: %v", err) + } + if got := channelVersion(); got != before { + t.Fatalf("non-top channel reaction bumped channel_base: before=%d after=%d", before, got) + } + if _, err := pool.Exec(ctx, ` +INSERT INTO channel_message_reactions + (channel_id, message_id, reacted_user_id, sender_user_id, reaction_type, reaction_value, reaction_date, chosen_order) +VALUES ($1, $2, $3, $4, 'emoji', 'top', $5, 1)`, channelID, topChannelMessage.Message.ID, friend.ID, owner.ID, now+8); err != nil { + t.Fatalf("insert top channel reaction: %v", err) + } + if got := channelVersion(); got <= before { + t.Fatalf("top channel reaction did not bump channel_base: before=%d after=%d", before, got) + } +} + +func testReadModelVersion(t *testing.T, ctx context.Context, pool *pgxpool.Pool, model string, ownerUserID int64, peerType string, peerID int64) int64 { + t.Helper() + var version int64 + if err := pool.QueryRow(ctx, ` +SELECT COALESCE((SELECT version + FROM read_model_versions + WHERE model = $1 AND owner_user_id = $2 AND peer_type = $3 AND peer_id = $4), 0)`, + model, ownerUserID, peerType, peerID).Scan(&version); err != nil { + t.Fatalf("read %s version: %v", model, err) + } + return version +} diff --git a/internal/store/postgres/dispatch_outbox.go b/internal/store/postgres/dispatch_outbox.go index a1a862ef..dcf17bb9 100644 --- a/internal/store/postgres/dispatch_outbox.go +++ b/internal/store/postgres/dispatch_outbox.go @@ -4,6 +4,7 @@ import ( "context" "errors" "fmt" + "sort" "time" "telesrv/internal/domain" @@ -36,6 +37,7 @@ func enqueueDispatch(ctx context.Context, q *sqlcgen.Queries, arg sqlcgen.Enqueu // DispatchOutboxStore 用 PostgreSQL 实现 transactional outbox。 type DispatchOutboxStore struct { + db sqlcgen.DBTX q *sqlcgen.Queries leaseSeconds int32 } @@ -58,6 +60,7 @@ func WithLeaseTimeout(d time.Duration) DispatchOutboxOption { // NewDispatchOutboxStore 基于 pgx 连接池（或事务）创建 DispatchOutboxStore。 func NewDispatchOutboxStore(db sqlcgen.DBTX, opts ...DispatchOutboxOption) *DispatchOutboxStore { s := &DispatchOutboxStore{ + db: db, q: sqlcgen.New(db), leaseSeconds: int32(defaultDispatchLease / time.Second), } @@ -169,10 +172,12 @@ func (s *DispatchOutboxStore) MarkDeliveredBatch(ctx context.Context, items []st ids[i] = it.ID expectedAttempts[i] = int32(it.Attempts) } - rows, err := s.q.MarkDispatchDeliveredBatch(ctx, sqlcgen.MarkDispatchDeliveredBatchParams{ - TargetUserIds: targetUserIDs, - Ids: ids, - ExpectedAttempts: expectedAttempts, + rows, err := s.withExclusiveLaneFences(ctx, targetUserIDs, func(db sqlcgen.DBTX) (int64, error) { + return sqlcgen.New(db).MarkDispatchDeliveredBatch(ctx, sqlcgen.MarkDispatchDeliveredBatchParams{ + TargetUserIds: targetUserIDs, + Ids: ids, + ExpectedAttempts: expectedAttempts, + }) }) if err != nil { return fmt.Errorf("mark dispatch delivered batch: %w", err) @@ -184,10 +189,12 @@ func (s *DispatchOutboxStore) MarkDeliveredBatch(ctx context.Context, items []st } func (s *DispatchOutboxStore) MarkDelivered(ctx context.Context, item store.DispatchOutboxItem) error { - rows, err := s.q.MarkDispatchDelivered(ctx, sqlcgen.MarkDispatchDeliveredParams{ - TargetUserID: item.TargetUserID, - ID: item.ID, - ExpectedAttempts: int32(item.Attempts), + rows, err := s.withExclusiveLaneFences(ctx, []int64{item.TargetUserID}, func(db sqlcgen.DBTX) (int64, error) { + return sqlcgen.New(db).MarkDispatchDelivered(ctx, sqlcgen.MarkDispatchDeliveredParams{ + TargetUserID: item.TargetUserID, + ID: item.ID, + ExpectedAttempts: int32(item.Attempts), + }) }) if err != nil { return fmt.Errorf("mark dispatch delivered: %w", err) @@ -198,6 +205,68 @@ func (s *DispatchOutboxStore) MarkDelivered(ctx context.Context, item store.Disp return nil } +// withExclusiveLaneFences serializes the empty-lane transition with producers' +// shared append fences. The DELETE runs as a later READ COMMITTED statement, so +// it sees every producer that committed before the exclusive fence was granted. +func (s *DispatchOutboxStore) withExclusiveLaneFences( + ctx context.Context, + userIDs []int64, + work func(sqlcgen.DBTX) (int64, error), +) (int64, error) { + beginner, ok := s.db.(txBeginner) + if !ok { + return 0, fmt.Errorf("dispatch lane transition requires transaction-capable database") + } + tx, err := beginner.Begin(ctx) + if err != nil { + return 0, fmt.Errorf("begin dispatch lane transition: %w", err) + } + committed := false + defer func() { + if !committed { + _ = tx.Rollback(ctx) + } + }() + if err := lockDispatchOutboxLanesExclusive(ctx, tx, userIDs); err != nil { + return 0, err + } + rows, err := work(tx) + if err != nil { + return 0, err + } + if err := tx.Commit(ctx); err != nil { + return 0, fmt.Errorf("commit dispatch lane transition: %w", err) + } + committed = true + return rows, nil +} + +func lockDispatchOutboxLanesExclusive(ctx context.Context, db sqlcgen.DBTX, userIDs []int64) error { + unique := make([]int64, 0, len(userIDs)) + seen := make(map[int64]struct{}, len(userIDs)) + for _, userID := range userIDs { + if userID <= 0 { + continue + } + if _, ok := seen[userID]; ok { + continue + } + seen[userID] = struct{}{} + unique = append(unique, userID) + } + if len(unique) == 0 { + return nil + } + sort.Slice(unique, func(i, j int) bool { return unique[i] < unique[j] }) + if _, err := db.Exec(ctx, ` +SELECT pg_advisory_xact_lock(dispatch_outbox_lane_advisory_key(streams.target_user_id)) +FROM unnest($1::bigint[]) AS streams(target_user_id) +ORDER BY streams.target_user_id`, unique); err != nil { + return fmt.Errorf("lock dispatch outbox lane transition: %w", err) + } + return nil +} + func (s *DispatchOutboxStore) MarkFailed(ctx context.Context, item store.DispatchOutboxItem, lastError string) error { rows, err := s.q.MarkDispatchFailed(ctx, sqlcgen.MarkDispatchFailedParams{ TargetUserID: item.TargetUserID, @@ -224,9 +293,42 @@ func (s *DispatchOutboxStore) DeleteFailed(ctx context.Context, olderThan time.D if limit > maxDispatchPoisonCleanupBatch { limit = maxDispatchPoisonCleanupBatch } - deleted, err := s.q.DeleteFailedDispatchOutbox(ctx, sqlcgen.DeleteFailedDispatchOutboxParams{ - OlderThanSeconds: int32(olderThan / time.Second), - LimitCount: int32(limit), + olderThanSeconds := int32(olderThan / time.Second) + rows, err := s.db.Query(ctx, ` +SELECT h.target_user_id +FROM dispatch_outbox_user_heads h +WHERE h.status = 'failed' + AND h.updated_at < now() - make_interval(secs => $1::int) +ORDER BY h.updated_at ASC, h.target_user_id ASC, h.head_id ASC +LIMIT $2`, olderThanSeconds, int32(limit)) + if err != nil { + return 0, fmt.Errorf("list failed dispatch outbox lanes: %w", err) + } + userIDs := make([]int64, 0, limit) + for rows.Next() { + var userID int64 + if err := rows.Scan(&userID); err != nil { + rows.Close() + return 0, fmt.Errorf("scan failed dispatch outbox lane: %w", err) + } + userIDs = append(userIDs, userID) + } + if err := rows.Err(); err != nil { + rows.Close() + return 0, fmt.Errorf("iterate failed dispatch outbox lanes: %w", err) + } + rows.Close() + if len(userIDs) == 0 { + return 0, nil + } + + deleted, err := s.withExclusiveLaneFences(ctx, userIDs, func(db sqlcgen.DBTX) (int64, error) { + count, deleteErr := sqlcgen.New(db).DeleteFailedDispatchOutbox(ctx, sqlcgen.DeleteFailedDispatchOutboxParams{ + OlderThanSeconds: olderThanSeconds, + LimitCount: int32(limit), + TargetUserIds: userIDs, + }) + return int64(count), deleteErr }) if err != nil { return 0, fmt.Errorf("delete failed dispatch outbox: %w", err) diff --git a/internal/store/postgres/dispatch_outbox_sharding_integration_test.go b/internal/store/postgres/dispatch_outbox_sharding_integration_test.go index 81c0cf0d..cb0792df 100644 --- a/internal/store/postgres/dispatch_outbox_sharding_integration_test.go +++ b/internal/store/postgres/dispatch_outbox_sharding_integration_test.go @@ -192,6 +192,94 @@ ON CONFLICT DO NOTHING } } +func TestDispatchOutboxAppendRacingLastHeadCompletionKeepsLaneDiscoverable(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + suffix := randomSuffix(t) + owner := createTestUser(t, ctx, NewUserStore(pool), "+1884"+suffix+"91", "OutboxFence", "") + t.Cleanup(func() { + _, _ = pool.Exec(ctx, "DELETE FROM users WHERE id = $1", owner.ID) + }) + + appendEvent := func(events *UpdateEventStore, date int) domain.UpdateEvent { + t.Helper() + event, err := events.AppendAllocatedWithDispatch(ctx, owner.ID, domain.UpdateEvent{ + Type: domain.UpdateEventDialogPinned, + PtsCount: 1, + Date: date, + Peer: domain.Peer{Type: domain.PeerTypeUser, ID: owner.ID}, + Bool: true, + }, [8]byte{}, 0) + if err != nil { + t.Fatalf("append event: %v", err) + } + return event + } + first := appendEvent(NewUpdateEventStore(pool), 1700002900) + outbox := NewDispatchOutboxStore(pool, WithLeaseTimeout(time.Hour)) + claimed := storepkg.DispatchOutboxItem{TargetUserID: owner.ID, Pts: first.Pts, Attempts: 1} + if err := pool.QueryRow(ctx, ` +UPDATE dispatch_outbox +SET status='dispatching', attempts=1, updated_at=now() +WHERE target_user_id=$1 AND pts=$2 +RETURNING id`, owner.ID, first.Pts).Scan(&claimed.ID); err != nil { + t.Fatalf("claim first head: %v", err) + } + + producer, err := pool.Begin(ctx) + if err != nil { + t.Fatalf("begin producer: %v", err) + } + defer func() { _ = producer.Rollback(ctx) }() + second := appendEvent(NewUpdateEventStore(producer), 1700002901) + var producerPID, sharedFences int + if err := producer.QueryRow(ctx, `SELECT pg_backend_pid()`).Scan(&producerPID); err != nil { + t.Fatalf("load producer backend pid: %v", err) + } + if err := pool.QueryRow(ctx, ` +SELECT count(*) +FROM pg_locks +WHERE locktype='advisory' AND pid=$1 AND mode='ShareLock' AND granted`, producerPID).Scan(&sharedFences); err != nil { + t.Fatalf("inspect producer lane fence: %v", err) + } + if sharedFences == 0 { + t.Fatal("producer did not retain a shared dispatch lane fence") + } + + delivered := make(chan error, 1) + go func() { delivered <- outbox.MarkDelivered(ctx, claimed) }() + select { + case err := <-delivered: + t.Fatalf("completion crossed an uncommitted append fence: %v", err) + case <-time.After(100 * time.Millisecond): + } + if err := producer.Commit(ctx); err != nil { + t.Fatalf("commit producer: %v", err) + } + select { + case err := <-delivered: + if err != nil { + t.Fatalf("complete first head: %v", err) + } + case <-time.After(5 * time.Second): + t.Fatal("completion did not resume after producer commit") + } + + var outboxID, headID int64 + var outboxPts, headPts int + if err := pool.QueryRow(ctx, ` +SELECT d.id, d.pts, h.head_id, h.head_pts +FROM dispatch_outbox d +JOIN dispatch_outbox_user_heads h + ON h.target_user_id=d.target_user_id +WHERE d.target_user_id=$1`, owner.ID).Scan(&outboxID, &outboxPts, &headID, &headPts); err != nil { + t.Fatalf("load successor lane: %v", err) + } + if outboxID != headID || outboxPts != second.Pts || headPts != second.Pts { + t.Fatalf("successor outbox/head = %d/%d pts=%d/%d, want pts %d", outboxID, headID, outboxPts, headPts, second.Pts) + } +} + func TestDispatchOutboxShardClaimersAreMutuallyExclusive(t *testing.T) { pool := testPool(t) ctx := context.Background() diff --git a/internal/store/postgres/encrypted_queue.go b/internal/store/postgres/encrypted_queue.go index 9d4c43ee..9ccdf323 100644 --- a/internal/store/postgres/encrypted_queue.go +++ b/internal/store/postgres/encrypted_queue.go @@ -11,7 +11,7 @@ import ( "telesrv/internal/store/postgres/sqlcgen" ) -// EncryptedQueueStore 是 store.EncryptedQueueStore 的 PostgreSQL 实现（迁移 0138）。 +// EncryptedQueueStore 是 store.EncryptedQueueStore 的 PostgreSQL 实现。 // 盲中继 qts 投递队列：qts 分配（secret_qts_watermarks.reserved_qts 自增）+ 写队列行 // 在单事务内完成，保证设备 qts 无空洞。bytes 原样 BYTEA 存储，永不解密。 type EncryptedQueueStore struct { @@ -135,7 +135,8 @@ VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)`, } func (s *EncryptedQueueStore) ListEncryptedMessagesSince(ctx context.Context, receiverAuthKeyID int64, sinceQts, limit int) ([]domain.SecretChatMessage, error) { - if limit <= 0 || limit > 1000 { + // RPC difference 以 1000 条为一页，并额外读取 1 条探测 hasMore。 + if limit <= 0 || limit > 1001 { limit = 1000 } rows, err := s.db.Query(ctx, @@ -206,7 +207,8 @@ RETURNING id`, } func (s *EncryptedQueueStore) ListUndeliveredStateEvents(ctx context.Context, targetUserID, deviceAuthKeyID int64, limit int) ([]domain.EncryptedStateEvent, error) { - if limit <= 0 || limit > 1000 { + // RPC difference 以 1000 条为一页，并额外读取 1 条探测 hasMore。 + if limit <= 0 || limit > 1001 { limit = 1000 } rows, err := s.db.Query(ctx, ` diff --git a/internal/store/postgres/gif_catalog.go b/internal/store/postgres/gif_catalog.go index 4e41583b..5ccf1360 100644 --- a/internal/store/postgres/gif_catalog.go +++ b/internal/store/postgres/gif_catalog.go @@ -20,6 +20,13 @@ func (s *GifCatalogStore) CreateGifCatalogEntry(ctx context.Context, entry domai if entry.ID == 0 || entry.DocumentID == 0 { return domain.GifCatalogEntry{}, fmt.Errorf("create gif catalog entry: id and document_id are required") } + var count int64 + if err := s.db.QueryRow(ctx, `SELECT count(*) FROM gif_catalog`).Scan(&count); err != nil { + return domain.GifCatalogEntry{}, fmt.Errorf("count gif catalog entries: %w", err) + } + if count >= domain.MaxGifCatalogEntries { + return domain.GifCatalogEntry{}, domain.ErrGifCatalogFull + } row := s.db.QueryRow(ctx, ` INSERT INTO gif_catalog (id, title, document_id, enabled, sort_order, created_by, source_filename, category) VALUES ($1, $2, $3, true, $4, $5, $6, $7) diff --git a/internal/store/postgres/gif_catalog_integration_test.go b/internal/store/postgres/gif_catalog_integration_test.go new file mode 100644 index 00000000..f5e613d6 --- /dev/null +++ b/internal/store/postgres/gif_catalog_integration_test.go @@ -0,0 +1,108 @@ +package postgres + +import ( + "context" + "errors" + "fmt" + "sync" + "testing" + "time" + + "github.com/jackc/pgx/v5/pgxpool" + + "telesrv/internal/domain" +) + +func TestGifCatalogCapacityIsAtomic(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + base := time.Now().UnixNano() + const extraDocuments = 2 + t.Cleanup(func() { + _, _ = pool.Exec(ctx, `DELETE FROM gif_catalog WHERE id >= $1 AND id < $2`, base, base+domain.MaxGifCatalogEntries+extraDocuments) + _, _ = pool.Exec(ctx, `DELETE FROM documents WHERE id >= $1 AND id < $2`, base, base+domain.MaxGifCatalogEntries+extraDocuments) + }) + + var existing, reserved int + if err := pool.QueryRow(ctx, ` +SELECT (SELECT count(*) FROM gif_catalog), entry_count +FROM gif_catalog_capacity WHERE singleton`).Scan(&existing, &reserved); err != nil { + t.Fatalf("load initial gif catalog capacity: %v", err) + } + if existing != 0 || reserved != 0 { + t.Fatalf("dedicated test database has gif catalog rows: count=%d reserved=%d", existing, reserved) + } + + media := NewMediaStore(pool) + for i := 0; i < domain.MaxGifCatalogEntries+extraDocuments; i++ { + if err := media.PutDocument(ctx, domain.Document{ + ID: base + int64(i), MimeType: "video/mp4", Size: 1, DCID: 2, + }); err != nil { + t.Fatalf("put document %d: %v", i, err) + } + } + + type result struct { + entry domain.GifCatalogEntry + err error + } + results := make(chan result, domain.MaxGifCatalogEntries+1) + start := make(chan struct{}) + var wg sync.WaitGroup + for i := 0; i < domain.MaxGifCatalogEntries+1; i++ { + wg.Add(1) + go func(i int) { + defer wg.Done() + <-start + entry, err := NewGifCatalogStore(pool).CreateGifCatalogEntry(ctx, domain.GifCatalogEntry{ + ID: base + int64(i), Title: fmt.Sprintf("gif-%02d", i), DocumentID: base + int64(i), + }) + results <- result{entry: entry, err: err} + }(i) + } + close(start) + wg.Wait() + close(results) + + successes, full := make([]domain.GifCatalogEntry, 0, domain.MaxGifCatalogEntries), 0 + for got := range results { + switch { + case got.err == nil: + successes = append(successes, got.entry) + case errors.Is(got.err, domain.ErrGifCatalogFull): + full++ + default: + t.Fatalf("concurrent create: %v", got.err) + } + } + if len(successes) != domain.MaxGifCatalogEntries || full != 1 { + t.Fatalf("concurrent creates: success=%d full=%d", len(successes), full) + } + assertGifCatalogCapacity(t, ctx, pool, domain.MaxGifCatalogEntries) + + if changed, err := NewGifCatalogStore(pool).DeleteGifCatalogEntry(ctx, successes[0].ID); err != nil || !changed { + t.Fatalf("delete catalog entry: changed=%v err=%v", changed, err) + } + assertGifCatalogCapacity(t, ctx, pool, domain.MaxGifCatalogEntries-1) + + last := base + domain.MaxGifCatalogEntries + 1 + if _, err := NewGifCatalogStore(pool).CreateGifCatalogEntry(ctx, domain.GifCatalogEntry{ + ID: last, Title: "replacement", DocumentID: last, + }); err != nil { + t.Fatalf("create after release: %v", err) + } + assertGifCatalogCapacity(t, ctx, pool, domain.MaxGifCatalogEntries) +} + +func assertGifCatalogCapacity(t *testing.T, ctx context.Context, pool *pgxpool.Pool, want int) { + t.Helper() + var rows, reserved int + if err := pool.QueryRow(ctx, ` +SELECT (SELECT count(*) FROM gif_catalog), entry_count +FROM gif_catalog_capacity WHERE singleton`).Scan(&rows, &reserved); err != nil { + t.Fatalf("load gif catalog capacity: %v", err) + } + if rows != want || reserved != want { + t.Fatalf("gif catalog capacity: rows=%d reserved=%d want=%d", rows, reserved, want) + } +} diff --git a/internal/store/postgres/login_code_delivery.go b/internal/store/postgres/login_code_delivery.go index 0453ce06..341809ab 100644 --- a/internal/store/postgres/login_code_delivery.go +++ b/internal/store/postgres/login_code_delivery.go @@ -139,7 +139,7 @@ func (s *MessageStore) DeliverLoginCodeMessage(ctx context.Context, req domain.L return domain.LoginCodeDeliveryResult{}, fmt.Errorf("create login code private message: %w", err) } - boxID, err := s.nextLoginCodeBoxID(ctx, qtx, req.UserID) + boxID, err := s.nextIncomingSystemBoxID(ctx, qtx, req.UserID) if err != nil { return domain.LoginCodeDeliveryResult{}, fmt.Errorf("allocate login code box id: %w", err) } @@ -324,7 +324,7 @@ WHERE delivery_key = $1`, deliveryKey[:]).Scan( return receipt, true, nil } -func (s *MessageStore) nextLoginCodeBoxID(ctx context.Context, qtx *sqlcgen.Queries, userID int64) (int, error) { +func (s *MessageStore) nextIncomingSystemBoxID(ctx context.Context, qtx *sqlcgen.Queries, userID int64) (int, error) { // The default allocator queries PostgreSQL. Run that query on the active // transaction connection: querying s.q while holding the transaction can // deadlock a MaxConns=1 pool. External allocators (Redis/counters) retain diff --git a/internal/store/postgres/login_code_delivery_integration_test.go b/internal/store/postgres/login_code_delivery_integration_test.go index c156bd7e..e9e9f2af 100644 --- a/internal/store/postgres/login_code_delivery_integration_test.go +++ b/internal/store/postgres/login_code_delivery_integration_test.go @@ -279,6 +279,62 @@ WHERE peer_type = 'user' AND peer_id = $1`, domain.OfficialSystemUserID).Scan(&u } } +func TestLoginCodeDeliveryPostgresSurvivesCompiledOfficialUsernameChange(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + recipient := createLoginCodeDeliveryTestUser(t, ctx, pool, "official-source-update-recipient") + decoy := createLoginCodeDeliveryTestUser(t, ctx, pool, "official-source-update-decoy") + canonical := strings.ToLower(domain.OfficialSystemUser().Username) + legacy := "legacy_" + strings.ToLower(randomSuffix(t)) + if canonical == "" { + t.Fatal("official system username must be non-empty") + } + + // Model an installation upgraded across a source revision: the persisted + // official account still has the old username and the newly compiled default + // has since been claimed. Login-code delivery must not attempt request-time + // identity migration and fail on the unique indexes. + if _, err := pool.Exec(ctx, ` +UPDATE peer_usernames SET username_lower = $2, username = $2, updated_at = now() +WHERE peer_type = 'user' AND peer_id = $1 AND editable`, domain.OfficialSystemUserID, legacy); err != nil { + t.Fatalf("move official username registry to legacy value: %v", err) + } + if _, err := pool.Exec(ctx, `UPDATE users SET username = $2 WHERE id = $1`, domain.OfficialSystemUserID, legacy); err != nil { + t.Fatalf("move official username to legacy value: %v", err) + } + if _, err := pool.Exec(ctx, `UPDATE users SET username = $2 WHERE id = $1`, decoy.ID, canonical); err != nil { + t.Fatalf("assign compiled username to decoy: %v", err) + } + if _, err := pool.Exec(ctx, ` +INSERT INTO peer_usernames (username_lower, username, peer_type, peer_id, active, editable, sort_order) +VALUES ($1, $1, 'user', $2, true, true, 0)`, canonical, decoy.ID); err != nil { + t.Fatalf("register compiled username for decoy: %v", err) + } + t.Cleanup(func() { + _, _ = pool.Exec(ctx, `DELETE FROM peer_usernames WHERE peer_type = 'user' AND peer_id = $1`, decoy.ID) + _, _ = pool.Exec(ctx, `UPDATE users SET username = '' WHERE id = $1`, decoy.ID) + _, _ = pool.Exec(ctx, `UPDATE users SET username = $2 WHERE id = $1`, domain.OfficialSystemUserID, canonical) + _, _ = pool.Exec(ctx, ` +UPDATE peer_usernames SET username_lower = $2, username = $2, updated_at = now() +WHERE peer_type = 'user' AND peer_id = $1 AND editable`, domain.OfficialSystemUserID, canonical) + }) + + now := int(time.Now().Unix()) + if _, err := NewMessageStore(pool).DeliverLoginCodeMessage(ctx, domain.LoginCodeDeliveryRequest{ + UserID: recipient.ID, PhoneCodeHash: "official-source-update-" + randomSuffix(t), + Code: "12345", Date: now, ExpiresAt: int64(now + 300), + }); err != nil { + t.Fatalf("delivery with stale persisted official identity: %v", err) + } + var got string + if err := pool.QueryRow(ctx, `SELECT username FROM users WHERE id = $1`, domain.OfficialSystemUserID).Scan(&got); err != nil { + t.Fatalf("reload official identity: %v", err) + } + if got != legacy { + t.Fatalf("request-time delivery rewrote official username to %q, want persisted %q", got, legacy) + } +} + func TestLoginCodeDeliveryPostgresReceiptRetentionIsBoundedAndSeekOrdered(t *testing.T) { pool := testPool(t) ctx := context.Background() @@ -414,6 +470,14 @@ func (a loginCodeFixedBoxAllocator) NextBoxID(context.Context, int64) (int, erro return a.boxID, nil } +func (a loginCodeFixedBoxAllocator) NextBoxIDs(_ context.Context, userIDs []int64) (map[int64]int, error) { + out := make(map[int64]int, len(userIDs)) + for _, userID := range userIDs { + out[userID] = a.boxID + } + return out, nil +} + func (a loginCodeFixedBoxAllocator) CurrentBoxID(context.Context, int64) (int, error) { return a.boxID, nil } diff --git a/internal/store/postgres/media.go b/internal/store/postgres/media.go index 5b000ba0..860ea7e7 100644 --- a/internal/store/postgres/media.go +++ b/internal/store/postgres/media.go @@ -1,8 +1,11 @@ package postgres import ( + "bytes" "container/list" "context" + "crypto/sha256" + "encoding/hex" "errors" "fmt" "sync" @@ -204,17 +207,30 @@ func (s *MediaStore) DeleteExpiredUploadParts(ctx context.Context, before time.T // ---- blob 索引 ---- func (s *MediaStore) PutFileBlob(ctx context.Context, blob domain.FileBlob) error { - backend := string(blob.Backend) - if backend == "" { - backend = string(domain.MediaBackendLocalFS) + if blob.LocationKey == "" || blob.Size < 0 { + return fmt.Errorf("invalid file blob location or size") + } + switch blob.Backend { + case domain.MediaBackendLocalFS, domain.MediaBackendS3: + default: + return fmt.Errorf("invalid file blob backend %q", blob.Backend) + } + keyDigest, err := hex.DecodeString(blob.ObjectKey) + if err != nil || len(keyDigest) != sha256.Size || hex.EncodeToString(keyDigest) != blob.ObjectKey { + return fmt.Errorf("file blob object key must be lowercase SHA-256 hex") } sha := blob.SHA256 - if sha == nil { - sha = []byte{} // 列为 NOT NULL；nil []byte 会被 pgx 当作 NULL。 + if len(sha) == 0 { + // Canonicalize at the write boundary: BlobBackend guarantees that its + // returned object key is the content digest, so callers using Put (rather + // than PutReader) need not hash the same bytes a second time. + sha = keyDigest + } else if len(sha) != sha256.Size || !bytes.Equal(sha, keyDigest) { + return fmt.Errorf("file blob SHA-256 does not match object key") } return s.q.PutFileBlob(ctx, sqlcgen.PutFileBlobParams{ LocationKey: blob.LocationKey, - Backend: backend, + Backend: string(blob.Backend), ObjectKey: blob.ObjectKey, Size: blob.Size, Sha256: sha, @@ -276,6 +292,59 @@ func (s *MediaStore) SumFileBlobBytes(ctx context.Context) (int64, error) { return s.q.SumFileBlobBytes(ctx) } +// FileBlobBackendCounts returns the persisted permanent-backend distribution. +// Startup uses it as a fail-fast invariant: a configured backend is never +// allowed to read rows written for another backend through an implicit fallback. +func (s *MediaStore) FileBlobBackendCounts(ctx context.Context) (map[domain.MediaBackend]int64, error) { + rows, err := s.db.Query(ctx, ` +SELECT backend, count(*)::bigint +FROM file_blobs +GROUP BY backend`) + if err != nil { + return nil, fmt.Errorf("count file blob backends: %w", err) + } + defer rows.Close() + counts := make(map[domain.MediaBackend]int64) + for rows.Next() { + var backend string + var count int64 + if err := rows.Scan(&backend, &count); err != nil { + return nil, fmt.Errorf("scan file blob backend count: %w", err) + } + counts[domain.MediaBackend(backend)] = count + } + if err := rows.Err(); err != nil { + return nil, fmt.Errorf("iterate file blob backend counts: %w", err) + } + return counts, nil +} + +// UniqueFileBlobBytes returns the physical byte total represented by active +// metadata for one backend. Multiple logical locations may point at the same +// content-addressed object, so each object_key is counted exactly once. Size +// disagreement for a shared key is an invariant violation, not something to +// normalize for capacity accounting. +func (s *MediaStore) UniqueFileBlobBytes(ctx context.Context, backend domain.MediaBackend) (int64, error) { + var used int64 + var consistent bool + err := s.db.QueryRow(ctx, ` +SELECT COALESCE(SUM(max_size), 0)::bigint, + COALESCE(bool_and(min_size = max_size), true) +FROM ( + SELECT object_key, MIN(size)::bigint AS min_size, MAX(size)::bigint AS max_size + FROM file_blobs + WHERE backend = $1 + GROUP BY object_key +) objects`, string(backend)).Scan(&used, &consistent) + if err != nil { + return 0, fmt.Errorf("sum unique %s file blob bytes: %w", backend, err) + } + if !consistent { + return 0, fmt.Errorf("file_blobs contains inconsistent sizes for shared %s object keys", backend) + } + return used, nil +} + func (s *MediaStore) GetSeedState(ctx context.Context, key string) (string, bool, error) { var hash string if err := s.db.QueryRow(ctx, ` diff --git a/internal/store/postgres/media_index_integration_test.go b/internal/store/postgres/media_index_integration_test.go index 1d9834f6..fa14d375 100644 --- a/internal/store/postgres/media_index_integration_test.go +++ b/internal/store/postgres/media_index_integration_test.go @@ -88,6 +88,18 @@ func TestChannelMediaIndexSearch(t *testing.T) { wantIDs("music", search(domain.MediaCategoryMusic), musicID) wantIDs("photoVideo", search(domain.MediaCategoryPhoto, domain.MediaCategoryVideo), videoID, photoID) // newest-first wantIDs("voice empty", search(domain.MediaCategoryVoice)) + combined, err := channels.SearchChannelMedia(ctx, owner.ID, channelID, domain.MediaSearchRequest{ + Categories: []domain.MediaCategory{domain.MediaCategoryVideo}, + Query: "VID", + SenderUserID: owner.ID, + MinDate: 1700002002, + MaxDate: 1700002004, + Limit: 50, + }) + if err != nil { + t.Fatalf("combined channel media search: %v", err) + } + wantIDs("combined channel media", combined, videoID) countOnly, err := channels.SearchChannelMedia(ctx, owner.ID, channelID, domain.MediaSearchRequest{ Categories: []domain.MediaCategory{domain.MediaCategoryPhoto}, Limit: 0, @@ -175,6 +187,20 @@ func TestPrivateMediaCategoryCountsMaterialized(t *testing.T) { if err != nil { t.Fatalf("send private media: %v", err) } + combined, err := messages.SearchPrivateMedia(ctx, bob.ID, alice.ID, domain.MediaSearchRequest{ + Categories: []domain.MediaCategory{domain.MediaCategoryFile}, + Query: "DOC", + SenderUserID: alice.ID, + MinDate: 1700003000, + MaxDate: 1700003200, + Limit: 10, + }) + if err != nil { + t.Fatalf("combined private media search: %v", err) + } + if combined.Count != 1 || len(combined.Messages) != 1 || combined.Messages[0].ID != sent.RecipientMessage.ID { + t.Fatalf("combined private media = count %d messages %+v", combined.Count, combined.Messages) + } wantCount := func(name string, ownerID, peerID int64, category domain.MediaCategory, want int) { counts, err := messages.CountPrivateMediaCategories(ctx, ownerID, peerID) if err != nil { diff --git a/internal/store/postgres/media_integration_test.go b/internal/store/postgres/media_integration_test.go index 5d89cb80..52e8cfeb 100644 --- a/internal/store/postgres/media_integration_test.go +++ b/internal/store/postgres/media_integration_test.go @@ -29,20 +29,16 @@ func TestMediaStoreRoundTrip(t *testing.T) { cleanupMediaStoreRoundTripRows(t, context.Background(), pool) }) - // ---- file blob（nil sha256 应被归一为空，不报 NOT NULL）---- - if err := s.PutFileBlob(ctx, domain.FileBlob{ - LocationKey: "doc:9100000000000000001", - ObjectKey: "ab/cd/abcdef", - Size: 1234, - MimeType: "application/x-tgsticker", - }); err != nil { - t.Fatalf("put file blob (nil sha256): %v", err) + // ---- file blob（backend/key/hash/size 是同一份合法永久对象事实）---- + wantBlob := postgresTestBlob("doc:9100000000000000001", "media-round-trip", 1234, "application/x-tgsticker") + if err := s.PutFileBlob(ctx, wantBlob); err != nil { + t.Fatalf("put file blob: %v", err) } blob, ok, err := s.GetFileBlob(ctx, "doc:9100000000000000001") if err != nil || !ok { t.Fatalf("get file blob: ok=%v err=%v", ok, err) } - if blob.ObjectKey != "ab/cd/abcdef" || blob.Size != 1234 || blob.Backend != domain.MediaBackendLocalFS { + if blob.ObjectKey != wantBlob.ObjectKey || blob.Size != 1234 || blob.Backend != domain.MediaBackendLocalFS || !bytes.Equal(blob.SHA256, wantBlob.SHA256) { t.Fatalf("file blob mismatch: %+v", blob) } diff --git a/internal/store/postgres/media_search.go b/internal/store/postgres/media_search.go index 31201cdd..e156082f 100644 --- a/internal/store/postgres/media_search.go +++ b/internal/store/postgres/media_search.go @@ -76,6 +76,106 @@ func reorderChannelMessagesByID(msgs []domain.ChannelMessage, order []int) []dom return out } +func privateMediaSearchBase(ownerUserID, peerID int64, cats []int16, req domain.MediaSearchRequest) (string, []any) { + args := []any{ownerUserID, peerID, cats} + where := ` +FROM message_box_media mi +JOIN message_boxes mb ON mb.owner_user_id = mi.owner_user_id AND mb.box_id = mi.box_id +WHERE mi.owner_user_id = $1 AND mi.peer_id = $2 AND mi.category = ANY($3::smallint[]) + AND NOT mb.deleted` + add := func(clause string, value any) { + args = append(args, value) + where += fmt.Sprintf(clause, len(args)) + } + if req.MaxID > 0 { + add(" AND mi.box_id <= $%d", pgInt32NonNegative(req.MaxID)) + } + if req.MinID > 0 { + add(" AND mi.box_id >= $%d", pgInt32NonNegative(req.MinID)) + } + if req.Query != "" { + add(" AND mb.body ILIKE '%%' || $%d || '%%'", req.Query) + } + if req.SenderUserID != 0 { + add(" AND mb.from_user_id = $%d", req.SenderUserID) + } + if req.MinDate > 0 { + add(" AND mb.message_date > $%d", pgInt32NonNegative(req.MinDate)) + } + if req.MaxDate > 0 { + add(" AND mb.message_date < $%d", pgInt32NonNegative(req.MaxDate)) + } + if req.TopMsgID > 0 { + args = append(args, pgInt32NonNegative(req.TopMsgID)) + where += fmt.Sprintf(" AND (mb.box_id = $%d OR mb.reply_to_top_id = $%d)", len(args), len(args)) + } + if req.SavedPeer.ID != 0 { + args = append(args, string(req.SavedPeer.Type), req.SavedPeer.ID) + where += fmt.Sprintf(" AND mb.saved_peer_type = $%d AND mb.saved_peer_id = $%d", len(args)-1, len(args)) + } + if keys := postgresSavedReactionKeys(req.SavedReactions); len(keys) > 0 { + args = append(args, keys) + where += fmt.Sprintf(` AND EXISTS ( + SELECT 1 FROM saved_message_reaction_tags tag + WHERE tag.user_id = mb.owner_user_id AND tag.message_box_id = mb.box_id + AND (tag.reaction_type || ':' || tag.reaction_value) = ANY($%d::text[]) + )`, len(args)) + } + return where, args +} + +func channelMediaSearchBase( + viewerUserID, channelID int64, + cats []int16, + channel domain.Channel, + member domain.ChannelMember, + req domain.MediaSearchRequest, +) (string, []any) { + args := []any{channelID, cats} + where := ` +FROM channel_message_media mi +JOIN channel_messages m ON m.channel_id = mi.channel_id AND m.id = mi.id +WHERE mi.channel_id = $1 AND mi.category = ANY($2::smallint[]) + AND NOT m.deleted` + add := func(clause string, value any) { + args = append(args, value) + where += fmt.Sprintf(clause, len(args)) + } + if member.AvailableMinID > 0 { + add(" AND mi.id > $%d", pgInt32NonNegative(member.AvailableMinID)) + } + if channel.Monoforum { + if member.CanManageDirectMessages() { + where += " AND m.saved_peer_id = 0" + } else { + add(" AND m.saved_peer_type = 'user' AND m.saved_peer_id = $%d", viewerUserID) + } + } + if req.MaxID > 0 { + add(" AND mi.id <= $%d", pgInt32NonNegative(req.MaxID)) + } + if req.MinID > 0 { + add(" AND mi.id >= $%d", pgInt32NonNegative(req.MinID)) + } + if req.Query != "" { + add(" AND m.body ILIKE '%%' || $%d || '%%'", req.Query) + } + if req.SenderUserID != 0 { + add(" AND m.sender_user_id = $%d", req.SenderUserID) + } + if req.MinDate > 0 { + add(" AND m.message_date > $%d", pgInt32NonNegative(req.MinDate)) + } + if req.MaxDate > 0 { + add(" AND m.message_date < $%d", pgInt32NonNegative(req.MaxDate)) + } + if req.TopMsgID > 0 { + args = append(args, pgInt32NonNegative(req.TopMsgID)) + where += fmt.Sprintf(" AND (m.id = $%d OR m.reply_to_top_id = $%d)", len(args), len(args)) + } + return where, args +} + // SearchPrivateMedia 返回某私聊会话中属于给定类别的消息(newest-first 分页)。 func (s *MessageStore) SearchPrivateMedia(ctx context.Context, ownerUserID, peerID int64, req domain.MediaSearchRequest) (domain.MessageList, error) { cats := mediaCategoriesToInt16(req.Categories) @@ -83,19 +183,12 @@ func (s *MessageStore) SearchPrivateMedia(ctx context.Context, ownerUserID, peer return domain.MessageList{}, nil } limit, offset := mediaSearchPaging(req) - maxID, minID, offsetID := int32(req.MaxID), int32(req.MinID), int32(req.OffsetID) + base, baseArgs := privateMediaSearchBase(ownerUserID, peerID, cats, req) count := req.KnownCount if !req.HasKnownCount { var err error - count, err = mediaSearchCount(ctx, s.db, ` -SELECT count(DISTINCT mi.box_id)::int -FROM message_box_media mi -JOIN message_boxes mb ON mb.owner_user_id = mi.owner_user_id AND mb.box_id = mi.box_id -WHERE mi.owner_user_id = $1 AND mi.peer_id = $2 AND mi.category = ANY($3::smallint[]) - AND NOT mb.deleted - AND ($4 = 0 OR mi.box_id <= $4) - AND ($5 = 0 OR mi.box_id >= $5)`, ownerUserID, peerID, cats, maxID, minID) + count, err = mediaSearchCount(ctx, s.db, "SELECT count(DISTINCT mi.box_id)::int"+base, baseArgs...) if err != nil { return domain.MessageList{}, fmt.Errorf("count private media: %w", err) } @@ -103,17 +196,14 @@ WHERE mi.owner_user_id = $1 AND mi.peer_id = $2 AND mi.category = ANY($3::smalli if limit == 0 { return domain.MessageList{Count: count}, nil } - rows, err := s.db.Query(ctx, ` -SELECT DISTINCT mi.box_id -FROM message_box_media mi -JOIN message_boxes mb ON mb.owner_user_id = mi.owner_user_id AND mb.box_id = mi.box_id -WHERE mi.owner_user_id = $1 AND mi.peer_id = $2 AND mi.category = ANY($3::smallint[]) - AND NOT mb.deleted - AND ($4 = 0 OR mi.box_id <= $4) - AND ($5 = 0 OR mi.box_id >= $5) - AND ($6 = 0 OR mi.box_id < $6) -ORDER BY mi.box_id DESC -OFFSET $7 LIMIT $8`, ownerUserID, peerID, cats, maxID, minID, offsetID, offset, limit) + args := append([]any(nil), baseArgs...) + if req.OffsetID > 0 { + args = append(args, pgInt32NonNegative(req.OffsetID)) + base += fmt.Sprintf(" AND mi.box_id < $%d", len(args)) + } + args = append(args, offset, limit) + rows, err := s.db.Query(ctx, "SELECT DISTINCT mi.box_id"+base+ + fmt.Sprintf(" ORDER BY mi.box_id DESC OFFSET $%d LIMIT $%d", len(args)-1, len(args)), args...) if err != nil { return domain.MessageList{}, fmt.Errorf("list private media ids: %w", err) } @@ -174,24 +264,16 @@ func (s *ChannelStore) SearchChannelMedia(ctx context.Context, viewerUserID, cha return domain.ChannelHistory{}, nil } limit, offset := mediaSearchPaging(req) - maxID, minID, offsetID := int32(req.MaxID), int32(req.MinID), int32(req.OffsetID) channel, member, err := s.getChannelForMember(ctx, s.db, viewerUserID, channelID) if err != nil { return domain.ChannelHistory{}, err } + base, baseArgs := channelMediaSearchBase(viewerUserID, channelID, cats, channel, member, req) count := req.KnownCount if !req.HasKnownCount { var err error - count, err = mediaSearchCount(ctx, s.db, ` -SELECT count(DISTINCT mi.id)::int -FROM channel_message_media mi -JOIN channel_messages m ON m.channel_id = mi.channel_id AND m.id = mi.id -WHERE mi.channel_id = $1 AND mi.category = ANY($2::smallint[]) - AND NOT m.deleted - AND ($3 <= 0 OR mi.id > $3) - AND ($4 = 0 OR mi.id <= $4) - AND ($5 = 0 OR mi.id >= $5)`, channelID, cats, int32(member.AvailableMinID), maxID, minID) + count, err = mediaSearchCount(ctx, s.db, "SELECT count(DISTINCT mi.id)::int"+base, baseArgs...) if err != nil { return domain.ChannelHistory{}, fmt.Errorf("count channel media: %w", err) } @@ -199,18 +281,14 @@ WHERE mi.channel_id = $1 AND mi.category = ANY($2::smallint[]) if limit == 0 { return domain.ChannelHistory{Channel: channel, Self: member, Count: count}, nil } - rows, err := s.db.Query(ctx, ` -SELECT DISTINCT mi.id -FROM channel_message_media mi -JOIN channel_messages m ON m.channel_id = mi.channel_id AND m.id = mi.id -WHERE mi.channel_id = $1 AND mi.category = ANY($2::smallint[]) - AND NOT m.deleted - AND ($3 <= 0 OR mi.id > $3) - AND ($4 = 0 OR mi.id <= $4) - AND ($5 = 0 OR mi.id >= $5) - AND ($6 = 0 OR mi.id < $6) -ORDER BY mi.id DESC -OFFSET $7 LIMIT $8`, channelID, cats, int32(member.AvailableMinID), maxID, minID, offsetID, offset, limit) + args := append([]any(nil), baseArgs...) + if req.OffsetID > 0 { + args = append(args, pgInt32NonNegative(req.OffsetID)) + base += fmt.Sprintf(" AND mi.id < $%d", len(args)) + } + args = append(args, offset, limit) + rows, err := s.db.Query(ctx, "SELECT DISTINCT mi.id"+base+ + fmt.Sprintf(" ORDER BY mi.id DESC OFFSET $%d LIMIT $%d", len(args)-1, len(args)), args...) if err != nil { return domain.ChannelHistory{}, fmt.Errorf("list channel media ids: %w", err) } diff --git a/internal/store/postgres/message_delete.go b/internal/store/postgres/message_delete.go index c1bf944f..df5c7f51 100644 --- a/internal/store/postgres/message_delete.go +++ b/internal/store/postgres/message_delete.go @@ -55,6 +55,9 @@ func (s *MessageStore) DeleteMessages(ctx context.Context, req domain.DeleteMess if err := lockUsersForUpdate(ctx, tx, lockUserIDs...); err != nil { return res, fmt.Errorf("lock delete messages user: %w", err) } + if err := lockDispatchOutboxAppendFences(ctx, tx, lockUserIDs); err != nil { + return res, fmt.Errorf("lock delete messages dispatch append fences: %w", err) + } rows, err := qtx.DeleteMessageBoxesByIDs(ctx, sqlcgen.DeleteMessageBoxesByIDsParams{ OwnerUserID: req.OwnerUserID, diff --git a/internal/store/postgres/message_edit.go b/internal/store/postgres/message_edit.go index 3fbc1649..4c4ec81c 100644 --- a/internal/store/postgres/message_edit.go +++ b/internal/store/postgres/message_edit.go @@ -47,6 +47,9 @@ func (s *MessageStore) EditMessage(ctx context.Context, req domain.EditMessageRe if err := lockUsersForUpdate(ctx, tx, req.OwnerUserID, req.Peer.ID); err != nil { return res, fmt.Errorf("lock edit message users: %w", err) } + if err := lockDispatchOutboxAppendFences(ctx, tx, []int64{req.OwnerUserID, req.Peer.ID}); err != nil { + return res, fmt.Errorf("lock edit message dispatch append fences: %w", err) + } target, err := qtx.GetMessageBoxForEdit(ctx, sqlcgen.GetMessageBoxForEditParams{ OwnerUserID: req.OwnerUserID, diff --git a/internal/store/postgres/message_helpers.go b/internal/store/postgres/message_helpers.go index 20ac5e1a..d00a518e 100644 --- a/internal/store/postgres/message_helpers.go +++ b/internal/store/postgres/message_helpers.go @@ -218,6 +218,38 @@ func (a pgBoxIDAllocator) NextBoxID(ctx context.Context, userID int64) (int, err return cur + 1, nil } +func (a pgBoxIDAllocator) NextBoxIDs(ctx context.Context, userIDs []int64) (map[int64]int, error) { + unique := normalizedUserLaneIDs(userIDs) + if len(unique) == 0 { + return map[int64]int{}, nil + } + rows, err := a.s.db.Query(ctx, ` +SELECT requested.user_id, COALESCE(MAX(boxes.box_id), 0)::int + 1 +FROM unnest($1::bigint[]) AS requested(user_id) +LEFT JOIN message_boxes boxes ON boxes.owner_user_id = requested.user_id +GROUP BY requested.user_id`, unique) + if err != nil { + return nil, err + } + defer rows.Close() + out := make(map[int64]int, len(unique)) + for rows.Next() { + var userID int64 + var next int + if err := rows.Scan(&userID, &next); err != nil { + return nil, err + } + out[userID] = next + } + if err := rows.Err(); err != nil { + return nil, err + } + if len(out) != len(unique) { + return nil, fmt.Errorf("batch current box ids returned %d of %d users", len(out), len(unique)) + } + return out, nil +} + func (a pgBoxIDAllocator) CurrentBoxID(ctx context.Context, userID int64) (int, error) { v, err := a.s.q.MaxMessageBoxID(ctx, userID) if err != nil { diff --git a/internal/store/postgres/message_history.go b/internal/store/postgres/message_history.go index c5eadb48..4d860782 100644 --- a/internal/store/postgres/message_history.go +++ b/internal/store/postgres/message_history.go @@ -12,6 +12,8 @@ import ( "telesrv/internal/store/postgres/sqlcgen" ) +const retryableMessageTxAttempts = 3 + func (s *MessageStore) GetByIDs(ctx context.Context, userID int64, ids []int) (domain.MessageList, error) { if userID == 0 || len(ids) == 0 { return domain.MessageList{}, nil @@ -103,26 +105,28 @@ func (s *MessageStore) ListByUser(ctx context.Context, userID int64, filter doma var rows []sqlcgen.ListMessagesByUserRow if addOffset >= 0 { bw, err := s.q.ListMessagesBackward(ctx, sqlcgen.ListMessagesBackwardParams{ - OwnerUserID: userID, - HasPeer: filter.HasPeer, - PeerType: string(filter.Peer.Type), - PeerID: filter.Peer.ID, - RestrictPeerIds: filter.RestrictPeerIDs, - PeerIds: filter.PeerIDs, - Query: filter.Query, - MinDate: pgInt32NonNegative(filter.MinDate), - MaxDate: pgInt32NonNegative(filter.MaxDate), - MaxID: pgInt32NonNegative(filter.MaxID), - MinID: pgInt32NonNegative(filter.MinID), - PinnedOnly: filter.PinnedOnly, - MusicOnly: filter.MusicOnly, - SavedPeerType: savedPeerType, - SavedPeerID: savedPeerID, - SavedReactionKeys: savedReactionKeys, - OffsetDate: pgInt32NonNegative(filter.OffsetDate), - OffsetID: pgInt32NonNegative(filter.OffsetID), - RowOffset: pgInt32Bounded(addOffset), - LimitCount: int32(queryLimit), + OwnerUserID: userID, + HasPeer: filter.HasPeer, + PeerType: string(filter.Peer.Type), + PeerID: filter.Peer.ID, + RestrictPeerIds: filter.RestrictPeerIDs, + PeerIds: filter.PeerIDs, + Query: filter.Query, + MinDate: pgInt32NonNegative(filter.MinDate), + MaxDate: pgInt32NonNegative(filter.MaxDate), + MaxID: pgInt32NonNegative(filter.MaxID), + MinID: pgInt32NonNegative(filter.MinID), + PinnedOnly: filter.PinnedOnly, + MusicOnly: filter.MusicOnly, + PhoneCallsOnly: filter.PhoneCallsOnly, + MissedPhoneCallsOnly: filter.MissedPhoneCallsOnly, + SavedPeerType: savedPeerType, + SavedPeerID: savedPeerID, + SavedReactionKeys: savedReactionKeys, + OffsetDate: pgInt32NonNegative(filter.OffsetDate), + OffsetID: pgInt32NonNegative(filter.OffsetID), + RowOffset: pgInt32Bounded(addOffset), + LimitCount: int32(queryLimit), }) if err != nil { return domain.MessageList{}, fmt.Errorf("list messages (backward): %w", err) @@ -133,22 +137,24 @@ func (s *MessageStore) ListByUser(ctx context.Context, userID int64, filter doma } if filter.NeedTotalCount { total, err := s.q.CountMessagesByUser(ctx, sqlcgen.CountMessagesByUserParams{ - OwnerUserID: userID, - HasPeer: filter.HasPeer, - PeerType: string(filter.Peer.Type), - PeerID: filter.Peer.ID, - RestrictPeerIds: filter.RestrictPeerIDs, - PeerIds: filter.PeerIDs, - Query: filter.Query, - MinDate: pgInt32NonNegative(filter.MinDate), - MaxDate: pgInt32NonNegative(filter.MaxDate), - MaxID: pgInt32NonNegative(filter.MaxID), - MinID: pgInt32NonNegative(filter.MinID), - PinnedOnly: filter.PinnedOnly, - MusicOnly: filter.MusicOnly, - SavedPeerType: savedPeerType, - SavedPeerID: savedPeerID, - SavedReactionKeys: savedReactionKeys, + OwnerUserID: userID, + HasPeer: filter.HasPeer, + PeerType: string(filter.Peer.Type), + PeerID: filter.Peer.ID, + RestrictPeerIds: filter.RestrictPeerIDs, + PeerIds: filter.PeerIDs, + Query: filter.Query, + MinDate: pgInt32NonNegative(filter.MinDate), + MaxDate: pgInt32NonNegative(filter.MaxDate), + MaxID: pgInt32NonNegative(filter.MaxID), + MinID: pgInt32NonNegative(filter.MinID), + PinnedOnly: filter.PinnedOnly, + MusicOnly: filter.MusicOnly, + PhoneCallsOnly: filter.PhoneCallsOnly, + MissedPhoneCallsOnly: filter.MissedPhoneCallsOnly, + SavedPeerType: savedPeerType, + SavedPeerID: savedPeerID, + SavedReactionKeys: savedReactionKeys, }) if err != nil { return domain.MessageList{}, fmt.Errorf("count messages: %w", err) @@ -162,27 +168,29 @@ func (s *MessageStore) ListByUser(ctx context.Context, userID int64, filter doma } else { var err error rows, err = s.q.ListMessagesByUser(ctx, sqlcgen.ListMessagesByUserParams{ - OwnerUserID: userID, - HasPeer: filter.HasPeer, - PeerType: string(filter.Peer.Type), - PeerID: filter.Peer.ID, - RestrictPeerIds: filter.RestrictPeerIDs, - PeerIds: filter.PeerIDs, - Query: filter.Query, - MinDate: pgInt32NonNegative(filter.MinDate), - MaxDate: pgInt32NonNegative(filter.MaxDate), - OffsetID: pgInt32NonNegative(filter.OffsetID), - OffsetDate: pgInt32NonNegative(filter.OffsetDate), - MaxID: pgInt32NonNegative(filter.MaxID), - MinID: pgInt32NonNegative(filter.MinID), - AddOffset: pgInt32Bounded(addOffset), - LimitCount: int32(queryLimit), - PinnedOnly: filter.PinnedOnly, - MusicOnly: filter.MusicOnly, - NeedTotalCount: filter.NeedTotalCount, - SavedPeerType: savedPeerType, - SavedPeerID: savedPeerID, - SavedReactionKeys: savedReactionKeys, + OwnerUserID: userID, + HasPeer: filter.HasPeer, + PeerType: string(filter.Peer.Type), + PeerID: filter.Peer.ID, + RestrictPeerIds: filter.RestrictPeerIDs, + PeerIds: filter.PeerIDs, + Query: filter.Query, + MinDate: pgInt32NonNegative(filter.MinDate), + MaxDate: pgInt32NonNegative(filter.MaxDate), + OffsetID: pgInt32NonNegative(filter.OffsetID), + OffsetDate: pgInt32NonNegative(filter.OffsetDate), + MaxID: pgInt32NonNegative(filter.MaxID), + MinID: pgInt32NonNegative(filter.MinID), + AddOffset: pgInt32Bounded(addOffset), + LimitCount: int32(queryLimit), + PinnedOnly: filter.PinnedOnly, + MusicOnly: filter.MusicOnly, + PhoneCallsOnly: filter.PhoneCallsOnly, + MissedPhoneCallsOnly: filter.MissedPhoneCallsOnly, + NeedTotalCount: filter.NeedTotalCount, + SavedPeerType: savedPeerType, + SavedPeerID: savedPeerID, + SavedReactionKeys: savedReactionKeys, }) if err != nil { return domain.MessageList{}, fmt.Errorf("list messages: %w", err) @@ -295,7 +303,19 @@ func postgresSavedReactionKeys(reactions []domain.MessageReaction) []string { return out } -func (s *MessageStore) ReadHistory(ctx context.Context, req domain.ReadHistoryRequest) (res domain.ReadHistoryResult, err error) { +func (s *MessageStore) ReadHistory(ctx context.Context, req domain.ReadHistoryRequest) (domain.ReadHistoryResult, error) { + var lastErr error + for attempt := 0; attempt < retryableMessageTxAttempts; attempt++ { + res, err := s.readHistoryOnce(ctx, req) + if err == nil || !isRetryablePostgresTxError(err) || ctx.Err() != nil { + return res, err + } + lastErr = err + } + return domain.ReadHistoryResult{OwnerUserID: req.OwnerUserID, Peer: req.Peer, MaxID: req.MaxID}, lastErr +} + +func (s *MessageStore) readHistoryOnce(ctx context.Context, req domain.ReadHistoryRequest) (res domain.ReadHistoryResult, err error) { res = domain.ReadHistoryResult{OwnerUserID: req.OwnerUserID, Peer: req.Peer, MaxID: req.MaxID} if req.OwnerUserID == 0 { return res, fmt.Errorf("read history: missing owner user id") @@ -327,6 +347,12 @@ func (s *MessageStore) ReadHistory(ctx context.Context, req domain.ReadHistoryRe if err := lockUsersForUpdate(ctx, tx, req.OwnerUserID, req.Peer.ID); err != nil { return res, fmt.Errorf("lock read history users: %w", err) } + // This transaction may append durable inbox and outbox receipts for two + // different users. Acquire both append fences before the first INSERT so a + // batched Egress completion cannot take the same lanes in the opposite order. + if err := lockDispatchOutboxAppendFences(ctx, tx, []int64{req.OwnerUserID, req.Peer.ID}); err != nil { + return res, fmt.Errorf("lock read history dispatch append fences: %w", err) + } state, err := qtx.GetDialogReadStateForUpdate(ctx, sqlcgen.GetDialogReadStateForUpdateParams{ UserID: req.OwnerUserID, diff --git a/internal/store/postgres/message_pin.go b/internal/store/postgres/message_pin.go index 7ed596ef..f41d298a 100644 --- a/internal/store/postgres/message_pin.go +++ b/internal/store/postgres/message_pin.go @@ -53,6 +53,9 @@ func (s *MessageStore) PinPrivateMessage(ctx context.Context, req domain.PinPriv if err := lockUsersForUpdate(ctx, tx, req.OwnerUserID, req.Peer.ID); err != nil { return res, fmt.Errorf("lock pin users: %w", err) } + if err := lockDispatchOutboxAppendFences(ctx, tx, []int64{req.OwnerUserID, req.Peer.ID}); err != nil { + return res, fmt.Errorf("lock pin dispatch append fences: %w", err) + } owned, err := qtx.GetMessageBoxForPin(ctx, sqlcgen.GetMessageBoxForPinParams{ OwnerUserID: req.OwnerUserID, PeerType: string(req.Peer.Type), @@ -196,6 +199,9 @@ func (s *MessageStore) UnpinAllPrivateMessages(ctx context.Context, req domain.U if err := lockUsersForUpdate(ctx, tx, req.OwnerUserID, req.Peer.ID); err != nil { return res, fmt.Errorf("lock unpin users: %w", err) } + if err := lockDispatchOutboxAppendFences(ctx, tx, []int64{req.OwnerUserID, req.Peer.ID}); err != nil { + return res, fmt.Errorf("lock unpin dispatch append fences: %w", err) + } ownRows, err := qtx.UnpinAllMessageBoxesByPeer(ctx, sqlcgen.UnpinAllMessageBoxesByPeerParams{ OwnerUserID: req.OwnerUserID, PeerType: string(req.Peer.Type), diff --git a/internal/store/postgres/message_read.go b/internal/store/postgres/message_read.go index 3390b2a4..8f347b20 100644 --- a/internal/store/postgres/message_read.go +++ b/internal/store/postgres/message_read.go @@ -85,6 +85,9 @@ WHERE owner_user_id = $1 if err := lockUsersForUpdate(ctx, tx, lockIDs...); err != nil { return res, fmt.Errorf("lock read message contents users: %w", err) } + if err := lockDispatchOutboxAppendFences(ctx, tx, lockIDs); err != nil { + return res, fmt.Errorf("lock read message contents dispatch append fences: %w", err) + } rows, err := tx.Query(ctx, ` WITH target AS ( SELECT owner_user_id, box_id, peer_type, peer_id, media_unread, reaction_unread, diff --git a/internal/store/postgres/message_send.go b/internal/store/postgres/message_send.go index 844c39eb..c400507c 100644 --- a/internal/store/postgres/message_send.go +++ b/internal/store/postgres/message_send.go @@ -8,7 +8,6 @@ import ( "github.com/jackc/pgx/v5" "github.com/jackc/pgx/v5/pgconn" - "sort" "telesrv/internal/domain" "telesrv/internal/store" "telesrv/internal/store/postgres/sqlcgen" @@ -65,6 +64,20 @@ func ensureOfficialSystemUserWithDB(ctx context.Context, db sqlcgen.DBTX, msg do if !ok { return nil } + // Login-code delivery is a critical authentication path, not a branding + // migration. Once the official identity exists, never rewrite its unique + // phone/username from request-time code: a source update may change the + // compiled defaults while the old or new value is temporarily occupied, + // turning every auth.sendCode for an existing account into a generic 500. + // Explicit schema/data migrations own identity changes; this helper only + // seeds a missing row. + var exists bool + if err := db.QueryRow(ctx, `SELECT EXISTS (SELECT 1 FROM users WHERE id = $1)`, u.ID).Scan(&exists); err != nil { + return fmt.Errorf("check official system user: %w", err) + } + if exists { + return nil + } if _, err := db.Exec(ctx, ` WITH desired ( id, access_hash, phone, first_name, last_name, username, @@ -168,19 +181,24 @@ func (s *MessageStore) sendPrivateTextOnce(ctx context.Context, req domain.SendP if req.Date == 0 { req.Date = int(time.Now().Unix()) } - entities, err := encodeMessageEntities(req.Entities) - if err != nil { - return domain.SendPrivateTextResult{}, err - } - // reply_markup（bot reply/inline keyboard）随消息一并入双盒；普通用户发送恒 nil → "{}"。 - replyMarkupJSON, err := encodeReplyMarkup(req.ReplyMarkup) - if err != nil { - return domain.SendPrivateTextResult{}, err - } - // rich_message（Layer 227 富文本）随消息一并入双盒；普通消息恒 nil → "{}"。 - richMessageJSON, err := encodeRichMessage(req.RichMessage) - if err != nil { - return domain.SendPrivateTextResult{}, err + plainHotPath := plainPrivateSendHotPath(req, hooks) + var entities, replyMarkupJSON, richMessageJSON []byte + if !plainHotPath { + var err error + entities, err = encodeMessageEntities(req.Entities) + if err != nil { + return domain.SendPrivateTextResult{}, err + } + // reply_markup（bot reply/inline keyboard）随消息一并入双盒。 + replyMarkupJSON, err = encodeReplyMarkup(req.ReplyMarkup) + if err != nil { + return domain.SendPrivateTextResult{}, err + } + // rich_message（Layer 227 富文本）随消息一并入双盒。 + richMessageJSON, err = encodeRichMessage(req.RichMessage) + if err != nil { + return domain.SendPrivateTextResult{}, err + } } requestFingerprint, err := store.PrivateSendFingerprint(req) if err != nil { @@ -197,6 +215,14 @@ func (s *MessageStore) sendPrivateTextOnce(ctx context.Context, req domain.SendP return duplicate, nil } } + if plainHotPath && processPlainPrivateSendBatcher.Eligible(s) { + return processPlainPrivateSendBatcher.Submit(ctx, s, req, requestFingerprint) + } + releaseLanes, err := s.privateSendLanes.acquire(ctx, req.SenderUserID, req.RecipientUserID) + if err != nil { + return domain.SendPrivateTextResult{}, fmt.Errorf("wait private send actor lanes: %w", err) + } + defer releaseLanes() senderReply, recipientReply, err := s.resolvePrivateSendReply(ctx, req) if err != nil { return domain.SendPrivateTextResult{}, err @@ -214,7 +240,7 @@ func (s *MessageStore) sendPrivateTextOnce(ctx context.Context, req domain.SendP return domain.SendPrivateTextResult{}, fmt.Errorf("send private text: db does not support transactions") } - var recipientBoxID, recipientPts int + var senderBoxID, recipientBoxID, recipientPts int selfMessage := req.RecipientUserID == req.SenderUserID deliverRecipient := !selfMessage && !req.RecipientBlocked if selfMessage { @@ -222,6 +248,20 @@ func (s *MessageStore) sendPrivateTextOnce(ctx context.Context, req domain.SendP senderMeta.SavedPeerType = string(savedPeer.Type) senderMeta.SavedPeerID = savedPeer.ID } + // Box ids allow gaps. Allocate them before borrowing a PostgreSQL connection + // so Redis latency never extends the database transaction's lock lifetime. + if plainHotPath { + senderBoxID, err = s.boxIDs.NextBoxID(ctx, req.SenderUserID) + if err != nil { + return domain.SendPrivateTextResult{}, fmt.Errorf("allocate sender box id: %w", err) + } + if deliverRecipient { + recipientBoxID, err = s.boxIDs.NextBoxID(ctx, req.RecipientUserID) + if err != nil { + return domain.SendPrivateTextResult{}, fmt.Errorf("allocate recipient box id: %w", err) + } + } + } tx, err := beginner.Begin(ctx) if err != nil { @@ -241,11 +281,55 @@ func (s *MessageStore) sendPrivateTextOnce(ctx context.Context, req domain.SendP if err := lockUsersForUpdate(ctx, tx, req.SenderUserID, req.RecipientUserID); err != nil { return domain.SendPrivateTextResult{}, fmt.Errorf("lock send users: %w", err) } + if err := lockDispatchOutboxAppendFences(ctx, tx, []int64{req.SenderUserID, req.RecipientUserID}); err != nil { + return domain.SendPrivateTextResult{}, fmt.Errorf("lock send dispatch append fences: %w", err) + } if hooks.before != nil { if err := hooks.before(ctx, tx, &req); err != nil { return domain.SendPrivateTextResult{}, err } } + if plainHotPath { + pm, createErr := createPlainPrivateMessage(ctx, tx, req, requestFingerprint, deliverRecipient) + if createErr != nil { + if errors.Is(createErr, pgx.ErrNoRows) { + dup, found, dupErr := s.duplicateSendResult(ctx, qtx, req, requestFingerprint) + if dupErr != nil { + return domain.SendPrivateTextResult{}, dupErr + } + if !found { + return domain.SendPrivateTextResult{}, fmt.Errorf("duplicate private message disappeared after unique conflict") + } + dup.Duplicate = true + return dup, nil + } + return domain.SendPrivateTextResult{}, fmt.Errorf("create plain private message: %w", createErr) + } + projection, projectErr := persistPlainPrivateSendProjection( + ctx, + tx, + req, + pm.ID, + senderBoxID, + recipientBoxID, + int(pm.TtlPeriod), + int(pm.ExpiresAt), + ) + if projectErr != nil { + return domain.SendPrivateTextResult{}, projectErr + } + result := domain.SendPrivateTextResult{ + SenderMessage: projection.Sender, + RecipientMessage: projection.Recipient, + SenderEvent: eventFromMessage(projection.Sender), + RecipientEvent: eventFromMessage(projection.Recipient), + } + if err := tx.Commit(ctx); err != nil { + return domain.SendPrivateTextResult{}, fmt.Errorf("commit plain send message tx: %w", err) + } + committed = true + return result, nil + } media := privateSendMediaProjection{Shared: req.Media, Sender: req.Media, Recipient: req.Media} if hooks.projectMedia != nil { media, err = hooks.projectMedia(ctx, tx, &req) @@ -314,7 +398,7 @@ func (s *MessageStore) sendPrivateTextOnce(ctx context.Context, req domain.SendP return domain.SendPrivateTextResult{}, fmt.Errorf("create private message: %w", err) } - senderBoxID, err := s.boxIDs.NextBoxID(ctx, req.SenderUserID) + senderBoxID, err = s.boxIDs.NextBoxID(ctx, req.SenderUserID) if err != nil { return domain.SendPrivateTextResult{}, fmt.Errorf("allocate sender box id: %w", err) } @@ -721,9 +805,17 @@ func (s *MessageStore) resolvePrivateSendReply(ctx context.Context, req domain.S if peer.ID == 0 { peer = domain.Peer{Type: domain.PeerTypeUser, ID: req.RecipientUserID} } - if peer.Type != domain.PeerTypeUser || peer.ID != req.RecipientUserID { + if peer.Type != domain.PeerTypeUser && peer.Type != domain.PeerTypeChannel { return nil, nil, domain.ErrReplyMessageIDInvalid } + // Channel messages are validated at the RPC boundary through Channels.GetMessages. + // They have no private message_box row, so retain the cross-dialog reference + // and quote verbatim in both recipient projections. + if peer.Type == domain.PeerTypeChannel { + reply := cloneMessageReply(req.ReplyTo) + reply.Peer = peer + return reply, cloneMessageReply(reply), nil + } source, err := s.q.GetMessageBoxForReply(ctx, sqlcgen.GetMessageBoxForReplyParams{ OwnerUserID: req.SenderUserID, PeerType: string(peer.Type), @@ -742,6 +834,12 @@ func (s *MessageStore) resolvePrivateSendReply(ctx context.Context, req domain.S if req.SenderUserID == req.RecipientUserID { return senderReply, cloneMessageReply(senderReply), nil } + if peer.ID != req.RecipientUserID { + // A cross-dialog reply references the sender's source box. There is no + // corresponding row in the destination dialog to remap to; both sides + // therefore receive the explicit source peer/message pair. + return senderReply, cloneMessageReply(senderReply), nil + } recipientRow, err := s.q.GetMessageBoxByPrivateMessage(ctx, sqlcgen.GetMessageBoxByPrivateMessageParams{ OwnerUserID: req.RecipientUserID, @@ -810,11 +908,14 @@ func lockUsersForUpdate(ctx context.Context, tx pgx.Tx, userIDs ...int64) error seen[id] = struct{}{} unique = append(unique, id) } - sort.Slice(unique, func(i, j int) bool { return unique[i] < unique[j] }) - for _, id := range unique { - if _, err := tx.Exec(ctx, "SELECT pg_advisory_xact_lock($1)", id); err != nil { - return fmt.Errorf("advisory lock user %d: %w", id, err) - } + if len(unique) == 0 { + return nil + } + if _, err := tx.Exec(ctx, ` +SELECT pg_advisory_xact_lock(requested.user_id) +FROM unnest($1::bigint[]) AS requested(user_id) +ORDER BY requested.user_id`, unique); err != nil { + return fmt.Errorf("advisory lock users: %w", err) } return nil } diff --git a/internal/store/postgres/message_send_batch_actor.go b/internal/store/postgres/message_send_batch_actor.go new file mode 100644 index 00000000..bc0d31fd --- /dev/null +++ b/internal/store/postgres/message_send_batch_actor.go @@ -0,0 +1,408 @@ +package postgres + +import ( + "context" + "errors" + "fmt" + "sync/atomic" + "time" + + "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgxpool" + + "telesrv/internal/domain" + "telesrv/internal/store" + "telesrv/internal/store/postgres/sqlcgen" +) + +const ( + plainPrivateSendBatchWorkers = 8 + plainPrivateSendBatchMaxTasks = 32 + plainPrivateSendBatchMinTasks = 8 + plainPrivateSendBatchMailbox = 8192 + plainPrivateSendBatchFlushInterval = 8 * time.Millisecond + plainPrivateSendBatchTimeout = 10 * time.Second + plainPrivateSendBatchMaxQueuedBytes = int64(64 << 20) + plainPrivateSendTaskFixedBytes = int64(1024) +) + +var errPlainPrivateSendBatchOverloaded = errors.New("postgres: plain private send batch actor overloaded") + +var processPlainPrivateSendBatcher = newPlainPrivateSendBatchActor() + +type plainPrivateSendBatchTask struct { + ctx context.Context + store *MessageStore + req domain.SendPrivateTextRequest + fingerprint []byte + bytes int64 + done chan plainPrivateSendBatchResult +} + +type plainPrivateSendBatchResult struct { + result domain.SendPrivateTextResult + err error +} + +type plainPrivateSendBatchCompletion struct { + tasks []*plainPrivateSendBatchTask + results []plainPrivateSendBatchResult +} + +type plainPrivateSendScope struct { + store *MessageStore + userID int64 +} + +type plainPrivateSendBatchActor struct { + submit chan *plainPrivateSendBatchTask + work chan []*plainPrivateSendBatchTask + completed chan plainPrivateSendBatchCompletion + queuedBytes atomic.Int64 + batches atomic.Uint64 + tasks atomic.Uint64 +} + +type plainPrivateSendBatchSnapshot struct { + Batches uint64 + Tasks uint64 +} + +func newPlainPrivateSendBatchActor() *plainPrivateSendBatchActor { + a := &plainPrivateSendBatchActor{ + submit: make(chan *plainPrivateSendBatchTask, plainPrivateSendBatchMailbox), + work: make(chan []*plainPrivateSendBatchTask, plainPrivateSendBatchWorkers), + completed: make(chan plainPrivateSendBatchCompletion, plainPrivateSendBatchWorkers), + } + for range plainPrivateSendBatchWorkers { + go a.worker() + } + go a.run() + return a +} + +func (a *plainPrivateSendBatchActor) Snapshot() plainPrivateSendBatchSnapshot { + if a == nil { + return plainPrivateSendBatchSnapshot{} + } + return plainPrivateSendBatchSnapshot{Batches: a.batches.Load(), Tasks: a.tasks.Load()} +} + +func (a *plainPrivateSendBatchActor) Eligible(messageStore *MessageStore) bool { + if a == nil || messageStore == nil || messageStore.boxIDs == nil { + return false + } + if _, ok := messageStore.db.(*pgxpool.Pool); !ok { + return false + } + // The process batch path is a distributed allocator + PostgreSQL boundary. + // Local and test allocators cannot reserve gap-safe ids before the + // transaction under cross-process concurrency and therefore remain on the + // single-command transaction path. + _, distributed := messageStore.boxIDs.(store.DistributedBoxIDAllocator) + return distributed +} + +func (a *plainPrivateSendBatchActor) Submit( + ctx context.Context, + messageStore *MessageStore, + req domain.SendPrivateTextRequest, + fingerprint []byte, +) (domain.SendPrivateTextResult, error) { + if !a.Eligible(messageStore) || ctx == nil || len(fingerprint) == 0 { + return domain.SendPrivateTextResult{}, fmt.Errorf("postgres: invalid plain private send batch submission") + } + retained := plainPrivateSendTaskFixedBytes + int64(len(req.Message)+len(fingerprint)) + if !reservePlainPrivateSendBatchBytes(&a.queuedBytes, retained) { + return domain.SendPrivateTextResult{}, errPlainPrivateSendBatchOverloaded + } + task := &plainPrivateSendBatchTask{ + ctx: ctx, store: messageStore, req: req, + fingerprint: append([]byte(nil), fingerprint...), + bytes: retained, + done: make(chan plainPrivateSendBatchResult, 1), + } + select { + case a.submit <- task: + case <-ctx.Done(): + a.queuedBytes.Add(-retained) + return domain.SendPrivateTextResult{}, ctx.Err() + } + select { + case result := <-task.done: + return result.result, result.err + case <-ctx.Done(): + // Once accepted, the bounded actor may commit after the caller stops + // waiting. random_id is the durable receipt for an exact replay. + return domain.SendPrivateTextResult{}, ctx.Err() + } +} + +func reservePlainPrivateSendBatchBytes(used *atomic.Int64, amount int64) bool { + if used == nil || amount <= 0 || amount > plainPrivateSendBatchMaxQueuedBytes { + return false + } + for { + current := used.Load() + if current > plainPrivateSendBatchMaxQueuedBytes-amount { + return false + } + if used.CompareAndSwap(current, current+amount) { + return true + } + } +} + +func (a *plainPrivateSendBatchActor) run() { + ticker := time.NewTicker(plainPrivateSendBatchFlushInterval) + defer ticker.Stop() + pending := make([]*plainPrivateSendBatchTask, 0, plainPrivateSendBatchMailbox) + busy := make(map[plainPrivateSendScope]struct{}) + available := plainPrivateSendBatchWorkers + + completeCanceled := func(task *plainPrivateSendBatchTask) { + err := context.Canceled + if task.ctx != nil && task.ctx.Err() != nil { + err = task.ctx.Err() + } + task.done <- plainPrivateSendBatchResult{err: err} + a.queuedBytes.Add(-task.bytes) + } + dispatch := func(flush bool) { + for available > 0 && len(pending) > 0 { + if !flush && len(pending) < plainPrivateSendBatchMinTasks { + return + } + batch, remaining, canceled := selectPlainPrivateSendBatch(pending, busy) + pending = remaining + for _, task := range canceled { + completeCanceled(task) + } + if len(batch) == 0 { + return + } + for _, task := range batch { + for _, userID := range plainPrivateSendTaskUsers(task) { + busy[plainPrivateSendScope{store: task.store, userID: userID}] = struct{}{} + } + } + available-- + a.work <- batch + } + } + + for { + select { + case task := <-a.submit: + pending = append(pending, task) + dispatch(false) + case completion := <-a.completed: + available++ + for i, task := range completion.tasks { + for _, userID := range plainPrivateSendTaskUsers(task) { + delete(busy, plainPrivateSendScope{store: task.store, userID: userID}) + } + result := plainPrivateSendBatchResult{err: errors.New("postgres: missing plain private send batch result")} + if i < len(completion.results) { + result = completion.results[i] + } + task.done <- result + a.queuedBytes.Add(-task.bytes) + } + dispatch(false) + case <-ticker.C: + dispatch(true) + } + } +} + +func selectPlainPrivateSendBatch( + pending []*plainPrivateSendBatchTask, + busy map[plainPrivateSendScope]struct{}, +) (batch, remaining, canceled []*plainPrivateSendBatchTask) { + selected := make(map[plainPrivateSendScope]struct{}, plainPrivateSendBatchMaxTasks*2) + blockedByOlder := make(map[plainPrivateSendScope]struct{}, plainPrivateSendBatchMaxTasks*2) + var selectedStore *MessageStore + remaining = make([]*plainPrivateSendBatchTask, 0, len(pending)) + for _, task := range pending { + if task == nil || task.ctx == nil || task.ctx.Err() != nil { + if task != nil { + canceled = append(canceled, task) + } + continue + } + users := plainPrivateSendTaskUsers(task) + blocked := selectedStore != nil && task.store != selectedStore + for _, userID := range users { + key := plainPrivateSendScope{store: task.store, userID: userID} + if _, ok := busy[key]; ok { + blocked = true + } + if _, ok := blockedByOlder[key]; ok { + blocked = true + } + if _, ok := selected[key]; ok { + blocked = true + } + } + if blocked || len(batch) >= plainPrivateSendBatchMaxTasks { + remaining = append(remaining, task) + for _, userID := range users { + blockedByOlder[plainPrivateSendScope{store: task.store, userID: userID}] = struct{}{} + } + continue + } + if selectedStore == nil { + selectedStore = task.store + } + batch = append(batch, task) + for _, userID := range users { + selected[plainPrivateSendScope{store: task.store, userID: userID}] = struct{}{} + } + } + return batch, remaining, canceled +} + +func plainPrivateSendTaskUsers(task *plainPrivateSendBatchTask) []int64 { + if task == nil { + return nil + } + return normalizedUserLaneIDs([]int64{task.req.SenderUserID, task.req.RecipientUserID}) +} + +func (a *plainPrivateSendBatchActor) worker() { + for batch := range a.work { + results := executePlainPrivateSendBatch(batch) + a.batches.Add(1) + a.tasks.Add(uint64(len(batch))) + a.completed <- plainPrivateSendBatchCompletion{tasks: batch, results: results} + } +} + +func executePlainPrivateSendBatch(tasks []*plainPrivateSendBatchTask) []plainPrivateSendBatchResult { + results := make([]plainPrivateSendBatchResult, len(tasks)) + if len(tasks) == 0 || tasks[0] == nil || tasks[0].store == nil { + return plainPrivateSendBatchErrorResults(results, errors.New("postgres: empty plain private send batch")) + } + messageStore := tasks[0].store + pool, ok := messageStore.db.(*pgxpool.Pool) + if !ok { + return plainPrivateSendBatchErrorResults(results, errors.New("postgres: plain private send batch requires pgx pool")) + } + allocationUsers := make([]int64, 0, len(tasks)*2) + lockUsers := make([]int64, 0, len(tasks)*2) + seen := make(map[int64]struct{}, len(tasks)*2) + for _, task := range tasks { + if task == nil || task.store != messageStore { + return plainPrivateSendBatchErrorResults(results, errors.New("postgres: mixed message stores in plain private send batch")) + } + for _, userID := range plainPrivateSendTaskUsers(task) { + if _, exists := seen[userID]; exists { + return plainPrivateSendBatchErrorResults(results, fmt.Errorf("postgres: overlapping user %d in plain private send batch", userID)) + } + seen[userID] = struct{}{} + } + lockUsers = append(lockUsers, task.req.SenderUserID, task.req.RecipientUserID) + allocationUsers = append(allocationUsers, task.req.SenderUserID) + if task.req.SenderUserID != task.req.RecipientUserID && !task.req.RecipientBlocked { + allocationUsers = append(allocationUsers, task.req.RecipientUserID) + } + } + lockUsers = normalizedUserLaneIDs(lockUsers) + allocationUsers = normalizedUserLaneIDs(allocationUsers) + parent := context.Background() + if tasks[0].ctx != nil { + parent = context.WithoutCancel(tasks[0].ctx) + } + ctx, cancel := context.WithTimeout(parent, plainPrivateSendBatchTimeout) + defer cancel() + + boxIDs, err := messageStore.boxIDs.NextBoxIDs(ctx, allocationUsers) + if err != nil { + return plainPrivateSendBatchErrorResults(results, fmt.Errorf("allocate plain private send batch box ids: %w", err)) + } + releaseLanes, err := messageStore.privateSendLanes.acquire(ctx, lockUsers...) + if err != nil { + return plainPrivateSendBatchErrorResults(results, fmt.Errorf("admit plain private send batch: %w", err)) + } + defer releaseLanes() + + tx, err := pool.Begin(ctx) + if err != nil { + return plainPrivateSendBatchErrorResults(results, fmt.Errorf("begin plain private send batch: %w", err)) + } + committed := false + defer func() { + if !committed { + _ = tx.Rollback(context.Background()) + } + }() + if err := lockUsersForUpdate(ctx, tx, lockUsers...); err != nil { + return plainPrivateSendBatchErrorResults(results, fmt.Errorf("lock plain private send batch users: %w", err)) + } + if err := lockDispatchOutboxAppendFences(ctx, tx, allocationUsers); err != nil { + return plainPrivateSendBatchErrorResults(results, err) + } + created, err := createPlainPrivateMessageBatch(ctx, tx, tasks) + if err != nil { + return plainPrivateSendBatchErrorResults(results, err) + } + qtx := sqlcgen.New(tx) + for i, task := range tasks { + if created[i].inserted { + continue + } + duplicate, found, duplicateErr := messageStore.duplicateSendResult(ctx, qtx, task.req, task.fingerprint) + if duplicateErr != nil { + return plainPrivateSendBatchErrorResults(results, duplicateErr) + } + if !found { + return plainPrivateSendBatchErrorResults(results, errors.New("duplicate batched private message disappeared after unique conflict")) + } + duplicate.Duplicate = true + results[i].result = duplicate + } + projections, err := persistPlainPrivateSendProjectionBatch(ctx, tx, tasks, created, boxIDs) + if err != nil { + return plainPrivateSendBatchErrorResults(results, err) + } + for i := range tasks { + if !created[i].inserted { + continue + } + projection, ok := projections[i] + if !ok { + return plainPrivateSendBatchErrorResults(results, fmt.Errorf("missing plain private send batch projection %d", i)) + } + results[i].result = domain.SendPrivateTextResult{ + SenderMessage: projection.Sender, RecipientMessage: projection.Recipient, + SenderEvent: eventFromMessage(projection.Sender), RecipientEvent: eventFromMessage(projection.Recipient), + } + } + if err := tx.Commit(ctx); err != nil { + return plainPrivateSendBatchErrorResults(results, fmt.Errorf("commit plain private send batch: %w", err)) + } + committed = true + return results +} + +func lockDispatchOutboxAppendFences(ctx context.Context, tx pgx.Tx, userIDs []int64) error { + userIDs = normalizedUserLaneIDs(userIDs) + if len(userIDs) == 0 { + return nil + } + if _, err := tx.Exec(ctx, ` +SELECT pg_advisory_xact_lock_shared(dispatch_outbox_lane_advisory_key(streams.target_user_id)) +FROM unnest($1::bigint[]) AS streams(target_user_id) +ORDER BY streams.target_user_id`, userIDs); err != nil { + return fmt.Errorf("lock dispatch outbox append fences: %w", err) + } + return nil +} + +func plainPrivateSendBatchErrorResults(results []plainPrivateSendBatchResult, err error) []plainPrivateSendBatchResult { + for i := range results { + results[i] = plainPrivateSendBatchResult{err: err} + } + return results +} diff --git a/internal/store/postgres/message_send_batch_actor_test.go b/internal/store/postgres/message_send_batch_actor_test.go new file mode 100644 index 00000000..4d8d8e4b --- /dev/null +++ b/internal/store/postgres/message_send_batch_actor_test.go @@ -0,0 +1,236 @@ +package postgres + +import ( + "context" + "errors" + "testing" + + "telesrv/internal/domain" + "telesrv/internal/observability/dbtrace" + storepkg "telesrv/internal/store" +) + +func TestSelectPlainPrivateSendBatchPreservesConflictingFIFOAndCombinesDisjointScopes(t *testing.T) { + messageStore := &MessageStore{} + task := func(sender, recipient int64) *plainPrivateSendBatchTask { + return &plainPrivateSendBatchTask{ + ctx: context.Background(), store: messageStore, + req: domain.SendPrivateTextRequest{SenderUserID: sender, RecipientUserID: recipient}, + } + } + first := task(1, 2) + blockedFollower := task(2, 3) + disjoint := task(4, 5) + batch, remaining, canceled := selectPlainPrivateSendBatch( + []*plainPrivateSendBatchTask{first, blockedFollower, disjoint}, + map[plainPrivateSendScope]struct{}{}, + ) + if len(canceled) != 0 || len(batch) != 2 || batch[0] != first || batch[1] != disjoint || + len(remaining) != 1 || remaining[0] != blockedFollower { + t.Fatalf("batch=%v remaining=%v canceled=%d", batch, remaining, len(canceled)) + } + + busy := map[plainPrivateSendScope]struct{}{{store: messageStore, userID: 1}: {}} + batch, remaining, canceled = selectPlainPrivateSendBatch( + []*plainPrivateSendBatchTask{first, blockedFollower, disjoint}, busy, + ) + if len(canceled) != 0 || len(batch) != 1 || batch[0] != disjoint || + len(remaining) != 2 || remaining[0] != first || remaining[1] != blockedFollower { + t.Fatalf("busy batch=%v remaining=%v canceled=%d", batch, remaining, len(canceled)) + } +} + +func TestPlainPrivateSendBatchEligibilityRejectsLocalAllocator(t *testing.T) { + pool := testPool(t) + messages := NewMessageStore(pool, WithMessageAllocators(&perUserCounterAllocator{})) + if processPlainPrivateSendBatcher.Eligible(messages) { + t.Fatal("local allocator entered distributed private-send batch path") + } +} + +func TestExecutePlainPrivateSendBatchCommitsDisjointMessagesTogetherPostgres(t *testing.T) { + pool := testPool(t) + baseCtx := context.Background() + users := NewUserStore(pool) + suffix := randomSuffix(t) + const count = 12 + authKeyID := [8]byte{0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x80} + createdUsers := make([]int64, 0, count*2) + requests := make([]domain.SendPrivateTextRequest, 0, count) + for i := range count { + sender := createTestUser(t, baseCtx, users, "+1671"+suffix+batchTestSuffix(i, 0), "BatchSender", "") + recipient := createTestUser(t, baseCtx, users, "+1671"+suffix+batchTestSuffix(i, 1), "BatchRecipient", "") + createdUsers = append(createdUsers, sender.ID, recipient.ID) + request := domain.SendPrivateTextRequest{ + SenderUserID: sender.ID, RecipientUserID: recipient.ID, + RandomID: int64(2508251000 + i), Message: "batched private send", Date: 1800001000 + i, + IdempotencyPreflighted: true, + } + if i == 0 { + request.OriginAuthKeyID = authKeyID + request.OriginSessionID = 250825 + } + requests = append(requests, request) + } + t.Cleanup(func() { + _, _ = pool.Exec(baseCtx, "DELETE FROM users WHERE id = ANY($1::bigint[])", createdUsers) + }) + messageStore := NewMessageStore(pool, WithMessageAllocators(&perUserCounterAllocator{})) + ctx, stats := dbtrace.WithStats(baseCtx) + tasks := plainPrivateSendTestTasks(t, ctx, messageStore, requests) + results := executePlainPrivateSendBatch(tasks) + for i, result := range results { + if result.err != nil { + t.Fatalf("result %d: %v", i, result.err) + } + if result.result.Duplicate || result.result.SenderMessage.Pts != 1 || result.result.RecipientMessage.Pts != 1 { + t.Fatalf("result %d = %+v", i, result.result) + } + } + // BEGIN + ordered account lock + ordered append fence + set-based logical + // insert + set-based durable projection + COMMIT. Width does not change it. + const wantQueries = int64(6) + if snapshot := stats.Snapshot(); snapshot.Queries != wantQueries || snapshot.Errors != 0 { + t.Fatalf("query stats=%+v want queries=%d", snapshot, wantQueries) + } + var boxes, events, outbox int + if err := pool.QueryRow(baseCtx, ` +SELECT + (SELECT count(*) FROM message_boxes WHERE owner_user_id = ANY($1::bigint[])), + (SELECT count(*) FROM user_update_events WHERE user_id = ANY($1::bigint[])), + (SELECT count(*) FROM dispatch_outbox WHERE target_user_id = ANY($1::bigint[]))`, createdUsers).Scan(&boxes, &events, &outbox); err != nil { + t.Fatal(err) + } + if boxes != count*2 || events != count*2 || outbox != count*2 { + t.Fatalf("durable rows boxes/events/outbox=%d/%d/%d want=%d", boxes, events, outbox, count*2) + } + var excludeAuthKeyID, excludeSessionID int64 + if err := pool.QueryRow(baseCtx, ` +SELECT exclude_auth_key_id, exclude_session_id +FROM dispatch_outbox +WHERE target_user_id=$1`, requests[0].SenderUserID).Scan(&excludeAuthKeyID, &excludeSessionID); err != nil { + t.Fatalf("load batched sender exclusion: %v", err) + } + if excludeAuthKeyID != authKeyIDToInt64(authKeyID) || excludeSessionID != 250825 { + t.Fatalf("batched sender exclusion=%d/%d want=%d/250825", excludeAuthKeyID, excludeSessionID, authKeyIDToInt64(authKeyID)) + } +} + +func TestExecutePlainPrivateSendBatchPreservesBlockedSelfAndReplayPostgres(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + users := NewUserStore(pool) + suffix := randomSuffix(t) + createdUsers := make([]int64, 0, 5) + makeUser := func(index int) int64 { + user := createTestUser(t, ctx, users, "+1672"+suffix+batchTestSuffix(index, 0), "BatchMode", "") + createdUsers = append(createdUsers, user.ID) + return user.ID + } + normalSender, normalRecipient := makeUser(1), makeUser(2) + blockedSender, blockedRecipient := makeUser(3), makeUser(4) + selfUser := makeUser(5) + t.Cleanup(func() { + _, _ = pool.Exec(ctx, "DELETE FROM users WHERE id = ANY($1::bigint[])", createdUsers) + }) + messages := NewMessageStore(pool, WithMessageAllocators(&perUserCounterAllocator{})) + requests := []domain.SendPrivateTextRequest{ + {SenderUserID: normalSender, RecipientUserID: normalRecipient, RandomID: 2508252001, Message: "normal", Date: 1800002001, IdempotencyPreflighted: true}, + {SenderUserID: blockedSender, RecipientUserID: blockedRecipient, RandomID: 2508252002, Message: "blocked", Date: 1800002002, RecipientBlocked: true, IdempotencyPreflighted: true}, + {SenderUserID: selfUser, RecipientUserID: selfUser, RandomID: 2508252003, Message: "self", Date: 1800002003, IdempotencyPreflighted: true}, + } + results := executePlainPrivateSendBatch(plainPrivateSendTestTasks(t, ctx, messages, requests)) + for i, result := range results { + if result.err != nil || result.result.Duplicate { + t.Fatalf("first result %d = %+v error=%v", i, result.result, result.err) + } + } + if results[1].result.RecipientMessage.ID != 0 || results[1].result.RecipientEvent.Pts != 0 { + t.Fatalf("blocked recipient leaked durable projection: %+v", results[1].result) + } + if results[2].result.RecipientMessage.ID != results[2].result.SenderMessage.ID || + results[2].result.RecipientMessage.Pts != results[2].result.SenderMessage.Pts { + t.Fatalf("self projection differs sender=%+v recipient=%+v", results[2].result.SenderMessage, results[2].result.RecipientMessage) + } + replay := executePlainPrivateSendBatch(plainPrivateSendTestTasks(t, ctx, messages, requests[:1])) + if len(replay) != 1 || replay[0].err != nil || !replay[0].result.Duplicate || + replay[0].result.SenderMessage.ID != results[0].result.SenderMessage.ID || + replay[0].result.SenderMessage.Pts != results[0].result.SenderMessage.Pts { + t.Fatalf("replay=%+v first=%+v", replay, results[0]) + } +} + +func TestExecutePlainPrivateSendBatchRollsBackEveryTaskOnProjectionFailurePostgres(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + users := NewUserStore(pool) + suffix := randomSuffix(t) + createdUsers := make([]int64, 0, 4) + makeUser := func(index int) int64 { + user := createTestUser(t, ctx, users, "+1673"+suffix+batchTestSuffix(index, 0), "BatchRollback", "") + createdUsers = append(createdUsers, user.ID) + return user.ID + } + firstSender, firstRecipient := makeUser(1), makeUser(2) + badSender, badRecipient := makeUser(3), makeUser(4) + t.Cleanup(func() { + _, _ = pool.Exec(ctx, "DELETE FROM users WHERE id = ANY($1::bigint[])", createdUsers) + }) + messages := NewMessageStore(pool, WithMessageAllocators(&perUserCounterAllocator{})) + requests := []domain.SendPrivateTextRequest{ + {SenderUserID: firstSender, RecipientUserID: firstRecipient, RandomID: 2508253001, Message: "must roll back", Date: 1800003001, IdempotencyPreflighted: true}, + { + SenderUserID: badSender, RecipientUserID: badRecipient, RandomID: 2508253002, + Message: "invalid exclusion", Date: 1800003002, IdempotencyPreflighted: true, + OriginAuthKeyID: [8]byte{1}, + }, + } + results := executePlainPrivateSendBatch(plainPrivateSendTestTasks(t, ctx, messages, requests)) + if len(results) != len(requests) { + t.Fatalf("results=%d want=%d", len(results), len(requests)) + } + for i, result := range results { + if !errors.Is(result.err, errInvalidDispatchOutboxExclusionPair) { + t.Fatalf("result %d error=%v want=%v", i, result.err, errInvalidDispatchOutboxExclusionPair) + } + } + var logical, boxes, events, outbox int + if err := pool.QueryRow(ctx, ` +SELECT + (SELECT count(*) FROM private_messages WHERE sender_user_id = ANY($1::bigint[])), + (SELECT count(*) FROM message_boxes WHERE owner_user_id = ANY($1::bigint[])), + (SELECT count(*) FROM user_update_events WHERE user_id = ANY($1::bigint[])), + (SELECT count(*) FROM dispatch_outbox WHERE target_user_id = ANY($1::bigint[]))`, createdUsers). + Scan(&logical, &boxes, &events, &outbox); err != nil { + t.Fatal(err) + } + if logical != 0 || boxes != 0 || events != 0 || outbox != 0 { + t.Fatalf("partial batch commit logical/boxes/events/outbox=%d/%d/%d/%d", logical, boxes, events, outbox) + } +} + +func plainPrivateSendTestTasks( + t *testing.T, + ctx context.Context, + messages *MessageStore, + requests []domain.SendPrivateTextRequest, +) []*plainPrivateSendBatchTask { + t.Helper() + tasks := make([]*plainPrivateSendBatchTask, len(requests)) + for i, req := range requests { + fingerprint, err := storepkg.PrivateSendFingerprint(req) + if err != nil { + t.Fatal(err) + } + tasks[i] = &plainPrivateSendBatchTask{ctx: ctx, store: messages, req: req, fingerprint: fingerprint} + } + return tasks +} + +func batchTestSuffix(index, side int) string { + return string([]byte{ + byte('0' + (index/10)%10), + byte('0' + index%10), + byte('0' + side), + }) +} diff --git a/internal/store/postgres/message_send_batch_sql.go b/internal/store/postgres/message_send_batch_sql.go new file mode 100644 index 00000000..564cfd68 --- /dev/null +++ b/internal/store/postgres/message_send_batch_sql.go @@ -0,0 +1,488 @@ +package postgres + +import ( + "context" + "encoding/hex" + "encoding/json" + "fmt" + + "github.com/jackc/pgx/v5" + + "telesrv/internal/domain" + "telesrv/internal/store" +) + +type plainPrivateBatchCreated struct { + inserted bool + privateMessageID int64 + ttlPeriod int + expiresAt int +} + +type plainPrivateBatchInsertInput struct { + Ordinal int `json:"ordinal"` + SenderUserID int64 `json:"sender_user_id"` + RecipientUserID int64 `json:"recipient_user_id"` + RandomID int64 `json:"random_id"` + RequestFingerprint string `json:"request_fingerprint"` + RecipientDelivered bool `json:"recipient_delivered"` + MessageDate int `json:"message_date"` + RequestedTTLPeriod int `json:"requested_ttl_period"` + Body string `json:"body"` +} + +// createPlainPrivateMessageBatch resolves TTL and inserts every disjoint +// logical message in one statement. Missing rows are immutable random_id +// conflicts and are resolved from their receipts before projection. +func createPlainPrivateMessageBatch( + ctx context.Context, + tx pgx.Tx, + tasks []*plainPrivateSendBatchTask, +) ([]plainPrivateBatchCreated, error) { + created := make([]plainPrivateBatchCreated, len(tasks)) + input := make([]plainPrivateBatchInsertInput, len(tasks)) + for i, task := range tasks { + input[i] = plainPrivateBatchInsertInput{ + Ordinal: i, SenderUserID: task.req.SenderUserID, RecipientUserID: task.req.RecipientUserID, + RandomID: task.req.RandomID, RequestFingerprint: hex.EncodeToString(task.fingerprint), + RecipientDelivered: task.req.SenderUserID != task.req.RecipientUserID && !task.req.RecipientBlocked, + MessageDate: task.req.Date, RequestedTTLPeriod: task.req.TTLPeriod, Body: task.req.Message, + } + } + raw, err := json.Marshal(input) + if err != nil { + return nil, fmt.Errorf("marshal plain private send batch inserts: %w", err) + } + rows, err := tx.Query(ctx, ` +WITH input AS MATERIALIZED ( + SELECT * + FROM jsonb_to_recordset($1::jsonb) AS i( + ordinal int, + sender_user_id bigint, + recipient_user_id bigint, + random_id bigint, + request_fingerprint text, + recipient_delivered boolean, + message_date int, + requested_ttl_period int, + body text + ) +), resolved AS MATERIALIZED ( + SELECT + i.*, + CASE + WHEN i.requested_ttl_period <> 0 THEN i.requested_ttl_period + ELSE GREATEST(COALESCE(NULLIF(d.ttl_period, 0), u.default_history_ttl_period, 0), 0)::int + END AS ttl_period + FROM input i + JOIN users u ON u.id = i.sender_user_id + LEFT JOIN dialogs d + ON d.user_id = i.sender_user_id + AND d.peer_type = 'user' + AND d.peer_id = i.recipient_user_id +), inserted AS ( + INSERT INTO private_messages ( + sender_user_id, recipient_user_id, random_id, request_fingerprint, + recipient_delivered, message_date, ttl_period, expires_at, body + ) + SELECT + sender_user_id, recipient_user_id, random_id, decode(request_fingerprint, 'hex'), + recipient_delivered, message_date, ttl_period, + CASE WHEN ttl_period > 0 THEN message_date + ttl_period ELSE 0 END, + body + FROM resolved + ORDER BY ordinal + ON CONFLICT (sender_user_id, random_id) WHERE random_id <> 0 DO NOTHING + RETURNING id, sender_user_id, ttl_period, expires_at +) +SELECT i.ordinal, inserted.id, inserted.ttl_period, inserted.expires_at +FROM inserted +JOIN input i ON i.sender_user_id = inserted.sender_user_id +ORDER BY i.ordinal`, raw) + if err != nil { + return nil, fmt.Errorf("create plain private send batch messages: %w", err) + } + defer rows.Close() + for rows.Next() { + var ordinal int + var item plainPrivateBatchCreated + if err := rows.Scan(&ordinal, &item.privateMessageID, &item.ttlPeriod, &item.expiresAt); err != nil { + return nil, fmt.Errorf("scan plain private send batch message: %w", err) + } + if ordinal < 0 || ordinal >= len(created) || created[ordinal].inserted || item.privateMessageID <= 0 { + return nil, fmt.Errorf("create plain private send batch messages: invalid ordinal/id %d/%d", ordinal, item.privateMessageID) + } + item.inserted = true + created[ordinal] = item + } + if err := rows.Err(); err != nil { + return nil, fmt.Errorf("iterate plain private send batch messages: %w", err) + } + return created, nil +} + +type plainPrivateBatchProjectionInput struct { + Ordinal int `json:"ordinal"` + SenderUserID int64 `json:"sender_user_id"` + RecipientUserID int64 `json:"recipient_user_id"` + PrivateMessageID int64 `json:"private_message_id"` + SenderBoxID int `json:"sender_box_id"` + RecipientBoxID int `json:"recipient_box_id"` + MessageDate int `json:"message_date"` + TTLPeriod int `json:"ttl_period"` + ExpiresAt int `json:"expires_at"` + Body string `json:"body"` + SavedPeerType string `json:"saved_peer_type"` + SavedPeerID int64 `json:"saved_peer_id"` + SenderExcludeAuthKeyID int64 `json:"sender_exclude_auth_key_id"` + SenderExcludeSessionID int64 `json:"sender_exclude_session_id"` + RecipientExcludeAuthKeyID int64 `json:"recipient_exclude_auth_key_id"` + RecipientExcludeSessionID int64 `json:"recipient_exclude_session_id"` + ReceiptRecipientBoxID int `json:"receipt_recipient_box_id"` + SenderSnapshotTemplate json.RawMessage `json:"sender_snapshot_template"` + ExpectedRows int `json:"expected_rows"` +} + +func persistPlainPrivateSendProjectionBatch( + ctx context.Context, + tx pgx.Tx, + tasks []*plainPrivateSendBatchTask, + created []plainPrivateBatchCreated, + boxIDs map[int64]int, +) (map[int]plainPrivateSendProjection, error) { + input := make([]plainPrivateBatchProjectionInput, 0, len(tasks)) + templates := make(map[int]plainPrivateSendProjection, len(tasks)) + expectedTotal := 0 + for ordinal, task := range tasks { + if ordinal >= len(created) || !created[ordinal].inserted { + continue + } + req := task.req + selfMessage := req.SenderUserID == req.RecipientUserID + deliverRecipient := !selfMessage && !req.RecipientBlocked + senderBoxID := boxIDs[req.SenderUserID] + if senderBoxID <= 0 { + return nil, fmt.Errorf("allocate plain private send batch box ids: missing sender %d", req.SenderUserID) + } + recipientBoxID := 0 + if deliverRecipient { + recipientBoxID = boxIDs[req.RecipientUserID] + if recipientBoxID <= 0 { + return nil, fmt.Errorf("allocate plain private send batch box ids: missing recipient %d", req.RecipientUserID) + } + } + savedPeer := domain.Peer{} + if selfMessage { + savedPeer = domain.SavedPeerForSelfChat(req.SenderUserID, nil) + } + item := created[ordinal] + sender := domain.Message{ + ID: senderBoxID, UID: item.privateMessageID, OwnerUserID: req.SenderUserID, + Peer: domain.Peer{Type: domain.PeerTypeUser, ID: req.RecipientUserID}, + From: domain.Peer{Type: domain.PeerTypeUser, ID: req.SenderUserID}, + Date: req.Date, Out: true, Body: req.Message, Pts: 1, + TTLPeriod: item.ttlPeriod, ExpiresAt: item.expiresAt, SavedPeer: savedPeer, RandomID: req.RandomID, + } + originUserID := req.OriginUserID + if originUserID == 0 { + originUserID = req.SenderUserID + } + senderExcludeAuthKeyID, senderExcludeSessionID := int64(0), int64(0) + if originUserID == req.SenderUserID { + senderExcludeAuthKeyID = authKeyIDToInt64(req.OriginAuthKeyID) + senderExcludeSessionID = req.OriginSessionID + } + recipientExcludeAuthKeyID, recipientExcludeSessionID := int64(0), int64(0) + if deliverRecipient && originUserID == req.RecipientUserID { + recipientExcludeAuthKeyID = authKeyIDToInt64(req.OriginAuthKeyID) + recipientExcludeSessionID = req.OriginSessionID + } + if (senderExcludeAuthKeyID != 0) != (senderExcludeSessionID != 0) || + (recipientExcludeAuthKeyID != 0) != (recipientExcludeSessionID != 0) { + return nil, errInvalidDispatchOutboxExclusionPair + } + receiptRecipientBoxID := recipientBoxID + if selfMessage { + receiptRecipientBoxID = senderBoxID + } + snapshot, err := store.EncodePrivateSendSnapshot(sender) + if err != nil { + return nil, err + } + expectedRows := 1 + if deliverRecipient { + expectedRows = 2 + } + expectedTotal += expectedRows + input = append(input, plainPrivateBatchProjectionInput{ + Ordinal: ordinal, SenderUserID: req.SenderUserID, RecipientUserID: req.RecipientUserID, + PrivateMessageID: item.privateMessageID, SenderBoxID: senderBoxID, RecipientBoxID: recipientBoxID, + MessageDate: req.Date, TTLPeriod: item.ttlPeriod, ExpiresAt: item.expiresAt, Body: req.Message, + SavedPeerType: string(savedPeer.Type), SavedPeerID: savedPeer.ID, + SenderExcludeAuthKeyID: senderExcludeAuthKeyID, SenderExcludeSessionID: senderExcludeSessionID, + RecipientExcludeAuthKeyID: recipientExcludeAuthKeyID, RecipientExcludeSessionID: recipientExcludeSessionID, + ReceiptRecipientBoxID: receiptRecipientBoxID, SenderSnapshotTemplate: snapshot, ExpectedRows: expectedRows, + }) + templates[ordinal] = plainPrivateSendProjection{Sender: sender} + } + if len(input) == 0 { + return templates, nil + } + raw, err := json.Marshal(input) + if err != nil { + return nil, fmt.Errorf("marshal plain private send batch projections: %w", err) + } + rows, err := tx.Query(ctx, plainPrivateSendBatchProjectionSQL, raw) + if err != nil { + return nil, fmt.Errorf("persist plain private send batch projection: %w", err) + } + defer rows.Close() + seen := 0 + for rows.Next() { + var ordinal, senderPts, recipientPts int + var boxRows, dialogRows, eventRows, dispatchRows, receiptRows int + if err := rows.Scan( + &ordinal, &senderPts, &recipientPts, + &boxRows, &dialogRows, &eventRows, &dispatchRows, &receiptRows, + ); err != nil { + return nil, fmt.Errorf("scan plain private send batch projection: %w", err) + } + if boxRows != expectedTotal || dialogRows != expectedTotal || eventRows != expectedTotal || + dispatchRows != expectedTotal || receiptRows != len(input) { + return nil, fmt.Errorf( + "persist plain private send batch projection: incomplete rows boxes=%d dialogs=%d events=%d dispatch=%d receipts=%d want=%d/%d", + boxRows, dialogRows, eventRows, dispatchRows, receiptRows, expectedTotal, len(input), + ) + } + projection, ok := templates[ordinal] + if !ok || senderPts <= 0 { + return nil, fmt.Errorf("persist plain private send batch projection: invalid ordinal/pts %d/%d", ordinal, senderPts) + } + projection.Sender.Pts = senderPts + req := tasks[ordinal].req + if req.SenderUserID == req.RecipientUserID { + projection.Recipient = projection.Sender + } else if !req.RecipientBlocked { + if recipientPts <= 0 { + return nil, fmt.Errorf("persist plain private send batch projection: missing recipient pts for ordinal %d", ordinal) + } + item := created[ordinal] + projection.Recipient = domain.Message{ + ID: boxIDs[req.RecipientUserID], UID: item.privateMessageID, OwnerUserID: req.RecipientUserID, + Peer: domain.Peer{Type: domain.PeerTypeUser, ID: req.SenderUserID}, + From: domain.Peer{Type: domain.PeerTypeUser, ID: req.SenderUserID}, + Date: req.Date, Body: req.Message, Pts: recipientPts, + TTLPeriod: item.ttlPeriod, ExpiresAt: item.expiresAt, RandomID: req.RandomID, + } + } + templates[ordinal] = projection + seen++ + } + if err := rows.Err(); err != nil { + return nil, fmt.Errorf("iterate plain private send batch projections: %w", err) + } + if seen != len(input) { + return nil, fmt.Errorf("persist plain private send batch projection: returned %d rows want %d", seen, len(input)) + } + return templates, nil +} + +const plainPrivateSendBatchProjectionSQL = ` +WITH input AS MATERIALIZED ( + SELECT * + FROM jsonb_to_recordset($1::jsonb) AS i( + ordinal int, + sender_user_id bigint, + recipient_user_id bigint, + private_message_id bigint, + sender_box_id int, + recipient_box_id int, + message_date int, + ttl_period int, + expires_at int, + body text, + saved_peer_type text, + saved_peer_id bigint, + sender_exclude_auth_key_id bigint, + sender_exclude_session_id bigint, + recipient_exclude_auth_key_id bigint, + recipient_exclude_session_id bigint, + receipt_recipient_box_id int, + sender_snapshot_template jsonb, + expected_rows int + ) +), box_seed AS MATERIALIZED ( + SELECT + ordinal, sender_user_id AS owner_user_id, sender_box_id AS box_id, + recipient_user_id AS peer_id, true AS outgoing, + saved_peer_type, saved_peer_id, + sender_exclude_auth_key_id AS exclude_auth_key_id, + sender_exclude_session_id AS exclude_session_id, + private_message_id, sender_user_id AS message_sender_id, + message_date, ttl_period, expires_at, body + FROM input + UNION ALL + SELECT + ordinal, recipient_user_id, recipient_box_id, + sender_user_id, false, + ''::text, 0::bigint, + recipient_exclude_auth_key_id, + recipient_exclude_session_id, + private_message_id, sender_user_id, + message_date, ttl_period, expires_at, body + FROM input + WHERE recipient_box_id > 0 +), watermark_rows AS ( + INSERT INTO user_update_watermarks (user_id, contiguous_pts) + SELECT owner_user_id, 1 + FROM box_seed + GROUP BY owner_user_id + ORDER BY owner_user_id + ON CONFLICT (user_id) DO UPDATE + SET contiguous_pts = user_update_watermarks.contiguous_pts + 1, + updated_at = now() + RETURNING user_id, contiguous_pts +), box_input AS MATERIALIZED ( + SELECT seed.*, watermark_rows.contiguous_pts AS pts + FROM box_seed seed + JOIN watermark_rows ON watermark_rows.user_id = seed.owner_user_id +), boxes AS ( + INSERT INTO message_boxes ( + owner_user_id, box_id, private_message_id, message_sender_id, + peer_type, peer_id, from_user_id, message_date, ttl_period, + expires_at, outgoing, body, pts, saved_peer_type, saved_peer_id + ) + SELECT + owner_user_id, box_id, private_message_id, message_sender_id, + 'user', peer_id, message_sender_id, message_date, ttl_period, + expires_at, outgoing, body, pts, saved_peer_type, saved_peer_id + FROM box_input + WHERE box_id > 0 AND pts > 0 + ORDER BY owner_user_id + RETURNING owner_user_id, box_id, private_message_id, peer_id, outgoing, pts +), dialog_rows AS ( + INSERT INTO dialogs ( + user_id, peer_type, peer_id, top_message_id, top_message_date, unread_count + ) + SELECT + b.owner_user_id, 'user', b.peer_id, b.box_id, i.message_date, + CASE WHEN b.outgoing THEN 0 ELSE 1 END + FROM boxes b + JOIN input i ON i.private_message_id = b.private_message_id + ORDER BY b.owner_user_id + ON CONFLICT (user_id, peer_type, peer_id) DO UPDATE SET + top_message_id = CASE + WHEN EXCLUDED.unread_count = 0 THEN EXCLUDED.top_message_id + ELSE GREATEST(dialogs.top_message_id, EXCLUDED.top_message_id) + END, + top_message_date = CASE + WHEN EXCLUDED.unread_count = 0 THEN EXCLUDED.top_message_date + WHEN EXCLUDED.top_message_id >= dialogs.top_message_id THEN EXCLUDED.top_message_date + ELSE dialogs.top_message_date + END, + unread_count = CASE + WHEN EXCLUDED.unread_count = 0 THEN dialogs.unread_count + ELSE ( + SELECT COUNT(*)::int + FROM message_boxes existing + WHERE existing.owner_user_id = dialogs.user_id + AND existing.peer_type = dialogs.peer_type + AND existing.peer_id = dialogs.peer_id + AND NOT existing.deleted + AND NOT existing.outgoing + AND existing.box_id > dialogs.read_inbox_max_id + AND existing.box_id <= GREATEST(dialogs.top_message_id, EXCLUDED.top_message_id) + ) + CASE + WHEN EXCLUDED.top_message_id > dialogs.read_inbox_max_id THEN 1 + ELSE 0 + END + END, + unread_mark = CASE + WHEN EXCLUDED.unread_count = 0 THEN false + ELSE dialogs.unread_mark + END, + updated_at = now() + RETURNING user_id +), event_rows AS ( + INSERT INTO user_update_events ( + user_id, pts, pts_count, date, event_type, + message_box_id, peer_type, peer_id + ) + SELECT + b.owner_user_id, b.pts, 1, i.message_date, 'new_message', + b.box_id, 'user', b.peer_id + FROM boxes b + JOIN input i ON i.private_message_id = b.private_message_id + ORDER BY b.owner_user_id + RETURNING user_id, pts +), dispatch_rows AS ( + INSERT INTO dispatch_outbox ( + target_user_id, pts, event_type, exclude_auth_key_id, exclude_session_id + ) + SELECT + e.user_id, e.pts, 'new_message', i.exclude_auth_key_id, i.exclude_session_id + FROM event_rows e + JOIN box_input i ON i.owner_user_id = e.user_id AND i.pts = e.pts + ORDER BY e.user_id + ON CONFLICT DO NOTHING + RETURNING target_user_id +), expected AS MATERIALIZED ( + SELECT SUM(expected_rows)::int AS rows, COUNT(*)::int AS receipts + FROM input +), receipt_rows AS ( + UPDATE private_messages pm + SET sender_box_id = i.sender_box_id, + sender_pts = sender_box.pts, + recipient_box_id = i.receipt_recipient_box_id, + recipient_pts = CASE + WHEN i.receipt_recipient_box_id = 0 THEN 0 + WHEN i.sender_user_id = i.recipient_user_id THEN sender_box.pts + ELSE recipient_box.pts + END, + sender_snapshot = jsonb_set( + i.sender_snapshot_template, + ARRAY['message', 'Pts'], + to_jsonb(sender_box.pts), + false + ) + FROM input i + JOIN boxes sender_box + ON sender_box.private_message_id = i.private_message_id + AND sender_box.owner_user_id = i.sender_user_id + LEFT JOIN boxes recipient_box + ON recipient_box.private_message_id = i.private_message_id + AND recipient_box.owner_user_id = i.recipient_user_id + AND i.recipient_box_id > 0 + WHERE pm.sender_user_id = i.sender_user_id + AND pm.id = i.private_message_id + AND pm.sender_box_id = 0 + AND pm.sender_pts = 0 + AND pm.sender_snapshot = '{}'::jsonb + AND (SELECT COUNT(*) FROM boxes) = (SELECT rows FROM expected) + RETURNING i.ordinal +), counts AS MATERIALIZED ( + SELECT + (SELECT COUNT(*) FROM boxes)::int AS boxes, + (SELECT COUNT(*) FROM dialog_rows)::int AS dialogs, + (SELECT COUNT(*) FROM event_rows)::int AS events, + (SELECT COUNT(*) FROM dispatch_rows)::int AS dispatches, + (SELECT COUNT(*) FROM receipt_rows)::int AS receipts +) +SELECT + i.ordinal, + sender_box.pts::int, + CASE + WHEN i.sender_user_id = i.recipient_user_id THEN sender_box.pts + ELSE COALESCE(recipient_box.pts, 0) + END::int, + counts.boxes, counts.dialogs, counts.events, counts.dispatches, counts.receipts +FROM input i +JOIN boxes sender_box + ON sender_box.private_message_id = i.private_message_id + AND sender_box.owner_user_id = i.sender_user_id +LEFT JOIN boxes recipient_box + ON recipient_box.private_message_id = i.private_message_id + AND recipient_box.owner_user_id = i.recipient_user_id + AND i.recipient_box_id > 0 +CROSS JOIN counts +ORDER BY i.ordinal` diff --git a/internal/store/postgres/message_send_hotpath.go b/internal/store/postgres/message_send_hotpath.go new file mode 100644 index 00000000..f722cc95 --- /dev/null +++ b/internal/store/postgres/message_send_hotpath.go @@ -0,0 +1,349 @@ +package postgres + +import ( + "context" + "fmt" + + "github.com/jackc/pgx/v5" + + "telesrv/internal/domain" + "telesrv/internal/store" + "telesrv/internal/store/postgres/sqlcgen" +) + +// plainPrivateSendHotPath is a semantic classifier. Requests with additional +// durable projections keep using the complete aggregate transaction. +func plainPrivateSendHotPath(req domain.SendPrivateTextRequest, hooks privateSendTxHooks) bool { + return hooks.before == nil && hooks.projectMedia == nil && hooks.afterAllocate == nil && hooks.after == nil && + len(req.Entities) == 0 && req.Media.IsZero() && req.ReplyMarkup.IsZero() && req.RichMessage.IsZero() && + req.ReplyTo == nil && req.Forward == nil && !req.Silent && !req.NoForwards && + req.ViaBotID == 0 && req.GroupedID == 0 && req.Effect == 0 && req.BusinessAutomationKind == "" +} + +type plainPrivateSendProjection struct { + Sender domain.Message + Recipient domain.Message +} + +// createPlainPrivateMessage folds the dialog/default TTL lookup into the +// logical-message insert. A random-id conflict returns pgx.ErrNoRows and is +// resolved through the immutable replay receipt by the caller. +func createPlainPrivateMessage( + ctx context.Context, + tx pgx.Tx, + req domain.SendPrivateTextRequest, + requestFingerprint []byte, + deliverRecipient bool, +) (sqlcgen.CreatePrivateMessageRow, error) { + row := tx.QueryRow(ctx, ` +WITH effective_ttl AS MATERIALIZED ( + SELECT CASE + WHEN $7::int <> 0 THEN $7::int + ELSE GREATEST(COALESCE(( + SELECT COALESCE(NULLIF(d.ttl_period, 0), u.default_history_ttl_period, 0)::int + FROM users u + LEFT JOIN dialogs d + ON d.user_id = u.id + AND d.peer_type = 'user' + AND d.peer_id = $2::bigint + WHERE u.id = $1::bigint + ), 0), 0) + END AS ttl_period +), inserted AS ( + INSERT INTO private_messages ( + sender_user_id, recipient_user_id, random_id, request_fingerprint, + recipient_delivered, message_date, ttl_period, expires_at, body + ) + SELECT + $1::bigint, $2::bigint, $3::bigint, $4::bytea, + $5::boolean, $6::int, ttl_period, + CASE WHEN ttl_period > 0 THEN ($6::int + ttl_period)::int ELSE 0 END, + $8::text + FROM effective_ttl + ON CONFLICT (sender_user_id, random_id) WHERE random_id <> 0 DO NOTHING + RETURNING + id, sender_user_id, recipient_user_id, random_id, message_date, + ttl_period, expires_at, edit_date, body, entities::text AS entities_json +) +SELECT + id, sender_user_id, recipient_user_id, random_id, message_date, + ttl_period, expires_at, edit_date, body, entities_json +FROM inserted`, + req.SenderUserID, + req.RecipientUserID, + req.RandomID, + requestFingerprint, + deliverRecipient, + req.Date, + req.TTLPeriod, + req.Message, + ) + var result sqlcgen.CreatePrivateMessageRow + err := row.Scan( + &result.ID, + &result.SenderUserID, + &result.RecipientUserID, + &result.RandomID, + &result.MessageDate, + &result.TtlPeriod, + &result.ExpiresAt, + &result.EditDate, + &result.Body, + &result.EntitiesJson, + ) + return result, err +} + +// persistPlainPrivateSendProjection reserves account PTS and writes both box +// projections, dialogs, update events, durable dispatch rows and the immutable +// replay receipt in one statement. The caller owns the transaction and holds +// the ordered user advisory locks. +func persistPlainPrivateSendProjection( + ctx context.Context, + tx pgx.Tx, + req domain.SendPrivateTextRequest, + privateMessageID int64, + senderBoxID, recipientBoxID int, + ttlPeriod, expiresAt int, +) (plainPrivateSendProjection, error) { + selfMessage := req.SenderUserID == req.RecipientUserID + deliverRecipient := !selfMessage && !req.RecipientBlocked + savedPeer := domain.Peer{} + if selfMessage { + savedPeer = domain.SavedPeerForSelfChat(req.SenderUserID, nil) + } + senderTemplate := domain.Message{ + ID: senderBoxID, + UID: privateMessageID, + OwnerUserID: req.SenderUserID, + Peer: domain.Peer{Type: domain.PeerTypeUser, ID: req.RecipientUserID}, + From: domain.Peer{Type: domain.PeerTypeUser, ID: req.SenderUserID}, + Date: req.Date, + Out: true, + Body: req.Message, + Pts: 1, + TTLPeriod: ttlPeriod, + ExpiresAt: expiresAt, + SavedPeer: savedPeer, + RandomID: req.RandomID, + } + originUserID := req.OriginUserID + if originUserID == 0 { + originUserID = req.SenderUserID + } + senderExcludeAuthKeyID, senderExcludeSessionID := int64(0), int64(0) + if originUserID == req.SenderUserID { + senderExcludeAuthKeyID = authKeyIDToInt64(req.OriginAuthKeyID) + senderExcludeSessionID = req.OriginSessionID + } + recipientExcludeAuthKeyID, recipientExcludeSessionID := int64(0), int64(0) + if deliverRecipient && originUserID == req.RecipientUserID { + recipientExcludeAuthKeyID = authKeyIDToInt64(req.OriginAuthKeyID) + recipientExcludeSessionID = req.OriginSessionID + } + if (senderExcludeAuthKeyID != 0) != (senderExcludeSessionID != 0) || + (recipientExcludeAuthKeyID != 0) != (recipientExcludeSessionID != 0) { + return plainPrivateSendProjection{}, errInvalidDispatchOutboxExclusionPair + } + + receiptRecipientBoxID := recipientBoxID + if selfMessage { + receiptRecipientBoxID = senderBoxID + } + senderSnapshotTemplate, err := store.EncodePrivateSendSnapshot(senderTemplate) + if err != nil { + return plainPrivateSendProjection{}, err + } + expectedRows := 1 + if deliverRecipient { + expectedRows = 2 + } + + var boxRows, dialogRows, eventRows, dispatchRows, receiptRows, senderPts, recipientPts int + err = tx.QueryRow(ctx, ` +WITH box_seed ( + owner_user_id, box_id, peer_id, outgoing, + saved_peer_type, saved_peer_id, exclude_auth_key_id, exclude_session_id +) AS MATERIALIZED ( + VALUES + ($1::bigint, $2::int, $3::bigint, true, + $4::text, $5::bigint, $6::bigint, $7::bigint), + ($3::bigint, $8::int, $1::bigint, false, + ''::text, 0::bigint, $9::bigint, $10::bigint) +), watermark_rows AS ( + INSERT INTO user_update_watermarks (user_id, contiguous_pts) + SELECT owner_user_id, 1 + FROM box_seed + WHERE box_id > 0 + GROUP BY owner_user_id + ORDER BY owner_user_id + ON CONFLICT (user_id) DO UPDATE + SET contiguous_pts = user_update_watermarks.contiguous_pts + 1, + updated_at = now() + RETURNING user_id, contiguous_pts +), box_input AS MATERIALIZED ( + SELECT seed.*, watermark_rows.contiguous_pts AS pts + FROM box_seed seed + JOIN watermark_rows ON watermark_rows.user_id = seed.owner_user_id + WHERE seed.box_id > 0 +), boxes AS ( + INSERT INTO message_boxes ( + owner_user_id, box_id, private_message_id, message_sender_id, + peer_type, peer_id, from_user_id, message_date, ttl_period, + expires_at, outgoing, body, pts, saved_peer_type, saved_peer_id + ) + SELECT + i.owner_user_id, i.box_id, $11::bigint, $1::bigint, + 'user', i.peer_id, $1::bigint, $12::int, $13::int, + $14::int, i.outgoing, $15::text, i.pts, + i.saved_peer_type, i.saved_peer_id + FROM box_input i + WHERE i.box_id > 0 AND i.pts > 0 + RETURNING owner_user_id, box_id, peer_id, outgoing, pts +), dialog_rows AS ( + INSERT INTO dialogs ( + user_id, peer_type, peer_id, top_message_id, top_message_date, unread_count + ) + SELECT + b.owner_user_id, 'user', b.peer_id, b.box_id, $12::int, + CASE WHEN b.outgoing THEN 0 ELSE 1 END + FROM boxes b + ON CONFLICT (user_id, peer_type, peer_id) DO UPDATE SET + top_message_id = CASE + WHEN EXCLUDED.unread_count = 0 THEN EXCLUDED.top_message_id + ELSE GREATEST(dialogs.top_message_id, EXCLUDED.top_message_id) + END, + top_message_date = CASE + WHEN EXCLUDED.unread_count = 0 THEN EXCLUDED.top_message_date + WHEN EXCLUDED.top_message_id >= dialogs.top_message_id THEN EXCLUDED.top_message_date + ELSE dialogs.top_message_date + END, + unread_count = CASE + WHEN EXCLUDED.unread_count = 0 THEN dialogs.unread_count + ELSE ( + SELECT COUNT(*)::int + FROM message_boxes m + WHERE m.owner_user_id = dialogs.user_id + AND m.peer_type = dialogs.peer_type + AND m.peer_id = dialogs.peer_id + AND NOT m.deleted + AND NOT m.outgoing + AND m.box_id > dialogs.read_inbox_max_id + AND m.box_id <= GREATEST(dialogs.top_message_id, EXCLUDED.top_message_id) + ) + CASE + -- Data-modifying CTE effects are not visible through a base-table + -- rescan in the same statement; account explicitly for this box. + WHEN EXCLUDED.top_message_id > dialogs.read_inbox_max_id THEN 1 + ELSE 0 + END + END, + unread_mark = CASE + WHEN EXCLUDED.unread_count = 0 THEN false + ELSE dialogs.unread_mark + END, + updated_at = now() + RETURNING user_id +), event_rows AS ( + INSERT INTO user_update_events ( + user_id, pts, pts_count, date, event_type, + message_box_id, peer_type, peer_id + ) + SELECT + b.owner_user_id, b.pts, 1, $12::int, 'new_message', + b.box_id, 'user', b.peer_id + FROM boxes b + RETURNING user_id, pts +), dispatch_rows AS ( + INSERT INTO dispatch_outbox ( + target_user_id, pts, event_type, exclude_auth_key_id, exclude_session_id + ) + SELECT + e.user_id, e.pts, 'new_message', i.exclude_auth_key_id, i.exclude_session_id + FROM event_rows e + JOIN box_input i ON i.owner_user_id = e.user_id AND i.pts = e.pts + ON CONFLICT DO NOTHING + RETURNING target_user_id +), receipt_rows AS ( + UPDATE private_messages + SET sender_box_id = $2::int, + sender_pts = (SELECT pts FROM boxes WHERE outgoing), + recipient_box_id = $16::int, + recipient_pts = CASE + WHEN $16::int = 0 THEN 0 + WHEN $3::bigint = $1::bigint THEN (SELECT pts FROM boxes WHERE outgoing) + ELSE (SELECT pts FROM boxes WHERE NOT outgoing) + END, + sender_snapshot = jsonb_set( + $17::jsonb, + ARRAY['message', 'Pts'], + to_jsonb((SELECT pts FROM boxes WHERE outgoing)), + false + ) + WHERE sender_user_id = $1::bigint + AND id = $11::bigint + AND sender_box_id = 0 + AND sender_pts = 0 + AND sender_snapshot = '{}'::jsonb + AND (SELECT COUNT(*) FROM boxes) = $18::int + RETURNING id +) +SELECT + (SELECT COUNT(*) FROM boxes)::int, + (SELECT COUNT(*) FROM dialog_rows)::int, + (SELECT COUNT(*) FROM event_rows)::int, + (SELECT COUNT(*) FROM dispatch_rows)::int, + (SELECT COUNT(*) FROM receipt_rows)::int, + (SELECT pts FROM boxes WHERE outgoing)::int, + COALESCE((SELECT pts FROM boxes WHERE NOT outgoing), 0)::int`, + req.SenderUserID, + senderBoxID, + req.RecipientUserID, + string(savedPeer.Type), + savedPeer.ID, + senderExcludeAuthKeyID, + senderExcludeSessionID, + recipientBoxID, + recipientExcludeAuthKeyID, + recipientExcludeSessionID, + privateMessageID, + req.Date, + ttlPeriod, + expiresAt, + req.Message, + receiptRecipientBoxID, + senderSnapshotTemplate, + expectedRows, + ).Scan(&boxRows, &dialogRows, &eventRows, &dispatchRows, &receiptRows, &senderPts, &recipientPts) + if err != nil { + return plainPrivateSendProjection{}, fmt.Errorf("persist plain private send projection: %w", err) + } + if boxRows != expectedRows || dialogRows != expectedRows || eventRows != expectedRows || + dispatchRows != expectedRows || receiptRows != 1 || senderPts <= 0 || (deliverRecipient && recipientPts <= 0) { + return plainPrivateSendProjection{}, fmt.Errorf( + "persist plain private send projection: incomplete rows boxes=%d dialogs=%d events=%d dispatch=%d receipt=%d pts=%d/%d want=%d/%d/%d/%d/1", + boxRows, dialogRows, eventRows, dispatchRows, receiptRows, senderPts, recipientPts, + expectedRows, expectedRows, expectedRows, expectedRows, + ) + } + sender := senderTemplate + sender.Pts = senderPts + recipient := domain.Message{} + if selfMessage { + recipient = sender + } else if deliverRecipient { + recipient = domain.Message{ + ID: recipientBoxID, + UID: privateMessageID, + OwnerUserID: req.RecipientUserID, + Peer: domain.Peer{Type: domain.PeerTypeUser, ID: req.SenderUserID}, + From: domain.Peer{Type: domain.PeerTypeUser, ID: req.SenderUserID}, + Date: req.Date, + Body: req.Message, + Pts: recipientPts, + TTLPeriod: ttlPeriod, + ExpiresAt: expiresAt, + RandomID: req.RandomID, + } + } + return plainPrivateSendProjection{Sender: sender, Recipient: recipient}, nil +} diff --git a/internal/store/postgres/message_send_hotpath_test.go b/internal/store/postgres/message_send_hotpath_test.go new file mode 100644 index 00000000..de2b82ff --- /dev/null +++ b/internal/store/postgres/message_send_hotpath_test.go @@ -0,0 +1,111 @@ +package postgres + +import ( + "context" + "testing" + + "github.com/jackc/pgx/v5" + + "telesrv/internal/domain" + "telesrv/internal/observability/dbtrace" +) + +func TestPlainPrivateSendHotPathClassifier(t *testing.T) { + base := domain.SendPrivateTextRequest{Message: "plain"} + if !plainPrivateSendHotPath(base, privateSendTxHooks{}) { + t.Fatal("plain text request did not select hot path") + } + tests := []struct { + name string + edit func(*domain.SendPrivateTextRequest, *privateSendTxHooks) + }{ + {"entity", func(req *domain.SendPrivateTextRequest, _ *privateSendTxHooks) { + req.Entities = []domain.MessageEntity{{Type: domain.MessageEntityBold, Length: 1}} + }}, + {"reply", func(req *domain.SendPrivateTextRequest, _ *privateSendTxHooks) { + req.ReplyTo = &domain.MessageReply{MessageID: 1} + }}, + {"silent", func(req *domain.SendPrivateTextRequest, _ *privateSendTxHooks) { req.Silent = true }}, + {"automation", func(req *domain.SendPrivateTextRequest, _ *privateSendTxHooks) { + req.BusinessAutomationKind = domain.BusinessAutomationGreeting + }}, + {"hook", func(_ *domain.SendPrivateTextRequest, hooks *privateSendTxHooks) { + hooks.after = func(context.Context, pgx.Tx, domain.SendPrivateTextResult) error { return nil } + }}, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + req := base + hooks := privateSendTxHooks{} + tt.edit(&req, &hooks) + if plainPrivateSendHotPath(req, hooks) { + t.Fatal("request with additional semantics selected hot path") + } + }) + } +} + +func TestPlainPrivateSendHotPathDurableFactsAndQueryCount(t *testing.T) { + pool := testPool(t) + baseCtx := context.Background() + users := NewUserStore(pool) + suffix := randomSuffix(t) + sender := createTestUser(t, baseCtx, users, "+1667"+suffix+"01", "HotSender", "") + recipient := createTestUser(t, baseCtx, users, "+1667"+suffix+"02", "HotRecipient", "") + t.Cleanup(func() { + _, _ = pool.Exec(baseCtx, "DELETE FROM users WHERE id = ANY($1::bigint[])", []int64{sender.ID, recipient.ID}) + }) + + messages := NewMessageStore(pool, WithMessageAllocators(&perUserCounterAllocator{})) + ctx, stats := dbtrace.WithStats(baseCtx) + authKeyID := [8]byte{0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x80} + result, err := messages.SendPrivateText(ctx, domain.SendPrivateTextRequest{ + SenderUserID: sender.ID, + RecipientUserID: recipient.ID, + RandomID: 250825001, + Message: "plain hot path", + Date: 1800000001, + IdempotencyPreflighted: true, + OriginAuthKeyID: authKeyID, + OriginSessionID: 250825, + }) + if err != nil { + t.Fatalf("SendPrivateText: %v", err) + } + if snapshot := stats.Snapshot(); snapshot.Queries != 5 || snapshot.Errors != 0 { + t.Fatalf("query stats = %+v, want BEGIN + lock + logical + projection + COMMIT", snapshot) + } + if result.SenderMessage.ID != 1 || result.RecipientMessage.ID != 1 || + result.SenderMessage.Pts != 1 || result.RecipientMessage.Pts != 1 { + t.Fatalf("result = %+v, want first box/PTS for both owners", result) + } + + for _, fact := range []struct { + name string + query string + want int + }{ + {"boxes", `SELECT count(*) FROM message_boxes WHERE private_message_id=$1`, 2}, + {"events", `SELECT count(*) FROM user_update_events e JOIN message_boxes m ON (m.owner_user_id,m.box_id)=(e.user_id,e.message_box_id) WHERE m.private_message_id=$1`, 2}, + {"outbox", `SELECT count(*) FROM dispatch_outbox d JOIN user_update_events e ON (e.user_id,e.pts)=(d.target_user_id,d.pts) JOIN message_boxes m ON (m.owner_user_id,m.box_id)=(e.user_id,e.message_box_id) WHERE m.private_message_id=$1`, 2}, + } { + var got int + if err := pool.QueryRow(baseCtx, fact.query, result.SenderMessage.UID).Scan(&got); err != nil { + t.Fatalf("count %s: %v", fact.name, err) + } + if got != fact.want { + t.Fatalf("%s rows = %d, want %d", fact.name, got, fact.want) + } + } + + var excludeAuthKeyID, excludeSessionID int64 + if err := pool.QueryRow(baseCtx, ` +SELECT exclude_auth_key_id, exclude_session_id +FROM dispatch_outbox +WHERE target_user_id=$1`, sender.ID).Scan(&excludeAuthKeyID, &excludeSessionID); err != nil { + t.Fatalf("load sender exclusion: %v", err) + } + if excludeAuthKeyID != authKeyIDToInt64(authKeyID) || excludeSessionID != 250825 { + t.Fatalf("sender exclusion = %d/%d, want exact auth key/session", excludeAuthKeyID, excludeSessionID) + } +} diff --git a/internal/store/postgres/message_send_idempotency_integration_test.go b/internal/store/postgres/message_send_idempotency_integration_test.go index 77abd4a9..0fb12a66 100644 --- a/internal/store/postgres/message_send_idempotency_integration_test.go +++ b/internal/store/postgres/message_send_idempotency_integration_test.go @@ -304,12 +304,18 @@ func TestMessageStorePrivateRandomIDConflictFallbackUsesTransactionConnection(t boxIDs := &perUserCounterAllocator{} db := &beginHookDB{Pool: pool} db.before = func(ctx context.Context) error { - _, err := NewMessageStore(pool, WithMessageAllocators(boxIDs)).SendPrivateText(ctx, req) + remote := NewMessageStore(pool, WithMessageAllocators(boxIDs)) + // A separate actor represents another server process. Cross-process + // uniqueness must still resolve through the transaction connection. + remote.privateSendLanes = newUserLaneActor() + _, err := remote.SendPrivateText(ctx, req) return err } deadlineCtx, cancel := context.WithTimeout(context.Background(), 3*time.Second) defer cancel() - got, err := NewMessageStore(db, WithMessageAllocators(boxIDs)).SendPrivateText(deadlineCtx, req) + local := NewMessageStore(db, WithMessageAllocators(boxIDs)) + local.privateSendLanes = newUserLaneActor() + got, err := local.SendPrivateText(deadlineCtx, req) if err != nil { t.Fatalf("conflict fallback with MaxConns=1: %v", err) } diff --git a/internal/store/postgres/message_store.go b/internal/store/postgres/message_store.go index e98f051f..af0bc2e8 100644 --- a/internal/store/postgres/message_store.go +++ b/internal/store/postgres/message_store.go @@ -12,10 +12,11 @@ import ( // MessageStore 用 PostgreSQL 实现 store.MessageStore。 type MessageStore struct { - db sqlcgen.DBTX - q *sqlcgen.Queries - boxIDs store.BoxIDAllocator - log *zap.Logger + db sqlcgen.DBTX + q *sqlcgen.Queries + boxIDs store.BoxIDAllocator + privateSendLanes *userLaneActor + log *zap.Logger } type txBeginner interface { @@ -41,7 +42,7 @@ func WithMessageLogger(log *zap.Logger) MessageStoreOption { // NewMessageStore 基于 pgx 连接池（或事务）创建 MessageStore。 func NewMessageStore(db sqlcgen.DBTX, opts ...MessageStoreOption) *MessageStore { - s := &MessageStore{db: db, q: sqlcgen.New(db)} + s := &MessageStore{db: db, q: sqlcgen.New(db), privateSendLanes: defaultPrivateSendLaneActor} for _, opt := range opts { opt(s) } diff --git a/internal/store/postgres/message_store_testkit_test.go b/internal/store/postgres/message_store_testkit_test.go index 5bd75343..a8bff567 100644 --- a/internal/store/postgres/message_store_testkit_test.go +++ b/internal/store/postgres/message_store_testkit_test.go @@ -14,6 +14,14 @@ func (a fixedBoxIDAllocator) NextBoxID(context.Context, int64) (int, error) { return a.next, nil } +func (a fixedBoxIDAllocator) NextBoxIDs(_ context.Context, userIDs []int64) (map[int64]int, error) { + out := make(map[int64]int, len(userIDs)) + for _, userID := range userIDs { + out[userID] = a.next + } + return out, nil +} + func (a fixedBoxIDAllocator) CurrentBoxID(context.Context, int64) (int, error) { return a.next, nil } @@ -27,6 +35,16 @@ func (a *perUserCounterAllocator) NextBoxID(_ context.Context, userID int64) (in return a.next(userID), nil } +func (a *perUserCounterAllocator) NextBoxIDs(_ context.Context, userIDs []int64) (map[int64]int, error) { + out := make(map[int64]int, len(userIDs)) + for _, userID := range userIDs { + if _, ok := out[userID]; !ok { + out[userID] = a.next(userID) + } + } + return out, nil +} + func (a *perUserCounterAllocator) CurrentBoxID(_ context.Context, userID int64) (int, error) { return a.current(userID), nil } diff --git a/internal/store/postgres/official_username_claim_integration_test.go b/internal/store/postgres/official_username_claim_integration_test.go new file mode 100644 index 00000000..da9e5dbc --- /dev/null +++ b/internal/store/postgres/official_username_claim_integration_test.go @@ -0,0 +1,86 @@ +package postgres + +import ( + "context" + "errors" + "fmt" + "testing" + "time" + + "telesrv/internal/domain" +) + +func TestClaimOfficialUsernameDisplacesOrdinaryUserAtomically(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + users := NewUserStore(pool) + + officialBefore, found, err := users.ByID(ctx, domain.OfficialSystemUserID) + if err != nil || !found { + t.Fatalf("load official user: found=%v err=%v", found, err) + } + suffix := time.Now().UnixNano() + target := fmt.Sprintf("brand_%d", suffix) + holder := createTestUser(t, ctx, users, fmt.Sprintf("+18881%d", suffix), "Brand", "Holder") + t.Cleanup(func() { + _, _ = users.ClaimOfficialUsername(ctx, officialBefore.Username) + _, _ = pool.Exec(ctx, `DELETE FROM users WHERE id = $1`, holder.ID) + }) + if _, err := users.UpdateUsername(ctx, holder.ID, target); err != nil { + t.Fatalf("occupy target username: %v", err) + } + + claim, err := users.ClaimOfficialUsername(ctx, target) + if err != nil { + t.Fatalf("claim official username: %v", err) + } + if !claim.Changed || claim.DisplacedUserID != holder.ID || claim.Official.ID != domain.OfficialSystemUserID || claim.Official.Username != target { + t.Fatalf("claim = %+v, want changed claim displacing %d", claim, holder.ID) + } + displaced, found, err := users.ByID(ctx, holder.ID) + if err != nil || !found || displaced.Username != "" { + t.Fatalf("displaced user = %+v found=%v err=%v, want empty username", displaced, found, err) + } + resolved, found, err := users.ByUsername(ctx, target) + if err != nil || !found || resolved.ID != domain.OfficialSystemUserID { + t.Fatalf("resolve claimed username = %+v found=%v err=%v", resolved, found, err) + } + owner, found, err := getPeerUsernameOwner(ctx, pool, target, false) + if err != nil || !found || !owner.matches(peerUsernameTypeUser, domain.OfficialSystemUserID) || !owner.editable || owner.collectible { + t.Fatalf("registry owner = %+v found=%v err=%v", owner, found, err) + } + + again, err := users.ClaimOfficialUsername(ctx, target) + if err != nil { + t.Fatalf("repeat official username claim: %v", err) + } + if again.Changed || again.DisplacedUserID != 0 || again.Official.Username != target { + t.Fatalf("repeat claim = %+v, want idempotent no-op", again) + } +} + +func TestClaimOfficialUsernameDoesNotDisplaceBot(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + users := NewUserStore(pool) + suffix := time.Now().UnixNano() + target := fmt.Sprintf("botbrand_%d", suffix) + holder := createTestUser(t, ctx, users, fmt.Sprintf("+18882%d", suffix), "Protected", "Bot") + t.Cleanup(func() { + _, _ = pool.Exec(ctx, `DELETE FROM users WHERE id = $1`, holder.ID) + }) + if _, err := users.UpdateUsername(ctx, holder.ID, target); err != nil { + t.Fatalf("occupy target username: %v", err) + } + if _, err := pool.Exec(ctx, `UPDATE users SET is_bot = true WHERE id = $1`, holder.ID); err != nil { + t.Fatalf("mark protected holder as bot: %v", err) + } + + if _, err := users.ClaimOfficialUsername(ctx, target); !errors.Is(err, domain.ErrUsernameOccupied) { + t.Fatalf("claim bot username error = %v, want ErrUsernameOccupied", err) + } + protected, found, err := users.ByID(ctx, holder.ID) + if err != nil || !found || protected.Username != target { + t.Fatalf("protected holder = %+v found=%v err=%v, want username unchanged", protected, found, err) + } +} diff --git a/internal/store/postgres/peer_identity_listener_test.go b/internal/store/postgres/peer_identity_listener_test.go new file mode 100644 index 00000000..d20b5c98 --- /dev/null +++ b/internal/store/postgres/peer_identity_listener_test.go @@ -0,0 +1,53 @@ +package postgres + +import ( + "testing" + + "telesrv/internal/domain" +) + +type fakePeerIdentityReadModelCache struct { + peers []domain.Peer + flushes int +} + +func (f *fakePeerIdentityReadModelCache) InvalidatePeerIdentityReadModel(peer domain.Peer) { + f.peers = append(f.peers, peer) +} + +func (f *fakePeerIdentityReadModelCache) FlushPeerIdentityReadModel() { + f.flushes++ +} + +func TestReadModelListenerSeparatesPeerIdentityInvalidationDomain(t *testing.T) { + projections := &fakeRPCProjectionReadModelCache{} + identities := &fakePeerIdentityReadModelCache{} + listener := NewReadModelChangeListener("", ReadModelCacheSet{ + RPCProjections: projections, + PeerIdentities: identities, + }, nil) + + listener.handlePayload(`{"model":"user_base","peer_type":"user","peer_id":71}`) + listener.handlePayload(`{"model":"channel_base","peer_type":"channel","peer_id":72}`) + if len(identities.peers) != 0 { + t.Fatalf("base projection events invalidated peer identity: %+v", identities.peers) + } + if len(projections.users) != 1 || projections.users[0] != 71 || len(projections.channels) != 1 || projections.channels[0] != 72 { + t.Fatalf("base projection invalidations users=%v channels=%v", projections.users, projections.channels) + } + + listener.handlePayload(`{"model":"peer_identity","peer_type":"user","peer_id":71}`) + listener.handlePayload(`{"model":"peer_identity","peer_type":"channel","peer_id":72}`) + want := []domain.Peer{{Type: domain.PeerTypeUser, ID: 71}, {Type: domain.PeerTypeChannel, ID: 72}} + if len(identities.peers) != len(want) || identities.peers[0] != want[0] || identities.peers[1] != want[1] { + t.Fatalf("peer identity invalidations=%+v want=%+v", identities.peers, want) + } + if len(projections.users) != 2 || len(projections.channels) != 2 { + t.Fatalf("identity event did not invalidate enclosing projections users=%v channels=%v", projections.users, projections.channels) + } + + listener.flush("test") + if identities.flushes != 1 || projections.flushes != 1 { + t.Fatalf("flushes identities=%d projections=%d", identities.flushes, projections.flushes) + } +} diff --git a/internal/store/postgres/peer_identity_read_model_integration_test.go b/internal/store/postgres/peer_identity_read_model_integration_test.go new file mode 100644 index 00000000..03a2ee19 --- /dev/null +++ b/internal/store/postgres/peer_identity_read_model_integration_test.go @@ -0,0 +1,127 @@ +package postgres + +import ( + "context" + "testing" + "time" + + "telesrv/internal/domain" +) + +func peerIdentityHash(t *testing.T, peer domain.Peer) int64 { + t.Helper() + pool := testPool(t) + var hash int64 + if err := pool.QueryRow(context.Background(), ` +SELECT hash +FROM read_model_versions +WHERE model = 'peer_identity' + AND owner_user_id = 0 + AND peer_type = $1 + AND peer_id = $2`, string(peer.Type), peer.ID).Scan(&hash); err != nil { + t.Fatalf("read peer identity hash for %+v: %v", peer, err) + } + return hash +} + +func TestPeerIdentityReadModelTokenCreatedWithPeer(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + suffix := randomSuffix(t) + user, err := NewUserStore(pool).Create(ctx, domain.User{ + AccessHash: 991, Phone: "+1998" + suffix + "01", FirstName: "IdentitySeed", + }) + if err != nil { + t.Fatal(err) + } + var channelID int64 + t.Cleanup(func() { + if channelID != 0 { + _, _ = pool.Exec(ctx, "DELETE FROM channels WHERE id = $1", channelID) + } + _, _ = pool.Exec(ctx, "DELETE FROM users WHERE id = $1", user.ID) + }) + if hash := peerIdentityHash(t, domain.Peer{Type: domain.PeerTypeUser, ID: user.ID}); hash == 0 { + t.Fatal("new user peer_identity hash is zero") + } + created, err := NewChannelStore(pool).CreateChannel(ctx, domain.CreateChannelRequest{ + CreatorUserID: user.ID, Title: "Identity Seed " + suffix, Megagroup: true, Date: 1701000300, + }) + if err != nil { + t.Fatal(err) + } + channelID = created.Channel.ID + if hash := peerIdentityHash(t, domain.Peer{Type: domain.PeerTypeChannel, ID: channelID}); hash == 0 { + t.Fatal("new channel peer_identity hash is zero") + } +} + +func TestPeerIdentityReadModelBumpsForUsernameRegistryMutation(t *testing.T) { + pool := testPool(t) + seed := time.Now().UnixNano() & 0x3fffffff + peer := collectibleTestUser(t, pool, 6_100_000_000+seed, "") + ctx := context.Background() + _, _ = pool.Exec(ctx, `DELETE FROM read_model_versions +WHERE model='peer_identity' AND owner_user_id=0 AND peer_type=$1 AND peer_id=$2`, peer.Type, peer.ID) + + setEditableUsername(t, pool, peer, "identityone") + first := peerIdentityHash(t, peer) + if _, err := pool.Exec(ctx, `UPDATE peer_usernames +SET active=false, updated_at=now() +WHERE peer_type=$1 AND peer_id=$2`, peer.Type, peer.ID); err != nil { + t.Fatalf("update peer username: %v", err) + } + second := peerIdentityHash(t, peer) + if first == second { + t.Fatalf("peer identity hash did not change on username update: %d", first) + } + if _, err := pool.Exec(ctx, `DELETE FROM peer_usernames WHERE peer_type=$1 AND peer_id=$2`, peer.Type, peer.ID); err != nil { + t.Fatalf("delete peer username: %v", err) + } + third := peerIdentityHash(t, peer) + if second == third { + t.Fatalf("peer identity hash did not change on username delete: %d", second) + } +} + +func TestPeerIdentityReadModelBumpsForCustomVerificationMutation(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + verifierID := botVerificationTestUser(t, pool) + targetID := botVerificationTestUser(t, pool) + peer := domain.Peer{Type: domain.PeerTypeUser, ID: targetID} + store := NewBotVerificationStore(pool) + icon := botVerificationTestIcon(t, pool, store, "peer identity", verifierID) + botVerificationTestVerifier(t, store, verifierID, icon.DocumentID) + _, _ = pool.Exec(ctx, `DELETE FROM read_model_versions +WHERE model='peer_identity' AND owner_user_id=0 AND peer_type=$1 AND peer_id=$2`, peer.Type, peer.ID) + + if _, _, err := store.GrantCustomVerification(ctx, domain.CustomVerification{ + VerifierBotID: verifierID, + Peer: peer, + IconDocumentID: icon.DocumentID, + Description: "first", + }); err != nil { + t.Fatalf("grant custom verification: %v", err) + } + first := peerIdentityHash(t, peer) + if _, _, err := store.GrantCustomVerification(ctx, domain.CustomVerification{ + VerifierBotID: verifierID, + Peer: peer, + IconDocumentID: icon.DocumentID, + Description: "second", + }); err != nil { + t.Fatalf("update custom verification: %v", err) + } + second := peerIdentityHash(t, peer) + if first == second { + t.Fatalf("peer identity hash did not change on verification update: %d", first) + } + if changed, err := store.RevokeCustomVerification(ctx, verifierID, peer); err != nil || !changed { + t.Fatalf("revoke custom verification: changed=%v err=%v", changed, err) + } + third := peerIdentityHash(t, peer) + if second == third { + t.Fatalf("peer identity hash did not change on verification delete: %d", second) + } +} diff --git a/internal/store/postgres/peer_username.go b/internal/store/postgres/peer_username.go index 5a00a838..aa21e73d 100644 --- a/internal/store/postgres/peer_username.go +++ b/internal/store/postgres/peer_username.go @@ -32,6 +32,10 @@ type peerUsernameOwner struct { // active mirrors the registry flag. An inactive name stays occupied for // uniqueness purposes but must not resolve to its holder. active bool + // editable distinguishes the ordinary username slot from any future + // non-collectible reserved rows. Only an ordinary editable user slot may be + // displaced by the official product-username claim. + editable bool } func (o peerUsernameOwner) matches(peerType string, peerID int64) bool { @@ -46,12 +50,12 @@ func getPeerUsernameOwner(ctx context.Context, db sqlcgen.DBTX, usernameLower st if usernameLower == "" { return peerUsernameOwner{}, false, nil } - query := `SELECT peer_type, peer_id, collectible_id IS NOT NULL, active FROM peer_usernames WHERE username_lower = $1` + query := `SELECT peer_type, peer_id, collectible_id IS NOT NULL, active, editable FROM peer_usernames WHERE username_lower = $1` if forUpdate { query += ` FOR UPDATE` } var owner peerUsernameOwner - err := db.QueryRow(ctx, query, usernameLower).Scan(&owner.peerType, &owner.peerID, &owner.collectible, &owner.active) + err := db.QueryRow(ctx, query, usernameLower).Scan(&owner.peerType, &owner.peerID, &owner.collectible, &owner.active, &owner.editable) if err != nil { if errors.Is(err, pgx.ErrNoRows) { return peerUsernameOwner{}, false, nil diff --git a/internal/store/postgres/phone_change.go b/internal/store/postgres/phone_change.go index 7553510e..e447246f 100644 --- a/internal/store/postgres/phone_change.go +++ b/internal/store/postgres/phone_change.go @@ -4,7 +4,6 @@ import ( "context" "errors" "fmt" - "time" "github.com/jackc/pgx/v5" @@ -12,8 +11,8 @@ import ( "telesrv/internal/store/postgres/sqlcgen" ) -// PhoneChangeStore 把 users.phone、账号 pts、durable event 与 dispatch outbox -// 作为一个事务提交，避免任何一边单独可见。 +// PhoneChangeStore 在事务内更新 users.phone。updateUserPhone 没有 +// pts/pts_count，因此这里不得分配账号 PTS 或写 durable event/outbox。 type PhoneChangeStore struct { db sqlcgen.DBTX q *sqlcgen.Queries @@ -23,8 +22,6 @@ func NewPhoneChangeStore(db sqlcgen.DBTX) *PhoneChangeStore { return &PhoneChangeStore{db: db, q: sqlcgen.New(db)} } -func (*PhoneChangeStore) UsesReliableDispatch() bool { return true } - func (s *PhoneChangeStore) ChangePhone(ctx context.Context, req domain.PhoneChangeRequest) (domain.PhoneChangeResult, error) { if s == nil || req.UserID == 0 || !domain.ValidPhone(req.Phone) { return domain.PhoneChangeResult{}, domain.ErrPhoneNumberInvalid @@ -79,33 +76,6 @@ func (s *PhoneChangeStore) ChangePhone(ctx context.Context, req domain.PhoneChan } return domain.PhoneChangeResult{}, fmt.Errorf("update user phone: %w", err) } - date := req.Date - if date == 0 { - date = int(time.Now().Unix()) - } - event := domain.UpdateEvent{ - UserID: req.UserID, - Type: domain.UpdateEventUserPhone, - Date: date, - Phone: req.Phone, - PtsCount: 1, - } - event.Pts, err = reserveUserPts(ctx, tx, req.UserID, event.PtsCount) - if err != nil { - return domain.PhoneChangeResult{}, fmt.Errorf("reserve phone change pts: %w", err) - } - if err := appendUserUpdateEvent(ctx, tx, qtx, req.UserID, event); err != nil { - return domain.PhoneChangeResult{}, fmt.Errorf("append phone change event: %w", err) - } - if err := enqueueDispatch(ctx, qtx, sqlcgen.EnqueueDispatchParams{ - TargetUserID: req.UserID, - Pts: int32(event.Pts), - EventType: string(event.Type), - ExcludeAuthKeyID: authKeyIDToInt64(req.ExcludeAuthKeyID), - ExcludeSessionID: req.ExcludeSessionID, - }); err != nil { - return domain.PhoneChangeResult{}, fmt.Errorf("enqueue phone change dispatch: %w", err) - } if err := tx.Commit(ctx); err != nil { if isUniqueConstraint(err, "users_phone_unique_idx") { return domain.PhoneChangeResult{}, domain.ErrPhoneNumberOccupied @@ -113,5 +83,5 @@ func (s *PhoneChangeStore) ChangePhone(ctx context.Context, req domain.PhoneChan return domain.PhoneChangeResult{}, fmt.Errorf("commit phone change: %w", err) } committed = true - return domain.PhoneChangeResult{User: userFromModel(row), Event: event, Changed: true}, nil + return domain.PhoneChangeResult{User: userFromModel(row), Changed: true}, nil } diff --git a/internal/store/postgres/phone_change_integration_test.go b/internal/store/postgres/phone_change_integration_test.go index a2d9219e..ee4f4917 100644 --- a/internal/store/postgres/phone_change_integration_test.go +++ b/internal/store/postgres/phone_change_integration_test.go @@ -10,7 +10,7 @@ import ( "telesrv/internal/domain" ) -func TestPhoneChangeStoreAtomicUserEventOutboxPostgres(t *testing.T) { +func TestPhoneChangeStoreUpdatesUserWithoutPTSPostgres(t *testing.T) { pool := testPool(t) ctx := context.Background() users := NewUserStore(pool) @@ -43,7 +43,7 @@ func TestPhoneChangeStoreAtomicUserEventOutboxPostgres(t *testing.T) { if err != nil { t.Fatalf("change phone: %v", err) } - if !result.Changed || result.User.Phone != newPhone || result.Event.Pts != 1 || result.Event.Phone != newPhone { + if !result.Changed || result.User.Phone != newPhone { t.Fatalf("result = %+v", result) } loaded, found, err := users.ByID(ctx, u1.ID) @@ -51,28 +51,27 @@ func TestPhoneChangeStoreAtomicUserEventOutboxPostgres(t *testing.T) { t.Fatalf("loaded user = %+v found=%v err=%v", loaded, found, err) } storedEvents, err := events.ListAfter(ctx, u1.ID, 0, 10) - if err != nil || len(storedEvents) != 1 || storedEvents[0].Type != domain.UpdateEventUserPhone || storedEvents[0].Phone != newPhone { + if err != nil || len(storedEvents) != 0 { t.Fatalf("stored events = %+v err=%v", storedEvents, err) } var outboxCount int - var excludedAuth, excludedSession int64 - if err := pool.QueryRow(ctx, `SELECT count(*), max(exclude_auth_key_id), max(exclude_session_id) FROM dispatch_outbox WHERE target_user_id = $1 AND pts = $2`, u1.ID, result.Event.Pts).Scan(&outboxCount, &excludedAuth, &excludedSession); err != nil { + if err := pool.QueryRow(ctx, `SELECT count(*) FROM dispatch_outbox WHERE target_user_id = $1`, u1.ID).Scan(&outboxCount); err != nil { t.Fatalf("query outbox: %v", err) } - if outboxCount != 1 || excludedAuth != authKeyIDToInt64(authKeyID) || excludedSession != 77 { - t.Fatalf("outbox count/auth/session = %d/%d/%d", outboxCount, excludedAuth, excludedSession) + if outboxCount != 0 { + t.Fatalf("outbox count = %d, want 0", outboxCount) } - // 同号重试是幂等读，不得重复推进 pts 或重复入 outbox。 + // 同号重试是幂等读，不得产生 PTS/event/outbox。 retry, err := changes.ChangePhone(ctx, domain.PhoneChangeRequest{UserID: u1.ID, Phone: newPhone, Date: 1700000002}) - if err != nil || retry.Changed || retry.Event.Pts != 0 || retry.User.Phone != newPhone { + if err != nil || retry.Changed || retry.User.Phone != newPhone { t.Fatalf("idempotent retry = %+v err=%v", retry, err) } if pts, err := events.MaxContiguousPts(ctx, u1.ID); err != nil || pts != 1 { t.Fatalf("pts after retry = %d err=%v", pts, err) } - // 冲突更新整体回滚：号码和 pts/event 都不变。 + // 冲突更新整体回滚：号码不变，也不产生 PTS/event。 if _, err := changes.ChangePhone(ctx, domain.PhoneChangeRequest{UserID: u2.ID, Phone: newPhone}); !errors.Is(err, domain.ErrPhoneNumberOccupied) { t.Fatalf("occupied change err = %v", err) } diff --git a/internal/store/postgres/queries/dialog.sql b/internal/store/postgres/queries/dialog.sql index 5510d79b..fa39af80 100644 --- a/internal/store/postgres/queries/dialog.sql +++ b/internal/store/postgres/queries/dialog.sql @@ -1014,6 +1014,19 @@ WHERE user_id = $1 ORDER BY date DESC, peer_type ASC, peer_id DESC, top_message_id DESC LIMIT sqlc.arg(limit_count); +-- name: ListDialogDraftsByPeers :many +SELECT d.draft::text AS draft_json +FROM dialog_drafts d +WHERE d.user_id = sqlc.arg(user_id) + AND d.top_message_id = 0 + AND EXISTS ( + SELECT 1 + FROM unnest(sqlc.arg(peer_types)::text[]) WITH ORDINALITY AS requested_type(peer_type, ord) + JOIN unnest(sqlc.arg(peer_ids)::bigint[]) WITH ORDINALITY AS requested_id(peer_id, ord) USING (ord) + WHERE requested_type.peer_type = d.peer_type + AND requested_id.peer_id = d.peer_id + ); + -- name: ClearDialogDrafts :many WITH doomed AS ( SELECT d.user_id, d.peer_type, d.peer_id, d.top_message_id diff --git a/internal/store/postgres/queries/message.sql b/internal/store/postgres/queries/message.sql index c29a8029..d17165c1 100644 --- a/internal/store/postgres/queries/message.sql +++ b/internal/store/postgres/queries/message.sql @@ -562,6 +562,18 @@ base AS NOT MATERIALIZED ( ) ) ) + AND ( + NOT sqlc.arg(phone_calls_only)::boolean + OR m.media #>> '{service_action,kind}' = 'phone_call' + ) + AND ( + NOT sqlc.arg(missed_phone_calls_only)::boolean + OR ( + NOT m.outgoing + AND m.media #>> '{service_action,kind}' = 'phone_call' + AND m.media #>> '{service_action,call,reason}' = 'missed' + ) + ) AND ( sqlc.arg(saved_peer_type)::text = '' OR (m.saved_peer_type = sqlc.arg(saved_peer_type)::text AND m.saved_peer_id = sqlc.arg(saved_peer_id)::bigint) @@ -840,6 +852,18 @@ WHERE m.owner_user_id = sqlc.arg(owner_user_id)::bigint ) ) ) + AND ( + NOT sqlc.arg(phone_calls_only)::boolean + OR m.media #>> '{service_action,kind}' = 'phone_call' + ) + AND ( + NOT sqlc.arg(missed_phone_calls_only)::boolean + OR ( + NOT m.outgoing + AND m.media #>> '{service_action,kind}' = 'phone_call' + AND m.media #>> '{service_action,call,reason}' = 'missed' + ) + ) AND ( sqlc.arg(saved_peer_type)::text = '' OR (m.saved_peer_type = sqlc.arg(saved_peer_type)::text AND m.saved_peer_id = sqlc.arg(saved_peer_id)::bigint) @@ -899,6 +923,18 @@ WHERE m.owner_user_id = sqlc.arg(owner_user_id)::bigint ) ) ) + AND ( + NOT sqlc.arg(phone_calls_only)::boolean + OR m.media #>> '{service_action,kind}' = 'phone_call' + ) + AND ( + NOT sqlc.arg(missed_phone_calls_only)::boolean + OR ( + NOT m.outgoing + AND m.media #>> '{service_action,kind}' = 'phone_call' + AND m.media #>> '{service_action,call,reason}' = 'missed' + ) + ) AND ( sqlc.arg(saved_peer_type)::text = '' OR (m.saved_peer_type = sqlc.arg(saved_peer_type)::text AND m.saved_peer_id = sqlc.arg(saved_peer_id)::bigint) diff --git a/internal/store/postgres/queries/user_update_event.sql b/internal/store/postgres/queries/user_update_event.sql index d3232eb2..1df6a636 100644 --- a/internal/store/postgres/queries/user_update_event.sql +++ b/internal/store/postgres/queries/user_update_event.sql @@ -121,6 +121,7 @@ SELECT COALESCE(m.effect, 0)::bigint AS effect, COALESCE(m.reply_markup::text, '{}')::text AS reply_markup_json, COALESCE(m.rich_message::text, '{}')::text AS rich_message_json, + COALESCE(m.deleted, false)::boolean AS message_deleted, COALESCE(peer_u.id, 0)::bigint AS peer_user_id, COALESCE(peer_u.access_hash, 0)::bigint AS peer_access_hash, COALESCE(peer_u.phone, '')::text AS peer_phone, @@ -395,6 +396,7 @@ SELECT COALESCE(m.effect, 0)::bigint AS effect, COALESCE(m.reply_markup::text, '{}')::text AS reply_markup_json, COALESCE(m.rich_message::text, '{}')::text AS rich_message_json, + COALESCE(m.deleted, false)::boolean AS message_deleted, COALESCE(peer_u.id, 0)::bigint AS peer_user_id, COALESCE(peer_u.access_hash, 0)::bigint AS peer_access_hash, COALESCE(peer_u.phone, '')::text AS peer_phone, @@ -495,6 +497,7 @@ WITH doomed AS MATERIALIZED ( FROM dispatch_outbox_user_heads h WHERE h.status = 'failed' AND h.updated_at < now() - make_interval(secs => sqlc.arg(older_than_seconds)::int) + AND h.target_user_id = ANY(sqlc.arg(target_user_ids)::bigint[]) ORDER BY h.updated_at ASC, h.target_user_id ASC, h.head_id ASC LIMIT sqlc.arg(limit_count) FOR UPDATE OF h SKIP LOCKED diff --git a/internal/store/postgres/read_model_listener.go b/internal/store/postgres/read_model_listener.go index 22988109..0516c39d 100644 --- a/internal/store/postgres/read_model_listener.go +++ b/internal/store/postgres/read_model_listener.go @@ -19,24 +19,34 @@ const privacyReadModelWarmTimeout = 5 * time.Second // ReadModelCacheSet 是 read_model_versions 通知可失效的进程内投影缓存集合。 // 后续新增 read model 时，把缓存接到这里即可复用同一条 LISTEN 连接。 type ReadModelCacheSet struct { - ReadModelVersions store.ReadModelVersionCache - ChannelRows *ChannelRowCache - ChannelMembers *ChannelMemberCache - ChannelDialogs *ChannelDialogCache - ChannelBoosts *ChannelBoostCache - Contacts ContactReadModelCache - Dialogs DialogReadModelCache - Privacy PrivacyReadModelCache - ProfilePhotos ProfilePhotoReadModelCache - Stories StoryReadModelCache - ChannelFullBots ChannelFullBotReadModelCache - ChannelBotMembers ChannelBotMemberReadModelCache - ChannelMediaCounts ChannelMediaCountReadModelCache - PrivateMediaCounts PrivateMediaCountReadModelCache - RPCProjections RPCProjectionReadModelCache - BaseUsers BaseUserCache - BotProfiles BotProfileReadModelCache - AccountSettings AccountSettingsReadModelCache + ReadModelVersions store.ReadModelVersionCache + ChannelRows *ChannelRowCache + ChannelTopMessages *ChannelTopMessageCache + CommunityCatalog *CommunityCatalogCache + ChannelMembers *ChannelMemberCache + ChannelDialogs *ChannelDialogCache + ChannelDifferences *ChannelDifferenceBaseCache + ChannelBoosts *ChannelBoostCache + Contacts ContactReadModelCache + Dialogs DialogReadModelCache + Privacy PrivacyReadModelCache + ProfilePhotos ProfilePhotoReadModelCache + Stories StoryReadModelCache + ChannelFullBots ChannelFullBotReadModelCache + ChannelBotMembers ChannelBotMemberReadModelCache + ChannelMediaCounts ChannelMediaCountReadModelCache + PrivateMediaCounts PrivateMediaCountReadModelCache + RPCProjections RPCProjectionReadModelCache + PeerIdentities PeerIdentityReadModelCache + BaseUsers BaseUserCache + BotProfiles BotProfileReadModelCache + AccountSettings AccountSettingsReadModelCache + UserProjectionFacts UserProjectionFactReadModelCache +} + +type UserProjectionFactReadModelCache interface { + InvalidateAccountFreezeFact(userID int64) + FlushUserProjectionFactReadModel() } type AccountSettingsReadModelCache interface { @@ -48,8 +58,9 @@ type AccountSettingsReadModelWarmer interface { WarmAccountSettingsReadModel(context.Context, int64) error } -// BaseUserCache 是跨进程共享的 user:base 缓存(Redis)。user_base read-model 事件必须删除 -// 对应 user 键，否则 RPC 投影失效后会从陈旧的 user:base 重建(失效被未失效的源自我抵消)。 +// BaseUserCache 是跨进程共享的 user:base 缓存(Redis)。user_base/user_deleted +// read-model 事件必须删除对应 user 键，否则 RPC 投影失效后会从陈旧的 +// user:base 重建(失效被未失效的源自我抵消)。 // 不参与重连 flush：Redis 是跨实例共享的，整库清空是错的，漏掉的通知靠其自身 TTL 兜底。 type BaseUserCache interface { Delete(ctx context.Context, ids []int64) error @@ -73,6 +84,14 @@ type DialogReadModelCache interface { FlushReadModelCache() } +type DialogOwnerReadModelCache interface { + InvalidateDialogOwner(ownerUserID int64) +} + +type ChannelDialogListReadModelCache interface { + InvalidateDialogListsForChannel(channelID int64) +} + // ContactReadModelCaches fans out invalidation to multiple contact read-model caches. type ContactReadModelCaches []ContactReadModelCache @@ -154,6 +173,11 @@ type RPCProjectionReadModelCache interface { FlushRPCProjectionReadModel() } +type PeerIdentityReadModelCache interface { + InvalidatePeerIdentityReadModel(domain.Peer) + FlushPeerIdentityReadModel() +} + type readModelChangePayload struct { Model string `json:"model"` OwnerUserID int64 `json:"owner_user_id"` @@ -230,8 +254,11 @@ func (l *ReadModelChangeListener) listenAndConsume(ctx context.Context) error { func (l *ReadModelChangeListener) empty() bool { return l.caches.ReadModelVersions == nil && l.caches.ChannelRows == nil && + l.caches.ChannelTopMessages == nil && + l.caches.CommunityCatalog == nil && l.caches.ChannelMembers == nil && l.caches.ChannelDialogs == nil && + l.caches.ChannelDifferences == nil && l.caches.ChannelBoosts == nil && l.caches.Contacts == nil && l.caches.Dialogs == nil && @@ -243,9 +270,11 @@ func (l *ReadModelChangeListener) empty() bool { l.caches.ChannelMediaCounts == nil && l.caches.PrivateMediaCounts == nil && l.caches.RPCProjections == nil && + l.caches.PeerIdentities == nil && l.caches.BaseUsers == nil && l.caches.BotProfiles == nil && - l.caches.AccountSettings == nil + l.caches.AccountSettings == nil && + l.caches.UserProjectionFacts == nil } func (l *ReadModelChangeListener) flush(reasons ...string) { @@ -262,6 +291,14 @@ func (l *ReadModelChangeListener) flush(reasons ...string) { l.caches.ChannelRows.flush() flushed = append(flushed, "channel_rows") } + if l.caches.ChannelTopMessages != nil { + l.caches.ChannelTopMessages.flush() + flushed = append(flushed, "channel_top_messages") + } + if l.caches.CommunityCatalog != nil { + l.caches.CommunityCatalog.flush() + flushed = append(flushed, "community_catalog") + } if l.caches.ChannelMembers != nil { l.caches.ChannelMembers.flush() flushed = append(flushed, "channel_members") @@ -270,6 +307,10 @@ func (l *ReadModelChangeListener) flush(reasons ...string) { l.caches.ChannelDialogs.flush() flushed = append(flushed, "channel_dialogs") } + if l.caches.ChannelDifferences != nil { + l.caches.ChannelDifferences.flush() + flushed = append(flushed, "channel_differences") + } if l.caches.ChannelBoosts != nil { l.caches.ChannelBoosts.flush() flushed = append(flushed, "channel_boosts") @@ -314,6 +355,10 @@ func (l *ReadModelChangeListener) flush(reasons ...string) { l.caches.RPCProjections.FlushRPCProjectionReadModel() flushed = append(flushed, "rpc_projections") } + if l.caches.PeerIdentities != nil { + l.caches.PeerIdentities.FlushPeerIdentityReadModel() + flushed = append(flushed, "peer_identities") + } if l.caches.BotProfiles != nil { l.caches.BotProfiles.FlushBotProfileReadModel() flushed = append(flushed, "bot_profiles") @@ -322,6 +367,10 @@ func (l *ReadModelChangeListener) flush(reasons ...string) { l.caches.AccountSettings.FlushAccountSettingsReadModel() flushed = append(flushed, "account_settings") } + if l.caches.UserProjectionFacts != nil { + l.caches.UserProjectionFacts.FlushUserProjectionFactReadModel() + flushed = append(flushed, "user_projection_facts") + } // 注意：BaseUsers(Redis) 刻意不在重连时 flush——它是跨实例共享缓存，整库清空会误伤 // 其它实例；漏掉的通知由其 5min TTL 兜底。 l.log.Info("read model caches flushed", @@ -350,6 +399,10 @@ func (l *ReadModelChangeListener) handlePayload(payload string) { } } switch evt.Model { + case "community_catalog": + if l.caches.CommunityCatalog != nil { + l.caches.CommunityCatalog.invalidate() + } case "account_settings": if evt.OwnerUserID != 0 && l.caches.AccountSettings != nil { l.caches.AccountSettings.InvalidateAccountSettingsReadModel(evt.OwnerUserID) @@ -363,6 +416,31 @@ func (l *ReadModelChangeListener) handlePayload(payload string) { } } } + case "user_deleted": + if evt.PeerType == "user" && evt.PeerID != 0 { + // Logical account deletion changes the target User for every viewer but + // deliberately keeps contacts, dialogs and memberships intact. A coarse + // projection flush is bounded (the first event empties the caches; a batch + // of later events is O(1)) and avoids four full-map scans per deleted user. + if l.caches.RPCProjections != nil { + l.caches.RPCProjections.FlushRPCProjectionReadModel() + } + if l.caches.BaseUsers != nil { + if err := l.caches.BaseUsers.Delete(context.Background(), []int64{evt.PeerID}); err != nil { + l.log.Warn("invalidate base user cache on user_deleted event", + zap.Int64("user_id", evt.PeerID), zap.Error(err)) + } + } + // The deleted base user is no longer projected, but exact eviction keeps + // negative/positive durable overlay entries from occupying the bounded + // caches until unrelated LRU pressure removes them. + if l.caches.UserProjectionFacts != nil { + l.caches.UserProjectionFacts.InvalidateAccountFreezeFact(evt.PeerID) + } + if l.caches.PeerIdentities != nil { + l.caches.PeerIdentities.InvalidatePeerIdentityReadModel(domain.Peer{Type: domain.PeerTypeUser, ID: evt.PeerID}) + } + } case "user_base": if evt.PeerType == "user" && evt.PeerID != 0 { if l.caches.RPCProjections != nil { @@ -386,6 +464,9 @@ func (l *ReadModelChangeListener) handlePayload(payload string) { } case "user_visibility": if evt.PeerType == "user" && evt.PeerID != 0 { + if l.caches.UserProjectionFacts != nil { + l.caches.UserProjectionFacts.InvalidateAccountFreezeFact(evt.PeerID) + } if l.caches.RPCProjections != nil { l.caches.RPCProjections.InvalidateRPCProjectionReadModelForUser(evt.PeerID) } @@ -393,6 +474,21 @@ func (l *ReadModelChangeListener) handlePayload(payload string) { l.caches.Stories.InvalidateStoryReadModelPeer(domain.Peer{Type: domain.PeerTypeUser, ID: evt.PeerID}) } } + case "peer_identity": + if evt.PeerID != 0 { + if peerType, ok := readModelPeerType(evt.PeerType); ok && l.caches.PeerIdentities != nil { + l.caches.PeerIdentities.InvalidatePeerIdentityReadModel(domain.Peer{Type: peerType, ID: evt.PeerID}) + } + if l.caches.RPCProjections == nil { + break + } + switch evt.PeerType { + case "user": + l.caches.RPCProjections.InvalidateRPCProjectionReadModelForUser(evt.PeerID) + case "channel": + l.caches.RPCProjections.InvalidateRPCProjectionReadModelForChannel(evt.PeerID) + } + } case "bot_full": // bot 资料(name/about/description/commands/menu_button)变更经 bot_info_version // bump 触发(迁移 0013)。channelFullBotInfoCache 按 (viewer,channel) 键、无法按 botID @@ -413,11 +509,16 @@ func (l *ReadModelChangeListener) handlePayload(payload string) { l.caches.RPCProjections.InvalidateRPCProjectionReadModelForViewer(evt.OwnerUserID) } case "story_peer": - // stories / story_hidden_peers 写(0135 触发器)→ 按 owner peer 失效该 peer 的 + // stories / story_hidden_peers 写(基础 trigger + 20260901000015 sparse read-model trigger) + // → 按 owner peer 失效该 peer 的 // 故事投影(ring/hidden/置顶可用性/置顶分页),实现跨实例失效。 if peerType, ok := readModelPeerType(evt.PeerType); ok && evt.PeerID != 0 && l.caches.Stories != nil { l.caches.Stories.InvalidateStoryReadModelPeer(domain.Peer{Type: peerType, ID: evt.PeerID}) } + case "story_hidden_list": + if evt.OwnerUserID != 0 && evt.PeerType == "user" && evt.PeerID == evt.OwnerUserID && l.caches.Stories != nil { + l.caches.Stories.InvalidateStoryReadModelViewers(evt.OwnerUserID) + } case "privacy_rules": if evt.OwnerUserID != 0 && l.caches.Privacy != nil { l.caches.Privacy.InvalidateOwners(evt.OwnerUserID) @@ -451,6 +552,12 @@ func (l *ReadModelChangeListener) handlePayload(payload string) { l.caches.RPCProjections.InvalidateRPCProjectionReadModelForPeer(evt.OwnerUserID, peer) } } + case "dialog_owner": + if evt.OwnerUserID != 0 { + if cache, ok := l.caches.Dialogs.(DialogOwnerReadModelCache); ok { + cache.InvalidateDialogOwner(evt.OwnerUserID) + } + } case "profile_photo": if peerType, ok := readModelPeerType(evt.PeerType); ok && evt.PeerID != 0 && l.caches.ProfilePhotos != nil { l.caches.ProfilePhotos.InvalidateOwner(peerType, evt.PeerID) @@ -464,15 +571,24 @@ func (l *ReadModelChangeListener) handlePayload(payload string) { } case "channel_base": if evt.PeerType == "channel" && evt.PeerID != 0 { + if cache, ok := l.caches.Dialogs.(ChannelDialogListReadModelCache); ok { + cache.InvalidateDialogListsForChannel(evt.PeerID) + } if l.caches.ChannelRows != nil { l.caches.ChannelRows.delete(evt.PeerID) } + if l.caches.ChannelTopMessages != nil { + l.caches.ChannelTopMessages.deleteChannel(evt.PeerID) + } if l.caches.ChannelMembers != nil { l.caches.ChannelMembers.deleteChannel(evt.PeerID) } if l.caches.ChannelDialogs != nil { l.caches.ChannelDialogs.deleteChannel(evt.PeerID) } + if l.caches.ChannelDifferences != nil { + l.caches.ChannelDifferences.deleteChannel(evt.PeerID) + } if l.caches.ChannelFullBots != nil { l.caches.ChannelFullBots.InvalidateChannelFullBotInfoReadModel(evt.PeerID) } @@ -486,6 +602,10 @@ func (l *ReadModelChangeListener) handlePayload(payload string) { cache.InvalidateChannelMemberships(evt.PeerID) } } + case "channel_difference_base": + if evt.PeerType == "channel" && evt.PeerID != 0 && l.caches.ChannelDifferences != nil { + l.caches.ChannelDifferences.deleteChannel(evt.PeerID) + } case "channel_media_counts": if evt.PeerType == "channel" && evt.PeerID != 0 && l.caches.ChannelMediaCounts != nil { l.caches.ChannelMediaCounts.InvalidateChannelMediaCountReadModel(evt.PeerID) diff --git a/internal/store/postgres/secretchat.go b/internal/store/postgres/secretchat.go index da957fcb..f1ff416a 100644 --- a/internal/store/postgres/secretchat.go +++ b/internal/store/postgres/secretchat.go @@ -12,7 +12,7 @@ import ( "telesrv/internal/store/postgres/sqlcgen" ) -// SecretChatStore 是 store.SecretChatStore 的 PostgreSQL 实现（迁移 0137）。 +// SecretChatStore 是 store.SecretChatStore 的 PostgreSQL 实现。 // 盲中继：g_a/g_b/key_fingerprint 原样 BYTEA/BIGINT 存储；握手态迁移用条件 // UPDATE 做原子 CAS（accept 绑定接受设备、discard 幂等）。行为契约与 memory // 实现由 storetest 钉死。 @@ -44,8 +44,8 @@ func scanSecretChat(row rowScanner) (domain.SecretChat, error) { } func (s *SecretChatStore) CreateSecretChat(ctx context.Context, chat domain.SecretChat) error { - if chat.ID == 0 { - return domain.ErrSecretChatNotFound + if chat.ID == 0 || chat.ID != int(chat.RandomID) { + return domain.ErrSecretChatRandomIDDuplicate } if chat.State == "" { chat.State = domain.SecretChatStateRequested @@ -62,12 +62,7 @@ VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16)`, if err != nil { var pgErr *pgconn.PgError if errors.As(err, &pgErr) && pgErr.Code == "23505" { - if pgErr.ConstraintName == "secret_chats_pkey" { - return domain.ErrSecretChatIDConflict - } - // uq_secret_chats_admin_random：与并发同 random_id 请求竞态（罕见， - // 服务端 GetByAdminRandom 预检已收口大多数情况）。 - return fmt.Errorf("insert secret chat: duplicate admin random: %w", err) + return domain.ErrSecretChatRandomIDDuplicate } return fmt.Errorf("insert secret chat: %w", err) } @@ -86,20 +81,6 @@ func (s *SecretChatStore) GetSecretChat(ctx context.Context, chatID int) (domain return chat, true, nil } -func (s *SecretChatStore) GetByAdminRandom(ctx context.Context, adminAuthKeyID int64, randomID int32) (domain.SecretChat, bool, error) { - chat, err := scanSecretChat(s.db.QueryRow(ctx, - `SELECT `+secretChatColumns+` FROM secret_chats -WHERE admin_auth_key_id = $1 AND random_id = $2 AND state <> 'discarded' LIMIT 1`, - adminAuthKeyID, randomID)) - if errors.Is(err, pgx.ErrNoRows) { - return domain.SecretChat{}, false, nil - } - if err != nil { - return domain.SecretChat{}, false, fmt.Errorf("get secret chat by admin random: %w", err) - } - return chat, true, nil -} - func (s *SecretChatStore) AcceptSecretChat(ctx context.Context, chatID int, participantAuthKeyID int64, gb []byte, keyFingerprint int64) (domain.SecretChat, error) { // 原子 CAS：仅 requested 且未绑定接受设备时迁移到 normal。 chat, err := scanSecretChat(s.db.QueryRow(ctx, ` @@ -177,14 +158,6 @@ ORDER BY chat_id`, authKeyID) return out, nil } -func (s *SecretChatStore) MaxSecretChatID(ctx context.Context) (int, error) { - var id int - if err := s.db.QueryRow(ctx, `SELECT COALESCE(MAX(chat_id), 0) FROM secret_chats`).Scan(&id); err != nil { - return 0, fmt.Errorf("max secret chat id: %w", err) - } - return id, nil -} - func nullableBytes(b []byte) any { if len(b) == 0 { return nil diff --git a/internal/store/postgres/secretchat_integration_test.go b/internal/store/postgres/secretchat_integration_test.go index fd42e666..37f05ff1 100644 --- a/internal/store/postgres/secretchat_integration_test.go +++ b/internal/store/postgres/secretchat_integration_test.go @@ -9,8 +9,8 @@ import ( ) // TestSecretChatStorePostgres 验证密聊握手状态机 PG 实现的行为契约（与 memory 实现 -// 同构）：create/get、幂等去重、accept CAS、double-accept、discard 幂等、 -// accept-after-discard、部分唯一索引（discard 后同 random_id 可重建）。 +// 同构）：create/get、chat_id=random_id、duplicate、accept CAS、double-accept、 +// discard 幂等、accept-after-discard。 // 门控于 TELESRV_TEST_POSTGRES_DSN。 func TestSecretChatStorePostgres(t *testing.T) { pool := testPool(t) @@ -31,7 +31,7 @@ func TestSecretChatStorePostgres(t *testing.T) { cleanup() t.Cleanup(cleanup) - mk := func(id int, randomID int32) domain.SecretChat { + mk := func(id int) domain.SecretChat { return domain.SecretChat{ ID: id, AdminAccessHash: 111, @@ -41,13 +41,13 @@ func TestSecretChatStorePostgres(t *testing.T) { ParticipantUserID: partUser, State: domain.SecretChatStateRequested, GA: []byte{0x0a, 0x0b, 0x0c}, - RandomID: randomID, + RandomID: int32(id), Date: 1000, } } // create + get round-trip。 - chat := mk(base, 555) + chat := mk(base) if err := store.CreateSecretChat(ctx, chat); err != nil { t.Fatalf("create: %v", err) } @@ -55,19 +55,25 @@ func TestSecretChatStorePostgres(t *testing.T) { if err != nil || !found { t.Fatalf("get: found=%v err=%v", found, err) } - if got.AdminUserID != adminUser || got.RandomID != 555 || string(got.GA) != string(chat.GA) { + if got.AdminUserID != adminUser || got.RandomID != int32(base) || string(got.GA) != string(chat.GA) { t.Fatalf("round-trip mismatch: %+v", got) } - - // 重复 chat_id → ID conflict。 - if err := store.CreateSecretChat(ctx, mk(base, 556)); !errors.Is(err, domain.ErrSecretChatIDConflict) { - t.Fatalf("duplicate chat_id err = %v, want ErrSecretChatIDConflict", err) + negative := mk(-base) + if err := store.CreateSecretChat(ctx, negative); err != nil { + t.Fatalf("create negative chat id: %v", err) + } + if got, found, err := store.GetSecretChat(ctx, -base); err != nil || !found || got.ID != -base || got.RandomID != -base { + t.Fatalf("negative round-trip = %+v found=%v err=%v", got, found, err) + } + invalid := mk(base + 1) + invalid.RandomID = int32(base + 2) + if err := store.CreateSecretChat(ctx, invalid); !errors.Is(err, domain.ErrSecretChatRandomIDDuplicate) { + t.Fatalf("mismatched id/random err = %v, want ErrSecretChatRandomIDDuplicate", err) } - // 幂等查询（非终态）。 - idem, found, err := store.GetByAdminRandom(ctx, adminKey, 555) - if err != nil || !found || idem.ID != base { - t.Fatalf("GetByAdminRandom: found=%v id=%d err=%v", found, idem.ID, err) + // 重复 chat_id/random_id → 显式 duplicate，禁止另分配 ID。 + if err := store.CreateSecretChat(ctx, mk(base)); !errors.Is(err, domain.ErrSecretChatRandomIDDuplicate) { + t.Fatalf("duplicate chat_id err = %v, want ErrSecretChatRandomIDDuplicate", err) } // accept CAS。 @@ -101,15 +107,9 @@ func TestSecretChatStorePostgres(t *testing.T) { t.Fatalf("accept after discard err = %v, want ErrSecretChatAlreadyDeclined", err) } - // 部分唯一索引：discarded 旧 chat 不阻塞同 (admin_auth_key_id, random_id) 重建。 - if err := store.CreateSecretChat(ctx, mk(base+1, 555)); err != nil { - t.Fatalf("recreate after discard with same random_id: %v", err) - } - - // MaxSecretChatID 反映最大 chat_id（≥ base+1）。 - maxID, err := store.MaxSecretChatID(ctx) - if err != nil || maxID < base+1 { - t.Fatalf("max chat id = %d err = %v, want >= %d", maxID, err, base+1) + // discarded 后也不能复用同一 wire chat ID。 + if err := store.CreateSecretChat(ctx, mk(base)); !errors.Is(err, domain.ErrSecretChatRandomIDDuplicate) { + t.Fatalf("recreate discarded chat err = %v, want ErrSecretChatRandomIDDuplicate", err) } // 不存在 chat：accept/discard 返回 not found。 @@ -137,16 +137,18 @@ func TestSecretChatListActiveByAuthKeyPostgres(t *testing.T) { keyOther = int64(0xCC03) base = 7701001 ) - cleanup := func() { _, _ = pool.Exec(ctx, `DELETE FROM secret_chats WHERE admin_user_id IN ($1, $2)`, adminUser, partUser) } + cleanup := func() { + _, _ = pool.Exec(ctx, `DELETE FROM secret_chats WHERE admin_user_id IN ($1, $2)`, adminUser, partUser) + } cleanup() t.Cleanup(cleanup) - mk := func(id int, randomID int32, adminUID, adminKey, partUID, partKeyV int64, state domain.SecretChatState) domain.SecretChat { + mk := func(id int, adminUID, adminKey, partUID, partKeyV int64, state domain.SecretChatState) domain.SecretChat { return domain.SecretChat{ ID: id, AdminAccessHash: 1, ParticipantAccessHash: 2, AdminUserID: adminUID, AdminAuthKeyID: adminKey, ParticipantUserID: partUID, ParticipantAuthKeyID: partKeyV, - State: state, GA: []byte{0x01}, RandomID: randomID, Date: 1, + State: state, GA: []byte{0x01}, RandomID: int32(id), Date: 1, } } idsOf := func(chats []domain.SecretChat) []int { @@ -171,10 +173,10 @@ func TestSecretChatListActiveByAuthKeyPostgres(t *testing.T) { // chat1 admin=keyA participant=keyB normal；chat2 admin=keyA 未绑定 requested； // chat3 admin=keyOther participant=keyB normal；chat4 admin=keyA participant=keyB 已 discard。 for _, c := range []domain.SecretChat{ - mk(base+1, 1, adminUser, keyA, partUser, keyB, domain.SecretChatStateNormal), - mk(base+2, 2, adminUser, keyA, partUser, 0, domain.SecretChatStateRequested), - mk(base+3, 3, partUser, keyOther, adminUser, keyB, domain.SecretChatStateNormal), - mk(base+4, 4, adminUser, keyA, partUser, keyB, domain.SecretChatStateNormal), + mk(base+1, adminUser, keyA, partUser, keyB, domain.SecretChatStateNormal), + mk(base+2, adminUser, keyA, partUser, 0, domain.SecretChatStateRequested), + mk(base+3, partUser, keyOther, adminUser, keyB, domain.SecretChatStateNormal), + mk(base+4, adminUser, keyA, partUser, keyB, domain.SecretChatStateNormal), } { if err := store.CreateSecretChat(ctx, c); err != nil { t.Fatalf("create %d: %v", c.ID, err) diff --git a/internal/store/postgres/sqlcgen/dialog.sql.go b/internal/store/postgres/sqlcgen/dialog.sql.go index 56ba2477..b2d6078b 100644 --- a/internal/store/postgres/sqlcgen/dialog.sql.go +++ b/internal/store/postgres/sqlcgen/dialog.sql.go @@ -372,6 +372,46 @@ func (q *Queries) ListDialogDrafts(ctx context.Context, arg ListDialogDraftsPara return items, nil } +const listDialogDraftsByPeers = `-- name: ListDialogDraftsByPeers :many +SELECT d.draft::text AS draft_json +FROM dialog_drafts d +WHERE d.user_id = $1 + AND d.top_message_id = 0 + AND EXISTS ( + SELECT 1 + FROM unnest($2::text[]) WITH ORDINALITY AS requested_type(peer_type, ord) + JOIN unnest($3::bigint[]) WITH ORDINALITY AS requested_id(peer_id, ord) USING (ord) + WHERE requested_type.peer_type = d.peer_type + AND requested_id.peer_id = d.peer_id + ) +` + +type ListDialogDraftsByPeersParams struct { + UserID int64 + PeerTypes []string + PeerIds []int64 +} + +func (q *Queries) ListDialogDraftsByPeers(ctx context.Context, arg ListDialogDraftsByPeersParams) ([]string, error) { + rows, err := q.db.Query(ctx, listDialogDraftsByPeers, arg.UserID, arg.PeerTypes, arg.PeerIds) + if err != nil { + return nil, err + } + defer rows.Close() + var items []string + for rows.Next() { + var draft_json string + if err := rows.Scan(&draft_json); err != nil { + return nil, err + } + items = append(items, draft_json) + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + const listDialogFolders = `-- name: ListDialogFolders :many SELECT filter_id, diff --git a/internal/store/postgres/sqlcgen/message.sql.go b/internal/store/postgres/sqlcgen/message.sql.go index d14d7f8b..da448b00 100644 --- a/internal/store/postgres/sqlcgen/message.sql.go +++ b/internal/store/postgres/sqlcgen/message.sql.go @@ -44,39 +44,53 @@ WHERE m.owner_user_id = $1::bigint ) ) AND ( - $14::text = '' - OR (m.saved_peer_type = $14::text AND m.saved_peer_id = $15::bigint) + NOT $14::boolean + OR m.media #>> '{service_action,kind}' = 'phone_call' ) AND ( - cardinality($16::text[]) = 0 + NOT $15::boolean + OR ( + NOT m.outgoing + AND m.media #>> '{service_action,kind}' = 'phone_call' + AND m.media #>> '{service_action,call,reason}' = 'missed' + ) + ) + AND ( + $16::text = '' + OR (m.saved_peer_type = $16::text AND m.saved_peer_id = $17::bigint) + ) + AND ( + cardinality($18::text[]) = 0 OR EXISTS ( SELECT 1 FROM saved_message_reaction_tags tag WHERE tag.user_id = m.owner_user_id AND tag.message_box_id = m.box_id AND (tag.reaction_type || ':' || tag.reaction_value) - = ANY($16::text[]) + = ANY($18::text[]) ) ) ` type CountMessagesByUserParams struct { - OwnerUserID int64 - HasPeer bool - PeerType string - PeerID int64 - RestrictPeerIds bool - PeerIds []int64 - Query string - MinDate int32 - MaxDate int32 - MaxID int32 - MinID int32 - PinnedOnly bool - MusicOnly bool - SavedPeerType string - SavedPeerID int64 - SavedReactionKeys []string + OwnerUserID int64 + HasPeer bool + PeerType string + PeerID int64 + RestrictPeerIds bool + PeerIds []int64 + Query string + MinDate int32 + MaxDate int32 + MaxID int32 + MinID int32 + PinnedOnly bool + MusicOnly bool + PhoneCallsOnly bool + MissedPhoneCallsOnly bool + SavedPeerType string + SavedPeerID int64 + SavedReactionKeys []string } // ListMessagesByUser total CTE 的独立化:相同 base 过滤(不含分页 anchor), @@ -96,6 +110,8 @@ func (q *Queries) CountMessagesByUser(ctx context.Context, arg CountMessagesByUs arg.MinID, arg.PinnedOnly, arg.MusicOnly, + arg.PhoneCallsOnly, + arg.MissedPhoneCallsOnly, arg.SavedPeerType, arg.SavedPeerID, arg.SavedReactionKeys, @@ -2338,50 +2354,64 @@ WHERE m.owner_user_id = $1::bigint ) ) AND ( - $14::text = '' - OR (m.saved_peer_type = $14::text AND m.saved_peer_id = $15::bigint) + NOT $14::boolean + OR m.media #>> '{service_action,kind}' = 'phone_call' ) AND ( - cardinality($16::text[]) = 0 + NOT $15::boolean + OR ( + NOT m.outgoing + AND m.media #>> '{service_action,kind}' = 'phone_call' + AND m.media #>> '{service_action,call,reason}' = 'missed' + ) + ) + AND ( + $16::text = '' + OR (m.saved_peer_type = $16::text AND m.saved_peer_id = $17::bigint) + ) + AND ( + cardinality($18::text[]) = 0 OR EXISTS ( SELECT 1 FROM saved_message_reaction_tags tag WHERE tag.user_id = m.owner_user_id AND tag.message_box_id = m.box_id AND (tag.reaction_type || ':' || tag.reaction_value) - = ANY($16::text[]) + = ANY($18::text[]) ) ) AND ( - ($17::int > 0 AND m.message_date < $17::int) - OR ($17::int <= 0 AND ($18::int <= 0 OR m.box_id < $18::int)) + ($19::int > 0 AND m.message_date < $19::int) + OR ($19::int <= 0 AND ($20::int <= 0 OR m.box_id < $20::int)) ) ORDER BY m.box_id DESC -OFFSET GREATEST($19::int, 0) -LIMIT $20::int +OFFSET GREATEST($21::int, 0) +LIMIT $22::int ` type ListMessagesBackwardParams struct { - OwnerUserID int64 - HasPeer bool - PeerType string - PeerID int64 - RestrictPeerIds bool - PeerIds []int64 - Query string - MinDate int32 - MaxDate int32 - MaxID int32 - MinID int32 - PinnedOnly bool - MusicOnly bool - SavedPeerType string - SavedPeerID int64 - SavedReactionKeys []string - OffsetDate int32 - OffsetID int32 - RowOffset int32 - LimitCount int32 + OwnerUserID int64 + HasPeer bool + PeerType string + PeerID int64 + RestrictPeerIds bool + PeerIds []int64 + Query string + MinDate int32 + MaxDate int32 + MaxID int32 + MinID int32 + PinnedOnly bool + MusicOnly bool + PhoneCallsOnly bool + MissedPhoneCallsOnly bool + SavedPeerType string + SavedPeerID int64 + SavedReactionKeys []string + OffsetDate int32 + OffsetID int32 + RowOffset int32 + LimitCount int32 } type ListMessagesBackwardRow struct { @@ -2480,6 +2510,8 @@ func (q *Queries) ListMessagesBackward(ctx context.Context, arg ListMessagesBack arg.MinID, arg.PinnedOnly, arg.MusicOnly, + arg.PhoneCallsOnly, + arg.MissedPhoneCallsOnly, arg.SavedPeerType, arg.SavedPeerID, arg.SavedReactionKeys, @@ -2703,25 +2735,37 @@ base AS NOT MATERIALIZED ( ) ) AND ( - $18::text = '' - OR (m.saved_peer_type = $18::text AND m.saved_peer_id = $19::bigint) + NOT $18::boolean + OR m.media #>> '{service_action,kind}' = 'phone_call' ) AND ( - cardinality($20::text[]) = 0 + NOT $19::boolean + OR ( + NOT m.outgoing + AND m.media #>> '{service_action,kind}' = 'phone_call' + AND m.media #>> '{service_action,call,reason}' = 'missed' + ) + ) + AND ( + $20::text = '' + OR (m.saved_peer_type = $20::text AND m.saved_peer_id = $21::bigint) + ) + AND ( + cardinality($22::text[]) = 0 OR EXISTS ( SELECT 1 FROM saved_message_reaction_tags tag WHERE tag.user_id = m.owner_user_id AND tag.message_box_id = m.box_id AND (tag.reaction_type || ':' || tag.reaction_value) - = ANY($20::text[]) + = ANY($22::text[]) ) ) ), total AS ( SELECT count(*)::int AS total_count FROM base - WHERE $21::boolean + WHERE $23::boolean ), backward AS ( SELECT b.box_id, b.private_message_id, b.owner_user_id, b.peer_type, b.peer_id, b.from_user_id, b.message_date, b.ttl_period, b.expires_at, b.edit_date, b.hide_edited, b.outgoing, b.body, b.entities_json, b.silent, b.noforwards, b.reply_to_msg_id, b.reply_to_peer_type, b.reply_to_peer_id, b.reply_to_top_id, b.reply_to_story_id, b.quote_text, b.quote_entities_json, b.quote_offset, b.fwd_from_peer_type, b.fwd_from_peer_id, b.fwd_from_name, b.fwd_date, b.fwd_saved_from_peer_type, b.fwd_saved_from_peer_id, b.fwd_saved_from_msg_id, b.saved_peer_type, b.saved_peer_id, b.pts, b.media_json, b.media_unread, b.reaction_unread, b.pinned, b.via_bot_id, b.grouped_id, b.effect, b.reply_markup_json, b.rich_message_json, b.peer_user_id, b.peer_access_hash, b.peer_phone, b.peer_first_name, b.peer_last_name, b.peer_username, b.peer_country_code, b.peer_verified, b.peer_support, b.peer_is_bot, b.peer_bot_info_version, b.peer_premium_until, b.peer_emoji_status_document_id, b.peer_emoji_status_until, b.peer_last_seen_at, b.from_user_user_id, b.from_user_access_hash, b.from_user_phone, b.from_user_first_name, b.from_user_last_name, b.from_user_username, b.from_user_country_code, b.from_user_verified, b.from_user_support, b.from_user_is_bot, b.from_user_bot_info_version, b.from_user_premium_until, b.from_user_emoji_status_document_id, b.from_user_emoji_status_until, b.from_user_last_seen_at @@ -2868,27 +2912,29 @@ ORDER BY box_id DESC ` type ListMessagesByUserParams struct { - OwnerUserID int64 - OffsetID int32 - OffsetDate int32 - AddOffset int32 - LimitCount int32 - HasPeer bool - PeerType string - PeerID int64 - RestrictPeerIds bool - PeerIds []int64 - Query string - MinDate int32 - MaxDate int32 - MaxID int32 - MinID int32 - PinnedOnly bool - MusicOnly bool - SavedPeerType string - SavedPeerID int64 - SavedReactionKeys []string - NeedTotalCount bool + OwnerUserID int64 + OffsetID int32 + OffsetDate int32 + AddOffset int32 + LimitCount int32 + HasPeer bool + PeerType string + PeerID int64 + RestrictPeerIds bool + PeerIds []int64 + Query string + MinDate int32 + MaxDate int32 + MaxID int32 + MinID int32 + PinnedOnly bool + MusicOnly bool + PhoneCallsOnly bool + MissedPhoneCallsOnly bool + SavedPeerType string + SavedPeerID int64 + SavedReactionKeys []string + NeedTotalCount bool } type ListMessagesByUserRow struct { @@ -2987,6 +3033,8 @@ func (q *Queries) ListMessagesByUser(ctx context.Context, arg ListMessagesByUser arg.MinID, arg.PinnedOnly, arg.MusicOnly, + arg.PhoneCallsOnly, + arg.MissedPhoneCallsOnly, arg.SavedPeerType, arg.SavedPeerID, arg.SavedReactionKeys, diff --git a/internal/store/postgres/sqlcgen/user_update_event.sql.go b/internal/store/postgres/sqlcgen/user_update_event.sql.go index cf57ce80..de76f2b8 100644 --- a/internal/store/postgres/sqlcgen/user_update_event.sql.go +++ b/internal/store/postgres/sqlcgen/user_update_event.sql.go @@ -192,6 +192,7 @@ SELECT COALESCE(m.effect, 0)::bigint AS effect, COALESCE(m.reply_markup::text, '{}')::text AS reply_markup_json, COALESCE(m.rich_message::text, '{}')::text AS rich_message_json, + COALESCE(m.deleted, false)::boolean AS message_deleted, COALESCE(peer_u.id, 0)::bigint AS peer_user_id, COALESCE(peer_u.access_hash, 0)::bigint AS peer_access_hash, COALESCE(peer_u.phone, '')::text AS peer_phone, @@ -330,6 +331,7 @@ type BatchListDispatchEventsRow struct { Effect int64 ReplyMarkupJson string RichMessageJson string + MessageDeleted bool PeerUserID int64 PeerAccessHash int64 PeerPhone string @@ -466,6 +468,7 @@ func (q *Queries) BatchListDispatchEvents(ctx context.Context, arg BatchListDisp &i.Effect, &i.ReplyMarkupJson, &i.RichMessageJson, + &i.MessageDeleted, &i.PeerUserID, &i.PeerAccessHash, &i.PeerPhone, @@ -703,8 +706,9 @@ WITH doomed AS MATERIALIZED ( FROM dispatch_outbox_user_heads h WHERE h.status = 'failed' AND h.updated_at < now() - make_interval(secs => $1::int) + AND h.target_user_id = ANY($2::bigint[]) ORDER BY h.updated_at ASC, h.target_user_id ASC, h.head_id ASC - LIMIT $2 + LIMIT $3 FOR UPDATE OF h SKIP LOCKED ), deleted AS ( @@ -720,6 +724,7 @@ FROM deleted type DeleteFailedDispatchOutboxParams struct { OlderThanSeconds int32 + TargetUserIds []int64 LimitCount int32 } @@ -727,7 +732,7 @@ type DeleteFailedDispatchOutboxParams struct { // claim/completion 保持同一 user_heads→outbox 锁序。删除的只是在线任务，durable // user_update_events 不动，故客户端仍可经 difference 恢复。 func (q *Queries) DeleteFailedDispatchOutbox(ctx context.Context, arg DeleteFailedDispatchOutboxParams) (int32, error) { - row := q.db.QueryRow(ctx, deleteFailedDispatchOutbox, arg.OlderThanSeconds, arg.LimitCount) + row := q.db.QueryRow(ctx, deleteFailedDispatchOutbox, arg.OlderThanSeconds, arg.TargetUserIds, arg.LimitCount) var deleted_count int32 err := row.Scan(&deleted_count) return deleted_count, err @@ -846,6 +851,7 @@ SELECT COALESCE(m.effect, 0)::bigint AS effect, COALESCE(m.reply_markup::text, '{}')::text AS reply_markup_json, COALESCE(m.rich_message::text, '{}')::text AS rich_message_json, + COALESCE(m.deleted, false)::boolean AS message_deleted, COALESCE(peer_u.id, 0)::bigint AS peer_user_id, COALESCE(peer_u.access_hash, 0)::bigint AS peer_access_hash, COALESCE(peer_u.phone, '')::text AS peer_phone, @@ -987,6 +993,7 @@ type ListUserUpdateEventsAfterRow struct { Effect int64 ReplyMarkupJson string RichMessageJson string + MessageDeleted bool PeerUserID int64 PeerAccessHash int64 PeerPhone string @@ -1121,6 +1128,7 @@ func (q *Queries) ListUserUpdateEventsAfter(ctx context.Context, arg ListUserUpd &i.Effect, &i.ReplyMarkupJson, &i.RichMessageJson, + &i.MessageDeleted, &i.PeerUserID, &i.PeerAccessHash, &i.PeerPhone, diff --git a/internal/store/postgres/sticker_system_key_migration_integration_test.go b/internal/store/postgres/sticker_system_key_migration_integration_test.go new file mode 100644 index 00000000..0cb9abe9 --- /dev/null +++ b/internal/store/postgres/sticker_system_key_migration_integration_test.go @@ -0,0 +1,89 @@ +package postgres + +import ( + "context" + "errors" + "testing" + + "github.com/jackc/pgerrcode" + "github.com/jackc/pgx/v5/pgconn" + + "telesrv/deploy" +) + +const ( + stickerSystemKeyMigrationUp = "migrations/20260901000006_sticker_set_system_key_unique.up.sql" + stickerSystemKeyMigrationDown = "migrations/20260901000006_sticker_set_system_key_unique.down.sql" + synthesizedDefaultStatusSetID = int64(7_777_000_000_000_001) +) + +func TestStickerSetSystemKeyMigrationCanonicalizesAndRejectsDuplicatesPostgres(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + upSQL, err := deploy.Migrations.ReadFile(stickerSystemKeyMigrationUp) + if err != nil { + t.Fatalf("read up migration: %v", err) + } + downSQL, err := deploy.Migrations.ReadFile(stickerSystemKeyMigrationDown) + if err != nil { + t.Fatalf("read down migration: %v", err) + } + + tx, err := pool.Begin(ctx) + if err != nil { + t.Fatalf("begin sticker system-key migration test: %v", err) + } + defer func() { _ = tx.Rollback(context.Background()) }() + + if _, err := tx.Exec(ctx, string(downSQL)); err != nil { + t.Fatalf("return system-key index to non-unique form: %v", err) + } + const ( + realSetID = int64(9_100_000_000_018_101) + thirdSetID = int64(9_100_000_000_018_102) + defaultStatuses = "emoji_default_statuses" + ) + if _, err := tx.Exec(ctx, `UPDATE public.sticker_sets SET system_key='' WHERE system_key=$1`, defaultStatuses); err != nil { + t.Fatalf("isolate existing default-status fixture keys: %v", err) + } + if _, err := tx.Exec(ctx, ` +DELETE FROM public.sticker_sets +WHERE id IN ($1,$2,$3)`, synthesizedDefaultStatusSetID, realSetID, thirdSetID); err != nil { + t.Fatalf("clean migration fixtures: %v", err) + } + for _, fixture := range []struct { + id int64 + shortName string + }{ + {id: synthesizedDefaultStatusSetID, shortName: "TelesrvDefaultStatusesMigrationTest"}, + {id: realSetID, shortName: "StatusPackMigrationTest"}, + } { + if _, err := tx.Exec(ctx, ` +INSERT INTO public.sticker_sets(id,access_hash,short_name,title,count,hash,set_kind,system_key) +VALUES ($1,$1,$2,$2,0,1,'system',$3)`, fixture.id, fixture.shortName, defaultStatuses); err != nil { + t.Fatalf("insert duplicate system-key fixture %d: %v", fixture.id, err) + } + } + + if _, err := tx.Exec(ctx, string(upSQL)); err != nil { + t.Fatalf("apply sticker system-key uniqueness migration: %v", err) + } + var synthesizedKey, realKey string + if err := tx.QueryRow(ctx, `SELECT system_key FROM public.sticker_sets WHERE id=$1`, synthesizedDefaultStatusSetID).Scan(&synthesizedKey); err != nil { + t.Fatalf("read synthesized set after migration: %v", err) + } + if err := tx.QueryRow(ctx, `SELECT system_key FROM public.sticker_sets WHERE id=$1`, realSetID).Scan(&realKey); err != nil { + t.Fatalf("read real set after migration: %v", err) + } + if synthesizedKey != "" || realKey != defaultStatuses { + t.Fatalf("canonical system keys = synthesized %q real %q", synthesizedKey, realKey) + } + + _, err = tx.Exec(ctx, ` +INSERT INTO public.sticker_sets(id,access_hash,short_name,title,count,hash,set_kind,system_key) +VALUES ($1,$1,'ThirdStatusPackMigrationTest','ThirdStatusPackMigrationTest',0,1,'system',$2)`, thirdSetID, defaultStatuses) + var pgErr *pgconn.PgError + if !errors.As(err, &pgErr) || pgErr.Code != pgerrcode.UniqueViolation || pgErr.ConstraintName != "sticker_sets_system_key_idx" { + t.Fatalf("duplicate non-empty system key error = %v, want sticker_sets_system_key_idx unique violation", err) + } +} diff --git a/internal/store/postgres/story.go b/internal/store/postgres/story.go index 00b13b96..90d40cef 100644 --- a/internal/store/postgres/story.go +++ b/internal/store/postgres/story.go @@ -933,6 +933,88 @@ ORDER BY recent.ord ASC`, peerTypes, peerIDs, int32(now), viewerUserID) return out, nil } +func (s *StoryStore) ActiveStoryPeerExpirations(ctx context.Context, peers []domain.Peer, now int) (map[domain.Peer]int, error) { + if len(peers) > domain.MaxStoryIDs { + return nil, domain.ErrStoryIDInvalid + } + if len(peers) == 0 { + return map[domain.Peer]int{}, nil + } + peerTypes := make([]string, 0, len(peers)) + peerIDs := make([]int64, 0, len(peers)) + for _, peer := range peers { + if err := validatePGStoryPeer(peer); err != nil { + return nil, err + } + peerTypes = append(peerTypes, string(peer.Type)) + peerIDs = append(peerIDs, peer.ID) + } + rows, err := s.db.Query(ctx, ` +WITH input AS ( + SELECT p.peer_type, i.peer_id + FROM unnest($1::text[]) WITH ORDINALITY AS p(peer_type, ord) + JOIN unnest($2::bigint[]) WITH ORDINALITY AS i(peer_id, ord) USING (ord) +) +SELECT input.peer_type, input.peer_id, MAX(s.expire_date)::int +FROM input +JOIN stories s + ON s.owner_peer_type = input.peer_type + AND s.owner_peer_id = input.peer_id + AND s.deleted = false + AND s.expire_date > $3 +GROUP BY input.peer_type, input.peer_id`, peerTypes, peerIDs, int32(now)) + if err != nil { + return nil, fmt.Errorf("get active story peer expirations: %w", err) + } + defer rows.Close() + out := make(map[domain.Peer]int, len(peers)) + for rows.Next() { + var peerType string + var peerID int64 + var expireAt int + if err := rows.Scan(&peerType, &peerID, &expireAt); err != nil { + return nil, fmt.Errorf("scan active story peer expiration: %w", err) + } + out[domain.Peer{Type: domain.PeerType(peerType), ID: peerID}] = expireAt + } + if err := rows.Err(); err != nil { + return nil, fmt.Errorf("scan active story peer expirations: %w", err) + } + return out, nil +} + +func (s *StoryStore) ListHiddenStoryPeers(ctx context.Context, viewerUserID int64) ([]domain.Peer, error) { + if viewerUserID == 0 { + return nil, domain.ErrStoryPeerInvalid + } + rows, err := s.db.Query(ctx, ` +SELECT owner_peer_type, owner_peer_id +FROM story_hidden_peers +WHERE viewer_user_id = $1 +ORDER BY owner_peer_type, owner_peer_id`, viewerUserID) + if err != nil { + return nil, fmt.Errorf("list hidden story peers: %w", err) + } + defer rows.Close() + out := make([]domain.Peer, 0) + for rows.Next() { + var peerType string + var peerID int64 + if err := rows.Scan(&peerType, &peerID); err != nil { + return nil, fmt.Errorf("scan hidden story peer: %w", err) + } + peer := domain.Peer{Type: domain.PeerType(peerType), ID: peerID} + if err := validatePGStoryPeer(peer); err != nil { + return nil, err + } + out = append(out, peer) + } + if err := rows.Err(); err != nil { + return nil, fmt.Errorf("scan hidden story peers: %w", err) + } + return out, nil +} + func (s *StoryStore) MarkRead(ctx context.Context, viewerUserID int64, peer domain.Peer, maxID, date int) (domain.StoryReadResult, error) { if viewerUserID == 0 { return domain.StoryReadResult{}, domain.ErrStoryPeerInvalid diff --git a/internal/store/postgres/story_integration_test.go b/internal/store/postgres/story_integration_test.go index 47a4e852..57d18068 100644 --- a/internal/store/postgres/story_integration_test.go +++ b/internal/store/postgres/story_integration_test.go @@ -97,6 +97,14 @@ func TestStoryStoreReadMaxHiddenAndPeerMaxIDsPostgres(t *testing.T) { if len(projections) != 1 || projections[0].Peer != ownerPeer || projections[0].Recent.MaxID != 2 || !projections[0].Hidden { t.Fatalf("story peer projections = %+v, want max id 2 hidden owner", projections) } + expirations, err := store.ActiveStoryPeerExpirations(ctx, []domain.Peer{ownerPeer}, 1700000202) + if err != nil || expirations[ownerPeer] != 1700001000 { + t.Fatalf("active story peer expirations = %+v, %v; want owner=1700001000", expirations, err) + } + hiddenPeers, err := store.ListHiddenStoryPeers(ctx, viewer.ID) + if err != nil || len(hiddenPeers) != 1 || hiddenPeers[0] != ownerPeer { + t.Fatalf("hidden story peer snapshot = %+v, %v; want owner", hiddenPeers, err) + } list, err = store.ListActiveStories(ctx, viewer.ID, false, 1700000202, 100) if err != nil { t.Fatalf("list visible after hidden: %v", err) @@ -121,6 +129,14 @@ func TestStoryStoreReadMaxHiddenAndPeerMaxIDsPostgres(t *testing.T) { if hiddenStates[ownerPeer] { t.Fatalf("hidden states after clear = %+v, want owner visible", hiddenStates) } + hiddenPeers, err = store.ListHiddenStoryPeers(ctx, viewer.ID) + if err != nil || len(hiddenPeers) != 0 { + t.Fatalf("hidden story peer snapshot after clear = %+v, %v; want empty", hiddenPeers, err) + } + expirations, err = store.ActiveStoryPeerExpirations(ctx, []domain.Peer{ownerPeer}, 1700001000) + if err != nil || len(expirations) != 0 { + t.Fatalf("active story peer expirations at boundary = %+v, %v; want empty", expirations, err) + } } func TestStoryStoreListActiveStoriesPaginatesByPeerPostgres(t *testing.T) { diff --git a/internal/store/postgres/story_peer_read_model_test.go b/internal/store/postgres/story_peer_read_model_test.go index 4e1adb18..6c74083a 100644 --- a/internal/store/postgres/story_peer_read_model_test.go +++ b/internal/store/postgres/story_peer_read_model_test.go @@ -18,7 +18,9 @@ type fakeStoryReadModelCache struct { } type fakeRPCProjectionReadModelCache struct { - users []int64 + users []int64 + channels []int64 + flushes int } func (*fakeRPCProjectionReadModelCache) InvalidateRPCProjectionReadModelForViewer(int64) {} @@ -27,8 +29,39 @@ func (f *fakeRPCProjectionReadModelCache) InvalidateRPCProjectionReadModelForUse } func (*fakeRPCProjectionReadModelCache) InvalidateRPCProjectionReadModelForPeer(int64, domain.Peer) { } -func (*fakeRPCProjectionReadModelCache) InvalidateRPCProjectionReadModelForChannel(int64) {} -func (*fakeRPCProjectionReadModelCache) FlushRPCProjectionReadModel() {} +func (f *fakeRPCProjectionReadModelCache) InvalidateRPCProjectionReadModelForChannel(id int64) { + f.channels = append(f.channels, id) +} +func (f *fakeRPCProjectionReadModelCache) FlushRPCProjectionReadModel() { + f.flushes++ +} + +type fakeBaseUserCache struct { + deletedIDs []int64 +} + +type fakeUserProjectionFactCache struct { + freezes []int64 + phones []int64 + flushes int +} + +func (f *fakeUserProjectionFactCache) InvalidateAccountFreezeFact(userID int64) { + f.freezes = append(f.freezes, userID) +} + +func (f *fakeUserProjectionFactCache) InvalidateCollectiblePhoneFact(userID int64) { + f.phones = append(f.phones, userID) +} + +func (f *fakeUserProjectionFactCache) FlushUserProjectionFactReadModel() { + f.flushes++ +} + +func (f *fakeBaseUserCache) Delete(_ context.Context, ids []int64) error { + f.deletedIDs = append(f.deletedIDs, ids...) + return nil +} func (f *fakeStoryReadModelCache) InvalidateStoryReadModelViewers(ids ...int64) { f.mu.Lock() @@ -91,12 +124,30 @@ func TestReadModelChangeListenerRoutesStoryPeer(t *testing.T) { } } +func TestReadModelChangeListenerRoutesStoryHiddenList(t *testing.T) { + stories := &fakeStoryReadModelCache{} + listener := NewReadModelChangeListener("", ReadModelCacheSet{Stories: stories}, nil) + + listener.handlePayload(`{"model":"story_hidden_list","owner_user_id":777,"peer_type":"user","peer_id":777,"version":2}`) + listener.handlePayload(`{"model":"story_hidden_list","owner_user_id":888,"peer_type":"channel","peer_id":888,"version":3}`) + listener.handlePayload(`{"model":"story_hidden_list","owner_user_id":0,"peer_type":"user","peer_id":0,"version":4}`) + + stories.mu.Lock() + viewers := append([]int64(nil), stories.viewers...) + stories.mu.Unlock() + if len(viewers) != 1 || viewers[0] != 777 { + t.Fatalf("story hidden-list viewer invalidations = %v, want [777]", viewers) + } +} + func TestReadModelChangeListenerRoutesUserVisibility(t *testing.T) { stories := &fakeStoryReadModelCache{} rpcProjections := &fakeRPCProjectionReadModelCache{} + facts := &fakeUserProjectionFactCache{} listener := NewReadModelChangeListener("", ReadModelCacheSet{ - Stories: stories, - RPCProjections: rpcProjections, + Stories: stories, + RPCProjections: rpcProjections, + UserProjectionFacts: facts, }, nil) listener.handlePayload(`{"model":"user_visibility","owner_user_id":0,"peer_type":"user","peer_id":777,"version":2}`) @@ -106,14 +157,80 @@ func TestReadModelChangeListenerRoutesUserVisibility(t *testing.T) { if peers := stories.peersSnapshot(); len(peers) != 1 || peers[0] != (domain.Peer{Type: domain.PeerTypeUser, ID: 777}) { t.Fatalf("story projection invalidations = %+v, want user 777", peers) } + if len(facts.freezes) != 1 || facts.freezes[0] != 777 { + t.Fatalf("freeze fact invalidations = %v, want [777]", facts.freezes) + } listener.handlePayload(`{"model":"user_visibility","owner_user_id":0,"peer_type":"channel","peer_id":888,"version":3}`) listener.handlePayload(`{"model":"user_visibility","owner_user_id":0,"peer_type":"user","peer_id":0,"version":4}`) - if len(rpcProjections.users) != 1 || len(stories.peersSnapshot()) != 1 { + if len(rpcProjections.users) != 1 || len(stories.peersSnapshot()) != 1 || len(facts.freezes) != 1 { t.Fatalf("invalid visibility events were not ignored: users=%v peers=%+v", rpcProjections.users, stories.peersSnapshot()) } } +func TestReadModelChangeListenerRoutesUserCollectiblePhone(t *testing.T) { + facts := &fakeUserProjectionFactCache{} + listener := NewReadModelChangeListener("", ReadModelCacheSet{UserProjectionFacts: facts}, nil) + listener.handlePayload(`{"model":"user_collectible_phone","owner_user_id":0,"peer_type":"user","peer_id":777,"version":2,"hash":101}`) + listener.handlePayload(`{"model":"user_collectible_phone","owner_user_id":0,"peer_type":"channel","peer_id":888,"version":3,"hash":102}`) + listener.handlePayload(`{"model":"user_collectible_phone","owner_user_id":0,"peer_type":"user","peer_id":0,"version":4,"hash":103}`) + if len(facts.phones) != 1 || facts.phones[0] != 777 { + t.Fatalf("collectible phone fact invalidations = %v, want [777]", facts.phones) + } + listener.flush("test") + if facts.flushes != 1 { + t.Fatalf("user projection fact flushes = %d, want 1", facts.flushes) + } +} + +func TestReadModelChangeListenerRoutesPeerIdentity(t *testing.T) { + rpcProjections := &fakeRPCProjectionReadModelCache{} + listener := NewReadModelChangeListener("", ReadModelCacheSet{RPCProjections: rpcProjections}, nil) + + listener.handlePayload(`{"model":"peer_identity","owner_user_id":0,"peer_type":"user","peer_id":777,"version":2,"hash":101}`) + listener.handlePayload(`{"model":"peer_identity","owner_user_id":0,"peer_type":"channel","peer_id":888,"version":3,"hash":102}`) + listener.handlePayload(`{"model":"peer_identity","owner_user_id":0,"peer_type":"chat","peer_id":999,"version":4,"hash":103}`) + listener.handlePayload(`{"model":"peer_identity","owner_user_id":0,"peer_type":"user","peer_id":0,"version":5,"hash":104}`) + + if len(rpcProjections.users) != 1 || rpcProjections.users[0] != 777 { + t.Fatalf("user peer identity invalidations = %v, want [777]", rpcProjections.users) + } + if len(rpcProjections.channels) != 1 || rpcProjections.channels[0] != 888 { + t.Fatalf("channel peer identity invalidations = %v, want [888]", rpcProjections.channels) + } +} + +func TestReadModelChangeListenerRoutesLogicalUserDeletionAsCoarseInvalidation(t *testing.T) { + rpcProjections := &fakeRPCProjectionReadModelCache{} + baseUsers := &fakeBaseUserCache{} + facts := &fakeUserProjectionFactCache{} + listener := NewReadModelChangeListener("", ReadModelCacheSet{ + RPCProjections: rpcProjections, + BaseUsers: baseUsers, + UserProjectionFacts: facts, + }, nil) + + listener.handlePayload(`{"model":"user_deleted","owner_user_id":777,"peer_type":"user","peer_id":777,"version":1}`) + if rpcProjections.flushes != 1 { + t.Fatalf("RPC projection flushes = %d, want 1", rpcProjections.flushes) + } + if len(rpcProjections.users) != 0 { + t.Fatalf("logical deletion used per-user scans: %v", rpcProjections.users) + } + if len(baseUsers.deletedIDs) != 1 || baseUsers.deletedIDs[0] != 777 { + t.Fatalf("base user invalidations = %v, want [777]", baseUsers.deletedIDs) + } + if len(facts.freezes) != 1 || facts.freezes[0] != 777 || len(facts.phones) != 1 || facts.phones[0] != 777 { + t.Fatalf("user projection fact invalidations freezes=%v phones=%v, want [777]/[777]", facts.freezes, facts.phones) + } + + listener.handlePayload(`{"model":"user_deleted","owner_user_id":888,"peer_type":"channel","peer_id":888,"version":1}`) + if rpcProjections.flushes != 1 || len(baseUsers.deletedIDs) != 1 || len(facts.freezes) != 1 || len(facts.phones) != 1 { + t.Fatalf("invalid user_deleted event was not ignored: flushes=%d base=%v freezes=%v phones=%v", + rpcProjections.flushes, baseUsers.deletedIDs, facts.freezes, facts.phones) + } +} + // TestStoryPeerReadModelNotifyInvalidatesOnStoryWrite 验证 0135 触发器:写 stories / // story_hidden_peers → story_peer bump → 统一 read-model NOTIFY → 按 owner peer 失效故事投影。 func TestStoryPeerReadModelNotifyInvalidatesOnStoryWrite(t *testing.T) { @@ -127,6 +244,7 @@ func TestStoryPeerReadModelNotifyInvalidatesOnStoryWrite(t *testing.T) { _, _ = pool.Exec(ctx, "DELETE FROM stories WHERE owner_peer_type='user' AND owner_peer_id=$1", ownerID) _, _ = pool.Exec(ctx, "DELETE FROM story_hidden_peers WHERE owner_peer_type='user' AND owner_peer_id=$1", ownerID) _, _ = pool.Exec(ctx, "DELETE FROM read_model_versions WHERE model='story_peer' AND peer_id=$1", ownerID) + _, _ = pool.Exec(ctx, "DELETE FROM read_model_versions WHERE model='story_hidden_list' AND owner_user_id=$1", viewerID) } cleanup() t.Cleanup(cleanup) @@ -162,6 +280,18 @@ VALUES ($1, 'user', $2)`, viewerID, ownerID); err != nil { if !waitUntil(3*time.Second, func() bool { return countPeer(stories.peersSnapshot(), wantPeer) > before }) { t.Fatalf("story_hidden_peers INSERT 后未再失效 owner peer") } + if !waitUntil(3*time.Second, func() bool { + stories.mu.Lock() + defer stories.mu.Unlock() + for _, viewer := range stories.viewers { + if viewer == viewerID { + return true + } + } + return false + }) { + t.Fatalf("story_hidden_peers INSERT 后 story_hidden_list NOTIFY 未失效 viewer=%d", viewerID) + } // 持久版本脊确实 bump 了 story_peer(owner_user_id=0, peer=user/ownerID)。 var version int64 @@ -173,6 +303,15 @@ WHERE model='story_peer' AND owner_user_id=0 AND peer_type='user' AND peer_id=$1 if version < 2 { t.Fatalf("story_peer version = %d, want >=2 (stories + hidden writes)", version) } + var hiddenListVersion int64 + if err := pool.QueryRow(ctx, ` +SELECT version FROM read_model_versions +WHERE model='story_hidden_list' AND owner_user_id=$1 AND peer_type='user' AND peer_id=$1`, viewerID).Scan(&hiddenListVersion); err != nil { + t.Fatalf("read story_hidden_list version: %v", err) + } + if hiddenListVersion < 1 { + t.Fatalf("story_hidden_list version = %d, want >=1 after hidden write", hiddenListVersion) + } // DELETE story 也应失效(用 OLD.owner_peer_*)。 before = countPeer(stories.peersSnapshot(), wantPeer) diff --git a/internal/store/postgres/temp_auth_key.go b/internal/store/postgres/temp_auth_key.go index 48cbdb92..04aa52dc 100644 --- a/internal/store/postgres/temp_auth_key.go +++ b/internal/store/postgres/temp_auth_key.go @@ -26,127 +26,69 @@ func NewTempAuthKeyBindingStore(db sqlcgen.DBTX) *TempAuthKeyBindingStore { } func (s *TempAuthKeyBindingStore) Save(ctx context.Context, b domain.TempAuthKeyBinding) error { - if b.ExpiresAt <= 0 || int64(b.ExpiresAt) > math.MaxInt32 { - return store.ErrAuthKeyBindingInvalid - } - return withAuthIdentityTx(ctx, s.db, "save temp auth key binding", func(tx pgx.Tx) error { - return s.saveTx(ctx, tx, b) - }) + _, err := s.SaveWithState(ctx, b) + return err } -func (s *TempAuthKeyBindingStore) saveTx(ctx context.Context, tx pgx.Tx, b domain.TempAuthKeyBinding) error { - rawID := authKeyIDToInt64(b.TempAuthKeyID) - permID := b.PermAuthKeyID - // Every operation that may bridge temp and permanent rows enters the - // permanent identity gate before taking the raw-key row lock. This is the - // same gate/order used by selector advance and permanent revocation. - if err := lockPermanentAuthIdentities(ctx, tx, []int64{permID}); err != nil { +func (s *TempAuthKeyBindingStore) SaveWithState(ctx context.Context, b domain.TempAuthKeyBinding) (domain.TempAuthKeyBindingResult, error) { + if b.ExpiresAt <= 0 || int64(b.ExpiresAt) > math.MaxInt32 { + return domain.TempAuthKeyBindingResult{}, store.ErrAuthKeyBindingInvalid + } + var result domain.TempAuthKeyBindingResult + err := withAuthIdentityTx(ctx, s.db, "save temp auth key binding", func(tx pgx.Tx) error { + var err error + result, err = s.saveTx(ctx, tx, b) return err - } - var ( - tempExpiry int - tempLayer int - tempObservationID int64 - ) - if err := tx.QueryRow(ctx, ` -SELECT expires_at, layer, layer_observation_id -FROM auth_keys -WHERE auth_key_id = $1 -FOR UPDATE -`, rawID).Scan(&tempExpiry, &tempLayer, &tempObservationID); err != nil { - if errors.Is(err, pgx.ErrNoRows) { - return store.ErrAuthKeyBindingInvalid - } - return fmt.Errorf("lock temporary auth key for binding: %w", err) - } - if tempExpiry <= 0 || tempExpiry != b.ExpiresAt || rawID == permID { - return store.ErrAuthKeyBindingInvalid - } - - // The raw row serializes first bind and rebind attempts. Read the binding - // only after taking that lock, so a concurrent winner is either visible or - // still waiting behind us. A different permanent identity is immutable. - var currentPermID int64 - err := tx.QueryRow(ctx, ` -SELECT perm_auth_key_id -FROM temp_auth_key_bindings -WHERE temp_auth_key_id = $1 -`, rawID).Scan(¤tPermID) - switch { - case err == nil && currentPermID != permID: - return store.ErrTempAuthKeyAlreadyBound - case err != nil && !errors.Is(err, pgx.ErrNoRows): - return fmt.Errorf("read existing temporary auth key binding: %w", err) - } - - var ( - permExpiry int - permLayer int - permObservationID int64 - ) - if err := tx.QueryRow(ctx, ` -SELECT expires_at, layer, layer_observation_id -FROM auth_keys -WHERE auth_key_id = $1 -FOR UPDATE -`, permID).Scan(&permExpiry, &permLayer, &permObservationID); err != nil { - if errors.Is(err, pgx.ErrNoRows) { - return store.ErrAuthKeyBindingInvalid - } - return fmt.Errorf("lock permanent auth key for binding: %w", err) - } - if permExpiry != 0 { - return store.ErrAuthKeyBindingInvalid - } - - mergedLayer, mergedObservationID, err := store.MergeAuthKeyLayerObservations( - tempLayer, tempObservationID, - permLayer, permObservationID, - ) - if err != nil { - return err - } - - q := s.q.WithTx(tx) - n, err := q.UpsertTempAuthKeyBinding(ctx, sqlcgen.UpsertTempAuthKeyBindingParams{ - TempAuthKeyID: authKeyIDToInt64(b.TempAuthKeyID), - PermAuthKeyID: b.PermAuthKeyID, - Nonce: b.Nonce, - TempSessionID: b.TempSessionID, - ExpiresAt: int32(b.ExpiresAt), - EncryptedMessage: b.EncryptedMessage, }) + return result, err +} + +func (s *TempAuthKeyBindingStore) saveTx(ctx context.Context, tx pgx.Tx, b domain.TempAuthKeyBinding) (domain.TempAuthKeyBindingResult, error) { + rawID := authKeyIDToInt64(b.TempAuthKeyID) + var ( + status string + mergedLayer int + observationID int64 + ) + err := tx.QueryRow(ctx, ` +/* temp_auth_key_bind_atomic */ +SELECT bind_status, merged_layer, merged_observation_id +FROM public.telesrv_bind_temp_auth_key($1, $2, $3, $4, $5, $6) +`, + rawID, + b.PermAuthKeyID, + b.Nonce, + b.TempSessionID, + b.ExpiresAt, + b.EncryptedMessage, + ).Scan(&status, &mergedLayer, &observationID) if err != nil { var pgErr *pgconn.PgError if errors.As(err, &pgErr) && pgErr.Code == "23503" { - return store.ErrAuthKeyBindingInvalid + return domain.TempAuthKeyBindingResult{}, store.ErrAuthKeyBindingInvalid } - return fmt.Errorf("upsert temp auth key binding: %w", err) + return domain.TempAuthKeyBindingResult{}, fmt.Errorf("bind temporary auth key atomically: %w", err) } - if n == 0 { - return store.ErrAuthKeyBindingInvalid + switch status { + case "ok": + if mergedLayer < 0 || observationID < 0 || (observationID > 0 && mergedLayer == 0) { + return domain.TempAuthKeyBindingResult{}, fmt.Errorf( + "bind temporary auth key atomically: invalid result layer=%d observation=%d", + mergedLayer, observationID, + ) + } + return domain.TempAuthKeyBindingResult{Layer: mergedLayer, LayerObservationID: observationID}, nil + case "already_bound": + return domain.TempAuthKeyBindingResult{}, store.ErrTempAuthKeyAlreadyBound + case "binding_invalid": + return domain.TempAuthKeyBindingResult{}, store.ErrAuthKeyBindingInvalid + case "layer_invalid": + return domain.TempAuthKeyBindingResult{}, store.ErrAuthKeySessionLayerInvalid + case "layer_conflict": + return domain.TempAuthKeyBindingResult{}, store.ErrAuthKeySessionLayerConflict + default: + return domain.TempAuthKeyBindingResult{}, fmt.Errorf("bind temporary auth key atomically: unknown status %q", status) } - keyIDs := []int64{rawID, permID} - tag, err := tx.Exec(ctx, ` -UPDATE auth_keys -SET layer = $2, - layer_observation_id = $3 -WHERE auth_key_id = ANY($1::bigint[]) -`, keyIDs, mergedLayer, mergedObservationID) - if err != nil { - return fmt.Errorf("merge bound auth key layer defaults: %w", err) - } - if tag.RowsAffected() != int64(len(keyIDs)) { - return fmt.Errorf("merge bound auth key layer defaults: updated %d of %d locked keys", tag.RowsAffected(), len(keyIDs)) - } - if _, err := tx.Exec(ctx, ` -UPDATE authorizations -SET layer = $2 -WHERE auth_key_id = ANY($1::bigint[]) -`, keyIDs, mergedLayer); err != nil { - return fmt.Errorf("mirror bound auth key layer default: %w", err) - } - return nil } // DeleteExpired 实现 store.TempAuthKeyBindingStore：按 auth_keys.expires_at 的部分索引 diff --git a/internal/store/postgres/temp_auth_key_identity_integration_test.go b/internal/store/postgres/temp_auth_key_identity_integration_test.go index 7c23b795..c2253ee1 100644 --- a/internal/store/postgres/temp_auth_key_identity_integration_test.go +++ b/internal/store/postgres/temp_auth_key_identity_integration_test.go @@ -11,6 +11,7 @@ import ( "testing" "time" + "github.com/jackc/pgx/v5" "github.com/jackc/pgx/v5/pgconn" "github.com/jackc/pgx/v5/pgxpool" @@ -18,6 +19,61 @@ import ( "telesrv/internal/store" ) +func TestTempAuthKeyBindingStoreUsesOneDatabaseStatementPostgres(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + keys := NewAuthKeyStore(pool) + handshakeExpiry := int(time.Now().Add(time.Hour).Unix()) + temp := saveTempIdentityTestAuthKey(t, ctx, pool, keys, handshakeExpiry) + perm := saveTempIdentityTestAuthKey(t, ctx, pool, keys, 0) + counter := &tempAuthKeyBindStatementCounter{Pool: pool} + + err := NewTempAuthKeyBindingStore(counter).Save(ctx, domain.TempAuthKeyBinding{ + TempAuthKeyID: temp, PermAuthKeyID: authKeyIDToInt64(perm), + Nonce: 801, TempSessionID: 802, ExpiresAt: handshakeExpiry, + EncryptedMessage: []byte("one database statement"), + }) + if err != nil { + t.Fatalf("bind temporary auth key: %v", err) + } + if counter.statements != 1 { + t.Fatalf("binding transaction statements = %d, want 1", counter.statements) + } +} + +type tempAuthKeyBindStatementCounter struct { + *pgxpool.Pool + statements int +} + +func (c *tempAuthKeyBindStatementCounter) Begin(ctx context.Context) (pgx.Tx, error) { + tx, err := c.Pool.Begin(ctx) + if err != nil { + return nil, err + } + return &tempAuthKeyBindCountingTx{Tx: tx, statements: &c.statements}, nil +} + +type tempAuthKeyBindCountingTx struct { + pgx.Tx + statements *int +} + +func (tx *tempAuthKeyBindCountingTx) Exec(ctx context.Context, sql string, arguments ...any) (pgconn.CommandTag, error) { + *tx.statements++ + return tx.Tx.Exec(ctx, sql, arguments...) +} + +func (tx *tempAuthKeyBindCountingTx) Query(ctx context.Context, sql string, args ...any) (pgx.Rows, error) { + *tx.statements++ + return tx.Tx.Query(ctx, sql, args...) +} + +func (tx *tempAuthKeyBindCountingTx) QueryRow(ctx context.Context, sql string, args ...any) pgx.Row { + *tx.statements++ + return tx.Tx.QueryRow(ctx, sql, args...) +} + func TestTempAuthKeyBindingStoreRejectsIntegerWraparoundPostgres(t *testing.T) { if strconv.IntSize < 64 { t.Skip("64-bit int required to construct an out-of-int32 expiry") @@ -188,7 +244,7 @@ UPDATE authorizations SET layer = $2 WHERE auth_key_id = $1`, authKeyIDToInt64(p ExpiresAt: handshakeExpiry, EncryptedMessage: []byte("layer merge proof"), } - err := bindings.Save(ctx, binding) + result, err := bindings.SaveWithState(ctx, binding) if tt.wantErr != nil { if !errors.Is(err, tt.wantErr) { t.Fatalf("bind error = %v, want %v", err, tt.wantErr) @@ -204,11 +260,18 @@ UPDATE authorizations SET layer = $2 WHERE auth_key_id = $1`, authKeyIDToInt64(p if err != nil { t.Fatalf("bind: %v", err) } + if result.Layer != tt.wantLayer || result.LayerObservationID != tt.wantObs { + t.Fatalf("bind result = %+v, want layer=%d observation=%d", result, tt.wantLayer, tt.wantObs) + } // A normalized proof replay is idempotent and repeats the same merge. binding.Nonce++ - if err := bindings.Save(ctx, binding); err != nil { + replayed, err := bindings.SaveWithState(ctx, binding) + if err != nil { t.Fatalf("replay merged binding: %v", err) } + if replayed != result { + t.Fatalf("replay bind result = %+v, want %+v", replayed, result) + } assertTempIdentityLayerTuple(t, ctx, pool, tempID, tt.wantLayer, tt.wantObs) assertTempIdentityLayerTuple(t, ctx, pool, permID, tt.wantLayer, tt.wantObs) assertTempIdentityAuthorizationLayer(t, ctx, pool, permID, tt.wantLayer) diff --git a/internal/store/postgres/update_event.go b/internal/store/postgres/update_event.go index 0a2502ae..b0842054 100644 --- a/internal/store/postgres/update_event.go +++ b/internal/store/postgres/update_event.go @@ -455,6 +455,7 @@ func (s *UpdateEventStore) ListAfter(ctx context.Context, userID int64, pts, lim GroupedID: row.GroupedID, Effect: row.Effect, Pinned: row.Pinned, + Deleted: row.MessageDeleted, SavedPeer: savedPeerFromFields(row.SavedPeerType, row.SavedPeerID), TTLPeriod: int(row.TtlPeriod), ExpiresAt: int(row.ExpiresAt), @@ -654,6 +655,7 @@ func (s *UpdateEventStore) BatchByCursor(ctx context.Context, cursors []store.Ev GroupedID: row.GroupedID, Effect: row.Effect, Pinned: row.Pinned, + Deleted: row.MessageDeleted, SavedPeer: savedPeerFromFields(row.SavedPeerType, row.SavedPeerID), TTLPeriod: int(row.TtlPeriod), ExpiresAt: int(row.ExpiresAt), diff --git a/internal/store/postgres/update_event_retention.go b/internal/store/postgres/update_event_retention.go index b214a141..f0d8c26f 100644 --- a/internal/store/postgres/update_event_retention.go +++ b/internal/store/postgres/update_event_retention.go @@ -201,6 +201,13 @@ LIMIT $5`, userID, floor, safePts, cutoff, limit) for i, event := range events { pts[i] = int32(event.pts) } + // Retention can remove the final online-delivery task for this user. Take the + // exclusive lane fence before locking the durable head so the subsequent + // READ COMMITTED statements observe every producer that completed first and + // later producers cannot miss the empty-lane transition. + if err := lockDispatchOutboxLanesExclusive(ctx, tx, []int64{userID}); err != nil { + return 0, fmt.Errorf("lock retained user update dispatch lane: %w", err) + } // Every outbox mutation follows user_heads→outbox. Retention may remove a pending or leased // task after the client has already confirmed its durable event; lock the lane head first so // it cannot deadlock a lease-expiry claim/completion. No head means these events have no online diff --git a/internal/store/postgres/user.go b/internal/store/postgres/user.go index 6758f50f..8a7e97bb 100644 --- a/internal/store/postgres/user.go +++ b/internal/store/postgres/user.go @@ -5,6 +5,7 @@ import ( "encoding/json" "errors" "fmt" + "sort" "strings" "time" @@ -12,6 +13,7 @@ import ( "github.com/jackc/pgx/v5/pgtype" "telesrv/internal/domain" + "telesrv/internal/store" "telesrv/internal/store/postgres/sqlcgen" ) @@ -21,6 +23,20 @@ type UserStore struct { q *sqlcgen.Queries } +const officialUsernameClaimAttempts = 3 + +var errOfficialUsernameClaimRetry = errors.New("official username claim changed concurrently") + +// OfficialUsernameClaimResult reports the authoritative 777000 username +// reconciliation performed during startup. DisplacedUserID is set only when an +// ordinary account's editable username was cleared; bots, other built-in users, +// channels and collectible names are never silently seized. +type OfficialUsernameClaimResult struct { + Official domain.User + DisplacedUserID int64 + Changed bool +} + // NewUserStore 基于 pgx 连接池（或事务）创建 UserStore。 func NewUserStore(db sqlcgen.DBTX) *UserStore { return &UserStore{db: db, q: sqlcgen.New(db)} @@ -288,6 +304,202 @@ func (s *UserStore) UpdateUsername(ctx context.Context, userID int64, username s return userFromModel(row), nil } +// ClaimOfficialUsername makes the configured product username authoritative +// for the official 777000 account. If an ordinary user currently owns that +// editable username, the user's slot is cleared and 777000 claims it in the same +// transaction. The method deliberately refuses to seize bots, other system +// users, channels, collectible assets or non-editable registry rows. +func (s *UserStore) ClaimOfficialUsername(ctx context.Context, username string) (OfficialUsernameClaimResult, error) { + username = strings.TrimSpace(strings.TrimPrefix(username, "@")) + usernameLower := strings.ToLower(username) + if usernameLower == "" { + return OfficialUsernameClaimResult{}, domain.ErrUsernameInvalid + } + var lastErr error + for attempt := 0; attempt < officialUsernameClaimAttempts; attempt++ { + result, err := s.claimOfficialUsernameOnce(ctx, username, usernameLower) + if err == nil { + return result, nil + } + if ctx.Err() != nil || (!errors.Is(err, errOfficialUsernameClaimRetry) && !isRetryablePostgresTxError(err)) { + return OfficialUsernameClaimResult{}, err + } + lastErr = err + } + return OfficialUsernameClaimResult{}, lastErr +} + +func (s *UserStore) claimOfficialUsernameOnce(ctx context.Context, username, usernameLower string) (OfficialUsernameClaimResult, error) { + beginner, ok := s.db.(txBeginner) + if !ok { + return OfficialUsernameClaimResult{}, fmt.Errorf("claim official username: db does not support transactions") + } + tx, err := beginner.Begin(ctx) + if err != nil { + return OfficialUsernameClaimResult{}, fmt.Errorf("begin official username claim: %w", err) + } + committed := false + defer func() { + if !committed { + _ = tx.Rollback(ctx) + } + }() + + // Discover the user rows that can participate, then lock them in numeric + // order. Ordinary UpdateUsername locks its user before the registry row; this + // order avoids reversing that dependency during a rolling restart. + lockIDs := map[int64]struct{}{domain.OfficialSystemUserID: {}} + if holderID, found, err := usernameScalarHolder(ctx, tx, usernameLower); err != nil { + return OfficialUsernameClaimResult{}, err + } else if found { + lockIDs[holderID] = struct{}{} + } + if owner, found, err := getPeerUsernameOwner(ctx, tx, usernameLower, false); err != nil { + return OfficialUsernameClaimResult{}, err + } else if found && owner.peerType == peerUsernameTypeUser { + lockIDs[owner.peerID] = struct{}{} + } + ids := make([]int64, 0, len(lockIDs)) + for id := range lockIDs { + ids = append(ids, id) + } + sort.Slice(ids, func(i, j int) bool { return ids[i] < ids[j] }) + + type lockedUser struct { + bot bool + } + locked := make(map[int64]lockedUser, len(ids)) + rows, err := tx.Query(ctx, ` +SELECT id, is_bot +FROM users +WHERE id = ANY($1::bigint[]) AND deleted_at IS NULL +ORDER BY id +FOR UPDATE`, ids) + if err != nil { + return OfficialUsernameClaimResult{}, fmt.Errorf("lock users for official username claim: %w", err) + } + for rows.Next() { + var id int64 + var item lockedUser + if err := rows.Scan(&id, &item.bot); err != nil { + rows.Close() + return OfficialUsernameClaimResult{}, fmt.Errorf("scan user for official username claim: %w", err) + } + locked[id] = item + } + if err := rows.Err(); err != nil { + rows.Close() + return OfficialUsernameClaimResult{}, fmt.Errorf("iterate users for official username claim: %w", err) + } + rows.Close() + if _, found := locked[domain.OfficialSystemUserID]; !found { + return OfficialUsernameClaimResult{}, domain.ErrUserNotFound + } + + // Re-read both ownership facts after the row locks. A newly observed user was + // not locked in the stable order above, so retry the whole transaction. + owner, ownerFound, err := getPeerUsernameOwner(ctx, tx, usernameLower, true) + if err != nil { + return OfficialUsernameClaimResult{}, err + } + holderID, holderFound, err := usernameScalarHolder(ctx, tx, usernameLower) + if err != nil { + return OfficialUsernameClaimResult{}, err + } + if holderFound { + if _, found := locked[holderID]; !found { + return OfficialUsernameClaimResult{}, errOfficialUsernameClaimRetry + } + } + if ownerFound && owner.peerType == peerUsernameTypeUser { + if _, found := locked[owner.peerID]; !found { + return OfficialUsernameClaimResult{}, errOfficialUsernameClaimRetry + } + } + + ordinaryUser := func(userID int64) bool { + item, found := locked[userID] + return found && !item.bot && !domain.IsSystemUserID(userID) + } + if holderFound && holderID != domain.OfficialSystemUserID && !ordinaryUser(holderID) { + return OfficialUsernameClaimResult{}, domain.ErrUsernameOccupied + } + if ownerFound { + allowedOfficialSlot := owner.matches(peerUsernameTypeUser, domain.OfficialSystemUserID) && owner.editable && !owner.collectible + allowedOrdinarySlot := owner.peerType == peerUsernameTypeUser && owner.editable && !owner.collectible && ordinaryUser(owner.peerID) + if !allowedOfficialSlot && !allowedOrdinarySlot { + return OfficialUsernameClaimResult{}, domain.ErrUsernameOccupied + } + } + + qtx := s.q.WithTx(tx) + officialRow, err := qtx.GetUserByID(ctx, domain.OfficialSystemUserID) + if err != nil { + if errors.Is(err, pgx.ErrNoRows) { + return OfficialUsernameClaimResult{}, domain.ErrUserNotFound + } + return OfficialUsernameClaimResult{}, fmt.Errorf("get official user during username claim: %w", err) + } + if holderFound && holderID == domain.OfficialSystemUserID && ownerFound && owner.matches(peerUsernameTypeUser, domain.OfficialSystemUserID) && + owner.editable && !owner.collectible && officialRow.Username == username { + return OfficialUsernameClaimResult{Official: userFromModel(officialRow)}, nil + } + + result := OfficialUsernameClaimResult{Changed: true} + if holderFound && holderID != domain.OfficialSystemUserID { + if _, err := tx.Exec(ctx, `UPDATE users SET username = '', updated_at = now() WHERE id = $1`, holderID); err != nil { + return OfficialUsernameClaimResult{}, fmt.Errorf("clear displaced product username: %w", err) + } + result.DisplacedUserID = holderID + } + if _, err := tx.Exec(ctx, `DELETE FROM peer_usernames WHERE username_lower = $1`, usernameLower); err != nil { + return OfficialUsernameClaimResult{}, fmt.Errorf("release product username registry slot: %w", err) + } + if err := deletePeerUsernameTx(ctx, tx, peerUsernameTypeUser, domain.OfficialSystemUserID); err != nil { + return OfficialUsernameClaimResult{}, err + } + if _, err := tx.Exec(ctx, ` +INSERT INTO peer_usernames (username_lower, peer_type, peer_id, username, active, editable, sort_order, collectible_id) +VALUES ($1, 'user', $2, $3, true, true, 0, NULL)`, usernameLower, domain.OfficialSystemUserID, username); err != nil { + if isUniqueViolation(err) { + return OfficialUsernameClaimResult{}, errOfficialUsernameClaimRetry + } + return OfficialUsernameClaimResult{}, fmt.Errorf("claim official username registry slot: %w", err) + } + officialRow, err = qtx.UpdateUserUsername(ctx, sqlcgen.UpdateUserUsernameParams{ + ID: domain.OfficialSystemUserID, + Username: username, + }) + if err != nil { + if isUniqueConstraint(err, "users_username_lower_unique_idx") { + return OfficialUsernameClaimResult{}, errOfficialUsernameClaimRetry + } + return OfficialUsernameClaimResult{}, fmt.Errorf("update official username: %w", err) + } + if err := tx.Commit(ctx); err != nil { + return OfficialUsernameClaimResult{}, fmt.Errorf("commit official username claim: %w", err) + } + committed = true + result.Official = userFromModel(officialRow) + return result, nil +} + +func usernameScalarHolder(ctx context.Context, db sqlcgen.DBTX, usernameLower string) (int64, bool, error) { + var userID int64 + err := db.QueryRow(ctx, ` +SELECT id +FROM users +WHERE deleted_at IS NULL AND lower(username) = $1 +LIMIT 1`, usernameLower).Scan(&userID) + if err != nil { + if errors.Is(err, pgx.ErrNoRows) { + return 0, false, nil + } + return 0, false, fmt.Errorf("get scalar username holder: %w", err) + } + return userID, true, nil +} + func (s *UserStore) UpdateLastSeen(ctx context.Context, userID int64, lastSeenAt int) error { if lastSeenAt <= 0 { return nil @@ -301,6 +513,56 @@ func (s *UserStore) UpdateLastSeen(ctx context.Context, userID int64, lastSeenAt return nil } +// UpdateLastSeenBatch applies a set of monotonic presence watermarks with one +// PostgreSQL round trip. Duplicate user IDs are collapsed to their maximum +// timestamp before the query so UPDATE ... FROM never has an ambiguous source +// row. Missing/deleted users are intentionally ignored, matching the ordinary +// UpdateLastSeen WHERE boundary. +func (s *UserStore) UpdateLastSeenBatch(ctx context.Context, updates []store.UserLastSeenUpdate) error { + latest := make(map[int64]int, len(updates)) + for _, update := range updates { + if update.UserID == 0 || update.LastSeenAt <= 0 { + continue + } + if current := latest[update.UserID]; update.LastSeenAt > current { + latest[update.UserID] = update.LastSeenAt + } + } + if len(latest) == 0 { + return nil + } + userIDs := make([]int64, 0, len(latest)) + for userID := range latest { + userIDs = append(userIDs, userID) + } + sort.Slice(userIDs, func(i, j int) bool { return userIDs[i] < userIDs[j] }) + lastSeen := make([]int64, len(userIDs)) + for index, userID := range userIDs { + lastSeen[index] = int64(latest[userID]) + } + if _, err := s.db.Exec(ctx, ` +WITH incoming AS MATERIALIZED ( + SELECT user_id, last_seen_at + FROM unnest($1::bigint[], $2::bigint[]) AS value(user_id, last_seen_at) +), locked AS MATERIALIZED ( + SELECT target.id, incoming.last_seen_at + FROM users AS target + JOIN incoming ON incoming.user_id = target.id + WHERE target.deleted_at IS NULL + ORDER BY target.id + FOR UPDATE OF target +) +UPDATE users AS target +SET last_seen_at = GREATEST(target.last_seen_at, locked.last_seen_at), + updated_at = now() +FROM locked +WHERE target.id = locked.id +`, userIDs, lastSeen); err != nil { + return fmt.Errorf("update user last seen batch: %w", err) + } + return nil +} + func (s *UserStore) Create(ctx context.Context, u domain.User) (domain.User, error) { u.Username = strings.TrimSpace(strings.TrimPrefix(u.Username, "@")) beginner, ok := s.db.(txBeginner) diff --git a/internal/store/postgres/user_lane_actor.go b/internal/store/postgres/user_lane_actor.go new file mode 100644 index 00000000..3f656e6b --- /dev/null +++ b/internal/store/postgres/user_lane_actor.go @@ -0,0 +1,152 @@ +package postgres + +import ( + "context" + "sort" + "sync" + "sync/atomic" +) + +// userLaneActor moves same-user admission waits out of PostgreSQL. It grants a +// request only when all of its user lanes are free, while allowing unrelated +// requests to bypass a blocked waiter. PostgreSQL advisory locks remain the +// cross-process correctness fence after admission. +type userLaneActor struct { + nextID atomic.Uint64 + commands chan any +} + +type userLaneAcquire struct { + id uint64 + userIDs []int64 + granted chan struct{} +} + +type userLaneCancel struct { + id uint64 + done chan struct{} +} + +type userLaneRelease struct{ id uint64 } + +var defaultPrivateSendLaneActor = newUserLaneActor() + +func newUserLaneActor() *userLaneActor { + actor := &userLaneActor{commands: make(chan any, 1024)} + go actor.run() + return actor +} + +func (a *userLaneActor) acquire(ctx context.Context, userIDs ...int64) (func(), error) { + if ctx == nil { + ctx = context.Background() + } + keys := normalizedUserLaneIDs(userIDs) + if len(keys) == 0 { + return func() {}, nil + } + request := userLaneAcquire{ + id: a.nextID.Add(1), + userIDs: keys, + granted: make(chan struct{}), + } + select { + case a.commands <- request: + case <-ctx.Done(): + return nil, ctx.Err() + } + select { + case <-request.granted: + var once sync.Once + return func() { + once.Do(func() { a.commands <- userLaneRelease{id: request.id} }) + }, nil + case <-ctx.Done(): + canceled := userLaneCancel{id: request.id, done: make(chan struct{})} + a.commands <- canceled + <-canceled.done + return nil, ctx.Err() + } +} + +func normalizedUserLaneIDs(userIDs []int64) []int64 { + unique := make([]int64, 0, len(userIDs)) + seen := make(map[int64]struct{}, len(userIDs)) + for _, userID := range userIDs { + if userID <= 0 { + continue + } + if _, ok := seen[userID]; ok { + continue + } + seen[userID] = struct{}{} + unique = append(unique, userID) + } + sort.Slice(unique, func(i, j int) bool { return unique[i] < unique[j] }) + return unique +} + +func (a *userLaneActor) run() { + held := make(map[int64]uint64) + granted := make(map[uint64][]int64) + pending := make([]userLaneAcquire, 0, 256) + + release := func(id uint64) { + for _, userID := range granted[id] { + if held[userID] == id { + delete(held, userID) + } + } + delete(granted, id) + } + drain := func() { + for index := 0; index < len(pending); { + request := pending[index] + available := true + for _, userID := range request.userIDs { + if _, busy := held[userID]; busy { + available = false + break + } + } + if !available { + index++ + continue + } + for _, userID := range request.userIDs { + held[userID] = request.id + } + granted[request.id] = request.userIDs + close(request.granted) + copy(pending[index:], pending[index+1:]) + pending = pending[:len(pending)-1] + } + } + + for command := range a.commands { + switch value := command.(type) { + case userLaneAcquire: + pending = append(pending, value) + drain() + case userLaneRelease: + release(value.id) + drain() + case userLaneCancel: + found := false + for index := range pending { + if pending[index].id != value.id { + continue + } + copy(pending[index:], pending[index+1:]) + pending = pending[:len(pending)-1] + found = true + break + } + if !found { + release(value.id) + } + close(value.done) + drain() + } + } +} diff --git a/internal/store/postgres/user_lane_actor_test.go b/internal/store/postgres/user_lane_actor_test.go new file mode 100644 index 00000000..6ba5956d --- /dev/null +++ b/internal/store/postgres/user_lane_actor_test.go @@ -0,0 +1,72 @@ +package postgres + +import ( + "context" + "errors" + "testing" + "time" +) + +func TestUserLaneActorSerializesOverlapsAndAllowsUnrelatedBypass(t *testing.T) { + actor := newUserLaneActor() + releaseA, err := actor.acquire(context.Background(), 1, 2) + if err != nil { + t.Fatal(err) + } + + overlapGranted := make(chan func(), 1) + go func() { + release, err := actor.acquire(context.Background(), 2, 3) + if err == nil { + overlapGranted <- release + } + }() + select { + case release := <-overlapGranted: + release() + t.Fatal("overlapping request was granted while lane 2 was held") + case <-time.After(20 * time.Millisecond): + } + + unrelatedCtx, cancel := context.WithTimeout(context.Background(), time.Second) + defer cancel() + releaseUnrelated, err := actor.acquire(unrelatedCtx, 4, 5) + if err != nil { + t.Fatalf("unrelated request did not bypass blocked waiter: %v", err) + } + releaseUnrelated() + releaseA() + select { + case release := <-overlapGranted: + release() + case <-time.After(time.Second): + t.Fatal("overlapping request did not resume after release") + } +} + +func TestUserLaneActorCancellationRemovesPendingRequest(t *testing.T) { + actor := newUserLaneActor() + release, err := actor.acquire(context.Background(), 10) + if err != nil { + t.Fatal(err) + } + ctx, cancel := context.WithCancel(context.Background()) + done := make(chan error, 1) + go func() { + _, err := actor.acquire(ctx, 10, 11) + done <- err + }() + time.Sleep(20 * time.Millisecond) + cancel() + if err := <-done; !errors.Is(err, context.Canceled) { + t.Fatalf("canceled acquire error = %v", err) + } + release() + availableCtx, availableCancel := context.WithTimeout(context.Background(), time.Second) + defer availableCancel() + releaseNext, err := actor.acquire(availableCtx, 11) + if err != nil { + t.Fatalf("canceled waiter retained lane 11: %v", err) + } + releaseNext() +} diff --git a/internal/store/postgres/user_last_seen_batch_integration_test.go b/internal/store/postgres/user_last_seen_batch_integration_test.go new file mode 100644 index 00000000..fcce5171 --- /dev/null +++ b/internal/store/postgres/user_last_seen_batch_integration_test.go @@ -0,0 +1,56 @@ +package postgres + +import ( + "context" + "fmt" + "testing" + "time" + + "telesrv/internal/domain" + "telesrv/internal/store" +) + +func TestUserStoreUpdateLastSeenBatchPostgres(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + users := NewUserStore(pool) + suffix := time.Now().UnixNano() % 1_000_000_000 + first, err := users.Create(ctx, domain.User{ + AccessHash: 1, Phone: fmt.Sprintf("17781%d", suffix), FirstName: "PresenceBatchFirst", + }) + if err != nil { + t.Fatalf("create first: %v", err) + } + second, err := users.Create(ctx, domain.User{ + AccessHash: 2, Phone: fmt.Sprintf("17782%d", suffix), FirstName: "PresenceBatchSecond", + }) + if err != nil { + t.Fatalf("create second: %v", err) + } + t.Cleanup(func() { + _, _ = pool.Exec(context.Background(), "DELETE FROM users WHERE id = ANY($1::bigint[])", []int64{first.ID, second.ID}) + }) + + if err := users.UpdateLastSeenBatch(ctx, []store.UserLastSeenUpdate{ + {UserID: second.ID, LastSeenAt: 20}, + {UserID: first.ID, LastSeenAt: 10}, + {UserID: first.ID, LastSeenAt: 30}, + }); err != nil { + t.Fatalf("first batch: %v", err) + } + if err := users.UpdateLastSeenBatch(ctx, []store.UserLastSeenUpdate{ + {UserID: first.ID, LastSeenAt: 5}, + {UserID: second.ID, LastSeenAt: 25}, + }); err != nil { + t.Fatalf("second batch: %v", err) + } + + loadedFirst, found, err := users.ByID(ctx, first.ID) + if err != nil || !found || loadedFirst.LastSeenAt != 30 { + t.Fatalf("first last seen = %d found=%v err=%v, want 30", loadedFirst.LastSeenAt, found, err) + } + loadedSecond, found, err := users.ByID(ctx, second.ID) + if err != nil || !found || loadedSecond.LastSeenAt != 25 { + t.Fatalf("second last seen = %d found=%v err=%v, want 25", loadedSecond.LastSeenAt, found, err) + } +} diff --git a/internal/store/postgres/welcome_message.go b/internal/store/postgres/welcome_message.go new file mode 100644 index 00000000..96fa2cf7 --- /dev/null +++ b/internal/store/postgres/welcome_message.go @@ -0,0 +1,342 @@ +package postgres + +import ( + "bytes" + "context" + "encoding/json" + "errors" + "fmt" + "math" + "reflect" + + "github.com/jackc/pgx/v5" + + "telesrv/internal/domain" + "telesrv/internal/store" + "telesrv/internal/store/postgres/sqlcgen" +) + +type WelcomeMessageStore struct { + db sqlcgen.DBTX +} + +func NewWelcomeMessageStore(db sqlcgen.DBTX) *WelcomeMessageStore { + return &WelcomeMessageStore{db: db} +} + +var _ store.WelcomeMessageStore = (*WelcomeMessageStore)(nil) + +const welcomeMessageColumns = `id, creator_user_id, date, edit_date, random_id, + content, create_fingerprint, version` + +type welcomeMessageRow interface { + Scan(dest ...any) error +} + +func (s *WelcomeMessageStore) CreateWelcomeMessage(ctx context.Context, req domain.CreateWelcomeMessageRequest) (stored domain.WelcomeMessage, created bool, err error) { + if s == nil || s.db == nil { + return domain.WelcomeMessage{}, false, fmt.Errorf("welcome message store is not configured") + } + if err := req.Validate(); err != nil { + return domain.WelcomeMessage{}, false, err + } + content, err := json.Marshal(req.Content) + if err != nil { + return domain.WelcomeMessage{}, false, fmt.Errorf("marshal welcome message content: %w", err) + } + err = withTx(ctx, s.db, "create welcome message", func(tx pgx.Tx) error { + if _, err := tx.Exec(ctx, ` +INSERT INTO welcome_message_peers (channel_id) +VALUES ($1) +ON CONFLICT (channel_id) DO NOTHING`, req.Peer.ID); err != nil { + return fmt.Errorf("ensure welcome message peer: %w", err) + } + var nextID int + var revision int64 + if err := tx.QueryRow(ctx, ` +SELECT next_id, revision +FROM welcome_message_peers +WHERE channel_id = $1 +FOR UPDATE`, req.Peer.ID).Scan(&nextID, &revision); err != nil { + return fmt.Errorf("lock welcome message peer: %w", err) + } + existing, err := scanWelcomeMessage(tx.QueryRow(ctx, ` +SELECT `+welcomeMessageColumns+` +FROM welcome_messages +WHERE channel_id = $1 AND creator_user_id = $2 AND random_id = $3`, + req.Peer.ID, req.CreatorUserID, req.RandomID), req.Peer) + if err == nil { + if !bytes.Equal(existing.CreateFingerprint[:], req.CreateFingerprint[:]) { + return domain.ErrWelcomeMessageRandomIDConflict + } + stored = existing + created = false + return nil + } + if !errors.Is(err, pgx.ErrNoRows) { + return fmt.Errorf("lookup welcome message idempotency key: %w", err) + } + var count int + if err := tx.QueryRow(ctx, `SELECT count(*) FROM welcome_messages WHERE channel_id = $1`, req.Peer.ID).Scan(&count); err != nil { + return fmt.Errorf("count welcome messages: %w", err) + } + if count >= domain.MaxWelcomeMessagesPerPeer { + return domain.ErrWelcomeMessageLimit + } + if nextID <= 0 || nextID >= domain.MaxMessageBoxID { + return domain.ErrWelcomeMessageInvalid + } + nextRevision, err := domain.NextWelcomeRevision(revision) + if err != nil { + return err + } + stored, err = scanWelcomeMessage(tx.QueryRow(ctx, ` +INSERT INTO welcome_messages ( + channel_id, id, creator_user_id, date, edit_date, random_id, + content, create_fingerprint, version +) VALUES ($1,$2,$3,$4,0,$5,$6::jsonb,$7,1) +RETURNING `+welcomeMessageColumns, + req.Peer.ID, nextID, req.CreatorUserID, req.Date, req.RandomID, + content, req.CreateFingerprint[:]), req.Peer) + if err != nil { + return fmt.Errorf("insert welcome message: %w", err) + } + if _, err := tx.Exec(ctx, ` +UPDATE welcome_message_peers +SET next_id = $2, revision = $3, updated_at = now() +WHERE channel_id = $1`, req.Peer.ID, nextID+1, nextRevision); err != nil { + return fmt.Errorf("advance welcome message peer: %w", err) + } + created = true + return nil + }) + return stored, created, err +} + +func (s *WelcomeMessageStore) EditWelcomeMessage(ctx context.Context, req domain.EditWelcomeMessageRequest) (stored domain.WelcomeMessage, err error) { + if s == nil || s.db == nil { + return domain.WelcomeMessage{}, fmt.Errorf("welcome message store is not configured") + } + if err := req.Validate(); err != nil { + return domain.WelcomeMessage{}, err + } + err = withTx(ctx, s.db, "edit welcome message", func(tx pgx.Tx) error { + var revision int64 + if err := tx.QueryRow(ctx, ` +SELECT revision FROM welcome_message_peers WHERE channel_id = $1 FOR UPDATE`, req.Peer.ID).Scan(&revision); errors.Is(err, pgx.ErrNoRows) { + return domain.ErrWelcomeMessageNotFound + } else if err != nil { + return fmt.Errorf("lock welcome message peer: %w", err) + } + current, err := scanWelcomeMessage(tx.QueryRow(ctx, ` +SELECT `+welcomeMessageColumns+` FROM welcome_messages +WHERE channel_id = $1 AND id = $2`, req.Peer.ID, req.ID), req.Peer) + if errors.Is(err, pgx.ErrNoRows) { + return domain.ErrWelcomeMessageNotFound + } + if err != nil { + return fmt.Errorf("get welcome message for edit: %w", err) + } + content, err := req.Fields.Apply(current.Content) + if err != nil { + return err + } + if reflect.DeepEqual(content, current.Content) { + return domain.ErrWelcomeMessageNotModified + } + if current.Version >= math.MaxInt64 { + return domain.ErrWelcomeMessageRevisionOverflow + } + nextRevision, err := domain.NextWelcomeRevision(revision) + if err != nil { + return err + } + raw, err := json.Marshal(content) + if err != nil { + return fmt.Errorf("marshal edited welcome message content: %w", err) + } + stored, err = scanWelcomeMessage(tx.QueryRow(ctx, ` +UPDATE welcome_messages +SET content = $3::jsonb, edit_date = GREATEST(date, $4), + version = version + 1, updated_at = now() +WHERE channel_id = $1 AND id = $2 +RETURNING `+welcomeMessageColumns, req.Peer.ID, req.ID, raw, req.EditDate), req.Peer) + if err != nil { + return fmt.Errorf("update welcome message: %w", err) + } + if _, err := tx.Exec(ctx, ` +UPDATE welcome_message_peers SET revision = $2, updated_at = now() WHERE channel_id = $1`, + req.Peer.ID, nextRevision); err != nil { + return fmt.Errorf("advance welcome message revision: %w", err) + } + return nil + }) + return stored, err +} + +func (s *WelcomeMessageStore) ListWelcomeMessages(ctx context.Context, peer domain.Peer, hash int64) (result domain.WelcomeMessageList, err error) { + if s == nil || s.db == nil { + return result, fmt.Errorf("welcome message store is not configured") + } + if peer.Type != domain.PeerTypeChannel || peer.ID <= 0 || hash < 0 { + return result, domain.ErrWelcomeMessageInvalid + } + err = withTx(ctx, s.db, "list welcome messages", func(tx pgx.Tx) error { + var revision int64 + err := tx.QueryRow(ctx, ` +SELECT revision FROM welcome_message_peers WHERE channel_id = $1 FOR SHARE`, peer.ID).Scan(&revision) + if errors.Is(err, pgx.ErrNoRows) { + revision = domain.InitialWelcomeRevision + } else if err != nil { + return fmt.Errorf("lock welcome message peer for read: %w", err) + } + result.Hash = revision + if hash == revision { + result.NotModified = true + return nil + } + rows, err := tx.Query(ctx, ` +SELECT `+welcomeMessageColumns+` FROM welcome_messages +WHERE channel_id = $1 ORDER BY id`, peer.ID) + if err != nil { + return fmt.Errorf("list welcome messages: %w", err) + } + defer rows.Close() + result.Messages = make([]domain.WelcomeMessage, 0, domain.MaxWelcomeMessagesPerPeer) + for rows.Next() { + message, err := scanWelcomeMessage(rows, peer) + if err != nil { + return fmt.Errorf("scan welcome message list: %w", err) + } + result.Messages = append(result.Messages, message) + } + if err := rows.Err(); err != nil { + return fmt.Errorf("iterate welcome messages: %w", err) + } + return nil + }) + return result, err +} + +func (s *WelcomeMessageStore) DeleteWelcomeMessage(ctx context.Context, peer domain.Peer, id int) (succeeded bool, err error) { + if s == nil || s.db == nil { + return false, fmt.Errorf("welcome message store is not configured") + } + if peer.Type != domain.PeerTypeChannel || peer.ID <= 0 || id <= 0 || id > domain.MaxMessageBoxID { + return false, domain.ErrWelcomeMessageInvalid + } + err = withTx(ctx, s.db, "delete welcome message", func(tx pgx.Tx) error { + var nextID int + var revision int64 + if err := tx.QueryRow(ctx, ` +SELECT next_id, revision FROM welcome_message_peers WHERE channel_id = $1 FOR UPDATE`, peer.ID).Scan(&nextID, &revision); errors.Is(err, pgx.ErrNoRows) { + return domain.ErrWelcomeMessageNotFound + } else if err != nil { + return fmt.Errorf("lock welcome message peer: %w", err) + } + tag, err := tx.Exec(ctx, `DELETE FROM welcome_messages WHERE channel_id = $1 AND id = $2`, peer.ID, id) + if err != nil { + return fmt.Errorf("delete welcome message: %w", err) + } + if tag.RowsAffected() == 0 { + if id < nextID { + succeeded = true + return nil + } + return domain.ErrWelcomeMessageNotFound + } + nextRevision, err := domain.NextWelcomeRevision(revision) + if err != nil { + return err + } + if _, err := tx.Exec(ctx, ` +UPDATE welcome_message_peers SET revision = $2, updated_at = now() WHERE channel_id = $1`, peer.ID, nextRevision); err != nil { + return fmt.Errorf("advance welcome message revision: %w", err) + } + succeeded = true + return nil + }) + return succeeded, err +} + +func (s *WelcomeMessageStore) DeleteAllWelcomeMessages(ctx context.Context, peer domain.Peer) (succeeded bool, err error) { + if s == nil || s.db == nil { + return false, fmt.Errorf("welcome message store is not configured") + } + if peer.Type != domain.PeerTypeChannel || peer.ID <= 0 { + return false, domain.ErrWelcomeMessageInvalid + } + err = withTx(ctx, s.db, "delete all welcome messages", func(tx pgx.Tx) error { + var revision int64 + err := tx.QueryRow(ctx, ` +SELECT revision FROM welcome_message_peers WHERE channel_id = $1 FOR UPDATE`, peer.ID).Scan(&revision) + if errors.Is(err, pgx.ErrNoRows) { + succeeded = true + return nil + } + if err != nil { + return fmt.Errorf("lock welcome message peer: %w", err) + } + tag, err := tx.Exec(ctx, `DELETE FROM welcome_messages WHERE channel_id = $1`, peer.ID) + if err != nil { + return fmt.Errorf("delete all welcome messages: %w", err) + } + if tag.RowsAffected() > 0 { + nextRevision, err := domain.NextWelcomeRevision(revision) + if err != nil { + return err + } + if _, err := tx.Exec(ctx, ` +UPDATE welcome_message_peers SET revision = $2, updated_at = now() WHERE channel_id = $1`, peer.ID, nextRevision); err != nil { + return fmt.Errorf("advance welcome message revision: %w", err) + } + } + succeeded = true + return nil + }) + return succeeded, err +} + +func (s *WelcomeMessageStore) HasWelcomeMessages(ctx context.Context, peer domain.Peer) (bool, error) { + if s == nil || s.db == nil { + return false, fmt.Errorf("welcome message store is not configured") + } + if peer.Type != domain.PeerTypeChannel || peer.ID <= 0 { + return false, domain.ErrWelcomeMessageInvalid + } + var exists bool + if err := s.db.QueryRow(ctx, `SELECT EXISTS ( + SELECT 1 FROM welcome_messages WHERE channel_id = $1 +)`, peer.ID).Scan(&exists); err != nil { + return false, fmt.Errorf("check welcome messages: %w", err) + } + return exists, nil +} + +func scanWelcomeMessage(row welcomeMessageRow, peer domain.Peer) (domain.WelcomeMessage, error) { + var ( + message domain.WelcomeMessage + contentRaw []byte + fingerprint []byte + version int64 + ) + if err := row.Scan(&message.ID, &message.CreatorUserID, &message.Date, &message.EditDate, + &message.RandomID, &contentRaw, &fingerprint, &version); err != nil { + return domain.WelcomeMessage{}, err + } + if len(fingerprint) != sha256Size || version <= 0 { + return domain.WelcomeMessage{}, domain.ErrWelcomeMessageInvalid + } + if err := json.Unmarshal(contentRaw, &message.Content); err != nil { + return domain.WelcomeMessage{}, fmt.Errorf("decode welcome message content: %w", err) + } + message.Peer = peer + message.Version = uint64(version) + copy(message.CreateFingerprint[:], fingerprint) + if err := message.ValidateStored(); err != nil { + return domain.WelcomeMessage{}, err + } + return message, nil +} + +const sha256Size = 32 diff --git a/internal/store/postgres/welcome_message_delivery.go b/internal/store/postgres/welcome_message_delivery.go new file mode 100644 index 00000000..9a8f054a --- /dev/null +++ b/internal/store/postgres/welcome_message_delivery.go @@ -0,0 +1,313 @@ +package postgres + +import ( + "context" + "encoding/json" + "fmt" + "math" + "sort" + "strings" + "time" + "unicode/utf8" + + "github.com/jackc/pgx/v5" + + "telesrv/internal/domain" + "telesrv/internal/store" +) + +var _ store.WelcomeMessageDeliveryStore = (*WelcomeMessageStore)(nil) + +// enqueueWelcomeMessageDeliveriesTx snapshots all templates for one bounded +// batch of inactive->active transitions. It takes one channel-scoped transaction +// lock, then uses two set operations: remove every older epoch and create one new +// event per distinct member. The separate lock statement is intentional: a waiter +// must acquire a fresh READ COMMITTED snapshot after the prior transaction commits. +func enqueueWelcomeMessageDeliveriesTx(ctx context.Context, tx pgx.Tx, channelID int64, members []domain.ChannelMember) error { + if tx == nil || channelID <= 0 { + return domain.ErrWelcomeMessageInvalid + } + if len(members) == 0 { + return nil + } + type activation struct { + userID int64 + joinedAt int + } + byUser := make(map[int64]activation, len(members)) + for _, member := range members { + if member.ChannelID != channelID || member.UserID <= 0 || member.Status != domain.ChannelMemberActive || + member.JoinedAt <= 0 || member.JoinedAt > math.MaxInt32 { + return domain.ErrWelcomeMessageInvalid + } + byUser[member.UserID] = activation{userID: member.UserID, joinedAt: member.JoinedAt} + } + activations := make([]activation, 0, len(byUser)) + for _, item := range byUser { + activations = append(activations, item) + } + sort.Slice(activations, func(i, j int) bool { return activations[i].userID < activations[j].userID }) + userIDs := make([]int64, len(activations)) + joinedAt := make([]int32, len(activations)) + for i, item := range activations { + userIDs[i] = item.userID + joinedAt[i] = int32(item.joinedAt) + } + if err := lockWelcomeMessageDeliveryChannelTx(ctx, tx, channelID); err != nil { + return err + } + // A later activation physically supersedes every older pending or delivered + // epoch. The current membership transaction serializes competing transitions. + if _, err := tx.Exec(ctx, ` +DELETE FROM welcome_message_deliveries +WHERE channel_id = $1 AND target_user_id = ANY($2::bigint[])`, channelID, userIDs); err != nil { + return fmt.Errorf("supersede previous welcome message deliveries: %w", err) + } + if _, err := tx.Exec(ctx, ` +WITH incoming AS MATERIALIZED ( + SELECT user_id, joined_at + FROM unnest($2::bigint[], $3::integer[]) AS value(user_id, joined_at) +), join_events AS MATERIALIZED ( + SELECT nextval('welcome_message_join_event_id_seq') AS id, user_id, joined_at + FROM incoming +) +INSERT INTO welcome_message_deliveries ( + join_event_id, channel_id, target_user_id, template_id, joined_at, content, + created_at, next_attempt_at, expires_at +) +SELECT e.id, w.channel_id, e.user_id, w.id, e.joined_at, w.content, + now(), now(), now() + interval '24 hours' +FROM welcome_messages w +CROSS JOIN join_events e +WHERE w.channel_id = $1 +ORDER BY e.user_id, w.id`, channelID, userIDs, joinedAt); err != nil { + return fmt.Errorf("enqueue welcome message deliveries: %w", err) + } + return nil +} + +func deleteWelcomeMessageDeliveriesTx(ctx context.Context, tx pgx.Tx, channelID int64, userIDs []int64) error { + if tx == nil || channelID <= 0 || len(userIDs) == 0 { + return domain.ErrWelcomeMessageInvalid + } + ids := append([]int64(nil), userIDs...) + sort.Slice(ids, func(i, j int) bool { return ids[i] < ids[j] }) + deduped := ids[:0] + for _, id := range ids { + if id <= 0 { + return domain.ErrWelcomeMessageInvalid + } + if len(deduped) == 0 || deduped[len(deduped)-1] != id { + deduped = append(deduped, id) + } + } + if err := lockWelcomeMessageDeliveryChannelTx(ctx, tx, channelID); err != nil { + return err + } + if _, err := tx.Exec(ctx, ` +DELETE FROM welcome_message_deliveries +WHERE channel_id = $1 AND target_user_id = ANY($2::bigint[])`, channelID, deduped); err != nil { + return fmt.Errorf("delete welcome message deliveries: %w", err) + } + return nil +} + +func deleteChannelWelcomeMessageDeliveriesTx(ctx context.Context, tx pgx.Tx, channelID int64) error { + if tx == nil || channelID <= 0 { + return domain.ErrWelcomeMessageInvalid + } + if err := lockWelcomeMessageDeliveryChannelTx(ctx, tx, channelID); err != nil { + return err + } + if _, err := tx.Exec(ctx, `DELETE FROM welcome_message_deliveries WHERE channel_id = $1`, channelID); err != nil { + return fmt.Errorf("delete channel welcome message deliveries: %w", err) + } + return nil +} + +func lockWelcomeMessageDeliveryChannelTx(ctx context.Context, tx pgx.Tx, channelID int64) error { + if _, err := tx.Exec(ctx, ` +SELECT pg_advisory_xact_lock(hashtextextended('welcome-message-delivery:' || $1::bigint::text, 0))`, channelID); err != nil { + return fmt.Errorf("lock channel welcome message deliveries: %w", err) + } + return nil +} + +func (s *WelcomeMessageStore) ClaimWelcomeMessageDeliveries( + ctx context.Context, + owner string, + now time.Time, + limit int, + lease time.Duration, +) ([]domain.WelcomeMessageDelivery, error) { + if s == nil || s.db == nil { + return nil, fmt.Errorf("welcome message delivery store is not configured") + } + owner = strings.TrimSpace(owner) + if owner == "" || len(owner) > 128 || now.IsZero() || limit <= 0 || lease <= 0 { + return nil, domain.ErrWelcomeMessageInvalid + } + if limit > 1000 { + limit = 1000 + } + rows, err := s.db.Query(ctx, ` +WITH leaders AS ( + SELECT d.id, d.join_event_id + FROM welcome_message_deliveries d + WHERE d.delivered_at IS NULL + AND d.expires_at > $2 + AND d.next_attempt_at <= $2 + AND (d.lease_expires_at IS NULL OR d.lease_expires_at <= $2) + AND d.id = ( + SELECT min(first.id) + FROM welcome_message_deliveries first + WHERE first.join_event_id = d.join_event_id AND first.delivered_at IS NULL + ) + ORDER BY d.next_attempt_at, d.id + LIMIT $3 + FOR UPDATE OF d SKIP LOCKED +), claimed AS ( +UPDATE welcome_message_deliveries d +SET lease_owner = $1, + lease_expires_at = $2 + $4::interval, + attempt_count = d.attempt_count + 1 +FROM leaders leader +WHERE d.join_event_id = leader.join_event_id + AND d.delivered_at IS NULL + AND d.expires_at > $2 + AND d.next_attempt_at <= $2 + AND (d.lease_expires_at IS NULL OR d.lease_expires_at <= $2) +RETURNING d.id, d.join_event_id, d.channel_id, d.target_user_id, + d.template_id, d.ephemeral_id, d.joined_at, d.content, + d.attempt_count, d.expires_at +) +SELECT * FROM claimed +ORDER BY join_event_id, template_id, id`, owner, now, limit, lease.String()) + if err != nil { + return nil, fmt.Errorf("claim welcome message deliveries: %w", err) + } + defer rows.Close() + deliveries := make([]domain.WelcomeMessageDelivery, 0, limit) + for rows.Next() { + var delivery domain.WelcomeMessageDelivery + var content []byte + if err := rows.Scan( + &delivery.ID, &delivery.JoinEventID, &delivery.ChannelID, &delivery.TargetUserID, + &delivery.TemplateID, &delivery.EphemeralID, &delivery.JoinedAt, &content, + &delivery.AttemptCount, &delivery.ExpiresAt, + ); err != nil { + return nil, fmt.Errorf("scan welcome message delivery: %w", err) + } + if err := json.Unmarshal(content, &delivery.Content); err != nil { + return nil, fmt.Errorf("decode welcome message delivery %d: %w", delivery.ID, err) + } + if err := delivery.ValidateStored(now); err != nil { + return nil, fmt.Errorf("validate welcome message delivery %d: %w", delivery.ID, err) + } + deliveries = append(deliveries, delivery) + } + if err := rows.Err(); err != nil { + return nil, fmt.Errorf("iterate welcome message deliveries: %w", err) + } + sort.Slice(deliveries, func(i, j int) bool { + if deliveries[i].JoinEventID != deliveries[j].JoinEventID { + return deliveries[i].JoinEventID < deliveries[j].JoinEventID + } + if deliveries[i].TemplateID != deliveries[j].TemplateID { + return deliveries[i].TemplateID < deliveries[j].TemplateID + } + return deliveries[i].ID < deliveries[j].ID + }) + return deliveries, nil +} + +func (s *WelcomeMessageStore) AckWelcomeMessageDeliveries(ctx context.Context, owner string, ids []int64, deliveredAt time.Time) (int, error) { + if s == nil || s.db == nil { + return 0, fmt.Errorf("welcome message delivery store is not configured") + } + ids, ok := normalizeWelcomeDeliveryIDs(ids) + if strings.TrimSpace(owner) == "" || !ok || deliveredAt.IsZero() { + return 0, domain.ErrWelcomeMessageInvalid + } + tag, err := s.db.Exec(ctx, ` +UPDATE welcome_message_deliveries +SET delivered_at = $3, lease_owner = NULL, lease_expires_at = NULL, + last_error = '' +WHERE id = ANY($1::bigint[]) AND lease_owner = $2 + AND delivered_at IS NULL AND expires_at > $3`, ids, owner, deliveredAt) + if err != nil { + return 0, fmt.Errorf("ack welcome message deliveries: %w", err) + } + return int(tag.RowsAffected()), nil +} + +func (s *WelcomeMessageStore) RetryWelcomeMessageDeliveries(ctx context.Context, owner string, ids []int64, nextAttempt time.Time, lastError string) (int, error) { + if s == nil || s.db == nil { + return 0, fmt.Errorf("welcome message delivery store is not configured") + } + ids, ok := normalizeWelcomeDeliveryIDs(ids) + if strings.TrimSpace(owner) == "" || !ok || nextAttempt.IsZero() { + return 0, domain.ErrWelcomeMessageInvalid + } + tag, err := s.db.Exec(ctx, ` +UPDATE welcome_message_deliveries +SET next_attempt_at = LEAST($3, expires_at), + lease_owner = NULL, lease_expires_at = NULL, last_error = $4 +WHERE id = ANY($1::bigint[]) AND lease_owner = $2 AND delivered_at IS NULL`, + ids, owner, nextAttempt, truncateWelcomeDeliveryError(lastError)) + if err != nil { + return 0, fmt.Errorf("retry welcome message deliveries: %w", err) + } + return int(tag.RowsAffected()), nil +} + +func (s *WelcomeMessageStore) DeleteExpiredWelcomeMessageDeliveries(ctx context.Context, now time.Time, limit int) (int, error) { + if s == nil || s.db == nil { + return 0, fmt.Errorf("welcome message delivery store is not configured") + } + if now.IsZero() || limit <= 0 { + return 0, domain.ErrWelcomeMessageInvalid + } + if limit > 5000 { + limit = 5000 + } + tag, err := s.db.Exec(ctx, ` +WITH expired AS ( + SELECT id + FROM welcome_message_deliveries + WHERE expires_at <= $1 + ORDER BY expires_at, id + LIMIT $2 + FOR UPDATE SKIP LOCKED +) +DELETE FROM welcome_message_deliveries d +USING expired e +WHERE d.id = e.id`, now, limit) + if err != nil { + return 0, fmt.Errorf("delete expired welcome message deliveries: %w", err) + } + return int(tag.RowsAffected()), nil +} + +func truncateWelcomeDeliveryError(value string) string { + const maxRunes = 1024 + if utf8.RuneCountInString(value) <= maxRunes { + return value + } + runes := []rune(value) + return string(runes[:maxRunes]) +} + +func normalizeWelcomeDeliveryIDs(ids []int64) ([]int64, bool) { + if len(ids) == 0 { + return nil, false + } + result := append([]int64(nil), ids...) + sort.Slice(result, func(i, j int) bool { return result[i] < result[j] }) + for i, id := range result { + if id <= 0 || (i > 0 && id == result[i-1]) { + return nil, false + } + } + return result, true +} diff --git a/internal/store/postgres/welcome_message_integration_test.go b/internal/store/postgres/welcome_message_integration_test.go new file mode 100644 index 00000000..e849c6d0 --- /dev/null +++ b/internal/store/postgres/welcome_message_integration_test.go @@ -0,0 +1,437 @@ +package postgres + +import ( + "context" + "errors" + "fmt" + "sort" + "sync" + "testing" + "time" + + "github.com/jackc/pgx/v5/pgxpool" + + "telesrv/internal/domain" +) + +func TestWelcomeMessageStoreDurabilityIdempotencyConcurrencyAndNoPTS(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + suffix := randomSuffix(t) + users := NewUserStore(pool) + owner := createTestUser(t, ctx, users, "+1779"+suffix+"01", "WelcomeOwner", "") + channels := NewChannelStore(pool) + createdChannel, err := channels.CreateChannel(ctx, domain.CreateChannelRequest{ + CreatorUserID: owner.ID, Title: "Welcome " + suffix, Megagroup: true, Date: 1700000000, + }) + if err != nil { + t.Fatalf("create channel: %v", err) + } + peer := domain.Peer{Type: domain.PeerTypeChannel, ID: createdChannel.Channel.ID} + t.Cleanup(func() { + _, _ = pool.Exec(ctx, "DELETE FROM channels WHERE id = $1", peer.ID) + _, _ = pool.Exec(ctx, "DELETE FROM users WHERE id = $1", owner.ID) + }) + + countsBefore := welcomeSideEffectCounts(t, ctx, pool, owner.ID, peer.ID) + store := NewWelcomeMessageStore(pool) + initial, err := store.ListWelcomeMessages(ctx, peer, 0) + if err != nil || initial.Hash != domain.InitialWelcomeRevision || initial.NotModified || len(initial.Messages) != 0 { + t.Fatalf("initial list = %+v err=%v", initial, err) + } + if same, err := store.ListWelcomeMessages(ctx, peer, initial.Hash); err != nil || !same.NotModified { + t.Fatalf("initial not-modified = %+v err=%v", same, err) + } + + makeRequest := func(randomID int64, text string) domain.CreateWelcomeMessageRequest { + content := domain.WelcomeMessageContent{Message: text} + fingerprint, err := domain.WelcomeCreateFingerprint(peer, owner.ID, randomID, content) + if err != nil { + t.Fatal(err) + } + return domain.CreateWelcomeMessageRequest{ + Peer: peer, CreatorUserID: owner.ID, Date: 1700000001, + RandomID: randomID, Content: content, CreateFingerprint: fingerprint, + } + } + firstRequest := makeRequest(5001, "first") + first, fresh, err := store.CreateWelcomeMessage(ctx, firstRequest) + if err != nil || !fresh || first.ID != 1 || first.Version != 1 { + t.Fatalf("first create = %+v fresh=%v err=%v", first, fresh, err) + } + replayed, fresh, err := NewWelcomeMessageStore(pool).CreateWelcomeMessage(ctx, firstRequest) + if err != nil || fresh || replayed.ID != first.ID { + t.Fatalf("restart replay = %+v fresh=%v err=%v", replayed, fresh, err) + } + conflict := makeRequest(firstRequest.RandomID, "conflict") + if _, _, err := store.CreateWelcomeMessage(ctx, conflict); !errors.Is(err, domain.ErrWelcomeMessageRandomIDConflict) { + t.Fatalf("conflicting replay err=%v", err) + } + + edited, err := store.EditWelcomeMessage(ctx, domain.EditWelcomeMessageRequest{ + Peer: peer, ID: first.ID, EditDate: 1700000002, + Fields: domain.WelcomeMessageEditFields{SetMessage: true, Message: "edited", SetEntities: true}, + }) + if err != nil || edited.Content.Message != "edited" || edited.Version != 2 || edited.EditDate != 1700000002 { + t.Fatalf("edit = %+v err=%v", edited, err) + } + replayed, fresh, err = store.CreateWelcomeMessage(ctx, firstRequest) + if err != nil || fresh || replayed.Content.Message != "edited" || replayed.Version != 2 { + t.Fatalf("create replay after edit = %+v fresh=%v err=%v", replayed, fresh, err) + } + + start := make(chan struct{}) + var wg sync.WaitGroup + var mu sync.Mutex + ids := []int{first.ID} + limitErrors := 0 + unexpected := []error{} + for i := 0; i < 8; i++ { + wg.Add(1) + go func(index int) { + defer wg.Done() + <-start + message, _, err := NewWelcomeMessageStore(pool).CreateWelcomeMessage(ctx, makeRequest(int64(6000+index), fmt.Sprintf("parallel-%d", index))) + mu.Lock() + defer mu.Unlock() + switch { + case err == nil: + ids = append(ids, message.ID) + case errors.Is(err, domain.ErrWelcomeMessageLimit): + limitErrors++ + default: + unexpected = append(unexpected, err) + } + }(i) + } + close(start) + wg.Wait() + sort.Ints(ids) + if len(unexpected) != 0 || len(ids) != domain.MaxWelcomeMessagesPerPeer || limitErrors != 4 { + t.Fatalf("parallel ids=%v limitErrors=%d unexpected=%v", ids, limitErrors, unexpected) + } + for index, id := range ids { + if id != index+1 { + t.Fatalf("parallel ids=%v, want monotonic 1..5", ids) + } + } + + afterRestart, err := NewWelcomeMessageStore(pool).ListWelcomeMessages(ctx, peer, 0) + if err != nil || len(afterRestart.Messages) != domain.MaxWelcomeMessagesPerPeer || afterRestart.Hash <= initial.Hash { + t.Fatalf("restart list = hash:%d messages:%d err=%v", afterRestart.Hash, len(afterRestart.Messages), err) + } + if has, err := store.HasWelcomeMessages(ctx, peer); err != nil || !has { + t.Fatalf("has welcome messages=%v,%v", has, err) + } + if ok, err := store.DeleteWelcomeMessage(ctx, peer, first.ID); err != nil || !ok { + t.Fatalf("delete=%v,%v", ok, err) + } + if ok, err := store.DeleteWelcomeMessage(ctx, peer, first.ID); err != nil || !ok { + t.Fatalf("idempotent delete=%v,%v", ok, err) + } + if _, err := store.DeleteWelcomeMessage(ctx, peer, 99); !errors.Is(err, domain.ErrWelcomeMessageNotFound) { + t.Fatalf("future delete err=%v", err) + } + if ok, err := store.DeleteAllWelcomeMessages(ctx, peer); err != nil || !ok { + t.Fatalf("delete all=%v,%v", ok, err) + } + empty, err := store.ListWelcomeMessages(ctx, peer, 0) + if err != nil || len(empty.Messages) != 0 { + t.Fatalf("empty after delete all=%+v err=%v", empty, err) + } + if ok, err := store.DeleteAllWelcomeMessages(ctx, peer); err != nil || !ok { + t.Fatalf("idempotent delete all=%v,%v", ok, err) + } + if has, err := store.HasWelcomeMessages(ctx, peer); err != nil || has { + t.Fatalf("has after delete all=%v,%v", has, err) + } + if got := welcomeSideEffectCounts(t, ctx, pool, owner.ID, peer.ID); got != countsBefore { + t.Fatalf("welcome mutations changed PTS/event/outbox counts: before=%+v after=%+v", countsBefore, got) + } +} + +func TestWelcomeMessageJoinDeliveryIsTransactionalLeasedAndTTLBounded(t *testing.T) { + pool := testPool(t) + ctx := context.Background() + suffix := randomSuffix(t) + users := NewUserStore(pool) + owner := createTestUser(t, ctx, users, "+1778"+suffix+"01", "WelcomeOwner", "") + member := createTestUser(t, ctx, users, "+1778"+suffix+"02", "WelcomeMember", "") + secondMember := createTestUser(t, ctx, users, "+1778"+suffix+"03", "WelcomeSecond", "") + channels := NewChannelStore(pool) + created, err := channels.CreateChannel(ctx, domain.CreateChannelRequest{ + CreatorUserID: owner.ID, Title: "Welcome Delivery " + suffix, Megagroup: true, Date: 1700000100, + }) + if err != nil { + t.Fatalf("create channel: %v", err) + } + channelID := created.Channel.ID + peer := domain.Peer{Type: domain.PeerTypeChannel, ID: channelID} + t.Cleanup(func() { + _, _ = pool.Exec(ctx, "DELETE FROM channels WHERE id = $1", channelID) + _, _ = pool.Exec(ctx, "DELETE FROM users WHERE id = ANY($1)", []int64{owner.ID, member.ID, secondMember.ID}) + }) + + welcomeStore := NewWelcomeMessageStore(pool) + contents := []domain.WelcomeMessageContent{{Message: "hello new member"}, {Message: "read the rules"}} + for index, content := range contents { + randomID := int64(9001 + index) + fingerprint, err := domain.WelcomeCreateFingerprint(peer, owner.ID, randomID, content) + if err != nil { + t.Fatal(err) + } + if _, fresh, err := welcomeStore.CreateWelcomeMessage(ctx, domain.CreateWelcomeMessageRequest{ + Peer: peer, CreatorUserID: owner.ID, Date: 1700000101, RandomID: randomID, + Content: content, CreateFingerprint: fingerprint, + }); err != nil || !fresh { + t.Fatalf("create welcome template %d fresh=%v err=%v", index, fresh, err) + } + } + + firstJoin := 1700000102 + if _, err := channels.InviteToChannel(ctx, channelID, owner.ID, []int64{member.ID, secondMember.ID}, firstJoin); err != nil { + t.Fatalf("batch invite members: %v", err) + } + var batchRows, batchUsers, batchEvents int + if err := pool.QueryRow(ctx, ` +SELECT count(*), count(DISTINCT target_user_id), count(DISTINCT join_event_id) +FROM welcome_message_deliveries +WHERE channel_id=$1 AND target_user_id=ANY($2::bigint[])`, channelID, []int64{member.ID, secondMember.ID}). + Scan(&batchRows, &batchUsers, &batchEvents); err != nil { + t.Fatal(err) + } + if batchRows != len(contents)*2 || batchUsers != 2 || batchEvents != 2 { + t.Fatalf("batch rows=%d users=%d events=%d", batchRows, batchUsers, batchEvents) + } + if _, err := channels.EditChannelBanned(ctx, domain.EditChannelBannedRequest{ + UserID: owner.ID, ChannelID: channelID, + Participant: domain.Peer{Type: domain.PeerTypeUser, ID: secondMember.ID}, + BannedRights: domain.ChannelBannedRights{ViewMessages: true}, Date: firstJoin + 1, + }); err != nil { + t.Fatalf("kick second member: %v", err) + } + var secondAfterLeave int + if err := pool.QueryRow(ctx, `SELECT count(*) FROM welcome_message_deliveries WHERE channel_id=$1 AND target_user_id=$2`, channelID, secondMember.ID).Scan(&secondAfterLeave); err != nil || secondAfterLeave != 0 { + t.Fatalf("second member deliveries after kick=%d err=%v", secondAfterLeave, err) + } + var firstEvent int64 + var firstJoined int + var expiresInSeconds int64 + var firstTemplateCount int + if err := pool.QueryRow(ctx, ` +SELECT min(join_event_id), min(joined_at), min(EXTRACT(EPOCH FROM (expires_at - created_at)))::bigint, count(*) +FROM welcome_message_deliveries +WHERE channel_id=$1 AND target_user_id=$2 AND delivered_at IS NULL`, channelID, member.ID). + Scan(&firstEvent, &firstJoined, &expiresInSeconds, &firstTemplateCount); err != nil { + t.Fatalf("read first delivery: %v", err) + } + if firstEvent <= 0 || firstJoined != firstJoin || firstTemplateCount != len(contents) || expiresInSeconds != int64(domain.WelcomeMessageDeliveryTTL/time.Second) { + t.Fatalf("first delivery event=%d joined=%d templates=%d ttl_seconds=%d", firstEvent, firstJoined, firstTemplateCount, expiresInSeconds) + } + + // A waiter must take its DELETE snapshot only after the previous activation + // commits; otherwise two concurrent epochs could survive the delete+insert pair. + tx1, err := pool.Begin(ctx) + if err != nil { + t.Fatal(err) + } + firstConcurrent := domain.ChannelMember{ChannelID: channelID, UserID: member.ID, Status: domain.ChannelMemberActive, JoinedAt: firstJoin + 10} + if err := enqueueWelcomeMessageDeliveriesTx(ctx, tx1, channelID, []domain.ChannelMember{firstConcurrent}); err != nil { + _ = tx1.Rollback(ctx) + t.Fatal(err) + } + pidReady := make(chan int) + concurrentDone := make(chan error, 1) + go func() { + tx2, err := pool.Begin(ctx) + if err != nil { + pidReady <- 0 + concurrentDone <- err + return + } + defer tx2.Rollback(ctx) // no-op after Commit + var pid int + if err := tx2.QueryRow(ctx, `SELECT pg_backend_pid()`).Scan(&pid); err != nil { + pidReady <- 0 + concurrentDone <- err + return + } + pidReady <- pid + secondConcurrent := firstConcurrent + secondConcurrent.JoinedAt = firstJoin + 20 + if err := enqueueWelcomeMessageDeliveriesTx(ctx, tx2, channelID, []domain.ChannelMember{secondConcurrent}); err != nil { + concurrentDone <- err + return + } + concurrentDone <- tx2.Commit(ctx) + }() + waitingPID := <-pidReady + if waitingPID == 0 { + _ = tx1.Rollback(ctx) + t.Fatal(<-concurrentDone) + } + waitDeadline := time.Now().Add(2 * time.Second) + for { + var waitType string + if err := pool.QueryRow(ctx, `SELECT COALESCE(wait_event_type, '') FROM pg_stat_activity WHERE pid=$1`, waitingPID).Scan(&waitType); err != nil { + _ = tx1.Rollback(ctx) + t.Fatal(err) + } + if waitType == "Lock" { + break + } + if time.Now().After(waitDeadline) { + _ = tx1.Rollback(ctx) + t.Fatalf("concurrent enqueue PID %d did not wait for advisory lock", waitingPID) + } + time.Sleep(10 * time.Millisecond) + } + if err := tx1.Commit(ctx); err != nil { + t.Fatal(err) + } + if err := <-concurrentDone; err != nil { + t.Fatal(err) + } + var concurrentRows, concurrentEvents, latestJoined int + if err := pool.QueryRow(ctx, ` +SELECT count(*), count(DISTINCT join_event_id), max(joined_at) +FROM welcome_message_deliveries WHERE channel_id=$1 AND target_user_id=$2`, channelID, member.ID). + Scan(&concurrentRows, &concurrentEvents, &latestJoined); err != nil { + t.Fatal(err) + } + if concurrentRows != len(contents) || concurrentEvents != 1 || latestJoined != firstJoin+20 { + t.Fatalf("concurrent rows=%d events=%d latest_joined=%d", concurrentRows, concurrentEvents, latestJoined) + } + + // A new active epoch supersedes the prior pending row instead of releasing + // both when the member next opens a compatible client. + if _, err := channels.LeaveChannel(ctx, channelID, member.ID, firstJoin+2); err != nil { + t.Fatalf("leave channel: %v", err) + } + var afterLeave int + if err := pool.QueryRow(ctx, `SELECT count(*) FROM welcome_message_deliveries WHERE channel_id=$1 AND target_user_id=$2`, channelID, member.ID).Scan(&afterLeave); err != nil || afterLeave != 0 { + t.Fatalf("deliveries after leave=%d err=%v", afterLeave, err) + } + secondJoin := firstJoin + 3 + if _, err := channels.InviteToChannel(ctx, channelID, owner.ID, []int64{member.ID}, secondJoin); err != nil { + t.Fatalf("reinvite member: %v", err) + } + var pendingCount int + var secondEvent int64 + var secondJoined int + var secondEvents int + if err := pool.QueryRow(ctx, ` +SELECT count(*), count(DISTINCT join_event_id), max(join_event_id), max(joined_at) +FROM welcome_message_deliveries +WHERE channel_id=$1 AND target_user_id=$2 AND delivered_at IS NULL`, channelID, member.ID). + Scan(&pendingCount, &secondEvents, &secondEvent, &secondJoined); err != nil { + t.Fatal(err) + } + if pendingCount != len(contents) || secondEvents != 1 || secondEvent == firstEvent || secondJoined != secondJoin { + t.Fatalf("pending=%d events=%d first_event=%d second_event=%d joined=%d", pendingCount, secondEvents, firstEvent, secondEvent, secondJoined) + } + + now := time.Now() + // limit counts join events, not template rows: one event claims both templates + // so the dispatcher can project and encode exactly once. + claimed, err := welcomeStore.ClaimWelcomeMessageDeliveries(ctx, "test-worker", now, 1, 15*time.Second) + if err != nil || len(claimed) != len(contents) { + t.Fatalf("claim=%+v err=%v", claimed, err) + } + ids := make([]int64, len(claimed)) + for index, delivery := range claimed { + ids[index] = delivery.ID + if delivery.JoinEventID != secondEvent || delivery.JoinedAt != secondJoin || delivery.Content.Message != contents[index].Message || delivery.AttemptCount != 1 { + t.Fatalf("delivery[%d]=%+v", index, delivery) + } + } + retryAt := now.Add(10 * time.Second) + if updated, err := welcomeStore.RetryWelcomeMessageDeliveries(ctx, "test-worker", ids, retryAt, "offline"); err != nil || updated != len(ids) { + t.Fatalf("retry updated=%d err=%v", updated, err) + } + if early, err := welcomeStore.ClaimWelcomeMessageDeliveries(ctx, "other-worker", now.Add(time.Second), 1, 15*time.Second); err != nil || len(early) != 0 { + t.Fatalf("early claim=%+v err=%v", early, err) + } + reclaimed, err := welcomeStore.ClaimWelcomeMessageDeliveries(ctx, "other-worker", retryAt, 1, 15*time.Second) + if err != nil || len(reclaimed) != len(contents) || reclaimed[0].AttemptCount != 2 || reclaimed[1].AttemptCount != 2 { + t.Fatalf("reclaim=%+v err=%v", reclaimed, err) + } + if acked, err := welcomeStore.AckWelcomeMessageDeliveries(ctx, "other-worker", ids, retryAt); err != nil || acked != len(ids) { + t.Fatalf("ack=%d err=%v", acked, err) + } + if _, err := channels.LeaveChannel(ctx, channelID, member.ID, secondJoin+1); err != nil { + t.Fatalf("leave after delivered welcome: %v", err) + } + var deliveredAfterLeave int + if err := pool.QueryRow(ctx, `SELECT count(*) FROM welcome_message_deliveries WHERE channel_id=$1 AND target_user_id=$2`, channelID, member.ID).Scan(&deliveredAfterLeave); err != nil || deliveredAfterLeave != 0 { + t.Fatalf("delivered rows after leave=%d err=%v", deliveredAfterLeave, err) + } + thirdJoin := secondJoin + 2 + if _, err := channels.InviteToChannel(ctx, channelID, owner.ID, []int64{member.ID}, thirdJoin); err != nil { + t.Fatalf("third join: %v", err) + } + expiryNow := time.Now().Add(time.Second) + claimStart := make(chan struct{}) + claimResults := make([][]domain.WelcomeMessageDelivery, 2) + claimErrors := make([]error, 2) + var claimWG sync.WaitGroup + for i := range claimResults { + claimWG.Add(1) + go func(index int) { + defer claimWG.Done() + <-claimStart + claimResults[index], claimErrors[index] = welcomeStore.ClaimWelcomeMessageDeliveries( + ctx, fmt.Sprintf("expiry-worker-%d", index), expiryNow, 1, 15*time.Second, + ) + }(i) + } + close(claimStart) + claimWG.Wait() + if claimErrors[0] != nil || claimErrors[1] != nil || len(claimResults[0])+len(claimResults[1]) != len(contents) || + (len(claimResults[0]) != 0 && len(claimResults[0]) != len(contents)) || + (len(claimResults[1]) != 0 && len(claimResults[1]) != len(contents)) { + t.Fatalf("concurrent group claims=%v/%v errors=%v/%v", claimResults[0], claimResults[1], claimErrors[0], claimErrors[1]) + } + expiryClaim := claimResults[0] + if len(expiryClaim) == 0 { + expiryClaim = claimResults[1] + } + expiryIDs := make([]int64, len(expiryClaim)) + for i, delivery := range expiryClaim { + expiryIDs[i] = delivery.ID + } + + // Both pending and delivered records are retention-bounded. Move this row's + // whole TTL window into the past, then verify physical deletion. + if _, err := pool.Exec(ctx, ` +UPDATE welcome_message_deliveries +SET created_at=$2, expires_at=$3 +WHERE id=ANY($1::bigint[])`, expiryIDs, expiryNow.Add(-25*time.Hour), expiryNow.Add(-time.Hour)); err != nil { + t.Fatalf("age delivery: %v", err) + } + deleted, err := welcomeStore.DeleteExpiredWelcomeMessageDeliveries(ctx, expiryNow, 10) + if err != nil || deleted != len(expiryIDs) { + t.Fatalf("delete expired=%d err=%v", deleted, err) + } +} + +type welcomeEffectCounts struct { + ChannelEvents int + UserEvents int + Outbox int +} + +func welcomeSideEffectCounts(t *testing.T, ctx context.Context, pool *pgxpool.Pool, userID, channelID int64) welcomeEffectCounts { + t.Helper() + var result welcomeEffectCounts + if err := pool.QueryRow(ctx, `SELECT count(*) FROM channel_update_events WHERE channel_id = $1`, channelID).Scan(&result.ChannelEvents); err != nil { + t.Fatalf("count channel events: %v", err) + } + if err := pool.QueryRow(ctx, `SELECT count(*) FROM user_update_events WHERE user_id = $1`, userID).Scan(&result.UserEvents); err != nil { + t.Fatalf("count user events: %v", err) + } + if err := pool.QueryRow(ctx, `SELECT count(*) FROM dispatch_outbox WHERE target_user_id = $1`, userID).Scan(&result.Outbox); err != nil { + t.Fatalf("count dispatch outbox: %v", err) + } + return result +} diff --git a/internal/store/read_model_batch.go b/internal/store/read_model_batch.go new file mode 100644 index 00000000..1925ccfe --- /dev/null +++ b/internal/store/read_model_batch.go @@ -0,0 +1,301 @@ +package store + +import ( + "context" + "errors" + "fmt" + "sync" + "time" + + "telesrv/internal/domain" +) + +// ReadModelVersionBatchConfig bounds synchronous cross-request batching of +// durable read-model hash misses. MaxKeys limits the union sent to one database +// query; QueueSize limits accepted requests, not individual keys. +type ReadModelVersionBatchConfig struct { + MaxKeys int + MaxWait time.Duration + QueueSize int + QueryTimeout time.Duration +} + +type readModelVersionBatchRequest struct { + ctx context.Context + keys []ReadModelKey + result chan readModelVersionBatchResult +} + +type readModelVersionBatchResult struct { + hashes map[ReadModelKey]int64 + err error +} + +// BatchedReadModelVersionStore combines contemporaneous exact-key misses into +// one base ReadModelHashes call. It is deliberately below +// CachedReadModelVersionStore: the cache still owns exact-key inflight +// singleflight, NOTIFY updates and reconnect flushes, while this layer only +// reduces cold-burst database acquisitions. There is no direct-query fallback +// when the bounded queue or shared query fails. +type BatchedReadModelVersionStore struct { + base ReadModelVersionStore + cfg ReadModelVersionBatchConfig + + queue chan readModelVersionBatchRequest + stop chan struct{} + done chan struct{} + cancel context.CancelFunc + once sync.Once + gate sync.RWMutex + closed bool +} + +func NewBatchedReadModelVersionStore( + base ReadModelVersionStore, + cfg ReadModelVersionBatchConfig, +) (*BatchedReadModelVersionStore, error) { + if base == nil { + return nil, errors.New("initialize read-model version batcher: nil store") + } + if cfg.MaxKeys <= 0 || cfg.MaxKeys > 1<<16 { + return nil, fmt.Errorf("initialize read-model version batcher: max keys %d outside [1,65536]", cfg.MaxKeys) + } + if cfg.MaxWait <= 0 || cfg.MaxWait > 10*time.Millisecond { + return nil, fmt.Errorf("initialize read-model version batcher: max wait %v outside (0,10ms]", cfg.MaxWait) + } + if cfg.QueueSize <= 0 || cfg.QueueSize > 1<<20 { + return nil, fmt.Errorf("initialize read-model version batcher: queue size %d outside [1,1048576]", cfg.QueueSize) + } + if cfg.QueryTimeout <= 0 || cfg.QueryTimeout > 30*time.Second { + return nil, fmt.Errorf("initialize read-model version batcher: query timeout %v outside (0,30s]", cfg.QueryTimeout) + } + workerCtx, cancel := context.WithCancel(context.Background()) + s := &BatchedReadModelVersionStore{ + base: base, + cfg: cfg, + queue: make(chan readModelVersionBatchRequest, cfg.QueueSize), + stop: make(chan struct{}), + done: make(chan struct{}), + cancel: cancel, + } + go s.run(workerCtx) + return s, nil +} + +func (s *BatchedReadModelVersionStore) ReadModelHash( + ctx context.Context, + model string, + ownerUserID int64, + peerType domain.PeerType, + peerID int64, +) (int64, bool, error) { + if model == "" { + return 0, false, nil + } + key := ReadModelKey{Model: model, OwnerUserID: ownerUserID, PeerType: peerType, PeerID: peerID} + rows, err := s.ReadModelHashes(ctx, []ReadModelKey{key}) + if err != nil { + return 0, false, err + } + hash := rows[key] + return hash, hash != 0, nil +} + +func (s *BatchedReadModelVersionStore) ReadModelHashes( + ctx context.Context, + keys []ReadModelKey, +) (map[ReadModelKey]int64, error) { + out := make(map[ReadModelKey]int64, len(keys)) + if s == nil || s.base == nil || len(keys) == 0 { + return out, nil + } + if ctx == nil { + ctx = context.Background() + } + unique := make([]ReadModelKey, 0, len(keys)) + seen := make(map[ReadModelKey]struct{}, len(keys)) + for _, key := range keys { + if key.Model == "" { + continue + } + if _, duplicate := seen[key]; duplicate { + continue + } + seen[key] = struct{}{} + unique = append(unique, key) + } + for start := 0; start < len(unique); start += s.cfg.MaxKeys { + end := start + s.cfg.MaxKeys + if end > len(unique) { + end = len(unique) + } + rows, err := s.readChunk(ctx, unique[start:end]) + if err != nil { + return nil, err + } + for key, hash := range rows { + out[key] = hash + } + } + return out, nil +} + +func (s *BatchedReadModelVersionStore) readChunk( + ctx context.Context, + keys []ReadModelKey, +) (map[ReadModelKey]int64, error) { + request := readModelVersionBatchRequest{ + ctx: ctx, + keys: append([]ReadModelKey(nil), keys...), + result: make(chan readModelVersionBatchResult, 1), + } + s.gate.RLock() + if s.closed { + s.gate.RUnlock() + return nil, context.Canceled + } + select { + case s.queue <- request: + case <-ctx.Done(): + s.gate.RUnlock() + return nil, ctx.Err() + } + s.gate.RUnlock() + + select { + case result := <-request.result: + return result.hashes, result.err + case <-ctx.Done(): + return nil, ctx.Err() + } +} + +func (s *BatchedReadModelVersionStore) Close() { + if s == nil { + return + } + s.once.Do(func() { + s.gate.Lock() + s.closed = true + close(s.stop) + s.cancel() + s.gate.Unlock() + <-s.done + }) +} + +func (s *BatchedReadModelVersionStore) run(ctx context.Context) { + defer close(s.done) + var carry *readModelVersionBatchRequest + for { + batch := make([]readModelVersionBatchRequest, 0, 32) + keyCount := 0 + if carry != nil { + batch = append(batch, *carry) + keyCount = len(carry.keys) + carry = nil + } else { + select { + case request := <-s.queue: + batch = append(batch, request) + keyCount = len(request.keys) + case <-s.stop: + s.failQueued(context.Canceled, nil) + return + } + } + + timer := time.NewTimer(s.cfg.MaxWait) + collect: + for keyCount < s.cfg.MaxKeys { + select { + case request := <-s.queue: + if keyCount+len(request.keys) > s.cfg.MaxKeys { + carry = &request + break collect + } + batch = append(batch, request) + keyCount += len(request.keys) + case <-timer.C: + break collect + case <-s.stop: + if !timer.Stop() { + select { + case <-timer.C: + default: + } + } + if carry != nil { + batch = append(batch, *carry) + carry = nil + } + s.failQueued(context.Canceled, batch) + return + } + } + if !timer.Stop() { + select { + case <-timer.C: + default: + } + } + s.execute(ctx, batch) + } +} + +func (s *BatchedReadModelVersionStore) execute(ctx context.Context, batch []readModelVersionBatchRequest) { + active := batch[:0] + union := make([]ReadModelKey, 0) + seen := make(map[ReadModelKey]struct{}) + for _, request := range batch { + if err := request.ctx.Err(); err != nil { + request.result <- readModelVersionBatchResult{err: err} + continue + } + active = append(active, request) + for _, key := range request.keys { + if _, duplicate := seen[key]; duplicate { + continue + } + seen[key] = struct{}{} + union = append(union, key) + } + } + if len(active) == 0 { + return + } + queryCtx, cancel := context.WithTimeout(ctx, s.cfg.QueryTimeout) + loaded, err := s.base.ReadModelHashes(queryCtx, union) + cancel() + if err != nil { + for _, request := range active { + request.result <- readModelVersionBatchResult{err: err} + } + return + } + for _, request := range active { + rows := make(map[ReadModelKey]int64, len(request.keys)) + for _, key := range request.keys { + if hash, found := loaded[key]; found { + rows[key] = hash + } + } + request.result <- readModelVersionBatchResult{hashes: rows} + } +} + +func (s *BatchedReadModelVersionStore) failQueued(err error, pending []readModelVersionBatchRequest) { + for _, request := range pending { + request.result <- readModelVersionBatchResult{err: err} + } + for { + select { + case request := <-s.queue: + request.result <- readModelVersionBatchResult{err: err} + default: + return + } + } +} + +var _ ReadModelVersionStore = (*BatchedReadModelVersionStore)(nil) diff --git a/internal/store/read_model_batch_test.go b/internal/store/read_model_batch_test.go new file mode 100644 index 00000000..5527e0c0 --- /dev/null +++ b/internal/store/read_model_batch_test.go @@ -0,0 +1,154 @@ +package store + +import ( + "context" + "sync" + "testing" + "time" + + "telesrv/internal/domain" +) + +type countingReadModelVersionBase struct { + mu sync.Mutex + calls int + keys int +} + +func (b *countingReadModelVersionBase) ReadModelHash( + ctx context.Context, + model string, + ownerUserID int64, + peerType domain.PeerType, + peerID int64, +) (int64, bool, error) { + key := ReadModelKey{Model: model, OwnerUserID: ownerUserID, PeerType: peerType, PeerID: peerID} + rows, err := b.ReadModelHashes(ctx, []ReadModelKey{key}) + return rows[key], rows[key] != 0, err +} + +func (b *countingReadModelVersionBase) ReadModelHashes( + _ context.Context, + keys []ReadModelKey, +) (map[ReadModelKey]int64, error) { + b.mu.Lock() + b.calls++ + b.keys += len(keys) + b.mu.Unlock() + rows := make(map[ReadModelKey]int64, len(keys)) + for _, key := range keys { + rows[key] = key.PeerID + 1000 + } + return rows, nil +} + +func (b *countingReadModelVersionBase) counts() (int, int) { + b.mu.Lock() + defer b.mu.Unlock() + return b.calls, b.keys +} + +func TestBatchedReadModelVersionStoreCombinesConcurrentMisses(t *testing.T) { + base := &countingReadModelVersionBase{} + batcher, err := NewBatchedReadModelVersionStore(base, ReadModelVersionBatchConfig{ + MaxKeys: 128, MaxWait: 10 * time.Millisecond, QueueSize: 128, QueryTimeout: time.Second, + }) + if err != nil { + t.Fatal(err) + } + t.Cleanup(batcher.Close) + + const callers = 32 + start := make(chan struct{}) + errs := make(chan error, callers) + var wg sync.WaitGroup + for index := 0; index < callers; index++ { + index := index + wg.Add(1) + go func() { + defer wg.Done() + <-start + shared := ReadModelKey{Model: "channel_base", PeerType: domain.PeerTypeChannel, PeerID: 9} + own := ReadModelKey{Model: "dialog_owner", OwnerUserID: int64(index + 1), PeerType: domain.PeerTypeUser, PeerID: int64(index + 1)} + rows, readErr := batcher.ReadModelHashes(context.Background(), []ReadModelKey{shared, own}) + if readErr != nil { + errs <- readErr + return + } + if rows[shared] != 1009 || rows[own] != own.PeerID+1000 { + errs <- context.Canceled + } + }() + } + close(start) + wg.Wait() + close(errs) + for err := range errs { + t.Fatal(err) + } + calls, keys := base.counts() + if calls <= 0 || calls > 4 { + t.Fatalf("base calls = %d, want 1..4", calls) + } + if keys < callers+1 || keys > callers+calls { + t.Fatalf("base key inputs = %d, callers=%d calls=%d", keys, callers, calls) + } +} + +func TestBatchedReadModelVersionStoreSplitsOversizedRequest(t *testing.T) { + base := &countingReadModelVersionBase{} + batcher, err := NewBatchedReadModelVersionStore(base, ReadModelVersionBatchConfig{ + MaxKeys: 2, MaxWait: time.Microsecond, QueueSize: 4, QueryTimeout: time.Second, + }) + if err != nil { + t.Fatal(err) + } + t.Cleanup(batcher.Close) + + keys := []ReadModelKey{ + {Model: "m", PeerType: domain.PeerTypeUser, PeerID: 1}, + {Model: "m", PeerType: domain.PeerTypeUser, PeerID: 2}, + {Model: "m", PeerType: domain.PeerTypeUser, PeerID: 3}, + {Model: "m", PeerType: domain.PeerTypeUser, PeerID: 1}, + } + rows, err := batcher.ReadModelHashes(context.Background(), keys) + if err != nil { + t.Fatal(err) + } + if len(rows) != 3 || rows[keys[2]] != 1003 { + t.Fatalf("rows = %#v", rows) + } + calls, loaded := base.counts() + if calls != 2 || loaded != 3 { + t.Fatalf("base = %d calls / %d keys, want 2 / 3", calls, loaded) + } +} + +func TestBatchedReadModelVersionStoreCloseFailsNewReads(t *testing.T) { + base := &countingReadModelVersionBase{} + batcher, err := NewBatchedReadModelVersionStore(base, ReadModelVersionBatchConfig{ + MaxKeys: 2, MaxWait: time.Microsecond, QueueSize: 2, QueryTimeout: time.Second, + }) + if err != nil { + t.Fatal(err) + } + batcher.Close() + if _, err := batcher.ReadModelHashes(context.Background(), []ReadModelKey{{Model: "m", PeerID: 1}}); err == nil { + t.Fatal("read after close succeeded") + } +} + +func TestNewBatchedReadModelVersionStoreRejectsInvalidConfig(t *testing.T) { + base := &countingReadModelVersionBase{} + for _, cfg := range []ReadModelVersionBatchConfig{ + {}, + {MaxKeys: 1, MaxWait: 11 * time.Millisecond, QueueSize: 1, QueryTimeout: time.Second}, + {MaxKeys: 1, MaxWait: time.Microsecond, QueueSize: 0, QueryTimeout: time.Second}, + {MaxKeys: 1, MaxWait: time.Microsecond, QueueSize: 1, QueryTimeout: 31 * time.Second}, + } { + if batcher, err := NewBatchedReadModelVersionStore(base, cfg); err == nil { + batcher.Close() + t.Fatalf("invalid config accepted: %+v", cfg) + } + } +} diff --git a/internal/store/read_model_cache.go b/internal/store/read_model_cache.go index 21f134ca..1c8d4988 100644 --- a/internal/store/read_model_cache.go +++ b/internal/store/read_model_cache.go @@ -1,6 +1,7 @@ package store import ( + "container/list" "context" "sort" "sync" @@ -11,17 +12,20 @@ import ( const ( defaultReadModelHashCacheTTL = 30 * time.Minute - defaultReadModelHashCacheMax = 65536 + defaultReadModelHashCacheMax = 1000000 ) type readModelHashCacheEntry struct { + key ReadModelKey hash int64 expireAt time.Time } type readModelHashInflight struct { - done chan struct{} - err error + done chan struct{} + err error + hash int64 + accepted bool } // CachedReadModelVersionStore caches read_model_versions hash tokens in-process. @@ -33,13 +37,16 @@ type CachedReadModelVersionStore struct { max int now func() time.Time - mu sync.RWMutex - m map[ReadModelKey]readModelHashCacheEntry + mu sync.Mutex + lru *list.List + m map[ReadModelKey]*list.Element inflight map[ReadModelKey]*readModelHashInflight - // epoch 在每次 invalidate/update/flush 时自增；一次锁外 DB load 若跨越了一次失效， - // finishReadModelHashInflight 会拒绝把 stale hash 写回，避免 NOTIFY 送来的新 hash 被覆盖。 - // 与 contacts/privacy 读模缓存的 epoch 守卫同构。 - epoch uint64 + // flushGeneration rejects every refill that started before a listener + // reconnect/full flush. keyGeneration rejects only the exact key whose + // NOTIFY arrived while it was loading; unrelated high-churn keys must not + // keep the complete version spine permanently cold. + flushGeneration uint64 + keyGeneration map[ReadModelKey]uint64 } func NewCachedReadModelVersionStore(base ReadModelVersionStore, ttl time.Duration, max int) *CachedReadModelVersionStore { @@ -53,12 +60,14 @@ func NewCachedReadModelVersionStore(base ReadModelVersionStore, ttl time.Duratio max = defaultReadModelHashCacheMax } return &CachedReadModelVersionStore{ - base: base, - ttl: ttl, - max: max, - now: time.Now, - m: make(map[ReadModelKey]readModelHashCacheEntry, 1024), - inflight: make(map[ReadModelKey]*readModelHashInflight), + base: base, + ttl: ttl, + max: max, + now: time.Now, + lru: list.New(), + m: make(map[ReadModelKey]*list.Element, 1024), + inflight: make(map[ReadModelKey]*readModelHashInflight), + keyGeneration: make(map[ReadModelKey]uint64, 1024), } } @@ -85,7 +94,7 @@ func (s *CachedReadModelVersionStore) ReadModelHashes(ctx context.Context, keys done := make(map[ReadModelKey]struct{}, len(keys)) seen := make(map[ReadModelKey]struct{}, len(keys)) - s.mu.RLock() + s.mu.Lock() for _, key := range keys { if key.Model == "" { continue @@ -94,14 +103,14 @@ func (s *CachedReadModelVersionStore) ReadModelHashes(ctx context.Context, keys continue } seen[key] = struct{}{} - if entry, ok := s.m[key]; ok && entry.expireAt.After(now) { + if entry, ok := s.readHashLocked(key, now); ok { out[key] = entry.hash done[key] = struct{}{} continue } misses = append(misses, key) } - s.mu.RUnlock() + s.mu.Unlock() if len(misses) == 0 { return out, nil @@ -111,15 +120,17 @@ func (s *CachedReadModelVersionStore) ReadModelHashes(ctx context.Context, keys for len(done) < len(seen) { owned := make([]ReadModelKey, 0, len(misses)) waiting := make(map[ReadModelKey]*readModelHashInflight) - var loadEpoch uint64 + var loadFlushGeneration uint64 + ownedGeneration := make(map[ReadModelKey]uint64, len(misses)) + ownedInflight := make(map[ReadModelKey]*readModelHashInflight, len(misses)) now = s.now() s.mu.Lock() - loadEpoch = s.epoch + loadFlushGeneration = s.flushGeneration for _, key := range misses { if _, ok := done[key]; ok { continue } - if entry, ok := s.m[key]; ok && entry.expireAt.After(now) { + if entry, ok := s.readHashLocked(key, now); ok { out[key] = entry.hash done[key] = struct{}{} continue @@ -131,6 +142,8 @@ func (s *CachedReadModelVersionStore) ReadModelHashes(ctx context.Context, keys inflight := &readModelHashInflight{done: make(chan struct{})} s.inflight[key] = inflight owned = append(owned, key) + ownedGeneration[key] = s.keyGeneration[key] + ownedInflight[key] = inflight } s.mu.Unlock() if len(owned) == 0 && len(waiting) == 0 { @@ -139,24 +152,31 @@ func (s *CachedReadModelVersionStore) ReadModelHashes(ctx context.Context, keys if len(owned) > 0 { loaded, err := s.base.ReadModelHashes(ctx, owned) if err != nil { - s.finishReadModelHashInflight(owned, nil, err, time.Time{}, loadEpoch) + s.finishReadModelHashInflight(owned, ownedGeneration, nil, err, time.Time{}, loadFlushGeneration) return nil, err } expireAt := s.now().Add(s.ttl) - s.finishReadModelHashInflight(owned, loaded, nil, expireAt, loadEpoch) + s.finishReadModelHashInflight(owned, ownedGeneration, loaded, nil, expireAt, loadFlushGeneration) // 失效可能在 load 期间到达并写入更新的 hash；优先返回缓存里的当前值 - // (可能是 NOTIFY 刚写入的新 hash)，而不是这次 load 读到的可能已过期的值。 + // (可能是 NOTIFY 刚写入的新 hash)。精确 invalidation/flush 后若没有 + // 当前值则不返回旧 load，而是在下一轮重新 claim/load。 effNow := s.now() - s.mu.RLock() + s.mu.Lock() for _, key := range owned { - if entry, ok := s.m[key]; ok && entry.expireAt.After(effNow) { + if entry, ok := s.readHashLocked(key, effNow); ok { out[key] = entry.hash - } else { - out[key] = loaded[key] + done[key] = struct{}{} + continue + } + if inflight := ownedInflight[key]; inflight != nil && inflight.accepted { + // A capacity eviction may remove an otherwise generation-valid + // entry before this owner reacquires the lock. Its accepted value + // remains a valid result for this call even if it is not retained. + out[key] = inflight.hash + done[key] = struct{}{} } - done[key] = struct{}{} } - s.mu.RUnlock() + s.mu.Unlock() } for key, inflight := range waiting { select { @@ -167,37 +187,55 @@ func (s *CachedReadModelVersionStore) ReadModelHashes(ctx context.Context, keys if inflight.err != nil { return nil, inflight.err } - s.mu.RLock() - entry, ok := s.m[key] - s.mu.RUnlock() - if ok && entry.expireAt.After(s.now()) { + s.mu.Lock() + entry, ok := s.readHashLocked(key, s.now()) + s.mu.Unlock() + if ok { out[key] = entry.hash + done[key] = struct{}{} + continue + } + if inflight.accepted { + out[key] = inflight.hash + done[key] = struct{}{} } - done[key] = struct{}{} } } return out, nil } -func (s *CachedReadModelVersionStore) finishReadModelHashInflight(keys []ReadModelKey, loaded map[ReadModelKey]int64, err error, expireAt time.Time, loadEpoch uint64) { +func (s *CachedReadModelVersionStore) finishReadModelHashInflight( + keys []ReadModelKey, + keyGeneration map[ReadModelKey]uint64, + loaded map[ReadModelKey]int64, + err error, + expireAt time.Time, + loadFlushGeneration uint64, +) { s.mu.Lock() defer s.mu.Unlock() - if err == nil && s.epoch == loadEpoch { - if len(s.m)+len(keys) > s.max { - s.m = make(map[ReadModelKey]readModelHashCacheEntry, 1024) - } + if err == nil { if expireAt.IsZero() { expireAt = s.now().Add(s.ttl) } for _, key := range keys { - hash := loaded[key] - s.m[key] = readModelHashCacheEntry{hash: hash, expireAt: expireAt} + inflight := s.inflight[key] + if inflight == nil { + continue + } + if s.flushGeneration != loadFlushGeneration || s.keyGeneration[key] != keyGeneration[key] { + continue + } + inflight.hash = loaded[key] + inflight.accepted = true + s.storeHashLocked(key, inflight.hash, expireAt) } } for _, key := range keys { if inflight := s.inflight[key]; inflight != nil { inflight.err = err delete(s.inflight, key) + delete(s.keyGeneration, key) close(inflight.done) } } @@ -208,8 +246,8 @@ func (s *CachedReadModelVersionStore) InvalidateReadModel(key ReadModelKey) { return } s.mu.Lock() - delete(s.m, key) - s.epoch++ + s.removeHashLocked(key) + s.bumpReadModelKeyGenerationLocked(key) s.mu.Unlock() } @@ -222,25 +260,78 @@ func (s *CachedReadModelVersionStore) UpdateReadModelHash(key ReadModelKey, hash return } s.mu.Lock() - if len(s.m)+1 > s.max { - s.m = make(map[ReadModelKey]readModelHashCacheEntry, 1024) - } - s.m[key] = readModelHashCacheEntry{hash: hash, expireAt: s.now().Add(s.ttl)} - // 写入权威新 hash 后自增 epoch：任何此刻在飞的 load 都不得再用旧值覆盖它。 - s.epoch++ + s.storeHashLocked(key, hash, s.now().Add(s.ttl)) + // 写入权威新 hash 后只推进该 exact key 的 generation；其它 key 的 + // inflight refill 仍可正常完成。 + s.bumpReadModelKeyGenerationLocked(key) s.mu.Unlock() } +func (s *CachedReadModelVersionStore) bumpReadModelKeyGenerationLocked(key ReadModelKey) { + if s.inflight[key] == nil { + // Generations only guard a currently unlocked refill. Keeping tombstones + // for every historical notification would make this side map unbounded. + delete(s.keyGeneration, key) + return + } + s.keyGeneration[key]++ +} + func (s *CachedReadModelVersionStore) FlushReadModelCache() { if s == nil { return } s.mu.Lock() - s.m = make(map[ReadModelKey]readModelHashCacheEntry, 1024) - s.epoch++ + s.lru.Init() + s.m = make(map[ReadModelKey]*list.Element, 1024) + s.keyGeneration = make(map[ReadModelKey]uint64, 1024) + s.flushGeneration++ s.mu.Unlock() } +func (s *CachedReadModelVersionStore) readHashLocked(key ReadModelKey, now time.Time) (readModelHashCacheEntry, bool) { + el := s.m[key] + if el == nil { + return readModelHashCacheEntry{}, false + } + entry := el.Value.(*readModelHashCacheEntry) + if !entry.expireAt.After(now) { + s.lru.Remove(el) + delete(s.m, key) + return readModelHashCacheEntry{}, false + } + s.lru.MoveToFront(el) + return *entry, true +} + +func (s *CachedReadModelVersionStore) storeHashLocked(key ReadModelKey, hash int64, expireAt time.Time) { + if el := s.m[key]; el != nil { + entry := el.Value.(*readModelHashCacheEntry) + entry.hash = hash + entry.expireAt = expireAt + s.lru.MoveToFront(el) + return + } + entry := &readModelHashCacheEntry{key: key, hash: hash, expireAt: expireAt} + s.m[key] = s.lru.PushFront(entry) + for len(s.m) > s.max { + oldest := s.lru.Back() + if oldest == nil { + break + } + old := oldest.Value.(*readModelHashCacheEntry) + delete(s.m, old.key) + s.lru.Remove(oldest) + } +} + +func (s *CachedReadModelVersionStore) removeHashLocked(key ReadModelKey) { + if el := s.m[key]; el != nil { + delete(s.m, key) + s.lru.Remove(el) + } +} + func sortReadModelKeys(keys []ReadModelKey) { sort.Slice(keys, func(i, j int) bool { a, b := keys[i], keys[j] diff --git a/internal/store/read_model_cache_test.go b/internal/store/read_model_cache_test.go index d008ccd4..0ced0de4 100644 --- a/internal/store/read_model_cache_test.go +++ b/internal/store/read_model_cache_test.go @@ -219,6 +219,161 @@ func TestCachedReadModelVersionStoreEpochGuardRejectsStaleWriteback(t *testing.T } } +func TestCachedReadModelVersionStoreKeyGenerationDoesNotRejectUnrelatedRefill(t *testing.T) { + ctx := context.Background() + loading := ReadModelKey{Model: "channel_base", PeerType: domain.PeerTypeChannel, PeerID: 10} + unrelated := ReadModelKey{Model: "dialog_light", OwnerUserID: 200, PeerType: domain.PeerTypeUser, PeerID: 300} + base := &blockingReadModelVersionStore{ + started: make(chan struct{}), + release: make(chan struct{}), + hashes: map[ReadModelKey]int64{loading: 11}, + } + cache := NewCachedReadModelVersionStore(base, time.Hour, 100) + + resultCh := make(chan map[ReadModelKey]int64, 1) + go func() { + rows, _ := cache.ReadModelHashes(ctx, []ReadModelKey{loading}) + resultCh <- rows + }() + <-base.started + cache.UpdateReadModelHash(unrelated, 99) + close(base.release) + if rows := <-resultCh; rows[loading] != 11 { + t.Fatalf("loading hash = %d, want 11", rows[loading]) + } + if _, err := cache.ReadModelHashes(ctx, []ReadModelKey{loading}); err != nil { + t.Fatal(err) + } + if got := base.calls.Load(); got != 1 { + t.Fatalf("unrelated NOTIFY rejected refill: base calls = %d, want 1", got) + } +} + +func TestCachedReadModelVersionStoreExactUpdateRejectsOnlyChangedBatchKey(t *testing.T) { + ctx := context.Background() + a := ReadModelKey{Model: "channel_base", PeerType: domain.PeerTypeChannel, PeerID: 10} + b := ReadModelKey{Model: "channel_base", PeerType: domain.PeerTypeChannel, PeerID: 11} + base := &blockingReadModelVersionStore{ + started: make(chan struct{}), + release: make(chan struct{}), + hashes: map[ReadModelKey]int64{ + a: 11, + b: 22, + }, + } + cache := NewCachedReadModelVersionStore(base, time.Hour, 100) + resultCh := make(chan map[ReadModelKey]int64, 1) + go func() { + rows, _ := cache.ReadModelHashes(ctx, []ReadModelKey{a, b}) + resultCh <- rows + }() + <-base.started + cache.UpdateReadModelHash(a, 99) + close(base.release) + rows := <-resultCh + if rows[a] != 99 || rows[b] != 22 { + t.Fatalf("hashes = %+v, want A=99 B=22", rows) + } + if _, err := cache.ReadModelHashes(ctx, []ReadModelKey{b}); err != nil { + t.Fatal(err) + } + if got := base.calls.Load(); got != 1 { + t.Fatalf("exact A update rejected B refill: base calls = %d, want 1", got) + } +} + +type staleThenFreshReadModelVersionStore struct { + key ReadModelKey + first int64 + second int64 + started chan struct{} + release chan struct{} + calls atomic.Int32 +} + +func (s *staleThenFreshReadModelVersionStore) ReadModelHash( + ctx context.Context, + model string, + ownerUserID int64, + peerType domain.PeerType, + peerID int64, +) (int64, bool, error) { + key := ReadModelKey{Model: model, OwnerUserID: ownerUserID, PeerType: peerType, PeerID: peerID} + rows, err := s.ReadModelHashes(ctx, []ReadModelKey{key}) + if err != nil { + return 0, false, err + } + hash := rows[key] + return hash, hash != 0, nil +} + +func (s *staleThenFreshReadModelVersionStore) ReadModelHashes(ctx context.Context, keys []ReadModelKey) (map[ReadModelKey]int64, error) { + call := s.calls.Add(1) + if call == 1 { + close(s.started) + select { + case <-s.release: + case <-ctx.Done(): + return nil, ctx.Err() + } + } + hash := s.second + if call == 1 { + hash = s.first + } + out := make(map[ReadModelKey]int64, len(keys)) + for _, key := range keys { + if key == s.key { + out[key] = hash + } + } + return out, nil +} + +func TestCachedReadModelVersionStoreInvalidationAndFlushReloadInflight(t *testing.T) { + for _, test := range []struct { + name string + mutate func(*CachedReadModelVersionStore, ReadModelKey) + }{ + {name: "exact invalidation", mutate: func(cache *CachedReadModelVersionStore, key ReadModelKey) { + cache.InvalidateReadModel(key) + }}, + {name: "listener flush", mutate: func(cache *CachedReadModelVersionStore, _ ReadModelKey) { + cache.FlushReadModelCache() + }}, + } { + t.Run(test.name, func(t *testing.T) { + ctx := context.Background() + key := ReadModelKey{Model: "channel_member", OwnerUserID: 100, PeerType: domain.PeerTypeChannel, PeerID: 10} + base := &staleThenFreshReadModelVersionStore{ + key: key, first: 11, second: 22, + started: make(chan struct{}), release: make(chan struct{}), + } + cache := NewCachedReadModelVersionStore(base, time.Hour, 100) + resultCh := make(chan map[ReadModelKey]int64, 1) + go func() { + rows, _ := cache.ReadModelHashes(ctx, []ReadModelKey{key}) + resultCh <- rows + }() + <-base.started + test.mutate(cache, key) + close(base.release) + if rows := <-resultCh; rows[key] != 22 { + t.Fatalf("in-flight read returned %d, want reloaded 22", rows[key]) + } + if got := base.calls.Load(); got != 2 { + t.Fatalf("base calls = %d, want stale load + reload", got) + } + if _, err := cache.ReadModelHashes(ctx, []ReadModelKey{key}); err != nil { + t.Fatal(err) + } + if got := base.calls.Load(); got != 2 { + t.Fatalf("reloaded value was not cached: calls=%d", got) + } + }) + } +} + func TestCachedReadModelVersionStoreUpdateReadModelHashWarmsCache(t *testing.T) { ctx := context.Background() key := ReadModelKey{Model: "channel_base", PeerType: domain.PeerTypeChannel, PeerID: 10} @@ -241,3 +396,51 @@ func TestCachedReadModelVersionStoreUpdateReadModelHashWarmsCache(t *testing.T) t.Fatalf("base calls = %d, want cache warmed by notify", got) } } + +func TestCachedReadModelVersionStoreEvictsOneLRUEntryWithoutFlush(t *testing.T) { + ctx := context.Background() + keys := []ReadModelKey{ + {Model: "channel_base", PeerType: domain.PeerTypeChannel, PeerID: 10}, + {Model: "channel_base", PeerType: domain.PeerTypeChannel, PeerID: 11}, + {Model: "channel_base", PeerType: domain.PeerTypeChannel, PeerID: 12}, + } + release := make(chan struct{}) + close(release) + base := &blockingReadModelVersionStore{ + started: make(chan struct{}), + release: release, + hashes: map[ReadModelKey]int64{ + keys[0]: 10, + keys[1]: 11, + keys[2]: 12, + }, + } + cache := NewCachedReadModelVersionStore(base, time.Hour, 2) + for _, key := range keys[:2] { + if _, _, err := cache.ReadModelHash(ctx, key.Model, key.OwnerUserID, key.PeerType, key.PeerID); err != nil { + t.Fatal(err) + } + } + // Refresh key 0 so key 1 becomes the unique LRU victim. + if _, _, err := cache.ReadModelHash(ctx, keys[0].Model, 0, keys[0].PeerType, keys[0].PeerID); err != nil { + t.Fatal(err) + } + if _, _, err := cache.ReadModelHash(ctx, keys[2].Model, 0, keys[2].PeerType, keys[2].PeerID); err != nil { + t.Fatal(err) + } + if got := base.calls.Load(); got != 3 { + t.Fatalf("base calls after three unique loads = %d, want 3", got) + } + if _, _, err := cache.ReadModelHash(ctx, keys[0].Model, 0, keys[0].PeerType, keys[0].PeerID); err != nil { + t.Fatal(err) + } + if got := base.calls.Load(); got != 3 { + t.Fatalf("recent entry was flushed with capacity eviction: calls=%d", got) + } + if _, _, err := cache.ReadModelHash(ctx, keys[1].Model, 0, keys[1].PeerType, keys[1].PeerID); err != nil { + t.Fatal(err) + } + if got := base.calls.Load(); got != 4 { + t.Fatalf("LRU victim reload calls = %d, want 4", got) + } +} diff --git a/internal/store/redisstore/active_channel_ids_page.go b/internal/store/redisstore/active_channel_ids_page.go new file mode 100644 index 00000000..c4526f58 --- /dev/null +++ b/internal/store/redisstore/active_channel_ids_page.go @@ -0,0 +1,135 @@ +package redisstore + +import ( + "context" + "encoding/json" + "fmt" + "time" + + "github.com/redis/go-redis/v9" + + "telesrv/internal/domain" + "telesrv/internal/store" +) + +const ( + DefaultActiveChannelIDsPageTTL = 24 * time.Hour + activeChannelIDsPageSchemaV1 = 1 + activeChannelIDsPageMaxBytes = 64 << 10 +) + +type ActiveChannelIDsPageCache struct { + c *redis.Client + ttl time.Duration +} + +func NewActiveChannelIDsPageCache(c *redis.Client, ttl time.Duration) *ActiveChannelIDsPageCache { + if ttl <= 0 { + ttl = DefaultActiveChannelIDsPageTTL + } + return &ActiveChannelIDsPageCache{c: c, ttl: ttl} +} + +type activeChannelIDsPageEnvelope struct { + Schema int `json:"schema"` + Key store.ActiveChannelIDsPageKey `json:"key"` + ChannelIDs []int64 `json:"channel_ids"` +} + +func activeChannelIDsPageRedisKey(key store.ActiveChannelIDsPageKey) string { + return fmt.Sprintf( + "channel:active-ids:page:v1:%d:%d:%d:%d", + key.UserID, key.Generation, key.AfterChannelID, key.Limit, + ) +} + +func (s *ActiveChannelIDsPageCache) GetActiveChannelIDsPage( + ctx context.Context, + key store.ActiveChannelIDsPageKey, +) ([]int64, bool, error) { + if s == nil || s.c == nil { + return nil, false, fmt.Errorf("active channel IDs Redis cache unavailable") + } + if err := validateActiveChannelIDsPageKey(key); err != nil { + return nil, false, err + } + redisKey := activeChannelIDsPageRedisKey(key) + raw, err := s.c.Get(ctx, redisKey).Bytes() + if err == redis.Nil { + return nil, false, nil + } + if err != nil { + return nil, false, fmt.Errorf("redis get active channel IDs page: %w", err) + } + if len(raw) == 0 || len(raw) > activeChannelIDsPageMaxBytes { + _ = s.c.Del(ctx, redisKey).Err() + return nil, false, fmt.Errorf("invalid active channel IDs page size %d", len(raw)) + } + var envelope activeChannelIDsPageEnvelope + if err := json.Unmarshal(raw, &envelope); err != nil { + _ = s.c.Del(ctx, redisKey).Err() + return nil, false, fmt.Errorf("decode active channel IDs page: %w", err) + } + if envelope.Schema != activeChannelIDsPageSchemaV1 || envelope.Key != key { + _ = s.c.Del(ctx, redisKey).Err() + return nil, false, fmt.Errorf("active channel IDs page identity/schema mismatch") + } + if err := validateActiveChannelIDsPage(key, envelope.ChannelIDs); err != nil { + _ = s.c.Del(ctx, redisKey).Err() + return nil, false, err + } + return append([]int64(nil), envelope.ChannelIDs...), true, nil +} + +func (s *ActiveChannelIDsPageCache) PutActiveChannelIDsPage( + ctx context.Context, + key store.ActiveChannelIDsPageKey, + channelIDs []int64, +) error { + if s == nil || s.c == nil { + return fmt.Errorf("active channel IDs Redis cache unavailable") + } + if err := validateActiveChannelIDsPageKey(key); err != nil { + return err + } + if err := validateActiveChannelIDsPage(key, channelIDs); err != nil { + return err + } + raw, err := json.Marshal(activeChannelIDsPageEnvelope{ + Schema: activeChannelIDsPageSchemaV1, Key: key, ChannelIDs: channelIDs, + }) + if err != nil { + return fmt.Errorf("encode active channel IDs page: %w", err) + } + if len(raw) > activeChannelIDsPageMaxBytes { + return fmt.Errorf("active channel IDs page exceeds %d bytes: %d", activeChannelIDsPageMaxBytes, len(raw)) + } + if err := s.c.Set(ctx, activeChannelIDsPageRedisKey(key), raw, s.ttl).Err(); err != nil { + return fmt.Errorf("redis set active channel IDs page: %w", err) + } + return nil +} + +func validateActiveChannelIDsPageKey(key store.ActiveChannelIDsPageKey) error { + if key.UserID == 0 || key.Generation == 0 || key.AfterChannelID < 0 || + key.Limit <= 0 || key.Limit > domain.MaxSynchronousChannelDialogFanout { + return fmt.Errorf("invalid active channel IDs page key") + } + return nil +} + +func validateActiveChannelIDsPage(key store.ActiveChannelIDsPageKey, channelIDs []int64) error { + if len(channelIDs) > key.Limit { + return fmt.Errorf("active channel IDs page has %d rows, limit %d", len(channelIDs), key.Limit) + } + previous := key.AfterChannelID + for _, channelID := range channelIDs { + if channelID <= previous { + return fmt.Errorf("active channel IDs page is not strictly ordered after %d", previous) + } + previous = channelID + } + return nil +} + +var _ store.ActiveChannelIDsPageCache = (*ActiveChannelIDsPageCache)(nil) diff --git a/internal/store/redisstore/active_channel_ids_page_integration_test.go b/internal/store/redisstore/active_channel_ids_page_integration_test.go new file mode 100644 index 00000000..1916e9db --- /dev/null +++ b/internal/store/redisstore/active_channel_ids_page_integration_test.go @@ -0,0 +1,66 @@ +package redisstore + +import ( + "context" + "os" + "slices" + "testing" + "time" + + "telesrv/internal/store" +) + +func TestActiveChannelIDsPageCacheRoundTripAndCorruptFailClosed(t *testing.T) { + addr := os.Getenv("TELESRV_TEST_REDIS_ADDR") + if addr == "" { + t.Skip("set TELESRV_TEST_REDIS_ADDR to run redis integration test") + } + ctx := context.Background() + c, err := Open(ctx, addr, "", 0) + if err != nil { + t.Fatalf("open: %v", err) + } + t.Cleanup(func() { _ = c.Close() }) + key := store.ActiveChannelIDsPageKey{ + UserID: time.Now().UnixNano(), Generation: 701, AfterChannelID: 10, Limit: 1000, + } + redisKey := activeChannelIDsPageRedisKey(key) + t.Cleanup(func() { _ = c.Del(ctx, redisKey).Err() }) + cache := NewActiveChannelIDsPageCache(c, time.Minute) + want := []int64{11, 20, 30} + if err := cache.PutActiveChannelIDsPage(ctx, key, want); err != nil { + t.Fatalf("put: %v", err) + } + got, found, err := cache.GetActiveChannelIDsPage(ctx, key) + if err != nil || !found || !slices.Equal(got, want) { + t.Fatalf("get = %v found=%v err=%v", got, found, err) + } + got[0] = 999 + again, _, err := cache.GetActiveChannelIDsPage(ctx, key) + if err != nil || !slices.Equal(again, want) { + t.Fatalf("cached value aliased: %v err=%v", again, err) + } + if ttl, err := c.TTL(ctx, redisKey).Result(); err != nil || ttl <= 0 || ttl > time.Minute { + t.Fatalf("ttl = %v err=%v", ttl, err) + } + if err := c.Set(ctx, redisKey, `{"schema":1,"key":{"UserID":1}}`, time.Minute).Err(); err != nil { + t.Fatalf("seed corrupt value: %v", err) + } + if _, _, err := cache.GetActiveChannelIDsPage(ctx, key); err == nil { + t.Fatal("corrupt cache value accepted") + } + if exists, err := c.Exists(ctx, redisKey).Result(); err != nil || exists != 0 { + t.Fatalf("corrupt key exists=%d err=%v", exists, err) + } +} + +func TestActiveChannelIDsPageCacheRejectsUnorderedPage(t *testing.T) { + cache := NewActiveChannelIDsPageCache(nil, time.Minute) + key := store.ActiveChannelIDsPageKey{UserID: 1, Generation: -1, Limit: 1000} + if err := validateActiveChannelIDsPage(key, []int64{2, 2}); err == nil { + t.Fatal("duplicate channel ID accepted") + } + if err := cache.PutActiveChannelIDsPage(context.Background(), key, nil); err == nil { + t.Fatal("nil Redis client accepted") + } +} diff --git a/internal/store/redisstore/allocator.go b/internal/store/redisstore/allocator.go index 3e50aca9..58002078 100644 --- a/internal/store/redisstore/allocator.go +++ b/internal/store/redisstore/allocator.go @@ -15,6 +15,12 @@ type BoxIDAllocator struct { counter counterAllocator } +var _ store.DistributedBoxIDAllocator = (*BoxIDAllocator)(nil) + +// DistributedBoxIDAllocation marks Redis INCR reservations as safe for the +// cross-process private-send microbatch path. +func (*BoxIDAllocator) DistributedBoxIDAllocation() {} + // ChannelIDAllocator 用 Redis INCR 分配全局 channel/supergroup id。 type ChannelIDAllocator struct { counter counterAllocator @@ -25,11 +31,6 @@ type ChannelMessageIDAllocator struct { counter counterAllocator } -// SecretChatIDAllocator 用 Redis INCR 分配全局 secret chat id（int32 量级）。 -type SecretChatIDAllocator struct { - counter counterAllocator -} - type counterAllocator struct { c *redis.Client source store.CounterSource @@ -113,16 +114,6 @@ func NewChannelMessageIDAllocator(c *redis.Client, source store.CounterSource) * }} } -// NewSecretChatIDAllocator 创建 Redis-backed secret chat id allocator。 -func NewSecretChatIDAllocator(c *redis.Client, source store.CounterSource) *SecretChatIDAllocator { - return &SecretChatIDAllocator{counter: counterAllocator{ - c: c, - source: source, - key: secretChatIDKey, - name: "secret_chat_id", - }} -} - func boxIDKey(userID int64) string { return fmt.Sprintf("counter:box_id:{%d}", userID) } @@ -131,10 +122,6 @@ func channelIDKey(_ int64) string { return "counter:channel_id" } -func secretChatIDKey(_ int64) string { - return "counter:secret_chat_id" -} - func channelMessageIDKey(channelID int64) string { return fmt.Sprintf("counter:channel_msg_id:{%d}", channelID) } @@ -144,6 +131,91 @@ func (a *BoxIDAllocator) NextBoxID(ctx context.Context, userID int64) (int, erro return int(v), err } +// NextBoxIDs allocates every distinct owner in one Redis pipeline. Cold +// counters use one durable batch read and one recovery pipeline; the batch API +// never degrades into per-user network calls. +func (a *BoxIDAllocator) NextBoxIDs(ctx context.Context, userIDs []int64) (map[int64]int, error) { + if a == nil || a.counter.c == nil { + return nil, fmt.Errorf("redis box_id counter: nil client") + } + unique := make([]int64, 0, len(userIDs)) + keys := make([]string, 0, len(userIDs)) + seen := make(map[int64]struct{}, len(userIDs)) + for _, userID := range userIDs { + if userID <= 0 { + return nil, fmt.Errorf("redis box_id counter: invalid user id %d", userID) + } + if _, ok := seen[userID]; ok { + continue + } + seen[userID] = struct{}{} + key, err := a.counter.validatedKey(userID) + if err != nil { + return nil, err + } + unique = append(unique, userID) + keys = append(keys, key) + } + if len(unique) == 0 { + return map[int64]int{}, nil + } + + commands := make([]*redis.Cmd, len(unique)) + if _, err := a.counter.c.Pipelined(ctx, func(pipe redis.Pipeliner) error { + for i, key := range keys { + commands[i] = counterNextScript.Eval(ctx, pipe, []string{key}) + } + return nil + }); err != nil { + return nil, fmt.Errorf("redis batch next box_id counters: %w", err) + } + + out := make(map[int64]int, len(unique)) + missingUsers := make([]int64, 0, len(unique)) + missingKeys := make([]string, 0, len(unique)) + for i, command := range commands { + value, err := command.Int64() + if err != nil { + return nil, fmt.Errorf("redis batch next box_id counter for %d: %w", unique[i], err) + } + if value == missingCounterSentinel { + missingUsers = append(missingUsers, unique[i]) + missingKeys = append(missingKeys, keys[i]) + continue + } + out[unique[i]] = int(value) + } + if len(missingUsers) == 0 { + return out, nil + } + + recovered, err := a.counter.recoveredBatch(ctx, missingUsers) + if err != nil { + return nil, err + } + recoveryCommands := make([]*redis.Cmd, len(missingUsers)) + if _, err := a.counter.c.Pipelined(ctx, func(pipe redis.Pipeliner) error { + for i, key := range missingKeys { + floor, ok := recovered[missingUsers[i]] + if !ok { + return fmt.Errorf("durable source omitted user %d", missingUsers[i]) + } + recoveryCommands[i] = counterRecoverNextScript.Eval(ctx, pipe, []string{key}, floor) + } + return nil + }); err != nil { + return nil, fmt.Errorf("redis batch recover-next box_id counters: %w", err) + } + for i, command := range recoveryCommands { + value, err := command.Int64() + if err != nil { + return nil, fmt.Errorf("redis batch recover-next box_id counter for %d: %w", missingUsers[i], err) + } + out[missingUsers[i]] = int(value) + } + return out, nil +} + func (a *BoxIDAllocator) CurrentBoxID(ctx context.Context, userID int64) (int, error) { v, err := a.counter.current(ctx, userID) return int(v), err @@ -184,29 +256,6 @@ func (a *ChannelIDAllocator) CurrentChannelID(ctx context.Context) (int64, error return a.counter.current(ctx, 1) } -func (a *SecretChatIDAllocator) NextSecretChatID(ctx context.Context) (int, error) { - v, err := a.counter.next(ctx, 1) - return int(v), err -} - -// NextSecretChatIDAtLeast 把计数器至少顶到 floor 后再分配下一个 id（撞 chat_id -// 主键自愈：Redis 快照回退或外部写库后计数器落后于 secret_chats 表最大 id）。 -func (a *SecretChatIDAllocator) NextSecretChatIDAtLeast(ctx context.Context, floor int) (int, error) { - if a.counter.c == nil { - return 0, fmt.Errorf("redis secret_chat_id counter: nil client") - } - v, err := counterNextAtLeastScript.Run(ctx, a.counter.c, []string{secretChatIDKey(1)}, floor).Int64() - if err != nil { - return 0, fmt.Errorf("redis next-at-least secret_chat_id counter: %w", err) - } - return int(v), nil -} - -func (a *SecretChatIDAllocator) CurrentSecretChatID(ctx context.Context) (int, error) { - v, err := a.counter.current(ctx, 1) - return int(v), err -} - func (a *ChannelMessageIDAllocator) NextChannelMessageID(ctx context.Context, channelID int64) (int, error) { v, err := a.counter.next(ctx, channelID) return int(v), err @@ -284,3 +333,14 @@ func (a counterAllocator) recovered(ctx context.Context, userID int64) (int, err } return recovered, nil } + +func (a counterAllocator) recoveredBatch(ctx context.Context, userIDs []int64) (map[int64]int, error) { + if a.source == nil { + return nil, fmt.Errorf("recover %s counters: missing durable source", a.name) + } + recovered, err := a.source.CurrentBatch(ctx, userIDs) + if err != nil { + return nil, fmt.Errorf("recover %s counters: %w", a.name, err) + } + return recovered, nil +} diff --git a/internal/store/redisstore/allocator_integration_test.go b/internal/store/redisstore/allocator_integration_test.go index 84e7ff77..a09a51a5 100644 --- a/internal/store/redisstore/allocator_integration_test.go +++ b/internal/store/redisstore/allocator_integration_test.go @@ -16,6 +16,116 @@ func (s staticCounterSource) Current(context.Context, int64) (int, error) { return s.value, nil } +func (s staticCounterSource) CurrentBatch(_ context.Context, userIDs []int64) (map[int64]int, error) { + out := make(map[int64]int, len(userIDs)) + for _, userID := range userIDs { + out[userID] = s.value + } + return out, nil +} + +type recordingCounterSource struct { + mu sync.Mutex + values map[int64]int + currentCalls int + batchCalls int + batchUsers [][]int64 +} + +func (s *recordingCounterSource) Current(_ context.Context, userID int64) (int, error) { + s.mu.Lock() + defer s.mu.Unlock() + s.currentCalls++ + return s.values[userID], nil +} + +func (s *recordingCounterSource) CurrentBatch(_ context.Context, userIDs []int64) (map[int64]int, error) { + s.mu.Lock() + defer s.mu.Unlock() + s.batchCalls++ + s.batchUsers = append(s.batchUsers, append([]int64(nil), userIDs...)) + out := make(map[int64]int, len(userIDs)) + for _, userID := range userIDs { + out[userID] = s.values[userID] + } + return out, nil +} + +func TestRedisBoxAllocatorBatchPipelinesDistinctUsersAndColdRecovery(t *testing.T) { + addr := os.Getenv("TELESRV_TEST_REDIS_ADDR") + if addr == "" { + t.Skip("set TELESRV_TEST_REDIS_ADDR to run redis integration test") + } + ctx := context.Background() + c, err := Open(ctx, addr, "", 0) + if err != nil { + t.Fatalf("open: %v", err) + } + t.Cleanup(func() { _ = c.Close() }) + + base := time.Now().UnixNano() + userIDs := []int64{base, base + 1, base, base + 2} + unique := []int64{base, base + 1, base + 2} + for _, userID := range unique { + userID := userID + t.Cleanup(func() { _ = c.Del(ctx, boxIDKey(userID)).Err() }) + } + source := &recordingCounterSource{values: map[int64]int{ + base: 100, base + 1: 200, base + 2: 300, + }} + boxes := NewBoxIDAllocator(c, source) + + first, err := boxes.NextBoxIDs(ctx, userIDs) + if err != nil { + t.Fatalf("NextBoxIDs first: %v", err) + } + for i, userID := range unique { + want := (i+1)*100 + 1 + if first[userID] != want { + t.Fatalf("first box[%d]=%d want=%d", userID, first[userID], want) + } + } + second, err := boxes.NextBoxIDs(ctx, unique) + if err != nil { + t.Fatalf("NextBoxIDs second: %v", err) + } + for i, userID := range unique { + want := (i+1)*100 + 2 + if second[userID] != want { + t.Fatalf("second box[%d]=%d want=%d", userID, second[userID], want) + } + } + source.mu.Lock() + defer source.mu.Unlock() + if source.currentCalls != 0 || source.batchCalls != 1 || len(source.batchUsers) != 1 || len(source.batchUsers[0]) != len(unique) { + t.Fatalf("source calls current=%d batch=%d users=%v", source.currentCalls, source.batchCalls, source.batchUsers) + } +} + +func TestRedisBoxAllocatorBatchValidatesWholeRequestBeforeMutation(t *testing.T) { + addr := os.Getenv("TELESRV_TEST_REDIS_ADDR") + if addr == "" { + t.Skip("set TELESRV_TEST_REDIS_ADDR to run redis integration test") + } + ctx := context.Background() + c, err := Open(ctx, addr, "", 0) + if err != nil { + t.Fatalf("open: %v", err) + } + t.Cleanup(func() { _ = c.Close() }) + + userID := time.Now().UnixNano() + key := boxIDKey(userID) + t.Cleanup(func() { _ = c.Del(ctx, key).Err() }) + boxes := NewBoxIDAllocator(c, staticCounterSource{value: 100}) + if _, err := boxes.NextBoxIDs(ctx, []int64{userID, 0}); err == nil { + t.Fatal("NextBoxIDs accepted an invalid user id") + } + if exists, err := c.Exists(ctx, key).Result(); err != nil || exists != 0 { + t.Fatalf("validated prefix mutated redis: exists=%d err=%v", exists, err) + } +} + func TestRedisBoxAllocatorRecoverFromCounterSource(t *testing.T) { addr := os.Getenv("TELESRV_TEST_REDIS_ADDR") if addr == "" { diff --git a/internal/store/redisstore/dialog_list_snapshot.go b/internal/store/redisstore/dialog_list_snapshot.go new file mode 100644 index 00000000..9499a66b --- /dev/null +++ b/internal/store/redisstore/dialog_list_snapshot.go @@ -0,0 +1,172 @@ +package redisstore + +import ( + "context" + "encoding/json" + "fmt" + "sync" + "time" + + "github.com/klauspost/compress/zstd" + "github.com/redis/go-redis/v9" + + "telesrv/internal/store" +) + +const ( + DefaultDialogListSnapshotTTL = time.Hour + dialogListSnapshotSchemaV7 = 7 + dialogListSnapshotMaxEncodedBytes = 8 << 20 + dialogListSnapshotMaxDecodedBytes = 8 << 20 +) + +var ( + dialogListSnapshotCodecOnce sync.Once + dialogListSnapshotEncoder *zstd.Encoder + dialogListSnapshotDecoder *zstd.Decoder + dialogListSnapshotCodecErr error +) + +// DialogListSnapshotCache stores version-addressed materialized owner snapshots. +// PostgreSQL read-model hashes remain the authority; this cache never decides +// whether an entry is current. +type DialogListSnapshotCache struct { + c *redis.Client + ttl time.Duration +} + +func NewDialogListSnapshotCache(c *redis.Client, ttl time.Duration) *DialogListSnapshotCache { + if ttl <= 0 { + ttl = DefaultDialogListSnapshotTTL + } + return &DialogListSnapshotCache{c: c, ttl: ttl} +} + +type dialogListSnapshotEnvelope struct { + Schema int `json:"schema"` + Key store.DialogListSnapshotCacheKey `json:"key"` + Value store.DialogListSnapshotCacheValue `json:"value"` +} + +func dialogListSnapshotKey(key store.DialogListSnapshotCacheKey) string { + return fmt.Sprintf( + "dialog:list:snapshot:v7:%d:%d", + key.UserID, key.OwnerHash, + ) +} + +func (s *DialogListSnapshotCache) GetDialogListSnapshot( + ctx context.Context, + key store.DialogListSnapshotCacheKey, +) (store.DialogListSnapshotCacheValue, bool, error) { + if s == nil || s.c == nil { + return store.DialogListSnapshotCacheValue{}, false, fmt.Errorf("dialog list snapshot Redis cache unavailable") + } + if err := validateDialogListSnapshotKey(key); err != nil { + return store.DialogListSnapshotCacheValue{}, false, err + } + redisKey := dialogListSnapshotKey(key) + raw, err := s.c.Get(ctx, redisKey).Bytes() + if err == redis.Nil { + return store.DialogListSnapshotCacheValue{}, false, nil + } + if err != nil { + return store.DialogListSnapshotCacheValue{}, false, fmt.Errorf("redis get dialog list snapshot: %w", err) + } + if len(raw) == 0 || len(raw) > dialogListSnapshotMaxEncodedBytes { + _ = s.c.Del(ctx, redisKey).Err() + return store.DialogListSnapshotCacheValue{}, false, fmt.Errorf("invalid dialog list snapshot size %d", len(raw)) + } + _, decoder, err := dialogListSnapshotCodecs() + if err != nil { + return store.DialogListSnapshotCacheValue{}, false, err + } + decoded, err := decoder.DecodeAll(raw, nil) + if err != nil { + _ = s.c.Del(ctx, redisKey).Err() + return store.DialogListSnapshotCacheValue{}, false, fmt.Errorf("decompress dialog list snapshot: %w", err) + } + if len(decoded) == 0 || len(decoded) > dialogListSnapshotMaxDecodedBytes { + _ = s.c.Del(ctx, redisKey).Err() + return store.DialogListSnapshotCacheValue{}, false, fmt.Errorf("invalid decoded dialog list snapshot size %d", len(decoded)) + } + var envelope dialogListSnapshotEnvelope + if err := json.Unmarshal(decoded, &envelope); err != nil { + _ = s.c.Del(ctx, redisKey).Err() + return store.DialogListSnapshotCacheValue{}, false, fmt.Errorf("decode dialog list snapshot: %w", err) + } + if envelope.Schema != dialogListSnapshotSchemaV7 || envelope.Key != key || envelope.Value.DependencyHash == 0 { + _ = s.c.Del(ctx, redisKey).Err() + return store.DialogListSnapshotCacheValue{}, false, fmt.Errorf("dialog list snapshot identity/schema mismatch") + } + return envelope.Value, true, nil +} + +func (s *DialogListSnapshotCache) PutDialogListSnapshot( + ctx context.Context, + key store.DialogListSnapshotCacheKey, + value store.DialogListSnapshotCacheValue, +) error { + if s == nil || s.c == nil { + return fmt.Errorf("dialog list snapshot Redis cache unavailable") + } + if err := validateDialogListSnapshotKey(key); err != nil { + return err + } + if value.DependencyHash == 0 { + return fmt.Errorf("invalid dialog list snapshot dependency hash") + } + decoded, err := json.Marshal(dialogListSnapshotEnvelope{ + Schema: dialogListSnapshotSchemaV7, + Key: key, + Value: value, + }) + if err != nil { + return fmt.Errorf("encode dialog list snapshot: %w", err) + } + if len(decoded) > dialogListSnapshotMaxDecodedBytes { + return fmt.Errorf("dialog list snapshot exceeds %d decoded bytes: %d", dialogListSnapshotMaxDecodedBytes, len(decoded)) + } + encoder, _, err := dialogListSnapshotCodecs() + if err != nil { + return err + } + raw := encoder.EncodeAll(decoded, nil) + if len(raw) == 0 || len(raw) > dialogListSnapshotMaxEncodedBytes { + return fmt.Errorf("dialog list snapshot exceeds %d encoded bytes: %d", dialogListSnapshotMaxEncodedBytes, len(raw)) + } + if err := s.c.Set(ctx, dialogListSnapshotKey(key), raw, s.ttl).Err(); err != nil { + return fmt.Errorf("redis set dialog list snapshot: %w", err) + } + return nil +} + +func dialogListSnapshotCodecs() (*zstd.Encoder, *zstd.Decoder, error) { + dialogListSnapshotCodecOnce.Do(func() { + dialogListSnapshotEncoder, dialogListSnapshotCodecErr = zstd.NewWriter( + nil, + zstd.WithEncoderLevel(zstd.SpeedFastest), + ) + if dialogListSnapshotCodecErr != nil { + return + } + dialogListSnapshotDecoder, dialogListSnapshotCodecErr = zstd.NewReader( + nil, + zstd.WithDecoderMaxMemory(dialogListSnapshotMaxDecodedBytes), + zstd.WithDecoderMaxWindow(dialogListSnapshotMaxDecodedBytes), + ) + }) + if dialogListSnapshotCodecErr != nil { + return nil, nil, fmt.Errorf("initialize dialog list snapshot codec: %w", dialogListSnapshotCodecErr) + } + return dialogListSnapshotEncoder, dialogListSnapshotDecoder, nil +} + +func validateDialogListSnapshotKey(key store.DialogListSnapshotCacheKey) error { + if key.UserID == 0 || key.OwnerHash == 0 { + return fmt.Errorf("invalid dialog list snapshot key") + } + return nil +} + +var _ store.DialogListSnapshotCache = (*DialogListSnapshotCache)(nil) diff --git a/internal/store/redisstore/dialog_list_snapshot_integration_test.go b/internal/store/redisstore/dialog_list_snapshot_integration_test.go new file mode 100644 index 00000000..efc9fdd2 --- /dev/null +++ b/internal/store/redisstore/dialog_list_snapshot_integration_test.go @@ -0,0 +1,77 @@ +package redisstore + +import ( + "bytes" + "context" + "os" + "reflect" + "testing" + "time" + + "telesrv/internal/domain" + "telesrv/internal/store" +) + +func TestDialogListSnapshotCacheRoundTripAndCorruptFailClosed(t *testing.T) { + addr := os.Getenv("TELESRV_TEST_REDIS_ADDR") + if addr == "" { + t.Skip("set TELESRV_TEST_REDIS_ADDR to run redis integration test") + } + ctx := context.Background() + c, err := Open(ctx, addr, "", 0) + if err != nil { + t.Fatalf("open: %v", err) + } + t.Cleanup(func() { _ = c.Close() }) + + key := store.DialogListSnapshotCacheKey{ + UserID: time.Now().UnixNano(), OwnerHash: 7001, + } + redisKey := dialogListSnapshotKey(key) + t.Cleanup(func() { _ = c.Del(ctx, redisKey).Err() }) + cache := NewDialogListSnapshotCache(c, time.Minute) + want := store.DialogListSnapshotCacheValue{ + DependencyHash: 8001, + Dialogs: []domain.Dialog{{ + Peer: domain.Peer{Type: domain.PeerTypeChannel, ID: 91}, TopMessage: 7, TopMessageDate: 70, + Draft: &domain.DialogDraft{Peer: domain.Peer{Type: domain.PeerTypeChannel, ID: 91}, Date: 71, Message: "shared draft"}, + DefaultSendAs: &domain.Peer{Type: domain.PeerTypeChannel, ID: 93}, + ChannelMember: &domain.ChannelMember{ + ChannelID: 91, UserID: 92, Role: domain.ChannelRoleAdmin, Status: domain.ChannelMemberActive, + AvailableMinPts: 3, AdminRights: domain.ChannelAdminRights{PostMessages: true}, + }, + }}, + Messages: []domain.Message{{ + ID: 8, Peer: domain.Peer{Type: domain.PeerTypeUser, ID: 92}, Body: "private top", + }}, + Users: []domain.User{{ID: 92, FirstName: "peer"}}, + State: domain.UpdateState{Pts: 3, Date: 4, Seq: 5}, + } + if err := cache.PutDialogListSnapshot(ctx, key, want); err != nil { + t.Fatalf("put: %v", err) + } + raw, err := c.Get(ctx, redisKey).Bytes() + if err != nil { + t.Fatalf("get encoded value: %v", err) + } + if !bytes.HasPrefix(raw, []byte{0x28, 0xb5, 0x2f, 0xfd}) { + t.Fatalf("snapshot is not a zstd frame: prefix=%x", raw[:min(len(raw), 4)]) + } + got, found, err := cache.GetDialogListSnapshot(ctx, key) + if err != nil || !found || !reflect.DeepEqual(got, want) { + t.Fatalf("get = %+v found=%v err=%v, want %+v", got, found, err, want) + } + if ttl, err := c.TTL(ctx, redisKey).Result(); err != nil || ttl <= 0 || ttl > time.Minute { + t.Fatalf("ttl = %v err=%v", ttl, err) + } + + if err := c.Set(ctx, redisKey, "{bad json", time.Minute).Err(); err != nil { + t.Fatalf("seed corrupt value: %v", err) + } + if _, _, err := cache.GetDialogListSnapshot(ctx, key); err == nil { + t.Fatal("corrupt cache value accepted") + } + if exists, err := c.Exists(ctx, redisKey).Result(); err != nil || exists != 0 { + t.Fatalf("corrupt key exists=%d err=%v, want deleted", exists, err) + } +} diff --git a/internal/store/secretchat.go b/internal/store/secretchat.go index 63efca6e..480f19ca 100644 --- a/internal/store/secretchat.go +++ b/internal/store/secretchat.go @@ -10,14 +10,11 @@ import ( // storetest 钉死）。服务端是盲中继：g_a/g_b/key_fingerprint 原样不透明存储。 // 设计见 docs/secret-chat-module.md。 type SecretChatStore interface { - // CreateSecretChat 插入 requested 态密聊。chat_id 主键撞键返回 - // domain.ErrSecretChatIDConflict（调用方按 AtLeast 重分配重试）。 + // CreateSecretChat 插入 requested 态密聊。chat_id 必须等于 requestEncryption.random_id； + // 主键/幂等键撞键返回 domain.ErrSecretChatRandomIDDuplicate，禁止另分配 ID。 CreateSecretChat(ctx context.Context, chat domain.SecretChat) error // GetSecretChat 按 chat_id 取密聊。 GetSecretChat(ctx context.Context, chatID int) (domain.SecretChat, bool, error) - // GetByAdminRandom 幂等查询：按发起设备 perm auth_key + random_id 找既有密聊 - //（同 random_id 重发 requestEncryption 返回同 chat）。 - GetByAdminRandom(ctx context.Context, adminAuthKeyID int64, randomID int32) (domain.SecretChat, bool, error) // AcceptSecretChat 原子 CAS 绑定：仅当 requested 且 participant_auth_key_id 未绑定时 // 迁移到 normal、落 g_b/key_fingerprint、绑定接受设备。并发第二个 accept 或已成型/ // 已销毁分别返回 domain.ErrSecretChatAlreadyAccepted / ErrSecretChatAlreadyDeclined； @@ -30,8 +27,6 @@ type SecretChatStore interface { // 接受方 participant）且未终态的密聊，按 chat_id 升序。设备登出 / 授权撤销时用于级联 // discard 并通知对端（避免对端继续往死 auth_key 投递的静默死链）。authKeyID==0 返回 nil。 ListActiveSecretChatsByAuthKey(ctx context.Context, authKeyID int64) ([]domain.SecretChat, error) - // MaxSecretChatID 返回当前最大 chat_id（id 计数器冷恢复 / 撞键自愈用，空表返回 0）。 - MaxSecretChatID(ctx context.Context) (int, error) } // EncryptedQueueStore 持久化密聊 qts 投递队列（设备级，memory/postgres 双实现）。 @@ -64,11 +59,3 @@ type EncryptedQueueStore interface { // GetEncryptedFile 按 id + access_hash 回查文件快照（inputEncryptedFile 复用路径）。 GetEncryptedFile(ctx context.Context, id, accessHash int64) (domain.EncryptedFileRef, bool, error) } - -// SecretChatIDAllocator 分配全局单调 chat_id（int32 量级）。Redis INCR 实现 + PG -// CounterSource 冷恢复；撞键时 AtLeast 自愈。语义同 ChannelIDAllocator。 -type SecretChatIDAllocator interface { - NextSecretChatID(ctx context.Context) (int, error) - NextSecretChatIDAtLeast(ctx context.Context, floor int) (int, error) - CurrentSecretChatID(ctx context.Context) (int, error) -} diff --git a/internal/store/story.go b/internal/store/story.go index 4312c509..2dc342a4 100644 --- a/internal/store/story.go +++ b/internal/store/story.go @@ -23,6 +23,8 @@ type StoryStore interface { GetPeerMaxIDs(ctx context.Context, viewerUserID int64, peers []domain.Peer, now int) ([]domain.RecentStory, error) GetPeerHiddenStates(ctx context.Context, viewerUserID int64, peers []domain.Peer) (map[domain.Peer]bool, error) GetPeerStoryProjections(ctx context.Context, viewerUserID int64, peers []domain.Peer, now int) ([]domain.PeerStoryProjection, error) + ActiveStoryPeerExpirations(ctx context.Context, peers []domain.Peer, now int) (map[domain.Peer]int, error) + ListHiddenStoryPeers(ctx context.Context, viewerUserID int64) ([]domain.Peer, error) MarkRead(ctx context.Context, viewerUserID int64, peer domain.Peer, maxID, date int) (domain.StoryReadResult, error) IncrementViews(ctx context.Context, viewerUserID int64, peer domain.Peer, ids []int, date int) (int, error) SetReaction(ctx context.Context, viewerUserID int64, peer domain.Peer, storyID int, reaction *domain.MessageReaction, date int) (domain.StoryReactionResult, error) diff --git a/internal/store/temp_auth_key.go b/internal/store/temp_auth_key.go index 27924812..7eb57fe8 100644 --- a/internal/store/temp_auth_key.go +++ b/internal/store/temp_auth_key.go @@ -14,6 +14,10 @@ var ErrTempAuthKeyAlreadyBound = errors.New("temporary auth key already bound") // TempAuthKeyBindingStore 持久化 auth.bindTempAuthKey 的 temp→perm 绑定。 type TempAuthKeyBindingStore interface { Save(ctx context.Context, binding domain.TempAuthKeyBinding) error + // SaveWithState performs the same write and returns the exact Layer tuple + // committed under the identity/key locks. Callers must use this result rather + // than issuing a post-commit confirmation read. + SaveWithState(ctx context.Context, binding domain.TempAuthKeyBinding) (domain.TempAuthKeyBindingResult, error) GetByTemp(ctx context.Context, tempAuthKeyID [8]byte) (domain.TempAuthKeyBinding, bool, error) // DeleteExpired 以 auth_keys 的握手协议 expiry 为唯一事实源，回收早于 // expiredBefore（unix 秒）的 temporary key，单次最多 limit 条并返回 key 数。 diff --git a/internal/store/user.go b/internal/store/user.go index 6a6e70b9..8f8bf35b 100644 --- a/internal/store/user.go +++ b/internal/store/user.go @@ -48,6 +48,22 @@ type UserStore interface { UpdatePersonalChannel(ctx context.Context, userID int64, channelID int64) (domain.User, error) } +// UserLastSeenUpdate is one monotonic durable presence watermark. Writers must +// apply the maximum timestamp for duplicate user IDs and must never move the +// stored value backwards. +type UserLastSeenUpdate struct { + UserID int64 + LastSeenAt int +} + +// UserLastSeenBatchStore is the optional production write boundary used by +// lifecycle presence batching. It deliberately remains separate from +// UserStore so narrow test stores and read-only projections do not acquire a +// fake batch capability accidentally. +type UserLastSeenBatchStore interface { + UpdateLastSeenBatch(ctx context.Context, updates []UserLastSeenUpdate) error +} + // UserEmojiStatusEventStore is the aggregate write boundary used by the // account RPC in durable deployments. The user snapshot, pts event and online // dispatch row must commit or roll back together. diff --git a/internal/store/welcome_message.go b/internal/store/welcome_message.go new file mode 100644 index 00000000..d9b9e4bd --- /dev/null +++ b/internal/store/welcome_message.go @@ -0,0 +1,29 @@ +package store + +import ( + "context" + "time" + + "telesrv/internal/domain" +) + +// WelcomeMessageStore is the independent durable Layer 229 template state. +// It must not reuse transient EphemeralMessageStore or write update/outbox rows. +type WelcomeMessageStore interface { + CreateWelcomeMessage(ctx context.Context, req domain.CreateWelcomeMessageRequest) (domain.WelcomeMessage, bool, error) + EditWelcomeMessage(ctx context.Context, req domain.EditWelcomeMessageRequest) (domain.WelcomeMessage, error) + ListWelcomeMessages(ctx context.Context, peer domain.Peer, hash int64) (domain.WelcomeMessageList, error) + DeleteWelcomeMessage(ctx context.Context, peer domain.Peer, id int) (bool, error) + DeleteAllWelcomeMessages(ctx context.Context, peer domain.Peer) (bool, error) + HasWelcomeMessages(ctx context.Context, peer domain.Peer) (bool, error) +} + +// WelcomeMessageDeliveryStore is the bounded non-PTS recovery boundary for +// actual join greetings. Implementations lease rows, ACK the first compatible +// online delivery, and physically delete pending and delivered rows at TTL. +type WelcomeMessageDeliveryStore interface { + ClaimWelcomeMessageDeliveries(ctx context.Context, owner string, now time.Time, limit int, lease time.Duration) ([]domain.WelcomeMessageDelivery, error) + AckWelcomeMessageDeliveries(ctx context.Context, owner string, ids []int64, deliveredAt time.Time) (int, error) + RetryWelcomeMessageDeliveries(ctx context.Context, owner string, ids []int64, nextAttempt time.Time, lastError string) (int, error) + DeleteExpiredWelcomeMessageDeliveries(ctx context.Context, now time.Time, limit int) (int, error) +} diff --git a/internal/telegramloginhttp/handler.go b/internal/telegramloginhttp/handler.go index feda7894..f2851c07 100644 --- a/internal/telegramloginhttp/handler.go +++ b/internal/telegramloginhttp/handler.go @@ -24,6 +24,7 @@ import ( "go.uber.org/zap" loginapp "telesrv/internal/app/telegramlogin" + "telesrv/internal/branding" "telesrv/internal/domain" ) @@ -31,11 +32,13 @@ const ( maxAuthorizationQueryBytes = 16 << 10 maxTokenFormBytes = 16 << 10 maxStatusFormBytes = 4 << 10 + maxWidgetResolveFormBytes = 1 << 10 ) type Config struct { Service *loginapp.Service Tokens *loginapp.IDTokenIssuer + BotUsernames BotUsernameResolver Limiter RateLimiter AppName string Logger *zap.Logger @@ -46,6 +49,7 @@ type Config struct { type Handler struct { service *loginapp.Service tokens *loginapp.IDTokenIssuer + botUsernames BotUsernameResolver appName string logger *zap.Logger limiter RateLimiter @@ -58,12 +62,16 @@ type RateLimiter interface { Allow(ctx context.Context, key string, limit int, window time.Duration) (allowed bool, retryAfterSeconds int, err error) } +type BotUsernameResolver interface { + ByUsername(ctx context.Context, username string) (domain.User, bool, error) +} + func NewHandler(cfg Config) (*Handler, error) { - if cfg.Service == nil || cfg.Tokens == nil || cfg.Tokens.Issuer() == "" { + if cfg.Service == nil || cfg.Tokens == nil || cfg.Tokens.Issuer() == "" || cfg.BotUsernames == nil { return nil, errors.New("telegram login HTTP dependencies are incomplete") } if strings.TrimSpace(cfg.AppName) == "" { - cfg.AppName = "Telesrv" + cfg.AppName = branding.ProductName } if cfg.Logger == nil { cfg.Logger = zap.NewNop() @@ -76,7 +84,7 @@ func NewHandler(cfg Config) (*Handler, error) { } trustedProxies = append(trustedProxies, prefix.Masked()) } - h := &Handler{service: cfg.Service, tokens: cfg.Tokens, appName: strings.TrimSpace(cfg.AppName), logger: cfg.Logger, limiter: cfg.Limiter, trustedProxies: trustedProxies, allowHTTP: cfg.AllowHTTP} + h := &Handler{service: cfg.Service, tokens: cfg.Tokens, botUsernames: cfg.BotUsernames, appName: strings.TrimSpace(cfg.AppName), logger: cfg.Logger, limiter: cfg.Limiter, trustedProxies: trustedProxies, allowHTTP: cfg.AllowHTTP} mux := http.NewServeMux() mux.HandleFunc("GET /.well-known/openid-configuration", h.discovery) mux.HandleFunc("GET /.well-known/jwks.json", h.jwks) @@ -87,6 +95,9 @@ func NewHandler(cfg Config) (*Handler, error) { mux.HandleFunc("POST /token", h.token) mux.HandleFunc("GET /telegram-login.js", h.loginJavaScript) mux.HandleFunc("GET /js/telegram-login.js", h.loginJavaScript) + mux.HandleFunc("GET /telegram-widget.js", h.widgetJavaScript) + mux.HandleFunc("GET /js/telegram-widget.js", h.widgetJavaScript) + mux.HandleFunc("POST /telegram-widget/resolve", h.resolveWidgetClient) h.mux = mux return h, nil } @@ -361,6 +372,55 @@ func setInAppCORS(w http.ResponseWriter, origin string) { w.Header().Set("Vary", "Origin") } +func (h *Handler) resolveWidgetClient(w http.ResponseWriter, r *http.Request) { + if !h.allow(w, r, "widget-resolve", h.requestIP(r), 60, time.Minute) { + return + } + origins := r.Header.Values("Origin") + if len(origins) != 1 || origins[0] == "" { + writeOAuthError(w, http.StatusForbidden, "access_denied", "browser origin is not authorized") + return + } + form, ok := parseBoundedForm(w, r, maxWidgetResolveFormBytes) + if !ok { + return + } + rawUsername, unique := requiredSingleValue(form, "username", domain.MaxCollectibleUsernameLength+1) + username := domain.NormalizeUsername(rawUsername) + if !unique || !domain.ValidCollectibleUsername(username) { + writeOAuthError(w, http.StatusBadRequest, "invalid_request", "bot username is invalid") + return + } + user, found, err := h.botUsernames.ByUsername(r.Context(), username) + if err != nil { + h.logger.Error("telegram_widget_username_resolve_failed", zap.String("error", errorClass(err))) + writeOAuthError(w, http.StatusInternalServerError, "server_error", "widget client lookup failed") + return + } + if !found || !user.Bot || user.ID <= 0 { + writeOAuthError(w, http.StatusNotFound, "invalid_client", "widget client is unavailable") + return + } + resolved, err := h.service.ResolveWidgetClient(r.Context(), user.ID, origins[0]) + if err != nil { + switch { + case errors.Is(err, domain.ErrTelegramLoginClientInvalid), errors.Is(err, domain.ErrTelegramLoginClientDisabled): + writeOAuthError(w, http.StatusNotFound, "invalid_client", "widget client is unavailable") + case errors.Is(err, domain.ErrTelegramLoginOriginNotAllowed), errors.Is(err, domain.ErrTelegramLoginURLInvalid): + writeOAuthError(w, http.StatusForbidden, "access_denied", "browser origin is not authorized") + default: + h.logger.Error("telegram_widget_client_resolve_failed", zap.String("error", errorClass(err))) + writeOAuthError(w, http.StatusInternalServerError, "server_error", "widget client lookup failed") + } + return + } + w.Header().Set("Access-Control-Allow-Origin", resolved.Origin) + w.Header().Set("Vary", "Origin") + w.Header().Set("Cache-Control", "no-store") + w.Header().Set("Pragma", "no-cache") + writeJSON(w, http.StatusOK, map[string]string{"client_id": resolved.ClientID}) +} + func nativeSDKPlatform(values url.Values) (domain.TelegramLoginNativePlatform, bool) { ios, iosUnique := singleValue(values, "ios_sdk") android, androidUnique := singleValue(values, "android_sdk") diff --git a/internal/telegramloginhttp/handler_test.go b/internal/telegramloginhttp/handler_test.go index e5414c1d..110cf14f 100644 --- a/internal/telegramloginhttp/handler_test.go +++ b/internal/telegramloginhttp/handler_test.go @@ -64,6 +64,13 @@ func (telegramLoginHTTPDenyLimiter) Allow(context.Context, string, int, time.Dur return false, 17, nil } +type telegramLoginHTTPBotUsernames map[string]domain.User + +func (u telegramLoginHTTPBotUsernames) ByUsername(_ context.Context, username string) (domain.User, bool, error) { + user, ok := u[strings.ToLower(domain.NormalizeUsername(username))] + return user, ok, nil +} + func newTelegramLoginHTTPFixture(t *testing.T) telegramLoginHTTPFixture { return newTelegramLoginHTTPFixtureWithAppLinkBase(t, "") } @@ -113,7 +120,13 @@ func newTelegramLoginHTTPFixtureWithAppLinkBase(t *testing.T, appLinkBase string if err != nil { t.Fatal(err) } - handler, err := NewHandler(Config{Service: service, Tokens: tokens, AppName: "Telesrv", AllowHTTP: true}) + handler, err := NewHandler(Config{ + Service: service, Tokens: tokens, AppName: "Telesrv", AllowHTTP: true, + BotUsernames: telegramLoginHTTPBotUsernames{ + "botname": {ID: 9001, Username: "BotName", Bot: true, BotInfoVersion: 1}, + "alice": {ID: 42, Username: "alice"}, + }, + }) if err != nil { t.Fatal(err) } @@ -712,6 +725,7 @@ func TestTelegramLoginJavaScriptIsCacheableAndConditional(t *testing.T) { !strings.Contains(first.Body.String(), "/auth/status") || !strings.Contains(first.Body.String(), "oauth_supported") || !strings.Contains(first.Body.String(), "/inapp?") || + !strings.Contains(first.Body.String(), "openid:'openid'") || !strings.Contains(first.Body.String(), "data-client-id") { t.Fatalf("SDK status=%d headers=%v body=%s", first.Code, first.Header(), first.Body.String()) } @@ -723,3 +737,88 @@ func TestTelegramLoginJavaScriptIsCacheableAndConditional(t *testing.T) { t.Fatalf("conditional SDK status=%d", second.Code) } } + +func TestTelegramWidgetJavaScriptIsSelfHostedCacheableAndAliased(t *testing.T) { + f := newTelegramLoginHTTPFixture(t) + for _, path := range []string{"/telegram-widget.js?23", "/js/telegram-widget.js?23"} { + recorder := httptest.NewRecorder() + f.handler.ServeHTTP(recorder, httptest.NewRequest(http.MethodGet, path, nil)) + body := recorder.Body.String() + if recorder.Code != http.StatusOK || recorder.Header().Get("ETag") == "" || + !strings.Contains(body, "/js/telegram-login.js") || + !strings.Contains(body, "/telegram-widget/resolve") || + !strings.Contains(body, "api.auth(options,finish)") || + !strings.Contains(body, "data-client-id") || + !strings.Contains(body, "data-telegram-login") || + !strings.Contains(body, "data-size") || + !strings.Contains(body, "data-radius") || + !strings.Contains(body, "data-request-access") || + !strings.Contains(body, "data-lang") || + !strings.Contains(body, "data-onauth") || + !strings.Contains(body, "openid profile telegram:bot_access") || + strings.Contains(body, "telegram.org") { + t.Fatalf("widget SDK path=%q status=%d headers=%v body=%s", path, recorder.Code, recorder.Header(), body) + } + } + first := httptest.NewRecorder() + f.handler.ServeHTTP(first, httptest.NewRequest(http.MethodGet, "/js/telegram-widget.js", nil)) + second := httptest.NewRecorder() + request := httptest.NewRequest(http.MethodGet, "/js/telegram-widget.js", nil) + request.Header.Set("If-None-Match", first.Header().Get("ETag")) + f.handler.ServeHTTP(second, request) + if second.Code != http.StatusNotModified { + t.Fatalf("conditional widget SDK status=%d", second.Code) + } +} + +func TestTelegramWidgetUsernameResolutionRequiresEnabledClientAndAllowedOrigin(t *testing.T) { + f := newTelegramLoginHTTPFixture(t) + resolve := func(username, origin string) *httptest.ResponseRecorder { + t.Helper() + recorder := httptest.NewRecorder() + request := httptest.NewRequest(http.MethodPost, "/telegram-widget/resolve", strings.NewReader(url.Values{"username": {username}}.Encode())) + request.Header.Set("Content-Type", "application/x-www-form-urlencoded") + if origin != "" { + request.Header.Set("Origin", origin) + } + f.handler.ServeHTTP(recorder, request) + return recorder + } + + valid := resolve("@BotName", "https://rp.example") + if valid.Code != http.StatusOK || valid.Header().Get("Access-Control-Allow-Origin") != "https://rp.example" || + !strings.Contains(valid.Header().Get("Vary"), "Origin") || valid.Header().Get("Cache-Control") != "no-store" { + t.Fatalf("valid widget resolution status=%d headers=%v body=%s", valid.Code, valid.Header(), valid.Body.String()) + } + var payload map[string]string + if err := json.Unmarshal(valid.Body.Bytes(), &payload); err != nil || payload["client_id"] != "9001" { + t.Fatalf("valid widget resolution payload=%v err=%v", payload, err) + } + + for _, tc := range []struct { + name string + username string + origin string + status int + }{ + {name: "unregistered origin", username: "BotName", origin: "https://evil.example", status: http.StatusForbidden}, + {name: "missing origin", username: "BotName", status: http.StatusForbidden}, + {name: "not a bot", username: "alice", origin: "https://rp.example", status: http.StatusNotFound}, + {name: "unknown bot", username: "MissingBot", origin: "https://rp.example", status: http.StatusNotFound}, + } { + t.Run(tc.name, func(t *testing.T) { + got := resolve(tc.username, tc.origin) + if got.Code != tc.status || got.Header().Get("Access-Control-Allow-Origin") != "" { + t.Fatalf("status=%d headers=%v body=%s", got.Code, got.Header(), got.Body.String()) + } + }) + } + + if err := f.service.SetClientEnabled(context.Background(), 9001, false); err != nil { + t.Fatal(err) + } + disabled := resolve("BotName", "https://rp.example") + if disabled.Code != http.StatusNotFound || disabled.Header().Get("Access-Control-Allow-Origin") != "" { + t.Fatalf("disabled widget client status=%d headers=%v body=%s", disabled.Code, disabled.Header(), disabled.Body.String()) + } +} diff --git a/internal/telegramloginhttp/sdk.go b/internal/telegramloginhttp/sdk.go index d95e18ec..154fa3a2 100644 --- a/internal/telegramloginhttp/sdk.go +++ b/internal/telegramloginhttp/sdk.go @@ -25,7 +25,7 @@ function normalize(options){ if(input===undefined||input===null||input===''){scopes.push('profile');input=options.request_access||[];} if(typeof input==='string'){input=input.trim()?input.trim().split(/\s+/):[];} if(!Array.isArray(input)){throw new Error('Telegram.Login scope must be an array or string');} - var allowed={profile:'profile',phone:'phone',write:'telegram:bot_access','telegram:bot_access':'telegram:bot_access'}; + var allowed={openid:'openid',profile:'profile',phone:'phone',write:'telegram:bot_access','telegram:bot_access':'telegram:bot_access'}; input.forEach(function(value){var mapped=allowed[value];if(!mapped){throw new Error('Telegram.Login scope is invalid');}if(scopes.indexOf(mapped)<0){scopes.push(mapped);}}); return {client_id:String(options.client_id),scope:scopes.join(' '),nonce:String(options.nonce||'').slice(0,1024),lang:String(options.lang||'').slice(0,16)}; } @@ -76,8 +76,85 @@ function autoInit(){var client=current.getAttribute('data-client-id');if(!client if(document.readyState==='loading'){document.addEventListener('DOMContentLoaded',autoInit);}else{autoInit();} })(window);` +// telegramWidgetJavaScript is deliberately only a presentation and +// compatibility layer. It loads this issuer's Telegram Login SDK, optionally +// resolves a local bot username, and delegates the authorization flow to +// Telegram.Login.auth without contacting Telegram's public widget backend. +const telegramWidgetJavaScript = `(function(global){ +'use strict'; +var current=document.currentScript; +if(!current){throw new Error('telesrv Telegram widget shim must be loaded by a script element');} +var provider=new URL(current.src,document.baseURI).origin; +var clientAttr=String(current.getAttribute('data-client-id')||'').trim(); +var username=String(current.getAttribute('data-telegram-login')||'').trim().replace(/^@/,''); +var size=String(current.getAttribute('data-size')||'large').trim().toLowerCase(); +var radius=String(current.getAttribute('data-radius')||'8').trim(); +var requestAccess=String(current.getAttribute('data-request-access')||'').trim().toLowerCase(); +var lang=String(current.getAttribute('data-lang')||'').trim().slice(0,16); +var onauth=resolveCallback(current.getAttribute('data-onauth')); +var label=username?'Log in with @'+username:'Log in with Telegram'; +var wrapper=document.createElement('span'),button=document.createElement('button'); +wrapper.className='telesrv-telegram-widget'; +button.type='button';button.className='telesrv-telegram-login-button';button.disabled=true;button.textContent=label; +button.style.cssText='border:0;background:#2aabee;color:#fff;cursor:pointer;font-family:Arial,sans-serif;font-weight:600;line-height:1.2;box-shadow:0 1px 2px rgba(0,0,0,.18)'; +var sizes={small:['12px','6px 10px'],medium:['14px','8px 14px'],large:['16px','10px 18px']},selected=sizes[size]||sizes.large; +button.style.fontSize=selected[0];button.style.padding=selected[1]; +button.style.borderRadius=/^[0-9]{1,3}$/.test(radius)?Math.min(Number(radius),64)+'px':'8px'; +if(lang){button.lang=lang;} +wrapper.appendChild(button); +function mount(){if(current.parentNode&¤t.parentNode!==document.head){current.parentNode.insertBefore(wrapper,current.nextSibling);}else if(document.body){document.body.appendChild(wrapper);}} +if(document.body){mount();}else{document.addEventListener('DOMContentLoaded',mount,{once:true});} +function resolveCallback(source){ + var match=/^([A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*)*)(?:\(\s*(?:[A-Za-z_$][\w$]*)?\s*\))?\s*;?$/.exec(String(source||'').trim()); + if(!match){return null;} + return function(value){var target=global,parts=match[1].split('.');for(var i=0;i 4<<20 { + return nil, fmt.Errorf("manifest exceeds 4 MiB") + } + + var manifest Manifest + decoder := json.NewDecoder(io.LimitReader(f, 4<<20)) + decoder.DisallowUnknownFields() + if err := decoder.Decode(&manifest); err != nil { + return nil, fmt.Errorf("decode manifest: %w", err) + } + if err := ensureJSONEOF(decoder); err != nil { + return nil, err + } + if manifest.SchemaVersion != ManifestSchemaVersion { + return nil, fmt.Errorf("schema_version = %d, want %d", manifest.SchemaVersion, ManifestSchemaVersion) + } + + catalog := &Catalog{manifest: manifest, files: make(map[string]fileRecord)} + if err := catalog.validateDesktop(filesDir); err != nil { + return nil, err + } + if err := catalog.validateApps(); err != nil { + return nil, err + } + return catalog, nil +} + +func ensureJSONEOF(decoder *json.Decoder) error { + var extra any + if err := decoder.Decode(&extra); err == io.EOF { + return nil + } else if err != nil { + return fmt.Errorf("decode manifest trailer: %w", err) + } + return fmt.Errorf("manifest contains more than one JSON value") +} + +func (c *Catalog) validateDesktop(filesDir string) error { + for platform, channels := range c.manifest.Desktop { + if !validDesktopPlatform(platform) { + return fmt.Errorf("desktop platform %q is unsupported", platform) + } + for channel, release := range channels { + if !validChannel(channel) { + return fmt.Errorf("desktop.%s channel %q is unsupported", platform, channel) + } + if release.Disabled { + continue + } + prefix := fmt.Sprintf("desktop.%s.%s", platform, channel) + if release.Build == 0 { + return fmt.Errorf("%s.build must be positive", prefix) + } + if release.File == "" || filepath.Base(release.File) != release.File || strings.ContainsAny(release.File, `/\\`) { + return fmt.Errorf("%s.file must be a single file name", prefix) + } + if !sha256RE.MatchString(release.SHA256) { + return fmt.Errorf("%s.sha256 must contain 64 hexadecimal characters", prefix) + } + if existing, ok := c.files[release.File]; ok { + if !strings.EqualFold(existing.sha256, release.SHA256) { + return fmt.Errorf("%s.file %q is reused with another SHA256", prefix, release.File) + } + continue + } + + path := filepath.Join(filesDir, release.File) + record, err := verifyDesktopFile(path, release) + if err != nil { + return fmt.Errorf("%s: %w", prefix, err) + } + c.files[release.File] = record + } + } + return nil +} + +func verifyDesktopFile(path string, release DesktopRelease) (fileRecord, error) { + f, err := os.Open(path) + if err != nil { + return fileRecord{}, fmt.Errorf("open package %q: %w", release.File, err) + } + defer f.Close() + + info, err := f.Stat() + if err != nil { + return fileRecord{}, fmt.Errorf("stat package %q: %w", release.File, err) + } + if !info.Mode().IsRegular() { + return fileRecord{}, fmt.Errorf("package %q is not a regular file", release.File) + } + if release.Size > 0 && release.Size != info.Size() { + return fileRecord{}, fmt.Errorf("package %q size = %d, want %d", release.File, info.Size(), release.Size) + } + hash := sha256.New() + if _, err := io.Copy(hash, f); err != nil { + return fileRecord{}, fmt.Errorf("hash package %q: %w", release.File, err) + } + actual := hex.EncodeToString(hash.Sum(nil)) + if !strings.EqualFold(actual, release.SHA256) { + return fileRecord{}, fmt.Errorf("package %q SHA256 = %s, want %s", release.File, actual, strings.ToLower(release.SHA256)) + } + return fileRecord{ + path: path, + name: release.File, + sha256: actual, + size: info.Size(), + modTime: info.ModTime(), + }, nil +} + +func (c *Catalog) validateApps() error { + for platform, channels := range c.manifest.Apps { + if !validAppPlatform(platform) { + return fmt.Errorf("apps platform %q is unsupported", platform) + } + for channel, release := range channels { + if !validChannel(channel) { + return fmt.Errorf("apps.%s channel %q is unsupported", platform, channel) + } + if release.Disabled { + continue + } + prefix := fmt.Sprintf("apps.%s.%s", platform, channel) + if release.ID <= 0 { + return fmt.Errorf("%s.id must be positive", prefix) + } + if _, ok := parseVersion(release.Version); !ok { + return fmt.Errorf("%s.version must contain a numeric version", prefix) + } + if len(release.Notes) == 0 { + return fmt.Errorf("%s.notes must contain at least one localization", prefix) + } + for lang, note := range release.Notes { + if strings.TrimSpace(lang) == "" || strings.TrimSpace(note) == "" { + return fmt.Errorf("%s.notes contains an empty language or text", prefix) + } + } + if release.URL != "" { + if err := validateDownloadURL(release.URL); err != nil { + return fmt.Errorf("%s.url: %w", prefix, err) + } + } + for source, rawURL := range release.URLBySource { + if strings.TrimSpace(source) == "" { + return fmt.Errorf("%s.url_by_source contains an empty source", prefix) + } + if err := validateDownloadURL(rawURL); err != nil { + return fmt.Errorf("%s.url_by_source[%q]: %w", prefix, source, err) + } + } + } + } + return nil +} + +func validateDownloadURL(raw string) error { + u, err := url.Parse(raw) + if err != nil { + return fmt.Errorf("parse URL: %w", err) + } + if (u.Scheme != "http" && u.Scheme != "https") || u.Hostname() == "" || u.User != nil { + return fmt.Errorf("must be an HTTP(S) URL without credentials") + } + return nil +} + +func validDesktopPlatform(platform string) bool { + switch platform { + case "win", "win64", "winarm", "mac", "armac", "linux": + return true + default: + return false + } +} + +func validAppPlatform(platform string) bool { + switch platform { + case "android", "ios", "macos", "tdesktop": + return true + default: + return false + } +} + +func validChannel(channel string) bool { + return channel == "stable" || channel == "beta" || channel == "alpha" +} + +// DesktopMap returns the exact JSON object consumed by TDesktop's current4 +// parser. Links are deliberately relative to autoupdate_url_prefix. +func (c *Catalog) DesktopMap() map[string]map[string]map[string]any { + result := make(map[string]map[string]map[string]any) + for platform, channels := range c.manifest.Desktop { + published := make(map[string]map[string]any) + for channel, release := range channels { + if release.Disabled { + continue + } + published[channel] = map[string]any{ + "released": release.Build, + "link": "/files/" + url.PathEscape(release.File), + } + } + if len(published) != 0 { + result[platform] = published + } + } + return result +} + +// Resolve returns a release only when it is newer than the supplied client +// version. Empty channel means stable. +func (c *Catalog) Resolve(req ResolveRequest) (*ResolvedUpdate, error) { + platform := strings.ToLower(strings.TrimSpace(req.Platform)) + channel := strings.ToLower(strings.TrimSpace(req.Channel)) + if channel == "" { + channel = "stable" + } + channels, ok := c.manifest.Apps[platform] + if !ok { + return nil, nil + } + release, ok := channels[channel] + if !ok || release.Disabled { + return nil, nil + } + if compareVersions(req.Version, release.Version) >= 0 { + return nil, nil + } + + text := localizedText(release.Notes, req.LangCode) + if text == "" { + return nil, fmt.Errorf("release %s/%s has no usable localized text", platform, channel) + } + updateURL := release.URL + if specific := release.URLBySource[req.Source]; specific != "" { + updateURL = specific + } + return &ResolvedUpdate{ + ID: release.ID, + Version: release.Version, + Text: text, + URL: updateURL, + CanNotSkip: release.CanNotSkip, + }, nil +} + +func localizedText(values map[string]string, langCode string) string { + if len(values) == 0 { + return "" + } + normalizedValues := make(map[string]string, len(values)) + for key, value := range values { + normalizedValues[strings.ToLower(strings.ReplaceAll(strings.TrimSpace(key), "_", "-"))] = value + } + normalized := strings.ToLower(strings.ReplaceAll(strings.TrimSpace(langCode), "_", "-")) + if text := normalizedValues[normalized]; text != "" { + return text + } + if base, _, ok := strings.Cut(normalized, "-"); ok { + if text := normalizedValues[base]; text != "" { + return text + } + } + if text := normalizedValues["en"]; text != "" { + return text + } + keys := make([]string, 0, len(normalizedValues)) + for key := range normalizedValues { + keys = append(keys, key) + } + sort.Strings(keys) + return normalizedValues[keys[0]] +} + +func compareVersions(left, right string) int { + a, aOK := parseVersion(left) + b, bOK := parseVersion(right) + if !aOK && !bOK { + return strings.Compare(strings.TrimSpace(left), strings.TrimSpace(right)) + } + if !aOK { + return -1 + } + if !bOK { + return 1 + } + max := len(a) + if len(b) > max { + max = len(b) + } + for i := 0; i < max; i++ { + var av, bv uint64 + if i < len(a) { + av = a[i] + } + if i < len(b) { + bv = b[i] + } + if av < bv { + return -1 + } + if av > bv { + return 1 + } + } + return 0 +} + +func parseVersion(value string) ([]uint64, bool) { + match := versionRE.FindString(value) + if match == "" { + return nil, false + } + rawParts := strings.Split(match, ".") + parts := make([]uint64, 0, len(rawParts)) + for _, raw := range rawParts { + part, err := strconv.ParseUint(raw, 10, 64) + if err != nil { + return nil, false + } + parts = append(parts, part) + } + return parts, true +} + +func (c *Catalog) file(name string) (fileRecord, bool) { + record, ok := c.files[name] + return record, ok +} diff --git a/internal/updatecdn/catalog_test.go b/internal/updatecdn/catalog_test.go new file mode 100644 index 00000000..099df321 --- /dev/null +++ b/internal/updatecdn/catalog_test.go @@ -0,0 +1,100 @@ +package updatecdn + +import ( + "crypto/sha256" + "encoding/hex" + "encoding/json" + "os" + "path/filepath" + "strings" + "testing" +) + +func TestCatalogDesktopMapAndResolve(t *testing.T) { + dir := t.TempDir() + filesDir := filepath.Join(dir, "files") + if err := os.Mkdir(filesDir, 0o755); err != nil { + t.Fatal(err) + } + packageData := []byte("signed-tdesktop-update-package") + packageName := "tx64upd7007000" + if err := os.WriteFile(filepath.Join(filesDir, packageName), packageData, 0o600); err != nil { + t.Fatal(err) + } + hash := sha256.Sum256(packageData) + manifest := Manifest{ + SchemaVersion: ManifestSchemaVersion, + Desktop: map[string]map[string]DesktopRelease{ + "win64": {"stable": { + Build: 7007000, Version: "7.0.7", File: packageName, + SHA256: hex.EncodeToString(hash[:]), Size: int64(len(packageData)), + }}, + }, + Apps: map[string]map[string]ApplicationRelease{ + "android": {"stable": { + ID: 77, Version: "12.9.1", URL: "https://updates.example/app.apk", + URLBySource: map[string]string{"com.example.store": "https://store.example/app"}, + Notes: map[string]string{"en": "New version", "ru": "Новая версия"}, + }}, + }, + } + manifestPath := writeTestManifest(t, dir, manifest) + catalog, err := LoadCatalog(manifestPath, filesDir) + if err != nil { + t.Fatal(err) + } + + entry := catalog.DesktopMap()["win64"]["stable"] + if entry["released"] != uint64(7007000) || entry["link"] != "/files/tx64upd7007000" { + t.Fatalf("desktop entry = %#v", entry) + } + resolved, err := catalog.Resolve(ResolveRequest{ + Platform: "android", Version: "12.9.0 (500)", Source: "com.example.store", LangCode: "ru-RU", + }) + if err != nil { + t.Fatal(err) + } + if resolved == nil || resolved.ID != 77 || resolved.Text != "Новая версия" || resolved.URL != "https://store.example/app" { + t.Fatalf("resolved update = %#v", resolved) + } + current, err := catalog.Resolve(ResolveRequest{Platform: "android", Version: "12.9.1", LangCode: "en"}) + if err != nil { + t.Fatal(err) + } + if current != nil { + t.Fatalf("current client got update %#v", current) + } +} + +func TestLoadCatalogRejectsPackageHashMismatch(t *testing.T) { + dir := t.TempDir() + filesDir := filepath.Join(dir, "files") + if err := os.Mkdir(filesDir, 0o755); err != nil { + t.Fatal(err) + } + if err := os.WriteFile(filepath.Join(filesDir, "tx64upd7007000"), []byte("package"), 0o600); err != nil { + t.Fatal(err) + } + manifestPath := writeTestManifest(t, dir, Manifest{ + SchemaVersion: ManifestSchemaVersion, + Desktop: map[string]map[string]DesktopRelease{ + "win64": {"stable": {Build: 7007000, File: "tx64upd7007000", SHA256: strings.Repeat("0", 64)}}, + }, + }) + if _, err := LoadCatalog(manifestPath, filesDir); err == nil { + t.Fatal("hash mismatch accepted") + } +} + +func writeTestManifest(t *testing.T, dir string, manifest Manifest) string { + t.Helper() + data, err := json.Marshal(manifest) + if err != nil { + t.Fatal(err) + } + path := filepath.Join(dir, "manifest.json") + if err := os.WriteFile(path, data, 0o600); err != nil { + t.Fatal(err) + } + return path +} diff --git a/internal/updatecdn/client.go b/internal/updatecdn/client.go new file mode 100644 index 00000000..8951f72f --- /dev/null +++ b/internal/updatecdn/client.go @@ -0,0 +1,77 @@ +package updatecdn + +import ( + "context" + "encoding/json" + "fmt" + "io" + "net/http" + "net/url" + "strings" + "time" +) + +type Resolver interface { + Resolve(ctx context.Context, req ResolveRequest) (*ResolvedUpdate, error) +} + +type Client struct { + baseURL string + http *http.Client +} + +func NewClient(baseURL string, timeout time.Duration) (*Client, error) { + baseURL = strings.TrimRight(strings.TrimSpace(baseURL), "/") + parsed, err := url.Parse(baseURL) + if err != nil { + return nil, fmt.Errorf("parse update service URL: %w", err) + } + if (parsed.Scheme != "http" && parsed.Scheme != "https") || parsed.Hostname() == "" || parsed.User != nil || parsed.RawQuery != "" || parsed.Fragment != "" { + return nil, fmt.Errorf("update service URL must be an HTTP(S) base URL without credentials, query, or fragment") + } + if timeout <= 0 { + timeout = 2 * time.Second + } + return &Client{baseURL: baseURL, http: &http.Client{Timeout: timeout}}, nil +} + +func (c *Client) Resolve(ctx context.Context, request ResolveRequest) (*ResolvedUpdate, error) { + u, err := url.Parse(c.baseURL + "/v1/resolve") + if err != nil { + return nil, err + } + query := u.Query() + query.Set("platform", request.Platform) + query.Set("channel", request.Channel) + query.Set("version", request.Version) + query.Set("source", request.Source) + query.Set("lang_code", request.LangCode) + u.RawQuery = query.Encode() + + req, err := http.NewRequestWithContext(ctx, http.MethodGet, u.String(), nil) + if err != nil { + return nil, fmt.Errorf("build update resolve request: %w", err) + } + resp, err := c.http.Do(req) + if err != nil { + return nil, fmt.Errorf("resolve application update: %w", err) + } + defer resp.Body.Close() + if resp.StatusCode == http.StatusNoContent { + return nil, nil + } + if resp.StatusCode != http.StatusOK { + _, _ = io.Copy(io.Discard, io.LimitReader(resp.Body, 4<<10)) + return nil, fmt.Errorf("resolve application update: HTTP %d", resp.StatusCode) + } + var resolved ResolvedUpdate + decoder := json.NewDecoder(io.LimitReader(resp.Body, 256<<10)) + decoder.DisallowUnknownFields() + if err := decoder.Decode(&resolved); err != nil { + return nil, fmt.Errorf("decode application update: %w", err) + } + if resolved.ID <= 0 || strings.TrimSpace(resolved.Version) == "" || strings.TrimSpace(resolved.Text) == "" { + return nil, fmt.Errorf("resolve application update: incomplete response") + } + return &resolved, nil +} diff --git a/internal/updatecdn/server.go b/internal/updatecdn/server.go new file mode 100644 index 00000000..98426955 --- /dev/null +++ b/internal/updatecdn/server.go @@ -0,0 +1,187 @@ +package updatecdn + +import ( + "encoding/json" + "fmt" + "net/http" + "os" + "path" + "strings" +) + +const maxResolveQueryLength = 256 + +type Handler struct { + store *Store + mux *http.ServeMux +} + +func NewHandler(store *Store) (*Handler, error) { + if store == nil { + return nil, fmt.Errorf("update catalog store is required") + } + h := &Handler{store: store, mux: http.NewServeMux()} + h.mux.HandleFunc("/healthz", h.health) + h.mux.HandleFunc("/readyz", h.ready) + h.mux.HandleFunc("/v1/resolve", h.resolve) + h.mux.HandleFunc("/files/", h.file) + for _, endpoint := range []string{"/current", "/current1", "/current2", "/current3", "/current4"} { + h.mux.HandleFunc(endpoint, h.current) + } + return h, nil +} + +func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { + w.Header().Set("X-Content-Type-Options", "nosniff") + w.Header().Set("Referrer-Policy", "no-referrer") + h.mux.ServeHTTP(w, r) +} + +func (h *Handler) health(w http.ResponseWriter, r *http.Request) { + if !allowReadMethod(w, r) { + return + } + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(http.StatusOK) + if r.Method != http.MethodHead { + _, _ = w.Write([]byte("{\"status\":\"ok\"}\n")) + } +} + +func (h *Handler) ready(w http.ResponseWriter, r *http.Request) { + if !allowReadMethod(w, r) { + return + } + if _, err := h.store.Snapshot(); err != nil { + writeJSONError(w, http.StatusServiceUnavailable, "catalog unavailable") + return + } + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(http.StatusOK) + if r.Method != http.MethodHead { + _, _ = w.Write([]byte("{\"status\":\"ready\"}\n")) + } +} + +func (h *Handler) current(w http.ResponseWriter, r *http.Request) { + if !allowReadMethod(w, r) { + return + } + catalog, err := h.store.Snapshot() + if err != nil { + writeJSONError(w, http.StatusServiceUnavailable, "catalog unavailable") + return + } + w.Header().Set("Content-Type", "application/json; charset=utf-8") + w.Header().Set("Cache-Control", "no-cache") + if r.Method == http.MethodHead { + w.WriteHeader(http.StatusOK) + return + } + if err := json.NewEncoder(w).Encode(catalog.DesktopMap()); err != nil { + return + } +} + +func (h *Handler) resolve(w http.ResponseWriter, r *http.Request) { + if !allowReadMethod(w, r) { + return + } + query := r.URL.Query() + values := []string{query.Get("platform"), query.Get("channel"), query.Get("version"), query.Get("source"), query.Get("lang_code")} + for _, value := range values { + if len(value) > maxResolveQueryLength { + writeJSONError(w, http.StatusBadRequest, "query value too long") + return + } + } + if strings.TrimSpace(values[0]) == "" { + writeJSONError(w, http.StatusBadRequest, "platform is required") + return + } + catalog, err := h.store.Snapshot() + if err != nil { + writeJSONError(w, http.StatusServiceUnavailable, "catalog unavailable") + return + } + resolved, err := catalog.Resolve(ResolveRequest{ + Platform: values[0], + Channel: values[1], + Version: values[2], + Source: values[3], + LangCode: values[4], + }) + if err != nil { + writeJSONError(w, http.StatusInternalServerError, "resolve failed") + return + } + if resolved == nil { + w.WriteHeader(http.StatusNoContent) + return + } + w.Header().Set("Content-Type", "application/json; charset=utf-8") + w.Header().Set("Cache-Control", "no-store") + if r.Method == http.MethodHead { + w.WriteHeader(http.StatusOK) + return + } + _ = json.NewEncoder(w).Encode(resolved) +} + +func (h *Handler) file(w http.ResponseWriter, r *http.Request) { + if !allowReadMethod(w, r) { + return + } + name := strings.TrimPrefix(r.URL.Path, "/files/") + if name == "" || path.Base(name) != name || strings.ContainsAny(name, `/\\`) { + http.NotFound(w, r) + return + } + catalog, err := h.store.Snapshot() + if err != nil { + writeJSONError(w, http.StatusServiceUnavailable, "catalog unavailable") + return + } + record, ok := catalog.file(name) + if !ok { + http.NotFound(w, r) + return + } + etag := `"sha256-` + record.sha256 + `"` + if r.Header.Get("If-None-Match") == etag { + w.WriteHeader(http.StatusNotModified) + return + } + f, err := os.Open(record.path) + if err != nil { + writeJSONError(w, http.StatusServiceUnavailable, "package unavailable") + return + } + defer f.Close() + info, err := f.Stat() + if err != nil || !info.Mode().IsRegular() || info.Size() != record.size || !info.ModTime().Equal(record.modTime) { + writeJSONError(w, http.StatusServiceUnavailable, "package changed; reload the manifest") + return + } + w.Header().Set("Content-Type", "application/octet-stream") + w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=%q", record.name)) + w.Header().Set("Cache-Control", "public, max-age=31536000, immutable") + w.Header().Set("ETag", etag) + w.Header().Set("Accept-Ranges", "bytes") + http.ServeContent(w, r, record.name, record.modTime, f) +} + +func allowReadMethod(w http.ResponseWriter, r *http.Request) bool { + if r.Method == http.MethodGet || r.Method == http.MethodHead { + return true + } + w.Header().Set("Allow", "GET, HEAD") + writeJSONError(w, http.StatusMethodNotAllowed, "method not allowed") + return false +} + +func writeJSONError(w http.ResponseWriter, status int, message string) { + w.Header().Set("Content-Type", "application/json; charset=utf-8") + w.WriteHeader(status) + _ = json.NewEncoder(w).Encode(map[string]string{"error": message}) +} diff --git a/internal/updatecdn/server_test.go b/internal/updatecdn/server_test.go new file mode 100644 index 00000000..e0603a0a --- /dev/null +++ b/internal/updatecdn/server_test.go @@ -0,0 +1,84 @@ +package updatecdn + +import ( + "crypto/sha256" + "encoding/hex" + "io" + "net/http" + "net/http/httptest" + "os" + "path/filepath" + "strings" + "testing" + "time" +) + +func TestHandlerServesCurrentResolveAndRange(t *testing.T) { + dir := t.TempDir() + filesDir := filepath.Join(dir, "files") + if err := os.Mkdir(filesDir, 0o755); err != nil { + t.Fatal(err) + } + packageData := []byte("0123456789abcdef") + packageName := "tx64upd7007000" + if err := os.WriteFile(filepath.Join(filesDir, packageName), packageData, 0o600); err != nil { + t.Fatal(err) + } + hash := sha256.Sum256(packageData) + manifestPath := writeTestManifest(t, dir, Manifest{ + SchemaVersion: ManifestSchemaVersion, + Desktop: map[string]map[string]DesktopRelease{ + "win64": {"stable": {Build: 7007000, File: packageName, SHA256: hex.EncodeToString(hash[:])}}, + }, + Apps: map[string]map[string]ApplicationRelease{ + "ios": {"stable": {ID: 8, Version: "12.9.1", URL: "https://apps.apple.com/app/id1", Notes: map[string]string{"en": "Update available"}}}, + }, + }) + store, err := NewStore(manifestPath, filesDir) + if err != nil { + t.Fatal(err) + } + handler, err := NewHandler(store) + if err != nil { + t.Fatal(err) + } + server := httptest.NewServer(handler) + defer server.Close() + + resp, err := http.Get(server.URL + "/current4") + if err != nil { + t.Fatal(err) + } + currentBody, _ := io.ReadAll(resp.Body) + resp.Body.Close() + if resp.StatusCode != http.StatusOK || !strings.Contains(string(currentBody), `"released":7007000`) { + t.Fatalf("current4 = %d %s", resp.StatusCode, currentBody) + } + + client, err := NewClient(server.URL, time.Second) + if err != nil { + t.Fatal(err) + } + resolved, err := client.Resolve(t.Context(), ResolveRequest{Platform: "ios", Version: "12.9.0", LangCode: "en"}) + if err != nil { + t.Fatal(err) + } + if resolved == nil || resolved.ID != 8 || resolved.Version != "12.9.1" { + t.Fatalf("resolved = %#v", resolved) + } + + req, err := http.NewRequest(http.MethodGet, server.URL+"/files/"+packageName, nil) + if err != nil { + t.Fatal(err) + } + req.Header.Set("Range", "bytes=2-5") + rangeResp, err := http.DefaultClient.Do(req) + if err != nil { + t.Fatal(err) + } + rangeBody, _ := io.ReadAll(rangeResp.Body) + rangeResp.Body.Close() + if rangeResp.StatusCode != http.StatusPartialContent || string(rangeBody) != "2345" { + t.Fatalf("range = %d %q", rangeResp.StatusCode, rangeBody) + } +} diff --git a/internal/updatecdn/store.go b/internal/updatecdn/store.go new file mode 100644 index 00000000..454c0a92 --- /dev/null +++ b/internal/updatecdn/store.go @@ -0,0 +1,60 @@ +package updatecdn + +import ( + "fmt" + "os" + "sync" + "time" +) + +// Store atomically reloads the catalog when the manifest changes. A broken new +// manifest is never mixed with the previous snapshot. +type Store struct { + manifestPath string + filesDir string + + mu sync.RWMutex + catalog *Catalog + modTime time.Time + fileSize int64 +} + +func NewStore(manifestPath, filesDir string) (*Store, error) { + store := &Store{manifestPath: manifestPath, filesDir: filesDir} + if _, err := store.Snapshot(); err != nil { + return nil, err + } + return store, nil +} + +func (s *Store) Snapshot() (*Catalog, error) { + info, err := os.Stat(s.manifestPath) + if err != nil { + return nil, fmt.Errorf("stat manifest: %w", err) + } + s.mu.RLock() + if s.catalog != nil && info.ModTime().Equal(s.modTime) && info.Size() == s.fileSize { + catalog := s.catalog + s.mu.RUnlock() + return catalog, nil + } + s.mu.RUnlock() + + s.mu.Lock() + defer s.mu.Unlock() + info, err = os.Stat(s.manifestPath) + if err != nil { + return nil, fmt.Errorf("stat manifest: %w", err) + } + if s.catalog != nil && info.ModTime().Equal(s.modTime) && info.Size() == s.fileSize { + return s.catalog, nil + } + catalog, err := LoadCatalog(s.manifestPath, s.filesDir) + if err != nil { + return nil, err + } + s.catalog = catalog + s.modTime = info.ModTime() + s.fileSize = info.Size() + return catalog, nil +} diff --git a/internal/web/server.go b/internal/web/server.go index e1a548e7..f4d3d812 100644 --- a/internal/web/server.go +++ b/internal/web/server.go @@ -16,6 +16,7 @@ import ( "go.uber.org/zap" + "telesrv/internal/branding" "telesrv/internal/domain" "telesrv/internal/links" ) @@ -129,7 +130,7 @@ func newHandler(cfg Config, logger *zap.Logger) (http.Handler, error) { return nil, fmt.Errorf("public Web sticker set resolver is nil") } if strings.TrimSpace(cfg.AppName) == "" { - cfg.AppName = links.DefaultAppName + cfg.AppName = branding.ProductName } if cfg.PublicBaseURL, err = links.ValidateBaseURL(cfg.PublicBaseURL); err != nil { return nil, fmt.Errorf("public base URL: %w", err) @@ -213,6 +214,9 @@ func newHandler(cfg Config, logger *zap.Logger) (http.Handler, error) { mux.Handle("POST /token", cfg.TelegramLogin) mux.Handle("GET /telegram-login.js", cfg.TelegramLogin) mux.Handle("GET /js/telegram-login.js", cfg.TelegramLogin) + mux.Handle("GET /telegram-widget.js", cfg.TelegramLogin) + mux.Handle("GET /js/telegram-widget.js", cfg.TelegramLogin) + mux.Handle("POST /telegram-widget/resolve", cfg.TelegramLogin) } mux.HandleFunc("GET /{username}", h.usernameLink) mux.HandleFunc("GET /{username}/{$}", h.usernameLink) diff --git a/internal/web/server_test.go b/internal/web/server_test.go index 82bb46de..6046866b 100644 --- a/internal/web/server_test.go +++ b/internal/web/server_test.go @@ -45,6 +45,32 @@ func newTestHandlerWithPublicPeers( return h } +func TestTelegramLoginWidgetRoutesReachProvider(t *testing.T) { + provider := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + w.WriteHeader(http.StatusNoContent) + }) + h, err := NewHandler(Config{ + StickerSets: fakeResolver{}, PublicBaseURL: "https://links.example.test", TelegramLogin: provider, + }) + if err != nil { + t.Fatalf("NewHandler: %v", err) + } + for _, tc := range []struct { + method string + path string + }{ + {method: http.MethodGet, path: "/telegram-widget.js?23"}, + {method: http.MethodGet, path: "/js/telegram-widget.js?23"}, + {method: http.MethodPost, path: "/telegram-widget/resolve"}, + } { + recorder := httptest.NewRecorder() + h.ServeHTTP(recorder, httptest.NewRequest(tc.method, tc.path, nil)) + if recorder.Code != http.StatusNoContent { + t.Fatalf("%s %s status=%d", tc.method, tc.path, recorder.Code) + } + } +} + type fakeModerationAppeals struct { link domain.ModerationAppealLink found bool @@ -304,7 +330,7 @@ func TestHandlerServesBotUsernameLandingPage(t *testing.T) { "http://127.0.0.1:2401/TetrisBot", "telesrv://127.0.0.1:2401/TetrisBot", "Start Bot", - "Open telesrv to start a chat with this bot.", + "Open Telesrv to start a chat with this bot.", `property="og:title" content="Tetris Bot"`, `property="al:android:url" content="telesrv://127.0.0.1:2401/TetrisBot"`, } { diff --git a/scripts/ensure-local-databases.ps1 b/scripts/ensure-local-databases.ps1 new file mode 100644 index 00000000..6cfb8de5 --- /dev/null +++ b/scripts/ensure-local-databases.ps1 @@ -0,0 +1,97 @@ +<# +.SYNOPSIS +Ensures the branch-isolated local PostgreSQL databases exist. + +.DESCRIPTION +The main and v2 branches have independent migration histories. They must never +share one schema_migrations row. This helper creates telesrv_main and +telesrv_v2 in the local Compose PostgreSQL container without modifying or +deleting the legacy telesrv database. + +Optional template parameters are intended for a one-time local split when an +existing database snapshot should be preserved. They are only used when the +target database does not already exist. +#> +[CmdletBinding()] +param( + [string]$PostgresContainer = "telesrv-postgres", + [string]$DbUser = "telesrv", + [string]$MainTemplate, + [string]$V2Template +) + +Set-StrictMode -Version Latest +$ErrorActionPreference = "Stop" + +function Assert-SafeIdentifier { + param([string]$Name, [string]$Value) + if ([string]::IsNullOrWhiteSpace($Value) -or $Value -notmatch '^[A-Za-z_][A-Za-z0-9_]*$') { + throw "$Name must be a PostgreSQL identifier containing only letters, digits, and underscores: '$Value'" + } +} + +function Invoke-Docker { + param([string[]]$Arguments) + $oldErrorActionPreference = $ErrorActionPreference + $ErrorActionPreference = "Continue" + try { + $output = & docker @Arguments 2>&1 + $exitCode = $LASTEXITCODE + } finally { + $ErrorActionPreference = $oldErrorActionPreference + } + $text = ($output | ForEach-Object { $_.ToString() }) -join "`n" + if ($exitCode -ne 0) { + throw "docker $($Arguments -join ' ') failed with exit code ${exitCode}:`n$text" + } + return $text.Trim() +} + +function Test-DatabaseExists { + param([string]$Database) + Assert-SafeIdentifier "database" $Database + $result = Invoke-Docker @( + "exec", $PostgresContainer, + "psql", "-U", $DbUser, "-d", "postgres", + "-v", "ON_ERROR_STOP=1", "-At", "-c", + "SELECT 1 FROM pg_database WHERE datname = '$Database';" + ) + return $result -eq "1" +} + +function Ensure-Database { + param([string]$Database, [string]$Template) + if (Test-DatabaseExists $Database) { + Write-Host "[ok] PostgreSQL database already exists: $Database" + return + } + + $args = @("exec", $PostgresContainer, "createdb", "-U", $DbUser, "-O", $DbUser) + if (-not [string]::IsNullOrWhiteSpace($Template)) { + Assert-SafeIdentifier "template database" $Template + if (-not (Test-DatabaseExists $Template)) { + throw "template database does not exist: $Template" + } + $args += @("-T", $Template) + } + $args += $Database + Invoke-Docker $args | Out-Null + $templateSuffix = "" + if (-not [string]::IsNullOrWhiteSpace($Template)) { + $templateSuffix = " (template: $Template)" + } + Write-Host "[ok] created PostgreSQL database: $Database$templateSuffix" +} + +Assert-SafeIdentifier "database user" $DbUser +if ($PostgresContainer -notmatch '^[A-Za-z0-9_.-]+$') { + throw "invalid Docker container name: '$PostgresContainer'" +} + +$running = Invoke-Docker @("inspect", "-f", "{{.State.Running}}", $PostgresContainer) +if ($running -ne "true") { + throw "PostgreSQL container is not running: $PostgresContainer" +} + +Ensure-Database "telesrv_main" $MainTemplate +Ensure-Database "telesrv_v2" $V2Template diff --git a/scripts/new-docker-env.ps1 b/scripts/new-docker-env.ps1 new file mode 100644 index 00000000..4e0e47f1 --- /dev/null +++ b/scripts/new-docker-env.ps1 @@ -0,0 +1,220 @@ +[CmdletBinding(SupportsShouldProcess)] +param( + [Parameter(Mandatory = $true)] + [ValidateNotNullOrEmpty()] + [string]$AdvertiseIP, + + [Parameter()] + [string]$PublicBaseURL = "", + + [Parameter()] + [string]$PublicWebBaseURL = "", + + [Parameter()] + [string]$AdminBindIP = "127.0.0.1", + + [Parameter()] + [switch]$HostNetwork, + + [Parameter()] + [switch]$BridgeNetwork, + + [Parameter()] + [switch]$AllowInsecureDevelopmentAuth +) + +$ErrorActionPreference = "Stop" + +if ($HostNetwork -and $BridgeNetwork) { + throw "HostNetwork and BridgeNetwork are mutually exclusive." +} + +$parsedIP = $null +if (-not [System.Net.IPAddress]::TryParse($AdvertiseIP, [ref]$parsedIP)) { + throw "AdvertiseIP must be an IPv4 or IPv6 address, not a DNS name." +} +$isLoopback = [System.Net.IPAddress]::IsLoopback($parsedIP) +$isIPv6 = $parsedIP.AddressFamily -eq [System.Net.Sockets.AddressFamily]::InterNetworkV6 + +$parsedAdminBindIP = $null +if (-not [System.Net.IPAddress]::TryParse($AdminBindIP, [ref]$parsedAdminBindIP)) { + throw "AdminBindIP must be an IPv4 or IPv6 address." +} + +if ([string]::IsNullOrWhiteSpace($PublicBaseURL)) { + if (-not $isLoopback) { + throw "PublicBaseURL is required when AdvertiseIP is not loopback." + } + $loopbackHost = if ($isIPv6) { "[::1]" } else { "127.0.0.1" } + $PublicBaseURL = "http://${loopbackHost}:2401" +} +if ([string]::IsNullOrWhiteSpace($PublicWebBaseURL)) { + $PublicWebBaseURL = $PublicBaseURL +} + +function Assert-HTTPURL { + param([string]$Name, [string]$Value) + $uri = $null + if (-not [Uri]::TryCreate($Value, [UriKind]::Absolute, [ref]$uri) -or + ($uri.Scheme -ne "http" -and $uri.Scheme -ne "https") -or + -not [string]::IsNullOrEmpty($uri.UserInfo)) { + throw "$Name must be an absolute HTTP(S) URL without embedded credentials." + } +} + +Assert-HTTPURL -Name "PublicBaseURL" -Value $PublicBaseURL +Assert-HTTPURL -Name "PublicWebBaseURL" -Value $PublicWebBaseURL +if (-not $isLoopback -and -not $AllowInsecureDevelopmentAuth) { + throw "Internet/LAN development-code auth requires AllowInsecureDevelopmentAuth; for production generate on loopback, then configure the webhook provider before startup." +} + +$repoRoot = Split-Path -Parent $PSScriptRoot +$dockerDir = Join-Path $repoRoot "deploy\docker" +$templatePath = Join-Path $dockerDir ".env.example" +$outputPath = Join-Path $dockerDir ".env" +if (-not (Test-Path -LiteralPath $templatePath -PathType Leaf)) { + throw "Docker environment template not found: $templatePath" +} +if (Test-Path -LiteralPath $outputPath) { + throw "$outputPath already exists. Initialization never overwrites live credentials." +} + +function New-HexSecret { + param([int]$Bytes = 32) + $buffer = New-Object byte[] $Bytes + $generator = [System.Security.Cryptography.RandomNumberGenerator]::Create() + try { + $generator.GetBytes($buffer) + } + finally { + $generator.Dispose() + } + return [BitConverter]::ToString($buffer).Replace("-", "").ToLowerInvariant() +} + +function Get-GitValue { + param([string[]]$GitArguments) + try { + $value = & git -C $repoRoot @GitArguments 2>$null + if ($LASTEXITCODE -eq 0) { return ($value | Select-Object -First 1).Trim() } + } + catch {} + return "unknown" +} + +$publicBindIP = if ($isIPv6) { "::" } else { "0.0.0.0" } +$localBindIP = if ($isIPv6) { "::1" } else { "127.0.0.1" } +if ($isLoopback) { + $publicBindIP = $parsedIP.ToString() + $localBindIP = $parsedIP.ToString() +} +elseif (([Uri]$PublicBaseURL).Scheme -eq "http") { + $publicLinkIP = $null + $publicLinkHost = ([Uri]$PublicBaseURL).Host.Trim([char[]]"[]") + if ([System.Net.IPAddress]::TryParse($publicLinkHost, [ref]$publicLinkIP) -and $publicLinkIP.Equals($parsedIP)) { + $localBindIP = $parsedIP.ToString() + } +} + +$adminHealthIP = $parsedAdminBindIP.ToString() +if ($adminHealthIP -eq "0.0.0.0") { $adminHealthIP = "127.0.0.1" } +if ($adminHealthIP -eq "::") { $adminHealthIP = "::1" } +$publicListenHost = if ($publicBindIP.Contains(":")) { "[${publicBindIP}]" } else { $publicBindIP } +$localListenHost = if ($localBindIP.Contains(":")) { "[${localBindIP}]" } else { $localBindIP } +$serverHealthURLHost = $localListenHost +$adminListenIP = $parsedAdminBindIP.ToString() +$adminListenHost = if ($adminListenIP.Contains(":")) { "[${adminListenIP}]" } else { $adminListenIP } +$turnEnabled = (-not $isIPv6).ToString().ToLowerInvariant() +$turnAdvertiseIP = if ($isIPv6) { "127.0.0.1" } else { $parsedIP.ToString() } +$rtmpHost = if ($isIPv6) { "[$($parsedIP.ToString())]" } else { $parsedIP.ToString() } +$postgresPassword = New-HexSecret 24 + +$treeState = "unknown" +try { + $treeOutput = & git -C $repoRoot status --porcelain 2>$null + if ($LASTEXITCODE -eq 0) { $treeState = if (@($treeOutput).Count -gt 0) { "dirty" } else { "clean" } } +} +catch {} + +$values = [ordered]@{ + TELESRV_BUILD_COMMIT = Get-GitValue @("rev-parse", "HEAD") + TELESRV_BUILD_BRANCH = Get-GitValue @("rev-parse", "--abbrev-ref", "HEAD") + TELESRV_BUILD_TREE_STATE = $treeState + TELESRV_BUILD_DATE = [DateTime]::UtcNow.ToString("o") + POSTGRES_PASSWORD = $postgresPassword + TELESRV_POSTGRES_DSN = "postgres://telesrv:${postgresPassword}@127.0.0.1:15432/telesrv_main?sslmode=disable" + TELESRV_REDIS_PASSWORD = New-HexSecret 32 + TELESRV_ADMIN_API_TOKEN = New-HexSecret 32 + TELESRV_ADMIN_UI_PASSWORD = New-HexSecret 24 + TELESRV_ADMIN_SESSION_KEY = New-HexSecret 32 + TELESRV_TURN_SECRET = New-HexSecret 32 + TELESRV_OTP_WEBHOOK_SECRET = New-HexSecret 32 + TELESRV_ALLOW_INSECURE_DEVELOPMENT_AUTH = ($isLoopback -or $AllowInsecureDevelopmentAuth).ToString().ToLowerInvariant() + TELESRV_ADVERTISE_IP = $parsedIP.ToString() + TELESRV_PUBLIC_BASE_URL = $PublicBaseURL + TELESRV_PUBLIC_WEB_BASE_URL = $PublicWebBaseURL + TELESRV_SERVER_HOST_NETWORK = (-not $BridgeNetwork).ToString().ToLowerInvariant() + TELESRV_SFU_ADVERTISE_IP = $parsedIP.ToString() + TELESRV_TURN_ENABLE = $turnEnabled + TELESRV_TURN_ADVERTISE_IP = $turnAdvertiseIP + TELESRV_LIVESTREAM_RTMP_URL = "rtmp://${rtmpHost}:2400/live" + TELESRV_PUBLIC_BIND_IP = $publicBindIP + TELESRV_PUBLIC_LISTEN_HOST = $publicListenHost + TELESRV_LOCAL_BIND_IP = $localBindIP + TELESRV_LOCAL_LISTEN_HOST = $localListenHost + TELESRV_SERVER_HEALTH_IP = $localBindIP + TELESRV_SERVER_HEALTH_URL_HOST = $serverHealthURLHost + TELESRV_ADMIN_BIND_IP = $adminListenIP + TELESRV_ADMIN_LISTEN_HOST = $adminListenHost + TELESRV_ADMIN_HEALTH_IP = $adminHealthIP +} + +$content = [IO.File]::ReadAllText($templatePath) +foreach ($entry in $values.GetEnumerator()) { + $pattern = "(?m)^$([Regex]::Escape($entry.Key))=.*$" + if (-not [Regex]::IsMatch($content, $pattern)) { throw "Template is missing $($entry.Key)." } + $replacement = ("{0}={1}" -f $entry.Key, $entry.Value).Replace('$', '$$') + $content = [Regex]::Replace($content, $pattern, $replacement) +} + +function Protect-SecretFile { + param([string]$Path) + + if ($env:OS -eq "Windows_NT") { + $owner = [System.Security.Principal.WindowsIdentity]::GetCurrent().User + $acl = New-Object System.Security.AccessControl.FileSecurity + $acl.SetAccessRuleProtection($true, $false) + $acl.SetOwner($owner) + $identities = @( + $owner, + (New-Object System.Security.Principal.SecurityIdentifier("S-1-5-18")), + (New-Object System.Security.Principal.SecurityIdentifier("S-1-5-32-544")) + ) + foreach ($identity in $identities) { + $rule = New-Object System.Security.AccessControl.FileSystemAccessRule( + $identity, + [System.Security.AccessControl.FileSystemRights]::FullControl, + [System.Security.AccessControl.AccessControlType]::Allow + ) + [void]$acl.AddAccessRule($rule) + } + Set-Acl -LiteralPath $Path -AclObject $acl + return + } + + & chmod 600 -- $Path + if ($LASTEXITCODE -ne 0) { throw "chmod 600 failed for $Path" } +} + +if ($PSCmdlet.ShouldProcess($outputPath, "write owner-only Docker deployment environment")) { + $temporaryPath = "$outputPath.tmp.$PID" + try { + [IO.File]::WriteAllText($temporaryPath, $content, (New-Object Text.UTF8Encoding($false))) + Protect-SecretFile -Path $temporaryPath + Move-Item -LiteralPath $temporaryPath -Destination $outputPath + } + finally { + if (Test-Path -LiteralPath $temporaryPath) { Remove-Item -LiteralPath $temporaryPath -Force } + } + Write-Host "Created $outputPath with generated deployment credentials." +} diff --git a/scripts/new-docker-env.sh b/scripts/new-docker-env.sh new file mode 100755 index 00000000..5b2e6167 --- /dev/null +++ b/scripts/new-docker-env.sh @@ -0,0 +1,268 @@ +#!/bin/sh +set -eu +umask 077 + +usage() { + cat <<'EOF' +Usage: ./scripts/new-docker-env.sh --advertise-ip IP [options] + +Options: + --public-base-url URL + --public-web-base-url URL + --admin-bind-ip IP + --host-network Bind the monolith's media sockets directly on the host (default). + --bridge-network Publish a bounded TURN relay range through Docker. + --allow-insecure-development-auth + --output PATH + --help +EOF +} + +die() { + printf 'new-docker-env: %s\n' "$*" >&2 + exit 1 +} + +validate_http_url() { + name=$1 + value=$2 + case "$value" in + *[[:space:]]*) die "$name must not contain whitespace" ;; + esac + case "$value" in + http://*|https://*) ;; + *) die "$name must be an absolute HTTP(S) URL" ;; + esac + authority=${value#*://} + authority=${authority%%/*} + authority=${authority%%\?*} + authority=${authority%%\#*} + [ -n "$authority" ] || die "$name must include a host" + case "$authority" in + *@*) die "$name must not contain embedded credentials" ;; + esac +} + +url_host() { + value=$1 + authority=${value#*://} + authority=${authority%%/*} + authority=${authority%%\?*} + authority=${authority%%\#*} + case "$authority" in + \[*\]*) host=${authority#\[}; host=${host%%\]*} ;; + *) host=${authority%%:*} ;; + esac + printf '%s\n' "$host" +} + +validate_ipv4() { + awk -F. ' + NF != 4 { exit 1 } + { for (i = 1; i <= 4; i++) if ($i !~ /^[0-9]+$/ || $i < 0 || $i > 255) exit 1 } + ' </dev/null 2>&1; then + perl -MSocket=AF_INET6,inet_pton -e 'exit inet_pton(AF_INET6, $ARGV[0]) ? 0 : 1' "$1" + return + fi + if command -v python3 >/dev/null 2>&1; then + python3 -c 'import ipaddress,sys; ipaddress.IPv6Address(sys.argv[1])' "$1" + return + fi + die "validating an IPv6 address requires perl or python3" +} + +random_hex() { + openssl rand -hex "$1" +} + +script_dir=$(CDPATH='' cd -- "$(dirname -- "$0")" && pwd) +repo_root=$(CDPATH='' cd -- "$script_dir/.." && pwd) +template_path="$repo_root/deploy/docker/.env.example" +output_path="$repo_root/deploy/docker/.env" + +advertise_ip= +public_base_url= +public_web_base_url= +admin_bind_ip=127.0.0.1 +server_host_network=true +allow_insecure=false + +while [ "$#" -gt 0 ]; do + case "$1" in + --advertise-ip) + [ "$#" -ge 2 ] || die "$1 requires a value" + advertise_ip=$2 + shift 2 + ;; + --public-base-url) + [ "$#" -ge 2 ] || die "$1 requires a value" + public_base_url=$2 + shift 2 + ;; + --public-web-base-url) + [ "$#" -ge 2 ] || die "$1 requires a value" + public_web_base_url=$2 + shift 2 + ;; + --admin-bind-ip) + [ "$#" -ge 2 ] || die "$1 requires a value" + admin_bind_ip=$2 + shift 2 + ;; + --host-network) server_host_network=true; shift ;; + --bridge-network) server_host_network=false; shift ;; + --allow-insecure-development-auth) allow_insecure=true; shift ;; + --output) + [ "$#" -ge 2 ] || die "$1 requires a value" + output_path=$2 + shift 2 + ;; + --help|-h) usage; exit 0 ;; + *) die "unknown argument: $1" ;; + esac +done + +[ -n "$advertise_ip" ] || die "--advertise-ip is required" +[ -f "$template_path" ] || die "Docker environment template not found: $template_path" +[ ! -e "$output_path" ] || die "$output_path already exists; initialization never overwrites live credentials" +command -v openssl >/dev/null 2>&1 || die "openssl is required" + +is_ipv6=false +case "$advertise_ip" in + *:*) validate_ipv6 "$advertise_ip" || die "--advertise-ip is not a valid IPv6 address"; is_ipv6=true ;; + *) validate_ipv4 "$advertise_ip" || die "--advertise-ip is not a valid IPv4 address" ;; +esac +case "$admin_bind_ip" in + *:*) validate_ipv6 "$admin_bind_ip" || die "--admin-bind-ip is not a valid IPv6 address" ;; + *) validate_ipv4 "$admin_bind_ip" || die "--admin-bind-ip is not a valid IPv4 address" ;; +esac + +is_loopback=false +if [ "$is_ipv6" = true ]; then + case "$advertise_ip" in ::1|0:0:0:0:0:0:0:1) is_loopback=true ;; esac +else + case "$advertise_ip" in 127.*) is_loopback=true ;; esac +fi + +if [ -z "$public_base_url" ]; then + [ "$is_loopback" = true ] || die "--public-base-url is required when --advertise-ip is not loopback" + if [ "$is_ipv6" = true ]; then public_base_url='http://[::1]:2401'; else public_base_url='http://127.0.0.1:2401'; fi +fi +[ -n "$public_web_base_url" ] || public_web_base_url=$public_base_url +validate_http_url "--public-base-url" "$public_base_url" +validate_http_url "--public-web-base-url" "$public_web_base_url" + +if [ "$is_loopback" = false ] && [ "$allow_insecure" = false ]; then + die "Internet/LAN development-code auth requires --allow-insecure-development-auth; for production generate on loopback, then configure the webhook provider before startup" +fi + +public_bind_ip=0.0.0.0 +local_bind_ip=127.0.0.1 +if [ "$is_ipv6" = true ]; then public_bind_ip=::; local_bind_ip=::1; fi +if [ "$is_loopback" = true ]; then + public_bind_ip=$advertise_ip + local_bind_ip=$advertise_ip +elif [ "${public_base_url%%:*}" = http ] && [ "$(url_host "$public_base_url")" = "$advertise_ip" ]; then + local_bind_ip=$advertise_ip +fi + +public_listen_host=$public_bind_ip +local_listen_host=$local_bind_ip +server_health_url_host=$local_bind_ip +if [ "$is_ipv6" = true ]; then + public_listen_host="[$public_bind_ip]" + local_listen_host="[$local_bind_ip]" + server_health_url_host="[$local_bind_ip]" +fi + +turn_enable=true +turn_advertise_ip=$advertise_ip +if [ "$is_ipv6" = true ]; then + turn_enable=false + turn_advertise_ip=127.0.0.1 +fi + +admin_health_ip=$admin_bind_ip +case "$admin_bind_ip" in 0.0.0.0) admin_health_ip=127.0.0.1 ;; ::) admin_health_ip=::1 ;; esac +admin_listen_host=$admin_bind_ip +case "$admin_bind_ip" in *:*) admin_listen_host="[$admin_bind_ip]" ;; esac +rtmp_host=$advertise_ip +[ "$is_ipv6" = true ] && rtmp_host="[$rtmp_host]" + +build_commit=$(git -C "$repo_root" rev-parse HEAD 2>/dev/null || printf unknown) +build_branch=$(git -C "$repo_root" rev-parse --abbrev-ref HEAD 2>/dev/null || printf unknown) +build_tree_state=unknown +if git -C "$repo_root" status --porcelain >/dev/null 2>&1; then + if [ -n "$(git -C "$repo_root" status --porcelain)" ]; then build_tree_state=dirty; else build_tree_state=clean; fi +fi + +POSTGRES_PASSWORD=$(random_hex 24) +TELESRV_BUILD_COMMIT=$build_commit +TELESRV_BUILD_BRANCH=$build_branch +TELESRV_BUILD_TREE_STATE=$build_tree_state +TELESRV_BUILD_DATE=$(date -u '+%Y-%m-%dT%H:%M:%SZ') +TELESRV_POSTGRES_DSN="postgres://telesrv:$POSTGRES_PASSWORD@127.0.0.1:15432/telesrv_main?sslmode=disable" +TELESRV_REDIS_PASSWORD=$(random_hex 32) +TELESRV_ADMIN_API_TOKEN=$(random_hex 32) +TELESRV_ADMIN_UI_PASSWORD=$(random_hex 24) +TELESRV_ADMIN_SESSION_KEY=$(random_hex 32) +TELESRV_TURN_SECRET=$(random_hex 32) +TELESRV_OTP_WEBHOOK_SECRET=$(random_hex 32) +TELESRV_ALLOW_INSECURE_DEVELOPMENT_AUTH=$allow_insecure +[ "$is_loopback" = true ] && TELESRV_ALLOW_INSECURE_DEVELOPMENT_AUTH=true +TELESRV_ADVERTISE_IP=$advertise_ip +TELESRV_PUBLIC_BASE_URL=$public_base_url +TELESRV_PUBLIC_WEB_BASE_URL=$public_web_base_url +TELESRV_SERVER_HOST_NETWORK=$server_host_network +TELESRV_SFU_ADVERTISE_IP=$advertise_ip +TELESRV_TURN_ENABLE=$turn_enable +TELESRV_TURN_ADVERTISE_IP=$turn_advertise_ip +TELESRV_LIVESTREAM_RTMP_URL="rtmp://$rtmp_host:2400/live" +TELESRV_PUBLIC_BIND_IP=$public_bind_ip +TELESRV_PUBLIC_LISTEN_HOST=$public_listen_host +TELESRV_LOCAL_BIND_IP=$local_bind_ip +TELESRV_LOCAL_LISTEN_HOST=$local_listen_host +TELESRV_SERVER_HEALTH_IP=$local_bind_ip +TELESRV_SERVER_HEALTH_URL_HOST=$server_health_url_host +TELESRV_ADMIN_BIND_IP=$admin_bind_ip +TELESRV_ADMIN_LISTEN_HOST=$admin_listen_host +TELESRV_ADMIN_HEALTH_IP=$admin_health_ip + +replacement_keys='TELESRV_BUILD_COMMIT TELESRV_BUILD_BRANCH TELESRV_BUILD_TREE_STATE TELESRV_BUILD_DATE POSTGRES_PASSWORD TELESRV_POSTGRES_DSN TELESRV_REDIS_PASSWORD TELESRV_ADMIN_API_TOKEN TELESRV_ADMIN_UI_PASSWORD TELESRV_ADMIN_SESSION_KEY TELESRV_TURN_SECRET TELESRV_OTP_WEBHOOK_SECRET TELESRV_ALLOW_INSECURE_DEVELOPMENT_AUTH TELESRV_ADVERTISE_IP TELESRV_PUBLIC_BASE_URL TELESRV_PUBLIC_WEB_BASE_URL TELESRV_SERVER_HOST_NETWORK TELESRV_SFU_ADVERTISE_IP TELESRV_TURN_ENABLE TELESRV_TURN_ADVERTISE_IP TELESRV_LIVESTREAM_RTMP_URL TELESRV_PUBLIC_BIND_IP TELESRV_PUBLIC_LISTEN_HOST TELESRV_LOCAL_BIND_IP TELESRV_LOCAL_LISTEN_HOST TELESRV_SERVER_HEALTH_IP TELESRV_SERVER_HEALTH_URL_HOST TELESRV_ADMIN_BIND_IP TELESRV_ADMIN_LISTEN_HOST TELESRV_ADMIN_HEALTH_IP' +export POSTGRES_PASSWORD TELESRV_BUILD_COMMIT TELESRV_BUILD_BRANCH TELESRV_BUILD_TREE_STATE TELESRV_BUILD_DATE +export TELESRV_POSTGRES_DSN TELESRV_REDIS_PASSWORD TELESRV_ADMIN_API_TOKEN TELESRV_ADMIN_UI_PASSWORD +export TELESRV_ADMIN_SESSION_KEY TELESRV_TURN_SECRET TELESRV_OTP_WEBHOOK_SECRET TELESRV_ALLOW_INSECURE_DEVELOPMENT_AUTH +export TELESRV_ADVERTISE_IP TELESRV_PUBLIC_BASE_URL TELESRV_PUBLIC_WEB_BASE_URL TELESRV_SERVER_HOST_NETWORK +export TELESRV_SFU_ADVERTISE_IP TELESRV_TURN_ENABLE TELESRV_TURN_ADVERTISE_IP TELESRV_LIVESTREAM_RTMP_URL +export TELESRV_PUBLIC_BIND_IP TELESRV_PUBLIC_LISTEN_HOST TELESRV_LOCAL_BIND_IP TELESRV_LOCAL_LISTEN_HOST +export TELESRV_SERVER_HEALTH_IP TELESRV_SERVER_HEALTH_URL_HOST TELESRV_ADMIN_BIND_IP TELESRV_ADMIN_LISTEN_HOST TELESRV_ADMIN_HEALTH_IP + +output_dir=$(dirname -- "$output_path") +[ -d "$output_dir" ] || die "output directory does not exist: $output_dir" +temporary_path=$(mktemp "$output_path.tmp.XXXXXX") +cleanup() { [ ! -e "$temporary_path" ] || unlink "$temporary_path"; } +trap cleanup EXIT HUP INT TERM + +awk -v keys="$replacement_keys" ' + BEGIN { count = split(keys, list, " "); for (i = 1; i <= count; i++) wanted[list[i]] = 1 } + { + separator = index($0, "=") + key = separator ? substr($0, 1, separator - 1) : "" + if (key in wanted) { print key "=" ENVIRON[key]; seen[key] = 1 } else print + } + END { + for (key in wanted) if (!(key in seen)) { print "template is missing " key > "/dev/stderr"; missing = 1 } + exit missing + } +' "$template_path" >"$temporary_path" +chmod 0600 "$temporary_path" +mv "$temporary_path" "$output_path" +trap - EXIT HUP INT TERM +printf 'Created %s with owner-only permissions.\n' "$output_path" diff --git a/scripts/restart-local-server.ps1 b/scripts/restart-local-server.ps1 index 9b307f36..de032b87 100644 --- a/scripts/restart-local-server.ps1 +++ b/scripts/restart-local-server.ps1 @@ -12,6 +12,9 @@ hidden, and verifies that the port is listening again. param( [string]$Listen = "0.0.0.0:2398", [string]$AdvertiseIP, + [string]$PostgresDSN, + [string]$PostgresContainer = "telesrv-postgres", + [string]$PostgresUser = "telesrv", [string]$ExePath, [string]$LogDir, [int]$HealthTimeoutSeconds = 20, @@ -221,10 +224,30 @@ New-Item -ItemType Directory -Force -Path $LogDir | Out-Null Push-Location $RepoRoot try { + $branch = Get-GitOutput @("branch", "--show-current") + $postgresDatabase = "external" + if ([string]::IsNullOrWhiteSpace($PostgresDSN)) { + switch ($branch) { + "main" { $postgresDatabase = "telesrv_main" } + "v2" { $postgresDatabase = "telesrv_v2" } + default { + throw "Branch '$branch' has no implicit local PostgreSQL database. Pass -PostgresDSN explicitly." + } + } + Write-Step "Resolve branch-isolated PostgreSQL" + & (Join-Path $PSScriptRoot "ensure-local-databases.ps1") ` + -PostgresContainer $PostgresContainer ` + -DbUser $PostgresUser + $PostgresDSN = "postgres://telesrv:telesrv@127.0.0.1:5432/$postgresDatabase`?sslmode=disable" + Write-Host "[ok] branch=$branch database=$postgresDatabase" + } else { + Write-Step "Use explicit PostgreSQL DSN" + Write-Host "[ok] branch=$branch database=explicit-override" + } + if (-not $SkipBuild) { Write-Step "Build telesrv" $commit = Get-GitOutput @("rev-parse", "HEAD") - $branch = Get-GitOutput @("branch", "--show-current") $dirty = Get-GitOutput @("status", "--porcelain", "--untracked-files=no") -Default "" $treeState = "clean" if ($dirty.Length -gt 0) { @@ -293,6 +316,7 @@ try { $stderrPath = Join-Path $LogDir "telesrv-$stamp.err.log" $env:TELESRV_LISTEN = $Listen + $env:TELESRV_POSTGRES_DSN = $PostgresDSN if ($AdvertiseIP) { $env:TELESRV_ADVERTISE_IP = $AdvertiseIP } @@ -338,6 +362,7 @@ try { Pid = $proc.Id Listen = $Listen AdvertiseIP = $env:TELESRV_ADVERTISE_IP + PostgresDatabase = $postgresDatabase Exe = $ExePath Stdout = $stdoutPath Stderr = $stderrPath diff --git a/scripts/start-docker.ps1 b/scripts/start-docker.ps1 new file mode 100644 index 00000000..e9bbf6a7 --- /dev/null +++ b/scripts/start-docker.ps1 @@ -0,0 +1,90 @@ +[CmdletBinding()] +param( + [Parameter()] + [string]$AdvertiseIP = "", + + [Parameter()] + [string]$PublicBaseURL = "", + + [Parameter()] + [string]$PublicWebBaseURL = "", + + [Parameter()] + [string]$AdminBindIP = "", + + [Parameter()] + [switch]$HostNetwork, + + [Parameter()] + [switch]$BridgeNetwork, + + [Parameter()] + [switch]$AllowInsecureDevelopmentAuth, + + [Parameter()] + [switch]$Build +) + +$ErrorActionPreference = "Stop" +if ($HostNetwork -and $BridgeNetwork) { throw "HostNetwork and BridgeNetwork are mutually exclusive." } + +$repoRoot = Split-Path -Parent $PSScriptRoot +$dockerDir = Join-Path $repoRoot "deploy\docker" +$composePath = Join-Path $dockerDir "compose.yaml" +$envPath = Join-Path $dockerDir ".env" +$generatorPath = Join-Path $PSScriptRoot "new-docker-env.ps1" + +if (-not (Test-Path -LiteralPath $envPath -PathType Leaf)) { + if ([string]::IsNullOrWhiteSpace($AdvertiseIP)) { $AdvertiseIP = "127.0.0.1" } + $generatorArguments = @{ AdvertiseIP = $AdvertiseIP } + if (-not [string]::IsNullOrWhiteSpace($PublicBaseURL)) { $generatorArguments.PublicBaseURL = $PublicBaseURL } + if (-not [string]::IsNullOrWhiteSpace($PublicWebBaseURL)) { $generatorArguments.PublicWebBaseURL = $PublicWebBaseURL } + if (-not [string]::IsNullOrWhiteSpace($AdminBindIP)) { $generatorArguments.AdminBindIP = $AdminBindIP } + if ($HostNetwork) { $generatorArguments.HostNetwork = $true } + if ($BridgeNetwork) { $generatorArguments.BridgeNetwork = $true } + if ($AllowInsecureDevelopmentAuth) { $generatorArguments.AllowInsecureDevelopmentAuth = $true } + & $generatorPath @generatorArguments +} +elseif ($PSBoundParameters.Keys | Where-Object { $_ -notin @("Build") }) { + Write-Warning "deploy/docker/.env already exists; initialization options were ignored to preserve credentials and deployment identity." +} + +$deployment = @{} +foreach ($line in Get-Content -LiteralPath $envPath) { + if ($line -match '^([A-Z0-9_]+)=(.*)$') { $deployment[$Matches[1]] = $Matches[2] } +} +if ($deployment['TELESRV_DEPLOYMENT_PROFILE'] -ne 'main-monolith-v1') { + throw "$envPath belongs to an older or different topology; move it aside and rerun so credentials are regenerated safely." +} + +$composeBase = @("compose", "--project-directory", $dockerDir, "--env-file", $envPath, "--file", $composePath) +$hostNetworkValue = $deployment['TELESRV_SERVER_HOST_NETWORK'] +if ([string]::IsNullOrWhiteSpace($hostNetworkValue)) { $hostNetworkValue = "true" } +if ($hostNetworkValue -ne "true" -and $hostNetworkValue -ne "false") { throw "TELESRV_SERVER_HOST_NETWORK must be true or false." } +if ($hostNetworkValue -eq "false") { $composeBase += @("--file", (Join-Path $dockerDir "compose.bridge-network.yaml")) } + +function Invoke-Compose { + param([string[]]$Arguments) + & docker @composeBase @Arguments + if ($LASTEXITCODE -ne 0) { throw "docker compose $($Arguments -join ' ') failed with exit code $LASTEXITCODE" } +} + +Invoke-Compose -Arguments @("config", "--quiet") +if ($Build) { Invoke-Compose -Arguments @("build", "--pull") } else { Invoke-Compose -Arguments @("pull") } +try { Invoke-Compose -Arguments @("up", "--detach", "--no-build", "--wait", "--wait-timeout", "600") } +catch { & docker @composeBase logs --no-color --tail 160; throw } + +Invoke-Compose -Arguments @("ps", "--all") +Write-Host "gramsrv main Docker stack is ready. Configuration: $envPath" +if ($deployment['TELESRV_PHONE_CODE_DELIVERY_PROVIDER'] -eq 'development') { Write-Host "Development login code: $($deployment['TELESRV_DEV_AUTH_CODE'])" } +Write-Host "MTProto: $($deployment['TELESRV_ADVERTISE_IP']):$($deployment['TELESRV_SERVER_PORT'])" +if ($deployment['TELESRV_TURN_ENABLE'] -eq 'true') { + Write-Host "TURN/STUN: udp://$($deployment['TELESRV_TURN_ADVERTISE_IP']):$($deployment['TELESRV_TURN_UDP_PORT'])" + $turnRelayMaxPort = $deployment['TELESRV_TURN_RELAY_MAX_PORT'] + if ($hostNetworkValue -eq 'false') { $turnRelayMaxPort = $deployment['TELESRV_TURN_BRIDGE_RELAY_MAX_PORT'] } + Write-Host "TURN relay UDP range: $($deployment['TELESRV_TURN_RELAY_MIN_PORT'])-$turnRelayMaxPort" +} +$adminHost = $deployment['TELESRV_ADMIN_BIND_IP'] +if ($adminHost -eq "0.0.0.0" -or $adminHost -eq "::") { $adminHost = $deployment['TELESRV_ADVERTISE_IP'] } +if ($adminHost.Contains(":")) { $adminHost = "[${adminHost}]" } +Write-Host "Admin UI: http://${adminHost}:$($deployment['TELESRV_ADMIN_PORT']) (password is stored in $envPath)" diff --git a/scripts/start-docker.sh b/scripts/start-docker.sh new file mode 100755 index 00000000..ea2f19e0 --- /dev/null +++ b/scripts/start-docker.sh @@ -0,0 +1,103 @@ +#!/usr/bin/env bash +set -euo pipefail + +usage() { + cat <<'EOF' +Usage: ./scripts/start-docker.sh [options] + +Initialization options (used only when deploy/docker/.env is absent): + --advertise-ip IP + --public-base-url URL + --public-web-base-url URL + --admin-bind-ip IP + --host-network Direct host networking for the monolith (default). + --bridge-network Docker port publishing compatibility mode. + --allow-insecure-development-auth + +Other options: + --build Build local images instead of pulling published images. + --help +EOF +} + +script_dir=$(CDPATH='' cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd) +repo_root=$(CDPATH='' cd -- "$script_dir/.." && pwd) +docker_dir="$repo_root/deploy/docker" +compose_path="$docker_dir/compose.yaml" +env_path="$docker_dir/.env" +generator_path="$script_dir/new-docker-env.sh" + +advertise_ip= +public_base_url= +public_web_base_url= +admin_bind_ip= +network_mode= +allow_insecure=false +build=false +initialization_options=false + +while [[ $# -gt 0 ]]; do + case "$1" in + --advertise-ip) [[ $# -ge 2 ]] || { printf '%s requires a value\n' "$1" >&2; exit 1; }; advertise_ip=$2; initialization_options=true; shift 2 ;; + --public-base-url) [[ $# -ge 2 ]] || { printf '%s requires a value\n' "$1" >&2; exit 1; }; public_base_url=$2; initialization_options=true; shift 2 ;; + --public-web-base-url) [[ $# -ge 2 ]] || { printf '%s requires a value\n' "$1" >&2; exit 1; }; public_web_base_url=$2; initialization_options=true; shift 2 ;; + --admin-bind-ip) [[ $# -ge 2 ]] || { printf '%s requires a value\n' "$1" >&2; exit 1; }; admin_bind_ip=$2; initialization_options=true; shift 2 ;; + --host-network) network_mode=host; initialization_options=true; shift ;; + --bridge-network) network_mode=bridge; initialization_options=true; shift ;; + --allow-insecure-development-auth) allow_insecure=true; initialization_options=true; shift ;; + --build) build=true; shift ;; + --help|-h) usage; exit 0 ;; + *) printf 'start-docker: unknown argument: %s\n' "$1" >&2; exit 1 ;; + esac +done + +if [[ ! -f "$env_path" ]]; then + [[ -n "$advertise_ip" ]] || advertise_ip=127.0.0.1 + generator_args=(--advertise-ip "$advertise_ip") + [[ -z "$public_base_url" ]] || generator_args+=(--public-base-url "$public_base_url") + [[ -z "$public_web_base_url" ]] || generator_args+=(--public-web-base-url "$public_web_base_url") + [[ -z "$admin_bind_ip" ]] || generator_args+=(--admin-bind-ip "$admin_bind_ip") + [[ "$network_mode" != host ]] || generator_args+=(--host-network) + [[ "$network_mode" != bridge ]] || generator_args+=(--bridge-network) + [[ "$allow_insecure" = false ]] || generator_args+=(--allow-insecure-development-auth) + "$generator_path" "${generator_args[@]}" +elif [[ "$initialization_options" = true ]]; then + printf 'start-docker: deploy/docker/.env already exists; initialization options were ignored to preserve credentials and deployment identity.\n' >&2 +fi + +env_value() { awk -F= -v key="$1" '$1 == key { print substr($0, length(key) + 2); exit }' "$env_path"; } + +if [[ "$(env_value TELESRV_DEPLOYMENT_PROFILE)" != main-monolith-v1 ]]; then + printf 'start-docker: %s belongs to an older or different topology; move it aside and rerun so credentials are regenerated safely.\n' "$env_path" >&2 + exit 1 +fi + +configured_host_network=$(env_value TELESRV_SERVER_HOST_NETWORK) +[[ -n "$configured_host_network" ]] || configured_host_network=true +case "$configured_host_network" in true|false) ;; *) printf 'start-docker: TELESRV_SERVER_HOST_NETWORK must be true or false\n' >&2; exit 1 ;; esac + +compose=(docker compose --project-directory "$docker_dir" --env-file "$env_path" --file "$compose_path") +if [[ "$configured_host_network" = false ]]; then compose+=(--file "$docker_dir/compose.bridge-network.yaml"); fi +"${compose[@]}" version >/dev/null +"${compose[@]}" config --quiet + +if [[ "$build" = true ]]; then "${compose[@]}" build --pull; else "${compose[@]}" pull; fi +if ! "${compose[@]}" up --detach --no-build --wait --wait-timeout 600; then + "${compose[@]}" logs --no-color --tail 160 || true + exit 1 +fi + +"${compose[@]}" ps --all +printf 'gramsrv main Docker stack is ready. Configuration: %s\n' "$env_path" +if [[ "$(env_value TELESRV_PHONE_CODE_DELIVERY_PROVIDER)" = development ]]; then printf 'Development login code: %s\n' "$(env_value TELESRV_DEV_AUTH_CODE)"; fi +printf 'MTProto: %s:%s\n' "$(env_value TELESRV_ADVERTISE_IP)" "$(env_value TELESRV_SERVER_PORT)" +if [[ "$(env_value TELESRV_TURN_ENABLE)" = true ]]; then + printf 'TURN/STUN: udp://%s:%s\n' "$(env_value TELESRV_TURN_ADVERTISE_IP)" "$(env_value TELESRV_TURN_UDP_PORT)" + turn_relay_max_port=$(env_value TELESRV_TURN_RELAY_MAX_PORT) + if [[ "$configured_host_network" = false ]]; then turn_relay_max_port=$(env_value TELESRV_TURN_BRIDGE_RELAY_MAX_PORT); fi + printf 'TURN relay UDP range: %s-%s\n' "$(env_value TELESRV_TURN_RELAY_MIN_PORT)" "$turn_relay_max_port" +fi +admin_host=$(env_value TELESRV_ADMIN_BIND_IP) +if [[ "$admin_host" = 0.0.0.0 || "$admin_host" = :: ]]; then admin_host=$(env_value TELESRV_ADVERTISE_IP); fi +[[ "$admin_host" != *:* ]] || admin_host="[$admin_host]" +printf 'Admin UI: http://%s:%s (password is stored in %s)\n' "$admin_host" "$(env_value TELESRV_ADMIN_PORT)" "$env_path"