SHA256
Compare commits
66
Commits
| Author | SHA256 | Date | |
|---|---|---|---|
|
|
5db3ad8a3e | ||
|
|
e556615fa9 | ||
|
|
790740cd56 | ||
|
|
d91e4a32df | ||
|
|
9e7526fd81 | ||
|
|
d3a84dd451 | ||
|
|
653015b2e7 | ||
|
|
8ac8f04128 | ||
|
|
80c70ebcdc | ||
|
|
792f368175 | ||
|
|
859dbee1f1 | ||
|
|
8f3b81c368 | ||
|
|
0274183730 | ||
|
|
c9f54224bb | ||
|
|
02c705d41e | ||
|
|
76bbc9d023 | ||
|
|
780ca53931 | ||
|
|
fc86c6190e | ||
|
|
2dd0ed6d59 | ||
|
|
1f06629838 | ||
|
|
c477560632 | ||
|
|
548160f7f8 | ||
|
|
a86a380dc7 | ||
|
|
d9fdaf1930 | ||
|
|
102feccb2e | ||
|
|
1b86bca19a | ||
|
|
fed28527ae | ||
|
|
2aa770a07b | ||
|
|
4362c0a015 | ||
|
|
2983ac89e6 | ||
|
|
4a6e072946 | ||
|
|
ac6a2e5b3f | ||
|
|
e01da7ae87 | ||
|
|
70540ff041 | ||
|
|
3ecec25fce | ||
|
|
2f5736e67d | ||
|
|
97db033eb8 | ||
|
|
c972a975fd | ||
|
|
42a05a7a67 | ||
|
|
2a72842a7a | ||
|
|
c97df82538 | ||
|
|
6b120731a3 | ||
|
|
d39d2777d1 | ||
|
|
afece72444 | ||
|
|
6031d95fe8 | ||
|
|
84f2400bef | ||
|
|
e7f6e0580c | ||
|
|
689321da1a | ||
|
|
b220f2ac8b | ||
|
|
6489fb56ab | ||
|
|
003cc942d8 | ||
|
|
9c30b33b39 | ||
|
|
405b9a91a7 | ||
|
|
526941eb33 | ||
|
|
34f7faf0a8 | ||
|
|
4068465ee6 | ||
|
|
9405f28525 | ||
|
|
571f4cbc7d | ||
|
|
e8f68f8fc4 | ||
|
|
4591d171d6 | ||
|
|
3185ce8b5e | ||
|
|
e575512ebb | ||
|
|
4f8c2a72e9 | ||
|
|
3c6021a290 | ||
|
|
dafa377cbe | ||
|
|
7ed47f7b7e |
+10
@@ -126,3 +126,13 @@ shine-UI/assets/navbar_preview.png
|
||||
**/.env.*
|
||||
!**/.env.example
|
||||
!**/.env.sample
|
||||
|
||||
# Private key files and local credential stores (never commit)
|
||||
*.key
|
||||
*.pem
|
||||
*.p12
|
||||
*.pfx
|
||||
*.jwk
|
||||
*.jks
|
||||
*.keystore
|
||||
*keypair*.json
|
||||
|
||||
@@ -1,145 +1,27 @@
|
||||
# AGENTS
|
||||
# Инструкции для агентов SHiNE
|
||||
|
||||
## Язык проекта
|
||||
- По умолчанию использовать русский язык во всех пользовательских текстах и технических пояснениях.
|
||||
- Пояснения к коммитам, PR и merge-запросам писать на русском языке.
|
||||
- Комментарии в коде, встроенные справки, документацию и инструкции писать по возможности на русском языке.
|
||||
Этот файл относится к репозиторию SHiNE. По умолчанию писать документацию, пользовательские пояснения и сообщения коммитов на русском языке.
|
||||
|
||||
## Примечание
|
||||
- Если внешний инструмент/интеграция требует английский формат, допускается английский, но рядом желательно дать краткое пояснение на русском.
|
||||
## Сначала определить область работы
|
||||
|
||||
## Структура проекта (кратко)
|
||||
- Серверный код SHiNE находится в папке `SHiNE-server/`.
|
||||
- Код клиентского UI SHiNE находится в папке `shine-UI/`.
|
||||
- Веб-панель администратора сервера (управление Solana PDA сервера) находится в `shine-UI/`:
|
||||
- точка входа `shine-UI/server-ui.html`;
|
||||
- остальные файлы серверного UI — в `shine-UI/server-ui/`.
|
||||
- Локальный Telegram-бот агента-кодера живёт рядом с репозиторием продукта, обычно в `../SHiNE-agent-bot-coder/`, и не входит в публичный код основного приложения.
|
||||
- Solana/Anchor-модуль находится в папке `shine-solana/shine/` и ведётся отдельно от основного server/UI деплоя.
|
||||
| Область | Код | Правила и документация |
|
||||
| --- | --- | --- |
|
||||
| Сервер, WebSocket/API, PostgreSQL | `SHiNE-server/` | `SHiNE-server/AGENTS.md`, `docs/API/` |
|
||||
| Блокчейн, Arweave | `SHiNE-server/shine-server-blockchain/` | `docs/Blockchain/README.md` |
|
||||
| Личные сообщения | сервер и `shine-UI/` | `docs/Personal_Messages/README.md`, локальный `AGENTS.md` |
|
||||
| Браузерный UI | `shine-UI/` | `shine-UI/AGENTS.md`, `docs/UI-Design/README.md` |
|
||||
| Solana/Anchor | `shine-solana/shine/` | локальный `AGENTS.md`, `docs/Solana_Architecture/README.md` |
|
||||
| ESP32 | `ESP32/` | `ESP32/AGENTS.md`, инструкции конкретного устройства |
|
||||
| Деплой и резервные копии | `deploy/` | `deploy/AGENTS.md`, `deploy/backup/AGENTS.md` |
|
||||
| Тестовый издатель | `tools/test-publisher/` | локальный `AGENTS.md` |
|
||||
|
||||
## Сервис агента-кодера
|
||||
- Локальный Telegram-бот-сервис агента-кодера находится вне этого git-репозитория, обычно в `../SHiNE-agent-bot-coder/`.
|
||||
- Сервис принимает сообщения из Telegram, ведёт историю диалога, ставит задачи в очередь и вызывает Codex CLI для обработки запросов по проекту.
|
||||
- Рабочая папка Codex для сервиса должна указывать на этот продуктовый репозиторий: `CODEX_WORKDIR=/home/ai/work/SHiNE/SHiNE-server-sha256/SHiNE-product`.
|
||||
- Автоматически читаемые инструкции для Codex внутри сервиса держать в `../SHiNE-agent-bot-coder/AGENTS.md`.
|
||||
- Подробные служебные правила Telegram-обработчика, его очередь, история, systemd-запуск и особенности ответов описывать в `../SHiNE-agent-bot-coder/AGENT.md`.
|
||||
- Если в сообщениях пользователя встречается «агент MD» или похожая формулировка про файл инструкций Codex, считать, что имеется в виду автоматически читаемый `AGENTS.md`.
|
||||
Общий каталог — `docs/README.md`; карта компонентов и потоков данных — `docs/ARCHITECTURE.md`. Правила сопровождения документов — `docs/CONTRIBUTING_DOCS.md`; после правки документации запускать `python3 scripts/check_docs.py`. Планы в `TODO/` не считать описанием действующего поведения или разрешением на реализацию.
|
||||
|
||||
## ESP32 UI homeserver
|
||||
- Для UI-скетча устройства `ESP32-S3-Touch-AMOLED-2.16` документ-спецификация и Arduino-скетч должны всегда оставаться синхронными.
|
||||
- Актуальный документ по экранной логике, состояниям, кнопкам, полям, статусам и ограничениям UI считать источником истины для скетча.
|
||||
- При изменении документа обязательно в том же наборе изменений приводить в соответствие скетч.
|
||||
- При изменении скетча обязательно в том же наборе изменений обновлять документ, если поменялись экраны, тексты, переходы, статусы, кнопки, поля или поведение.
|
||||
- Для нового ESP32 UI-прототипа homeserver использовать русский язык как основной и отдельно следить, чтобы текст реально отображался на устройстве, а не только логически присутствовал в коде.
|
||||
## Постоянные правила
|
||||
|
||||
## Solana-модуль
|
||||
- В проекте есть отдельный Solana/Anchor-модуль в папке `shine-solana/shine/`.
|
||||
- Модуль логически связан с SHiNE, но не должен автоматически подключаться к сборке или деплою основного сервера без отдельного решения.
|
||||
- В Solana-модуле действуют локальные инструкции `shine-solana/shine/AGENTS.md`; при изменениях внутри модуля сначала читать их.
|
||||
- В git добавлять исходники, lock-файлы, настройки проекта и документацию Solana-модуля, но не добавлять локальные ключи, `.git`, `.idea`, `.gradle`, `target`, `node_modules`, `test-ledger`, логи, временные run-отчёты и `.env`-конфиги.
|
||||
- Для Solana deploy/push использовать правила из локального `shine-solana/shine/AGENTS.md`; не смешивать deploy Solana-модуля со скриптами основного server/UI deploy из `deploy/scripts/`.
|
||||
- Для регистрации пользователей в Solana (программа `shine_users`) единая актуальная инструкция по деплою/инициализации, адресам программ, и куда их прописывать в UI/сервере находится в:
|
||||
- `docs/Инициализация_Solana_регистрации/README.md`
|
||||
- Этот файл считать основной справкой (single source of truth) по деплою и первичной инициализации Solana-регистрации в текущем проекте.
|
||||
- Актуальная архитектурная справка по устройству Solana-программ, PDA-счетам, ролям DAO и движению средств находится в:
|
||||
- `docs/Solana_Architecture/README.md`
|
||||
- Документы формата пользовательской PDA-записи `shine_users`:
|
||||
- текущий: `shine-solana/shine/doc/formats/shine-user-pda-format-v.1.2.md`;
|
||||
- legacy: `shine-solana/shine/doc/formats/shine-user-pda-format-v.1.0.md`.
|
||||
- Актуальная документация по серверному модулю синхронизации Solana users находится в:
|
||||
- `docs/Solana/SOLANA_USERS_SYNC_MODULE_DESIGN.md`
|
||||
- При любом изменении логики серверной синхронизации `shine_users`, её таблиц PostgreSQL, checkpoint-механизма, startup/lifecycle или deploy-настроек обязательно обновлять:
|
||||
- `docs/Solana/SOLANA_USERS_SYNC_MODULE_DESIGN.md`
|
||||
- `deploy/SOLANA_USERS_SYNC_SERVER_SETUP.md`
|
||||
|
||||
## Документация блокчейна
|
||||
- Актуальная документация по форматам блокчейна находится в `docs/Blockchain/README.md`.
|
||||
- Это точка входа (оглавление), рядом расположены детальные файлы по форматам, типам каналов и командным сообщениям.
|
||||
- При любом изменении кода, связанного с блокчейном (формат блока, типы каналов, правила чтения/записи, команды), обязательно обновлять соответствующие документы в `docs/Blockchain/`.
|
||||
- Дополнительно обязательно вести `docs/Blockchain/CHANGELOG.md`: дописывать изменения построчно с указанием даты/времени и хэша коммита, после которого внесено изменение.
|
||||
- Перед любым изменением формата блокчейна обязательно заранее предупреждать пользователя, что формат будет изменён.
|
||||
- Изменять формат блокчейна можно только после явного подтверждения пользователя (без подтверждения формат не менять).
|
||||
- Добавление любых данных в блокчейн выполнять только через операцию `AddBlock`.
|
||||
- Перед каждым `AddBlock` обязательно проверять/актуализировать текущее состояние вершины блокчейна (`last global number/hash`) и использовать его при формировании блока.
|
||||
|
||||
## Документация личных сообщений (DM)
|
||||
- Актуальная документация по логике личных сообщений находится в `docs/Personal_Messages/Протокол_DM_v1.md`.
|
||||
- Точный байтовый формат DM находится в `docs/Personal_Messages/Формат_DM_v1.md`.
|
||||
- При любом изменении кода, связанного с личными сообщениями (формат подписанного DM-блока, типы DM-сообщений, правила доставки/ACK/read-receipt, роутинг по сессиям, UI-логика чатов), обязательно обновлять оба документа:
|
||||
- `docs/Personal_Messages/Протокол_DM_v1.md`
|
||||
- `docs/Personal_Messages/Формат_DM_v1.md`
|
||||
- Логика личных сообщений в коде должна всегда соответствовать этим документам.
|
||||
- Документ по личным сообщениям обязан поддерживаться в актуальном состоянии.
|
||||
|
||||
## Документация API сервера
|
||||
- Актуальная документация по публичному JSON/WebSocket API сервера находится в `docs/API/`.
|
||||
- При любом изменении серверного API/эндпоинтов/операций `op` обязательно обновлять соответствующие документы в `docs/API/`.
|
||||
- Перед изменением самого серверного API обязательно явно предупредить пользователя, какие операции, поля запросов/ответов или коды ошибок будут изменены, и запросить отдельное подтверждение.
|
||||
- Без явного подтверждения пользователя формат серверного API не менять; допускается только приведение документации в соответствие уже существующему коду.
|
||||
- Если добавляется новая операция `op`, нужно обновить общий список операций в `docs/API/09_Operations_Index.md` или создать его, если файла ещё нет.
|
||||
|
||||
## Документация Figma
|
||||
- Актуальная документация по переносу экранов SHiNE в Figma и обратному переносу из Figma в код находится в `docs/Figma/`.
|
||||
- Точка входа: `docs/Figma/README.md`.
|
||||
- Подробный рабочий регламент: `docs/Figma/TRANSFER_UI_SCREENS.md`.
|
||||
- Для экранов регистрации, входа и других чувствительных UI-flow по умолчанию переносить экраны в Figma по одному, а не пачкой, если пользователь отдельно не подтвердил иной способ.
|
||||
|
||||
## Версионирование
|
||||
- Все правила по коммитам, merge в `main`, `git push` и обновлению `VERSION.properties` находятся в `COMMIT_AND_VERSION_RULES.md`.
|
||||
- Этот файл считать единым источником истины по правилам версионирования и коммитов для данного репозитория.
|
||||
|
||||
## Deploy
|
||||
- Все документы, инструкции, backup-правила и скрипты деплоя хранить в папке `deploy/`.
|
||||
- Подробные правила для агента по деплою находятся в `deploy/AGENTS.md`; перед любым deploy читать этот файл.
|
||||
- Production-серверы SHiNE: `shineup.me` и `server2.shineup.me`.
|
||||
- Тестовые/devnet серверы SHiNE: `t1.shineup.me`, `t2.shineup.me`, `t3.shineup.me`, `t4.shineup.me`.
|
||||
- В deploy-документах и скриптах использовать домены, а не IP.
|
||||
- По возможности все справки, комментарии и примечания в конфигах/документах писать на русском языке.
|
||||
- Любые изменения и любой деплой на production (`shineup.me` и `server2.shineup.me`) выполнять только после отдельного явного подтверждения пользователя.
|
||||
- Перед production deploy обязательно проверить/обновить бэкап в `deploy/backup/archive/`.
|
||||
- Если пользователь пишет просто `задеплой` без уточнения production/test, уточнить целевой контур; не выбирать production автоматически.
|
||||
- Deploy выполнять shell-скриптами из `deploy/scripts/`; Gradle deploy-задачи не использовать.
|
||||
- Для локального запуска использовать `./gradlew startLocal` (или `startLocalWithBuild`).
|
||||
- Сначала предлагать локальную проверку, а деплой на сервер выполнять по запросу пользователя.
|
||||
- Для временной бесплатной загрузки аватаров в Arweave секретный JWK нельзя хранить в git и нельзя прописывать в репозиторный `application.properties`.
|
||||
- Для продовой настройки тестового Arweave-кошелька JWK-файл нужно хранить только на сервере, например: `/home/player/SHiNE/secrets/test-free-avatar-wallet.json`.
|
||||
- Для этой временной фичи на проде должны быть заданы параметры `test.freeAvatar.walletJwkPath` и `test.freeAvatar.walletAddress` через серверный override-конфиг/секреты на хосте.
|
||||
- После изменения продовых значений `test.freeAvatar.*` нужно заново выполнить серверный деплой или перезапуск сервера, чтобы настройки были перечитаны приложением.
|
||||
- При таких изменениях в git допускается коммитить только документацию и код чтения настроек, но не сам JWK, не содержимое секрета и не реальные приватные ключи.
|
||||
|
||||
## Логи звонков (установка соединения)
|
||||
- Специальный поток диагностики установки звонков идёт через `CallDeliveryReport` (клиент → сервер).
|
||||
- На проде специальный файл для звонков:
|
||||
- `/home/player/SHiNE/shine-server/logs/call-delivery-events.log`
|
||||
- Общий серверный лог (и ротации) на проде:
|
||||
- `/home/player/SHiNE/shine-server/logs/app.log`
|
||||
- `/home/player/SHiNE/shine-server/logs/app.YYYY-MM-DD.log`
|
||||
- Для анализа причин недозвона в первую очередь фильтровать записи по ключам:
|
||||
- `CallDeliveryReport`
|
||||
- `call_connected`
|
||||
- `outgoing_failed`
|
||||
- `incoming_failed`
|
||||
- `call_busy`
|
||||
- `call_declined`
|
||||
- `unknown_error`
|
||||
- В этих записях искать поля `reason`, `failureStage`, `pcConnectionState`, `pcIceConnectionState`, `routeLabel`, `configuredTurnHosts*`, `reachableTurnHosts*`.
|
||||
|
||||
## Будущие фичи / TODO
|
||||
- Папка для задач, сознательно отложенных на будущее: `TODO/`.
|
||||
- Точка входа по планам: `TODO/README.md`.
|
||||
- Внутри планы разделены по горизонтам: `near/`, `medium/`, `far/` и тематическим подпапкам.
|
||||
- Если пользователь спрашивает, какие есть планы или что можно продолжить, сначала читать `TODO/README.md`, затем при необходимости конкретные файлы из подпапок.
|
||||
- Файлы из этой папки не считать активными задачами и не начинать реализацию без явной просьбы пользователя.
|
||||
- Старую папку `docs/Future_Features/` считать выведенной из использования и больше не использовать для новых записей.
|
||||
- Если часть кода временно отключена или закомментирована, либо удалена как временная заглушка, в TODO-файле подробно описывать:
|
||||
- какие файлы и участки отключены;
|
||||
- что осталось в коде как заготовка;
|
||||
- какие документы нужно обновить при возврате;
|
||||
- с какого сценария продолжать разработку;
|
||||
- из какого коммита брать последнюю полную реализацию.
|
||||
|
||||
## Коммуникация по новым задачам
|
||||
- При получении нового задания кратко подтвердить понимание задачи, если это помогает синхронизироваться.
|
||||
- До начала реализации задавать уточняющие вопросы только когда без ответа есть риск сделать не то или затронуть опасную область.
|
||||
- Если задача понятна и не требует отдельного подтверждения по другим правилам проекта, переходить к реализации сразу.
|
||||
- Если есть уместные идеи/улучшения — кратко предложить их; если полезных идей нет, ничего дополнительно не предлагать.
|
||||
- Прежде чем править подсистему, прочитать её локальный `AGENTS.md` и действующую документацию через `docs/README.md`. Архивные отчёты и старые планы не использовать как текущий контракт. При расхождении документа с кодом проверить реализацию и исправить документ либо явно отметить неопределённость.
|
||||
- Изменение поведения, формата, API, конфигурации или пользовательского сценария сопровождать обновлением соответствующего документа в том же наборе изменений. Не выдавать план, черновик или тестовое состояние за действующую функцию.
|
||||
- Формат блокчейна и контракт серверного API изменять только после отдельного явного согласия пользователя; документировать изменения в `docs/Blockchain/` и `docs/API/`. Для добавления блока использовать `AddBlock` с актуальной вершиной цепочки.
|
||||
- Любые изменения и деплой production (`shineup.me`, `server2.shineup.me`) — только после отдельного явного согласия пользователя. Перед деплоем прочитать `deploy/AGENTS.md` и проверить резервную копию. Для деплоя использовать скрипты `deploy/scripts/`.
|
||||
- Секреты, приватные ключи, локальные конфиги, сборочные артефакты и логи не добавлять в git.
|
||||
- Коммиты, версии и merge выполнять по `COMMIT_AND_VERSION_RULES.md`. Не делать коммит или push без необходимости для задачи.
|
||||
|
||||
@@ -32,15 +32,6 @@
|
||||
- По умолчанию в `main` нужно не коммитить напрямую, а мержить готовые изменения из рабочей ветки.
|
||||
- Если пользователь просит сделать прямой коммит в `main`, нужно отдельно и явно предупредить, что это обход обычного стабильного процесса, и обязательно переспросить подтверждение.
|
||||
|
||||
## Версионирование при merge или прямом коммите в `main`
|
||||
|
||||
- Для попадания изменений в `main` действует отдельная схема инкремента.
|
||||
- Нужно увеличивать вторую цифру версии и обнулять третью.
|
||||
- Пример: `1.2.346` → `1.3.0`.
|
||||
- Если в наборе изменений менялся только UI, обновлять только `client.version`.
|
||||
- Если в наборе изменений менялся только сервер, обновлять только `server.version`.
|
||||
- Если соответствующая часть не менялась, её версию не трогать.
|
||||
|
||||
## Правила для git commit и git push
|
||||
|
||||
- Обычные коммиты делать стандартным `git commit`; токен для локального коммита не нужен и не используется.
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
# SHiNE — патч DM R2 v3 (15.11.2026)
|
||||
|
||||
## Основа патча
|
||||
|
||||
Накладывать **поверх версии проекта с применённым патчем** `SHiNE-R2-public-MVP-patch-2026.11.14.zip` на архив `SHiNE-bundle-2026.11.14-13.22.24.zip` (либо поверх более новой версии, совместимой с этими серверными API).
|
||||
|
||||
Патч **не заменяет** изменённый после предыдущей работы `attachment-format.js` и не трогает новую публичную загрузку, Arweave и аватары.
|
||||
|
||||
## Что изменилось
|
||||
|
||||
- **Новые DM**: формат `S:file;v=3`, root manifest и AES-256-GCM-шифрование отдельных кусков до 8 МиБ, id = Base58(SHA-256(ciphertext)); **никаких новых BitTorrent/Merkle-хешей**.
|
||||
- Клиент отправляет JSON `fileId, size` на `POST /api/dm-files/prepare` со старым session key Ed25519 и отдельным доменом подписи `DM_R2_PREPARE_V1`.
|
||||
- Java подписывает PUT только в корзину `shine-dm`. Ciphertext загружается браузером **напрямую** в S3 endpoint R2. PUT использует `If-None-Match: *`; `Content-Type: application/octet-stream`.
|
||||
- Скачивание напрямую `https://dm-files.shineup.me/<fileId>` по публичной ссылке; получатель перед расшифровкой проверяет SHA-256/Base58 каждого объекта.
|
||||
- Никакой ключ AES и исходный MIME в R2 не передаются, они находятся только в E2EE DM.
|
||||
- **Чтение старых вложений v1 и v2** сохранено. В старых v2 BitTorrent ещё проверяется — исключительно ради совместимости. UI не показывает подпись BitTorrent для v3.
|
||||
- Передача голосовых вложений использует тот же v3.
|
||||
- Лимит одного исходного файла в MVP 500 МиБ, один ciphertext-объект ≤8 МиБ+16; нет S3 Multipart и нет строгой гарантии отсутствия повреждённого R2-объекта при первом недобросовестном PUT.
|
||||
|
||||
## Настройка Cloudflare
|
||||
|
||||
1. Проверьте, что корзина R2 **`shine-dm`** существует и пользовательский домен **`dm-files.shineup.me`** имеет статус **Active**.
|
||||
2. К `shine-dm` применено **Object Lifecycle → Delete after 14 days → All objects**. По согласованной политике это очистка R2, не гарантия исчезновения CDN-копий.
|
||||
3. У `shine-dm` установлен CORS для `https://shineup.me` (и реально используемых клиентских доменов). Methods `GET`, `HEAD`, `PUT`; Headers `*`; Expose `Content-Length`, `ETag`.
|
||||
4. R2 API credential server имеет права **Object Read & Write** для **`shine-files` и `shine-dm`**. Никакие ключи не передаются в UI.
|
||||
|
||||
## Настройка Java-сервера
|
||||
|
||||
В приватной конфигурации приложения:
|
||||
|
||||
```properties
|
||||
r2.dmBucket=shine-dm
|
||||
```
|
||||
|
||||
В переменных окружения сервиса Java (используются и публичным R2-модулем):
|
||||
|
||||
```text
|
||||
R2_ENDPOINT=https://<account-id>.r2.cloudflarestorage.com
|
||||
R2_ACCESS_KEY_ID=<серверный S3 Access Key ID>
|
||||
R2_SECRET_ACCESS_KEY=<серверный S3 Secret Access Key>
|
||||
```
|
||||
|
||||
В случае jurisdiction-specific endpoint использовать именно значение из Cloudflare. Не включать переменные в Git или клиентский JS. После применения патча обновить JAR и выполнить restart службы.
|
||||
|
||||
**Caddy / Nginx:** добавить точный маршрут `POST /api/dm-files/prepare` (и CORS OPTIONS на тот же URL) к той же Java/Jetty, которая обрабатывает `/ws` и публичный `/api/files/prepare`. Маршрут должен быть выше SPA fallback; `/dm-files/*` оставить для старых файлов v1/v2.
|
||||
|
||||
## Проверки
|
||||
|
||||
```bash
|
||||
node scripts/tests/test-dm-r2-v3.mjs
|
||||
node scripts/tests/test-r2-file-preparation.mjs
|
||||
python3 scripts/check_docs.py
|
||||
```
|
||||
|
||||
Нужно дополнительно сделать полноценную **Java-сборку и live R2 интеграционный тест на тестовом сервере**, поскольку в среде сборки этого патча Gradle не может скачать дистрибутив.
|
||||
|
||||
Рекомендуемый живой сценарий: отправить файл ~9 МиБ из личного чата; убедиться, что появились 2 ciphertext-части и 1 зашифрованный manifest в `shine-dm`, что ключи не попали в R2, а получатель скачал и открыл исходный файл. Затем проверить отправку голосового сообщения, файл 0 байт, файл около 500 МиБ, отсутствующую CORS-настройку и старую переписку v2.
|
||||
|
||||
### Ограничения перед production
|
||||
|
||||
- Нужны rate limits на выдачу подписанных URL и мониторинг расходов R2; сервер не проверяет байты против объявленного SHA-256 (это проверяет скачивающий клиент).
|
||||
- `If-None-Match: *` запрещает перезапись уже существующего ID, но не предотвращает первоначальную загрузку неправильных байтов под этим ID.
|
||||
- Старые клиенты **не умеют читать v3** — потребуется обновить клиентов обоих участников DM.
|
||||
- Пропуск зашифрованного файла через Java не происходит, но Java подписывает каждую новую часть; возможны десятки prepare-запросов на одно крупное вложение.
|
||||
- **Production deployment не выполнялся**.
|
||||
@@ -0,0 +1,86 @@
|
||||
# Инструкция по commit и push в Git
|
||||
|
||||
## Репозиторий
|
||||
|
||||
Работать с Git нужно из корня репозитория `SHiNE-product/`:
|
||||
|
||||
```bash
|
||||
cd /home/ai/work/SHiNE/SHiNE-server-sha256/SHiNE-product
|
||||
```
|
||||
|
||||
## Канонический Gitea
|
||||
|
||||
Всегда использовать этот Git-сервер и этот remote:
|
||||
|
||||
```text
|
||||
https://git.shineup.me/Aidar/SHiNE-server.git
|
||||
```
|
||||
|
||||
Проверка и исправление `origin`:
|
||||
|
||||
```bash
|
||||
git remote set-url origin https://git.shineup.me/Aidar/SHiNE-server.git
|
||||
git remote -v
|
||||
```
|
||||
|
||||
Старый адрес `git2.shineup.me` не использовать.
|
||||
|
||||
Секреты, токены, приватные ключи, `.env`, логи и сборочные артефакты в Git не добавлять.
|
||||
|
||||
## Перед коммитом
|
||||
|
||||
```bash
|
||||
git status --short --branch
|
||||
git diff --check
|
||||
git diff
|
||||
```
|
||||
|
||||
Перед обычным коммитом обновить `VERSION.properties`:
|
||||
|
||||
- только UI — увеличить `client.version`;
|
||||
- только сервер — увеличить `server.version`;
|
||||
- UI и сервер — увеличить обе версии;
|
||||
- в рабочей ветке использовать patch-инкремент: `1.2.346` → `1.2.347`.
|
||||
|
||||
Сообщения коммитов писать на русском языке.
|
||||
|
||||
## Commit
|
||||
|
||||
```bash
|
||||
git add <нужные-файлы>
|
||||
git commit -m "Краткое описание изменения"
|
||||
```
|
||||
|
||||
Для локального `git commit` токен не нужен. Не использовать `git add .`, если в рабочем дереве есть непроверенные локальные файлы.
|
||||
|
||||
## Push
|
||||
|
||||
Сначала проверить ветку и remote:
|
||||
|
||||
```bash
|
||||
git branch --show-current
|
||||
git remote -v
|
||||
```
|
||||
|
||||
Для push использовать токен из переменной окружения `GITEA_TOKEN`; сам токен в команду, файл или историю shell не записывать. При HTTPS Git обычно запросит имя пользователя и пароль токена:
|
||||
|
||||
```bash
|
||||
export GITEA_TOKEN='токен задаётся локально и не коммитится'
|
||||
git push origin HEAD
|
||||
unset GITEA_TOKEN
|
||||
```
|
||||
|
||||
Если credential helper не умеет автоматически подставлять `GITEA_TOKEN`, использовать настроенный локально способ авторизации Gitea; не вставлять токен в URL remote.
|
||||
|
||||
После push проверить результат:
|
||||
|
||||
```bash
|
||||
git status --short --branch
|
||||
git log -1 --oneline
|
||||
```
|
||||
|
||||
## Ветка `main`
|
||||
|
||||
`main` предназначена для стабильных версий. По умолчанию изменения сначала коммитить в рабочей ветке, затем вливать в `main`. Для merge в `main` увеличивать вторую цифру версии и обнулять третью: `1.2.346` → `1.3.0`.
|
||||
|
||||
Перед push в `main` отдельно проверить diff, версию и отсутствие секретов.
|
||||
@@ -1,29 +0,0 @@
|
||||
# SHiNE ANS-104 `test5590` patch
|
||||
|
||||
Этот архив содержит **только новые/изменённые файлы** плюс `DELETE_FILES.txt`.
|
||||
|
||||
## Что меняется
|
||||
|
||||
- Frame v1 без поддержки старого формата.
|
||||
- Один пользовательский block = готовый Ed25519 ANS-104 DataItem.
|
||||
- Test tag: `App=test5590`; channel tag: `c=<canonical slug>`.
|
||||
- SHiNE `prevHash` остаётся `SHA-256(FrameV1Bytes)` и не зависит от Arweave ID.
|
||||
- PostgreSQL — единственное локальное хранилище пользовательских blocks.
|
||||
- Старый custom SHINE-ARCHIVE и filesystem blockchain storage удаляются.
|
||||
- Каждые ~15 минут локальные pending DataItems собираются в standard ANS-104 bundle и идут через существующий native Arweave L1 transport.
|
||||
- Другие серверы находят `App=test5590`, импортируют и не публикуют повторно.
|
||||
- `ESP32/**` **не изменён**.
|
||||
|
||||
## Состав
|
||||
|
||||
- изменено/добавлено файлов: 46
|
||||
- удалить файлов: 41
|
||||
|
||||
Применение и проверки: `docs/Blockchain/CODEX_APPLY_ANS104_TEST5590_PATCH.md`.
|
||||
|
||||
## Проверки при сборке patch
|
||||
|
||||
- `node --check` для изменённых production JS: OK.
|
||||
- `diff -qr` каталога `ESP32` относительно исходного архива: без изменений.
|
||||
- Active Java refs на удалённые SHINE-ARCHIVE/file-recovery classes: отсутствуют.
|
||||
- `./gradlew testClasses --offline --no-daemon`: не запущен до компиляции, потому что wrapper требует скачать Gradle 8.14 с `services.gradle.org`, а рабочая среда не имеет внешнего сетевого доступа. Полный Gradle test обязателен после применения patch в dev-среде.
|
||||
@@ -0,0 +1,64 @@
|
||||
# SHiNE — патч R2 для публичных вложений (14.11.2026)
|
||||
|
||||
**База:** `SHiNE-bundle-2026.11.14-13.22.24.zip`. Это overlay-патч: распаковать **поверх точно этой версии** репозитория, сохраняя пути. Не раскатывать без проверки на тестовом сервере.
|
||||
|
||||
## Что изменено
|
||||
|
||||
- `S:att;v=1` поддерживает `pr` (BitTorrent v2 pieces root, base64url) и необязательное `mm` (MIME); `ar` сохраняется. Старый `sha256` остаётся читаемым.
|
||||
- SHA-256 у аватаров и существующий `/files/<sha256>` не меняются.
|
||||
- Новый `file-preparation-service.js` вычисляет `pr` через существующий аккумулятор порциями 1 МиБ; по окончательному файлу.
|
||||
- Новый `POST /api/files/prepare` принимает `{pr,size,mm}`, проверяет Ed25519 подпись существующей сессии, возвращает `uploadUrl` / `requiredHeaders` или `exists=true`.
|
||||
- Клиент напрямую делает один PUT в Cloudflare R2 (без проксирования байтов Java), максимальный размер 500 МиБ, без Multipart.
|
||||
- Для публичных вложений нет встроенного медиа-превью — только файловые карточки и прямые URL; в DM просмотрщик не меняется.
|
||||
- Для новых Arweave-вложений считаем `pr` и сохраняем `mm`, но аватары и транзакции прошлых версий остаются на SHA-256.
|
||||
|
||||
## Конфигурация Java-сервера
|
||||
|
||||
В защищённом окружении процесса Java задать:
|
||||
|
||||
```
|
||||
R2_ENDPOINT=https://<account_id>.r2.cloudflarestorage.com
|
||||
R2_ACCESS_KEY_ID=<secret>
|
||||
R2_SECRET_ACCESS_KEY=<secret>
|
||||
```
|
||||
|
||||
И `r2.publicBucket=shine-files` в обычной конфигурации. Убедиться, что используется endpoint юрисдикции, соответствующей bucket. Значения в Git НЕ добавлять.
|
||||
|
||||
Cloudflare CORS bucket `shine-files` должен позволять `PUT`, `GET`, `HEAD` с origins SHiNE и с заголовками **Content-Type, If-None-Match** (можно `AllowedHeaders: ["*"]`). Для тестового UI-домена добавить соответствующий origin в Cloudflare CORS; Java API в патче разрешает `https://test.shineup.me` наряду с основным доменом. Custom Domain: `https://files.shineup.me`.
|
||||
|
||||
## Запрос подписанного разрешения
|
||||
|
||||
```
|
||||
POST /api/files/prepare
|
||||
Content-Type: application/json
|
||||
X-Shine-Session-Id: <sessionId>
|
||||
X-Shine-Time-Ms: <epoch-ms>
|
||||
X-Shine-Signature: <Ed25519 signature>
|
||||
|
||||
{"pr":"<43-char-base64url>","size":12345,"mm":"video/mp4"}
|
||||
```
|
||||
|
||||
Подпись по UTF-8 строке:
|
||||
|
||||
```
|
||||
PUBLIC_R2_PREPARE_V1:<sessionId>:<pr>:<size>:<mm>:<epoch-ms>
|
||||
```
|
||||
|
||||
От сервера клиент получает `requiredHeaders`: передать **ровно эти заголовки** при PUT в `uploadUrl`. `If-None-Match: *` запрещает перезапись. Ключи API никогда не отправляются клиенту.
|
||||
|
||||
## Тесты
|
||||
|
||||
```
|
||||
node scripts/tests/test-r2-file-preparation.mjs
|
||||
python3 scripts/check_docs.py
|
||||
./gradlew compileJava test
|
||||
```
|
||||
|
||||
В среде подготовки патча проверки JavaScript и документации прошли. **Java-сборку нельзя было завершить**: Gradle Wrapper хотел скачать Gradle 8.14 с `services.gradle.org`, но сеть контейнера недоступна. Выполнить Gradle-сборку и сквозной тест реального R2 **до production deploy**. Реальный R2 не тестировался.
|
||||
|
||||
## Риски, которые остаются в MVP
|
||||
|
||||
- Клиент задаёт `pr`; сервер не пересчитывает хеш содержимого. Возможна первоначальная подмена объекта под заявленным ключом; проверка размера и `If-None-Match` не решают эту проблему полностью. Для доверенной дедупликации нужна независимая проверка или механизм карантина.
|
||||
- Сервер проверяет **заявленный** размер до подписи, но простой Presigned PUT сам по себе не обеспечивает строгий лимит фактически переданных байтов. Обязательно ограничить расходы/злоупотребления в окружении R2; для публичного production это отдельный вопрос безопасности.
|
||||
- Один PUT при обрыве загружается заново. Multipart пока исключён по согласованию.
|
||||
- Для тестового домена нужны правильные CORS origins; кэширование Cloudflare необязательно.
|
||||
@@ -1,7 +1,29 @@
|
||||
# SHiNE
|
||||
|
||||
## План запуска DAO
|
||||
SHiNE — проект децентрализованного общения: браузерный клиент, сервер, пользовательские блокчейны, личные сообщения и интеграция с Solana и Arweave. Репозиторий содержит также экспериментальные компоненты для ESP32 и браузерное расширение кошелька.
|
||||
|
||||
План запуска DAO зафиксирован в [DAO_запуск/README.md](DAO_запуск/README.md).
|
||||
> **Статус:** активная разработка и подготовка к публичному запуску. Исходный код доступен для изучения; самостоятельный запуск возможен, но инструкции по установке ещё дорабатываются. Не все описанные в планах возможности реализованы.
|
||||
|
||||
Это рабочий список задач по `этап1` и `этап2`. Дальше ведём его как основной чек-лист запуска DAO и отмечаем в нём выполненные пункты по мере готовности.
|
||||
## Как устроен проект
|
||||
|
||||
| Компонент | Назначение |
|
||||
| --- | --- |
|
||||
| [`shine-UI/`](shine-UI/) | Браузерный клиент и панель администратора сервера |
|
||||
| [`SHiNE-server/`](SHiNE-server/) | WebSocket/HTTP сервер, PostgreSQL, блокчейн, доставка сообщений |
|
||||
| [`shine-solana/shine/`](shine-solana/shine/) | Anchor-программы и инструменты Solana |
|
||||
| [`SHiNE-browser-plugin-wallet/`](SHiNE-browser-plugin-wallet/) | Браузерное расширение кошелька |
|
||||
| [`ESP32/`](ESP32/) | Прошивки и прототипы устройств |
|
||||
| [`deploy/`](deploy/) | Скрипты и инструкции по развёртыванию |
|
||||
|
||||
Архитектура и границы компонентов описаны в [общей схеме](docs/ARCHITECTURE.md). Пользовательские блоки проектируются для публикации в Arweave; подробности и текущие ограничения тестового контура приведены в [документации блокчейна](docs/Blockchain/README.md).
|
||||
|
||||
## Самостоятельный запуск
|
||||
|
||||
Основной сервер собирается Gradle из корня репозитория. Для локального запуска предусмотрены `./gradlew startLocal` и `./gradlew startLocalWithBuild`; состав и требования этих задач зависят от локальной конфигурации. Начните с [инструкций по развёртыванию](deploy/README.md) и [примера настроек](application.properties.example). Клиент находится в `shine-UI/`. Публичное пошаговое руководство по установке всего комплекса ещё готовится.
|
||||
|
||||
## Документация
|
||||
|
||||
- [Каталог документации](docs/README.md) — действующие спецификации, инструкции и планы.
|
||||
- [Общая архитектура](docs/ARCHITECTURE.md) — компоненты и потоки данных.
|
||||
- [API](docs/API/09_Operations_Index.md), [формат блокчейна](docs/Blockchain/README.md), [личные сообщения](docs/Personal_Messages/README.md), [Solana](docs/Solana_Architecture/README.md).
|
||||
- [Правила обновления документации](docs/CONTRIBUTING_DOCS.md).
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
"": {
|
||||
"name": "shine-browser-plugin-wallet",
|
||||
"version": "1.0.0",
|
||||
"license": "ISC",
|
||||
"license": "UNLICENSED",
|
||||
"dependencies": {
|
||||
"@noble/curves": "^1.5.0",
|
||||
"@solana/web3.js": "^1.98.4"
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "shine-browser-plugin-wallet",
|
||||
"version": "1.0.0",
|
||||
"private": true,
|
||||
"description": "Chrome-compatible Manifest V3 plugin for SHiNE wallet-session login.",
|
||||
"main": "popup.js",
|
||||
"scripts": {
|
||||
@@ -8,7 +9,7 @@
|
||||
},
|
||||
"keywords": [],
|
||||
"author": "",
|
||||
"license": "ISC",
|
||||
"license": "UNLICENSED",
|
||||
"dependencies": {
|
||||
"@noble/curves": "^1.5.0",
|
||||
"@solana/web3.js": "^1.98.4"
|
||||
|
||||
@@ -15,6 +15,17 @@ SHiNE-server — серверная часть мессенджера SHiNE: Web
|
||||
- `shine-server-config/` — конфигурация сервера
|
||||
- `shine-server-log/` — логирование
|
||||
- `shine-server-geo/` — геолокация IP
|
||||
- `shine-server-solana-users-sync/` — синхронизация PDA Solana в серверные данные
|
||||
- `shine-server-archive/` — публикация/импорт Arweave и workflow бесплатной регистрации
|
||||
|
||||
## Документация при изменении кода
|
||||
|
||||
- Новая или изменённая WS-операция: обновить профильный документ `../docs/API/` и `../docs/API/09_Operations_Index.md`; список зарегистрированных операций сверять с `JsonHandlerRegistry.java`.
|
||||
- Формат блока, правила проверки или публикации: обновить `../docs/Blockchain/` и журнал изменений этого раздела.
|
||||
- Доставка или формат DM: обновить затронутые документы из `../docs/Personal_Messages/README.md`.
|
||||
- Синхронизация Solana users: обновить `../docs/Solana/SOLANA_USERS_SYNC_MODULE_DESIGN.md` и `../deploy/SOLANA_USERS_SYNC_SERVER_SETUP.md`.
|
||||
- Регистрация с email, namespace или Arweave-сертификатами: обновить действующие документы в `../docs/registration-v2/`, а исторические планы явно оставлять помеченными как история.
|
||||
- Изменение локального запуска или конфигурации: обновить корневой `../README.md`, `../docs/ARCHITECTURE.md` либо `../deploy/README.md` по затронутой теме.
|
||||
|
||||
## Настройка сервера в Solana (Solana PDA)
|
||||
|
||||
|
||||
+66
-9
@@ -10,6 +10,7 @@ import org.slf4j.LoggerFactory;
|
||||
import server.logic.ws_protocol.JSON.handlers.blockchain.Net_AddBlock_Handler;
|
||||
import server.sync.BlockchainResyncGuard;
|
||||
import shine.db.DbController;
|
||||
import shine.db.KeyEncodingUtil;
|
||||
import utils.config.AppConfig;
|
||||
import shine.db.dao.ArweaveBlockImportDAO;
|
||||
import shine.db.dao.BlockchainStateDAO;
|
||||
@@ -19,6 +20,7 @@ import shine.db.dao.CanonicalChainResolver;
|
||||
import shine.db.dao.ChannelReadStateDAO;
|
||||
import shine.db.dao.BlockchainResyncCleanupDAO;
|
||||
import shine.db.dao.SolanaUserPdaCurrentDAO;
|
||||
import shine.db.dao.RegistrationIdentityDAO;
|
||||
import shine.db.entities.BlockchainStateEntry;
|
||||
import shine.db.entities.SolanaUserPdaCurrentEntry;
|
||||
|
||||
@@ -225,7 +227,7 @@ public final class ArweaveBlockSyncService {
|
||||
if (pending.isEmpty()) break;
|
||||
for (ArweaveBlockImportDAO.QueueItem q : pending) {
|
||||
if (q.parsedLogin() == null || q.parsedForkNumber() == null || q.parsedBlockNumber() == null) continue;
|
||||
SolanaUserPdaCurrentEntry activeUser = usersDAO.getByLogin(q.parsedLogin());
|
||||
SolanaUserPdaCurrentEntry activeUser = resolveChainOwnerByLogin(q.parsedLogin());
|
||||
if (activeUser == null || activeUser.getBlockchainName() == null || activeUser.getBlockchainName().isBlank()) {
|
||||
importDAO.setPendingError(q.dataItemId(), "active_user_missing", System.currentTimeMillis());
|
||||
continue;
|
||||
@@ -257,7 +259,7 @@ public final class ArweaveBlockSyncService {
|
||||
progress = true;
|
||||
continue;
|
||||
}
|
||||
SolanaUserPdaCurrentEntry physicalUser = usersDAO.getByBlockchainKey(item.owner32());
|
||||
SolanaUserPdaCurrentEntry physicalUser = resolveChainOwnerByBlockchainKey(item.owner32());
|
||||
if (physicalUser == null || physicalUser.getBlockchainName() == null
|
||||
|| !q.parsedLogin().equalsIgnoreCase(physicalUser.getLogin())
|
||||
|| forkOf(physicalUser.getBlockchainName()) != q.parsedForkNumber()) {
|
||||
@@ -335,7 +337,7 @@ public final class ArweaveBlockSyncService {
|
||||
if (!item.verifySignature()) throw new IllegalArgumentException("bad ANS-104 signature");
|
||||
BchBlockEntry b = new BchBlockEntry(raw);
|
||||
|
||||
SolanaUserPdaCurrentEntry owner = usersDAO.getByBlockchainKey(item.owner32());
|
||||
SolanaUserPdaCurrentEntry owner = resolveChainOwnerByBlockchainKey(item.owner32());
|
||||
if (owner == null || owner.getBlockchainName() == null || owner.getLogin() == null) {
|
||||
importDAO.setPendingError(id, "unknown_owner", System.currentTimeMillis());
|
||||
continue;
|
||||
@@ -352,7 +354,7 @@ public final class ArweaveBlockSyncService {
|
||||
if (fork <= 1) throw new IllegalArgumentException("TECH_FORK cannot belong to fork1");
|
||||
if (b.blockNumber != fb.forkPointBlockNumber + 1)
|
||||
throw new IllegalArgumentException("TECH_FORK block number/fork point mismatch");
|
||||
SolanaUserPdaCurrentEntry parent = usersDAO.getByBlockchainKey(fb.parentBlockchainKey32);
|
||||
SolanaUserPdaCurrentEntry parent = resolveChainOwnerByBlockchainKey(fb.parentBlockchainKey32);
|
||||
if (parent == null || parent.getBlockchainName() == null
|
||||
|| !owner.getLogin().equalsIgnoreCase(parent.getLogin()))
|
||||
throw new IllegalArgumentException("TECH_FORK parent owner mismatch");
|
||||
@@ -388,9 +390,64 @@ public final class ArweaveBlockSyncService {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Обычный пользователь подтверждается текущим Solana PDA. У бесплатной регистрации PDA
|
||||
* намеренно отсутствует: её проверяемая идентичность хранится в сертификате. Для обеих
|
||||
* моделей импортёр должен сопоставить ANS-104 owner с уже проверенной локальной записью,
|
||||
* иначе блоки FREE_CERT никогда не смогут попасть на другой сервер.
|
||||
*/
|
||||
private SolanaUserPdaCurrentEntry resolveChainOwnerByLogin(String login) throws SQLException {
|
||||
SolanaUserPdaCurrentEntry solana = usersDAO.getByLogin(login);
|
||||
if (solana != null) return solana;
|
||||
|
||||
RegistrationIdentityDAO.ResolvedIdentity identity = RegistrationIdentityDAO.getInstance().get(login);
|
||||
if (identity == null || !identity.isFree() || identity.blockchainKey() == null || identity.blockchainKey().isBlank()) {
|
||||
return null;
|
||||
}
|
||||
return freeCertificateOwner(identity.fullLogin(), identity.blockchainKey());
|
||||
}
|
||||
|
||||
private SolanaUserPdaCurrentEntry resolveChainOwnerByBlockchainKey(byte[] owner32) throws SQLException {
|
||||
SolanaUserPdaCurrentEntry solana = usersDAO.getByBlockchainKey(owner32);
|
||||
if (solana != null) return solana;
|
||||
if (owner32 == null || owner32.length != 32) return null;
|
||||
|
||||
String blockchainKey = KeyEncodingUtil.encodeBase58(owner32);
|
||||
try (Connection c = DbController.getInstance().getConnection();
|
||||
PreparedStatement ps = c.prepareStatement("""
|
||||
SELECT login, blockchain_key
|
||||
FROM user_identity_current
|
||||
WHERE registration_status='FREE_CERT' AND blockchain_key=?
|
||||
LIMIT 1
|
||||
""")) {
|
||||
ps.setString(1, blockchainKey);
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
return rs.next() ? freeCertificateOwner(rs.getString("login"), rs.getString("blockchain_key")) : null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private SolanaUserPdaCurrentEntry resolveChainOwnerByBlockchainName(String blockchainName) throws SQLException {
|
||||
SolanaUserPdaCurrentEntry solana = usersDAO.getByBlockchainName(blockchainName);
|
||||
if (solana != null) return solana;
|
||||
if (blockchainName == null || !blockchainName.endsWith("-001")) return null;
|
||||
String login = blockchainName.substring(0, blockchainName.length() - 4);
|
||||
SolanaUserPdaCurrentEntry free = resolveChainOwnerByLogin(login);
|
||||
return free != null && blockchainName.equalsIgnoreCase(free.getBlockchainName()) ? free : null;
|
||||
}
|
||||
|
||||
private static SolanaUserPdaCurrentEntry freeCertificateOwner(String login, String blockchainKey) {
|
||||
SolanaUserPdaCurrentEntry owner = new SolanaUserPdaCurrentEntry();
|
||||
owner.setLogin(login);
|
||||
owner.setBlockchainName(login.toLowerCase(Locale.ROOT) + "-001");
|
||||
owner.setBlockchainKey(KeyEncodingUtil.base58KeyToBase64_32(blockchainKey));
|
||||
owner.setPaidLimitBytes(0L);
|
||||
return owner;
|
||||
}
|
||||
|
||||
private void ensureState(SolanaUserPdaCurrentEntry user, BchBlockEntry firstSeen) throws Exception {
|
||||
int fork=forkOf(user.getBlockchainName()); BlockchainStateEntry s=new BlockchainStateEntry();
|
||||
s.setBlockchainName(user.getBlockchainName());s.setLogin(user.getLogin());s.setBlockchainKey(user.getBlockchainKey());s.setSizeLimit(user.getPaidLimitBytes()>0?user.getPaidLimitBytes():100_000L);s.setFileSizeBytes(0L);
|
||||
s.setBlockchainName(user.getBlockchainName());s.setLogin(user.getLogin());s.setBlockchainKey(user.getBlockchainKey());s.setSizeLimit(user.getPaidLimitBytes());s.setFileSizeBytes(0L);
|
||||
BlockchainForkSegmentsDAO.Segment seg=segmentsDAO.get(user.getLogin(),fork);
|
||||
BlockchainStateEntry existing=stateDAO.getByBlockchainName(user.getBlockchainName());
|
||||
if(existing!=null && (seg==null || seg.parentForkNumber()==null || existing.getLastBlockNumber()>=seg.forkPointBlockNumber()))return;
|
||||
@@ -414,7 +471,7 @@ public final class ArweaveBlockSyncService {
|
||||
while(rs.next())logins.add(rs.getString(1));
|
||||
}
|
||||
for(String login:logins){
|
||||
SolanaUserPdaCurrentEntry u=usersDAO.getByLogin(login);
|
||||
SolanaUserPdaCurrentEntry u=resolveChainOwnerByLogin(login);
|
||||
if(u==null||u.getBlockchainName()==null)continue;
|
||||
replayDurableCanonicalStaging(login,forkOf(u.getBlockchainName()));
|
||||
}
|
||||
@@ -477,17 +534,17 @@ public final class ArweaveBlockSyncService {
|
||||
if(last<0)throw new IllegalStateException("canonical staging is empty for "+login);
|
||||
}
|
||||
private void replayDurableCanonicalStaging(String login,int activeFork)throws Exception{
|
||||
SolanaUserPdaCurrentEntry u=usersDAO.getByLogin(login);if(u==null)throw new IllegalStateException("user missing for canonical rebuild: "+login);
|
||||
SolanaUserPdaCurrentEntry u=resolveChainOwnerByLogin(login);if(u==null)throw new IllegalStateException("user missing for canonical rebuild: "+login);
|
||||
String activeName=u.getBlockchainName();boolean guard=BlockchainResyncGuard.tryBegin(activeName);if(!guard)throw new IllegalStateException("canonical rebuild already active: "+login);
|
||||
try{
|
||||
validateGenericStaging(login);
|
||||
cleanupDAO.cleanupLoginForCanonicalReplay(login);
|
||||
long limit=u.getPaidLimitBytes()>0?u.getPaidLimitBytes():100_000L,cumulative=0;int currentFork=-1,prevNumber=-1;byte[] prevHash=null;
|
||||
long cumulative=0;int currentFork=-1,prevNumber=-1;byte[] prevHash=null;
|
||||
try(Connection c=DbController.getInstance().getConnection();PreparedStatement ps=c.prepareStatement("SELECT logical_block_number,physical_fork_number,block_bytes,block_hash FROM canonical_rebuild_staging WHERE LOWER(login)=LOWER(?) ORDER BY logical_block_number ASC")){
|
||||
ps.setString(1,login);try(ResultSet rs=ps.executeQuery()){while(rs.next()){
|
||||
int n=rs.getInt(1),f=rs.getInt(2);byte[] raw=rs.getBytes(3),hash=rs.getBytes(4);BchBlockEntry b=new BchBlockEntry(raw);
|
||||
String bch=login+"-"+String.format("%03d",f);
|
||||
if(f!=currentFork){BlockchainStateEntry st=new BlockchainStateEntry();st.setBlockchainName(bch);st.setLogin(login);st.setBlockchainKey(Base64.getEncoder().encodeToString(b.getOwner32()));st.setSizeLimit(limit);st.setFileSizeBytes(cumulative);st.setLastBlockNumber(prevNumber);st.setLastBlockHash(prevHash);st.setUpdatedAtMs(System.currentTimeMillis());stateDAO.insertIfMissing(st);currentFork=f;}
|
||||
if(f!=currentFork){SolanaUserPdaCurrentEntry forkOwner=resolveChainOwnerByBlockchainName(bch);long limit=forkOwner==null?0L:forkOwner.getPaidLimitBytes();BlockchainStateEntry st=new BlockchainStateEntry();st.setBlockchainName(bch);st.setLogin(login);st.setBlockchainKey(Base64.getEncoder().encodeToString(b.getOwner32()));st.setSizeLimit(limit);st.setFileSizeBytes(cumulative);st.setLastBlockNumber(prevNumber);st.setLastBlockHash(prevHash);st.setUpdatedAtMs(System.currentTimeMillis());stateDAO.insertIfMissing(st);currentFork=f;}
|
||||
Net_AddBlock_Handler.ArweaveImportResult r=addBlock.addBlockFromReplay(bch,raw);if(!r.ok())throw new IllegalStateException("canonical Arweave rebuild rejected #"+n+": "+r.reasonCode());
|
||||
cumulative+=raw.length;prevNumber=n;prevHash=hash;
|
||||
}}
|
||||
|
||||
+9
-3
@@ -33,7 +33,9 @@ public final class FreeRegistrationApiBootstrap {
|
||||
FreeRegistrationPublisher publisher=null;
|
||||
RegistrationEmailSender emailSender=null;
|
||||
AllowedEmailDomains allowedEmailDomains=null;
|
||||
if (cfg.getBoolean("freeRegistration.enabled",false)) {
|
||||
String freeNamespace=cfg.getStringOrEmpty("freeRegistration.namespace").trim();
|
||||
boolean freeRegistrationEnabled=cfg.getBoolean("freeRegistration.enabled",false) && !freeNamespace.isEmpty();
|
||||
if (freeRegistrationEnabled) {
|
||||
String domainsFile = cfg.getStringOrEmpty("freeRegistration.email.allowedDomainsFile");
|
||||
if (domainsFile.isBlank()) domainsFile = "allowed-email-domains.txt";
|
||||
// Относительный путь — от WorkingDirectory процесса Java.
|
||||
@@ -44,6 +46,8 @@ public final class FreeRegistrationApiBootstrap {
|
||||
if(transport.publishMode()!=ArweaveBlocksConfig.PublishMode.TURBO)
|
||||
throw new IllegalStateException("Free registration requires Turbo transport");
|
||||
newSigner=LocalRegistrarSigner.fromConfig(cfg);
|
||||
FreeRegistrationIssuer.validateConfiguredNamespace(dbSource(), newSigner, freeNamespace,
|
||||
cfg.getStringOrEmpty("server.SHiNE.login"));
|
||||
issuer=new FreeRegistrationIssuer(dbSource(),newSigner,allowEmailReuse);
|
||||
publisher=new FreeRegistrationPublisher(issuer,new TurboDataItemUploader(transport),
|
||||
new VerifiedFreeRegistrationImporter(allowEmailReuse));
|
||||
@@ -58,7 +62,8 @@ public final class FreeRegistrationApiBootstrap {
|
||||
}
|
||||
FreeRegistrationWorkflow newWorkflow=new FreeRegistrationWorkflow(issuer,publisher,emailSender,
|
||||
cfg.getBoolean("freeRegistration.email.allowTestCode",false),
|
||||
cfg.getBoolean("freeRegistration.email.allowReuse",false), allowedEmailDomains);
|
||||
cfg.getBoolean("freeRegistration.email.allowReuse",false), allowedEmailDomains,
|
||||
freeRegistrationEnabled ? freeNamespace : "");
|
||||
RegistrationApiBridge.install((op,req)->dispatch(newWorkflow,op,req));
|
||||
signer=newSigner; workflow=newWorkflow;
|
||||
}
|
||||
@@ -74,7 +79,7 @@ public final class FreeRegistrationApiBootstrap {
|
||||
case "GetNamespaces" -> {
|
||||
out.put("namespaces",w.listNamespaces().stream().map(ns->Map.of(
|
||||
"name",ns.namespace(), "type",ns.type(), "minLocalLength",ns.minLoginLength(),
|
||||
"registrationFeeLamports",ns.priceLamports(), "defaultServerLogin",ns.serverLogin()==null?"":ns.serverLogin()
|
||||
"registrationFeeLamports",ns.priceLamports(), "currencyCode",ns.currencyCode(), "defaultServerLogin",ns.serverLogin()==null?"":ns.serverLogin()
|
||||
)).toList());
|
||||
}
|
||||
case "CheckRegistrationLogin" -> {
|
||||
@@ -83,6 +88,7 @@ public final class FreeRegistrationApiBootstrap {
|
||||
out.put("namespaceType",info.namespaceType());
|
||||
out.put("minLocalLength",info.minLocalLength());
|
||||
out.put("registrationFeeLamports",info.registrationFeeLamports());
|
||||
out.put("currencyCode",info.currencyCode());
|
||||
}
|
||||
case "CheckRegistrationEmail" -> {
|
||||
var check=w.checkEmail(req.getEmail());
|
||||
|
||||
+24
@@ -24,6 +24,30 @@ public final class FreeRegistrationIssuer {
|
||||
this.allowEmailReuse = allowEmailReuse;
|
||||
}
|
||||
|
||||
/** Проверяет привязку локального ключа и сервера до открытия бесплатной регистрации. */
|
||||
static void validateConfiguredNamespace(DataSource db, RegistrarSigner signer, String namespace,
|
||||
String localServerLogin) throws Exception {
|
||||
if (localServerLogin == null || localServerLogin.isBlank())
|
||||
throw new IllegalStateException("server.SHiNE.login is required for free registration");
|
||||
try (Connection conn = db.getConnection();
|
||||
PreparedStatement statement = conn.prepareStatement("""
|
||||
SELECT namespace_type, registrar_pubkey, default_server_login
|
||||
FROM shine_namespace_current WHERE namespace = ?
|
||||
""")) {
|
||||
statement.setString(1, namespace);
|
||||
try (ResultSet rs = statement.executeQuery()) {
|
||||
if (!rs.next() || rs.getInt("namespace_type") != 2)
|
||||
throw new IllegalStateException("Configured free registration namespace is unavailable");
|
||||
byte[] namespaceKey = Base58Util.decode(rs.getString("registrar_pubkey"));
|
||||
if (!Arrays.equals(namespaceKey, signer.publicKey32()))
|
||||
throw new IllegalStateException("Registrar public key does not match configured namespace");
|
||||
String namespaceServer = rs.getString("default_server_login");
|
||||
if (namespaceServer == null || !namespaceServer.equalsIgnoreCase(localServerLogin.trim()))
|
||||
throw new IllegalStateException("Configured free namespace belongs to another access server");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** Выдаётся только после успешной проверки challenge в FreeRegistrationWorkflow. */
|
||||
synchronized byte[] issue(String fullLogin, byte[] root32, byte[] blockchain32,
|
||||
byte[] client32, String email) throws Exception {
|
||||
|
||||
+36
-13
@@ -15,9 +15,9 @@ import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
/** Внутренний state machine публичных операций регистрации v2. */
|
||||
public final class FreeRegistrationWorkflow {
|
||||
public record NamespaceInfo(String namespace, int type, int minLoginLength, String priceLamports, String serverLogin) {}
|
||||
public record NamespaceInfo(String namespace, int type, int minLoginLength, String priceLamports, int currencyCode, String serverLogin) {}
|
||||
public record Availability(boolean nameFree, boolean emailHashFree) {}
|
||||
public record LoginCheck(boolean loginAvailable, int namespaceType, int minLocalLength, String registrationFeeLamports) {}
|
||||
public record LoginCheck(boolean loginAvailable, int namespaceType, int minLocalLength, String registrationFeeLamports, int currencyCode) {}
|
||||
public record EmailCheck(boolean emailAvailable, String emailStatus) {}
|
||||
public record Started(String challengeId, long expiresAtMs) {}
|
||||
public record Completed(String fullLogin, String dataItemId, String state, boolean alreadyImported) {}
|
||||
@@ -51,10 +51,12 @@ public final class FreeRegistrationWorkflow {
|
||||
private final boolean allowTestCode;
|
||||
private final boolean allowEmailReuse;
|
||||
private final AllowedEmailDomains allowedEmailDomains;
|
||||
/** Единственный type-2 namespace, для которого этот сервер является регистратором. */
|
||||
private final String freeRegistrationNamespace;
|
||||
|
||||
public FreeRegistrationWorkflow(FreeRegistrationIssuer issuer, FreeRegistrationPublisher publisher,
|
||||
RegistrationEmailSender emailSender, boolean allowTestCode, boolean allowEmailReuse,
|
||||
AllowedEmailDomains allowedEmailDomains) {
|
||||
AllowedEmailDomains allowedEmailDomains, String freeRegistrationNamespace) {
|
||||
if ((issuer == null) != (publisher == null)) throw new IllegalArgumentException("Signer/publisher mismatch");
|
||||
if (issuer != null && emailSender == null) throw new IllegalArgumentException("Email sender is required");
|
||||
if (emailSender != null && allowedEmailDomains == null)
|
||||
@@ -65,11 +67,24 @@ public final class FreeRegistrationWorkflow {
|
||||
this.emailSender = emailSender;
|
||||
this.allowTestCode = allowTestCode;
|
||||
this.allowEmailReuse = allowEmailReuse;
|
||||
this.freeRegistrationNamespace = normalizeConfiguredNamespace(freeRegistrationNamespace);
|
||||
}
|
||||
public FreeRegistrationWorkflow(FreeRegistrationIssuer issuer, FreeRegistrationPublisher publisher,
|
||||
RegistrationEmailSender emailSender, boolean allowTestCode, boolean allowEmailReuse,
|
||||
AllowedEmailDomains allowedEmailDomains) {
|
||||
this(issuer, publisher, emailSender, allowTestCode, allowEmailReuse, allowedEmailDomains, "");
|
||||
}
|
||||
private static String normalizeConfiguredNamespace(String value) {
|
||||
String namespace = value == null ? "" : value.trim();
|
||||
if (namespace.isEmpty()) return "";
|
||||
if (!namespace.matches("[a-z0-9_]+"))
|
||||
throw new IllegalArgumentException("Free registration namespace must use lowercase ASCII letters, digits or _");
|
||||
return namespace;
|
||||
}
|
||||
public FreeRegistrationWorkflow(FreeRegistrationIssuer issuer, FreeRegistrationPublisher publisher,
|
||||
RegistrationEmailSender emailSender, boolean allowTestCode, boolean allowEmailReuse) {
|
||||
this(issuer, publisher, emailSender, allowTestCode, allowEmailReuse,
|
||||
emailSender == null ? null : loadDefaultEmailDomains());
|
||||
emailSender == null ? null : loadDefaultEmailDomains(), "");
|
||||
}
|
||||
private static AllowedEmailDomains loadDefaultEmailDomains() {
|
||||
try {
|
||||
@@ -93,11 +108,16 @@ public final class FreeRegistrationWorkflow {
|
||||
List<NamespaceInfo> result = new ArrayList<>();
|
||||
try (Connection c = DbController.getInstance().getConnection();
|
||||
PreparedStatement ps = c.prepareStatement("""
|
||||
SELECT namespace,namespace_type,min_localpart_len,registration_fee_lamports,default_server_login
|
||||
FROM shine_namespace_current ORDER BY namespace
|
||||
"""); ResultSet rs = ps.executeQuery()) {
|
||||
while (rs.next()) result.add(new NamespaceInfo(rs.getString(1),rs.getInt(2),rs.getInt(3),
|
||||
rs.getString(4),rs.getString(5)));
|
||||
SELECT namespace,namespace_type,min_localpart_len,registration_fee_lamports,currency_code,default_server_login
|
||||
FROM shine_namespace_current
|
||||
WHERE namespace_type = 1 OR (namespace_type = 2 AND namespace = ?)
|
||||
ORDER BY namespace
|
||||
""")) {
|
||||
ps.setString(1, freeRegistrationNamespace);
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
while (rs.next()) result.add(new NamespaceInfo(rs.getString(1),rs.getInt(2),rs.getInt(3),
|
||||
rs.getString(4),rs.getInt(5),rs.getString(6)));
|
||||
}
|
||||
}
|
||||
return List.copyOf(result);
|
||||
}
|
||||
@@ -105,18 +125,21 @@ public final class FreeRegistrationWorkflow {
|
||||
FreeRegistrationCertificateV1.validateLogin(login);
|
||||
String namespace=login.substring(login.indexOf('@')+1);
|
||||
try (Connection c=DbController.getInstance().getConnection()) {
|
||||
int type, minimum; String fee;
|
||||
try (PreparedStatement p=c.prepareStatement("SELECT namespace_type,min_localpart_len,registration_fee_lamports FROM shine_namespace_current WHERE namespace=?")) {
|
||||
int type, minimum, currencyCode; String fee;
|
||||
try (PreparedStatement p=c.prepareStatement("SELECT namespace_type,min_localpart_len,registration_fee_lamports,currency_code FROM shine_namespace_current WHERE namespace=?")) {
|
||||
p.setString(1,namespace);
|
||||
try (ResultSet rs=p.executeQuery()) {
|
||||
if (!rs.next()) throw new IllegalArgumentException("Namespace is unavailable");
|
||||
type=rs.getInt(1); minimum=rs.getInt(2); fee=rs.getString(3);
|
||||
type=rs.getInt(1); minimum=rs.getInt(2); fee=rs.getString(3); currencyCode=rs.getInt(4);
|
||||
if (type == 2 && !namespace.equals(freeRegistrationNamespace))
|
||||
throw new IllegalArgumentException("Free registration is unavailable for this namespace");
|
||||
if (currencyCode != 1) throw new IllegalStateException("Unsupported namespace currency");
|
||||
if (login.indexOf('@') < minimum) throw new IllegalArgumentException("Login shorter than namespace minimum");
|
||||
}
|
||||
}
|
||||
try (PreparedStatement p=c.prepareStatement("SELECT 1 FROM user_identity_current WHERE normalized_login=?")) {
|
||||
p.setString(1, login.toLowerCase(java.util.Locale.ROOT));
|
||||
try (ResultSet rs=p.executeQuery()) { return new LoginCheck(!rs.next(),type,minimum,fee); }
|
||||
try (ResultSet rs=p.executeQuery()) { return new LoginCheck(!rs.next(),type,minimum,fee,currencyCode); }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+5
-2
@@ -122,9 +122,12 @@ public final class VerifiedFreeRegistrationImporter {
|
||||
INSERT INTO blockchain_state_store (
|
||||
login, fork_number, blockchain_key, size_limit, file_size_bytes,
|
||||
last_block_number, last_block_hash, updated_at_ms)
|
||||
VALUES (?, 1, ?, 100000, 0, -1, ?, ?)
|
||||
VALUES (?, 1, ?, 0, 0, -1, ?, ?)
|
||||
""")) {
|
||||
insert.setString(1, login);
|
||||
// blockchain_state — техническая проекция chain: её ключ
|
||||
// совпадает с normalized_login и blockchain_name, а не с
|
||||
// отображаемым написанием login в сертификате.
|
||||
insert.setString(1, login.toLowerCase(java.util.Locale.ROOT));
|
||||
// blockchain_state — runtime-слой: его ключ всегда Base64(32),
|
||||
// как и у пользователей, импортированных из Solana PDA.
|
||||
insert.setString(2, Base64.getEncoder().encodeToString(cert.blockchainKey()));
|
||||
|
||||
+20
@@ -0,0 +1,20 @@
|
||||
package server.archive.registration;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
|
||||
class FreeRegistrationNamespaceConfigurationTest {
|
||||
@Test
|
||||
void acceptsLowercaseNamespaceForLocalFreeRegistration() {
|
||||
assertDoesNotThrow(() -> new FreeRegistrationWorkflow(
|
||||
null, null, null, false, false, null, "testfree"));
|
||||
}
|
||||
|
||||
@Test
|
||||
void rejectsMixedCaseNamespaceInsteadOfSilentlyServingAnotherNamespace() {
|
||||
assertThrows(IllegalArgumentException.class, () -> new FreeRegistrationWorkflow(
|
||||
null, null, null, false, false, null, "TestFree"));
|
||||
}
|
||||
}
|
||||
@@ -18,7 +18,8 @@ public final class BodyRecordParser {
|
||||
|
||||
// TECH supports Header v1 and CreateChannel current format (ver=1).
|
||||
if (t == (CreateChannelBody.TYPE & 0xFFFF)) {
|
||||
if (st == (HeaderBody.SUBTYPE_COMPAT & 0xFFFF) && v == (HeaderBody.VER & 0xFFFF)) {
|
||||
if (st == (HeaderBody.SUBTYPE_COMPAT & 0xFFFF)
|
||||
&& (v == (HeaderBody.VER & 0xFFFF) || v == (HeaderBody.VER_CC0 & 0xFFFF))) {
|
||||
return new HeaderBody(subType, version, bodyBytes).check();
|
||||
}
|
||||
if (st == (CreateChannelBody.SUBTYPE & 0xFFFF)
|
||||
|
||||
+19
@@ -37,6 +37,8 @@ public final class CreateChannelBody implements BodyRecord, BodyHasLine {
|
||||
public static final short CHANNEL_TYPE_VERSION_DEFAULT = 1;
|
||||
|
||||
private static final byte[] ZERO32 = new byte[32];
|
||||
// Минимум для создания нового канала; исторические блоки 1–3 символа читаются.
|
||||
public static final int MIN_NAME_LENGTH_FOR_CREATE = 4;
|
||||
private static final int MAX_NAME_LENGTH = 32;
|
||||
public static final int MAX_DESCRIPTION_UTF8_LEN = 2048;
|
||||
|
||||
@@ -159,6 +161,20 @@ public final class CreateChannelBody implements BodyRecord, BodyHasLine {
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Правило создания нового TECH_CREATE_CHANNEL (в отличие от чтения истории).
|
||||
* check() намеренно принимает старые каналы с именами из 1–3 символов.
|
||||
*/
|
||||
public CreateChannelBody checkForCreate() {
|
||||
check();
|
||||
String normalizedName = normalizeDisplayName(channelName);
|
||||
int length = normalizedName.codePointCount(0, normalizedName.length());
|
||||
if (length < MIN_NAME_LENGTH_FOR_CREATE) {
|
||||
throw new IllegalArgumentException("channelName length must be 4..32");
|
||||
}
|
||||
return this;
|
||||
}
|
||||
|
||||
private static String normalizeDisplayName(String value) {
|
||||
if (value == null) return "";
|
||||
return value.trim().replaceAll("\\s+", " ");
|
||||
@@ -171,6 +187,9 @@ public final class CreateChannelBody implements BodyRecord, BodyHasLine {
|
||||
|
||||
@Override
|
||||
public byte[] toBytes() {
|
||||
// Новые блоки кодируются только с именем от 4 символов.
|
||||
// Исторические блоки при чтении разбираются без повторного кодирования.
|
||||
checkForCreate();
|
||||
byte[] nameUtf8 = normalizeDisplayName(channelName).getBytes(StandardCharsets.UTF_8);
|
||||
if (nameUtf8.length == 0 || nameUtf8.length > 255) {
|
||||
throw new IllegalArgumentException("channelName utf8 len must be 1..255");
|
||||
|
||||
@@ -9,12 +9,13 @@ import java.util.Arrays;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* HeaderBody — type=0, subType=0, version=1.
|
||||
* HeaderBody — TECH type=0, subType=0; version=1 legacy / version=2 CC0.
|
||||
*
|
||||
* bodyBytes (BigEndian):
|
||||
* [TAG_LEN] tag ASCII
|
||||
* [1] loginLength (uint8)
|
||||
* [N] login UTF-8
|
||||
* [15] ASCII "license:CC0-1.0" (version=2 only)
|
||||
* [32] initialBlockchainKey32
|
||||
*
|
||||
* initialBlockchainKey32 is the public blockchain-signing key that created fork #1.
|
||||
@@ -23,7 +24,11 @@ import java.util.Objects;
|
||||
*/
|
||||
public final class HeaderBody implements BodyRecord {
|
||||
public static final short TYPE = 0;
|
||||
public static final short VER = 1;
|
||||
public static final short VER = 1; // Legacy, read-only for newly created chains
|
||||
public static final short VER_CC0 = 2;
|
||||
public static final String LICENSE_CC0 = "CC0-1.0";
|
||||
public static final String LICENSE_FIELD_CC0 = "license:" + LICENSE_CC0;
|
||||
private static final byte[] LICENSE_BYTES = LICENSE_FIELD_CC0.getBytes(StandardCharsets.US_ASCII);
|
||||
public static final int KEY = ((TYPE & 0xFFFF) << 16) | (VER & 0xFFFF);
|
||||
public static final short SUBTYPE_COMPAT = 0;
|
||||
public static final String TAG = ShineSignatureConstants.BLOCKCHAIN_HEADER_TAG;
|
||||
@@ -36,14 +41,16 @@ public final class HeaderBody implements BodyRecord {
|
||||
public final String tag;
|
||||
public final String login;
|
||||
public final byte[] initialBlockchainKey32;
|
||||
public final String license; // null for legacy HEADER v1
|
||||
|
||||
public HeaderBody(short subType, short version, byte[] bodyBytes) {
|
||||
Objects.requireNonNull(bodyBytes, "bodyBytes == null");
|
||||
this.subType = subType;
|
||||
this.version = version;
|
||||
if ((subType & 0xFFFF) != 0) throw new IllegalArgumentException("HeaderBody subType must be 0");
|
||||
if ((version & 0xFFFF) != (VER & 0xFFFF)) throw new IllegalArgumentException("HeaderBody version must be 1");
|
||||
if (bodyBytes.length < TAG_LEN + 1 + 1 + 32) throw new IllegalArgumentException("HeaderBody too short");
|
||||
if (version != VER && version != VER_CC0) throw new IllegalArgumentException("HeaderBody version must be 1 or 2");
|
||||
if (bodyBytes.length < TAG_LEN + 1 + 1 + 32 + (version == VER_CC0 ? LICENSE_BYTES.length : 0))
|
||||
throw new IllegalArgumentException("HeaderBody too short");
|
||||
|
||||
ByteBuffer bb = ByteBuffer.wrap(bodyBytes).order(ByteOrder.BIG_ENDIAN);
|
||||
byte[] tagBytes = new byte[TAG_LEN];
|
||||
@@ -53,30 +60,52 @@ public final class HeaderBody implements BodyRecord {
|
||||
this.tag = parsedTag;
|
||||
|
||||
int loginLen = Byte.toUnsignedInt(bb.get());
|
||||
if (loginLen <= 0 || bb.remaining() != loginLen + 32) throw new IllegalArgumentException("Bad HeaderBody login/key length");
|
||||
if (loginLen <= 0 || bb.remaining() != loginLen + 32 + (version == VER_CC0 ? LICENSE_BYTES.length : 0))
|
||||
throw new IllegalArgumentException("Bad HeaderBody login/key/license length");
|
||||
byte[] loginBytes = new byte[loginLen];
|
||||
bb.get(loginBytes);
|
||||
this.login = BodyTargetSupport.decodeStrictUtf8(loginBytes, "HeaderBody login");
|
||||
if (version == VER_CC0) {
|
||||
byte[] actual = new byte[LICENSE_BYTES.length];
|
||||
bb.get(actual);
|
||||
if (!Arrays.equals(actual, LICENSE_BYTES)) throw new IllegalArgumentException("Unsupported HEADER license");
|
||||
this.license = LICENSE_CC0;
|
||||
} else {
|
||||
this.license = null;
|
||||
}
|
||||
this.initialBlockchainKey32 = new byte[32];
|
||||
bb.get(this.initialBlockchainKey32);
|
||||
requireNonZeroKey(this.initialBlockchainKey32);
|
||||
if (bb.hasRemaining()) throw new IllegalArgumentException("Unexpected HeaderBody tail");
|
||||
}
|
||||
|
||||
// Legacy constructor is kept for historical fixtures and importing v1 blocks.
|
||||
public HeaderBody(String login, byte[] initialBlockchainKey32) {
|
||||
this(login, initialBlockchainKey32, VER);
|
||||
}
|
||||
|
||||
public static HeaderBody licensedCc0(String login, byte[] initialBlockchainKey32) {
|
||||
return new HeaderBody(login, initialBlockchainKey32, VER_CC0);
|
||||
}
|
||||
|
||||
private HeaderBody(String login, byte[] initialBlockchainKey32, short version) {
|
||||
Objects.requireNonNull(login, "login == null");
|
||||
Objects.requireNonNull(initialBlockchainKey32, "initialBlockchainKey32 == null");
|
||||
this.subType = SUBTYPE_COMPAT;
|
||||
this.version = VER;
|
||||
this.version = version;
|
||||
this.tag = TAG;
|
||||
this.login = login;
|
||||
this.initialBlockchainKey32 = Arrays.copyOf(initialBlockchainKey32, initialBlockchainKey32.length);
|
||||
this.license = version == VER_CC0 ? LICENSE_CC0 : null;
|
||||
check();
|
||||
}
|
||||
|
||||
@Override
|
||||
public HeaderBody check() {
|
||||
if ((subType & 0xFFFF) != 0) throw new IllegalArgumentException("HeaderBody subType must be 0");
|
||||
if (version != VER && version != VER_CC0) throw new IllegalArgumentException("Bad HeaderBody version");
|
||||
if (version == VER_CC0 && !LICENSE_CC0.equals(license)) throw new IllegalArgumentException("Bad HEADER CC0 license");
|
||||
if (version == VER && license != null) throw new IllegalArgumentException("Legacy HEADER must not contain a license");
|
||||
if (login == null || login.isBlank()) throw new IllegalArgumentException("Login is blank");
|
||||
byte[] loginUtf8 = login.getBytes(StandardCharsets.UTF_8);
|
||||
// В HEADER хранится неизменяемое написание зарегистрированного login@namespace.
|
||||
@@ -95,10 +124,11 @@ public final class HeaderBody implements BodyRecord {
|
||||
public byte[] toBytes() {
|
||||
check();
|
||||
byte[] loginUtf8 = login.getBytes(StandardCharsets.UTF_8);
|
||||
ByteBuffer bb = ByteBuffer.allocate(TAG_LEN + 1 + loginUtf8.length + 32).order(ByteOrder.BIG_ENDIAN);
|
||||
ByteBuffer bb = ByteBuffer.allocate(TAG_LEN + 1 + loginUtf8.length + 32 + (version == VER_CC0 ? LICENSE_BYTES.length : 0)).order(ByteOrder.BIG_ENDIAN);
|
||||
bb.put(TAG_ASCII);
|
||||
bb.put((byte) loginUtf8.length);
|
||||
bb.put(loginUtf8);
|
||||
if (version == VER_CC0) bb.put(LICENSE_BYTES);
|
||||
bb.put(initialBlockchainKey32);
|
||||
return bb.array();
|
||||
}
|
||||
@@ -112,6 +142,6 @@ public final class HeaderBody implements BodyRecord {
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "HeaderBody{login='" + login + "', initialBlockchainKey32=<32 bytes>}";
|
||||
return "HeaderBody{version=" + version + ", login='" + login + "', license=" + license + ", initialBlockchainKey32=<32 bytes>}";
|
||||
}
|
||||
}
|
||||
|
||||
+68
@@ -0,0 +1,68 @@
|
||||
package blockchain;
|
||||
|
||||
import blockchain.body.CreateChannelBody;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.ByteOrder;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
final class CreateChannelBodyNameLengthTest {
|
||||
|
||||
private static CreateChannelBody newChannel(String name) {
|
||||
return new CreateChannelBody(
|
||||
0, 0, new byte[32], 1, name, "",
|
||||
CreateChannelBody.CHANNEL_TYPE_PUBLIC,
|
||||
CreateChannelBody.CHANNEL_TYPE_VERSION_DEFAULT
|
||||
);
|
||||
}
|
||||
|
||||
@Test
|
||||
void newChannelMustContainAtLeastFourCharacters() {
|
||||
for (String name : new String[]{"a", "ab", "abc"}) {
|
||||
CreateChannelBody body = newChannel(name);
|
||||
assertDoesNotThrow(body::check, "Исторический декодер не должен блокировать: " + name);
|
||||
assertThrows(IllegalArgumentException.class, body::checkForCreate, name);
|
||||
assertThrows(IllegalArgumentException.class, body::toBytes, name);
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
void fourToThirtyTwoCharactersAreAccepted() {
|
||||
for (String name : new String[]{"abcd", "tantra", "X".repeat(32)}) {
|
||||
CreateChannelBody newBody = newChannel(name);
|
||||
assertDoesNotThrow(newBody::checkForCreate, name);
|
||||
CreateChannelBody fromHistory = assertInstanceOf(
|
||||
CreateChannelBody.class,
|
||||
BodyRecordParser.parse(CreateChannelBody.TYPE, CreateChannelBody.SUBTYPE,
|
||||
CreateChannelBody.VER, newBody.toBytes())
|
||||
);
|
||||
assertEquals(name, fromHistory.channelName);
|
||||
}
|
||||
assertThrows(IllegalArgumentException.class, () -> newChannel("x".repeat(33)).toBytes());
|
||||
}
|
||||
|
||||
@Test
|
||||
void historicalThreeCharacterBlockStillDecodes() {
|
||||
// Байт-в-байт существующий формат, без использования сериализатора новых блоков.
|
||||
byte[] name = "abc".getBytes(StandardCharsets.UTF_8);
|
||||
ByteBuffer raw = ByteBuffer.allocate(4 + 4 + 32 + 4 + 1 + name.length + 2 + 4)
|
||||
.order(ByteOrder.BIG_ENDIAN);
|
||||
raw.putInt(0).putInt(0).put(new byte[32]).putInt(1);
|
||||
raw.put((byte) name.length).put(name);
|
||||
raw.putShort((short) 0);
|
||||
raw.putShort(CreateChannelBody.CHANNEL_TYPE_PUBLIC);
|
||||
raw.putShort(CreateChannelBody.CHANNEL_TYPE_VERSION_DEFAULT);
|
||||
|
||||
CreateChannelBody parsed = assertInstanceOf(
|
||||
CreateChannelBody.class,
|
||||
BodyRecordParser.parse(CreateChannelBody.TYPE, CreateChannelBody.SUBTYPE,
|
||||
CreateChannelBody.VER, raw.array())
|
||||
);
|
||||
assertEquals("abc", parsed.channelName);
|
||||
assertDoesNotThrow(parsed::check);
|
||||
assertThrows(IllegalArgumentException.class, parsed::checkForCreate);
|
||||
}
|
||||
}
|
||||
+35
@@ -108,6 +108,41 @@ final class TargetLoginFormatTest {
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
void licensedHeaderV2IncludesExactCc0ConstantAndParsesAlongsideV1() {
|
||||
HeaderBody v2 = HeaderBody.licensedCc0("Alice@shine", INITIAL_KEY);
|
||||
assertEquals(HeaderBody.VER_CC0, v2.version);
|
||||
assertEquals("CC0-1.0", v2.license);
|
||||
HeaderBody parsed = new HeaderBody(HeaderBody.SUBTYPE_COMPAT, HeaderBody.VER_CC0, v2.toBytes()).check();
|
||||
assertEquals("Alice@shine", parsed.login);
|
||||
assertEquals("CC0-1.0", parsed.license);
|
||||
assertArrayEquals(INITIAL_KEY, parsed.initialBlockchainKey32);
|
||||
assertArrayEquals(v2.toBytes(), parsed.toBytes());
|
||||
|
||||
HeaderBody legacy = new HeaderBody("Alice@shine", INITIAL_KEY);
|
||||
assertNull(new HeaderBody(HeaderBody.SUBTYPE_COMPAT, HeaderBody.VER, legacy.toBytes()).license);
|
||||
assertEquals(legacy.toBytes().length + 15, v2.toBytes().length);
|
||||
byte[] expectedLicenseMarker = "license:CC0-1.0".getBytes(java.nio.charset.StandardCharsets.US_ASCII);
|
||||
int markerOffset = 5 + 1 + "Alice@shine".getBytes(java.nio.charset.StandardCharsets.UTF_8).length;
|
||||
assertArrayEquals(expectedLicenseMarker, java.util.Arrays.copyOfRange(v2.toBytes(), markerOffset, markerOffset + 15));
|
||||
assertArrayEquals(INITIAL_KEY, java.util.Arrays.copyOfRange(v2.toBytes(), markerOffset + 15, v2.toBytes().length));
|
||||
|
||||
byte[] invalid = v2.toBytes();
|
||||
invalid[markerOffset + 8] = (byte)'X';
|
||||
assertThrows(IllegalArgumentException.class,
|
||||
() -> new HeaderBody(HeaderBody.SUBTYPE_COMPAT, HeaderBody.VER_CC0, invalid));
|
||||
assertThrows(IllegalArgumentException.class,
|
||||
() -> new HeaderBody(HeaderBody.SUBTYPE_COMPAT, HeaderBody.VER, v2.toBytes()));
|
||||
assertThrows(IllegalArgumentException.class,
|
||||
() -> new HeaderBody(HeaderBody.SUBTYPE_COMPAT, HeaderBody.VER_CC0, legacy.toBytes()));
|
||||
|
||||
byte[] swapped = v2.toBytes();
|
||||
System.arraycopy(INITIAL_KEY, 0, swapped, markerOffset, 32);
|
||||
System.arraycopy(expectedLicenseMarker, 0, swapped, markerOffset + 32, 15);
|
||||
assertThrows(IllegalArgumentException.class,
|
||||
() -> new HeaderBody(HeaderBody.SUBTYPE_COMPAT, HeaderBody.VER_CC0, swapped));
|
||||
}
|
||||
|
||||
@Test
|
||||
void namespacedHeaderRejectsMalformedOrOversizedLogin() {
|
||||
for (String login : new String[]{"alice@", "@shine", "alice@@free", "alice@FREE", "alice.free@shine", "abcdefghijklmnopqrstuvwxyz@free"}) {
|
||||
|
||||
@@ -30,6 +30,12 @@ public final class DatabaseInitializer {
|
||||
public static final int SCHEMA_VERSION_37 = 37;
|
||||
public static final int SCHEMA_VERSION_38 = 38;
|
||||
public static final int SCHEMA_VERSION_39 = 39;
|
||||
public static final int SCHEMA_VERSION_40 = 40;
|
||||
public static final int SCHEMA_VERSION_41 = 41;
|
||||
public static final int SCHEMA_VERSION_42 = 42;
|
||||
public static final int SCHEMA_VERSION_43 = 43;
|
||||
public static final int SCHEMA_VERSION_44 = 44;
|
||||
public static final int SCHEMA_VERSION_45 = 45;
|
||||
public static final String POSTGRES_SCHEMA_RESOURCE = "postgres/schema_v1.sql";
|
||||
public static final String POSTGRES_MIGRATION_V31_RESOURCE = "postgres/migration_v31.sql";
|
||||
public static final String POSTGRES_MIGRATION_V32_RESOURCE = "postgres/migration_v32.sql";
|
||||
@@ -40,6 +46,12 @@ public final class DatabaseInitializer {
|
||||
public static final String POSTGRES_MIGRATION_V37_RESOURCE = "postgres/migration_v37.sql";
|
||||
public static final String POSTGRES_MIGRATION_V38_RESOURCE = "postgres/migration_v38.sql";
|
||||
public static final String POSTGRES_MIGRATION_V39_RESOURCE = "postgres/migration_v39.sql";
|
||||
public static final String POSTGRES_MIGRATION_V40_RESOURCE = "postgres/migration_v40.sql";
|
||||
public static final String POSTGRES_MIGRATION_V41_RESOURCE = "postgres/migration_v41.sql";
|
||||
public static final String POSTGRES_MIGRATION_V42_RESOURCE = "postgres/migration_v42.sql";
|
||||
public static final String POSTGRES_MIGRATION_V43_RESOURCE = "postgres/migration_v43.sql";
|
||||
public static final String POSTGRES_MIGRATION_V44_RESOURCE = "postgres/migration_v44.sql";
|
||||
public static final String POSTGRES_MIGRATION_V45_RESOURCE = "postgres/migration_v45.sql";
|
||||
|
||||
private DatabaseInitializer() {}
|
||||
|
||||
@@ -167,9 +179,33 @@ public final class DatabaseInitializer {
|
||||
runSqlScript(conn, POSTGRES_MIGRATION_V39_RESOURCE);
|
||||
currentVersion = readCurrentSchemaVersion(conn);
|
||||
}
|
||||
if (currentVersion != SCHEMA_VERSION_39) {
|
||||
if (currentVersion == SCHEMA_VERSION_39) {
|
||||
runSqlScript(conn, POSTGRES_MIGRATION_V40_RESOURCE);
|
||||
currentVersion = readCurrentSchemaVersion(conn);
|
||||
}
|
||||
if (currentVersion == SCHEMA_VERSION_40) {
|
||||
runSqlScript(conn, POSTGRES_MIGRATION_V41_RESOURCE);
|
||||
currentVersion = readCurrentSchemaVersion(conn);
|
||||
}
|
||||
if (currentVersion == SCHEMA_VERSION_41) {
|
||||
runSqlScript(conn, POSTGRES_MIGRATION_V42_RESOURCE);
|
||||
currentVersion = readCurrentSchemaVersion(conn);
|
||||
}
|
||||
if (currentVersion == SCHEMA_VERSION_42) {
|
||||
runSqlScript(conn, POSTGRES_MIGRATION_V43_RESOURCE);
|
||||
currentVersion = readCurrentSchemaVersion(conn);
|
||||
}
|
||||
if (currentVersion == SCHEMA_VERSION_43) {
|
||||
runSqlScript(conn, POSTGRES_MIGRATION_V44_RESOURCE);
|
||||
currentVersion = readCurrentSchemaVersion(conn);
|
||||
}
|
||||
if (currentVersion == SCHEMA_VERSION_44) {
|
||||
runSqlScript(conn, POSTGRES_MIGRATION_V45_RESOURCE);
|
||||
currentVersion = readCurrentSchemaVersion(conn);
|
||||
}
|
||||
if (currentVersion != SCHEMA_VERSION_45) {
|
||||
throw new SQLException(
|
||||
"Unsupported SHiNE DB v2 schema version: expected 39, found " + currentVersion);
|
||||
"Unsupported SHiNE DB v2 schema version: expected 45, found " + currentVersion);
|
||||
}
|
||||
normalizeBlockchainStateKeysToBase64(conn);
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@ import java.util.Locale;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
public final class ChannelNameRules {
|
||||
private static final int MIN_DISPLAY_NAME_LENGTH = 3;
|
||||
private static final int MIN_DISPLAY_NAME_LENGTH = 4;
|
||||
private static final int MAX_DISPLAY_NAME_LENGTH = 32;
|
||||
private static final Pattern DISPLAY_ALLOWED_PATTERN =
|
||||
Pattern.compile("^[A-Za-z0-9_-]+$");
|
||||
@@ -26,7 +26,7 @@ public final class ChannelNameRules {
|
||||
|
||||
int length = normalized.codePointCount(0, normalized.length());
|
||||
if (length < MIN_DISPLAY_NAME_LENGTH || length > MAX_DISPLAY_NAME_LENGTH) {
|
||||
throw new IllegalArgumentException("channelName length must be 3..32");
|
||||
throw new IllegalArgumentException("channelName length must be 4..32");
|
||||
}
|
||||
|
||||
if (!DISPLAY_ALLOWED_PATTERN.matcher(normalized).matches()) {
|
||||
|
||||
@@ -187,10 +187,27 @@ public final class BlockchainStateDAO {
|
||||
}
|
||||
}
|
||||
|
||||
/** Change ONLY the quota projection; 0 means unbounded. */
|
||||
public void updateSizeLimit(String blockchainName, long limit) throws SQLException {
|
||||
if (limit < 0L) throw new IllegalArgumentException("limit must be nonnegative");
|
||||
try (Connection c = db.getConnection(); PreparedStatement ps = c.prepareStatement("""
|
||||
UPDATE blockchain_state_store SET size_limit = ?, updated_at_ms = ?
|
||||
WHERE LOWER(login) = LOWER(?) AND fork_number = ?
|
||||
""")) {
|
||||
ChainRef r = chainRef(blockchainName);
|
||||
ps.setLong(1, limit);
|
||||
ps.setLong(2, System.currentTimeMillis());
|
||||
ps.setString(3, r.login());
|
||||
ps.setInt(4, r.fork());
|
||||
ps.executeUpdate();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Атомарно увеличить file_size_bytes на deltaBytes, но только если НЕ превысим size_limit.
|
||||
*/
|
||||
public boolean tryIncreaseFileSizeWithinLimit(Connection c, String blockchainName, long deltaBytes, long nowMs) throws SQLException {
|
||||
if (deltaBytes < 0L) throw new IllegalArgumentException("deltaBytes must be nonnegative");
|
||||
String sql = """
|
||||
UPDATE blockchain_state_store
|
||||
SET
|
||||
@@ -198,7 +215,8 @@ public final class BlockchainStateDAO {
|
||||
updated_at_ms = ?
|
||||
WHERE
|
||||
LOWER(login) = LOWER(?) AND fork_number = ?
|
||||
AND (file_size_bytes + ?) <= size_limit
|
||||
AND file_size_bytes <= 9223372036854775807 - ?
|
||||
AND (size_limit = 0 OR (file_size_bytes + ?) <= size_limit)
|
||||
""";
|
||||
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
@@ -208,6 +226,7 @@ public final class BlockchainStateDAO {
|
||||
ps.setString(3, r.login());
|
||||
ps.setInt(4, r.fork());
|
||||
ps.setLong(5, deltaBytes);
|
||||
ps.setLong(6, deltaBytes);
|
||||
return ps.executeUpdate() > 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -67,37 +67,76 @@ public final class ChannelNameStateDAO {
|
||||
channel_root_block_hash,
|
||||
created_at_ms,
|
||||
ava_ar,
|
||||
ava_sha256,
|
||||
ava_pr,
|
||||
ava_size,
|
||||
meta_updated_at_ms
|
||||
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
ps.setString(1, entry.getSlug());
|
||||
ps.setString(2, entry.getDisplayName());
|
||||
ps.setString(3, entry.getChannelDescription() == null ? "" : entry.getChannelDescription());
|
||||
ps.setString(4, entry.getOwnerLogin());
|
||||
ps.setString(5, entry.getOwnerBlockchainName());
|
||||
ps.setInt(6, entry.getChannelTypeCode());
|
||||
ps.setInt(7, entry.getChannelTypeVersion());
|
||||
ps.setInt(8, entry.getChannelRootBlockNumber());
|
||||
ps.setBytes(9, entry.getChannelRootBlockHash());
|
||||
ps.setLong(10, entry.getCreatedAtMs());
|
||||
ps.setString(11, entry.getAvaAr() == null ? "" : entry.getAvaAr());
|
||||
ps.setString(12, entry.getAvaSha256() == null ? "" : entry.getAvaSha256());
|
||||
ps.setLong(13, Math.max(0L, entry.getAvaSize()));
|
||||
ps.setLong(14, Math.max(0L, entry.getMetaUpdatedAtMs()));
|
||||
bindInsert(ps, entry);
|
||||
ps.executeUpdate();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Используется только при воспроизведении уже подписанной истории. В live AddBlock
|
||||
* дубликат имени запрещён; при replay блок всё же нужно сохранить, иначе цепочка
|
||||
* после него останется разорванной.
|
||||
*/
|
||||
public void insertOrReplaceWithNewerRoot(Connection c, ChannelNameStateEntry entry) throws SQLException {
|
||||
String sql = """
|
||||
INSERT INTO channel_names_state (
|
||||
slug, display_name, channel_description, owner_login, owner_bch_name,
|
||||
channel_type_code, channel_type_version, channel_root_block_number,
|
||||
channel_root_block_hash, created_at_ms, ava_ar, ava_pr, ava_size, meta_updated_at_ms
|
||||
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||
ON CONFLICT (owner_bch_name, channel_type_code, slug) DO UPDATE SET
|
||||
display_name = EXCLUDED.display_name,
|
||||
channel_description = EXCLUDED.channel_description,
|
||||
owner_login = EXCLUDED.owner_login,
|
||||
channel_type_version = EXCLUDED.channel_type_version,
|
||||
channel_root_block_number = EXCLUDED.channel_root_block_number,
|
||||
channel_root_block_hash = EXCLUDED.channel_root_block_hash,
|
||||
created_at_ms = EXCLUDED.created_at_ms,
|
||||
ava_ar = EXCLUDED.ava_ar,
|
||||
ava_pr = EXCLUDED.ava_pr,
|
||||
ava_size = EXCLUDED.ava_size,
|
||||
meta_updated_at_ms = EXCLUDED.meta_updated_at_ms,
|
||||
is_deleted = FALSE,
|
||||
deleted_at_ms = 0,
|
||||
deleted_block_number = NULL
|
||||
WHERE EXCLUDED.channel_root_block_number > channel_names_state.channel_root_block_number
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
bindInsert(ps, entry);
|
||||
ps.executeUpdate();
|
||||
}
|
||||
}
|
||||
|
||||
private static void bindInsert(PreparedStatement ps, ChannelNameStateEntry entry) throws SQLException {
|
||||
ps.setString(1, entry.getSlug());
|
||||
ps.setString(2, entry.getDisplayName());
|
||||
ps.setString(3, entry.getChannelDescription() == null ? "" : entry.getChannelDescription());
|
||||
ps.setString(4, entry.getOwnerLogin());
|
||||
ps.setString(5, entry.getOwnerBlockchainName());
|
||||
ps.setInt(6, entry.getChannelTypeCode());
|
||||
ps.setInt(7, entry.getChannelTypeVersion());
|
||||
ps.setInt(8, entry.getChannelRootBlockNumber());
|
||||
ps.setBytes(9, entry.getChannelRootBlockHash());
|
||||
ps.setLong(10, entry.getCreatedAtMs());
|
||||
ps.setString(11, entry.getAvaAr() == null ? "" : entry.getAvaAr());
|
||||
ps.setString(12, entry.getAvaPr() == null ? "" : entry.getAvaPr());
|
||||
ps.setLong(13, Math.max(0L, entry.getAvaSize()));
|
||||
ps.setLong(14, Math.max(0L, entry.getMetaUpdatedAtMs()));
|
||||
}
|
||||
|
||||
public void updateMeta(Connection c, ChannelNameStateEntry entry) throws SQLException {
|
||||
String sql = """
|
||||
UPDATE channel_names_state
|
||||
SET display_name = ?,
|
||||
channel_description = ?,
|
||||
ava_ar = ?,
|
||||
ava_sha256 = ?,
|
||||
ava_pr = ?,
|
||||
ava_size = ?,
|
||||
meta_updated_at_ms = ?
|
||||
WHERE LOWER(owner_login)=LOWER(?) AND channel_root_block_number = ?
|
||||
@@ -106,7 +145,7 @@ public final class ChannelNameStateDAO {
|
||||
ps.setString(1, entry.getDisplayName() == null ? "" : entry.getDisplayName());
|
||||
ps.setString(2, entry.getChannelDescription() == null ? "" : entry.getChannelDescription());
|
||||
ps.setString(3, entry.getAvaAr() == null ? "" : entry.getAvaAr());
|
||||
ps.setString(4, entry.getAvaSha256() == null ? "" : entry.getAvaSha256());
|
||||
ps.setString(4, entry.getAvaPr() == null ? "" : entry.getAvaPr());
|
||||
ps.setLong(5, Math.max(0L, entry.getAvaSize()));
|
||||
ps.setLong(6, Math.max(0L, entry.getMetaUpdatedAtMs()));
|
||||
ps.setString(7, entry.getOwnerLogin());
|
||||
|
||||
@@ -13,7 +13,7 @@ public final class ChannelSearchDAO {
|
||||
private ChannelSearchDAO() {}
|
||||
|
||||
public record Match(String ownerLogin, String slug, String displayName, String description,
|
||||
String avatarAr, String avatarSha256, String ownerBlockchainName,
|
||||
String avatarAr, String avatarPr, String ownerBlockchainName,
|
||||
int rootBlockNumber, String rootBlockHashHex, int subscribersCount) {}
|
||||
|
||||
// LIKE ESCAPE '!' — введённые пользователем %, _ и ! трактуются буквально.
|
||||
@@ -45,7 +45,7 @@ public final class ChannelSearchDAO {
|
||||
String ownerAnywhere = "%" + escapedPattern(ownerExact) + "%";
|
||||
String sql = """
|
||||
SELECT cn.owner_login, cn.slug, cn.display_name, cn.channel_description,
|
||||
cn.ava_ar, cn.ava_sha256, cn.owner_bch_name,
|
||||
cn.ava_ar, cn.ava_pr, cn.owner_bch_name,
|
||||
cn.channel_root_block_number, encode(cn.channel_root_block_hash, 'hex') AS root_hash,
|
||||
COALESCE(cs.subscribers_count, 0) AS subscribers_count
|
||||
FROM channel_names_state cn
|
||||
@@ -109,7 +109,7 @@ public final class ChannelSearchDAO {
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
while (rs.next()) matches.add(new Match(
|
||||
rs.getString("owner_login"), rs.getString("slug"), rs.getString("display_name"),
|
||||
rs.getString("channel_description"), rs.getString("ava_ar"), rs.getString("ava_sha256"),
|
||||
rs.getString("channel_description"), rs.getString("ava_ar"), rs.getString("ava_pr"),
|
||||
rs.getString("owner_bch_name"), rs.getInt("channel_root_block_number"),
|
||||
rs.getString("root_hash"), rs.getInt("subscribers_count")
|
||||
));
|
||||
|
||||
+20
-4
@@ -73,10 +73,26 @@ public final class SolanaUserPdaCurrentDAO {
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
ps.setString(1, blockchainName);
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
if (!rs.next()) {
|
||||
return null;
|
||||
}
|
||||
return mapRow(rs);
|
||||
if (rs.next()) return mapRow(rs);
|
||||
}
|
||||
}
|
||||
// Old forks remain valid separate blockchains even after root rotation.
|
||||
String forkSql = """
|
||||
SELECT u.login,
|
||||
u.login || '-' || LPAD(((f.value ->> 'forkIndex')::integer + 1)::text, 3, '0') AS blockchain_name,
|
||||
f.value ->> 'blockchainKey' AS blockchain_key,
|
||||
(f.value ->> 'paidLimitBytes')::bigint AS paid_limit_bytes
|
||||
FROM solana_user_pda_current u
|
||||
CROSS JOIN LATERAL jsonb_array_elements(
|
||||
COALESCE(NULLIF(u.blockchain_forks_json, ''), '[]')::jsonb
|
||||
) AS f(value)
|
||||
WHERE LOWER(u.login || '-' || LPAD(((f.value ->> 'forkIndex')::integer + 1)::text, 3, '0')) = LOWER(?)
|
||||
LIMIT 1
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(forkSql)) {
|
||||
ps.setString(1, blockchainName);
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
return rs.next() ? mapRow(rs) : null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,82 +0,0 @@
|
||||
package shine.db.dao;
|
||||
|
||||
import shine.db.DbController;
|
||||
import shine.db.entities.TestFreeAvatarUploadEntry;
|
||||
|
||||
import java.sql.Connection;
|
||||
import java.sql.PreparedStatement;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
|
||||
public final class TestFreeAvatarUploadsDAO {
|
||||
|
||||
private static volatile TestFreeAvatarUploadsDAO instance;
|
||||
private final DbController db = DbController.getInstance();
|
||||
|
||||
private TestFreeAvatarUploadsDAO() {
|
||||
}
|
||||
|
||||
public static TestFreeAvatarUploadsDAO getInstance() {
|
||||
if (instance == null) {
|
||||
synchronized (TestFreeAvatarUploadsDAO.class) {
|
||||
if (instance == null) instance = new TestFreeAvatarUploadsDAO();
|
||||
}
|
||||
}
|
||||
return instance;
|
||||
}
|
||||
|
||||
public TestFreeAvatarUploadEntry getByLogin(Connection c, String login) throws SQLException {
|
||||
String sql = """
|
||||
SELECT login, used_count, updated_at_ms, last_tx_id
|
||||
FROM test_free_avatar_uploads
|
||||
WHERE LOWER(login) = LOWER(?)
|
||||
LIMIT 1
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
ps.setString(1, login);
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
if (!rs.next()) return null;
|
||||
return mapRow(rs);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public TestFreeAvatarUploadEntry getByLogin(String login) throws SQLException {
|
||||
try (Connection c = db.getConnection()) {
|
||||
return getByLogin(c, login);
|
||||
}
|
||||
}
|
||||
|
||||
public void upsertUsage(Connection c, String login, int usedCount, long updatedAtMs, String lastTxId) throws SQLException {
|
||||
String sql = """
|
||||
INSERT INTO test_free_avatar_uploads (login, used_count, updated_at_ms, last_tx_id)
|
||||
VALUES (?, ?, ?, ?)
|
||||
ON CONFLICT(login) DO UPDATE SET
|
||||
used_count = excluded.used_count,
|
||||
updated_at_ms = excluded.updated_at_ms,
|
||||
last_tx_id = excluded.last_tx_id
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
ps.setString(1, login);
|
||||
ps.setInt(2, usedCount);
|
||||
ps.setLong(3, updatedAtMs);
|
||||
ps.setString(4, lastTxId);
|
||||
ps.executeUpdate();
|
||||
}
|
||||
}
|
||||
|
||||
public void upsertUsage(String login, int usedCount, long updatedAtMs, String lastTxId) throws SQLException {
|
||||
try (Connection c = db.getConnection()) {
|
||||
upsertUsage(c, login, usedCount, updatedAtMs, lastTxId);
|
||||
}
|
||||
}
|
||||
|
||||
private static TestFreeAvatarUploadEntry mapRow(ResultSet rs) throws SQLException {
|
||||
return new TestFreeAvatarUploadEntry(
|
||||
rs.getString("login"),
|
||||
rs.getInt("used_count"),
|
||||
rs.getLong("updated_at_ms"),
|
||||
rs.getString("last_tx_id")
|
||||
);
|
||||
}
|
||||
}
|
||||
+13
-4
@@ -10,6 +10,7 @@ import java.sql.SQLException;
|
||||
import java.sql.Types;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
public final class UserNotificationsStateDAO {
|
||||
private static volatile UserNotificationsStateDAO instance;
|
||||
@@ -45,7 +46,7 @@ public final class UserNotificationsStateDAO {
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
int i = 1;
|
||||
ps.setString(i++, e.getOwnerLogin());
|
||||
ps.setString(i++, normalizedLogin(e.getOwnerLogin()));
|
||||
ps.setString(i++, e.getNotificationKind());
|
||||
ps.setLong(i++, e.getCreatedAtMs());
|
||||
ps.setString(i++, e.getSourceLogin());
|
||||
@@ -74,7 +75,7 @@ public final class UserNotificationsStateDAO {
|
||||
""";
|
||||
List<UserNotificationEntry> out = new ArrayList<>();
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
ps.setString(1, ownerLogin);
|
||||
ps.setString(1, normalizedLogin(ownerLogin));
|
||||
ps.setString(2, kind);
|
||||
ps.setInt(3, Math.max(1, limit));
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
@@ -96,7 +97,7 @@ public final class UserNotificationsStateDAO {
|
||||
""";
|
||||
List<UserNotificationEntry> out = new ArrayList<>();
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
ps.setString(1, ownerLogin); ps.setString(2, kind); ps.setLong(3, Math.max(0, seenAtMs));
|
||||
ps.setString(1, normalizedLogin(ownerLogin)); ps.setString(2, kind); ps.setLong(3, Math.max(0, seenAtMs));
|
||||
ps.setLong(4, Math.max(0, cutoffMs));
|
||||
try (ResultSet rs = ps.executeQuery()) { while (rs.next()) out.add(mapRow(rs)); }
|
||||
}
|
||||
@@ -106,7 +107,7 @@ public final class UserNotificationsStateDAO {
|
||||
public long countUnseen(Connection c, String ownerLogin, String kind, long seenAtMs) throws SQLException {
|
||||
String sql = "SELECT COUNT(*) FROM user_notifications_state WHERE owner_login = ? AND notification_kind = ? AND created_at_ms > ?";
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
ps.setString(1, ownerLogin); ps.setString(2, kind); ps.setLong(3, Math.max(0, seenAtMs));
|
||||
ps.setString(1, normalizedLogin(ownerLogin)); ps.setString(2, kind); ps.setLong(3, Math.max(0, seenAtMs));
|
||||
try (ResultSet rs = ps.executeQuery()) { return rs.next() ? rs.getLong(1) : 0L; }
|
||||
}
|
||||
}
|
||||
@@ -129,4 +130,12 @@ public final class UserNotificationsStateDAO {
|
||||
e.setSourceText(rs.getString("source_text"));
|
||||
return e;
|
||||
}
|
||||
|
||||
/**
|
||||
* owner_login — технический FK на normalized_login. Исходный регистр остаётся
|
||||
* в полях подписанного блока и в отображаемых source/target login.
|
||||
*/
|
||||
private static String normalizedLogin(String login) {
|
||||
return login == null ? null : login.trim().toLowerCase(Locale.ROOT);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -116,7 +116,7 @@ public final class UserProfileStateDAO {
|
||||
String sql;
|
||||
if ("owned".equals(mode)) {
|
||||
sql="""
|
||||
SELECT cn.owner_login, cn.slug, cn.display_name, cn.ava_ar, cn.ava_sha256, cn.owner_bch_name,
|
||||
SELECT cn.owner_login, cn.slug, cn.display_name, cn.ava_ar, cn.ava_pr, cn.owner_bch_name,
|
||||
cn.channel_root_block_number, encode(cn.channel_root_block_hash,'hex') root_hash,
|
||||
cn.is_deleted, cn.deleted_at_ms, cn.deleted_block_number
|
||||
FROM channel_names_state cn
|
||||
@@ -125,7 +125,7 @@ public final class UserProfileStateDAO {
|
||||
""";
|
||||
} else if ("following".equals(mode)) {
|
||||
sql="""
|
||||
SELECT DISTINCT cn.owner_login, cn.slug, cn.display_name, cn.ava_ar, cn.ava_sha256, cn.owner_bch_name,
|
||||
SELECT DISTINCT cn.owner_login, cn.slug, cn.display_name, cn.ava_ar, cn.ava_pr, cn.owner_bch_name,
|
||||
cn.channel_root_block_number, encode(cn.channel_root_block_hash,'hex') root_hash,
|
||||
cn.is_deleted, cn.deleted_at_ms, cn.deleted_block_number
|
||||
FROM connections_state cs
|
||||
@@ -142,7 +142,7 @@ public final class UserProfileStateDAO {
|
||||
ps.setString(1,login); ps.setBoolean(2,includeDeleted); ps.setInt(3,safeLimit); ps.setInt(4,safeOffset);
|
||||
try(ResultSet rs=ps.executeQuery()){
|
||||
while(rs.next()) out.add(new ChannelCard(
|
||||
rs.getString("owner_login"), rs.getString("slug"), rs.getString("display_name"), rs.getString("ava_ar"), rs.getString("ava_sha256"),
|
||||
rs.getString("owner_login"), rs.getString("slug"), rs.getString("display_name"), rs.getString("ava_ar"), rs.getString("ava_pr"),
|
||||
rs.getString("owner_bch_name"), rs.getInt("channel_root_block_number"), rs.getString("root_hash"),
|
||||
rs.getBoolean("is_deleted"), rs.getLong("deleted_at_ms"), (Integer) rs.getObject("deleted_block_number")
|
||||
));
|
||||
@@ -154,5 +154,5 @@ public final class UserProfileStateDAO {
|
||||
private static ProfileCard map(ResultSet rs)throws SQLException{return new ProfileCard(rs.getString("login"),rs.getString("first_name"),rs.getString("last_name"),rs.getString("ava_ar"),rs.getString("account_role"),rs.getString("shine_status"));}
|
||||
public record ProfileCard(String login,String firstName,String lastName,String avatarAr,String accountRole,String shineStatus){}
|
||||
public record RelationCard(String login,String firstName,String lastName,String avatarAr,String accountRole,String shineStatus,boolean primaryConfirmed,boolean shineConfirmed,String relationType,int primaryConfirmationsCount,int shineConfirmationsCount){}
|
||||
public record ChannelCard(String ownerLogin,String slug,String displayName,String avatarAr,String avatarSha256,String ownerBlockchainName,int rootBlockNumber,String rootBlockHashHex,boolean deleted,long deletedAtMs,Integer deletedBlockNumber){}
|
||||
public record ChannelCard(String ownerLogin,String slug,String displayName,String avatarAr,String avatarPr,String ownerBlockchainName,int rootBlockNumber,String rootBlockHashHex,boolean deleted,long deletedAtMs,Integer deletedBlockNumber){}
|
||||
}
|
||||
|
||||
+8
-3
@@ -1,6 +1,7 @@
|
||||
package shine.db.entities;
|
||||
|
||||
import java.util.Base64;
|
||||
import java.util.Locale;
|
||||
|
||||
/**
|
||||
* Агрегатная сущность текущего состояния блокчейна.
|
||||
@@ -42,14 +43,18 @@ public final class BlockchainStateEntry {
|
||||
if (dash <= 0 || blockchainName.length()-dash-1 != 3) throw new IllegalArgumentException("Bad blockchainName: "+blockchainName);
|
||||
int parsedFork=Integer.parseInt(blockchainName.substring(dash+1));
|
||||
if (parsedFork < 1 || parsedFork > 999) throw new IllegalArgumentException("forkNumber must be 1..999");
|
||||
this.login=blockchainName.substring(0,dash);
|
||||
// Runtime-ключ цепочки всегда нормализован. Исходное написание
|
||||
// зарегистрированного login хранится отдельно в user_identity_current.
|
||||
this.login=blockchainName.substring(0,dash).trim().toLowerCase(Locale.ROOT);
|
||||
this.forkNumber=parsedFork;
|
||||
}
|
||||
public int getForkNumber() { return forkNumber; }
|
||||
public void setForkNumber(int forkNumber) { if (forkNumber < 1 || forkNumber > 999) throw new IllegalArgumentException("forkNumber must be 1..999"); this.forkNumber = forkNumber; }
|
||||
|
||||
public String getLogin() { return login; }
|
||||
public void setLogin(String login) { this.login = login; }
|
||||
public void setLogin(String login) {
|
||||
this.login = login == null ? null : login.trim().toLowerCase(Locale.ROOT);
|
||||
}
|
||||
|
||||
public String getBlockchainKey() { return blockchainKey; }
|
||||
public void setBlockchainKey(String blockchainKey) { this.blockchainKey = blockchainKey; }
|
||||
@@ -80,4 +85,4 @@ public final class BlockchainStateEntry {
|
||||
|
||||
public long getUpdatedAtMs() { return updatedAtMs; }
|
||||
public void setUpdatedAtMs(long updatedAtMs) { this.updatedAtMs = updatedAtMs; }
|
||||
}
|
||||
}
|
||||
|
||||
+5
-5
@@ -14,7 +14,7 @@ public class ChannelNameStateEntry {
|
||||
private byte[] channelRootBlockHash;
|
||||
private long createdAtMs;
|
||||
private String avaAr;
|
||||
private String avaSha256;
|
||||
private String avaPr;
|
||||
private long avaSize;
|
||||
private long metaUpdatedAtMs;
|
||||
|
||||
@@ -106,12 +106,12 @@ public class ChannelNameStateEntry {
|
||||
this.avaAr = avaAr;
|
||||
}
|
||||
|
||||
public String getAvaSha256() {
|
||||
return avaSha256;
|
||||
public String getAvaPr() {
|
||||
return avaPr;
|
||||
}
|
||||
|
||||
public void setAvaSha256(String avaSha256) {
|
||||
this.avaSha256 = avaSha256;
|
||||
public void setAvaPr(String avaPr) {
|
||||
this.avaPr = avaPr;
|
||||
}
|
||||
|
||||
public long getAvaSize() {
|
||||
|
||||
-50
@@ -1,50 +0,0 @@
|
||||
package shine.db.entities;
|
||||
|
||||
public class TestFreeAvatarUploadEntry {
|
||||
private String login;
|
||||
private int usedCount;
|
||||
private long updatedAtMs;
|
||||
private String lastTxId;
|
||||
|
||||
public TestFreeAvatarUploadEntry() {
|
||||
}
|
||||
|
||||
public TestFreeAvatarUploadEntry(String login, int usedCount, long updatedAtMs, String lastTxId) {
|
||||
this.login = login;
|
||||
this.usedCount = usedCount;
|
||||
this.updatedAtMs = updatedAtMs;
|
||||
this.lastTxId = lastTxId;
|
||||
}
|
||||
|
||||
public String getLogin() {
|
||||
return login;
|
||||
}
|
||||
|
||||
public void setLogin(String login) {
|
||||
this.login = login;
|
||||
}
|
||||
|
||||
public int getUsedCount() {
|
||||
return usedCount;
|
||||
}
|
||||
|
||||
public void setUsedCount(int usedCount) {
|
||||
this.usedCount = usedCount;
|
||||
}
|
||||
|
||||
public long getUpdatedAtMs() {
|
||||
return updatedAtMs;
|
||||
}
|
||||
|
||||
public void setUpdatedAtMs(long updatedAtMs) {
|
||||
this.updatedAtMs = updatedAtMs;
|
||||
}
|
||||
|
||||
public String getLastTxId() {
|
||||
return lastTxId;
|
||||
}
|
||||
|
||||
public void setLastTxId(String lastTxId) {
|
||||
this.lastTxId = lastTxId;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
-- SHiNE DB v40: код валюты и актуализация стоимости namespace.
|
||||
-- Исторический namespace 1.0 не содержит currency_code и означает SOL (код 1).
|
||||
BEGIN;
|
||||
ALTER TABLE shine_namespace_current
|
||||
ADD COLUMN currency_code SMALLINT NOT NULL DEFAULT 1
|
||||
CHECK (currency_code = 1);
|
||||
UPDATE db_schema_version SET schema_version = 40 WHERE id = 1;
|
||||
COMMIT;
|
||||
@@ -0,0 +1,7 @@
|
||||
-- SHiNE v41: public channel avatars now use BitTorrent v2 PR (Base58), no SHA256 legacy.
|
||||
BEGIN;
|
||||
ALTER TABLE channel_names_state RENAME COLUMN ava_sha256 TO ava_pr;
|
||||
-- Old sha256 hex values cannot be used as Pieces Root; no automatic conversion exists.
|
||||
UPDATE channel_names_state SET ava_pr = '', ava_ar = '', ava_size = 0 WHERE ava_pr <> '';
|
||||
UPDATE db_schema_version SET schema_version = 41 WHERE id = 1;
|
||||
COMMIT;
|
||||
@@ -0,0 +1,27 @@
|
||||
-- SHiNE v42: журнал выдачи разрешений R2 (не подтверждение успешного PUT).
|
||||
-- В DM записываются только зашифрованные объекты (включая манифест), без имени и MIME.
|
||||
BEGIN;
|
||||
CREATE TABLE IF NOT EXISTS public_file_uploads (
|
||||
id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
|
||||
user_login TEXT NOT NULL,
|
||||
file_hash TEXT NOT NULL,
|
||||
file_size_bytes BIGINT NOT NULL CHECK (file_size_bytes > 0),
|
||||
disposition TEXT NOT NULL CHECK (disposition IN ('upload_url_issued', 'already_exists')),
|
||||
requested_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||
);
|
||||
CREATE INDEX IF NOT EXISTS public_file_uploads_user_time_idx ON public_file_uploads (user_login, requested_at DESC);
|
||||
CREATE INDEX IF NOT EXISTS public_file_uploads_hash_idx ON public_file_uploads (file_hash);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS dm_file_uploads (
|
||||
id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
|
||||
user_login TEXT NOT NULL,
|
||||
file_hash TEXT NOT NULL,
|
||||
file_size_bytes BIGINT NOT NULL CHECK (file_size_bytes > 0),
|
||||
disposition TEXT NOT NULL CHECK (disposition IN ('upload_url_issued', 'already_exists')),
|
||||
requested_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||
);
|
||||
CREATE INDEX IF NOT EXISTS dm_file_uploads_user_time_idx ON dm_file_uploads (user_login, requested_at DESC);
|
||||
CREATE INDEX IF NOT EXISTS dm_file_uploads_hash_idx ON dm_file_uploads (file_hash);
|
||||
|
||||
UPDATE db_schema_version SET schema_version = 42, updated_at_ms = (EXTRACT(EPOCH FROM clock_timestamp()) * 1000)::BIGINT WHERE id = 1;
|
||||
COMMIT;
|
||||
@@ -0,0 +1,43 @@
|
||||
-- v43: runtime-идентичность blockchain_state совпадает с normalized_login.
|
||||
-- Исходный регистр зарегистрированного имени остаётся в user_identity_current.login
|
||||
-- и никогда не переписывает подписанные сертификаты или блоки.
|
||||
BEGIN;
|
||||
|
||||
-- blocks_store уже использует normalized_login. Временно снимаем составной FK,
|
||||
-- чтобы привести родительские строки blockchain_state к тому же ключу.
|
||||
ALTER TABLE blocks_store DROP CONSTRAINT IF EXISTS fk_blocks_physical_fork;
|
||||
ALTER TABLE blockchain_state_store DROP CONSTRAINT IF EXISTS blockchain_state_login_fkey;
|
||||
|
||||
-- v36-совместимость подставляла display login, что несовместимо с blocks_store.
|
||||
DROP TRIGGER IF EXISTS trg_canonical_identity_blockchain_state_store_login
|
||||
ON blockchain_state_store;
|
||||
|
||||
UPDATE blockchain_state_store
|
||||
SET login = LOWER(BTRIM(login))
|
||||
WHERE login IS DISTINCT FROM LOWER(BTRIM(login));
|
||||
|
||||
ALTER TABLE blockchain_state_store
|
||||
ADD CONSTRAINT blockchain_state_login_fkey
|
||||
FOREIGN KEY (login) REFERENCES user_identity_current(normalized_login);
|
||||
|
||||
ALTER TABLE blocks_store
|
||||
ADD CONSTRAINT fk_blocks_physical_fork
|
||||
FOREIGN KEY (login, fork_number)
|
||||
REFERENCES blockchain_state_store(login, fork_number);
|
||||
|
||||
CREATE OR REPLACE FUNCTION shine_normalize_blockchain_state_login()
|
||||
RETURNS TRIGGER LANGUAGE plpgsql AS $$
|
||||
BEGIN
|
||||
NEW.login := LOWER(BTRIM(NEW.login));
|
||||
RETURN NEW;
|
||||
END $$;
|
||||
|
||||
CREATE TRIGGER trg_normalize_blockchain_state_login
|
||||
BEFORE INSERT OR UPDATE OF login ON blockchain_state_store
|
||||
FOR EACH ROW EXECUTE FUNCTION shine_normalize_blockchain_state_login();
|
||||
|
||||
UPDATE db_schema_version
|
||||
SET schema_version = 43,
|
||||
updated_at_ms = CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
|
||||
WHERE id = 1;
|
||||
COMMIT;
|
||||
@@ -0,0 +1,29 @@
|
||||
-- v44: owner_login уведомлений — технический ключ normalized_login.
|
||||
-- Исходный регистр остаётся в содержимом подписанных блоков и полях source/target.
|
||||
BEGIN;
|
||||
|
||||
UPDATE user_notifications_state
|
||||
SET owner_login = LOWER(BTRIM(owner_login))
|
||||
WHERE owner_login IS DISTINCT FROM LOWER(BTRIM(owner_login));
|
||||
|
||||
DROP TRIGGER IF EXISTS trg_canonical_identity_user_notifications_state_owner_login
|
||||
ON user_notifications_state;
|
||||
DROP TRIGGER IF EXISTS trg_normalize_user_notifications_state_owner_login
|
||||
ON user_notifications_state;
|
||||
|
||||
CREATE OR REPLACE FUNCTION shine_normalize_user_notification_owner_login()
|
||||
RETURNS TRIGGER LANGUAGE plpgsql AS $$
|
||||
BEGIN
|
||||
NEW.owner_login := LOWER(BTRIM(NEW.owner_login));
|
||||
RETURN NEW;
|
||||
END $$;
|
||||
|
||||
CREATE TRIGGER trg_normalize_user_notifications_state_owner_login
|
||||
BEFORE INSERT OR UPDATE OF owner_login ON user_notifications_state
|
||||
FOR EACH ROW EXECUTE FUNCTION shine_normalize_user_notification_owner_login();
|
||||
|
||||
UPDATE db_schema_version
|
||||
SET schema_version = 44,
|
||||
updated_at_ms = CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
|
||||
WHERE id = 1;
|
||||
COMMIT;
|
||||
@@ -0,0 +1,68 @@
|
||||
-- v45: FREE_CERT — полноценная identity без фиктивной Solana PDA.
|
||||
-- Обычные проекции и чтение blockchain выбирают ветку по user_identity_current;
|
||||
-- Solana PDA остаётся источником только Solana-специфичных данных.
|
||||
BEGIN;
|
||||
|
||||
CREATE OR REPLACE FUNCTION shine_identity_active_fork(p_login TEXT)
|
||||
RETURNS INTEGER
|
||||
LANGUAGE plpgsql
|
||||
STABLE
|
||||
AS $$
|
||||
DECLARE
|
||||
v_fork INTEGER;
|
||||
BEGIN
|
||||
SELECT substring(blockchain_name FROM '([0-9]{3})$')::INTEGER
|
||||
INTO v_fork
|
||||
FROM user_identity_current
|
||||
WHERE LOWER(login) = LOWER(BTRIM(p_login))
|
||||
LIMIT 1;
|
||||
|
||||
IF v_fork BETWEEN 1 AND 999 THEN
|
||||
RETURN v_fork;
|
||||
END IF;
|
||||
|
||||
SELECT fork_number
|
||||
INTO v_fork
|
||||
FROM blockchain_state_store
|
||||
WHERE LOWER(login) = LOWER(BTRIM(p_login))
|
||||
ORDER BY updated_at_ms DESC, fork_number DESC
|
||||
LIMIT 1;
|
||||
|
||||
RETURN COALESCE(v_fork, 1);
|
||||
END $$;
|
||||
|
||||
CREATE OR REPLACE FUNCTION shine_active_fork(p_login TEXT, p_block_number INTEGER)
|
||||
RETURNS INTEGER
|
||||
LANGUAGE sql
|
||||
STABLE
|
||||
AS $$
|
||||
SELECT shine_canonical_fork(p_login, shine_identity_active_fork(p_login), p_block_number)
|
||||
$$;
|
||||
|
||||
CREATE OR REPLACE FUNCTION shine_channel_names_state_refresh_owner_stats()
|
||||
RETURNS TRIGGER
|
||||
LANGUAGE plpgsql
|
||||
AS $$
|
||||
BEGIN
|
||||
IF TG_OP = 'DELETE' THEN
|
||||
PERFORM shine_refresh_user_stats(OLD.owner_login);
|
||||
RETURN OLD;
|
||||
END IF;
|
||||
PERFORM shine_refresh_user_stats(NEW.owner_login);
|
||||
RETURN NEW;
|
||||
END $$;
|
||||
|
||||
DROP TRIGGER IF EXISTS trg_channel_names_state_refresh_owner_stats ON channel_names_state;
|
||||
CREATE TRIGGER trg_channel_names_state_refresh_owner_stats
|
||||
AFTER INSERT OR UPDATE OF owner_login, channel_type_code, is_deleted OR DELETE
|
||||
ON channel_names_state
|
||||
FOR EACH ROW EXECUTE FUNCTION shine_channel_names_state_refresh_owner_stats();
|
||||
|
||||
-- Исправить уже записанные FREE_CERT и paid identity одним пересчётом.
|
||||
SELECT shine_refresh_user_stats(login) FROM user_identity_current;
|
||||
|
||||
UPDATE db_schema_version
|
||||
SET schema_version = 45,
|
||||
updated_at_ms = CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
|
||||
WHERE id = 1;
|
||||
COMMIT;
|
||||
@@ -34,9 +34,14 @@ dependencies {
|
||||
implementation project(':shine-server-db') // модуль для работы с БД содержит и сущности из БД и саму работу с БД
|
||||
implementation project(':shine-server-geo') // модуль для определения геолокации по IP
|
||||
|
||||
testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
|
||||
|
||||
}
|
||||
|
||||
test {
|
||||
useJUnitPlatform()
|
||||
}
|
||||
|
||||
java {
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.VERSION_17
|
||||
|
||||
+12
@@ -91,6 +91,9 @@ import server.logic.ws_protocol.JSON.handlers.channels.ChannelNamesStateBootstra
|
||||
import server.logic.ws_protocol.JSON.handlers.channels.Net_GetChannelMessages_Handler;
|
||||
import server.logic.ws_protocol.JSON.handlers.channels.Net_GetMessageThread_Handler;
|
||||
import server.logic.ws_protocol.JSON.handlers.channels.Net_GetMessageLikes_Handler;
|
||||
import server.logic.ws_protocol.JSON.handlers.channels.Net_GetSupportTotals_Handler;
|
||||
import server.logic.ws_protocol.JSON.handlers.channels.Net_GetSupportStats_Handler;
|
||||
import server.logic.ws_protocol.JSON.handlers.channels.Net_GetSupportHistory_Handler;
|
||||
import server.logic.ws_protocol.JSON.handlers.channels.Net_GetPersonalDiary_Handler;
|
||||
import server.logic.ws_protocol.JSON.handlers.channels.Net_GetGroupDialog_Handler;
|
||||
import server.logic.ws_protocol.JSON.handlers.channels.Net_GetChannelsCounters_Handler;
|
||||
@@ -104,6 +107,9 @@ import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetChannelMe
|
||||
import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetGroupDialog_Request;
|
||||
import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetMessageThread_Request;
|
||||
import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetMessageLikes_Request;
|
||||
import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetSupportTotals_Request;
|
||||
import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetSupportStats_Request;
|
||||
import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetSupportHistory_Request;
|
||||
import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetPersonalDiary_Request;
|
||||
import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_ListGroupChats200_Request;
|
||||
import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_ListSubscriptionsFeed_Request;
|
||||
@@ -254,6 +260,9 @@ public final class JsonHandlerRegistry {
|
||||
Map.entry("GetPersonalDiary", new Net_GetPersonalDiary_Handler()),
|
||||
Map.entry("GetMessageThread", new Net_GetMessageThread_Handler()),
|
||||
Map.entry("GetMessageLikes", new Net_GetMessageLikes_Handler()),
|
||||
Map.entry("GetSupportTotals", new Net_GetSupportTotals_Handler()),
|
||||
Map.entry("GetSupportStats", new Net_GetSupportStats_Handler()),
|
||||
Map.entry("GetSupportHistory", new Net_GetSupportHistory_Handler()),
|
||||
Map.entry("GetGroupDialog", new Net_GetGroupDialog_Handler()),
|
||||
Map.entry("ListGroupChats200", new Net_ListGroupChats200_Handler()),
|
||||
Map.entry("GetChannelsCounters", new Net_GetChannelsCounters_Handler()),
|
||||
@@ -367,6 +376,9 @@ public final class JsonHandlerRegistry {
|
||||
Map.entry("GetPersonalDiary", Net_GetPersonalDiary_Request.class),
|
||||
Map.entry("GetMessageThread", Net_GetMessageThread_Request.class),
|
||||
Map.entry("GetMessageLikes", Net_GetMessageLikes_Request.class),
|
||||
Map.entry("GetSupportTotals", Net_GetSupportTotals_Request.class),
|
||||
Map.entry("GetSupportStats", Net_GetSupportStats_Request.class),
|
||||
Map.entry("GetSupportHistory", Net_GetSupportHistory_Request.class),
|
||||
Map.entry("GetGroupDialog", Net_GetGroupDialog_Request.class),
|
||||
Map.entry("ListGroupChats200", Net_ListGroupChats200_Request.class),
|
||||
Map.entry("GetChannelsCounters", Net_GetChannelsCounters_Request.class),
|
||||
|
||||
+2
-2
@@ -143,7 +143,7 @@ public final class SolanaUserPdaImportService {
|
||||
if (!MAGIC.equals(new String(raw, 0, 5, StandardCharsets.UTF_8))) return null;
|
||||
int major = u8(raw, 5);
|
||||
int minor = u8(raw, 6);
|
||||
if (major != 1 || minor != 2) return null;
|
||||
if (major != 1 || (minor != 2 && minor != 3)) return null;
|
||||
return parseUserPdaV12(raw);
|
||||
}
|
||||
|
||||
@@ -256,7 +256,7 @@ public final class SolanaUserPdaImportService {
|
||||
if (!MAGIC.equals(new String(raw, 0, 5, StandardCharsets.UTF_8))) return null;
|
||||
int major = u8(raw, 5);
|
||||
int minor = u8(raw, 6);
|
||||
if (major != 1 || minor != 2) return null;
|
||||
if (major != 1 || (minor != 2 && minor != 3)) return null;
|
||||
return parseServerProfileV12(raw);
|
||||
}
|
||||
|
||||
|
||||
+24
@@ -0,0 +1,24 @@
|
||||
package server.logic.ws_protocol.JSON.handlers.avatars;
|
||||
|
||||
import java.math.BigInteger;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
/** Canonical 32-byte BitTorrent v2 pieces root encoded as Bitcoin Base58. */
|
||||
public final class PiecesRootValidator {
|
||||
private static final String ALPHABET = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
|
||||
private static final Pattern B58 = Pattern.compile("^[1-9A-HJ-NP-Za-km-z]{32,44}$");
|
||||
private PiecesRootValidator() {}
|
||||
public static boolean valid(String root) {
|
||||
if (root == null || !B58.matcher(root).matches()) return false;
|
||||
int leadingZeros = 0;
|
||||
while (leadingZeros < root.length() && root.charAt(leadingZeros) == '1') leadingZeros++;
|
||||
BigInteger value = BigInteger.ZERO;
|
||||
for (int i = leadingZeros; i < root.length(); i++) {
|
||||
int digit = ALPHABET.indexOf(root.charAt(i));
|
||||
if (digit < 0) return false;
|
||||
value = value.multiply(BigInteger.valueOf(58)).add(BigInteger.valueOf(digit));
|
||||
}
|
||||
int dataBytes = value.signum() == 0 ? 0 : (value.bitLength() + 7) / 8;
|
||||
return leadingZeros + dataBytes == 32;
|
||||
}
|
||||
}
|
||||
+34
-10
@@ -38,6 +38,8 @@ import shine.db.dao.BlocksDAO;
|
||||
import shine.db.dao.CanonicalChainResolver;
|
||||
import shine.db.dao.ChannelNameStateDAO;
|
||||
import shine.db.dao.CurrentUsersDAO;
|
||||
import shine.db.dao.SolanaUserPdaCurrentDAO;
|
||||
import shine.db.entities.SolanaUserPdaCurrentEntry;
|
||||
import shine.db.dao.UserNotificationsStateDAO;
|
||||
import shine.db.dao.UserParamsDAO;
|
||||
import shine.db.entities.BlockchainStateEntry;
|
||||
@@ -53,6 +55,7 @@ import java.util.List;
|
||||
import java.sql.Connection;
|
||||
import java.sql.PreparedStatement;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.util.concurrent.locks.ReentrantLock;
|
||||
|
||||
/**
|
||||
@@ -67,6 +70,11 @@ public final class Net_AddBlock_Handler implements JsonMessageHandler {
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(Net_AddBlock_Handler.class);
|
||||
|
||||
private static long resolveChainLimit(String blockchainName) throws SQLException {
|
||||
SolanaUserPdaCurrentEntry current = SolanaUserPdaCurrentDAO.getInstance().getByBlockchainName(blockchainName);
|
||||
return current == null ? 0L : current.getPaidLimitBytes();
|
||||
}
|
||||
|
||||
private final BlocksDAO blocksDAO = BlocksDAO.getInstance();
|
||||
private final CanonicalChainResolver canonicalChain = CanonicalChainResolver.getInstance();
|
||||
private final BlockchainStateDAO stateDAO = BlockchainStateDAO.getInstance();
|
||||
@@ -281,7 +289,7 @@ public final class Net_AddBlock_Handler implements JsonMessageHandler {
|
||||
recovered.setBlockchainName(user.getBlockchainName());
|
||||
recovered.setLogin(user.getLogin());
|
||||
recovered.setBlockchainKey(user.getBlockchainKey());
|
||||
recovered.setSizeLimit(100_000L);
|
||||
recovered.setSizeLimit(Math.max(0L, resolveChainLimit(user.getBlockchainName())));
|
||||
recovered.setFileSizeBytes(0L);
|
||||
recovered.setLastBlockNumber(-1);
|
||||
recovered.setLastBlockHash(new byte[32]);
|
||||
@@ -335,7 +343,12 @@ public final class Net_AddBlock_Handler implements JsonMessageHandler {
|
||||
// 3) лимит (оставляем как было)
|
||||
try {
|
||||
long oldSize = st.getFileSizeBytes();
|
||||
long limit = st.getSizeLimit();
|
||||
// Current synced Solana PDA is authoritative; free users have no PDA.
|
||||
long limit = resolveChainLimit(blockchainName);
|
||||
if (limit != st.getSizeLimit()) {
|
||||
stateDAO.updateSizeLimit(blockchainName, limit);
|
||||
st.setSizeLimit(limit);
|
||||
}
|
||||
long newSize = safeAdd(oldSize, blockBytes.length);
|
||||
|
||||
if (limit > 0 && newSize > limit) {
|
||||
@@ -420,16 +433,27 @@ public final class Net_AddBlock_Handler implements JsonMessageHandler {
|
||||
final String normalizedName;
|
||||
final String slug;
|
||||
try {
|
||||
normalizedName = channelTypeCode == (CreateChannelBody.CHANNEL_TYPE_PERSONAL & 0xFFFF)
|
||||
? ChannelNameRules.requireValidDisplayNameForCreate(createChannelBody.channelName)
|
||||
: ChannelNameRules.requireValidPublicDisplayNameForCreate(createChannelBody.channelName);
|
||||
String historicalName = ChannelNameRules.normalizeDisplayName(createChannelBody.channelName);
|
||||
boolean legacyReplayName = replayMode
|
||||
&& historicalName.codePointCount(0, historicalName.length())
|
||||
< CreateChannelBody.MIN_NAME_LENGTH_FOR_CREATE;
|
||||
if (legacyReplayName) {
|
||||
// Только воспроизведение старых подписанных DataItem: не ломаем ресинк истории.
|
||||
// Новый AddBlock (replayMode=false) обязательно проверяет минимум 4 символа.
|
||||
normalizedName = historicalName;
|
||||
} else {
|
||||
createChannelBody.checkForCreate();
|
||||
normalizedName = channelTypeCode == (CreateChannelBody.CHANNEL_TYPE_PERSONAL & 0xFFFF)
|
||||
? ChannelNameRules.requireValidDisplayNameForCreate(createChannelBody.channelName)
|
||||
: ChannelNameRules.requireValidPublicDisplayNameForCreate(createChannelBody.channelName);
|
||||
}
|
||||
slug = ChannelNameRules.toCanonicalSlug(normalizedName);
|
||||
} catch (IllegalArgumentException badName) {
|
||||
return new AddBlockResult(WireCodes.Status.BAD_REQUEST, "bad_channel_name", serverLastNum, serverLastHashHex);
|
||||
}
|
||||
|
||||
try {
|
||||
if (channelNameStateDAO.existsByOwnerTypeAndSlug(blockchainName, channelTypeCode, slug)) {
|
||||
if (!replayMode && channelNameStateDAO.existsByOwnerTypeAndSlug(blockchainName, channelTypeCode, slug)) {
|
||||
return new AddBlockResult(409, "channel_name_already_exists", serverLastNum, serverLastHashHex);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
@@ -443,7 +467,7 @@ public final class Net_AddBlock_Handler implements JsonMessageHandler {
|
||||
? ""
|
||||
: ChannelNameRules.normalizeDisplayName(createChannelBody.channelDescription);
|
||||
String avaAr = "";
|
||||
String avaSha256 = "";
|
||||
String avaPr = "";
|
||||
long avaSize = 0L;
|
||||
long metaUpdatedAtMs = 0L;
|
||||
if (channelTypeCode == (CreateChannelBody.CHANNEL_TYPE_PUBLIC & 0xFFFF)) {
|
||||
@@ -452,7 +476,7 @@ public final class Net_AddBlock_Handler implements JsonMessageHandler {
|
||||
displayName = createMeta.title();
|
||||
channelDescription = createMeta.description();
|
||||
avaAr = createMeta.avaAr();
|
||||
avaSha256 = createMeta.avaSha256();
|
||||
avaPr = createMeta.avaPr();
|
||||
avaSize = createMeta.avaSize();
|
||||
metaUpdatedAtMs = block.timestamp * 1000L;
|
||||
} catch (IllegalArgumentException e) {
|
||||
@@ -465,7 +489,7 @@ public final class Net_AddBlock_Handler implements JsonMessageHandler {
|
||||
channelNameStateEntry.setDisplayName(displayName);
|
||||
channelNameStateEntry.setChannelDescription(channelDescription);
|
||||
channelNameStateEntry.setAvaAr(avaAr);
|
||||
channelNameStateEntry.setAvaSha256(avaSha256);
|
||||
channelNameStateEntry.setAvaPr(avaPr);
|
||||
channelNameStateEntry.setAvaSize(avaSize);
|
||||
channelNameStateEntry.setMetaUpdatedAtMs(metaUpdatedAtMs);
|
||||
channelNameStateEntry.setOwnerLogin(login);
|
||||
@@ -508,7 +532,7 @@ public final class Net_AddBlock_Handler implements JsonMessageHandler {
|
||||
channelMetaUpdateEntry.setDisplayName(parsedMeta.title());
|
||||
channelMetaUpdateEntry.setChannelDescription(parsedMeta.description());
|
||||
channelMetaUpdateEntry.setAvaAr(parsedMeta.avaAr());
|
||||
channelMetaUpdateEntry.setAvaSha256(parsedMeta.avaSha256());
|
||||
channelMetaUpdateEntry.setAvaPr(parsedMeta.avaPr());
|
||||
channelMetaUpdateEntry.setAvaSize(parsedMeta.avaSize());
|
||||
channelMetaUpdateEntry.setMetaUpdatedAtMs(block.timestamp * 1000L);
|
||||
}
|
||||
|
||||
+10
-3
@@ -66,16 +66,23 @@ public final class BlockchainWriter {
|
||||
try (Connection c = shine.db.DbController.getInstance().getConnection()) {
|
||||
c.setAutoCommit(false);
|
||||
try {
|
||||
blocksDAO.insert(c, be);
|
||||
|
||||
// blocks_store имеет внешний ключ (login, fork_number) на
|
||||
// blockchain_state_store. Сначала создаём/обновляем runtime-state:
|
||||
// это позволяет без отдельной предварительной записи принять
|
||||
// самый первый HEADER ранее импортированной цепочки.
|
||||
st.setLastBlockNumber(block.blockNumber);
|
||||
st.setLastBlockHash(block.getHash32());
|
||||
st.setFileSizeBytes(st.getFileSizeBytes() + rawDataItem.length);
|
||||
st.setUpdatedAtMs(nowMs);
|
||||
stateDAO.upsert(c, st);
|
||||
|
||||
blocksDAO.insert(c, be);
|
||||
|
||||
if (userParamEntry != null) userParamsDAO.upsertIfNewer(c, userParamEntry);
|
||||
if (channelNameStateEntry != null) channelNameStateDAO.insert(c, channelNameStateEntry);
|
||||
if (channelNameStateEntry != null) {
|
||||
if (replayMode) channelNameStateDAO.insertOrReplaceWithNewerRoot(c, channelNameStateEntry);
|
||||
else channelNameStateDAO.insert(c, channelNameStateEntry);
|
||||
}
|
||||
if (channelMetaUpdateEntry != null) channelNameStateDAO.updateMeta(c, channelMetaUpdateEntry);
|
||||
if (notificationEntry != null) userNotificationsStateDAO.upsert(c, notificationEntry);
|
||||
|
||||
|
||||
+92
@@ -0,0 +1,92 @@
|
||||
package server.logic.ws_protocol.JSON.handlers.channels;
|
||||
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
/** Только проверка небезопасных входящих маркеров v=2. Исходный TEXT не переписывается. */
|
||||
final class AttachmentMarkerValidator {
|
||||
private static final Pattern ROOT = Pattern.compile("[1-9A-HJ-NP-Za-km-z]{32,44}");
|
||||
private static final Pattern SHA = Pattern.compile("[0-9a-f]{64}");
|
||||
private static final Pattern TX_ID = Pattern.compile("[A-Za-z0-9_-]{43}");
|
||||
private static final Pattern MIME = Pattern.compile("(?i)[a-z0-9!#$&^_.+-]+/[a-z0-9!#$&^_.+-]+");
|
||||
private static final Set<String> ALLOWED = Set.of("v", "nm", "sz", "pr", "sha256", "mm", "ar");
|
||||
|
||||
private AttachmentMarkerValidator() { }
|
||||
|
||||
static boolean validateLeadingV2Markers(String raw) {
|
||||
String text = raw == null ? "" : raw;
|
||||
int offset = 0;
|
||||
for (int i = 0; i < 10; i++) {
|
||||
String prefix;
|
||||
if (text.startsWith("<S:att;", offset)) prefix = "<S:att;";
|
||||
else if (text.startsWith("<S:attach;", offset)) prefix = "<S:attach;";
|
||||
else if (text.startsWith("<SHiNE:attach;", offset)) prefix = "<SHiNE:attach;";
|
||||
else return true;
|
||||
int start = offset + prefix.length();
|
||||
int end = text.indexOf('>', start);
|
||||
if (end < 0 || end - start > 2048 || text.substring(start, end).contains("\n")) return false;
|
||||
String fields = text.substring(start, end);
|
||||
if (java.util.Arrays.stream(fields.split(";", -1)).anyMatch(field -> field.matches("v\\s*=\\s*0*2"))) {
|
||||
if (!validateV2(fields)) return false;
|
||||
}
|
||||
offset = end + 1;
|
||||
if (offset >= text.length()) return true;
|
||||
if (text.charAt(offset) != '\n') return false;
|
||||
offset++;
|
||||
}
|
||||
// Больше десяти технических тегов трактуем как недопустимые метаданные.
|
||||
return !text.startsWith("<S:att;", offset) && !text.startsWith("<S:attach;", offset)
|
||||
&& !text.startsWith("<SHiNE:attach;", offset);
|
||||
}
|
||||
|
||||
private static boolean validateV2(String rawFields) {
|
||||
String[] fields = rawFields.split(";", -1);
|
||||
if (fields.length < 4 || !fields[0].equals("v=2")) return false;
|
||||
Set<String> seen = new HashSet<>();
|
||||
String name = null, size = null, root = null, sha = null, mime = null, ar = null;
|
||||
for (String part : fields) {
|
||||
int index = part.indexOf('=');
|
||||
if (index <= 0 || part.indexOf('=', index + 1) >= 0) return false;
|
||||
String key = part.substring(0, index);
|
||||
String value = part.substring(index + 1);
|
||||
if (!ALLOWED.contains(key) || !seen.add(key) || value.isEmpty()) return false;
|
||||
switch (key) {
|
||||
case "v": if (!value.equals("2")) return false; break;
|
||||
case "nm": name = value; break;
|
||||
case "sz": size = value; break;
|
||||
case "pr": root = value; break;
|
||||
case "sha256": sha = value; break;
|
||||
case "mm": mime = value; break;
|
||||
case "ar": ar = value; break;
|
||||
default: return false;
|
||||
}
|
||||
}
|
||||
if (name == null || size == null || !seen.contains("v") || (root == null) == (sha == null)) return false;
|
||||
if (!size.matches("[1-9][0-9]{0,18}")) return false;
|
||||
try { if (Long.parseLong(size) < 1) return false; } catch (NumberFormatException e) { return false; }
|
||||
if (root != null && !ROOT.matcher(root).matches()) return false;
|
||||
if (sha != null && !SHA.matcher(sha).matches()) return false;
|
||||
if (mime != null && (mime.length() > 127 || !MIME.matcher(mime).matches())) return false;
|
||||
if (ar != null && !TX_ID.matcher(ar).matches()) return false;
|
||||
|
||||
StringBuilder decoded = new StringBuilder();
|
||||
for (int i = 0; i < name.length(); i++) {
|
||||
char ch = name.charAt(i);
|
||||
if (ch == '%') {
|
||||
if (i + 2 >= name.length()) return false;
|
||||
String code = name.substring(i + 1, i + 3).toUpperCase(java.util.Locale.ROOT);
|
||||
ch = switch (code) {
|
||||
case "25" -> '%'; case "3B" -> ';'; case "3D" -> '=';
|
||||
case "3C" -> '<'; case "3E" -> '>'; default -> 0;
|
||||
};
|
||||
if (ch == 0) return false;
|
||||
i += 2;
|
||||
} else if (ch == '<' || ch == '>' || ch == '=' || ch == ';') return false;
|
||||
if (ch < 32 || ch == 127) return false;
|
||||
decoded.append(ch);
|
||||
}
|
||||
return decoded.toString().getBytes(StandardCharsets.UTF_8).length <= 255;
|
||||
}
|
||||
}
|
||||
+17
-12
@@ -1,5 +1,6 @@
|
||||
package server.logic.ws_protocol.JSON.handlers.channels;
|
||||
|
||||
import server.logic.ws_protocol.JSON.handlers.avatars.PiecesRootValidator;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
@@ -15,7 +16,7 @@ public final class ChannelMetaTextParser {
|
||||
String text = String.valueOf(rawText == null ? "" : rawText);
|
||||
String title = "";
|
||||
String avaAr = "";
|
||||
String avaSha256 = "";
|
||||
String avaPr = "";
|
||||
long avaSize = 0L;
|
||||
boolean seenTitle = false;
|
||||
boolean seenAvatar = false;
|
||||
@@ -33,10 +34,14 @@ public final class ChannelMetaTextParser {
|
||||
} else if (body.startsWith("avatar;") || body.startsWith("ava;")) {
|
||||
if (seenAvatar) throw new IllegalArgumentException("duplicate_channel_meta_avatar");
|
||||
seenAvatar = true;
|
||||
Avatar avatar = parseAvatarTag(body);
|
||||
avaAr = avatar.ar;
|
||||
avaSha256 = avatar.sha256;
|
||||
avaSize = avatar.size;
|
||||
// Old SHA/hex avatars are not supported. Ignore just the avatar, not the whole channel.
|
||||
// Otherwise rebuilding the index from an old channel block would remove that channel.
|
||||
if (!body.matches("(?:ava|avatar);v=1;.*")) {
|
||||
Avatar avatar = parseAvatarTag(body);
|
||||
avaAr = avatar.ar;
|
||||
avaPr = avatar.pr;
|
||||
avaSize = avatar.size;
|
||||
}
|
||||
} else {
|
||||
throw new IllegalArgumentException("unknown_channel_meta_tag");
|
||||
}
|
||||
@@ -52,7 +57,7 @@ public final class ChannelMetaTextParser {
|
||||
String cleanTitle = title.isBlank() ? String.valueOf(fallbackTitle == null ? "" : fallbackTitle).trim() : title.trim();
|
||||
validateTitle(cleanTitle);
|
||||
|
||||
return new Parsed(cleanTitle, description, avaAr, avaSha256, avaSize);
|
||||
return new Parsed(cleanTitle, description, avaAr, avaPr, avaSize);
|
||||
}
|
||||
|
||||
private static String parseTitleTag(String body) {
|
||||
@@ -68,12 +73,12 @@ public final class ChannelMetaTextParser {
|
||||
? body.substring("ava;".length())
|
||||
: body.substring("avatar;".length());
|
||||
Map<String, String> fields = parseFields(rawFields);
|
||||
if (!"1".equals(fields.get("v"))) throw new IllegalArgumentException("bad_channel_meta_avatar_version");
|
||||
if (!"2".equals(fields.get("v"))) throw new IllegalArgumentException("bad_channel_meta_avatar_version");
|
||||
String ar = String.valueOf(fields.getOrDefault("ar", "")).trim();
|
||||
String sha256 = String.valueOf(fields.getOrDefault("sha256", "")).trim().toLowerCase();
|
||||
String pr = String.valueOf(fields.getOrDefault("pr", "")).trim();
|
||||
String sizeRaw = String.valueOf(fields.containsKey("sz") ? fields.get("sz") : fields.getOrDefault("size", "")).trim();
|
||||
if (!ar.isEmpty() && !ar.matches("^[A-Za-z0-9_-]{43}$")) throw new IllegalArgumentException("bad_channel_meta_avatar_ar");
|
||||
if (!sha256.matches("^[0-9a-f]{64}$")) throw new IllegalArgumentException("bad_channel_meta_avatar_sha256");
|
||||
if (!PiecesRootValidator.valid(pr)) throw new IllegalArgumentException("bad_channel_meta_avatar_pr");
|
||||
long size;
|
||||
try {
|
||||
size = Long.parseLong(sizeRaw);
|
||||
@@ -81,7 +86,7 @@ public final class ChannelMetaTextParser {
|
||||
throw new IllegalArgumentException("bad_channel_meta_avatar_size");
|
||||
}
|
||||
if (size <= 0L) throw new IllegalArgumentException("bad_channel_meta_avatar_size");
|
||||
return new Avatar(ar, sha256, size);
|
||||
return new Avatar(ar, pr, size);
|
||||
}
|
||||
|
||||
private static boolean startsWithTagPrefix(String text, int offset) {
|
||||
@@ -122,7 +127,7 @@ public final class ChannelMetaTextParser {
|
||||
return String.valueOf(value == null ? "" : value).codePointCount(0, String.valueOf(value == null ? "" : value).length());
|
||||
}
|
||||
|
||||
private record Avatar(String ar, String sha256, long size) {}
|
||||
private record Avatar(String ar, String pr, long size) {}
|
||||
|
||||
public record Parsed(String title, String description, String avaAr, String avaSha256, long avaSize) {}
|
||||
public record Parsed(String title, String description, String avaAr, String avaPr, long avaSize) {}
|
||||
}
|
||||
|
||||
+49
-40
@@ -41,7 +41,8 @@ public final class ChannelNamesStateBootstrapper {
|
||||
private static void rebuildFromBlocksOrThrow() {
|
||||
ChannelNameStateDAO dao = ChannelNameStateDAO.getInstance();
|
||||
List<ChannelNameStateEntry> entries = new ArrayList<>();
|
||||
Map<String, String> slugToIdentity = new LinkedHashMap<>();
|
||||
Map<String, ChannelNameStateEntry> entriesByOwnerTypeSlug = new LinkedHashMap<>();
|
||||
Map<ChannelRoot, ChannelNameStateEntry> replacedRoots = new LinkedHashMap<>();
|
||||
List<String> conflicts = new ArrayList<>();
|
||||
List<String> skipped = new ArrayList<>();
|
||||
|
||||
@@ -49,14 +50,7 @@ public final class ChannelNamesStateBootstrapper {
|
||||
SELECT login, bch_name, block_number, block_hash, block_bytes
|
||||
FROM blocks
|
||||
WHERE msg_type = ? AND msg_sub_type = ?
|
||||
AND fork_number=shine_canonical_fork(
|
||||
login,
|
||||
(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER
|
||||
FROM solana_user_pda_current
|
||||
WHERE LOWER(login)=LOWER(blocks.login)
|
||||
LIMIT 1),
|
||||
block_number
|
||||
)
|
||||
AND fork_number=shine_active_fork(login, block_number)
|
||||
ORDER BY LOWER(login), block_number
|
||||
""";
|
||||
|
||||
@@ -92,7 +86,7 @@ public final class ChannelNamesStateBootstrapper {
|
||||
final int channelTypeCode;
|
||||
final int channelTypeVersion;
|
||||
String avaAr = "";
|
||||
String avaSha256 = "";
|
||||
String avaPr = "";
|
||||
long avaSize = 0L;
|
||||
long metaUpdatedAtMs = 0L;
|
||||
try {
|
||||
@@ -106,7 +100,7 @@ public final class ChannelNamesStateBootstrapper {
|
||||
displayName = createMeta.title();
|
||||
channelDescription = createMeta.description();
|
||||
avaAr = createMeta.avaAr();
|
||||
avaSha256 = createMeta.avaSha256();
|
||||
avaPr = createMeta.avaPr();
|
||||
avaSize = createMeta.avaSize();
|
||||
metaUpdatedAtMs = parsed.timestamp * 1000L;
|
||||
}
|
||||
@@ -115,20 +109,12 @@ public final class ChannelNamesStateBootstrapper {
|
||||
continue;
|
||||
}
|
||||
|
||||
String identity = ownerBch + "#" + blockNumber;
|
||||
String ownerTypeSlug = ownerLogin.toLowerCase(Locale.ROOT) + "|" + channelTypeCode + "|" + slug;
|
||||
String existing = slugToIdentity.putIfAbsent(ownerTypeSlug, identity);
|
||||
if (existing != null && !existing.equals(identity)) {
|
||||
conflicts.add("owner/type/slug=\"" + ownerTypeSlug + "\" conflicts: " + existing + " vs " + identity);
|
||||
continue;
|
||||
}
|
||||
|
||||
ChannelNameStateEntry entry = new ChannelNameStateEntry();
|
||||
entry.setSlug(slug);
|
||||
entry.setDisplayName(displayName);
|
||||
entry.setChannelDescription(channelDescription == null ? "" : channelDescription);
|
||||
entry.setAvaAr(avaAr);
|
||||
entry.setAvaSha256(avaSha256);
|
||||
entry.setAvaPr(avaPr);
|
||||
entry.setAvaSize(avaSize);
|
||||
entry.setMetaUpdatedAtMs(metaUpdatedAtMs);
|
||||
entry.setOwnerLogin(ownerLogin);
|
||||
@@ -138,18 +124,28 @@ public final class ChannelNamesStateBootstrapper {
|
||||
entry.setChannelRootBlockNumber(blockNumber);
|
||||
entry.setChannelRootBlockHash(blockHash);
|
||||
entry.setCreatedAtMs(parsed.timestamp * 1000L);
|
||||
entries.add(entry);
|
||||
String ownerTypeSlug = ownerLogin.toLowerCase(Locale.ROOT) + "|" + channelTypeCode + "|" + slug;
|
||||
ChannelNameStateEntry previous = entriesByOwnerTypeSlug.put(ownerTypeSlug, entry);
|
||||
if (previous != null) {
|
||||
replacedRoots.put(new ChannelRoot(previous.getOwnerBlockchainName(), previous.getChannelRootBlockNumber(), previous.getChannelRootBlockHash()), entry);
|
||||
conflicts.add("owner/type/slug=\"" + ownerTypeSlug + "\" conflicts: "
|
||||
+ previous.getOwnerBlockchainName() + "#" + previous.getChannelRootBlockNumber()
|
||||
+ " vs " + ownerBch + "#" + blockNumber + "; kept newest root");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
entries.addAll(entriesByOwnerTypeSlug.values());
|
||||
|
||||
dao.clearAll(c);
|
||||
dao.insertAll(c, entries);
|
||||
redirectFollowedChannelRoots(c, replacedRoots);
|
||||
|
||||
applyMetaUpdates(c, dao, entries, skipped);
|
||||
applyDeletionStates(c, dao, skipped);
|
||||
// v18: counters are a projection, so rebuild them from current state after a full channel-name bootstrap.
|
||||
try (PreparedStatement ps = c.prepareStatement("SELECT shine_refresh_user_stats(login) FROM solana_user_pda_current")) {
|
||||
try (PreparedStatement ps = c.prepareStatement("SELECT shine_refresh_user_stats(login) FROM user_identity_current")) {
|
||||
ps.execute();
|
||||
}
|
||||
try (PreparedStatement ps = c.prepareStatement("""
|
||||
@@ -162,7 +158,7 @@ public final class ChannelNamesStateBootstrapper {
|
||||
c.commit();
|
||||
log.info("channel_names_state bootstrapped: {}", entries.size());
|
||||
if (!conflicts.isEmpty()) {
|
||||
log.warn("channel_names_state bootstrap detected {} slug conflicts (kept first occurrence)", conflicts.size());
|
||||
log.warn("channel_names_state bootstrap detected {} slug conflicts (kept newest root)", conflicts.size());
|
||||
int preview = Math.min(conflicts.size(), 10);
|
||||
for (int i = 0; i < preview; i++) {
|
||||
log.warn("channel_names_state conflict: {}", conflicts.get(i));
|
||||
@@ -192,19 +188,37 @@ public final class ChannelNamesStateBootstrapper {
|
||||
}
|
||||
}
|
||||
|
||||
/** Connections are a mutable projection. Keep follows on the current root when a legacy duplicate is replaced. */
|
||||
private static void redirectFollowedChannelRoots(Connection c,
|
||||
Map<ChannelRoot, ChannelNameStateEntry> replacedRoots) throws Exception {
|
||||
String sql = """
|
||||
UPDATE connections_state
|
||||
SET to_block_number = ?, to_block_hash = ?
|
||||
WHERE LOWER(to_login) = LOWER(?)
|
||||
AND to_block_number = ?
|
||||
AND to_block_hash = ?
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
for (Map.Entry<ChannelRoot, ChannelNameStateEntry> replacement : replacedRoots.entrySet()) {
|
||||
ChannelRoot oldRoot = replacement.getKey();
|
||||
ChannelNameStateEntry current = replacement.getValue();
|
||||
ps.setInt(1, current.getChannelRootBlockNumber());
|
||||
ps.setBytes(2, current.getChannelRootBlockHash());
|
||||
ps.setString(3, current.getOwnerLogin());
|
||||
ps.setInt(4, oldRoot.blockNumber());
|
||||
ps.setBytes(5, oldRoot.blockHash());
|
||||
ps.addBatch();
|
||||
}
|
||||
ps.executeBatch();
|
||||
}
|
||||
}
|
||||
|
||||
private static void applyDeletionStates(Connection c, ChannelNameStateDAO dao, List<String> skipped) throws Exception {
|
||||
String sql = """
|
||||
SELECT bch_name, block_number, block_bytes, msg_sub_type
|
||||
FROM blocks
|
||||
WHERE msg_type = ? AND msg_sub_type IN (?, ?, ?, ?, ?, ?, ?)
|
||||
AND fork_number=shine_canonical_fork(
|
||||
login,
|
||||
(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER
|
||||
FROM solana_user_pda_current
|
||||
WHERE LOWER(login)=LOWER(blocks.login)
|
||||
LIMIT 1),
|
||||
block_number
|
||||
)
|
||||
AND fork_number=shine_active_fork(login, block_number)
|
||||
ORDER BY LOWER(login), block_number
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
@@ -233,6 +247,8 @@ public final class ChannelNamesStateBootstrapper {
|
||||
}
|
||||
}
|
||||
|
||||
private record ChannelRoot(String ownerBlockchainName, int blockNumber, byte[] blockHash) {}
|
||||
|
||||
private static void applyMetaUpdates(Connection c,
|
||||
ChannelNameStateDAO dao,
|
||||
List<ChannelNameStateEntry> entries,
|
||||
@@ -246,14 +262,7 @@ public final class ChannelNamesStateBootstrapper {
|
||||
SELECT login, bch_name, block_number, block_bytes
|
||||
FROM blocks
|
||||
WHERE msg_type = ? AND msg_sub_type = ?
|
||||
AND fork_number=shine_canonical_fork(
|
||||
login,
|
||||
(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER
|
||||
FROM solana_user_pda_current
|
||||
WHERE LOWER(login)=LOWER(blocks.login)
|
||||
LIMIT 1),
|
||||
block_number
|
||||
)
|
||||
AND fork_number=shine_active_fork(login, block_number)
|
||||
ORDER BY LOWER(login), block_number
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
@@ -280,7 +289,7 @@ public final class ChannelNamesStateBootstrapper {
|
||||
update.setDisplayName(parsedMeta.title());
|
||||
update.setChannelDescription(parsedMeta.description());
|
||||
update.setAvaAr(parsedMeta.avaAr());
|
||||
update.setAvaSha256(parsedMeta.avaSha256());
|
||||
update.setAvaPr(parsedMeta.avaPr());
|
||||
update.setAvaSize(parsedMeta.avaSize());
|
||||
update.setMetaUpdatedAtMs(parsed.timestamp * 1000L);
|
||||
dao.updateMeta(c, update);
|
||||
|
||||
+46
-22
@@ -5,6 +5,7 @@ import blockchain.body.BodyRecord;
|
||||
import blockchain.body.CreateChannelBody;
|
||||
import blockchain.body.TextLineBody;
|
||||
import blockchain.body.TextReplyBody;
|
||||
import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetChannelMessages_Response;
|
||||
import shine.db.channels.ChannelNameRules;
|
||||
import shine.db.MsgSubType;
|
||||
import shine.db.sql.CurrentUsersSql;
|
||||
@@ -68,7 +69,7 @@ final class ChannelsReadSupport {
|
||||
|
||||
String stateSql = """
|
||||
SELECT slug, display_name, channel_description, channel_type_code, channel_type_version,
|
||||
created_at_ms, ava_ar, ava_sha256, ava_size, meta_updated_at_ms, is_deleted, deleted_at_ms, deleted_block_number
|
||||
created_at_ms, ava_ar, ava_pr, ava_size, meta_updated_at_ms, is_deleted, deleted_at_ms, deleted_block_number
|
||||
FROM channel_names_state
|
||||
WHERE LOWER(owner_login)=LOWER(?) AND channel_root_block_number = ?
|
||||
LIMIT 1
|
||||
@@ -85,7 +86,7 @@ final class ChannelsReadSupport {
|
||||
meta.channelTypeVersion = rs.getInt("channel_type_version");
|
||||
meta.createdAtMs = rs.getLong("created_at_ms");
|
||||
meta.avaAr = String.valueOf(rs.getString("ava_ar") == null ? "" : rs.getString("ava_ar"));
|
||||
meta.avaSha256 = String.valueOf(rs.getString("ava_sha256") == null ? "" : rs.getString("ava_sha256"));
|
||||
meta.avaPr = String.valueOf(rs.getString("ava_pr") == null ? "" : rs.getString("ava_pr"));
|
||||
meta.avaSize = rs.getLong("ava_size");
|
||||
meta.metaUpdatedAtMs = rs.getLong("meta_updated_at_ms");
|
||||
meta.deleted = rs.getBoolean("is_deleted");
|
||||
@@ -101,7 +102,7 @@ final class ChannelsReadSupport {
|
||||
String sql = """
|
||||
SELECT block_bytes FROM blocks
|
||||
WHERE LOWER(login)=LOWER(?) AND block_number=?
|
||||
AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM solana_user_pda_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number)
|
||||
AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM user_identity_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number)
|
||||
LIMIT 1
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
@@ -130,7 +131,7 @@ final class ChannelsReadSupport {
|
||||
meta.displayName = parsedMeta.title();
|
||||
meta.channelDescription = parsedMeta.description();
|
||||
meta.avaAr = parsedMeta.avaAr();
|
||||
meta.avaSha256 = parsedMeta.avaSha256();
|
||||
meta.avaPr = parsedMeta.avaPr();
|
||||
meta.avaSize = parsedMeta.avaSize();
|
||||
meta.createdAtMs = e.timestamp * 1000L;
|
||||
meta.metaUpdatedAtMs = e.timestamp * 1000L;
|
||||
@@ -156,7 +157,7 @@ final class ChannelsReadSupport {
|
||||
String sql = """
|
||||
SELECT COUNT(*) AS cnt FROM blocks
|
||||
WHERE LOWER(login)=LOWER(?) AND msg_type=? AND msg_sub_type IN (?, ?, ?, ?, ?, ?) AND line_code=?
|
||||
AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM solana_user_pda_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number)
|
||||
AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM user_identity_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number)
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
String login=loginFromChainName(ownerBch); ps.setString(1,login); ps.setInt(2,MSG_TYPE_TEXT); ps.setInt(3,MsgSubType.TEXT_POST); ps.setInt(4,MsgSubType.TEXT_REPOST); ps.setInt(5,MsgSubType.TEXT_ENTRYPOINT); ps.setInt(6,MsgSubType.TEXT_EXERCISE); ps.setInt(7,MsgSubType.TEXT_SERVICE); ps.setInt(8,MsgSubType.TEXT_COURSE); ps.setInt(9,lineCode); ps.setString(10,login);
|
||||
@@ -176,7 +177,7 @@ final class ChannelsReadSupport {
|
||||
String sql="""
|
||||
SELECT login,bch_name,block_number,block_hash,block_bytes,this_line_number FROM blocks
|
||||
WHERE LOWER(login)=LOWER(?) AND msg_type=? AND msg_sub_type IN (?, ?, ?, ?, ?, ?) AND line_code=?
|
||||
AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM solana_user_pda_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number)
|
||||
AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM user_identity_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number)
|
||||
ORDER BY block_number DESC LIMIT 1
|
||||
""";
|
||||
try(PreparedStatement ps=c.prepareStatement(sql)){String login=loginFromChainName(ownerBch);ps.setString(1,login);ps.setInt(2,MSG_TYPE_TEXT);ps.setInt(3,MsgSubType.TEXT_POST);ps.setInt(4,MsgSubType.TEXT_REPOST);ps.setInt(5,MsgSubType.TEXT_ENTRYPOINT);ps.setInt(6,MsgSubType.TEXT_EXERCISE);ps.setInt(7,MsgSubType.TEXT_SERVICE);ps.setInt(8,MsgSubType.TEXT_COURSE);ps.setInt(9,lineCode);ps.setString(10,login);try(ResultSet rs=ps.executeQuery()){if(!rs.next())return null;PostBlock pb=new PostBlock();pb.login=rs.getString("login");pb.bchName=rs.getString("bch_name");pb.blockNumber=rs.getInt("block_number");pb.blockHash=rs.getBytes("block_hash");pb.blockBytes=rs.getBytes("block_bytes");return pb;}}
|
||||
@@ -188,7 +189,7 @@ final class ChannelsReadSupport {
|
||||
FROM blocks
|
||||
WHERE LOWER(login)=LOWER(?) AND msg_type=? AND msg_sub_type=?
|
||||
AND to_block_number=? AND to_block_hash=?
|
||||
AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM solana_user_pda_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number)
|
||||
AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM user_identity_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number)
|
||||
ORDER BY block_number DESC
|
||||
LIMIT 1
|
||||
""";
|
||||
@@ -226,6 +227,7 @@ final class ChannelsReadSupport {
|
||||
} else if (e.body instanceof blockchain.body.StatusActionBody sab) {
|
||||
ti.text = sab.message;
|
||||
}
|
||||
ti.attachmentMetadataValid = AttachmentMarkerValidator.validateLeadingV2Markers(ti.text);
|
||||
return ti;
|
||||
} catch (Exception ex) {
|
||||
return new TextInfo();
|
||||
@@ -236,10 +238,10 @@ final class ChannelsReadSupport {
|
||||
String order = asc ? "ASC" : "DESC";
|
||||
boolean bounded = limit > 0;
|
||||
String sql = """
|
||||
SELECT login,bch_name,block_number,block_hash,block_bytes,to_bch_name,to_block_number,to_block_hash,msg_sub_type,this_line_number
|
||||
SELECT login,bch_name,block_number,block_hash,block_bytes,data_item_id,arweave_publish_pending,arweave_published_at_ms,to_bch_name,to_block_number,to_block_hash,msg_sub_type,this_line_number
|
||||
FROM blocks
|
||||
WHERE LOWER(login)=LOWER(?) AND msg_type=? AND msg_sub_type IN (?, ?, ?, ?, ?, ?) AND line_code=?
|
||||
AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM solana_user_pda_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number)
|
||||
AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM user_identity_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number)
|
||||
ORDER BY block_number
|
||||
""" + order + (bounded ? " LIMIT ?" : "");
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
@@ -263,6 +265,9 @@ final class ChannelsReadSupport {
|
||||
pb.blockNumber = rs.getInt("block_number");
|
||||
pb.blockHash = rs.getBytes("block_hash");
|
||||
pb.blockBytes = rs.getBytes("block_bytes");
|
||||
pb.dataItemId = rs.getBytes("data_item_id");
|
||||
pb.arweavePublishPending = rs.getBoolean("arweave_publish_pending");
|
||||
pb.arweavePublishedAtMs = (Long) rs.getObject("arweave_published_at_ms");
|
||||
pb.toBchName = rs.getString("to_bch_name");
|
||||
pb.toBlockNumber = (Integer) rs.getObject("to_block_number");
|
||||
pb.toBlockHash = rs.getBytes("to_block_hash");
|
||||
@@ -286,11 +291,11 @@ final class ChannelsReadSupport {
|
||||
|
||||
static List<PostBlock> versionsForPost(Connection c, String ownerBch, int originalBlock, byte[] originalHash) throws SQLException {
|
||||
String sql = """
|
||||
SELECT login,bch_name,block_number,block_hash,block_bytes
|
||||
SELECT login,bch_name,block_number,block_hash,block_bytes,data_item_id,arweave_publish_pending,arweave_published_at_ms
|
||||
FROM blocks
|
||||
WHERE LOWER(login)=LOWER(?) AND msg_type=? AND msg_sub_type=?
|
||||
AND to_block_number=? AND to_block_hash=?
|
||||
AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM solana_user_pda_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number)
|
||||
AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM user_identity_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number)
|
||||
ORDER BY block_number ASC
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
@@ -309,6 +314,9 @@ final class ChannelsReadSupport {
|
||||
pb.blockNumber = rs.getInt("block_number");
|
||||
pb.blockHash = rs.getBytes("block_hash");
|
||||
pb.blockBytes = rs.getBytes("block_bytes");
|
||||
pb.dataItemId = rs.getBytes("data_item_id");
|
||||
pb.arweavePublishPending = rs.getBoolean("arweave_publish_pending");
|
||||
pb.arweavePublishedAtMs = (Long) rs.getObject("arweave_published_at_ms");
|
||||
out.add(pb);
|
||||
}
|
||||
return out;
|
||||
@@ -343,7 +351,7 @@ final class ChannelsReadSupport {
|
||||
AND LOWER(to_login) = LOWER(?)
|
||||
AND to_block_number = ?
|
||||
AND to_block_hash = ?
|
||||
AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM solana_user_pda_current WHERE LOWER(login)=LOWER(blocks.login) LIMIT 1),block_number)
|
||||
AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM user_identity_current WHERE LOWER(login)=LOWER(blocks.login) LIMIT 1),block_number)
|
||||
""";
|
||||
int ratingsCount = 0;
|
||||
try (PreparedStatement ps = c.prepareStatement(ratingsSql)) {
|
||||
@@ -390,7 +398,7 @@ final class ChannelsReadSupport {
|
||||
String sql = """
|
||||
SELECT block_bytes FROM blocks
|
||||
WHERE LOWER(login)=LOWER(?) AND block_number=?
|
||||
AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM solana_user_pda_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number)
|
||||
AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM user_identity_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number)
|
||||
LIMIT 1
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
@@ -467,7 +475,7 @@ final class ChannelsReadSupport {
|
||||
SELECT login,bch_name,block_number,block_hash,block_bytes,this_line_number
|
||||
FROM blocks
|
||||
WHERE LOWER(login)=LOWER(?) AND msg_type=? AND msg_sub_type=? AND block_number=?
|
||||
AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM solana_user_pda_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number)
|
||||
AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM user_identity_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number)
|
||||
LIMIT 1
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(rootSql)) {
|
||||
@@ -497,7 +505,7 @@ final class ChannelsReadSupport {
|
||||
event.title = parsedMeta.title();
|
||||
event.description = parsedMeta.description();
|
||||
event.avaAr = parsedMeta.avaAr();
|
||||
event.avaSha256 = parsedMeta.avaSha256();
|
||||
event.avaPr = parsedMeta.avaPr();
|
||||
event.avaSize = parsedMeta.avaSize();
|
||||
}
|
||||
}
|
||||
@@ -509,7 +517,7 @@ final class ChannelsReadSupport {
|
||||
}
|
||||
if (event.description == null) event.description = "";
|
||||
if (event.avaAr == null) event.avaAr = "";
|
||||
if (event.avaSha256 == null) event.avaSha256 = "";
|
||||
if (event.avaPr == null) event.avaPr = "";
|
||||
out.add(event);
|
||||
}
|
||||
}
|
||||
@@ -519,7 +527,7 @@ final class ChannelsReadSupport {
|
||||
SELECT login,bch_name,block_number,block_hash,block_bytes,this_line_number
|
||||
FROM blocks
|
||||
WHERE LOWER(login)=LOWER(?) AND msg_type=? AND msg_sub_type=? AND line_code=?
|
||||
AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM solana_user_pda_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number)
|
||||
AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM user_identity_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number)
|
||||
ORDER BY block_number ASC
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
@@ -545,7 +553,7 @@ final class ChannelsReadSupport {
|
||||
event.title = parsed.title();
|
||||
event.description = parsed.description();
|
||||
event.avaAr = parsed.avaAr();
|
||||
event.avaSha256 = parsed.avaSha256();
|
||||
event.avaPr = parsed.avaPr();
|
||||
event.avaSize = parsed.avaSize();
|
||||
out.add(event);
|
||||
} catch (Exception ignored) {
|
||||
@@ -559,7 +567,7 @@ final class ChannelsReadSupport {
|
||||
SELECT login,bch_name,block_number,block_hash,block_bytes,this_line_number
|
||||
FROM blocks
|
||||
WHERE LOWER(login)=LOWER(?) AND msg_type=? AND msg_sub_type=? AND line_code=?
|
||||
AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM solana_user_pda_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number)
|
||||
AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM user_identity_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number)
|
||||
ORDER BY block_number ASC
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(deleteSql)) {
|
||||
@@ -595,7 +603,7 @@ final class ChannelsReadSupport {
|
||||
|
||||
String partnerBchSql = """
|
||||
SELECT blockchain_name
|
||||
FROM solana_user_pda_current
|
||||
FROM user_identity_current
|
||||
WHERE LOWER(login) = LOWER(?)
|
||||
LIMIT 1
|
||||
""";
|
||||
@@ -703,12 +711,27 @@ final class ChannelsReadSupport {
|
||||
|| subType == MsgSubType.TEXT_COURSE;
|
||||
}
|
||||
|
||||
static String dataItemIdBase64Url(byte[] bytes) {
|
||||
return bytes != null && bytes.length == 32
|
||||
? java.util.Base64.getUrlEncoder().withoutPadding().encodeToString(bytes) : null;
|
||||
}
|
||||
|
||||
static void setStorageInfo(Net_GetChannelMessages_Response.VersionItem out, byte[] id, boolean pending, Long publishedAt, byte[] raw) {
|
||||
out.setArweaveDataItemId(dataItemIdBase64Url(id));
|
||||
out.setArweavePublishPending(pending);
|
||||
out.setArweavePublishedAtMs(publishedAt);
|
||||
out.setSignedDataItemBytes(raw == null ? null : raw.length);
|
||||
}
|
||||
|
||||
static final class PostBlock {
|
||||
String login;
|
||||
String bchName;
|
||||
int blockNumber;
|
||||
byte[] blockHash;
|
||||
byte[] blockBytes;
|
||||
byte[] dataItemId;
|
||||
boolean arweavePublishPending;
|
||||
Long arweavePublishedAtMs;
|
||||
String toBchName;
|
||||
Integer toBlockNumber;
|
||||
byte[] toBlockHash;
|
||||
@@ -717,6 +740,7 @@ final class ChannelsReadSupport {
|
||||
}
|
||||
|
||||
static final class TextInfo {
|
||||
boolean attachmentMetadataValid = true;
|
||||
String text = "";
|
||||
long createdAtMs = 0L;
|
||||
}
|
||||
@@ -728,7 +752,7 @@ final class ChannelsReadSupport {
|
||||
int channelTypeCode;
|
||||
int channelTypeVersion;
|
||||
String avaAr = "";
|
||||
String avaSha256 = "";
|
||||
String avaPr = "";
|
||||
long avaSize = 0L;
|
||||
long createdAtMs = 0L;
|
||||
long metaUpdatedAtMs = 0L;
|
||||
@@ -748,7 +772,7 @@ final class ChannelsReadSupport {
|
||||
String title;
|
||||
String description;
|
||||
String avaAr;
|
||||
String avaSha256;
|
||||
String avaPr;
|
||||
long avaSize;
|
||||
}
|
||||
|
||||
|
||||
+11
-2
@@ -67,7 +67,7 @@ public class Net_GetChannelMessages_Handler implements JsonMessageHandler {
|
||||
channel.setDisplayName(meta.displayName == null || meta.displayName.isBlank() ? meta.channelName : meta.displayName);
|
||||
channel.setChannelDescription(meta.channelDescription);
|
||||
channel.setAvaAr(meta.avaAr);
|
||||
channel.setAvaSha256(meta.avaSha256);
|
||||
channel.setAvaPr(meta.avaPr);
|
||||
channel.setAvaSize(meta.avaSize);
|
||||
channel.setMetaUpdatedAtMs(meta.metaUpdatedAtMs);
|
||||
channel.setCreatedAtMs(meta.createdAtMs);
|
||||
@@ -98,7 +98,7 @@ public class Net_GetChannelMessages_Handler implements JsonMessageHandler {
|
||||
outEvent.setTitle(event.title);
|
||||
outEvent.setDescription(event.description);
|
||||
outEvent.setAvaAr(event.avaAr);
|
||||
outEvent.setAvaSha256(event.avaSha256);
|
||||
outEvent.setAvaPr(event.avaPr);
|
||||
outEvent.setAvaSize(event.avaSize);
|
||||
metaEvents.add(outEvent);
|
||||
}
|
||||
@@ -152,7 +152,9 @@ public class Net_GetChannelMessages_Handler implements JsonMessageHandler {
|
||||
v1.setBlockNumber(post.blockNumber);
|
||||
v1.setBlockHash(ChannelsReadSupport.toHex(post.blockHash));
|
||||
v1.setText(postText.text);
|
||||
v1.setAttachmentMetadataValid(postText.attachmentMetadataValid);
|
||||
v1.setCreatedAtMs(postText.createdAtMs);
|
||||
ChannelsReadSupport.setStorageInfo(v1, post.dataItemId, post.arweavePublishPending, post.arweavePublishedAtMs, post.blockBytes);
|
||||
versionsOut.add(v1);
|
||||
|
||||
if (ChannelsReadSupport.supportsEditPostVersions(post.msgSubType)) {
|
||||
@@ -164,13 +166,20 @@ public class Net_GetChannelMessages_Handler implements JsonMessageHandler {
|
||||
ve.setBlockNumber(edit.blockNumber);
|
||||
ve.setBlockHash(ChannelsReadSupport.toHex(edit.blockHash));
|
||||
ve.setText(editText.text);
|
||||
ve.setAttachmentMetadataValid(editText.attachmentMetadataValid);
|
||||
ve.setCreatedAtMs(editText.createdAtMs);
|
||||
ChannelsReadSupport.setStorageInfo(ve, edit.dataItemId, edit.arweavePublishPending, edit.arweavePublishedAtMs, edit.blockBytes);
|
||||
versionsOut.add(ve);
|
||||
}
|
||||
}
|
||||
|
||||
item.setVersions(versionsOut);
|
||||
item.setVersionsTotal(versionsOut.size());
|
||||
item.setAttachmentMetadataValid(v1.isAttachmentMetadataValid());
|
||||
item.setArweaveDataItemId(v1.getArweaveDataItemId());
|
||||
item.setArweavePublishPending(v1.getArweavePublishPending());
|
||||
item.setArweavePublishedAtMs(v1.getArweavePublishedAtMs());
|
||||
item.setSignedDataItemBytes(v1.getSignedDataItemBytes());
|
||||
|
||||
Net_GetChannelMessages_Response.VersionItem lastV = versionsOut.get(versionsOut.size() - 1);
|
||||
item.setText(lastV.getText());
|
||||
|
||||
+1
-2
@@ -158,14 +158,13 @@ public class Net_GetGroupDialog_Handler implements JsonMessageHandler {
|
||||
String sql = """
|
||||
SELECT login, bch_name, block_number, block_hash, block_bytes
|
||||
FROM blocks
|
||||
WHERE LOWER(login)=LOWER(?) AND msg_type=1 AND line_code=? AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM solana_user_pda_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number)
|
||||
WHERE LOWER(login)=LOWER(?) AND msg_type=1 AND line_code=? AND fork_number=shine_active_fork(login,block_number)
|
||||
ORDER BY block_number ASC
|
||||
""";
|
||||
List<MsgRow> out = new ArrayList<>();
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
ps.setString(1, ChannelsReadSupport.loginFromChainName(ownerBch));
|
||||
ps.setInt(2, line);
|
||||
ps.setString(3, ChannelsReadSupport.loginFromChainName(ownerBch));
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
while (rs.next()) {
|
||||
MsgRow row = new MsgRow();
|
||||
|
||||
+4
-1
@@ -1,4 +1,5 @@
|
||||
package server.logic.ws_protocol.JSON.handlers.channels;
|
||||
import server.logic.ws_protocol.JSON.handlers.profile.AvatarValueParser;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@@ -72,7 +73,9 @@ public class Net_GetMessageLikes_Handler implements JsonMessageHandler {
|
||||
user.setLogin(rs.getString("from_login"));
|
||||
user.setFirstName(rs.getString("first_name"));
|
||||
user.setLastName(rs.getString("last_name"));
|
||||
user.setAvatarAr(rs.getString("avatar_ar"));
|
||||
var avatar = AvatarValueParser.parse(rs.getString("avatar_ar"));
|
||||
user.setAvatarAr(avatar.ar());
|
||||
user.setAvatarPr(avatar.pr());
|
||||
|
||||
boolean isOfficial = "primary".equalsIgnoreCase(rs.getString("account_role"));
|
||||
boolean isShining = "shining".equalsIgnoreCase(rs.getString("shine_status"));
|
||||
|
||||
+25
-19
@@ -19,7 +19,6 @@ import java.sql.PreparedStatement;
|
||||
import java.sql.ResultSet;
|
||||
import java.util.Comparator;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Base64;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.HashMap;
|
||||
@@ -116,7 +115,7 @@ public class Net_GetMessageThread_Handler implements JsonMessageHandler {
|
||||
private List<PostRow> findRepliesAndRatings(Connection c, String toBchName, int toBlockNumber, byte[] toBlockHash, int limit) throws Exception {
|
||||
String targetLogin = ChannelsReadSupport.loginFromChainName(toBchName);
|
||||
String sql = """
|
||||
SELECT login,bch_name,block_number,block_hash,block_bytes,to_login,to_bch_name,to_block_number,to_block_hash,line_code,msg_sub_type,this_line_number
|
||||
SELECT login,bch_name,block_number,block_hash,block_bytes,data_item_id,arweave_publish_pending,arweave_published_at_ms,to_login,to_bch_name,to_block_number,to_block_hash,line_code,msg_sub_type,this_line_number
|
||||
FROM blocks
|
||||
WHERE msg_type=1
|
||||
AND to_block_number=? AND to_block_hash=?
|
||||
@@ -124,7 +123,7 @@ public class Net_GetMessageThread_Handler implements JsonMessageHandler {
|
||||
(msg_sub_type=? AND (LOWER(to_login)=LOWER(?) OR to_bch_name=?))
|
||||
OR (msg_sub_type=? AND LOWER(to_login)=LOWER(?))
|
||||
)
|
||||
AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM solana_user_pda_current WHERE LOWER(login)=LOWER(blocks.login) LIMIT 1),block_number)
|
||||
AND fork_number=shine_active_fork(login,block_number)
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
ps.setInt(1, toBlockNumber);
|
||||
@@ -153,17 +152,16 @@ public class Net_GetMessageThread_Handler implements JsonMessageHandler {
|
||||
|
||||
private PostRow findByLogicalTarget(Connection c, String login, int blockNumber, byte[] blockHash) throws Exception {
|
||||
String sql = """
|
||||
SELECT login,bch_name,block_number,block_hash,block_bytes,to_login,to_bch_name,to_block_number,to_block_hash,line_code,msg_sub_type,this_line_number
|
||||
SELECT login,bch_name,block_number,block_hash,block_bytes,data_item_id,arweave_publish_pending,arweave_published_at_ms,to_login,to_bch_name,to_block_number,to_block_hash,line_code,msg_sub_type,this_line_number
|
||||
FROM blocks
|
||||
WHERE LOWER(login)=LOWER(?) AND block_number=? AND block_hash=?
|
||||
AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM solana_user_pda_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number)
|
||||
AND fork_number=shine_active_fork(login,block_number)
|
||||
LIMIT 1
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
ps.setString(1, login);
|
||||
ps.setInt(2, blockNumber);
|
||||
ps.setBytes(3, blockHash);
|
||||
ps.setString(4, login);
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
return rs.next() ? mapRow(rs) : null;
|
||||
}
|
||||
@@ -172,17 +170,16 @@ public class Net_GetMessageThread_Handler implements JsonMessageHandler {
|
||||
|
||||
private PostRow findByNumber(Connection c, String bchName, int blockNumber) throws Exception {
|
||||
String sql = """
|
||||
SELECT login,bch_name,block_number,block_hash,block_bytes,to_login,to_bch_name,to_block_number,to_block_hash,line_code,msg_sub_type,this_line_number
|
||||
SELECT login,bch_name,block_number,block_hash,block_bytes,data_item_id,arweave_publish_pending,arweave_published_at_ms,to_login,to_bch_name,to_block_number,to_block_hash,line_code,msg_sub_type,this_line_number
|
||||
FROM blocks
|
||||
WHERE LOWER(login)=LOWER(?) AND block_number=?
|
||||
AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM solana_user_pda_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number)
|
||||
AND fork_number=shine_active_fork(login,block_number)
|
||||
LIMIT 1
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
String login=ChannelsReadSupport.loginFromChainName(bchName);
|
||||
ps.setString(1, login);
|
||||
ps.setInt(2, blockNumber);
|
||||
ps.setString(3, login);
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
return rs.next() ? mapRow(rs) : null;
|
||||
}
|
||||
@@ -191,10 +188,10 @@ public class Net_GetMessageThread_Handler implements JsonMessageHandler {
|
||||
|
||||
private PostRow findByNumberAndHash(Connection c, String bchName, int blockNumber, byte[] blockHash) throws Exception {
|
||||
String sql = """
|
||||
SELECT login,bch_name,block_number,block_hash,block_bytes,to_login,to_bch_name,to_block_number,to_block_hash,line_code,msg_sub_type,this_line_number
|
||||
SELECT login,bch_name,block_number,block_hash,block_bytes,data_item_id,arweave_publish_pending,arweave_published_at_ms,to_login,to_bch_name,to_block_number,to_block_hash,line_code,msg_sub_type,this_line_number
|
||||
FROM blocks
|
||||
WHERE LOWER(login)=LOWER(?) AND block_number=? AND block_hash=?
|
||||
AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM solana_user_pda_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number)
|
||||
AND fork_number=shine_active_fork(login,block_number)
|
||||
LIMIT 1
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
@@ -202,7 +199,6 @@ public class Net_GetMessageThread_Handler implements JsonMessageHandler {
|
||||
ps.setString(1, login);
|
||||
ps.setInt(2, blockNumber);
|
||||
ps.setBytes(3, blockHash);
|
||||
ps.setString(4, login);
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
return rs.next() ? mapRow(rs) : null;
|
||||
}
|
||||
@@ -226,6 +222,9 @@ public class Net_GetMessageThread_Handler implements JsonMessageHandler {
|
||||
row.blockNumber = rs.getInt("block_number");
|
||||
row.blockHash = rs.getBytes("block_hash");
|
||||
row.blockBytes = rs.getBytes("block_bytes");
|
||||
row.dataItemId = rs.getBytes("data_item_id");
|
||||
row.arweavePublishPending = rs.getBoolean("arweave_publish_pending");
|
||||
row.arweavePublishedAtMs = (Long) rs.getObject("arweave_published_at_ms");
|
||||
row.toLogin = rs.getString("to_login");
|
||||
row.toBchName = rs.getString("to_bch_name");
|
||||
row.toBlockNumber = (Integer) rs.getObject("to_block_number");
|
||||
@@ -259,7 +258,13 @@ public class Net_GetMessageThread_Handler implements JsonMessageHandler {
|
||||
first.setBlockNumber(row.blockNumber);
|
||||
first.setBlockHash(ChannelsReadSupport.toHex(row.blockHash));
|
||||
first.setText(base.text);
|
||||
first.setAttachmentMetadataValid(base.attachmentMetadataValid);
|
||||
first.setCreatedAtMs(base.createdAtMs);
|
||||
ChannelsReadSupport.setStorageInfo(first, row.dataItemId, row.arweavePublishPending, row.arweavePublishedAtMs, row.blockBytes);
|
||||
node.setArweaveDataItemId(first.getArweaveDataItemId());
|
||||
node.setArweavePublishPending(first.getArweavePublishPending());
|
||||
node.setArweavePublishedAtMs(first.getArweavePublishedAtMs());
|
||||
node.setSignedDataItemBytes(first.getSignedDataItemBytes());
|
||||
versions.add(first);
|
||||
|
||||
if (row.msgSubType == MsgSubType.TEXT_REPLY
|
||||
@@ -275,19 +280,18 @@ public class Net_GetMessageThread_Handler implements JsonMessageHandler {
|
||||
v.setBlockNumber(edit.blockNumber);
|
||||
v.setBlockHash(ChannelsReadSupport.toHex(edit.blockHash));
|
||||
v.setText(et.text);
|
||||
v.setAttachmentMetadataValid(et.attachmentMetadataValid);
|
||||
v.setCreatedAtMs(et.createdAtMs);
|
||||
ChannelsReadSupport.setStorageInfo(v, edit.dataItemId, edit.arweavePublishPending, edit.arweavePublishedAtMs, edit.blockBytes);
|
||||
versions.add(v);
|
||||
}
|
||||
}
|
||||
|
||||
node.setVersions(versions);
|
||||
node.setVersionsTotal(versions.size());
|
||||
node.setAttachmentMetadataValid(first.isAttachmentMetadataValid());
|
||||
node.setText(versions.get(versions.size() - 1).getText());
|
||||
|
||||
if (row.blockBytes != null) {
|
||||
node.setRawBlockB64(Base64.getEncoder().encodeToString(row.blockBytes));
|
||||
}
|
||||
|
||||
int[] stats = ChannelsReadSupport.loadStats(c, row.bchName, row.blockNumber, row.blockHash);
|
||||
node.setLikesCount(stats[0]);
|
||||
node.setPrimaryLikesCount(stats[3]);
|
||||
@@ -310,11 +314,11 @@ public class Net_GetMessageThread_Handler implements JsonMessageHandler {
|
||||
|
||||
private List<PostRow> findEdits(Connection c, String bch, int targetBlock, byte[] targetHash, int subType) throws Exception {
|
||||
String sql = """
|
||||
SELECT login,bch_name,block_number,block_hash,block_bytes,to_login,to_bch_name,to_block_number,to_block_hash,line_code,msg_sub_type,this_line_number
|
||||
SELECT login,bch_name,block_number,block_hash,block_bytes,data_item_id,arweave_publish_pending,arweave_published_at_ms,to_login,to_bch_name,to_block_number,to_block_hash,line_code,msg_sub_type,this_line_number
|
||||
FROM blocks
|
||||
WHERE LOWER(login)=LOWER(?) AND msg_type=1 AND msg_sub_type=?
|
||||
AND to_block_number=? AND to_block_hash=?
|
||||
AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM solana_user_pda_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number)
|
||||
AND fork_number=shine_active_fork(login,block_number)
|
||||
ORDER BY block_number ASC
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
@@ -323,7 +327,6 @@ public class Net_GetMessageThread_Handler implements JsonMessageHandler {
|
||||
ps.setInt(2, subType);
|
||||
ps.setInt(3, targetBlock);
|
||||
ps.setBytes(4, targetHash);
|
||||
ps.setString(5, login);
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
List<PostRow> out = new ArrayList<>();
|
||||
while (rs.next()) out.add(mapRow(rs));
|
||||
@@ -338,6 +341,9 @@ public class Net_GetMessageThread_Handler implements JsonMessageHandler {
|
||||
int blockNumber;
|
||||
byte[] blockHash;
|
||||
byte[] blockBytes;
|
||||
byte[] dataItemId;
|
||||
boolean arweavePublishPending;
|
||||
Long arweavePublishedAtMs;
|
||||
String toLogin;
|
||||
String toBchName;
|
||||
Integer toBlockNumber;
|
||||
|
||||
+2
-3
@@ -89,7 +89,7 @@ public class Net_GetPersonalDiary_Handler implements JsonMessageHandler {
|
||||
private String loadPrimaryBlockchainName(Connection c, String canonicalLogin) throws Exception {
|
||||
try (PreparedStatement ps = c.prepareStatement("""
|
||||
SELECT blockchain_name
|
||||
FROM solana_user_pda_current
|
||||
FROM user_identity_current
|
||||
WHERE LOWER(login)=LOWER(?)
|
||||
LIMIT 1
|
||||
""")) {
|
||||
@@ -181,7 +181,7 @@ public class Net_GetPersonalDiary_Handler implements JsonMessageHandler {
|
||||
AND msg_sub_type = ?
|
||||
AND to_block_number = ?
|
||||
AND to_block_hash = ?
|
||||
AND fork_number=shine_canonical_fork(login,(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER FROM solana_user_pda_current WHERE LOWER(login)=LOWER(?) LIMIT 1),block_number)
|
||||
AND fork_number=shine_active_fork(login,block_number)
|
||||
ORDER BY block_number ASC
|
||||
""")) {
|
||||
ps.setString(1, ChannelsReadSupport.loginFromChainName(ownerBch));
|
||||
@@ -189,7 +189,6 @@ public class Net_GetPersonalDiary_Handler implements JsonMessageHandler {
|
||||
ps.setInt(3, shine.db.MsgSubType.TEXT_EDIT_REPLY);
|
||||
ps.setInt(4, originalBlockNumber);
|
||||
ps.setBytes(5, originalBlockHash);
|
||||
ps.setString(6, ChannelsReadSupport.loginFromChainName(ownerBch));
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
while (rs.next()) {
|
||||
ChannelsReadSupport.TextInfo editText = ChannelsReadSupport.parseTextAndTime(rs.getBytes("block_bytes"));
|
||||
|
||||
+91
@@ -0,0 +1,91 @@
|
||||
package server.logic.ws_protocol.JSON.handlers.channels;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import server.logic.ws_protocol.JSON.ConnectionContext;
|
||||
import server.logic.ws_protocol.JSON.entyties.Net_Request;
|
||||
import server.logic.ws_protocol.JSON.entyties.Net_Response;
|
||||
import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler;
|
||||
import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetSupportHistory_Request;
|
||||
import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetSupportHistory_Response;
|
||||
import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory;
|
||||
import server.logic.ws_protocol.WireCodes;
|
||||
import shine.db.DbController;
|
||||
|
||||
import java.sql.Connection;
|
||||
import java.sql.PreparedStatement;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
/** Публичная постраничная история Stars из финализированного Helius-индекса. */
|
||||
public final class Net_GetSupportHistory_Handler implements JsonMessageHandler {
|
||||
private static final Logger log = LoggerFactory.getLogger(Net_GetSupportHistory_Handler.class);
|
||||
@Override
|
||||
public Net_Response handle(Net_Request baseRequest, ConnectionContext context) {
|
||||
Net_GetSupportHistory_Request req = (Net_GetSupportHistory_Request) baseRequest;
|
||||
String login = req.getLogin() == null ? "" : req.getLogin().trim();
|
||||
if (login.isEmpty() || login.length() > 255 || login.chars().anyMatch(Character::isISOControl)) {
|
||||
return NetExceptionResponseFactory.error(req, WireCodes.Status.BAD_REQUEST,
|
||||
"bad_login", "Некорректный логин");
|
||||
}
|
||||
int limit = req.getLimit() == null ? 20 : req.getLimit();
|
||||
int offset = req.getOffset() == null ? 0 : req.getOffset();
|
||||
if (limit < 1 || limit > 50 || offset < 0 || offset > 10_000) {
|
||||
return NetExceptionResponseFactory.error(req, WireCodes.Status.BAD_REQUEST,
|
||||
"bad_pagination", "Некорректные параметры страницы истории");
|
||||
}
|
||||
Net_GetSupportHistory_Response response = new Net_GetSupportHistory_Response();
|
||||
response.setOp(req.getOp()); response.setRequestId(req.getRequestId());
|
||||
response.setStatus(WireCodes.Status.OK);
|
||||
response.setLogin(login); response.setReady(false);
|
||||
response.setTransfers(List.of()); response.setHasMore(false);
|
||||
try (Connection c = DbController.getInstance().getConnection()) {
|
||||
try (PreparedStatement ps = c.prepareStatement(
|
||||
"SELECT history_complete FROM solana_support_sync_state WHERE id=1");
|
||||
ResultSet rs = ps.executeQuery()) {
|
||||
if (!rs.next() || !rs.getBoolean(1)) return response;
|
||||
}
|
||||
response.setReady(true);
|
||||
List<Net_GetSupportHistory_Response.Transfer> entries = new ArrayList<>();
|
||||
try (PreparedStatement ps = c.prepareStatement("""
|
||||
SELECT signature,instruction_index,slot,block_time,kind,sender_login,recipient_login,
|
||||
amount_lamports,amount_star_cents,recipient_star_cents,dao_star_cents,target_type,
|
||||
channel_block_number,channel_block_hash,message_block_number,message_block_hash
|
||||
FROM solana_support_transfers
|
||||
WHERE lower(sender_login)=? OR lower(recipient_login)=?
|
||||
ORDER BY slot DESC, instruction_index DESC, signature DESC LIMIT ? OFFSET ?
|
||||
""")) {
|
||||
String name = login.toLowerCase(Locale.ROOT);
|
||||
ps.setString(1, name); ps.setString(2, name);
|
||||
ps.setInt(3, limit + 1); ps.setInt(4, offset);
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
while (rs.next()) {
|
||||
Long time = rs.getObject(4) == null ? null : rs.getLong(4);
|
||||
entries.add(new Net_GetSupportHistory_Response.Transfer(
|
||||
rs.getString(1), rs.getInt(2), rs.getLong(3), time,
|
||||
rs.getString(5), rs.getString(6), rs.getString(7),
|
||||
rs.getBigDecimal(8).toBigIntegerExact().toString(),
|
||||
rs.getBigDecimal(9).toBigIntegerExact().toString(),
|
||||
rs.getBigDecimal(10).toBigIntegerExact().toString(),
|
||||
rs.getBigDecimal(11).toBigIntegerExact().toString(),
|
||||
rs.getInt(12),
|
||||
rs.getBigDecimal(13) == null ? null : rs.getBigDecimal(13).toBigIntegerExact().toString(),
|
||||
rs.getString(14),
|
||||
rs.getBigDecimal(15) == null ? null : rs.getBigDecimal(15).toBigIntegerExact().toString(),
|
||||
rs.getString(16)));
|
||||
}
|
||||
}
|
||||
}
|
||||
response.setHasMore(entries.size() > limit);
|
||||
response.setTransfers(entries.size() > limit ? entries.subList(0, limit) : entries);
|
||||
return response;
|
||||
} catch (SQLException e) {
|
||||
log.error("GetSupportHistory failed", e);
|
||||
return NetExceptionResponseFactory.error(req, WireCodes.Status.INTERNAL_ERROR,
|
||||
"support_history_unavailable", "История поддержки временно недоступна");
|
||||
}
|
||||
}
|
||||
}
|
||||
+83
@@ -0,0 +1,83 @@
|
||||
package server.logic.ws_protocol.JSON.handlers.channels;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import server.logic.ws_protocol.JSON.ConnectionContext;
|
||||
import server.logic.ws_protocol.JSON.entyties.Net_Request;
|
||||
import server.logic.ws_protocol.JSON.entyties.Net_Response;
|
||||
import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler;
|
||||
import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetSupportStats_Request;
|
||||
import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetSupportStats_Response;
|
||||
import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory;
|
||||
import server.logic.ws_protocol.WireCodes;
|
||||
import shine.db.DbController;
|
||||
|
||||
import java.sql.Connection;
|
||||
import java.sql.PreparedStatement;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.util.Locale;
|
||||
|
||||
/**
|
||||
* Публичные три суммы из локальной PostgreSQL без RPC на каждый профиль.
|
||||
* Индексатор формирует кеш только из финализированных on-chain донатов.
|
||||
*/
|
||||
public final class Net_GetSupportStats_Handler implements JsonMessageHandler {
|
||||
private static final Logger log = LoggerFactory.getLogger(Net_GetSupportStats_Handler.class);
|
||||
|
||||
@Override
|
||||
public Net_Response handle(Net_Request baseRequest, ConnectionContext ctx) {
|
||||
var req = (Net_GetSupportStats_Request) baseRequest;
|
||||
String login = req.getLogin() == null ? "" : req.getLogin().trim();
|
||||
if (login.isEmpty() || login.length() > 255 || login.chars().anyMatch(c -> Character.isISOControl(c))) {
|
||||
return NetExceptionResponseFactory.error(req, WireCodes.Status.BAD_REQUEST,
|
||||
"bad_login", "Некорректный логин");
|
||||
}
|
||||
var result = new Net_GetSupportStats_Response();
|
||||
result.setOp(req.getOp());
|
||||
result.setRequestId(req.getRequestId());
|
||||
result.setStatus(WireCodes.Status.OK);
|
||||
result.setLogin(login);
|
||||
result.setAvailable(false);
|
||||
result.setReady(false);
|
||||
result.setSupportSentStarCents("0");
|
||||
result.setSupportReceivedStarCents("0");
|
||||
result.setDaoDirectStarCents("0");
|
||||
try (Connection c = DbController.getInstance().getConnection()) {
|
||||
try (PreparedStatement ps = c.prepareStatement(
|
||||
"SELECT history_complete FROM solana_support_sync_state WHERE id=1")) {
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
if (!rs.next() || !rs.getBoolean(1)) return result;
|
||||
}
|
||||
}
|
||||
result.setReady(true);
|
||||
try (PreparedStatement ps = c.prepareStatement(
|
||||
"SELECT 1 FROM solana_user_pda_current WHERE normalized_login=? LIMIT 1")) {
|
||||
ps.setString(1, login.toLowerCase(Locale.ROOT));
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
if (!rs.next()) return result; // Free-пользователю не придумываем статистику
|
||||
}
|
||||
}
|
||||
result.setAvailable(true);
|
||||
try (PreparedStatement ps = c.prepareStatement("""
|
||||
SELECT support_sent, support_received, dao_direct
|
||||
FROM solana_support_user_stats WHERE normalized_login=?
|
||||
""")) {
|
||||
ps.setString(1, login.toLowerCase(Locale.ROOT));
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
if (rs.next()) {
|
||||
result.setSupportSentStarCents(rs.getBigDecimal(1).toBigIntegerExact().toString());
|
||||
result.setSupportReceivedStarCents(rs.getBigDecimal(2).toBigIntegerExact().toString());
|
||||
result.setDaoDirectStarCents(rs.getBigDecimal(3).toBigIntegerExact().toString());
|
||||
}
|
||||
}
|
||||
}
|
||||
result.setReady(true);
|
||||
return result;
|
||||
} catch (SQLException failure) {
|
||||
log.error("GetSupportStats failed for {}", login, failure);
|
||||
return NetExceptionResponseFactory.error(req, WireCodes.Status.INTERNAL_ERROR,
|
||||
"support_stats_unavailable", "Статистика поддержки недоступна");
|
||||
}
|
||||
}
|
||||
}
|
||||
+99
@@ -0,0 +1,99 @@
|
||||
package server.logic.ws_protocol.JSON.handlers.channels;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import server.logic.ws_protocol.JSON.ConnectionContext;
|
||||
import server.logic.ws_protocol.JSON.entyties.Net_Request;
|
||||
import server.logic.ws_protocol.JSON.entyties.Net_Response;
|
||||
import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler;
|
||||
import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetSupportTotals_Request;
|
||||
import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetSupportTotals_Response;
|
||||
import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory;
|
||||
import server.logic.ws_protocol.WireCodes;
|
||||
import shine.db.DbController;
|
||||
import java.sql.*;
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
* Публичные итоги только после проверки канала, автора и фактических блоков.
|
||||
* Сырые идентификаторы из Solana-инструкций НЕ являются доказательством авторства.
|
||||
*/
|
||||
public final class Net_GetSupportTotals_Handler implements JsonMessageHandler {
|
||||
private static final Logger log = LoggerFactory.getLogger(Net_GetSupportTotals_Handler.class);
|
||||
@Override public Net_Response handle(Net_Request baseRequest, ConnectionContext ctx) {
|
||||
var request = (Net_GetSupportTotals_Request) baseRequest;
|
||||
String hash = request.getChannelRootBlockHash();
|
||||
Long number = request.getChannelRootBlockNumber();
|
||||
if (hash == null || !hash.matches("(?i)[0-9a-f]{64}") || number == null || number < 0 || number > Integer.MAX_VALUE) {
|
||||
return NetExceptionResponseFactory.error(request, WireCodes.Status.BAD_REQUEST,
|
||||
"bad_selector", "Некорректный идентификатор канала");
|
||||
}
|
||||
var response = new Net_GetSupportTotals_Response();
|
||||
response.setOp(request.getOp());
|
||||
response.setRequestId(request.getRequestId());
|
||||
response.setStatus(WireCodes.Status.OK);
|
||||
response.setChannelReceivedStarCents("0");
|
||||
response.setMessages(List.of());
|
||||
try (Connection c = DbController.getInstance().getConnection()) {
|
||||
// Для каждой транзакции проверяем существование канала и соответствие
|
||||
// получателя оригинальному владельцу или автору блока публикации.
|
||||
String sql = """
|
||||
SELECT COALESCE(SUM(t.recipient_star_cents),0) AS total
|
||||
FROM solana_support_transfers t
|
||||
JOIN channel_names_state cn
|
||||
ON cn.channel_root_block_number = ?
|
||||
AND encode(cn.channel_root_block_hash,'hex') = ?
|
||||
AND t.channel_block_number = cn.channel_root_block_number
|
||||
AND t.channel_block_hash = encode(cn.channel_root_block_hash,'hex')
|
||||
WHERE t.kind='USER' AND (
|
||||
(t.target_type = 1 AND lower(t.recipient_login)=lower(cn.owner_login))
|
||||
OR (t.target_type = 2 AND EXISTS (
|
||||
SELECT 1 FROM blocks b WHERE b.block_number = t.message_block_number
|
||||
AND encode(b.block_hash,'hex')=t.message_block_hash
|
||||
AND lower(b.login)=lower(t.recipient_login)
|
||||
AND b.bch_name=cn.owner_bch_name
|
||||
))
|
||||
)
|
||||
""";
|
||||
try (PreparedStatement p = c.prepareStatement(sql)) {
|
||||
p.setLong(1, number); p.setString(2, hash.toLowerCase(Locale.ROOT));
|
||||
try (ResultSet r = p.executeQuery()) {
|
||||
if (r.next()) response.setChannelReceivedStarCents(r.getBigDecimal(1).toBigIntegerExact().toString());
|
||||
}
|
||||
}
|
||||
String messagesSql = """
|
||||
SELECT t.message_block_number, t.message_block_hash,
|
||||
SUM(t.recipient_star_cents) AS total
|
||||
FROM solana_support_transfers t
|
||||
JOIN channel_names_state cn
|
||||
ON cn.channel_root_block_number = ?
|
||||
AND encode(cn.channel_root_block_hash,'hex') = ?
|
||||
AND t.channel_block_number=cn.channel_root_block_number
|
||||
AND t.channel_block_hash=encode(cn.channel_root_block_hash,'hex')
|
||||
WHERE t.kind='USER' AND t.target_type=2
|
||||
AND EXISTS (SELECT 1 FROM blocks b
|
||||
WHERE b.block_number=t.message_block_number
|
||||
AND encode(b.block_hash,'hex')=t.message_block_hash
|
||||
AND lower(b.login)=lower(t.recipient_login)
|
||||
AND b.bch_name=cn.owner_bch_name)
|
||||
GROUP BY t.message_block_number,t.message_block_hash
|
||||
ORDER BY total DESC LIMIT 2000
|
||||
""";
|
||||
List<Net_GetSupportTotals_Response.MessageTotal> items = new ArrayList<>();
|
||||
try (PreparedStatement p = c.prepareStatement(messagesSql)) {
|
||||
p.setLong(1, number); p.setString(2, hash.toLowerCase(Locale.ROOT));
|
||||
try (ResultSet r = p.executeQuery()) {
|
||||
while (r.next()) items.add(new Net_GetSupportTotals_Response.MessageTotal(
|
||||
r.getBigDecimal(1).toBigIntegerExact().toString(), r.getString(2),
|
||||
r.getBigDecimal(3).toBigIntegerExact().toString()));
|
||||
}
|
||||
}
|
||||
response.setMessages(items);
|
||||
return response;
|
||||
} catch (SQLException e) {
|
||||
log.error("GetSupportTotals failed", e);
|
||||
return NetExceptionResponseFactory.error(request, WireCodes.Status.INTERNAL_ERROR,
|
||||
"support_totals_unavailable", "Статистика поддержки пока недоступна");
|
||||
}
|
||||
}
|
||||
}
|
||||
+5
-4
@@ -72,7 +72,7 @@ public class Net_ListSubscriptionsFeed_Handler implements JsonMessageHandler {
|
||||
channelRef.setDisplayName(meta.displayName == null || meta.displayName.isBlank() ? meta.channelName : meta.displayName);
|
||||
channelRef.setChannelDescription(meta.channelDescription);
|
||||
channelRef.setAvaAr(meta.avaAr);
|
||||
channelRef.setAvaSha256(meta.avaSha256);
|
||||
channelRef.setAvaPr(meta.avaPr);
|
||||
channelRef.setAvaSize(meta.avaSize);
|
||||
channelRef.setMetaUpdatedAtMs(meta.metaUpdatedAtMs);
|
||||
channelRef.setChannelTypeCode(meta.channelTypeCode);
|
||||
@@ -121,10 +121,11 @@ public class Net_ListSubscriptionsFeed_Handler implements JsonMessageHandler {
|
||||
return out;
|
||||
}
|
||||
|
||||
// Общий реестр включает FREE_CERT и пользователей, зарегистрированных через Solana.
|
||||
private List<ChannelKey> loadOwnChannels(Connection c, String canonicalLogin) throws Exception {
|
||||
List<ChannelKey> out = new ArrayList<>();
|
||||
String activeBch = null;
|
||||
try (PreparedStatement ps=c.prepareStatement("SELECT blockchain_name FROM solana_user_pda_current WHERE LOWER(login)=LOWER(?) LIMIT 1")){
|
||||
try (PreparedStatement ps=c.prepareStatement("SELECT blockchain_name FROM user_identity_current WHERE LOWER(login)=LOWER(?) LIMIT 1")){
|
||||
ps.setString(1,canonicalLogin);try(ResultSet rs=ps.executeQuery()){if(rs.next())activeBch=rs.getString(1);}
|
||||
}
|
||||
if(activeBch==null||activeBch.isBlank())return out;
|
||||
@@ -139,11 +140,11 @@ public class Net_ListSubscriptionsFeed_Handler implements JsonMessageHandler {
|
||||
List<ChannelKey> out = new ArrayList<>();
|
||||
String sql = """
|
||||
SELECT cs.to_login,
|
||||
COALESCE(cn.owner_bch_name,(SELECT su.blockchain_name FROM solana_user_pda_current su WHERE LOWER(su.login)=LOWER(cs.to_login) LIMIT 1)) AS to_bch_name,
|
||||
COALESCE(cn.owner_bch_name,(SELECT su.blockchain_name FROM user_identity_current su WHERE LOWER(su.login)=LOWER(cs.to_login) LIMIT 1)) AS to_bch_name,
|
||||
COALESCE(cs.to_block_number,0) AS root_number, cs.to_block_hash
|
||||
FROM connections_state cs
|
||||
LEFT JOIN channel_names_state cn ON LOWER(cn.owner_login)=LOWER(cs.to_login) AND cn.channel_root_block_number=cs.to_block_number AND cn.channel_root_block_hash=cs.to_block_hash
|
||||
WHERE cs.login=? AND cs.rel_type=?
|
||||
WHERE LOWER(cs.login)=LOWER(?) AND cs.rel_type=?
|
||||
ORDER BY cs.to_login, root_number
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
|
||||
+1
-1
@@ -34,7 +34,7 @@ public class Net_SearchChannels_Handler implements JsonMessageHandler {
|
||||
var item = new Net_SearchChannels_Response.ChannelItem();
|
||||
item.setOwnerLogin(match.ownerLogin()); item.setSlug(match.slug());
|
||||
item.setDisplayName(match.displayName()); item.setDescription(match.description());
|
||||
item.setAvatarAr(match.avatarAr()); item.setAvatarSha256(match.avatarSha256());
|
||||
item.setAvatarAr(match.avatarAr()); item.setAvatarPr(match.avatarPr());
|
||||
item.setOwnerBlockchainName(match.ownerBlockchainName());
|
||||
item.setRootBlockNumber(match.rootBlockNumber()); item.setRootBlockHashHex(match.rootBlockHashHex());
|
||||
item.setSubscribersCount(match.subscribersCount());
|
||||
|
||||
+38
-6
@@ -27,7 +27,7 @@ public class Net_GetChannelMessages_Response extends Net_Response {
|
||||
private String displayName;
|
||||
private String channelDescription;
|
||||
private String avaAr;
|
||||
private String avaSha256;
|
||||
private String avaPr;
|
||||
private Long avaSize;
|
||||
private Long metaUpdatedAtMs;
|
||||
private Long createdAtMs;
|
||||
@@ -57,8 +57,8 @@ public class Net_GetChannelMessages_Response extends Net_Response {
|
||||
public String getAvaAr() { return avaAr; }
|
||||
public void setAvaAr(String avaAr) { this.avaAr = avaAr; }
|
||||
|
||||
public String getAvaSha256() { return avaSha256; }
|
||||
public void setAvaSha256(String avaSha256) { this.avaSha256 = avaSha256; }
|
||||
public String getAvaPr() { return avaPr; }
|
||||
public void setAvaPr(String avaPr) { this.avaPr = avaPr; }
|
||||
|
||||
public Long getAvaSize() { return avaSize; }
|
||||
public void setAvaSize(Long avaSize) { this.avaSize = avaSize; }
|
||||
@@ -99,7 +99,7 @@ public class Net_GetChannelMessages_Response extends Net_Response {
|
||||
private String title;
|
||||
private String description;
|
||||
private String avaAr;
|
||||
private String avaSha256;
|
||||
private String avaPr;
|
||||
private Long avaSize;
|
||||
|
||||
public String getKind() { return kind; }
|
||||
@@ -129,8 +129,8 @@ public class Net_GetChannelMessages_Response extends Net_Response {
|
||||
public String getAvaAr() { return avaAr; }
|
||||
public void setAvaAr(String avaAr) { this.avaAr = avaAr; }
|
||||
|
||||
public String getAvaSha256() { return avaSha256; }
|
||||
public void setAvaSha256(String avaSha256) { this.avaSha256 = avaSha256; }
|
||||
public String getAvaPr() { return avaPr; }
|
||||
public void setAvaPr(String avaPr) { this.avaPr = avaPr; }
|
||||
|
||||
public Long getAvaSize() { return avaSize; }
|
||||
public void setAvaSize(Long avaSize) { this.avaSize = avaSize; }
|
||||
@@ -159,6 +159,11 @@ public class Net_GetChannelMessages_Response extends Net_Response {
|
||||
private int repliesCount;
|
||||
private int ratingsCount;
|
||||
private int versionsTotal;
|
||||
private boolean attachmentMetadataValid = true;
|
||||
private String arweaveDataItemId;
|
||||
private Boolean arweavePublishPending;
|
||||
private Long arweavePublishedAtMs;
|
||||
private Integer signedDataItemBytes;
|
||||
private List<VersionItem> versions = new ArrayList<>();
|
||||
|
||||
public BlockRef getMessageRef() { return messageRef; }
|
||||
@@ -221,6 +226,17 @@ public class Net_GetChannelMessages_Response extends Net_Response {
|
||||
public int getRatingsCount() { return ratingsCount; }
|
||||
public void setRatingsCount(int ratingsCount) { this.ratingsCount = ratingsCount; }
|
||||
|
||||
public boolean isAttachmentMetadataValid() { return attachmentMetadataValid; }
|
||||
public void setAttachmentMetadataValid(boolean value) { this.attachmentMetadataValid = value; }
|
||||
public String getArweaveDataItemId() { return arweaveDataItemId; }
|
||||
public void setArweaveDataItemId(String value) { this.arweaveDataItemId = value; }
|
||||
public Boolean getArweavePublishPending() { return arweavePublishPending; }
|
||||
public void setArweavePublishPending(Boolean value) { this.arweavePublishPending = value; }
|
||||
public Long getArweavePublishedAtMs() { return arweavePublishedAtMs; }
|
||||
public void setArweavePublishedAtMs(Long value) { this.arweavePublishedAtMs = value; }
|
||||
public Integer getSignedDataItemBytes() { return signedDataItemBytes; }
|
||||
public void setSignedDataItemBytes(Integer value) { this.signedDataItemBytes = value; }
|
||||
|
||||
public int getVersionsTotal() { return versionsTotal; }
|
||||
public void setVersionsTotal(int versionsTotal) { this.versionsTotal = versionsTotal; }
|
||||
|
||||
@@ -234,6 +250,22 @@ public class Net_GetChannelMessages_Response extends Net_Response {
|
||||
private String blockHash;
|
||||
private String text;
|
||||
private long createdAtMs;
|
||||
private boolean attachmentMetadataValid = true;
|
||||
private String arweaveDataItemId;
|
||||
private Boolean arweavePublishPending;
|
||||
private Long arweavePublishedAtMs;
|
||||
private Integer signedDataItemBytes;
|
||||
|
||||
public boolean isAttachmentMetadataValid() { return attachmentMetadataValid; }
|
||||
public void setAttachmentMetadataValid(boolean value) { this.attachmentMetadataValid = value; }
|
||||
public String getArweaveDataItemId() { return arweaveDataItemId; }
|
||||
public void setArweaveDataItemId(String value) { this.arweaveDataItemId = value; }
|
||||
public Boolean getArweavePublishPending() { return arweavePublishPending; }
|
||||
public void setArweavePublishPending(Boolean value) { this.arweavePublishPending = value; }
|
||||
public Long getArweavePublishedAtMs() { return arweavePublishedAtMs; }
|
||||
public void setArweavePublishedAtMs(Long value) { this.arweavePublishedAtMs = value; }
|
||||
public Integer getSignedDataItemBytes() { return signedDataItemBytes; }
|
||||
public void setSignedDataItemBytes(Integer value) { this.signedDataItemBytes = value; }
|
||||
|
||||
public int getVersionIndex() { return versionIndex; }
|
||||
public void setVersionIndex(int versionIndex) { this.versionIndex = versionIndex; }
|
||||
|
||||
+3
@@ -27,6 +27,7 @@ public class Net_GetMessageLikes_Response extends Net_Response {
|
||||
private String firstName;
|
||||
private String lastName;
|
||||
private String avatarAr;
|
||||
private String avatarPr;
|
||||
|
||||
public String getLogin() { return login; }
|
||||
public void setLogin(String login) { this.login = login; }
|
||||
@@ -36,5 +37,7 @@ public class Net_GetMessageLikes_Response extends Net_Response {
|
||||
public void setLastName(String lastName) { this.lastName = lastName; }
|
||||
public String getAvatarAr() { return avatarAr; }
|
||||
public void setAvatarAr(String avatarAr) { this.avatarAr = avatarAr; }
|
||||
public String getAvatarPr() { return avatarPr; }
|
||||
public void setAvatarPr(String avatarPr) { this.avatarPr = avatarPr; }
|
||||
}
|
||||
}
|
||||
|
||||
-3
@@ -21,13 +21,10 @@ public class Net_GetMessageThread_Response extends Net_Response {
|
||||
|
||||
public static class MessageNode extends Net_GetChannelMessages_Response.MessageItem {
|
||||
private ChannelInfo channelInfo;
|
||||
private String rawBlockB64;
|
||||
|
||||
public ChannelInfo getChannelInfo() { return channelInfo; }
|
||||
public void setChannelInfo(ChannelInfo channelInfo) { this.channelInfo = channelInfo; }
|
||||
|
||||
public String getRawBlockB64() { return rawBlockB64; }
|
||||
public void setRawBlockB64(String rawBlockB64) { this.rawBlockB64 = rawBlockB64; }
|
||||
}
|
||||
|
||||
public static class ChannelInfo {
|
||||
|
||||
+16
@@ -0,0 +1,16 @@
|
||||
package server.logic.ws_protocol.JSON.handlers.channels.entyties;
|
||||
|
||||
import server.logic.ws_protocol.JSON.entyties.Net_Request;
|
||||
|
||||
/** Публичная история подтверждённых пожертвований; пагинация ограничена сервером. */
|
||||
public final class Net_GetSupportHistory_Request extends Net_Request {
|
||||
private String login;
|
||||
private Integer limit;
|
||||
private Integer offset;
|
||||
public String getLogin() { return login; }
|
||||
public void setLogin(String v) { login = v; }
|
||||
public Integer getLimit() { return limit; }
|
||||
public void setLimit(Integer v) { limit = v; }
|
||||
public Integer getOffset() { return offset; }
|
||||
public void setOffset(Integer v) { offset = v; }
|
||||
}
|
||||
+25
@@ -0,0 +1,25 @@
|
||||
package server.logic.ws_protocol.JSON.handlers.channels.entyties;
|
||||
|
||||
import server.logic.ws_protocol.JSON.entyties.Net_Response;
|
||||
import java.util.List;
|
||||
|
||||
/** Денежные суммы передаются строками: JS Number не вмещает u64. */
|
||||
public final class Net_GetSupportHistory_Response extends Net_Response {
|
||||
private String login;
|
||||
private boolean ready;
|
||||
private boolean hasMore;
|
||||
private List<Transfer> transfers;
|
||||
public String getLogin() { return login; }
|
||||
public void setLogin(String v) { login = v; }
|
||||
public boolean isReady() { return ready; }
|
||||
public void setReady(boolean v) { ready = v; }
|
||||
public boolean isHasMore() { return hasMore; }
|
||||
public void setHasMore(boolean v) { hasMore = v; }
|
||||
public List<Transfer> getTransfers() { return transfers; }
|
||||
public void setTransfers(List<Transfer> v) { transfers = v; }
|
||||
public record Transfer(String signature, int instructionIndex, long slot, Long blockTime,
|
||||
String kind, String senderLogin, String recipientLogin, String amountLamports,
|
||||
String amountStarCents, String recipientStarCents, String daoStarCents,
|
||||
int targetType, String channelBlockNumber, String channelBlockHash,
|
||||
String messageBlockNumber, String messageBlockHash) { }
|
||||
}
|
||||
+10
@@ -0,0 +1,10 @@
|
||||
package server.logic.ws_protocol.JSON.handlers.channels.entyties;
|
||||
|
||||
import server.logic.ws_protocol.JSON.entyties.Net_Request;
|
||||
|
||||
/** Публичная статистика поддержки Paid-пользователя, логин SHiNE. */
|
||||
public final class Net_GetSupportStats_Request extends Net_Request {
|
||||
private String login;
|
||||
public String getLogin() { return login; }
|
||||
public void setLogin(String value) { login = value; }
|
||||
}
|
||||
+26
@@ -0,0 +1,26 @@
|
||||
package server.logic.ws_protocol.JSON.handlers.channels.entyties;
|
||||
|
||||
import server.logic.ws_protocol.JSON.entyties.Net_Response;
|
||||
|
||||
/** Суммы передаются строками в сотых долях Stars: JS Number теряет точность u64. */
|
||||
public final class Net_GetSupportStats_Response extends Net_Response {
|
||||
private String login;
|
||||
private boolean available;
|
||||
private boolean ready;
|
||||
private String supportSentStarCents;
|
||||
private String supportReceivedStarCents;
|
||||
private String daoDirectStarCents;
|
||||
|
||||
public String getLogin() { return login; }
|
||||
public void setLogin(String value) { login = value; }
|
||||
public boolean isAvailable() { return available; }
|
||||
public void setAvailable(boolean value) { available = value; }
|
||||
public boolean isReady() { return ready; }
|
||||
public void setReady(boolean value) { ready = value; }
|
||||
public String getSupportSentStarCents() { return supportSentStarCents; }
|
||||
public void setSupportSentStarCents(String value) { supportSentStarCents = value; }
|
||||
public String getSupportReceivedStarCents() { return supportReceivedStarCents; }
|
||||
public void setSupportReceivedStarCents(String value) { supportReceivedStarCents = value; }
|
||||
public String getDaoDirectStarCents() { return daoDirectStarCents; }
|
||||
public void setDaoDirectStarCents(String value) { daoDirectStarCents = value; }
|
||||
}
|
||||
+13
@@ -0,0 +1,13 @@
|
||||
package server.logic.ws_protocol.JSON.handlers.channels.entyties;
|
||||
|
||||
import server.logic.ws_protocol.JSON.entyties.Net_Request;
|
||||
|
||||
/** Агрегаты поддержки только по проверенной корневой ссылке канала. */
|
||||
public class Net_GetSupportTotals_Request extends Net_Request {
|
||||
private String channelRootBlockHash;
|
||||
private Long channelRootBlockNumber;
|
||||
public String getChannelRootBlockHash() { return channelRootBlockHash; }
|
||||
public void setChannelRootBlockHash(String value) { channelRootBlockHash = value; }
|
||||
public Long getChannelRootBlockNumber() { return channelRootBlockNumber; }
|
||||
public void setChannelRootBlockNumber(Long value) { channelRootBlockNumber = value; }
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package server.logic.ws_protocol.JSON.handlers.channels.entyties;
|
||||
|
||||
import server.logic.ws_protocol.JSON.entyties.Net_Response;
|
||||
import java.util.List;
|
||||
|
||||
public class Net_GetSupportTotals_Response extends Net_Response {
|
||||
private String channelReceivedStarCents;
|
||||
private List<MessageTotal> messages;
|
||||
public String getChannelReceivedStarCents() { return channelReceivedStarCents; }
|
||||
public void setChannelReceivedStarCents(String value) { channelReceivedStarCents = value; }
|
||||
public List<MessageTotal> getMessages() { return messages; }
|
||||
public void setMessages(List<MessageTotal> value) { messages = value; }
|
||||
public record MessageTotal(String blockNumber, String blockHash, String receivedStarCents) {}
|
||||
}
|
||||
+3
-3
@@ -57,7 +57,7 @@ public class Net_ListSubscriptionsFeed_Response extends Net_Response {
|
||||
private String displayName;
|
||||
private String channelDescription;
|
||||
private String avaAr;
|
||||
private String avaSha256;
|
||||
private String avaPr;
|
||||
private Long avaSize;
|
||||
private Long metaUpdatedAtMs;
|
||||
private Integer channelTypeCode;
|
||||
@@ -86,8 +86,8 @@ public class Net_ListSubscriptionsFeed_Response extends Net_Response {
|
||||
public String getAvaAr() { return avaAr; }
|
||||
public void setAvaAr(String avaAr) { this.avaAr = avaAr; }
|
||||
|
||||
public String getAvaSha256() { return avaSha256; }
|
||||
public void setAvaSha256(String avaSha256) { this.avaSha256 = avaSha256; }
|
||||
public String getAvaPr() { return avaPr; }
|
||||
public void setAvaPr(String avaPr) { this.avaPr = avaPr; }
|
||||
|
||||
public Long getAvaSize() { return avaSize; }
|
||||
public void setAvaSize(Long avaSize) { this.avaSize = avaSize; }
|
||||
|
||||
+3
-3
@@ -10,7 +10,7 @@ public class Net_SearchChannels_Response extends Net_Response {
|
||||
public void setChannels(List<ChannelItem> channels) { this.channels = channels; }
|
||||
|
||||
public static class ChannelItem {
|
||||
private String ownerLogin, slug, displayName, description, avatarAr, avatarSha256,
|
||||
private String ownerLogin, slug, displayName, description, avatarAr, avatarPr,
|
||||
ownerBlockchainName, rootBlockHashHex;
|
||||
private int rootBlockNumber, subscribersCount;
|
||||
public String getOwnerLogin() { return ownerLogin; }
|
||||
@@ -23,8 +23,8 @@ public class Net_SearchChannels_Response extends Net_Response {
|
||||
public void setDescription(String v) { description = v; }
|
||||
public String getAvatarAr() { return avatarAr; }
|
||||
public void setAvatarAr(String v) { avatarAr = v; }
|
||||
public String getAvatarSha256() { return avatarSha256; }
|
||||
public void setAvatarSha256(String v) { avatarSha256 = v; }
|
||||
public String getAvatarPr() { return avatarPr; }
|
||||
public void setAvatarPr(String v) { avatarPr = v; }
|
||||
public String getOwnerBlockchainName() { return ownerBlockchainName; }
|
||||
public void setOwnerBlockchainName(String v) { ownerBlockchainName = v; }
|
||||
public int getRootBlockNumber() { return rootBlockNumber; }
|
||||
|
||||
+1
-1
@@ -297,7 +297,7 @@ public class Net_GetUserConnectionsGraph_Handler implements JsonMessageHandler {
|
||||
if (!parsed.ok()) return null;
|
||||
Net_GetUserConnectionsGraph_Response.AvatarItem avatar = new Net_GetUserConnectionsGraph_Response.AvatarItem();
|
||||
avatar.setAr(parsed.ar());
|
||||
avatar.setSha256Hex(parsed.sha256Hex());
|
||||
avatar.setPr(parsed.pr());
|
||||
return avatar;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -63,7 +63,7 @@ public class Net_ListContacts_Handler implements JsonMessageHandler {
|
||||
AvatarValueParser.Parsed parsed = AvatarValueParser.parse(value);
|
||||
if (!parsed.ok()) return out;
|
||||
out.setAr(parsed.ar());
|
||||
out.setSha256Hex(parsed.sha256Hex());
|
||||
out.setPr(parsed.pr());
|
||||
return out;
|
||||
}
|
||||
|
||||
|
||||
+3
-3
@@ -39,12 +39,12 @@ public class Net_GetUserConnectionsGraph_Response extends Net_Response {
|
||||
|
||||
public static class AvatarItem {
|
||||
private String ar;
|
||||
private String sha256Hex;
|
||||
private String pr;
|
||||
|
||||
public String getAr() { return ar; }
|
||||
public void setAr(String ar) { this.ar = ar; }
|
||||
public String getSha256Hex() { return sha256Hex; }
|
||||
public void setSha256Hex(String sha256Hex) { this.sha256Hex = sha256Hex; }
|
||||
public String getPr() { return pr; }
|
||||
public void setPr(String pr) { this.pr = pr; }
|
||||
}
|
||||
|
||||
public static class RelativeItem {
|
||||
|
||||
+3
-3
@@ -56,10 +56,10 @@ public class Net_ListContacts_Response extends Net_Response {
|
||||
|
||||
public static class Avatar {
|
||||
private String ar;
|
||||
private String sha256Hex;
|
||||
private String pr;
|
||||
public String getAr() { return ar; }
|
||||
public void setAr(String ar) { this.ar = ar; }
|
||||
public String getSha256Hex() { return sha256Hex; }
|
||||
public void setSha256Hex(String sha256Hex) { this.sha256Hex = sha256Hex; }
|
||||
public String getPr() { return pr; }
|
||||
public void setPr(String pr) { this.pr = pr; }
|
||||
}
|
||||
}
|
||||
|
||||
+18
-37
@@ -1,57 +1,38 @@
|
||||
package server.logic.ws_protocol.JSON.handlers.profile;
|
||||
|
||||
import server.logic.ws_protocol.JSON.handlers.avatars.PiecesRootValidator;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
/** Avatar v2 only. No SHA256/hex or legacy avatar tag support. */
|
||||
public final class AvatarValueParser {
|
||||
private static final Pattern NEW_TAG = Pattern.compile("^<(?:SHiNE|S):(?:ava|avatar);([^>]*)>$");
|
||||
private static final Pattern LEGACY_AR = Pattern.compile("AR:([A-Za-z0-9_-]{43})");
|
||||
private static final Pattern LEGACY_SHA = Pattern.compile("SHA256:([A-Fa-f0-9]{64})");
|
||||
private static final Pattern TAG = Pattern.compile("^<S:ava;([^>]*)>$");
|
||||
private static final Pattern AR = Pattern.compile("^[A-Za-z0-9_-]{43}$");
|
||||
private static final Pattern SHA = Pattern.compile("^[A-Fa-f0-9]{64}$");
|
||||
|
||||
private AvatarValueParser() {}
|
||||
|
||||
public static Parsed parse(String rawValue) {
|
||||
String raw = String.valueOf(rawValue == null ? "" : rawValue).trim();
|
||||
if (raw.isEmpty()) return new Parsed("", "", 0L, false);
|
||||
|
||||
Matcher tag = NEW_TAG.matcher(raw);
|
||||
if (tag.matches()) {
|
||||
Map<String, String> fields = fields(tag.group(1));
|
||||
if (!"1".equals(fields.get("v"))) return new Parsed("", "", 0L, false);
|
||||
String ar = String.valueOf(fields.getOrDefault("ar", "")).trim();
|
||||
String sha = String.valueOf(fields.getOrDefault("sha256", "")).trim().toLowerCase();
|
||||
String sizeRaw = String.valueOf(fields.containsKey("sz") ? fields.get("sz") : fields.getOrDefault("size", "")).trim();
|
||||
if (!ar.isEmpty() && !AR.matcher(ar).matches()) return new Parsed("", "", 0L, false);
|
||||
if (!SHA.matcher(sha).matches()) return new Parsed("", "", 0L, false);
|
||||
long size;
|
||||
try { size = Long.parseLong(sizeRaw); } catch (Exception e) { return new Parsed("", "", 0L, false); }
|
||||
if (size <= 0L) return new Parsed("", "", 0L, false);
|
||||
return new Parsed(ar, sha, size, true);
|
||||
}
|
||||
|
||||
Matcher arMatcher = LEGACY_AR.matcher(raw);
|
||||
Matcher shaMatcher = LEGACY_SHA.matcher(raw);
|
||||
String ar = arMatcher.find() ? arMatcher.group(1) : "";
|
||||
String sha = shaMatcher.find() ? shaMatcher.group(1).toLowerCase() : "";
|
||||
if (!AR.matcher(ar).matches()) return new Parsed("", "", 0L, false);
|
||||
return new Parsed(ar, SHA.matcher(sha).matches() ? sha : "", 0L, true);
|
||||
Matcher tag = TAG.matcher(raw);
|
||||
if (!tag.matches()) return new Parsed("", "", 0L, false);
|
||||
Map<String, String> fields = fields(tag.group(1));
|
||||
if (!"2".equals(fields.get("v"))) return new Parsed("", "", 0L, false);
|
||||
String ar = fields.getOrDefault("ar", "").trim();
|
||||
String pr = fields.getOrDefault("pr", "").trim();
|
||||
if ((!ar.isEmpty() && !AR.matcher(ar).matches()) || !PiecesRootValidator.valid(pr))
|
||||
return new Parsed("", "", 0L, false);
|
||||
long size;
|
||||
try { size = Long.parseLong(fields.getOrDefault("sz", "")); }
|
||||
catch (Exception e) { return new Parsed("", "", 0L, false); }
|
||||
return size > 0 ? new Parsed(ar, pr, size, true) : new Parsed("", "", 0L, false);
|
||||
}
|
||||
|
||||
private static Map<String, String> fields(String raw) {
|
||||
Map<String, String> out = new HashMap<>();
|
||||
for (String part : String.valueOf(raw == null ? "" : raw).split(";")) {
|
||||
for (String part : raw.split(";")) {
|
||||
int eq = part.indexOf('=');
|
||||
if (eq <= 0) continue;
|
||||
String key = part.substring(0, eq).trim();
|
||||
String value = part.substring(eq + 1).trim();
|
||||
if (!key.isEmpty()) out.put(key, value);
|
||||
if (eq > 0) out.put(part.substring(0, eq).trim(), part.substring(eq + 1).trim());
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
public record Parsed(String ar, String sha256Hex, long size, boolean ok) {}
|
||||
public record Parsed(String ar, String pr, long size, boolean ok) {}
|
||||
}
|
||||
|
||||
+1
-1
@@ -1,3 +1,3 @@
|
||||
package server.logic.ws_protocol.JSON.handlers.profile;
|
||||
import server.logic.ws_protocol.JSON.*;import server.logic.ws_protocol.JSON.entyties.*;import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler;import server.logic.ws_protocol.JSON.handlers.profile.entyties.*;import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory;import server.logic.ws_protocol.WireCodes;import shine.db.dao.UserProfileStateDAO;import java.sql.*;import java.util.*;
|
||||
public class Net_ListUserProfileChannels_Handler implements JsonMessageHandler {public Net_Response handle(Net_Request base,ConnectionContext ctx)throws Exception{var req=(Net_ListUserProfileChannels_Request)base;if(req.getLogin()==null||req.getLogin().isBlank())return NetExceptionResponseFactory.error(req,400,"BAD_FIELDS","login required");try(Connection c=shine.db.DbController.getInstance().getConnection()){var rows=UserProfileStateDAO.getInstance().listPublicChannels(c,req.getLogin(),req.getMode(),Boolean.TRUE.equals(req.getIncludeDeleted()),req.getLimit()==null?100:req.getLimit(),req.getOffset()==null?0:req.getOffset());var resp=new Net_ListUserProfileChannels_Response();resp.setOp(req.getOp());resp.setRequestId(req.getRequestId());resp.setStatus(WireCodes.Status.OK);resp.setLogin(req.getLogin());resp.setMode(req.getMode());List<Net_ListUserProfileChannels_Response.ChannelItem> items=new ArrayList<>();for(var r:rows){var i=new Net_ListUserProfileChannels_Response.ChannelItem();i.setOwnerLogin(r.ownerLogin());i.setSlug(r.slug());i.setDisplayName(r.displayName());i.setAvatarAr(r.avatarAr());i.setAvatarSha256(r.avatarSha256());i.setOwnerBlockchainName(r.ownerBlockchainName());i.setRootBlockNumber(r.rootBlockNumber());i.setRootBlockHashHex(r.rootBlockHashHex());i.setDeleted(r.deleted());i.setDeletedAtMs(r.deletedAtMs());i.setDeletedBlockNumber(r.deletedBlockNumber());items.add(i);}resp.setChannels(items);return resp;}}}
|
||||
public class Net_ListUserProfileChannels_Handler implements JsonMessageHandler {public Net_Response handle(Net_Request base,ConnectionContext ctx)throws Exception{var req=(Net_ListUserProfileChannels_Request)base;if(req.getLogin()==null||req.getLogin().isBlank())return NetExceptionResponseFactory.error(req,400,"BAD_FIELDS","login required");try(Connection c=shine.db.DbController.getInstance().getConnection()){var rows=UserProfileStateDAO.getInstance().listPublicChannels(c,req.getLogin(),req.getMode(),Boolean.TRUE.equals(req.getIncludeDeleted()),req.getLimit()==null?100:req.getLimit(),req.getOffset()==null?0:req.getOffset());var resp=new Net_ListUserProfileChannels_Response();resp.setOp(req.getOp());resp.setRequestId(req.getRequestId());resp.setStatus(WireCodes.Status.OK);resp.setLogin(req.getLogin());resp.setMode(req.getMode());List<Net_ListUserProfileChannels_Response.ChannelItem> items=new ArrayList<>();for(var r:rows){var i=new Net_ListUserProfileChannels_Response.ChannelItem();i.setOwnerLogin(r.ownerLogin());i.setSlug(r.slug());i.setDisplayName(r.displayName());i.setAvatarAr(r.avatarAr());i.setAvatarPr(r.avatarPr());i.setOwnerBlockchainName(r.ownerBlockchainName());i.setRootBlockNumber(r.rootBlockNumber());i.setRootBlockHashHex(r.rootBlockHashHex());i.setDeleted(r.deleted());i.setDeletedAtMs(r.deletedAtMs());i.setDeletedBlockNumber(r.deletedBlockNumber());items.add(i);}resp.setChannels(items);return resp;}}}
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@ public class Net_ListUserProfileRelations_Handler implements JsonMessageHandler
|
||||
try(Connection c=shine.db.DbController.getInstance().getConnection()){
|
||||
var rows=UserProfileStateDAO.getInstance().listRelations(c,req.getLogin(),req.getListType(),req.getLimit()==null?100:req.getLimit(),req.getOffset()==null?0:req.getOffset());
|
||||
var resp=new Net_ListUserProfileRelations_Response(); resp.setOp(req.getOp());resp.setRequestId(req.getRequestId());resp.setStatus(WireCodes.Status.OK);resp.setLogin(req.getLogin());resp.setListType(req.getListType());
|
||||
List<Net_ListUserProfileRelations_Response.UserItem> items=new ArrayList<>(); for(var r:rows){var i=new Net_ListUserProfileRelations_Response.UserItem();i.setLogin(r.login());i.setFirstName(r.firstName());i.setLastName(r.lastName());i.setAvatarAr(r.avatarAr());i.setAccountRole(r.accountRole());i.setShineStatus(r.shineStatus());i.setRelationType(r.relationType());i.setPrimaryConfirmed(r.primaryConfirmed());i.setShineConfirmed(r.shineConfirmed());i.setPrimaryConfirmationsCount(r.primaryConfirmationsCount());i.setShineConfirmationsCount(r.shineConfirmationsCount());items.add(i);} resp.setUsers(items);return resp;
|
||||
List<Net_ListUserProfileRelations_Response.UserItem> items=new ArrayList<>(); for(var r:rows){var i=new Net_ListUserProfileRelations_Response.UserItem();i.setLogin(r.login());i.setFirstName(r.firstName());i.setLastName(r.lastName());var avatar = AvatarValueParser.parse(r.avatarAr());i.setAvatarAr(avatar.ar());i.setAvatarPr(avatar.pr());i.setAccountRole(r.accountRole());i.setShineStatus(r.shineStatus());i.setRelationType(r.relationType());i.setPrimaryConfirmed(r.primaryConfirmed());i.setShineConfirmed(r.shineConfirmed());i.setPrimaryConfirmationsCount(r.primaryConfirmationsCount());i.setShineConfirmationsCount(r.shineConfirmationsCount());items.add(i);} resp.setUsers(items);return resp;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -1,3 +1,3 @@
|
||||
package server.logic.ws_protocol.JSON.handlers.profile.entyties;
|
||||
import server.logic.ws_protocol.JSON.entyties.Net_Response;import java.util.*;
|
||||
public class Net_ListUserProfileChannels_Response extends Net_Response {private String login,mode;private List<ChannelItem> channels=new ArrayList<>();public String getLogin(){return login;}public void setLogin(String v){login=v;}public String getMode(){return mode;}public void setMode(String v){mode=v;}public List<ChannelItem> getChannels(){return channels;}public void setChannels(List<ChannelItem> v){channels=v;}public static class ChannelItem{private String ownerLogin,slug,displayName,avatarAr,avatarSha256,ownerBlockchainName,rootBlockHashHex;private int rootBlockNumber;private boolean deleted;private long deletedAtMs;private Integer deletedBlockNumber;public String getOwnerLogin(){return ownerLogin;}public void setOwnerLogin(String v){ownerLogin=v;}public String getSlug(){return slug;}public void setSlug(String v){slug=v;}public String getDisplayName(){return displayName;}public void setDisplayName(String v){displayName=v;}public String getAvatarAr(){return avatarAr;}public void setAvatarAr(String v){avatarAr=v;}public String getAvatarSha256(){return avatarSha256;}public void setAvatarSha256(String v){avatarSha256=v;}public String getOwnerBlockchainName(){return ownerBlockchainName;}public void setOwnerBlockchainName(String v){ownerBlockchainName=v;}public int getRootBlockNumber(){return rootBlockNumber;}public void setRootBlockNumber(int v){rootBlockNumber=v;}public String getRootBlockHashHex(){return rootBlockHashHex;}public void setRootBlockHashHex(String v){rootBlockHashHex=v;}public boolean isDeleted(){return deleted;}public void setDeleted(boolean v){deleted=v;}public long getDeletedAtMs(){return deletedAtMs;}public void setDeletedAtMs(long v){deletedAtMs=v;}public Integer getDeletedBlockNumber(){return deletedBlockNumber;}public void setDeletedBlockNumber(Integer v){deletedBlockNumber=v;}}}
|
||||
public class Net_ListUserProfileChannels_Response extends Net_Response {private String login,mode;private List<ChannelItem> channels=new ArrayList<>();public String getLogin(){return login;}public void setLogin(String v){login=v;}public String getMode(){return mode;}public void setMode(String v){mode=v;}public List<ChannelItem> getChannels(){return channels;}public void setChannels(List<ChannelItem> v){channels=v;}public static class ChannelItem{private String ownerLogin,slug,displayName,avatarAr,avatarPr,ownerBlockchainName,rootBlockHashHex;private int rootBlockNumber;private boolean deleted;private long deletedAtMs;private Integer deletedBlockNumber;public String getOwnerLogin(){return ownerLogin;}public void setOwnerLogin(String v){ownerLogin=v;}public String getSlug(){return slug;}public void setSlug(String v){slug=v;}public String getDisplayName(){return displayName;}public void setDisplayName(String v){displayName=v;}public String getAvatarAr(){return avatarAr;}public void setAvatarAr(String v){avatarAr=v;}public String getAvatarPr(){return avatarPr;}public void setAvatarPr(String v){avatarPr=v;}public String getOwnerBlockchainName(){return ownerBlockchainName;}public void setOwnerBlockchainName(String v){ownerBlockchainName=v;}public int getRootBlockNumber(){return rootBlockNumber;}public void setRootBlockNumber(int v){rootBlockNumber=v;}public String getRootBlockHashHex(){return rootBlockHashHex;}public void setRootBlockHashHex(String v){rootBlockHashHex=v;}public boolean isDeleted(){return deleted;}public void setDeleted(boolean v){deleted=v;}public long getDeletedAtMs(){return deletedAtMs;}public void setDeletedAtMs(long v){deletedAtMs=v;}public Integer getDeletedBlockNumber(){return deletedBlockNumber;}public void setDeletedBlockNumber(Integer v){deletedBlockNumber=v;}}}
|
||||
|
||||
+2
-1
@@ -7,12 +7,13 @@ public class Net_ListUserProfileRelations_Response extends Net_Response {
|
||||
public String getListType(){return listType;} public void setListType(String v){listType=v;}
|
||||
public List<UserItem> getUsers(){return users;} public void setUsers(List<UserItem> v){users=v;}
|
||||
public static class UserItem {
|
||||
private String login,firstName,lastName,avatarAr,accountRole,shineStatus,relationType;
|
||||
private String login,firstName,lastName,avatarAr,avatarPr,accountRole,shineStatus,relationType;
|
||||
private boolean primaryConfirmed,shineConfirmed; private int primaryConfirmationsCount,shineConfirmationsCount;
|
||||
public String getLogin(){return login;} public void setLogin(String v){login=v;}
|
||||
public String getFirstName(){return firstName;} public void setFirstName(String v){firstName=v;}
|
||||
public String getLastName(){return lastName;} public void setLastName(String v){lastName=v;}
|
||||
public String getAvatarAr(){return avatarAr;} public void setAvatarAr(String v){avatarAr=v;}
|
||||
public String getAvatarPr(){return avatarPr;} public void setAvatarPr(String v){avatarPr=v;}
|
||||
public String getAccountRole(){return accountRole;} public void setAccountRole(String v){accountRole=v;}
|
||||
public String getShineStatus(){return shineStatus;} public void setShineStatus(String v){shineStatus=v;}
|
||||
public String getRelationType(){return relationType;} public void setRelationType(String v){relationType=v;}
|
||||
|
||||
+84
-59
@@ -13,88 +13,113 @@ import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory;
|
||||
import server.logic.ws_protocol.WireCodes;
|
||||
|
||||
import java.net.SocketAddress;
|
||||
import java.net.InetSocketAddress;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* ClientErrorLog — технический endpoint для фронтенд-ошибок.
|
||||
* Не требует авторизации: клиент должен иметь возможность отправить ошибку
|
||||
* даже если логин/сессия ещё не установлены.
|
||||
*/
|
||||
/** Единая точка диагностики ошибок браузера (доступна до авторизации). */
|
||||
public class Net_ClientErrorLog_Handler implements JsonMessageHandler {
|
||||
private static final Logger log = LoggerFactory.getLogger("client.frontend");
|
||||
private static final long WINDOW_MS = 60_000L;
|
||||
private static final int MAX_PER_SOURCE = 60;
|
||||
private static final int MAX_ALL = 1200;
|
||||
private static final int MAX_SOURCES = 4096;
|
||||
private static final Map<String, Bucket> rateLimits = new HashMap<>();
|
||||
private static long globalWindow = 0;
|
||||
private static int globalCount = 0;
|
||||
private static int cleanCounter = 0;
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(Net_ClientErrorLog_Handler.class);
|
||||
private static final class Bucket {
|
||||
long start;
|
||||
int count;
|
||||
Bucket(long now) { start = now; }
|
||||
}
|
||||
|
||||
@Override
|
||||
public Net_Response handle(Net_Request baseRequest, ConnectionContext ctx) {
|
||||
Net_ClientErrorLog_Request req = (Net_ClientErrorLog_Request) baseRequest;
|
||||
|
||||
if (req.getMessage() == null || req.getMessage().isBlank()) {
|
||||
return NetExceptionResponseFactory.error(
|
||||
req,
|
||||
WireCodes.Status.BAD_REQUEST,
|
||||
"BAD_FIELDS",
|
||||
"Поле message обязательно для ClientErrorLog"
|
||||
);
|
||||
if (req.getMessage() == null || req.getMessage().isBlank() || invalidSize(req)) {
|
||||
return NetExceptionResponseFactory.error(req, WireCodes.Status.BAD_REQUEST,
|
||||
"BAD_FIELDS", "Недопустимый размер или отсутствие message в ClientErrorLog");
|
||||
}
|
||||
|
||||
long serverTs = System.currentTimeMillis();
|
||||
String login = safe(ctx != null ? ctx.getLogin() : null);
|
||||
String sessionId = safe(ctx != null ? ctx.getSessionId() : null);
|
||||
String remote = safe(remoteAddress(ctx));
|
||||
|
||||
log.error(
|
||||
"CLIENT_FRONTEND_ERROR kind={} clientTs={} serverTs={} login={} sessionId={} remote={} route={} href={} sourceUrl={} line={} column={} requestOp={} requestIdRef={} message={} userAgent={} context={}",
|
||||
clip(req.getKind(), 64),
|
||||
req.getClientTs(),
|
||||
serverTs,
|
||||
clip(login, 64),
|
||||
clip(sessionId, 128),
|
||||
clip(remote, 128),
|
||||
clip(req.getRoute(), 200),
|
||||
clip(req.getHref(), 240),
|
||||
clip(req.getSourceUrl(), 240),
|
||||
req.getLineNumber(),
|
||||
req.getColumnNumber(),
|
||||
clip(req.getRequestOp(), 64),
|
||||
clip(req.getRequestIdRef(), 128),
|
||||
clip(req.getMessage(), 500),
|
||||
clip(req.getUserAgent(), 240),
|
||||
clip(req.getContextJson(), 2000)
|
||||
);
|
||||
|
||||
if (req.getStack() != null && !req.getStack().isBlank()) {
|
||||
log.error("CLIENT_FRONTEND_ERROR_STACK requestId={} stack={}",
|
||||
clip(req.getRequestId(), 128),
|
||||
clip(req.getStack(), 8000));
|
||||
boolean accepted = allow(remoteAddress(ctx), serverTs);
|
||||
if (accepted) {
|
||||
log.error("CLIENT_FRONTEND_ERROR id={} clientVersion={} kind={} clientTs={} serverTs={} login={} "
|
||||
+ "route={} sourceUrl={} line={} column={} requestOp={} requestIdRef={} message={} "
|
||||
+ "userAgent={} context={} stack={}",
|
||||
clip(req.getErrorId(), 48), clip(req.getClientVersion(), 80),
|
||||
clip(req.getKind(), 64), req.getClientTs(), serverTs,
|
||||
clip(ctx != null ? ctx.getLogin() : null, 64), clip(req.getRoute(), 150),
|
||||
clip(req.getSourceUrl(), 240), req.getLineNumber(), req.getColumnNumber(),
|
||||
clip(req.getRequestOp(), 64), clip(req.getRequestIdRef(), 128),
|
||||
clip(req.getMessage(), 500), clip(req.getUserAgent(), 240),
|
||||
clip(req.getContextJson(), 800), clip(req.getStack(), 6000));
|
||||
}
|
||||
|
||||
Net_ClientErrorLog_Response resp = new Net_ClientErrorLog_Response();
|
||||
resp.setOp(req.getOp());
|
||||
resp.setRequestId(req.getRequestId());
|
||||
resp.setStatus(WireCodes.Status.OK);
|
||||
resp.setAccepted(true);
|
||||
resp.setAccepted(accepted); // false = ограничение частоты, отчёт не записан
|
||||
resp.setServerTs(serverTs);
|
||||
return resp;
|
||||
}
|
||||
|
||||
private static String remoteAddress(ConnectionContext ctx) {
|
||||
if (ctx == null) return "";
|
||||
Session ws = ctx.getWsSession();
|
||||
if (ws == null) return "";
|
||||
SocketAddress remote = ws.getRemoteAddress();
|
||||
return remote != null ? remote.toString() : "";
|
||||
private static boolean invalidSize(Net_ClientErrorLog_Request req) {
|
||||
return length(req.getMessage()) > 500 || length(req.getStack()) > 6000
|
||||
|| length(req.getContextJson()) > 800 || length(req.getKind()) > 64
|
||||
|| length(req.getSourceUrl()) > 240 || length(req.getUserAgent()) > 240
|
||||
|| length(req.getErrorId()) > 48 || length(req.getClientVersion()) > 80
|
||||
|| length(req.getRoute()) > 150 || length(req.getHref()) > 240
|
||||
|| length(req.getRequestOp()) > 64 || length(req.getRequestIdRef()) > 128;
|
||||
}
|
||||
|
||||
private static String safe(String value) {
|
||||
return value == null ? "" : value.trim();
|
||||
private static int length(String value) { return value == null ? 0 : value.length(); }
|
||||
|
||||
// Ограничение по IP WebSocket (не по полю JSON, которое клиент может подделать).
|
||||
private static synchronized boolean allow(String source, long now) {
|
||||
if (now - globalWindow >= WINDOW_MS) { globalWindow = now; globalCount = 0; }
|
||||
if (globalCount >= MAX_ALL) return false;
|
||||
if (rateLimits.size() >= MAX_SOURCES || ++cleanCounter % 128 == 0) {
|
||||
Iterator<Map.Entry<String, Bucket>> it = rateLimits.entrySet().iterator();
|
||||
while (it.hasNext()) {
|
||||
if (now - it.next().getValue().start >= WINDOW_MS) it.remove();
|
||||
}
|
||||
}
|
||||
Bucket bucket = rateLimits.get(source);
|
||||
if (bucket == null) {
|
||||
if (rateLimits.size() >= MAX_SOURCES) return false;
|
||||
bucket = new Bucket(now);
|
||||
rateLimits.put(source, bucket);
|
||||
}
|
||||
if (now - bucket.start >= WINDOW_MS) { bucket.start = now; bucket.count = 0; }
|
||||
if (bucket.count >= MAX_PER_SOURCE) return false;
|
||||
bucket.count++;
|
||||
globalCount++;
|
||||
return true;
|
||||
}
|
||||
|
||||
private static String remoteAddress(ConnectionContext ctx) {
|
||||
if (ctx == null) return "unknown";
|
||||
Session session = ctx.getWsSession();
|
||||
if (session == null) return "unknown";
|
||||
SocketAddress remote = session.getRemoteAddress();
|
||||
// Адрес не записывается в журнал и хранится только как ключ лимита на 1 минуту.
|
||||
if (remote instanceof InetSocketAddress inet) {
|
||||
return inet.getAddress() != null ? inet.getAddress().getHostAddress() : inet.getHostString();
|
||||
}
|
||||
return remote != null ? remote.toString() : "unknown";
|
||||
}
|
||||
|
||||
private static String clip(String value, int maxLen) {
|
||||
String cleaned = safe(value)
|
||||
.replace('\n', ' ')
|
||||
.replace('\r', ' ');
|
||||
if (cleaned.length() <= maxLen) {
|
||||
return cleaned;
|
||||
}
|
||||
return cleaned.substring(0, Math.max(0, maxLen - 3)) + "...";
|
||||
if (value == null) return "";
|
||||
String clean = value.replaceAll("[\\p{Cntrl}]", " ")
|
||||
.replaceAll("(?i)\\bBearer\\s+[^\\s,;]+", "Bearer [REDACTED]")
|
||||
.replaceAll("(?i)\\b(password|passwd|token|secret|privateKey|sessionId|authorization|apiKey|storagePwd)\\s*[:=]\\s*[^\\s,;}&]+", "$1=[REDACTED]")
|
||||
.replaceAll("[A-Za-z0-9_+/=-]{96,}", "[REDACTED_LONG_VALUE]")
|
||||
.replaceAll("(?i)[?&](token|key|password|secret|session|auth|code|signature)=[^&#\\s]+", "[REDACTED_PARAM]");
|
||||
return clean.length() <= maxLen ? clean : clean.substring(0, Math.max(0, maxLen - 3)) + "...";
|
||||
}
|
||||
}
|
||||
|
||||
+8
@@ -26,6 +26,8 @@ import server.logic.ws_protocol.JSON.entyties.Net_Request;
|
||||
*/
|
||||
public class Net_ClientErrorLog_Request extends Net_Request {
|
||||
|
||||
private String errorId;
|
||||
private String clientVersion;
|
||||
private String kind;
|
||||
private String message;
|
||||
private String stack;
|
||||
@@ -40,6 +42,12 @@ public class Net_ClientErrorLog_Request extends Net_Request {
|
||||
private String requestIdRef;
|
||||
private String contextJson;
|
||||
|
||||
public String getErrorId() { return errorId; }
|
||||
public void setErrorId(String errorId) { this.errorId = errorId; }
|
||||
|
||||
public String getClientVersion() { return clientVersion; }
|
||||
public void setClientVersion(String clientVersion) { this.clientVersion = clientVersion; }
|
||||
|
||||
public String getKind() { return kind; }
|
||||
public void setKind(String kind) { this.kind = kind; }
|
||||
|
||||
|
||||
+8
-1
@@ -13,6 +13,8 @@ import server.logic.ws_protocol.WireCodes;
|
||||
import shine.db.dao.BlockchainStateDAO;
|
||||
import shine.db.DbController;
|
||||
import shine.db.dao.CurrentUsersDAO;
|
||||
import shine.db.dao.SolanaUserPdaCurrentDAO;
|
||||
import shine.db.entities.SolanaUserPdaCurrentEntry;
|
||||
import shine.db.entities.BlockchainStateEntry;
|
||||
import shine.db.entities.CurrentUserEntry;
|
||||
|
||||
@@ -26,6 +28,11 @@ public class Net_GetUser_Handler implements JsonMessageHandler {
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(Net_GetUser_Handler.class);
|
||||
|
||||
private static long resolveChainLimit(String blockchainName) throws SQLException {
|
||||
SolanaUserPdaCurrentEntry current = SolanaUserPdaCurrentDAO.getInstance().getByBlockchainName(blockchainName);
|
||||
return current == null ? 0L : current.getPaidLimitBytes();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Net_Response handle(Net_Request baseRequest, ConnectionContext ctx) {
|
||||
Net_GetUser_Request req = (Net_GetUser_Request) baseRequest;
|
||||
@@ -80,7 +87,7 @@ public class Net_GetUser_Handler implements JsonMessageHandler {
|
||||
st.setLastBlockNumber(-1);
|
||||
st.setLastBlockHash(new byte[32]);
|
||||
st.setFileSizeBytes(0);
|
||||
st.setSizeLimit(1_000_000L);
|
||||
st.setSizeLimit(Math.max(0L, resolveChainLimit(u.getBlockchainName())));
|
||||
st.setUpdatedAtMs(System.currentTimeMillis());
|
||||
stateDAO.upsert(st);
|
||||
log.warn("GetUser: восстановлена запись blockchain_state для login={}, blockchainName={}",
|
||||
|
||||
+4
-1
@@ -6,6 +6,7 @@ import server.logic.ws_protocol.JSON.ConnectionContext;
|
||||
import server.logic.ws_protocol.JSON.entyties.Net_Request;
|
||||
import server.logic.ws_protocol.JSON.entyties.Net_Response;
|
||||
import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler;
|
||||
import server.logic.ws_protocol.JSON.handlers.profile.AvatarValueParser;
|
||||
import server.logic.ws_protocol.JSON.handlers.tempToTest.entyties.Net_SearchUsers_Request;
|
||||
import server.logic.ws_protocol.JSON.handlers.tempToTest.entyties.Net_SearchUsers_Response;
|
||||
import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory;
|
||||
@@ -50,7 +51,9 @@ public class Net_SearchUsers_Handler implements JsonMessageHandler {
|
||||
var item = new Net_SearchUsers_Response.UserItem();
|
||||
item.setLogin(card.login());
|
||||
item.setDisplayName(card.displayName());
|
||||
item.setAvatarAr(card.avatarAr());
|
||||
AvatarValueParser.Parsed avatar = AvatarValueParser.parse(card.avatarAr());
|
||||
item.setAvatarAr(avatar.ar());
|
||||
item.setAvatarPr(avatar.pr());
|
||||
users.add(item);
|
||||
}
|
||||
|
||||
|
||||
-37
@@ -1,37 +0,0 @@
|
||||
package server.logic.ws_protocol.JSON.handlers.tempToTest;
|
||||
|
||||
import server.logic.ws_protocol.JSON.ConnectionContext;
|
||||
import server.logic.ws_protocol.JSON.entyties.Net_Request;
|
||||
import server.logic.ws_protocol.JSON.entyties.Net_Response;
|
||||
import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler;
|
||||
import server.logic.ws_protocol.JSON.handlers.tempToTest.entyties.Net_TestGetFreeAvatarQuota_Request;
|
||||
import server.logic.ws_protocol.JSON.handlers.tempToTest.entyties.Net_TestGetFreeAvatarQuota_Response;
|
||||
import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory;
|
||||
import server.logic.ws_protocol.WireCodes;
|
||||
|
||||
public class Net_TestGetFreeAvatarQuota_Handler implements JsonMessageHandler {
|
||||
|
||||
private final TestFreeAvatarArweaveService service = new TestFreeAvatarArweaveService();
|
||||
|
||||
@Override
|
||||
public Net_Response handle(Net_Request baseRequest, ConnectionContext ctx) throws Exception {
|
||||
Net_TestGetFreeAvatarQuota_Request req = (Net_TestGetFreeAvatarQuota_Request) baseRequest;
|
||||
if (ctx == null || !ctx.isAuthenticatedUser()) {
|
||||
return NetExceptionResponseFactory.error(req, WireCodes.Status.UNVERIFIED, "NOT_AUTHENTICATED", "Требуется авторизация");
|
||||
}
|
||||
|
||||
String login = String.valueOf(ctx.getLogin() == null ? "" : ctx.getLogin()).trim();
|
||||
TestFreeAvatarArweaveService.Quota quota = service.getQuota(login);
|
||||
|
||||
Net_TestGetFreeAvatarQuota_Response resp = new Net_TestGetFreeAvatarQuota_Response();
|
||||
resp.setOp(req.getOp());
|
||||
resp.setRequestId(req.getRequestId());
|
||||
resp.setStatus(WireCodes.Status.OK);
|
||||
resp.setEnabled(quota.enabled());
|
||||
resp.setLimit(quota.limit());
|
||||
resp.setUsedCount(quota.usedCount());
|
||||
resp.setRemainingCount(quota.remainingCount());
|
||||
resp.setMaxBytes(service.getMaxBytes());
|
||||
return resp;
|
||||
}
|
||||
}
|
||||
-60
@@ -1,60 +0,0 @@
|
||||
package server.logic.ws_protocol.JSON.handlers.tempToTest;
|
||||
|
||||
import server.logic.ws_protocol.JSON.ConnectionContext;
|
||||
import server.logic.ws_protocol.JSON.entyties.Net_Request;
|
||||
import server.logic.ws_protocol.JSON.entyties.Net_Response;
|
||||
import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler;
|
||||
import server.logic.ws_protocol.JSON.handlers.tempToTest.entyties.Net_TestUploadFreeAvatar_Request;
|
||||
import server.logic.ws_protocol.JSON.handlers.tempToTest.entyties.Net_TestUploadFreeAvatar_Response;
|
||||
import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory;
|
||||
import server.logic.ws_protocol.WireCodes;
|
||||
|
||||
import java.util.Base64;
|
||||
|
||||
public class Net_TestUploadFreeAvatar_Handler implements JsonMessageHandler {
|
||||
|
||||
private final TestFreeAvatarArweaveService service = new TestFreeAvatarArweaveService();
|
||||
|
||||
@Override
|
||||
public Net_Response handle(Net_Request baseRequest, ConnectionContext ctx) throws Exception {
|
||||
Net_TestUploadFreeAvatar_Request req = (Net_TestUploadFreeAvatar_Request) baseRequest;
|
||||
if (ctx == null || !ctx.isAuthenticatedUser()) {
|
||||
return NetExceptionResponseFactory.error(req, WireCodes.Status.UNVERIFIED, "NOT_AUTHENTICATED", "Требуется авторизация");
|
||||
}
|
||||
|
||||
String fileBase64 = String.valueOf(req.getFileBytesBase64() == null ? "" : req.getFileBytesBase64()).trim();
|
||||
String contentType = String.valueOf(req.getContentType() == null ? "" : req.getContentType()).trim();
|
||||
if (fileBase64.isBlank() || contentType.isBlank()) {
|
||||
return NetExceptionResponseFactory.error(req, WireCodes.Status.BAD_REQUEST, "BAD_FIELDS", "Нужно передать contentType и fileBytesBase64.");
|
||||
}
|
||||
|
||||
byte[] fileBytes;
|
||||
try {
|
||||
fileBytes = Base64.getDecoder().decode(fileBase64);
|
||||
} catch (IllegalArgumentException e) {
|
||||
return NetExceptionResponseFactory.error(req, WireCodes.Status.BAD_REQUEST, "BAD_BASE64", "fileBytesBase64 должен быть корректным Base64.");
|
||||
}
|
||||
|
||||
String login = String.valueOf(ctx.getLogin() == null ? "" : ctx.getLogin()).trim();
|
||||
try {
|
||||
TestFreeAvatarArweaveService.UploadResult result = service.uploadAvatar(login, contentType, fileBytes, req.getSha256Hex());
|
||||
Net_TestUploadFreeAvatar_Response resp = new Net_TestUploadFreeAvatar_Response();
|
||||
resp.setOp(req.getOp());
|
||||
resp.setRequestId(req.getRequestId());
|
||||
resp.setStatus(WireCodes.Status.OK);
|
||||
resp.setTxId(result.txId());
|
||||
resp.setSha256Hex(result.sha256Hex());
|
||||
resp.setUsedCount(result.usedCount());
|
||||
resp.setRemainingCount(result.remainingCount());
|
||||
resp.setLimit(result.limit());
|
||||
resp.setGateway(result.gateway());
|
||||
return resp;
|
||||
} catch (TestFreeAvatarArweaveService.FreeAvatarLimitExceededException e) {
|
||||
return NetExceptionResponseFactory.error(req, WireCodes.Status.BAD_REQUEST, "FREE_AVATAR_LIMIT_EXHAUSTED", e.getMessage());
|
||||
} catch (IllegalArgumentException e) {
|
||||
return NetExceptionResponseFactory.error(req, WireCodes.Status.BAD_REQUEST, "BAD_AVATAR_FILE", e.getMessage());
|
||||
} catch (IllegalStateException e) {
|
||||
return NetExceptionResponseFactory.error(req, WireCodes.Status.SERVER_DATA_ERROR, "FREE_AVATAR_TEMP_DISABLED", e.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
-391
@@ -1,391 +0,0 @@
|
||||
package server.logic.ws_protocol.JSON.handlers.tempToTest;
|
||||
|
||||
import com.fasterxml.jackson.databind.JsonNode;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import shine.db.dao.TestFreeAvatarUploadsDAO;
|
||||
import shine.db.entities.TestFreeAvatarUploadEntry;
|
||||
import utils.config.AppConfig;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.math.BigInteger;
|
||||
import java.net.URI;
|
||||
import java.net.http.HttpClient;
|
||||
import java.net.http.HttpRequest;
|
||||
import java.net.http.HttpResponse;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.security.GeneralSecurityException;
|
||||
import java.security.KeyFactory;
|
||||
import java.security.MessageDigest;
|
||||
import java.security.PrivateKey;
|
||||
import java.security.Signature;
|
||||
import java.security.interfaces.RSAPrivateCrtKey;
|
||||
import java.security.spec.MGF1ParameterSpec;
|
||||
import java.security.spec.PSSParameterSpec;
|
||||
import java.security.spec.RSAPrivateCrtKeySpec;
|
||||
import java.sql.SQLException;
|
||||
import java.time.Duration;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Base64;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
public final class TestFreeAvatarArweaveService {
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(TestFreeAvatarArweaveService.class);
|
||||
private static final ObjectMapper MAPPER = new ObjectMapper();
|
||||
private static final HttpClient HTTP = HttpClient.newBuilder()
|
||||
.connectTimeout(Duration.ofSeconds(20))
|
||||
.build();
|
||||
private static final Base64.Decoder B64URL = Base64.getUrlDecoder();
|
||||
private static final Base64.Encoder B64URL_NOPAD = Base64.getUrlEncoder().withoutPadding();
|
||||
private static final int DEFAULT_LIMIT = 3;
|
||||
private static final int DEFAULT_MAX_BYTES = 128 * 1024;
|
||||
private static final String DEFAULT_GATEWAY = "https://arweave.net";
|
||||
private static final ConcurrentHashMap<String, Object> LOGIN_LOCKS = new ConcurrentHashMap<>();
|
||||
|
||||
private final AppConfig config = AppConfig.getInstance();
|
||||
private final TestFreeAvatarUploadsDAO quotaDao = TestFreeAvatarUploadsDAO.getInstance();
|
||||
|
||||
public Quota getQuota(String login) throws SQLException {
|
||||
int limit = getLimitPerUser();
|
||||
TestFreeAvatarUploadEntry entry = quotaDao.getByLogin(login);
|
||||
int used = entry == null ? 0 : Math.max(0, entry.getUsedCount());
|
||||
int remaining = Math.max(0, limit - used);
|
||||
return new Quota(limit, used, remaining, isEnabled());
|
||||
}
|
||||
|
||||
public UploadResult uploadAvatar(String login, String contentType, byte[] fileBytes, String expectedSha256Hex)
|
||||
throws Exception {
|
||||
if (!isEnabled()) {
|
||||
throw new IllegalStateException("Временная бесплатная загрузка аватаров сейчас отключена на сервере.");
|
||||
}
|
||||
|
||||
String cleanLogin = String.valueOf(login == null ? "" : login).trim();
|
||||
if (cleanLogin.isBlank()) {
|
||||
throw new IllegalArgumentException("Пустой login для бесплатной загрузки аватара.");
|
||||
}
|
||||
|
||||
String cleanType = normalizeContentType(contentType);
|
||||
validatePayload(cleanType, fileBytes);
|
||||
String actualSha256Hex = sha256Hex(fileBytes);
|
||||
String expectedSha = String.valueOf(expectedSha256Hex == null ? "" : expectedSha256Hex).trim().toLowerCase();
|
||||
if (!expectedSha.isBlank() && !actualSha256Hex.equals(expectedSha)) {
|
||||
throw new IllegalArgumentException("SHA-256 файла не совпадает с присланным клиентом.");
|
||||
}
|
||||
|
||||
Object lock = LOGIN_LOCKS.computeIfAbsent(cleanLogin.toLowerCase(), key -> new Object());
|
||||
synchronized (lock) {
|
||||
Quota before = getQuota(cleanLogin);
|
||||
if (before.remainingCount() <= 0) {
|
||||
throw new FreeAvatarLimitExceededException("Вы исчерпали бесплатный лимит аватарок.");
|
||||
}
|
||||
|
||||
ArweaveConfig arConfig = loadArweaveConfig();
|
||||
String txId = postAvatarTransaction(arConfig, cleanLogin, cleanType, fileBytes);
|
||||
|
||||
int usedAfter = before.usedCount() + 1;
|
||||
int remainingAfter = Math.max(0, before.limit() - usedAfter);
|
||||
quotaDao.upsertUsage(cleanLogin, usedAfter, System.currentTimeMillis(), txId);
|
||||
return new UploadResult(txId, actualSha256Hex, usedAfter, remainingAfter, before.limit(), arConfig.gateway());
|
||||
}
|
||||
}
|
||||
|
||||
public boolean isEnabled() {
|
||||
return config.getBoolean("test.freeAvatar.enabled", true);
|
||||
}
|
||||
|
||||
public int getLimitPerUser() {
|
||||
int configured = config.getInt("test.freeAvatar.limitPerUser", DEFAULT_LIMIT);
|
||||
return Math.max(1, configured);
|
||||
}
|
||||
|
||||
public int getMaxBytes() {
|
||||
int configured = config.getInt("test.freeAvatar.maxBytes", DEFAULT_MAX_BYTES);
|
||||
return Math.max(1024, configured);
|
||||
}
|
||||
|
||||
private String postAvatarTransaction(ArweaveConfig arConfig, String login, String contentType, byte[] data)
|
||||
throws IOException, InterruptedException, GeneralSecurityException {
|
||||
String gateway = arConfig.gateway();
|
||||
String anchor = getRequiredText(gateway, "/tx_anchor");
|
||||
String reward = getRequiredText(gateway, "/price/" + data.length);
|
||||
if (!reward.matches("^\\d+$")) {
|
||||
throw new IllegalStateException("Arweave gateway вернул некорректную цену загрузки.");
|
||||
}
|
||||
|
||||
if (!arConfig.address().isBlank()) {
|
||||
String balance = getRequiredText(gateway, "/wallet/" + arConfig.address() + "/balance");
|
||||
if (balance.matches("^\\d+$")) {
|
||||
BigInteger balanceWinston = new BigInteger(balance);
|
||||
BigInteger rewardWinston = new BigInteger(reward);
|
||||
if (balanceWinston.compareTo(rewardWinston) < 0) {
|
||||
throw new IllegalStateException("На серверном Arweave-кошельке недостаточно AR для бесплатной загрузки аватара.");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
byte[] dataRoot = singleChunkDataRoot(data);
|
||||
List<List<byte[]>> tagList = new ArrayList<>();
|
||||
List<Map<String, String>> jsonTags = new ArrayList<>();
|
||||
appendTag(jsonTags, tagList, "Content-Type", contentType);
|
||||
appendTag(jsonTags, tagList, "App-Name", "SHiNE");
|
||||
appendTag(jsonTags, tagList, "SHiNE-Type", "avatar-free-test");
|
||||
appendTag(jsonTags, tagList, "SHiNE-Profile-Login", login);
|
||||
|
||||
byte[] signaturePayload = deepHash(List.of(
|
||||
utf8("2"),
|
||||
b64UrlDecode(arConfig.owner()),
|
||||
new byte[0],
|
||||
utf8("0"),
|
||||
utf8(reward),
|
||||
b64UrlDecode(anchor),
|
||||
tagList,
|
||||
utf8(Integer.toString(data.length)),
|
||||
dataRoot
|
||||
));
|
||||
|
||||
byte[] rawSignature = signPayload(arConfig.privateKey(), signaturePayload);
|
||||
String txId = b64UrlEncode(sha256(rawSignature));
|
||||
|
||||
Map<String, Object> body = new LinkedHashMap<>();
|
||||
body.put("format", 2);
|
||||
body.put("id", txId);
|
||||
body.put("last_tx", anchor);
|
||||
body.put("owner", arConfig.owner());
|
||||
body.put("tags", jsonTags);
|
||||
body.put("target", "");
|
||||
body.put("quantity", "0");
|
||||
body.put("data_root", b64UrlEncode(dataRoot));
|
||||
body.put("data_size", Integer.toString(data.length));
|
||||
body.put("data", b64UrlEncode(data));
|
||||
body.put("reward", reward);
|
||||
body.put("signature", b64UrlEncode(rawSignature));
|
||||
|
||||
String bodyJson = MAPPER.writeValueAsString(body);
|
||||
HttpRequest req = HttpRequest.newBuilder(URI.create(gateway + "/tx"))
|
||||
.timeout(Duration.ofSeconds(40))
|
||||
.header("Content-Type", "application/json")
|
||||
.header("Accept", "application/json")
|
||||
.POST(HttpRequest.BodyPublishers.ofString(bodyJson, StandardCharsets.UTF_8))
|
||||
.build();
|
||||
HttpResponse<String> response = HTTP.send(req, HttpResponse.BodyHandlers.ofString(StandardCharsets.UTF_8));
|
||||
int status = response.statusCode();
|
||||
if (status != 200 && status != 208) {
|
||||
throw new IllegalStateException("Arweave отклонил транзакцию: HTTP " + status + " " + safeBody(response.body()));
|
||||
}
|
||||
return txId;
|
||||
}
|
||||
|
||||
private ArweaveConfig loadArweaveConfig() throws IOException, GeneralSecurityException {
|
||||
String rawGateway = String.valueOf(config.getParam("test.freeAvatar.gateway") == null
|
||||
? DEFAULT_GATEWAY
|
||||
: config.getParam("test.freeAvatar.gateway")).trim();
|
||||
String gateway = rawGateway.isBlank() ? DEFAULT_GATEWAY : rawGateway.replaceAll("/+$", "");
|
||||
|
||||
String walletPathRaw = String.valueOf(config.getParam("test.freeAvatar.walletJwkPath") == null
|
||||
? ""
|
||||
: config.getParam("test.freeAvatar.walletJwkPath")).trim();
|
||||
if (walletPathRaw.isBlank()) {
|
||||
throw new IllegalStateException("Не задан test.freeAvatar.walletJwkPath в настройках сервера.");
|
||||
}
|
||||
|
||||
JsonNode jwk = MAPPER.readTree(Files.readString(Path.of(walletPathRaw), StandardCharsets.UTF_8));
|
||||
String owner = requiredText(jwk, "n");
|
||||
PrivateKey privateKey = buildPrivateKeyFromJwk(jwk);
|
||||
String computedAddress = b64UrlEncode(sha256(b64UrlDecode(owner)));
|
||||
|
||||
String expectedAddress = String.valueOf(config.getParam("test.freeAvatar.walletAddress") == null
|
||||
? ""
|
||||
: config.getParam("test.freeAvatar.walletAddress")).trim();
|
||||
if (!expectedAddress.isBlank() && !expectedAddress.equals(computedAddress)) {
|
||||
throw new IllegalStateException("test.freeAvatar.walletAddress не совпадает с адресом из JWK.");
|
||||
}
|
||||
|
||||
return new ArweaveConfig(gateway, owner, computedAddress, privateKey);
|
||||
}
|
||||
|
||||
private static PrivateKey buildPrivateKeyFromJwk(JsonNode jwk) throws GeneralSecurityException {
|
||||
RSAPrivateCrtKeySpec spec = new RSAPrivateCrtKeySpec(
|
||||
asBigInt(requiredText(jwk, "n")),
|
||||
asBigInt(requiredText(jwk, "e")),
|
||||
asBigInt(requiredText(jwk, "d")),
|
||||
asBigInt(requiredText(jwk, "p")),
|
||||
asBigInt(requiredText(jwk, "q")),
|
||||
asBigInt(requiredText(jwk, "dp")),
|
||||
asBigInt(requiredText(jwk, "dq")),
|
||||
asBigInt(requiredText(jwk, "qi"))
|
||||
);
|
||||
return KeyFactory.getInstance("RSA").generatePrivate(spec);
|
||||
}
|
||||
|
||||
private static byte[] signPayload(PrivateKey key, byte[] payload) throws GeneralSecurityException {
|
||||
Signature signature = Signature.getInstance("RSASSA-PSS");
|
||||
signature.setParameter(new PSSParameterSpec("SHA-256", "MGF1", MGF1ParameterSpec.SHA256, 32, 1));
|
||||
signature.initSign(key);
|
||||
signature.update(payload);
|
||||
return signature.sign();
|
||||
}
|
||||
|
||||
private static byte[] singleChunkDataRoot(byte[] data) throws GeneralSecurityException {
|
||||
byte[] dataHash = sha256(data);
|
||||
byte[] left = sha256(dataHash);
|
||||
byte[] right = sha256(intToBuffer32(data.length));
|
||||
return sha256(concat(left, right));
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private static byte[] deepHash(Object data) throws GeneralSecurityException {
|
||||
if (data instanceof List<?> list) {
|
||||
byte[] tag = concat(utf8("list"), utf8(Integer.toString(list.size())));
|
||||
return deepHashChunks(list, sha384(tag));
|
||||
}
|
||||
if (!(data instanceof byte[] bytes)) {
|
||||
throw new IllegalArgumentException("deepHash поддерживает только byte[] и list.");
|
||||
}
|
||||
byte[] tag = concat(utf8("blob"), utf8(Integer.toString(bytes.length)));
|
||||
byte[] tagged = concat(sha384(tag), sha384(bytes));
|
||||
return sha384(tagged);
|
||||
}
|
||||
|
||||
private static byte[] deepHashChunks(List<?> chunks, byte[] acc) throws GeneralSecurityException {
|
||||
if (chunks.isEmpty()) return acc;
|
||||
byte[] pair = concat(acc, deepHash(chunks.get(0)));
|
||||
return deepHashChunks(chunks.subList(1, chunks.size()), sha384(pair));
|
||||
}
|
||||
|
||||
private static void appendTag(List<Map<String, String>> jsonTags, List<List<byte[]>> tagList, String name, String value) {
|
||||
byte[] nameBytes = utf8(name);
|
||||
byte[] valueBytes = utf8(value);
|
||||
Map<String, String> item = new LinkedHashMap<>();
|
||||
item.put("name", b64UrlEncode(nameBytes));
|
||||
item.put("value", b64UrlEncode(valueBytes));
|
||||
jsonTags.add(item);
|
||||
tagList.add(List.of(nameBytes, valueBytes));
|
||||
}
|
||||
|
||||
private static String getRequiredText(String gateway, String path) throws IOException, InterruptedException {
|
||||
HttpRequest req = HttpRequest.newBuilder(URI.create(gateway + path))
|
||||
.timeout(Duration.ofSeconds(20))
|
||||
.GET()
|
||||
.build();
|
||||
HttpResponse<String> response = HTTP.send(req, HttpResponse.BodyHandlers.ofString(StandardCharsets.UTF_8));
|
||||
if (response.statusCode() < 200 || response.statusCode() >= 300) {
|
||||
throw new IllegalStateException("Arweave gateway вернул HTTP " + response.statusCode() + " для " + path);
|
||||
}
|
||||
String body = String.valueOf(response.body() == null ? "" : response.body()).trim();
|
||||
if (body.isBlank()) {
|
||||
throw new IllegalStateException("Arweave gateway вернул пустой ответ для " + path);
|
||||
}
|
||||
return body;
|
||||
}
|
||||
|
||||
private void validatePayload(String contentType, byte[] fileBytes) {
|
||||
if (fileBytes == null || fileBytes.length == 0) {
|
||||
throw new IllegalArgumentException("Файл аватара пустой.");
|
||||
}
|
||||
if (fileBytes.length > getMaxBytes()) {
|
||||
throw new IllegalArgumentException("Файл слишком большой для бесплатной загрузки. Максимум " + getMaxBytes() + " байт.");
|
||||
}
|
||||
if (!isSupportedContentType(contentType)) {
|
||||
throw new IllegalArgumentException("Поддерживаются только JPEG, PNG или WebP.");
|
||||
}
|
||||
}
|
||||
|
||||
private static boolean isSupportedContentType(String contentType) {
|
||||
return "image/jpeg".equals(contentType)
|
||||
|| "image/png".equals(contentType)
|
||||
|| "image/webp".equals(contentType);
|
||||
}
|
||||
|
||||
private static String normalizeContentType(String contentType) {
|
||||
return String.valueOf(contentType == null ? "" : contentType).trim().toLowerCase();
|
||||
}
|
||||
|
||||
private static String requiredText(JsonNode node, String field) {
|
||||
String value = node == null ? "" : String.valueOf(node.path(field).asText("")).trim();
|
||||
if (value.isBlank()) {
|
||||
throw new IllegalStateException("В JWK отсутствует поле " + field + ".");
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
private static BigInteger asBigInt(String b64Url) {
|
||||
return new BigInteger(1, b64UrlDecode(b64Url));
|
||||
}
|
||||
|
||||
private static byte[] b64UrlDecode(String value) {
|
||||
return B64URL.decode(String.valueOf(value == null ? "" : value).trim());
|
||||
}
|
||||
|
||||
private static String b64UrlEncode(byte[] value) {
|
||||
return B64URL_NOPAD.encodeToString(value);
|
||||
}
|
||||
|
||||
private static byte[] utf8(String value) {
|
||||
return String.valueOf(value == null ? "" : value).getBytes(StandardCharsets.UTF_8);
|
||||
}
|
||||
|
||||
private static byte[] concat(byte[]... arrays) {
|
||||
int total = 0;
|
||||
for (byte[] array : arrays) total += array.length;
|
||||
byte[] out = new byte[total];
|
||||
int offset = 0;
|
||||
for (byte[] array : arrays) {
|
||||
System.arraycopy(array, 0, out, offset, array.length);
|
||||
offset += array.length;
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
private static byte[] intToBuffer32(int value) {
|
||||
byte[] out = new byte[32];
|
||||
long current = Integer.toUnsignedLong(value);
|
||||
for (int i = out.length - 1; i >= 0; i--) {
|
||||
out[i] = (byte) (current & 0xffL);
|
||||
current >>>= 8;
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
private static byte[] sha256(byte[] data) throws GeneralSecurityException {
|
||||
return MessageDigest.getInstance("SHA-256").digest(data);
|
||||
}
|
||||
|
||||
private static byte[] sha384(byte[] data) throws GeneralSecurityException {
|
||||
return MessageDigest.getInstance("SHA-384").digest(data);
|
||||
}
|
||||
|
||||
private static String sha256Hex(byte[] data) throws GeneralSecurityException {
|
||||
byte[] hash = sha256(data);
|
||||
StringBuilder sb = new StringBuilder(hash.length * 2);
|
||||
for (byte b : hash) sb.append(String.format("%02x", b));
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
private static String safeBody(String body) {
|
||||
String text = String.valueOf(body == null ? "" : body).replace('\n', ' ').replace('\r', ' ').trim();
|
||||
if (text.length() <= 220) return text;
|
||||
return text.substring(0, 220) + "...";
|
||||
}
|
||||
|
||||
public record Quota(int limit, int usedCount, int remainingCount, boolean enabled) {
|
||||
}
|
||||
|
||||
public record UploadResult(String txId, String sha256Hex, int usedCount, int remainingCount, int limit, String gateway) {
|
||||
}
|
||||
|
||||
private record ArweaveConfig(String gateway, String owner, String address, PrivateKey privateKey) {
|
||||
}
|
||||
|
||||
public static final class FreeAvatarLimitExceededException extends RuntimeException {
|
||||
public FreeAvatarLimitExceededException(String message) {
|
||||
super(message);
|
||||
}
|
||||
}
|
||||
}
|
||||
+3
-1
@@ -28,13 +28,15 @@ public class Net_SearchUsers_Response extends Net_Response {
|
||||
public void setUsers(List<UserItem> users) { this.users = users; }
|
||||
|
||||
public static class UserItem {
|
||||
private String login, displayName, avatarAr;
|
||||
private String login, displayName, avatarAr, avatarPr;
|
||||
public String getLogin() { return login; }
|
||||
public void setLogin(String value) { login = value; }
|
||||
public String getDisplayName() { return displayName; }
|
||||
public void setDisplayName(String value) { displayName = value; }
|
||||
public String getAvatarAr() { return avatarAr; }
|
||||
public void setAvatarAr(String value) { avatarAr = value; }
|
||||
public String getAvatarPr() { return avatarPr; }
|
||||
public void setAvatarPr(String value) { avatarPr = value; }
|
||||
}
|
||||
|
||||
|
||||
|
||||
-6
@@ -1,6 +0,0 @@
|
||||
package server.logic.ws_protocol.JSON.handlers.tempToTest.entyties;
|
||||
|
||||
import server.logic.ws_protocol.JSON.entyties.Net_Request;
|
||||
|
||||
public class Net_TestGetFreeAvatarQuota_Request extends Net_Request {
|
||||
}
|
||||
-51
@@ -1,51 +0,0 @@
|
||||
package server.logic.ws_protocol.JSON.handlers.tempToTest.entyties;
|
||||
|
||||
import server.logic.ws_protocol.JSON.entyties.Net_Response;
|
||||
|
||||
public class Net_TestGetFreeAvatarQuota_Response extends Net_Response {
|
||||
private boolean enabled;
|
||||
private int limit;
|
||||
private int usedCount;
|
||||
private int remainingCount;
|
||||
private int maxBytes;
|
||||
|
||||
public boolean isEnabled() {
|
||||
return enabled;
|
||||
}
|
||||
|
||||
public void setEnabled(boolean enabled) {
|
||||
this.enabled = enabled;
|
||||
}
|
||||
|
||||
public int getLimit() {
|
||||
return limit;
|
||||
}
|
||||
|
||||
public void setLimit(int limit) {
|
||||
this.limit = limit;
|
||||
}
|
||||
|
||||
public int getUsedCount() {
|
||||
return usedCount;
|
||||
}
|
||||
|
||||
public void setUsedCount(int usedCount) {
|
||||
this.usedCount = usedCount;
|
||||
}
|
||||
|
||||
public int getRemainingCount() {
|
||||
return remainingCount;
|
||||
}
|
||||
|
||||
public void setRemainingCount(int remainingCount) {
|
||||
this.remainingCount = remainingCount;
|
||||
}
|
||||
|
||||
public int getMaxBytes() {
|
||||
return maxBytes;
|
||||
}
|
||||
|
||||
public void setMaxBytes(int maxBytes) {
|
||||
this.maxBytes = maxBytes;
|
||||
}
|
||||
}
|
||||
-33
@@ -1,33 +0,0 @@
|
||||
package server.logic.ws_protocol.JSON.handlers.tempToTest.entyties;
|
||||
|
||||
import server.logic.ws_protocol.JSON.entyties.Net_Request;
|
||||
|
||||
public class Net_TestUploadFreeAvatar_Request extends Net_Request {
|
||||
private String contentType;
|
||||
private String fileBytesBase64;
|
||||
private String sha256Hex;
|
||||
|
||||
public String getContentType() {
|
||||
return contentType;
|
||||
}
|
||||
|
||||
public void setContentType(String contentType) {
|
||||
this.contentType = contentType;
|
||||
}
|
||||
|
||||
public String getFileBytesBase64() {
|
||||
return fileBytesBase64;
|
||||
}
|
||||
|
||||
public void setFileBytesBase64(String fileBytesBase64) {
|
||||
this.fileBytesBase64 = fileBytesBase64;
|
||||
}
|
||||
|
||||
public String getSha256Hex() {
|
||||
return sha256Hex;
|
||||
}
|
||||
|
||||
public void setSha256Hex(String sha256Hex) {
|
||||
this.sha256Hex = sha256Hex;
|
||||
}
|
||||
}
|
||||
-60
@@ -1,60 +0,0 @@
|
||||
package server.logic.ws_protocol.JSON.handlers.tempToTest.entyties;
|
||||
|
||||
import server.logic.ws_protocol.JSON.entyties.Net_Response;
|
||||
|
||||
public class Net_TestUploadFreeAvatar_Response extends Net_Response {
|
||||
private String txId;
|
||||
private String sha256Hex;
|
||||
private int usedCount;
|
||||
private int remainingCount;
|
||||
private int limit;
|
||||
private String gateway;
|
||||
|
||||
public String getTxId() {
|
||||
return txId;
|
||||
}
|
||||
|
||||
public void setTxId(String txId) {
|
||||
this.txId = txId;
|
||||
}
|
||||
|
||||
public String getSha256Hex() {
|
||||
return sha256Hex;
|
||||
}
|
||||
|
||||
public void setSha256Hex(String sha256Hex) {
|
||||
this.sha256Hex = sha256Hex;
|
||||
}
|
||||
|
||||
public int getUsedCount() {
|
||||
return usedCount;
|
||||
}
|
||||
|
||||
public void setUsedCount(int usedCount) {
|
||||
this.usedCount = usedCount;
|
||||
}
|
||||
|
||||
public int getRemainingCount() {
|
||||
return remainingCount;
|
||||
}
|
||||
|
||||
public void setRemainingCount(int remainingCount) {
|
||||
this.remainingCount = remainingCount;
|
||||
}
|
||||
|
||||
public int getLimit() {
|
||||
return limit;
|
||||
}
|
||||
|
||||
public void setLimit(int limit) {
|
||||
this.limit = limit;
|
||||
}
|
||||
|
||||
public String getGateway() {
|
||||
return gateway;
|
||||
}
|
||||
|
||||
public void setGateway(String gateway) {
|
||||
this.gateway = gateway;
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -139,7 +139,7 @@ public class Net_GetDirectMessages_Handler implements JsonMessageHandler {
|
||||
AvatarValueParser.Parsed parsed = AvatarValueParser.parse(value);
|
||||
if (!parsed.ok()) return out;
|
||||
out.setAr(parsed.ar());
|
||||
out.setSha256Hex(parsed.sha256Hex());
|
||||
out.setPr(parsed.pr());
|
||||
return out;
|
||||
}
|
||||
|
||||
|
||||
+3
-3
@@ -60,11 +60,11 @@ public class Net_GetDirectMessages_Response extends Net_Response {
|
||||
|
||||
public static class Avatar {
|
||||
private String ar;
|
||||
private String sha256Hex;
|
||||
private String pr;
|
||||
public String getAr() { return ar; }
|
||||
public void setAr(String ar) { this.ar = ar; }
|
||||
public String getSha256Hex() { return sha256Hex; }
|
||||
public void setSha256Hex(String sha256Hex) { this.sha256Hex = sha256Hex; }
|
||||
public String getPr() { return pr; }
|
||||
public void setPr(String pr) { this.pr = pr; }
|
||||
}
|
||||
|
||||
public static class MessageItem {
|
||||
|
||||
+25
@@ -0,0 +1,25 @@
|
||||
package server.logic.ws_protocol.JSON.handlers.channels;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
class AttachmentMarkerValidatorTest {
|
||||
private static final String PR = "4vJ9JU1bJJE96FWSJKvHsmmFADCg4gpZQff4P3bkLKi";
|
||||
private static String marker(String fields) { return "<S:att;" + fields + ">\nтекст"; }
|
||||
|
||||
@Test void validUnicodeAndEscapes() {
|
||||
assertTrue(AttachmentMarkerValidator.validateLeadingV2Markers(marker("v=2;nm=Водопад%3Bлето%3D2026.mp4;sz=1837243;pr=" + PR + ";mm=video/mp4")));
|
||||
assertTrue(AttachmentMarkerValidator.validateLeadingV2Markers("Обычный текст"));
|
||||
}
|
||||
|
||||
@Test void rejectsMalformedV2WithoutChangingBlock() {
|
||||
for (String fields : new String[]{
|
||||
"v=2;nm=abc;sz=10;sz=20;pr=" + PR,
|
||||
"v=2;nm=abc%ZZ;sz=10;pr=" + PR,
|
||||
"v=2;nm=abc;unknown=x;sz=10;pr=" + PR,
|
||||
"v=2;nm=abc;sz=-1;pr=" + PR,
|
||||
"v=2;nm=abc;sz=10;pr=bad",
|
||||
"nm=abc;v=2;sz=10;pr=" + PR
|
||||
}) assertFalse(AttachmentMarkerValidator.validateLeadingV2Markers(marker(fields)), fields);
|
||||
}
|
||||
}
|
||||
+71
-24
@@ -31,6 +31,9 @@ public final class ShineUsersCodec {
|
||||
6;
|
||||
|
||||
public static final int IX_CREATE_NAMESPACE = 7;
|
||||
public static final int IX_UPDATE_NAMESPACE_PRICE = 8;
|
||||
public static final int IX_SUPPORT_USER = 9;
|
||||
public static final int IX_SUPPORT_DAO = 10;
|
||||
|
||||
public static final long START_REGISTRATION_FEE_LAMPORTS =
|
||||
10_000_000L;
|
||||
@@ -139,18 +142,25 @@ public final class ShineUsersCodec {
|
||||
null
|
||||
);
|
||||
|
||||
case IX_UPDATE_USERS_ECONOMY_CONFIG ->
|
||||
case IX_UPDATE_USERS_ECONOMY_CONFIG -> {
|
||||
// Historical v1 transactions contain three u64s, v2 only update fee.
|
||||
int payloadBytes = reader.remaining();
|
||||
EconomyConfigState economy = switch (payloadBytes) {
|
||||
case 8 -> new EconomyConfigState(2, 0L, 0L, 0L, reader.readU64());
|
||||
case 24 -> new EconomyConfigState(1, reader.readU64(), reader.readU64(), reader.readU64(), 20_000L);
|
||||
default -> throw new IllegalArgumentException("Invalid economy config instruction length");
|
||||
};
|
||||
yield new ParsedInstruction(TxKind.UPDATE_USERS_ECONOMY_CONFIG,
|
||||
false, null, null, economy, null);
|
||||
}
|
||||
|
||||
case IX_UPDATE_NAMESPACE_PRICE ->
|
||||
new ParsedInstruction(
|
||||
TxKind.UPDATE_USERS_ECONOMY_CONFIG,
|
||||
false,
|
||||
TxKind.UPDATE_NAMESPACE_PRICE,
|
||||
true,
|
||||
accountAt(accounts, 1),
|
||||
null,
|
||||
null,
|
||||
new EconomyConfigState(
|
||||
1,
|
||||
reader.readU64(),
|
||||
reader.readU64(),
|
||||
reader.readU64()
|
||||
),
|
||||
null
|
||||
);
|
||||
|
||||
@@ -184,6 +194,21 @@ public final class ShineUsersCodec {
|
||||
null
|
||||
);
|
||||
|
||||
// Основной PDA-sync должен знать только логин отправителя.
|
||||
// Финансовый индексатор отдельно декодирует Stars, проверяет события
|
||||
// и отбрасывает историю старого тестового протокола. Здесь нельзя
|
||||
// разбирать старые поля как новый target: иначе sync может упасть
|
||||
// на транзакциях до обновления программы в Devnet.
|
||||
case IX_SUPPORT_USER -> {
|
||||
String senderLogin = reader.readStringU8();
|
||||
yield new ParsedInstruction(TxKind.SUPPORT_USER, false, null, senderLogin, null, null);
|
||||
}
|
||||
|
||||
case IX_SUPPORT_DAO -> {
|
||||
String senderLogin = reader.readStringU8();
|
||||
yield new ParsedInstruction(TxKind.SUPPORT_DAO, false, null, senderLogin, null, null);
|
||||
}
|
||||
|
||||
default ->
|
||||
new ParsedInstruction(
|
||||
TxKind.OTHER,
|
||||
@@ -232,7 +257,7 @@ public final class ShineUsersCodec {
|
||||
if (formatMajor != 1) {
|
||||
throw new IllegalArgumentException("Unsupported PDA format " + formatMajor + "." + formatMinor);
|
||||
}
|
||||
if (formatMinor == 2) {
|
||||
if (formatMinor == 2 || formatMinor == 3) {
|
||||
return parseUserPdaAccountV12(pdaAddress, slot, rawDataBase64, lastTxSignature, raw);
|
||||
}
|
||||
if (formatMinor == 0) {
|
||||
@@ -244,6 +269,24 @@ public final class ShineUsersCodec {
|
||||
throw new IllegalArgumentException("Unsupported PDA format " + formatMajor + "." + formatMinor);
|
||||
}
|
||||
|
||||
/** Счётчики Stars в сотых долях; версии с lamports не поддерживаются. */
|
||||
public static SupportStats parseSupportStats(byte[] raw) {
|
||||
if (raw == null || raw.length < 9) throw new IllegalArgumentException("PDA record too short");
|
||||
int recordLen = u16le(raw, 7);
|
||||
if (recordLen > raw.length) throw new IllegalArgumentException("Invalid record_len");
|
||||
if (recordLen == raw.length || raw[recordLen] == 0) return new SupportStats(0, 0L, 0L, 0L);
|
||||
if ((raw[recordLen] & 0xFF) == 1) return new SupportStats(2, 0L, 0L, 0L); // старые lamports игнорируем
|
||||
if ((raw[recordLen] & 0xFF) != 2) throw new IllegalArgumentException("Unsupported support stats version; required Stars v2");
|
||||
if (recordLen + 25 > raw.length) throw new IllegalArgumentException("Truncated support stats");
|
||||
return new SupportStats(2, u64le(raw, recordLen + 1), u64le(raw, recordLen + 9), u64le(raw, recordLen + 17));
|
||||
}
|
||||
|
||||
private static long u64le(byte[] bytes, int offset) {
|
||||
long value = 0L;
|
||||
for (int i = 0; i < 8; i++) value |= (long) (bytes[offset + i] & 0xFF) << (8 * i);
|
||||
return value;
|
||||
}
|
||||
|
||||
private static UserPdaSnapshot parseUserPdaAccountV10(
|
||||
String pdaAddress,
|
||||
long slot,
|
||||
@@ -744,15 +787,16 @@ public final class ShineUsersCodec {
|
||||
}
|
||||
}
|
||||
|
||||
/** Строгий декодер бинарного namespace 1.0 с on-chain PDA address check. */
|
||||
/** Строгий декодер бинарных namespace 1.0/1.1 с проверкой on-chain PDA. */
|
||||
public static NamespaceSnapshot parseNamespaceAccount(
|
||||
String pdaAddress, long slot, String rawDataBase64,
|
||||
String lastTxSignature, String programId
|
||||
) {
|
||||
byte[] bytes = Base64.getDecoder().decode(rawDataBase64);
|
||||
if (bytes.length < 13 || bytes[0] != 1 || bytes[1] != 0) {
|
||||
throw new IllegalArgumentException("Not a namespace PDA 1.0");
|
||||
if (bytes.length < 13 || bytes[0] != 1 || (bytes[1] != 0 && bytes[1] != 1)) {
|
||||
throw new IllegalArgumentException("Not a namespace PDA 1.0/1.1");
|
||||
}
|
||||
int minor = bytes[1] & 0xFF;
|
||||
Reader r = new Reader(bytes);
|
||||
r.readU8(); r.readU8();
|
||||
int type = r.readU8();
|
||||
@@ -766,6 +810,8 @@ public final class ShineUsersCodec {
|
||||
byte[] feeBigEndian = new byte[9];
|
||||
for (int n = 0; n < 8; n++) feeBigEndian[8 - n] = feeLittleEndian[n];
|
||||
java.math.BigInteger fee = new java.math.BigInteger(feeBigEndian);
|
||||
int currencyCode = minor == 1 ? r.readU8() : 1;
|
||||
if (currencyCode != 1) throw new IllegalArgumentException("Unsupported namespace currency code: " + currencyCode);
|
||||
String registrarKey = null, serverLogin = null;
|
||||
if (type == 2) {
|
||||
registrarKey = Base58Util.encode(r.readFixed(32));
|
||||
@@ -778,12 +824,12 @@ public final class ShineUsersCodec {
|
||||
throw new IllegalArgumentException("Invalid namespace bytes or PDA address");
|
||||
}
|
||||
return new NamespaceSnapshot(namespace, pdaAddress, type, minLen,
|
||||
fee, registrarKey, serverLogin, slot, lastTxSignature, rawDataBase64);
|
||||
fee, currencyCode, registrarKey, serverLogin, slot, lastTxSignature, rawDataBase64);
|
||||
}
|
||||
|
||||
public record NamespaceSnapshot(
|
||||
String namespace, String pdaAddress, int type, int minLocalpartLength,
|
||||
java.math.BigInteger registrationFeeLamports, String registrarPublicKey,
|
||||
java.math.BigInteger registrationFeeLamports, int currencyCode, String registrarPublicKey,
|
||||
String defaultServerLogin, long slot, String lastTxSignature,
|
||||
String rawDataBase64
|
||||
) {}
|
||||
@@ -793,7 +839,10 @@ public final class ShineUsersCodec {
|
||||
UPDATE_USERS_ECONOMY_CONFIG,
|
||||
CREATE_USER_PDA,
|
||||
CREATE_NAMESPACE,
|
||||
UPDATE_NAMESPACE_PRICE,
|
||||
UPDATE_USER_PDA,
|
||||
SUPPORT_USER,
|
||||
SUPPORT_DAO,
|
||||
CLOSE_LEGACY_USER_PDA,
|
||||
OTHER
|
||||
}
|
||||
@@ -810,20 +859,18 @@ public final class ShineUsersCodec {
|
||||
|
||||
public record EconomyConfigState(
|
||||
int version,
|
||||
long registrationFeeLamports,
|
||||
long lamportsPerLimitStep,
|
||||
long startBonusLimit
|
||||
long registrationFeeLamports, // legacy v1 only
|
||||
long lamportsPerLimitStep, // legacy v1 only
|
||||
long startBonusLimit, // legacy v1 only
|
||||
long updateFeeLamports // v2 (v1 fallback 20_000)
|
||||
) {
|
||||
public static EconomyConfigState initial() {
|
||||
return new EconomyConfigState(
|
||||
1,
|
||||
START_REGISTRATION_FEE_LAMPORTS,
|
||||
START_LAMPORTS_PER_LIMIT_STEP,
|
||||
START_BONUS_LIMIT
|
||||
);
|
||||
return new EconomyConfigState(2, 0L, 0L, 0L, 20_000L);
|
||||
}
|
||||
}
|
||||
|
||||
public record SupportStats(int version, long supportSent, long supportReceived, long daoDirect) {}
|
||||
|
||||
public record UserSessionSnapshot(
|
||||
int sessionType,
|
||||
int sessionVersion,
|
||||
|
||||
+7
-2
@@ -48,6 +48,7 @@ public final class SolanaUsersSyncService
|
||||
private final AtomicBoolean syncWorkerScheduled =
|
||||
new AtomicBoolean(false);
|
||||
private final String economyConfigPda;
|
||||
private final SupportHistoryIndexer supportHistoryIndexer;
|
||||
|
||||
private volatile boolean initialSyncCompleted =
|
||||
false;
|
||||
@@ -118,6 +119,7 @@ public final class SolanaUsersSyncService
|
||||
),
|
||||
config.programId()
|
||||
);
|
||||
this.supportHistoryIndexer = new SupportHistoryIndexer(config, economyConfigPda);
|
||||
}
|
||||
|
||||
public void start()
|
||||
@@ -302,6 +304,9 @@ public final class SolanaUsersSyncService
|
||||
long nowMs =
|
||||
System.currentTimeMillis();
|
||||
|
||||
// Финансовый checkpoint независим от snapshot PDA. Историю не пропускаем.
|
||||
supportHistoryIndexer.sync();
|
||||
|
||||
PostgresStorageRepository.SyncStateSnapshot state =
|
||||
storage.loadState();
|
||||
|
||||
@@ -532,7 +537,7 @@ public final class SolanaUsersSyncService
|
||||
for (ProgramAccountUpdate account : exactAccounts.updates()) {
|
||||
String lastSignature = latestRelevantSignatureByPda.getOrDefault(account.address(), "");
|
||||
byte[] firstBytes = Base64.getDecoder().decode(account.dataBase64());
|
||||
if (firstBytes.length > 2 && firstBytes[0] == 1 && firstBytes[1] == 0) {
|
||||
if (firstBytes.length > 2 && firstBytes[0] == 1 && (firstBytes[1] == 0 || firstBytes[1] == 1)) {
|
||||
var ns = ShineUsersCodec.parseNamespaceAccount(account.address(),
|
||||
account.slot(), account.dataBase64(), lastSignature, config.programId());
|
||||
namespacesToPersist.removeIf(existing -> existing.pdaAddress().equals(ns.pdaAddress()));
|
||||
@@ -613,7 +618,7 @@ public final class SolanaUsersSyncService
|
||||
|
||||
try {
|
||||
byte[] firstBytes = Base64.getDecoder().decode(account.dataBase64());
|
||||
if (firstBytes.length > 2 && firstBytes[0] == 1 && firstBytes[1] == 0) {
|
||||
if (firstBytes.length > 2 && firstBytes[0] == 1 && (firstBytes[1] == 0 || firstBytes[1] == 1)) {
|
||||
currentNamespaces.add(ShineUsersCodec.parseNamespaceAccount(
|
||||
account.address(), account.slot(), account.dataBase64(), "", config.programId()));
|
||||
} else {
|
||||
|
||||
+355
@@ -0,0 +1,355 @@
|
||||
package sync.service;
|
||||
|
||||
import com.fasterxml.jackson.databind.JsonNode;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import sync.config.AppConfig;
|
||||
import sync.source.rpc.SolanaRpcClient;
|
||||
import sync.util.Base58Util;
|
||||
|
||||
import java.math.BigInteger;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.ByteOrder;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.sql.*;
|
||||
import java.util.*;
|
||||
import java.util.HexFormat;
|
||||
|
||||
/**
|
||||
* Независимый журнал финансовой поддержки. Не использует checkpoint синхронизации
|
||||
* PDA: он может быть создан из full snapshot и не содержит старых донатов.
|
||||
* Обновление журнала и checkpoint выполняются в одной транзакции PostgreSQL.
|
||||
*/
|
||||
public final class SupportHistoryIndexer {
|
||||
private static final Logger log = LoggerFactory.getLogger(SupportHistoryIndexer.class);
|
||||
private final AppConfig config;
|
||||
private final String economyPda;
|
||||
private final SolanaRpcClient rpc;
|
||||
|
||||
public SupportHistoryIndexer(AppConfig config, String economyPda) {
|
||||
this.config = config;
|
||||
this.economyPda = economyPda;
|
||||
this.rpc = new SolanaRpcClient(config.rpcUrl(), config.programId(), "finalized");
|
||||
}
|
||||
|
||||
public void sync() throws Exception {
|
||||
try (Connection connection = DriverManager.getConnection(
|
||||
config.databaseUrl(), config.databaseUser(), config.databasePassword())) {
|
||||
migrate(connection);
|
||||
String checkpoint = checkpoint(connection);
|
||||
var result = rpc.getSignaturesForAddressSince(economyPda, checkpoint);
|
||||
if (checkpoint != null && !result.anchorFound()) {
|
||||
throw new IllegalStateException("Support history checkpoint not found by RPC: " + checkpoint
|
||||
+ ". Use archival Helius RPC; checkpoint will NOT be skipped.");
|
||||
}
|
||||
List<SolanaRpcClient.SignatureRecord> signatures = new ArrayList<>(result.signatures());
|
||||
Collections.reverse(signatures);
|
||||
int indexed = 0;
|
||||
for (var signature : signatures) {
|
||||
// Ошибочные транзакции не содержат успешных переводов; checkpoint всё равно сдвигаем.
|
||||
JsonNode transaction = signature.failed() ? null : rpc.getTransactionJsonParsed(signature.signature());
|
||||
if (!signature.failed() && transaction == null) {
|
||||
throw new IllegalStateException("Historical transaction unavailable: " + signature.signature()
|
||||
+ ". An archival RPC is required, checkpoint unchanged.");
|
||||
}
|
||||
List<SupportEvent> events = signature.failed() ? List.of()
|
||||
: decodeTransaction(transaction, config.programId());
|
||||
connection.setAutoCommit(false);
|
||||
try {
|
||||
for (SupportEvent event : events) {
|
||||
// Счётчики изменяются только при действительно новой записи журнала.
|
||||
// Повторная обработка одной инструкции не может удвоить суммы.
|
||||
if (insert(connection, signature, event)) {
|
||||
incrementUserStats(connection, event);
|
||||
indexed++;
|
||||
}
|
||||
}
|
||||
try (PreparedStatement stmt = connection.prepareStatement(
|
||||
"UPDATE solana_support_sync_state SET last_signature=?, last_slot=?, updated_at=now() WHERE id=1")) {
|
||||
stmt.setString(1, signature.signature());
|
||||
stmt.setLong(2, signature.slot());
|
||||
stmt.executeUpdate();
|
||||
}
|
||||
connection.commit();
|
||||
} catch (Exception failure) {
|
||||
connection.rollback();
|
||||
throw failure;
|
||||
} finally {
|
||||
connection.setAutoCommit(true);
|
||||
}
|
||||
}
|
||||
// Признак готовности устанавливается только после полного успешного прохода.
|
||||
// После аварии на середине истории публичные нули не показываем.
|
||||
try (PreparedStatement ready = connection.prepareStatement(
|
||||
"UPDATE solana_support_sync_state SET history_complete=TRUE WHERE id=1")) {
|
||||
ready.executeUpdate();
|
||||
}
|
||||
log.info("Support history synchronized: scanned={} newEvents={} checkpoint={}",
|
||||
signatures.size(), indexed, signatures.isEmpty() ? checkpoint : signatures.get(signatures.size()-1).signature());
|
||||
}
|
||||
}
|
||||
|
||||
private static String checkpoint(Connection c) throws SQLException {
|
||||
try (Statement s = c.createStatement(); ResultSet r = s.executeQuery(
|
||||
"SELECT last_signature FROM solana_support_sync_state WHERE id=1")) {
|
||||
if (!r.next()) throw new SQLException("Support checkpoint missing");
|
||||
return r.getString(1);
|
||||
}
|
||||
}
|
||||
|
||||
private static void migrate(Connection c) throws SQLException {
|
||||
try (Statement s = c.createStatement()) {
|
||||
s.executeUpdate("CREATE TABLE IF NOT EXISTS solana_support_sync_state (" +
|
||||
"id INT PRIMARY KEY CHECK(id=1), last_signature TEXT, last_slot BIGINT, updated_at TIMESTAMPTZ NOT NULL DEFAULT now())");
|
||||
s.executeUpdate("INSERT INTO solana_support_sync_state(id) VALUES(1) ON CONFLICT DO NOTHING");
|
||||
s.executeUpdate("ALTER TABLE solana_support_sync_state ADD COLUMN IF NOT EXISTS stats_cache_ready BOOLEAN NOT NULL DEFAULT FALSE");
|
||||
s.executeUpdate("ALTER TABLE solana_support_sync_state ADD COLUMN IF NOT EXISTS history_complete BOOLEAN NOT NULL DEFAULT FALSE");
|
||||
s.executeUpdate("CREATE TABLE IF NOT EXISTS solana_support_user_stats (" +
|
||||
"normalized_login TEXT PRIMARY KEY, " +
|
||||
"support_sent NUMERIC(20,0) NOT NULL DEFAULT 0, " +
|
||||
"support_received NUMERIC(20,0) NOT NULL DEFAULT 0, " +
|
||||
"dao_direct NUMERIC(20,0) NOT NULL DEFAULT 0)");
|
||||
s.executeUpdate("CREATE TABLE IF NOT EXISTS solana_support_transfers (" +
|
||||
"signature TEXT NOT NULL, instruction_index INT NOT NULL, slot BIGINT NOT NULL, " +
|
||||
"block_time BIGINT, kind TEXT NOT NULL, sender_login TEXT NOT NULL, recipient_login TEXT, " +
|
||||
"amount_lamports NUMERIC(20,0) NOT NULL, recipient_lamports NUMERIC(20,0) NOT NULL, " +
|
||||
"inflow_lamports NUMERIC(20,0) NOT NULL, " +
|
||||
"amount_star_cents NUMERIC(20,0) NOT NULL, recipient_star_cents NUMERIC(20,0) NOT NULL, dao_star_cents NUMERIC(20,0) NOT NULL, target_type SMALLINT NOT NULL, " +
|
||||
"channel_block_number NUMERIC(20,0), channel_block_hash TEXT, " +
|
||||
"message_block_number NUMERIC(20,0), message_block_hash TEXT, " +
|
||||
"PRIMARY KEY(signature, instruction_index))");
|
||||
// Существующая t2/test БД могла содержать legacy-таблицу без Stars-полей.
|
||||
// CREATE TABLE IF NOT EXISTS её не меняет, поэтому мигрируем добавленные поля отдельно.
|
||||
s.executeUpdate("ALTER TABLE solana_support_transfers ADD COLUMN IF NOT EXISTS amount_star_cents NUMERIC(20,0) NOT NULL DEFAULT 0");
|
||||
s.executeUpdate("ALTER TABLE solana_support_transfers ADD COLUMN IF NOT EXISTS recipient_star_cents NUMERIC(20,0) NOT NULL DEFAULT 0");
|
||||
s.executeUpdate("ALTER TABLE solana_support_transfers ADD COLUMN IF NOT EXISTS dao_star_cents NUMERIC(20,0) NOT NULL DEFAULT 0");
|
||||
s.executeUpdate("ALTER TABLE solana_support_transfers ADD COLUMN IF NOT EXISTS target_type SMALLINT NOT NULL DEFAULT 0");
|
||||
s.executeUpdate("CREATE INDEX IF NOT EXISTS solana_support_by_channel ON solana_support_transfers(channel_block_hash, channel_block_number)");
|
||||
s.executeUpdate("CREATE INDEX IF NOT EXISTS solana_support_by_message ON solana_support_transfers(message_block_hash, message_block_number)");
|
||||
s.executeUpdate("CREATE INDEX IF NOT EXISTS solana_support_by_sender ON solana_support_transfers(sender_login)");
|
||||
s.executeUpdate("CREATE INDEX IF NOT EXISTS solana_support_by_recipient ON solana_support_transfers(recipient_login)");
|
||||
// Старые view могли иметь колонки received_lamports; OR REPLACE не меняет их имена.
|
||||
s.executeUpdate("DROP VIEW IF EXISTS solana_support_channel_totals");
|
||||
s.executeUpdate("DROP VIEW IF EXISTS solana_support_message_totals");
|
||||
s.executeUpdate("CREATE OR REPLACE VIEW solana_support_channel_totals AS SELECT channel_block_number, channel_block_hash, " +
|
||||
"SUM(recipient_star_cents) AS received_star_cents, COUNT(*) AS transfers FROM solana_support_transfers " +
|
||||
"WHERE kind='USER' AND target_type IN (1,2) GROUP BY channel_block_number, channel_block_hash");
|
||||
s.executeUpdate("CREATE OR REPLACE VIEW solana_support_message_totals AS SELECT channel_block_number, channel_block_hash, " +
|
||||
"message_block_number, message_block_hash, SUM(recipient_star_cents) AS received_star_cents, COUNT(*) AS transfers " +
|
||||
"FROM solana_support_transfers WHERE kind='USER' AND target_type=2 " +
|
||||
"GROUP BY channel_block_number, channel_block_hash, message_block_number, message_block_hash");
|
||||
}
|
||||
backfillUserStats(c);
|
||||
}
|
||||
|
||||
/** For clean test deployment only; aggregates v2 Stars events, NEVER legacy lamports. */
|
||||
private static void backfillUserStats(Connection c) throws SQLException {
|
||||
boolean previousAutocommit = c.getAutoCommit();
|
||||
c.setAutoCommit(false);
|
||||
try {
|
||||
boolean ready;
|
||||
try (Statement s = c.createStatement(); ResultSet r = s.executeQuery(
|
||||
"SELECT stats_cache_ready FROM solana_support_sync_state WHERE id=1 FOR UPDATE")) {
|
||||
if (!r.next()) throw new SQLException("Support sync state missing");
|
||||
ready = r.getBoolean(1);
|
||||
}
|
||||
if (!ready) {
|
||||
try (Statement s = c.createStatement()) {
|
||||
s.executeUpdate("DELETE FROM solana_support_user_stats");
|
||||
s.executeUpdate("""
|
||||
INSERT INTO solana_support_user_stats(normalized_login, support_sent, support_received, dao_direct)
|
||||
SELECT lower(btrim(login)), SUM(sent), SUM(received), SUM(direct)
|
||||
FROM (
|
||||
SELECT sender_login AS login,
|
||||
CASE WHEN kind='USER' THEN amount_star_cents ELSE 0 END AS sent,
|
||||
0::NUMERIC AS received,
|
||||
CASE WHEN kind='DAO' THEN amount_star_cents ELSE 0 END AS direct
|
||||
FROM solana_support_transfers
|
||||
UNION ALL
|
||||
SELECT recipient_login AS login, 0::NUMERIC AS sent,
|
||||
recipient_star_cents AS received, 0::NUMERIC AS direct
|
||||
FROM solana_support_transfers WHERE kind='USER'
|
||||
) history
|
||||
GROUP BY lower(btrim(login))
|
||||
""");
|
||||
s.executeUpdate("UPDATE solana_support_sync_state SET stats_cache_ready=TRUE WHERE id=1");
|
||||
}
|
||||
log.info("Support user statistics cache initialized from transaction history");
|
||||
}
|
||||
c.commit();
|
||||
} catch (SQLException failure) {
|
||||
c.rollback();
|
||||
throw failure;
|
||||
} finally {
|
||||
c.setAutoCommit(previousAutocommit);
|
||||
}
|
||||
}
|
||||
|
||||
/** Чистая функция: одинаковая раскладка используется в SQL-агрегаторе и тестах. */
|
||||
public static List<UserStatsIncrement> userStatsIncrements(SupportEvent event) {
|
||||
if ("USER".equals(event.kind())) {
|
||||
return List.of(
|
||||
new UserStatsIncrement(event.sender(), event.stars(), BigInteger.ZERO, BigInteger.ZERO),
|
||||
new UserStatsIncrement(event.recipient(), BigInteger.ZERO, event.recipientStars(), BigInteger.ZERO));
|
||||
}
|
||||
if ("DAO".equals(event.kind())) {
|
||||
return List.of(new UserStatsIncrement(event.sender(), BigInteger.ZERO, BigInteger.ZERO, event.stars()));
|
||||
}
|
||||
throw new IllegalArgumentException("Unknown support event kind");
|
||||
}
|
||||
|
||||
public record UserStatsIncrement(String login, BigInteger sent, BigInteger received, BigInteger direct) {}
|
||||
|
||||
/** Atomically update both participants after inserting the unique event. */
|
||||
private static void incrementUserStats(Connection c, SupportEvent event) throws SQLException {
|
||||
for (UserStatsIncrement delta : userStatsIncrements(event)) {
|
||||
addUserStats(c, delta.login(), delta.sent(), delta.received(), delta.direct());
|
||||
}
|
||||
}
|
||||
|
||||
private static void addUserStats(Connection c, String login, BigInteger sent, BigInteger received, BigInteger direct)
|
||||
throws SQLException {
|
||||
try (PreparedStatement s = c.prepareStatement("""
|
||||
INSERT INTO solana_support_user_stats(normalized_login, support_sent, support_received, dao_direct)
|
||||
VALUES (lower(btrim(?)), ?, ?, ?)
|
||||
ON CONFLICT (normalized_login) DO UPDATE SET
|
||||
support_sent=solana_support_user_stats.support_sent+EXCLUDED.support_sent,
|
||||
support_received=solana_support_user_stats.support_received+EXCLUDED.support_received,
|
||||
dao_direct=solana_support_user_stats.dao_direct+EXCLUDED.dao_direct
|
||||
""")) {
|
||||
s.setString(1, login);
|
||||
s.setBigDecimal(2, new java.math.BigDecimal(sent));
|
||||
s.setBigDecimal(3, new java.math.BigDecimal(received));
|
||||
s.setBigDecimal(4, new java.math.BigDecimal(direct));
|
||||
s.executeUpdate();
|
||||
}
|
||||
}
|
||||
|
||||
private static boolean insert(Connection c, SolanaRpcClient.SignatureRecord signature, SupportEvent event) throws SQLException {
|
||||
try (PreparedStatement s = c.prepareStatement("INSERT INTO solana_support_transfers (" +
|
||||
"signature,instruction_index,slot,block_time,kind,sender_login,recipient_login,amount_lamports," +
|
||||
"recipient_lamports,inflow_lamports,amount_star_cents,recipient_star_cents,dao_star_cents,target_type,channel_block_number,channel_block_hash," +
|
||||
"message_block_number,message_block_hash) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ON CONFLICT DO NOTHING")) {
|
||||
s.setString(1, signature.signature());
|
||||
s.setInt(2, event.index());
|
||||
s.setLong(3, signature.slot());
|
||||
if (signature.blockTime() == null) s.setNull(4, Types.BIGINT); else s.setLong(4, signature.blockTime());
|
||||
s.setString(5, event.kind());
|
||||
s.setString(6, event.sender());
|
||||
s.setString(7, event.recipient());
|
||||
s.setBigDecimal(8, new java.math.BigDecimal(event.amount()));
|
||||
s.setBigDecimal(9, new java.math.BigDecimal(event.recipientAmount()));
|
||||
s.setBigDecimal(10, new java.math.BigDecimal(event.inflowAmount()));
|
||||
s.setBigDecimal(11, new java.math.BigDecimal(event.stars()));
|
||||
s.setBigDecimal(12, new java.math.BigDecimal(event.recipientStars()));
|
||||
s.setBigDecimal(13, new java.math.BigDecimal(event.daoStars()));
|
||||
s.setInt(14, event.target());
|
||||
if (event.channelNumber() == null) s.setNull(15, Types.NUMERIC); else s.setBigDecimal(15, new java.math.BigDecimal(event.channelNumber()));
|
||||
s.setString(16, event.channelHash());
|
||||
if (event.messageNumber() == null) s.setNull(17, Types.NUMERIC); else s.setBigDecimal(17, new java.math.BigDecimal(event.messageNumber()));
|
||||
s.setString(18, event.messageHash());
|
||||
return s.executeUpdate() == 1;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* События Stars обязательны для новых инструкций. Данные старой тестовой
|
||||
* программы (до Stars) пропускаем только если у них нет формата новых
|
||||
* параметров И нет событий SHINE_STARS_V1. Такая история не мигрируется.
|
||||
*/
|
||||
public static List<SupportEvent> decodeTransaction(JsonNode transaction, String programId) {
|
||||
if (transaction.path("meta").hasNonNull("err")) return List.of();
|
||||
JsonNode instructions = transaction.path("transaction").path("message").path("instructions");
|
||||
if (!instructions.isArray()) throw new IllegalArgumentException("Transaction instructions missing");
|
||||
JsonNode logs = transaction.path("meta").path("logMessages");
|
||||
Map<String, Integer> counts = new HashMap<>();
|
||||
if (logs.isArray()) for (JsonNode line : logs) {
|
||||
String msg = line.asText("");
|
||||
int start = msg.indexOf("Program log: SHINE_STARS_V1|");
|
||||
if (start < 0) continue;
|
||||
String payload = msg.substring(start + "Program log: SHINE_STARS_V1|".length());
|
||||
counts.merge(payload, 1, Integer::sum);
|
||||
}
|
||||
boolean hasStarsEvent = !counts.isEmpty();
|
||||
List<SupportEvent> result = new ArrayList<>();
|
||||
for (int index = 0; index < instructions.size(); index++) {
|
||||
JsonNode instruction = instructions.get(index);
|
||||
if (!programId.equals(instruction.path("programId").asText())) continue;
|
||||
String encoded = instruction.path("data").asText("");
|
||||
if (encoded.isBlank()) continue;
|
||||
byte[] bytes = Base58Util.decode(encoded);
|
||||
if (bytes.length == 0 || ((bytes[0] & 0xff) != 9 && (bytes[0] & 0xff) != 10)) continue;
|
||||
try {
|
||||
result.add(decodeInstruction(bytes, index));
|
||||
} catch (RuntimeException malformed) {
|
||||
if (hasStarsEvent) throw malformed;
|
||||
// Историческая инструкция тестового контракта: количество Stars
|
||||
// отсутствует, поэтому в новую историю её не включаем.
|
||||
}
|
||||
}
|
||||
// Если новая инструкция была, но событие пропало, НЕ включаем её в историю
|
||||
// и НЕ продвигаем checkpoint. Это ошибка RPC/индексатора.
|
||||
if (!result.isEmpty() && !logs.isArray()) throw new IllegalArgumentException("Stars event logs missing");
|
||||
for (SupportEvent event : result) {
|
||||
String payload = event.kind() + "|" + event.sender() + "|" +
|
||||
(event.recipient() == null ? "-" : event.recipient()) + "|" +
|
||||
event.amount() + "|" + event.stars() + "|" + event.recipientStars() + "|" + event.daoStars();
|
||||
int count = counts.getOrDefault(payload, 0);
|
||||
if (count == 0) throw new IllegalArgumentException("Missing verified Stars event: " + payload);
|
||||
counts.put(payload, count - 1);
|
||||
}
|
||||
if (counts.values().stream().anyMatch(v -> v != 0)) {
|
||||
throw new IllegalArgumentException("Unmatched SHINE_STARS_V1 events in transaction");
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
public static SupportEvent decodeInstruction(byte[] bytes, int index) {
|
||||
ByteBuffer b = ByteBuffer.wrap(bytes).order(ByteOrder.LITTLE_ENDIAN);
|
||||
int ix = b.get() & 255;
|
||||
if (ix != 9 && ix != 10) throw new IllegalArgumentException("Not a support instruction");
|
||||
String sender = readLogin(b);
|
||||
String recipient = ix == 9 ? readLogin(b) : null;
|
||||
BigInteger amount = readUnsigned64(b);
|
||||
BigInteger stars = readUnsigned64(b);
|
||||
if (stars.compareTo(BigInteger.TEN) < 0) throw new IllegalArgumentException("Stars minimum 0.10");
|
||||
if (amount.signum() <= 0) throw new IllegalArgumentException("Invalid amount");
|
||||
int target = ix == 9 ? (b.get() & 255) : 0;
|
||||
String channelNumber = null, messageNumber = null, channelHash = null, messageHash = null;
|
||||
if (target == 1 || target == 2) {
|
||||
channelNumber = readUnsigned64(b).toString();
|
||||
byte[] hash = new byte[32]; b.get(hash); channelHash = HexFormat.of().formatHex(hash);
|
||||
}
|
||||
if (target == 2) {
|
||||
messageNumber = readUnsigned64(b).toString();
|
||||
byte[] hash = new byte[32]; b.get(hash); messageHash = HexFormat.of().formatHex(hash);
|
||||
}
|
||||
if (target > 2 || b.hasRemaining()) throw new IllegalArgumentException("Malformed support instruction");
|
||||
if (ix == 9 && sender.equals(recipient)) {
|
||||
throw new IllegalArgumentException("Invalid support split or self-support");
|
||||
}
|
||||
BigInteger inflow = ix == 9 ? amount.add(BigInteger.valueOf(9)).divide(BigInteger.TEN) : amount;
|
||||
BigInteger daoStars = ix == 9 ? stars.add(BigInteger.valueOf(9)).divide(BigInteger.TEN) : stars;
|
||||
BigInteger recipientStars = ix == 9 ? stars.subtract(daoStars) : BigInteger.ZERO;
|
||||
BigInteger received = ix == 9 ? amount.subtract(inflow) : BigInteger.ZERO;
|
||||
return new SupportEvent(index, ix == 9 ? "USER" : "DAO", sender, recipient,
|
||||
amount, received, inflow, stars, recipientStars, daoStars, target, channelNumber, channelHash, messageNumber, messageHash);
|
||||
}
|
||||
|
||||
private static String readLogin(ByteBuffer b) {
|
||||
int length = b.get() & 255;
|
||||
if (length == 0 || length > b.remaining()) throw new IllegalArgumentException("Invalid login length");
|
||||
byte[] str = new byte[length]; b.get(str);
|
||||
return new String(str, StandardCharsets.UTF_8);
|
||||
}
|
||||
|
||||
private static BigInteger readUnsigned64(ByteBuffer b) {
|
||||
long value = b.getLong();
|
||||
return new BigInteger(Long.toUnsignedString(value));
|
||||
}
|
||||
|
||||
public record SupportEvent(int index, String kind, String sender, String recipient,
|
||||
BigInteger amount, BigInteger recipientAmount, BigInteger inflowAmount,
|
||||
BigInteger stars, BigInteger recipientStars, BigInteger daoStars, int target,
|
||||
String channelNumber, String channelHash, String messageNumber, String messageHash) {}
|
||||
}
|
||||
+53
-11
@@ -63,7 +63,7 @@ public final class PostgresStorageRepository
|
||||
"last_error, economy_config_version, " +
|
||||
"registration_fee_lamports, " +
|
||||
"lamports_per_limit_step, " +
|
||||
"start_bonus_limit, updated_at_ms " +
|
||||
"start_bonus_limit, update_fee_lamports, updated_at_ms " +
|
||||
"FROM solana_sync_state WHERE id = 1"
|
||||
);
|
||||
ResultSet resultSet =
|
||||
@@ -106,7 +106,8 @@ public final class PostgresStorageRepository
|
||||
),
|
||||
resultSet.getLong(
|
||||
"start_bonus_limit"
|
||||
)
|
||||
),
|
||||
resultSet.getLong("update_fee_lamports")
|
||||
);
|
||||
}
|
||||
|
||||
@@ -274,6 +275,7 @@ public final class PostgresStorageRepository
|
||||
connection,
|
||||
snapshots
|
||||
);
|
||||
syncBlockchainStateLimits(connection, snapshots);
|
||||
|
||||
reconcileConfirmedKeyRotations(
|
||||
connection,
|
||||
@@ -314,6 +316,7 @@ public final class PostgresStorageRepository
|
||||
connection,
|
||||
snapshots
|
||||
);
|
||||
syncBlockchainStateLimits(connection, snapshots);
|
||||
|
||||
reconcileConfirmedKeyRotations(
|
||||
connection,
|
||||
@@ -337,6 +340,36 @@ public final class PostgresStorageRepository
|
||||
}
|
||||
}
|
||||
|
||||
/** Copy on-chain fork limits into the server's runtime state. 0 = unbounded.
|
||||
* Never touch block tips, used bytes, or keys. Works after PDA updates even
|
||||
* when record_number remains unchanged (future system-only limit mutation).
|
||||
*/
|
||||
private void syncBlockchainStateLimits(Connection connection,
|
||||
List<ShineUsersCodec.UserPdaSnapshot> snapshots) throws SQLException {
|
||||
if (snapshots == null || snapshots.isEmpty()) return;
|
||||
try (PreparedStatement exists = connection.prepareStatement("SELECT to_regclass('public.blockchain_state_store')")) {
|
||||
try (ResultSet rs = exists.executeQuery()) {
|
||||
if (!rs.next() || rs.getString(1) == null) return;
|
||||
}
|
||||
}
|
||||
try (PreparedStatement stmt = connection.prepareStatement("""
|
||||
UPDATE blockchain_state_store SET size_limit = ?, updated_at_ms = ?
|
||||
WHERE LOWER(login) = LOWER(?) AND fork_number = ?
|
||||
""")) {
|
||||
for (ShineUsersCodec.UserPdaSnapshot snapshot : snapshots) {
|
||||
if (snapshot == null || snapshot.blockchainForks() == null) continue;
|
||||
for (ShineUsersCodec.BlockchainForkSnapshot fork : snapshot.blockchainForks()) {
|
||||
stmt.setLong(1, fork.paidLimitBytes());
|
||||
stmt.setLong(2, System.currentTimeMillis());
|
||||
stmt.setString(3, snapshot.login());
|
||||
stmt.setInt(4, fork.forkIndex() + 1);
|
||||
stmt.addBatch();
|
||||
}
|
||||
}
|
||||
stmt.executeBatch();
|
||||
}
|
||||
}
|
||||
|
||||
private void upsertTxHistory(
|
||||
Connection connection,
|
||||
List<TxHistoryEntry> txEntries
|
||||
@@ -469,23 +502,26 @@ public final class PostgresStorageRepository
|
||||
String sql = """
|
||||
INSERT INTO shine_namespace_current (
|
||||
namespace, pda_address, namespace_type, min_localpart_len,
|
||||
registration_fee_lamports, registrar_pubkey, default_server_login,
|
||||
registration_fee_lamports, currency_code, registrar_pubkey, default_server_login,
|
||||
slot, last_tx_signature, raw_data_base64
|
||||
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||
ON CONFLICT (namespace) DO UPDATE SET
|
||||
registration_fee_lamports=EXCLUDED.registration_fee_lamports,
|
||||
currency_code=EXCLUDED.currency_code,
|
||||
slot=EXCLUDED.slot, last_tx_signature=EXCLUDED.last_tx_signature,
|
||||
raw_data_base64=EXCLUDED.raw_data_base64
|
||||
WHERE shine_namespace_current.pda_address=EXCLUDED.pda_address
|
||||
AND shine_namespace_current.raw_data_base64=EXCLUDED.raw_data_base64
|
||||
AND EXCLUDED.slot >= shine_namespace_current.slot
|
||||
""";
|
||||
try (PreparedStatement ps = connection.prepareStatement(sql)) {
|
||||
for (ShineUsersCodec.NamespaceSnapshot ns : namespaces) {
|
||||
ps.setString(1, ns.namespace()); ps.setString(2, ns.pdaAddress());
|
||||
ps.setInt(3, ns.type()); ps.setInt(4, ns.minLocalpartLength());
|
||||
ps.setBigDecimal(5, new java.math.BigDecimal(ns.registrationFeeLamports()));
|
||||
ps.setString(6, ns.registrarPublicKey());
|
||||
ps.setString(7, ns.defaultServerLogin()); ps.setLong(8, ns.slot());
|
||||
ps.setString(9, ns.lastTxSignature()); ps.setString(10, ns.rawDataBase64());
|
||||
ps.setInt(6, ns.currencyCode());
|
||||
ps.setString(7, ns.registrarPublicKey());
|
||||
ps.setString(8, ns.defaultServerLogin()); ps.setLong(9, ns.slot());
|
||||
ps.setString(10, ns.lastTxSignature()); ps.setString(11, ns.rawDataBase64());
|
||||
ps.addBatch();
|
||||
}
|
||||
ps.executeBatch();
|
||||
@@ -859,8 +895,8 @@ public final class PostgresStorageRepository
|
||||
"last_seen_slot, last_relevant_signature, " +
|
||||
"last_relevant_slot, last_error, economy_config_version, " +
|
||||
"registration_fee_lamports, lamports_per_limit_step, " +
|
||||
"start_bonus_limit, updated_at_ms" +
|
||||
") VALUES (1, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) " +
|
||||
"start_bonus_limit, update_fee_lamports, updated_at_ms" +
|
||||
") VALUES (1, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) " +
|
||||
"ON CONFLICT (id) DO UPDATE SET " +
|
||||
"status = EXCLUDED.status, " +
|
||||
"ready = EXCLUDED.ready, " +
|
||||
@@ -875,6 +911,7 @@ public final class PostgresStorageRepository
|
||||
"registration_fee_lamports = EXCLUDED.registration_fee_lamports, " +
|
||||
"lamports_per_limit_step = EXCLUDED.lamports_per_limit_step, " +
|
||||
"start_bonus_limit = EXCLUDED.start_bonus_limit, " +
|
||||
"update_fee_lamports = EXCLUDED.update_fee_lamports, " +
|
||||
"updated_at_ms = EXCLUDED.updated_at_ms";
|
||||
|
||||
try (PreparedStatement statement =
|
||||
@@ -895,14 +932,16 @@ public final class PostgresStorageRepository
|
||||
statement.setNull(11, Types.BIGINT);
|
||||
statement.setNull(12, Types.BIGINT);
|
||||
statement.setNull(13, Types.BIGINT);
|
||||
statement.setNull(14, Types.BIGINT);
|
||||
} else {
|
||||
statement.setInt(10, snapshot.economyConfigState().version());
|
||||
statement.setLong(11, snapshot.economyConfigState().registrationFeeLamports());
|
||||
statement.setLong(12, snapshot.economyConfigState().lamportsPerLimitStep());
|
||||
statement.setLong(13, snapshot.economyConfigState().startBonusLimit());
|
||||
statement.setLong(14, snapshot.economyConfigState().updateFeeLamports());
|
||||
}
|
||||
|
||||
bindNullableLong(statement, 14, snapshot.updatedAtMs());
|
||||
bindNullableLong(statement, 15, snapshot.updatedAtMs());
|
||||
statement.executeUpdate();
|
||||
}
|
||||
}
|
||||
@@ -931,10 +970,13 @@ public final class PostgresStorageRepository
|
||||
"registration_fee_lamports BIGINT, " +
|
||||
"lamports_per_limit_step BIGINT, " +
|
||||
"start_bonus_limit BIGINT, " +
|
||||
"update_fee_lamports BIGINT, " +
|
||||
"updated_at_ms BIGINT" +
|
||||
")"
|
||||
);
|
||||
|
||||
statement.executeUpdate("ALTER TABLE solana_sync_state ADD COLUMN IF NOT EXISTS update_fee_lamports BIGINT");
|
||||
|
||||
statement.executeUpdate(
|
||||
"INSERT INTO solana_sync_state (id, status, ready) " +
|
||||
"VALUES (1, 'EMPTY', FALSE) " +
|
||||
|
||||
+16
@@ -24,6 +24,22 @@ public final class NamespaceV2VectorCheck {
|
||||
ns.registrationFeeLamports().longValueExact() != 5_000_000L ||
|
||||
!"registrar@shine".equals(ns.defaultServerLogin()))
|
||||
throw new AssertionError("Namespace value mismatch");
|
||||
int currencyOffset = 5 + (raw[4] & 0xFF) + 8;
|
||||
byte[] version11 = new byte[raw.length+1];
|
||||
System.arraycopy(raw,0,version11,0,currencyOffset);
|
||||
version11[1] = 1;
|
||||
version11[currencyOffset] = 1;
|
||||
System.arraycopy(raw,currencyOffset,version11,currencyOffset+1,raw.length-currencyOffset);
|
||||
var upgraded = ShineUsersCodec.parseNamespaceAccount(p.getProperty("namespace_free_pda"),
|
||||
43, Base64.getEncoder().encodeToString(version11), "update", program);
|
||||
if (upgraded.currencyCode()!=1 || upgraded.registrationFeeLamports().longValueExact()!=5_000_000L)
|
||||
throw new AssertionError("Namespace 1.1 decode mismatch");
|
||||
version11[currencyOffset] = 2;
|
||||
try {
|
||||
ShineUsersCodec.parseNamespaceAccount(p.getProperty("namespace_free_pda"),
|
||||
44, Base64.getEncoder().encodeToString(version11), "update", program);
|
||||
throw new AssertionError("Reserved currency 2 accepted");
|
||||
} catch (IllegalArgumentException expected) { }
|
||||
byte[] corrupt = raw.clone(); corrupt[6] ^= 1;
|
||||
try {
|
||||
ShineUsersCodec.parseNamespaceAccount(p.getProperty("namespace_free_pda"),
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user