SHA256
Compare commits
168
Commits
| Author | SHA256 | Date | |
|---|---|---|---|
|
|
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 | ||
|
|
bd52a23bec | ||
|
|
e84ab41fe6 | ||
|
|
41d5e79f83 | ||
|
|
c13734cbc9 | ||
|
|
e78402c860 | ||
|
|
2ce80eeaef | ||
|
|
551bdc2d65 | ||
|
|
f507bdb343 | ||
|
|
395aa62bda | ||
|
|
d2b2876a79 | ||
|
|
8bb7d39c76 | ||
|
|
e296217f21 | ||
|
|
c0257f4be2 | ||
|
|
7b88b61b22 | ||
|
|
ab61787ee7 | ||
|
|
219a65ae27 | ||
|
|
94d4665185 | ||
|
|
ce97171d5a | ||
|
|
a22f590395 | ||
|
|
a520c5c5e1 | ||
|
|
cab26bbf41 | ||
|
|
6c8159c5f7 | ||
|
|
df0e9cef9b | ||
|
|
7a6ab3b35a | ||
|
|
aa5addb5d9 | ||
|
|
b67d06ce43 | ||
|
|
8d9a580f50 | ||
|
|
45eb77f431 | ||
|
|
2be6fe3ff9 | ||
|
|
a380900ec8 | ||
|
|
bca788c5e6 | ||
|
|
e77aaa3675 | ||
|
|
d25894149b | ||
|
|
68eec2b28b | ||
|
|
694aaf1f0e | ||
|
|
5caa4ce0ae | ||
|
|
af5b26c934 | ||
|
|
6997bc7600 | ||
|
|
9eedbf60a8 | ||
|
|
6294646922 | ||
|
|
42797b1a43 | ||
|
|
8c3751aba0 | ||
|
|
f40353725e | ||
|
|
3f0d71f788 | ||
|
|
f2ba7ce630 | ||
|
|
edc3d50136 | ||
|
|
a7a600035a | ||
|
|
3f05806563 | ||
|
|
2fb19ee66d | ||
|
|
d91ca5fbb3 | ||
|
|
7173f33d5f | ||
|
|
b3f9e1fe21 | ||
|
|
401ba918ad | ||
|
|
82d5a768f8 | ||
|
|
835109c81a | ||
|
|
d5f2c12fe7 | ||
|
|
11f169b080 | ||
|
|
96d23b16fc | ||
|
|
26db18e250 | ||
|
|
8fee7e1a9b | ||
|
|
e7cf98889b | ||
|
|
3fdff2a92b | ||
|
|
4d5a485933 | ||
|
|
b9cbbb857b | ||
|
|
56de0f2c74 | ||
|
|
68fe0532ce | ||
|
|
3edde418a2 | ||
|
|
923f281bf6 | ||
|
|
9ea276ba77 | ||
|
|
cfb0f9b734 | ||
|
|
993930eb82 | ||
|
|
17d6cb5be0 | ||
|
|
bb725ee451 | ||
|
|
b5ce7b0fa0 | ||
|
|
58de6a025d | ||
|
|
e6937cb49c | ||
|
|
7ac9e5a806 | ||
|
|
89630878af | ||
|
|
8b2012fad3 | ||
|
|
07ddaf5e4c | ||
|
|
4d10096ba2 | ||
|
|
5e9699613d | ||
|
|
b56a3a795f | ||
|
|
70fac068d0 | ||
|
|
d138bd9464 | ||
|
|
e14e3dfa21 | ||
|
|
30541ae4af | ||
|
|
74bace639c | ||
|
|
dda21a54ff | ||
|
|
d8f42c769c | ||
|
|
7b8e178723 | ||
|
|
b1c42efa82 | ||
|
|
acd5d4406d | ||
|
|
83548a859f | ||
|
|
79598fffa6 | ||
|
|
72e62127b3 | ||
|
|
67010a57f2 | ||
|
|
daa221a158 | ||
|
|
aca1e3054e | ||
|
|
6b5734d535 | ||
|
|
de8700f8e0 | ||
|
|
e101e5c5f4 | ||
|
|
8d22602761 | ||
|
|
f452ce1f1e | ||
|
|
3281da7f5c | ||
|
|
08c7fd7676 | ||
|
|
2e62616b46 | ||
|
|
9be4c4d3a5 | ||
|
|
f5698771e4 | ||
|
|
151a2c1754 | ||
|
|
13693a0a53 | ||
|
|
451280edd2 | ||
|
|
c997057a37 | ||
|
|
f8900e531a | ||
|
|
6e5b57fd7c | ||
|
|
408e474130 | ||
|
|
ef707ec217 | ||
|
|
8b12760dde |
+22
@@ -78,6 +78,8 @@ shine-solana/shine/scripts/**/TEMP_*.md
|
|||||||
|
|
||||||
# Локальные артефакты и внешние материалы ESP32-подпроекта
|
# Локальные артефакты и внешние материалы ESP32-подпроекта
|
||||||
ESP32/esp32-config-tool/
|
ESP32/esp32-config-tool/
|
||||||
|
ESP32/local-sketches/
|
||||||
|
ESP32/esp32/ESP32-S3-Touch-AMOLED-2.16/main-device/test_sketches/breath_dual_mode_monitor/
|
||||||
ESP32/**/.git/
|
ESP32/**/.git/
|
||||||
ESP32/**/.idea/
|
ESP32/**/.idea/
|
||||||
ESP32-wallet/.idea/
|
ESP32-wallet/.idea/
|
||||||
@@ -114,3 +116,23 @@ SHiNE-bundle-*.zip
|
|||||||
# Рабочие бэкапы/превью-ассеты UI — не для репозитория
|
# Рабочие бэкапы/превью-ассеты UI — не для репозитория
|
||||||
*.bak.png
|
*.bak.png
|
||||||
shine-UI/assets/navbar_preview.png
|
shine-UI/assets/navbar_preview.png
|
||||||
|
|
||||||
|
# Private local configuration: keep on disk, never push to GitHub
|
||||||
|
/SHiNE-server/src/main/resources/application.properties
|
||||||
|
/application.properties
|
||||||
|
/deploy/backup/scheme/
|
||||||
|
/shine-solana/shine/create-SHiNE-DAO/dao.config.mainnet.env
|
||||||
|
**/.env
|
||||||
|
**/.env.*
|
||||||
|
!**/.env.example
|
||||||
|
!**/.env.sample
|
||||||
|
|
||||||
|
# Private key files and local credential stores (never commit)
|
||||||
|
*.key
|
||||||
|
*.pem
|
||||||
|
*.p12
|
||||||
|
*.pfx
|
||||||
|
*.jwk
|
||||||
|
*.jks
|
||||||
|
*.keystore
|
||||||
|
*keypair*.json
|
||||||
|
|||||||
@@ -1,147 +1,27 @@
|
|||||||
# AGENTS
|
# Инструкции для агентов SHiNE
|
||||||
|
|
||||||
## Язык проекта
|
Этот файл относится к репозиторию SHiNE. По умолчанию писать документацию, пользовательские пояснения и сообщения коммитов на русском языке.
|
||||||
- По умолчанию использовать русский язык во всех пользовательских текстах и технических пояснениях.
|
|
||||||
- Пояснения к коммитам, PR и merge-запросам писать на русском языке.
|
|
||||||
- Комментарии в коде, встроенные справки, документацию и инструкции писать по возможности на русском языке.
|
|
||||||
|
|
||||||
## Примечание
|
## Сначала определить область работы
|
||||||
- Если внешний инструмент/интеграция требует английский формат, допускается английский, но рядом желательно дать краткое пояснение на русском.
|
|
||||||
|
|
||||||
## Структура проекта (кратко)
|
| Область | Код | Правила и документация |
|
||||||
- Серверный код SHiNE находится в папке `SHiNE-server/`.
|
| --- | --- | --- |
|
||||||
- Код клиентского UI SHiNE находится в папке `shine-UI/`.
|
| Сервер, WebSocket/API, PostgreSQL | `SHiNE-server/` | `SHiNE-server/AGENTS.md`, `docs/API/` |
|
||||||
- Веб-панель администратора сервера (управление Solana PDA сервера) находится в `shine-UI/`:
|
| Блокчейн, Arweave | `SHiNE-server/shine-server-blockchain/` | `docs/Blockchain/README.md` |
|
||||||
- точка входа `shine-UI/server-ui.html`;
|
| Личные сообщения | сервер и `shine-UI/` | `docs/Personal_Messages/README.md`, локальный `AGENTS.md` |
|
||||||
- остальные файлы серверного UI — в `shine-UI/server-ui/`.
|
| Браузерный UI | `shine-UI/` | `shine-UI/AGENTS.md`, `docs/UI-Design/README.md` |
|
||||||
- Локальный Telegram-бот агента-кодера живёт рядом с репозиторием продукта, обычно в `../SHiNE-agent-bot-coder/`, и не входит в публичный код основного приложения.
|
| Solana/Anchor | `shine-solana/shine/` | локальный `AGENTS.md`, `docs/Solana_Architecture/README.md` |
|
||||||
- Solana/Anchor-модуль находится в папке `shine-solana/shine/` и ведётся отдельно от основного server/UI деплоя.
|
| ESP32 | `ESP32/` | `ESP32/AGENTS.md`, инструкции конкретного устройства |
|
||||||
|
| Деплой и резервные копии | `deploy/` | `deploy/AGENTS.md`, `deploy/backup/AGENTS.md` |
|
||||||
|
| Тестовый издатель | `tools/test-publisher/` | локальный `AGENTS.md` |
|
||||||
|
|
||||||
## Сервис агента-кодера
|
Общий каталог — `docs/README.md`; карта компонентов и потоков данных — `docs/ARCHITECTURE.md`. Правила сопровождения документов — `docs/CONTRIBUTING_DOCS.md`; после правки документации запускать `python3 scripts/check_docs.py`. Планы в `TODO/` не считать описанием действующего поведения или разрешением на реализацию.
|
||||||
- Локальный 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`.
|
|
||||||
|
|
||||||
## ESP32 UI homeserver
|
## Постоянные правила
|
||||||
- Для UI-скетча устройства `ESP32-S3-Touch-AMOLED-2.16` документ-спецификация и Arduino-скетч должны всегда оставаться синхронными.
|
|
||||||
- Актуальный документ по экранной логике, состояниям, кнопкам, полям, статусам и ограничениям UI считать источником истины для скетча.
|
|
||||||
- При изменении документа обязательно в том же наборе изменений приводить в соответствие скетч.
|
|
||||||
- При изменении скетча обязательно в том же наборе изменений обновлять документ, если поменялись экраны, тексты, переходы, статусы, кнопки, поля или поведение.
|
|
||||||
- Для нового ESP32 UI-прототипа homeserver использовать русский язык как основной и отдельно следить, чтобы текст реально отображался на устройстве, а не только логически присутствовал в коде.
|
|
||||||
|
|
||||||
## Solana-модуль
|
- Прежде чем править подсистему, прочитать её локальный `AGENTS.md` и действующую документацию через `docs/README.md`. Архивные отчёты и старые планы не использовать как текущий контракт. При расхождении документа с кодом проверить реализацию и исправить документ либо явно отметить неопределённость.
|
||||||
- В проекте есть отдельный Solana/Anchor-модуль в папке `shine-solana/shine/`.
|
- Изменение поведения, формата, API, конфигурации или пользовательского сценария сопровождать обновлением соответствующего документа в том же наборе изменений. Не выдавать план, черновик или тестовое состояние за действующую функцию.
|
||||||
- Модуль логически связан с SHiNE, но не должен автоматически подключаться к сборке или деплою основного сервера без отдельного решения.
|
- Формат блокчейна и контракт серверного API изменять только после отдельного явного согласия пользователя; документировать изменения в `docs/Blockchain/` и `docs/API/`. Для добавления блока использовать `AddBlock` с актуальной вершиной цепочки.
|
||||||
- В Solana-модуле действуют локальные инструкции `shine-solana/shine/AGENTS.md`; при изменениях внутри модуля сначала читать их.
|
- Любые изменения и деплой production (`shineup.me`, `server2.shineup.me`) — только после отдельного явного согласия пользователя. Перед деплоем прочитать `deploy/AGENTS.md` и проверить резервную копию. Для деплоя использовать скрипты `deploy/scripts/`.
|
||||||
- В git добавлять исходники, lock-файлы, настройки проекта и документацию Solana-модуля, но не добавлять локальные ключи, `.git`, `.idea`, `.gradle`, `target`, `node_modules`, `test-ledger`, логи, временные run-отчёты и `.env`-конфиги.
|
- Секреты, приватные ключи, локальные конфиги, сборочные артефакты и логи не добавлять в git.
|
||||||
- Для Solana deploy/push использовать правила из локального `shine-solana/shine/AGENTS.md`; не смешивать deploy Solana-модуля со скриптами основного server/UI deploy из `deploy/scripts/`.
|
- Коммиты, версии и merge выполнять по `COMMIT_AND_VERSION_RULES.md`. Не делать коммит или push без необходимости для задачи.
|
||||||
- Для регистрации пользователей в 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.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-файле подробно описывать:
|
|
||||||
- какие файлы и участки отключены;
|
|
||||||
- что осталось в коде как заготовка;
|
|
||||||
- какие документы нужно обновить при возврате;
|
|
||||||
- с какого сценария продолжать разработку;
|
|
||||||
- из какого коммита брать последнюю полную реализацию.
|
|
||||||
|
|
||||||
## Коммуникация по новым задачам (обязательно)
|
|
||||||
- При получении нового задания сначала кратко пересказать задачу своими словами.
|
|
||||||
- До начала реализации задать недостающие уточняющие вопросы (если они есть).
|
|
||||||
- Если есть уместные идеи/улучшения — кратко предложить их; если полезных идей нет, ничего дополнительно не предлагать.
|
|
||||||
- Добавлять краткую оценку фичи (насколько это полезно/удачно по мнению исполнителя).
|
|
||||||
- После этого обязательно запросить подтверждение от пользователя, что задача понята верно, и только после подтверждения переходить к реализации.
|
|
||||||
- Если вопросов нет, явно написать в формате: «Я всё понял, начинаю делать?» и ждать подтверждения.
|
|
||||||
- Без подтверждения пользователя реализацию не начинать.
|
|
||||||
|
|||||||
@@ -32,15 +32,6 @@
|
|||||||
- По умолчанию в `main` нужно не коммитить напрямую, а мержить готовые изменения из рабочей ветки.
|
- По умолчанию в `main` нужно не коммитить напрямую, а мержить готовые изменения из рабочей ветки.
|
||||||
- Если пользователь просит сделать прямой коммит в `main`, нужно отдельно и явно предупредить, что это обход обычного стабильного процесса, и обязательно переспросить подтверждение.
|
- Если пользователь просит сделать прямой коммит в `main`, нужно отдельно и явно предупредить, что это обход обычного стабильного процесса, и обязательно переспросить подтверждение.
|
||||||
|
|
||||||
## Версионирование при merge или прямом коммите в `main`
|
|
||||||
|
|
||||||
- Для попадания изменений в `main` действует отдельная схема инкремента.
|
|
||||||
- Нужно увеличивать вторую цифру версии и обнулять третью.
|
|
||||||
- Пример: `1.2.346` → `1.3.0`.
|
|
||||||
- Если в наборе изменений менялся только UI, обновлять только `client.version`.
|
|
||||||
- Если в наборе изменений менялся только сервер, обновлять только `server.version`.
|
|
||||||
- Если соответствующая часть не менялась, её версию не трогать.
|
|
||||||
|
|
||||||
## Правила для git commit и git push
|
## Правила для git commit и git push
|
||||||
|
|
||||||
- Обычные коммиты делать стандартным `git commit`; токен для локального коммита не нужен и не используется.
|
- Обычные коммиты делать стандартным `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 не выполнялся**.
|
||||||
+52
@@ -0,0 +1,52 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
MODE="${1:-potentiometer-adc-test}"
|
||||||
|
PORT="${PORT:-}"
|
||||||
|
|
||||||
|
case "$MODE" in
|
||||||
|
potentiometer-adc-test)
|
||||||
|
SKETCH_DIR="$ROOT_DIR/test_sketches/potentiometer_adc_test"
|
||||||
|
BUILD_DIR="$ROOT_DIR/.arduino-build/build-potentiometer-adc-test"
|
||||||
|
;;
|
||||||
|
buzzer-gpio6-test)
|
||||||
|
SKETCH_DIR="$ROOT_DIR/test_sketches/buzzer_gpio6_test"
|
||||||
|
BUILD_DIR="$ROOT_DIR/.arduino-build/build-buzzer-gpio6-test"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Unknown mode: $MODE" >&2
|
||||||
|
echo "Known modes: potentiometer-adc-test, buzzer-gpio6-test" >&2
|
||||||
|
exit 2
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
if [[ -z "$PORT" ]]; then
|
||||||
|
PORT="$(arduino-cli board list | awk '/ttyACM|ttyUSB/ {print $1; exit}')"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -z "$PORT" ]]; then
|
||||||
|
echo "No serial port found. Set PORT=/dev/ttyACM0 explicitly." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
FQBN="esp32:esp32:esp32s3:USBMode=hwcdc,CDCOnBoot=cdc,UploadSpeed=921600,CPUFreq=240,FlashMode=dio,FlashSize=16M,PartitionScheme=app3M_fat9M_16MB,PSRAM=opi"
|
||||||
|
|
||||||
|
echo "== Mode: $MODE"
|
||||||
|
echo "== Sketch: $SKETCH_DIR"
|
||||||
|
echo "== Port: $PORT"
|
||||||
|
echo "== FQBN: $FQBN"
|
||||||
|
|
||||||
|
arduino-cli compile \
|
||||||
|
--fqbn "$FQBN" \
|
||||||
|
--build-path "$BUILD_DIR" \
|
||||||
|
"$SKETCH_DIR"
|
||||||
|
|
||||||
|
arduino-cli upload \
|
||||||
|
--fqbn "$FQBN" \
|
||||||
|
-p "$PORT" \
|
||||||
|
--input-dir "$BUILD_DIR" \
|
||||||
|
"$SKETCH_DIR"
|
||||||
|
|
||||||
|
echo
|
||||||
|
echo "== Done."
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
# AGENTS
|
||||||
|
|
||||||
|
This folder contains a temporary GPIO6 buzzer diagnostic for ESP32-S3-LCD-2. Keep screen/serial strings in English.
|
||||||
+51
@@ -0,0 +1,51 @@
|
|||||||
|
#include <Arduino.h>
|
||||||
|
|
||||||
|
// Buzzer module wiring: GND -> GND, VCC -> 3V3, I/O -> P1 IO6 / GPIO6.
|
||||||
|
static constexpr uint8_t PIN_BUZZER = 6;
|
||||||
|
static constexpr uint32_t STEP_MS = 1800;
|
||||||
|
static uint8_t gStep = 0;
|
||||||
|
static uint32_t gChangedMs = 0;
|
||||||
|
|
||||||
|
static void applyStep(uint8_t step) {
|
||||||
|
ledcDetach(PIN_BUZZER);
|
||||||
|
pinMode(PIN_BUZZER, OUTPUT);
|
||||||
|
digitalWrite(PIN_BUZZER, LOW);
|
||||||
|
delay(80);
|
||||||
|
switch (step) {
|
||||||
|
case 0:
|
||||||
|
pinMode(PIN_BUZZER, OUTPUT);
|
||||||
|
digitalWrite(PIN_BUZZER, HIGH);
|
||||||
|
Serial.println("TEST 1: GPIO6 HIGH - active-high module should sound");
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
pinMode(PIN_BUZZER, OUTPUT);
|
||||||
|
digitalWrite(PIN_BUZZER, LOW);
|
||||||
|
Serial.println("TEST 2: GPIO6 LOW - active-low module should sound");
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
ledcAttach(PIN_BUZZER, 1800, 8);
|
||||||
|
ledcWriteTone(PIN_BUZZER, 1800);
|
||||||
|
ledcWrite(PIN_BUZZER, 180);
|
||||||
|
Serial.println("TEST 3: GPIO6 PWM 1800 Hz - passive module should sound");
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
pinMode(PIN_BUZZER, OUTPUT);
|
||||||
|
digitalWrite(PIN_BUZZER, LOW);
|
||||||
|
Serial.println("SILENCE");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void setup() {
|
||||||
|
Serial.begin(115200);
|
||||||
|
Serial.println("GPIO6 BUZZER TEST: HIGH, LOW, PWM, SILENCE. Each step lasts 1.8 seconds.");
|
||||||
|
applyStep(gStep);
|
||||||
|
gChangedMs = millis();
|
||||||
|
}
|
||||||
|
|
||||||
|
void loop() {
|
||||||
|
if (millis() - gChangedMs < STEP_MS) return;
|
||||||
|
gStep = (gStep + 1) % 4;
|
||||||
|
applyStep(gStep);
|
||||||
|
gChangedMs = millis();
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
# AGENTS
|
||||||
|
|
||||||
|
## Назначение папки
|
||||||
|
|
||||||
|
Эта папка содержит отдельный тестовый Arduino-скетч `potentiometer_adc_test.ino` для Waveshare `ESP32-S3-LCD-2`.
|
||||||
|
|
||||||
|
Скетч проверяет переменный резистор на обычных GPIO/ADC, без использования USB `D+ / D-`.
|
||||||
|
|
||||||
|
## Обязательная синхронизация
|
||||||
|
|
||||||
|
При любом изменении `potentiometer_adc_test.ino` обязательно обновлять рядом лежащий `README.md`.
|
||||||
|
|
||||||
|
Если меняются экранные тексты, режимы, пины подключения, правила расчёта, touch-кнопки или serial-команды, описание в `README.md` должно быть обновлено в том же наборе изменений.
|
||||||
|
|
||||||
|
## Язык экрана
|
||||||
|
|
||||||
|
Экранные строки в скетче оставлять на английском языке.
|
||||||
@@ -0,0 +1,73 @@
|
|||||||
|
# Potentiometer ADC Test for ESP32-S3-LCD-2
|
||||||
|
|
||||||
|
Тестовый скетч для Waveshare `ESP32-S3-LCD-2`.
|
||||||
|
|
||||||
|
Назначение: проверить переменный резистор `RP 6045-B50K` через обычные GPIO/ADC, без использования USB `D+ / D-`.
|
||||||
|
|
||||||
|
## Пины
|
||||||
|
|
||||||
|
Используются пины с разъёма `P1` платы:
|
||||||
|
|
||||||
|
- `GPIO2 / IO2` — ADC-вход, сюда подключается ползунок потенциометра.
|
||||||
|
- `GPIO6 / IO6` — DRIVE-выход для грубого 2-проводного режима.
|
||||||
|
- `3V3` — питание потенциометра для 3-проводного режима, находится на разъёме `P2`.
|
||||||
|
- `GND` — земля.
|
||||||
|
|
||||||
|
Не подавать `5V` на `GPIO2` или `GPIO6`: GPIO ESP32-S3 не являются 5V tolerant.
|
||||||
|
|
||||||
|
## Режимы
|
||||||
|
|
||||||
|
Переключение:
|
||||||
|
|
||||||
|
- touch-кнопка `3-WIRE`;
|
||||||
|
- touch-кнопка `2-WIRE`;
|
||||||
|
- серийная команда `m`;
|
||||||
|
- короткое нажатие `BOOT / GPIO0`.
|
||||||
|
|
||||||
|
Сброс min/max:
|
||||||
|
|
||||||
|
- touch-кнопка `RESET`;
|
||||||
|
- серийная команда `r`.
|
||||||
|
|
||||||
|
## 3-Wire Mode
|
||||||
|
|
||||||
|
Правильное подключение:
|
||||||
|
|
||||||
|
- один край потенциометра -> `3V3`;
|
||||||
|
- второй край потенциометра -> `GND`;
|
||||||
|
- средний ползунок -> `GPIO2 / IO2`.
|
||||||
|
|
||||||
|
Скетч показывает напряжение на ползунке, raw ADC, абсолютное положение от `0..3.3V`, калиброванное положение между найденными min/max и примерное сопротивление участка `0..50 kΩ`.
|
||||||
|
|
||||||
|
## 2-Wire Mode
|
||||||
|
|
||||||
|
Грубое подключение:
|
||||||
|
|
||||||
|
- один край потенциометра -> `GPIO6 / IO6`;
|
||||||
|
- средний ползунок -> `GPIO2 / IO2`;
|
||||||
|
- второй край не подключать.
|
||||||
|
|
||||||
|
`GPIO6` выдаёт `HIGH`, `GPIO2` читается как ADC с внутренней подтяжкой вниз. Такой режим показывает движение ползунка, но не даёт точного сопротивления: внутренняя подтяжка ESP32 имеет большой разброс.
|
||||||
|
|
||||||
|
## Экранные данные
|
||||||
|
|
||||||
|
На экране выводятся:
|
||||||
|
|
||||||
|
- режим и схема пинов;
|
||||||
|
- raw ADC и millivolts;
|
||||||
|
- абсолютный процент от `0..3300 mV`;
|
||||||
|
- калиброванный процент по найденному min/max;
|
||||||
|
- min/max/span;
|
||||||
|
- EMA-сглаживание;
|
||||||
|
- примерная оценка сопротивления;
|
||||||
|
- статус `OPEN/LOW/MID/HIGH/SATURATED/NO SPAN`;
|
||||||
|
- координаты последнего touch;
|
||||||
|
- serial-подсказка.
|
||||||
|
|
||||||
|
## Сборка
|
||||||
|
|
||||||
|
Из папки `main-device`:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
./burn.sh potentiometer-adc-test
|
||||||
|
```
|
||||||
+348
@@ -0,0 +1,348 @@
|
|||||||
|
#include <Arduino.h>
|
||||||
|
#include <Arduino_GFX_Library.h>
|
||||||
|
#include <Wire.h>
|
||||||
|
#include <bsp_cst816.h>
|
||||||
|
|
||||||
|
#define PIN_LCD_SCLK 39
|
||||||
|
#define PIN_LCD_MOSI 38
|
||||||
|
#define PIN_LCD_MISO 40
|
||||||
|
#define PIN_LCD_DC 42
|
||||||
|
#define PIN_LCD_RST -1
|
||||||
|
#define PIN_LCD_CS 45
|
||||||
|
#define PIN_LCD_BL 1
|
||||||
|
|
||||||
|
#define PIN_TP_SDA 48
|
||||||
|
#define PIN_TP_SCL 47
|
||||||
|
|
||||||
|
#define PIN_ADC_WIPER 2
|
||||||
|
#define PIN_DRIVE_2WIRE 6
|
||||||
|
#define PIN_BOOT_BUTTON 0
|
||||||
|
|
||||||
|
static const uint16_t DISP_W = 320;
|
||||||
|
static const uint16_t DISP_H = 240;
|
||||||
|
static const uint32_t ADC_FULL_MV = 3300;
|
||||||
|
static const float POT_OHMS = 50000.0f;
|
||||||
|
static const float ROUGH_PULLDOWN_OHMS = 45000.0f;
|
||||||
|
|
||||||
|
static const uint16_t C_BG = 0x0841;
|
||||||
|
static const uint16_t C_PANEL = 0x18E3;
|
||||||
|
static const uint16_t C_CARD = 0x2126;
|
||||||
|
static const uint16_t C_TEXT = 0xF7BE;
|
||||||
|
static const uint16_t C_MUTE = 0x8C71;
|
||||||
|
static const uint16_t C_ACCENT = 0x05DF;
|
||||||
|
static const uint16_t C_OK = 0x47E8;
|
||||||
|
static const uint16_t C_WARN = 0xFD20;
|
||||||
|
static const uint16_t C_BAD = 0xF986;
|
||||||
|
static const uint16_t C_BORDER = 0x4208;
|
||||||
|
|
||||||
|
struct Rect {
|
||||||
|
int16_t x;
|
||||||
|
int16_t y;
|
||||||
|
int16_t w;
|
||||||
|
int16_t h;
|
||||||
|
};
|
||||||
|
|
||||||
|
enum class Mode : uint8_t {
|
||||||
|
ThreeWire,
|
||||||
|
TwoWire,
|
||||||
|
};
|
||||||
|
|
||||||
|
struct Sample {
|
||||||
|
uint16_t raw;
|
||||||
|
uint32_t mv;
|
||||||
|
uint16_t rawMinBurst;
|
||||||
|
uint16_t rawMaxBurst;
|
||||||
|
};
|
||||||
|
|
||||||
|
Arduino_DataBus *bus = new Arduino_ESP32SPI(
|
||||||
|
PIN_LCD_DC, PIN_LCD_CS, PIN_LCD_SCLK, PIN_LCD_MOSI, PIN_LCD_MISO);
|
||||||
|
Arduino_GFX *gfx = new Arduino_ST7789(
|
||||||
|
bus, PIN_LCD_RST, 1, true, 240, 320);
|
||||||
|
|
||||||
|
static const Rect BTN_3WIRE = {10, 38, 94, 30};
|
||||||
|
static const Rect BTN_2WIRE = {113, 38, 94, 30};
|
||||||
|
static const Rect BTN_RESET = {216, 38, 94, 30};
|
||||||
|
|
||||||
|
static Mode gMode = Mode::ThreeWire;
|
||||||
|
static uint32_t gLastUiMs = 0;
|
||||||
|
static uint32_t gLastSerialMs = 0;
|
||||||
|
static uint32_t gMinMv = 0xFFFFFFFF;
|
||||||
|
static uint32_t gMaxMv = 0;
|
||||||
|
static float gEmaMv = 0.0f;
|
||||||
|
static bool gHasEma = false;
|
||||||
|
static bool gTouchOk = false;
|
||||||
|
static uint16_t gLastTouchX = 0;
|
||||||
|
static uint16_t gLastTouchY = 0;
|
||||||
|
static bool gBootWasDown = false;
|
||||||
|
static uint32_t gBootLastChangeMs = 0;
|
||||||
|
|
||||||
|
static void drawText(int16_t x, int16_t y, const char *text, uint16_t color, uint8_t size = 1) {
|
||||||
|
gfx->setTextSize(size);
|
||||||
|
gfx->setTextColor(color);
|
||||||
|
gfx->setCursor(x, y);
|
||||||
|
gfx->print(text);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void drawButton(const Rect &r, const char *label, bool active) {
|
||||||
|
uint16_t fill = active ? C_ACCENT : C_CARD;
|
||||||
|
uint16_t text = active ? C_BG : C_TEXT;
|
||||||
|
gfx->fillRoundRect(r.x, r.y, r.w, r.h, 6, fill);
|
||||||
|
gfx->drawRoundRect(r.x, r.y, r.w, r.h, 6, active ? C_ACCENT : C_BORDER);
|
||||||
|
int16_t tx = r.x + 10;
|
||||||
|
int16_t ty = r.y + 10;
|
||||||
|
drawText(tx, ty, label, text, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool contains(const Rect &r, uint16_t x, uint16_t y) {
|
||||||
|
return x >= r.x && x < r.x + r.w && y >= r.y && y < r.y + r.h;
|
||||||
|
}
|
||||||
|
|
||||||
|
static const char *modeName() {
|
||||||
|
return gMode == Mode::ThreeWire ? "3-WIRE" : "2-WIRE";
|
||||||
|
}
|
||||||
|
|
||||||
|
static void resetRange() {
|
||||||
|
gMinMv = 0xFFFFFFFF;
|
||||||
|
gMaxMv = 0;
|
||||||
|
gHasEma = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void configurePins() {
|
||||||
|
pinMode(PIN_ADC_WIPER, INPUT);
|
||||||
|
analogReadResolution(12);
|
||||||
|
analogSetPinAttenuation(PIN_ADC_WIPER, ADC_11db);
|
||||||
|
|
||||||
|
if (gMode == Mode::TwoWire) {
|
||||||
|
pinMode(PIN_DRIVE_2WIRE, OUTPUT);
|
||||||
|
digitalWrite(PIN_DRIVE_2WIRE, HIGH);
|
||||||
|
pinMode(PIN_ADC_WIPER, INPUT_PULLDOWN);
|
||||||
|
} else {
|
||||||
|
pinMode(PIN_DRIVE_2WIRE, INPUT);
|
||||||
|
pinMode(PIN_ADC_WIPER, INPUT);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void setMode(Mode mode) {
|
||||||
|
if (gMode == mode) return;
|
||||||
|
gMode = mode;
|
||||||
|
configurePins();
|
||||||
|
resetRange();
|
||||||
|
}
|
||||||
|
|
||||||
|
static Sample readSample() {
|
||||||
|
const uint8_t count = 32;
|
||||||
|
uint32_t rawSum = 0;
|
||||||
|
uint32_t mvSum = 0;
|
||||||
|
uint16_t rawMin = 4095;
|
||||||
|
uint16_t rawMax = 0;
|
||||||
|
|
||||||
|
for (uint8_t i = 0; i < count; i++) {
|
||||||
|
uint16_t raw = analogRead(PIN_ADC_WIPER);
|
||||||
|
uint32_t mv = analogReadMilliVolts(PIN_ADC_WIPER);
|
||||||
|
rawSum += raw;
|
||||||
|
mvSum += mv;
|
||||||
|
if (raw < rawMin) rawMin = raw;
|
||||||
|
if (raw > rawMax) rawMax = raw;
|
||||||
|
delayMicroseconds(250);
|
||||||
|
}
|
||||||
|
|
||||||
|
Sample s;
|
||||||
|
s.raw = rawSum / count;
|
||||||
|
s.mv = mvSum / count;
|
||||||
|
s.rawMinBurst = rawMin;
|
||||||
|
s.rawMaxBurst = rawMax;
|
||||||
|
return s;
|
||||||
|
}
|
||||||
|
|
||||||
|
static uint8_t percentFromMv(uint32_t mv) {
|
||||||
|
if (mv >= ADC_FULL_MV) return 100;
|
||||||
|
return (uint8_t)((mv * 100UL + ADC_FULL_MV / 2) / ADC_FULL_MV);
|
||||||
|
}
|
||||||
|
|
||||||
|
static uint8_t calibratedPercent(uint32_t mv, uint32_t span) {
|
||||||
|
if (span < 10 || gMinMv == 0xFFFFFFFF || mv <= gMinMv) return 0;
|
||||||
|
uint32_t pct = ((mv - gMinMv) * 100UL + span / 2) / span;
|
||||||
|
return (uint8_t)min<uint32_t>(pct, 100);
|
||||||
|
}
|
||||||
|
|
||||||
|
static const char *statusText(uint32_t mv, uint32_t span, uint8_t pctAbs) {
|
||||||
|
if (mv < 30) return "OPEN/GND";
|
||||||
|
if (mv > 3250) return "SATURATED";
|
||||||
|
if (span < 20) return "NO SPAN";
|
||||||
|
if (pctAbs < 15) return "LOW";
|
||||||
|
if (pctAbs > 85) return "HIGH";
|
||||||
|
return "MID";
|
||||||
|
}
|
||||||
|
|
||||||
|
static float estimateOhms(uint32_t mv) {
|
||||||
|
if (gMode == Mode::ThreeWire) {
|
||||||
|
return POT_OHMS * ((float)percentFromMv(mv) / 100.0f);
|
||||||
|
}
|
||||||
|
if (mv < 5) return -1.0f;
|
||||||
|
if (mv >= ADC_FULL_MV) return 0.0f;
|
||||||
|
return ROUGH_PULLDOWN_OHMS * ((float)ADC_FULL_MV / (float)mv - 1.0f);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void drawStaticUi() {
|
||||||
|
gfx->fillScreen(C_BG);
|
||||||
|
drawText(10, 8, "POT ADC TEST", C_TEXT, 2);
|
||||||
|
drawText(210, 12, "ESP32-S3-LCD-2", C_MUTE, 1);
|
||||||
|
drawButton(BTN_3WIRE, "3-WIRE", gMode == Mode::ThreeWire);
|
||||||
|
drawButton(BTN_2WIRE, "2-WIRE", gMode == Mode::TwoWire);
|
||||||
|
drawButton(BTN_RESET, "RESET", false);
|
||||||
|
|
||||||
|
gfx->drawRoundRect(8, 76, 304, 64, 8, C_BORDER);
|
||||||
|
gfx->drawRoundRect(8, 148, 304, 54, 8, C_BORDER);
|
||||||
|
gfx->drawRoundRect(8, 208, 304, 24, 6, C_BORDER);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void drawBar(uint8_t pct, uint16_t color) {
|
||||||
|
int x = 18;
|
||||||
|
int y = 123;
|
||||||
|
int w = 284;
|
||||||
|
int h = 10;
|
||||||
|
gfx->fillRect(x, y, w, h, C_BORDER);
|
||||||
|
gfx->fillRect(x, y, (w * pct) / 100, h, color);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void updateUi() {
|
||||||
|
Sample s = readSample();
|
||||||
|
if (s.mv < gMinMv) gMinMv = s.mv;
|
||||||
|
if (s.mv > gMaxMv) gMaxMv = s.mv;
|
||||||
|
uint32_t span = (gMaxMv > gMinMv) ? (gMaxMv - gMinMv) : 0;
|
||||||
|
|
||||||
|
if (!gHasEma) {
|
||||||
|
gEmaMv = (float)s.mv;
|
||||||
|
gHasEma = true;
|
||||||
|
} else {
|
||||||
|
gEmaMv = gEmaMv * 0.85f + (float)s.mv * 0.15f;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint8_t pctAbs = percentFromMv(s.mv);
|
||||||
|
uint8_t pctCal = calibratedPercent(s.mv, span);
|
||||||
|
float ohms = estimateOhms(s.mv);
|
||||||
|
const char *status = statusText(s.mv, span, pctAbs);
|
||||||
|
uint16_t statusColor = strcmp(status, "MID") == 0 ? C_OK :
|
||||||
|
strcmp(status, "NO SPAN") == 0 ? C_WARN :
|
||||||
|
strcmp(status, "SATURATED") == 0 ? C_BAD : C_ACCENT;
|
||||||
|
|
||||||
|
char line[96];
|
||||||
|
gfx->fillRect(9, 77, 302, 62, C_BG);
|
||||||
|
snprintf(line, sizeof(line), "%s ADC=IO2 DRIVE=IO6", modeName());
|
||||||
|
drawText(16, 84, line, C_ACCENT, 1);
|
||||||
|
snprintf(line, sizeof(line), "raw:%4u mv:%4lu ema:%4lu",
|
||||||
|
s.raw, (unsigned long)s.mv, (unsigned long)(gEmaMv + 0.5f));
|
||||||
|
drawText(16, 101, line, C_TEXT, 1);
|
||||||
|
snprintf(line, sizeof(line), "abs:%3u%% cal:%3u%% jitter:%u",
|
||||||
|
pctAbs, pctCal, (unsigned)(s.rawMaxBurst - s.rawMinBurst));
|
||||||
|
drawText(16, 115, line, C_TEXT, 1);
|
||||||
|
drawBar(gMode == Mode::ThreeWire ? pctAbs : pctCal, statusColor);
|
||||||
|
|
||||||
|
gfx->fillRect(9, 149, 302, 52, C_BG);
|
||||||
|
snprintf(line, sizeof(line), "min:%4lu max:%4lu span:%4lu mV",
|
||||||
|
(unsigned long)gMinMv, (unsigned long)gMaxMv, (unsigned long)span);
|
||||||
|
drawText(16, 156, line, C_TEXT, 1);
|
||||||
|
if (ohms < 0) {
|
||||||
|
snprintf(line, sizeof(line), "ohm: open/too high status:%s", status);
|
||||||
|
} else {
|
||||||
|
snprintf(line, sizeof(line), "ohm:%6.1fk%s status:%s",
|
||||||
|
ohms / 1000.0f, gMode == Mode::TwoWire ? " rough" : "", status);
|
||||||
|
}
|
||||||
|
drawText(16, 172, line, statusColor, 1);
|
||||||
|
snprintf(line, sizeof(line), "touch:%s x:%u y:%u serial:m/r",
|
||||||
|
gTouchOk ? "ok" : "off", gLastTouchX, gLastTouchY);
|
||||||
|
drawText(16, 188, line, C_MUTE, 1);
|
||||||
|
|
||||||
|
gfx->fillRect(9, 209, 302, 22, C_BG);
|
||||||
|
if (gMode == Mode::ThreeWire) {
|
||||||
|
drawText(16, 216, "Wire: 3V3-edge GND-edge IO2-wiper", C_MUTE, 1);
|
||||||
|
} else {
|
||||||
|
drawText(16, 216, "Wire: IO6-edge IO2-wiper third pin open", C_MUTE, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
Serial.printf("mode=%s raw=%u mv=%lu ema=%.1f abs=%u cal=%u min=%lu max=%lu span=%lu jitter=%u status=%s\n",
|
||||||
|
modeName(), s.raw, (unsigned long)s.mv, gEmaMv, pctAbs, pctCal,
|
||||||
|
(unsigned long)gMinMv, (unsigned long)gMaxMv, (unsigned long)span,
|
||||||
|
(unsigned)(s.rawMaxBurst - s.rawMinBurst), status);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void handleTouch() {
|
||||||
|
bsp_touch_read();
|
||||||
|
uint16_t x = 0;
|
||||||
|
uint16_t y = 0;
|
||||||
|
if (!bsp_touch_get_coordinates(&x, &y)) return;
|
||||||
|
gLastTouchX = x;
|
||||||
|
gLastTouchY = y;
|
||||||
|
|
||||||
|
if (contains(BTN_3WIRE, x, y)) {
|
||||||
|
setMode(Mode::ThreeWire);
|
||||||
|
drawStaticUi();
|
||||||
|
} else if (contains(BTN_2WIRE, x, y)) {
|
||||||
|
setMode(Mode::TwoWire);
|
||||||
|
drawStaticUi();
|
||||||
|
} else if (contains(BTN_RESET, x, y)) {
|
||||||
|
resetRange();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void handleBootButton() {
|
||||||
|
bool down = digitalRead(PIN_BOOT_BUTTON) == LOW;
|
||||||
|
uint32_t now = millis();
|
||||||
|
if (down != gBootWasDown && now - gBootLastChangeMs > 40) {
|
||||||
|
gBootWasDown = down;
|
||||||
|
gBootLastChangeMs = now;
|
||||||
|
if (!down) {
|
||||||
|
setMode(gMode == Mode::ThreeWire ? Mode::TwoWire : Mode::ThreeWire);
|
||||||
|
drawStaticUi();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void handleSerial() {
|
||||||
|
while (Serial.available() > 0) {
|
||||||
|
char c = (char)Serial.read();
|
||||||
|
if (c == 'm' || c == 'M') {
|
||||||
|
setMode(gMode == Mode::ThreeWire ? Mode::TwoWire : Mode::ThreeWire);
|
||||||
|
drawStaticUi();
|
||||||
|
} else if (c == 'r' || c == 'R') {
|
||||||
|
resetRange();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void setup() {
|
||||||
|
Serial.begin(115200);
|
||||||
|
delay(100);
|
||||||
|
Serial.println("ESP32-S3-LCD-2 potentiometer ADC test");
|
||||||
|
Serial.println("Commands: m=switch mode, r=reset min/max");
|
||||||
|
|
||||||
|
pinMode(PIN_BOOT_BUTTON, INPUT_PULLUP);
|
||||||
|
configurePins();
|
||||||
|
|
||||||
|
if (!gfx->begin()) {
|
||||||
|
Serial.println("gfx->begin() failed");
|
||||||
|
}
|
||||||
|
pinMode(PIN_LCD_BL, OUTPUT);
|
||||||
|
digitalWrite(PIN_LCD_BL, HIGH);
|
||||||
|
|
||||||
|
Wire.begin(PIN_TP_SDA, PIN_TP_SCL);
|
||||||
|
gTouchOk = bsp_touch_init(&Wire, 1, DISP_W, DISP_H);
|
||||||
|
|
||||||
|
drawStaticUi();
|
||||||
|
}
|
||||||
|
|
||||||
|
void loop() {
|
||||||
|
handleSerial();
|
||||||
|
handleBootButton();
|
||||||
|
if (gTouchOk) handleTouch();
|
||||||
|
|
||||||
|
uint32_t now = millis();
|
||||||
|
if (now - gLastUiMs >= 250) {
|
||||||
|
updateUi();
|
||||||
|
gLastUiMs = now;
|
||||||
|
}
|
||||||
|
if (now - gLastSerialMs >= 5000) {
|
||||||
|
Serial.println("Hint: m switches 3-WIRE/2-WIRE, r resets min/max. Never feed 5V into IO2/IO6.");
|
||||||
|
gLastSerialMs = now;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -47,24 +47,20 @@ case "${MODE}" in
|
|||||||
lvgl-official-based-test) SKETCH_DIR="${ROOT_DIR}/test_sketches/lvgl_official_based_test" ;;
|
lvgl-official-based-test) SKETCH_DIR="${ROOT_DIR}/test_sketches/lvgl_official_based_test" ;;
|
||||||
lvgl-subserver-touch-test) SKETCH_DIR="${ROOT_DIR}/test_sketches/lvgl_subserver_touch_test" ;;
|
lvgl-subserver-touch-test) SKETCH_DIR="${ROOT_DIR}/test_sketches/lvgl_subserver_touch_test" ;;
|
||||||
lvgl-russian-font-test) SKETCH_DIR="${ROOT_DIR}/test_sketches/lvgl_russian_font_test" ;;
|
lvgl-russian-font-test) SKETCH_DIR="${ROOT_DIR}/test_sketches/lvgl_russian_font_test" ;;
|
||||||
|
usb-contact-test) SKETCH_DIR="${ROOT_DIR}/test_sketches/usb_contact_sensor_test" ;;
|
||||||
|
usb-contact-debug-test) SKETCH_DIR="${ROOT_DIR}/test_sketches/usb_contact_sensor_debug_test" ;;
|
||||||
|
usb-contact-resistance-test) SKETCH_DIR="${ROOT_DIR}/test_sketches/usb_contact_resistance_test" ;;
|
||||||
|
usb-contact-screen-start-stub) SKETCH_DIR="${ROOT_DIR}/test_sketches/usb_contact_screen_start_stub" ;;
|
||||||
lvgl-nav-minimal-test) SKETCH_DIR="${ROOT_DIR}/shine_homeserver_main" ;;
|
lvgl-nav-minimal-test) SKETCH_DIR="${ROOT_DIR}/shine_homeserver_main" ;;
|
||||||
*)
|
*)
|
||||||
echo "Unknown mode: ${MODE}" >&2
|
echo "Unknown mode: ${MODE}" >&2
|
||||||
echo "Use one of: hello, widgets, audio, simple, argon2, homeserver-ui, shine-homeserver-main, shine-homeserver-ui-main, legacy-homeserver-ui, text-test, gfx-text-test, gfx-layout-test, lvgl-basic-test, lvgl-interaction-test, lvgl-touch-debug-test, lvgl-official-based-test, lvgl-subserver-touch-test, lvgl-russian-font-test" >&2
|
echo "Use one of: hello, widgets, audio, simple, argon2, homeserver-ui, shine-homeserver-main, shine-homeserver-ui-main, legacy-homeserver-ui, text-test, gfx-text-test, gfx-layout-test, lvgl-basic-test, lvgl-interaction-test, lvgl-touch-debug-test, lvgl-official-based-test, lvgl-subserver-touch-test, lvgl-russian-font-test, usb-contact-test, usb-contact-debug-test, usb-contact-resistance-test, usb-contact-screen-start-stub" >&2
|
||||||
exit 2
|
exit 2
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if [[ -z "${PORT}" ]]; then
|
|
||||||
if ! PORT="$(detect_port)"; then
|
|
||||||
echo "Failed to auto-detect ESP32 port. Set PORT=/dev/ttyACM0 ./burn.sh ${MODE}" >&2
|
|
||||||
exit 3
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "== Mode: ${MODE}"
|
echo "== Mode: ${MODE}"
|
||||||
echo "== Sketch: ${SKETCH_DIR}"
|
echo "== Sketch: ${SKETCH_DIR}"
|
||||||
echo "== Port: ${PORT}"
|
|
||||||
echo "== FQBN: ${FQBN}"
|
echo "== FQBN: ${FQBN}"
|
||||||
|
|
||||||
mkdir -p "${BUILD_DIR}" "${OUT_DIR}"
|
mkdir -p "${BUILD_DIR}" "${OUT_DIR}"
|
||||||
@@ -78,6 +74,7 @@ compile_args=(
|
|||||||
--library "${DEMO_BASE}/libraries/XPowersLib"
|
--library "${DEMO_BASE}/libraries/XPowersLib"
|
||||||
--library "${DEMO_BASE}/libraries/lvgl"
|
--library "${DEMO_BASE}/libraries/lvgl"
|
||||||
--library "${DEMO_BASE}/libraries/Mylibrary"
|
--library "${DEMO_BASE}/libraries/Mylibrary"
|
||||||
|
--library "${ROOT_DIR}/simple_av_test"
|
||||||
"${SKETCH_DIR}"
|
"${SKETCH_DIR}"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -87,6 +84,20 @@ if ! arduino-cli compile "${compile_args[@]}"; then
|
|||||||
arduino-cli compile --clean "${compile_args[@]}"
|
arduino-cli compile --clean "${compile_args[@]}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ "${NO_UPLOAD:-0}" == "1" ]]; then
|
||||||
|
echo "== Done: compiled without upload (NO_UPLOAD=1)."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -z "${PORT}" ]]; then
|
||||||
|
if ! PORT="$(detect_port)"; then
|
||||||
|
echo "Failed to auto-detect ESP32 port. Set PORT=/dev/ttyACM0 ./burn.sh ${MODE}" >&2
|
||||||
|
exit 3
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "== Port: ${PORT}"
|
||||||
|
|
||||||
arduino-cli upload \
|
arduino-cli upload \
|
||||||
-p "${PORT}" \
|
-p "${PORT}" \
|
||||||
--fqbn "${FQBN}" \
|
--fqbn "${FQBN}" \
|
||||||
|
|||||||
@@ -15,6 +15,9 @@
|
|||||||
- `lvgl_official_based_test/` - минимальный наш экран поверх максимально близкой к официальному `05_LVGL_Widgets` инициализации
|
- `lvgl_official_based_test/` - минимальный наш экран поверх максимально близкой к официальному `05_LVGL_Widgets` инициализации
|
||||||
- `lvgl_subserver_touch_test/` - старый гибридный тест: `LVGL`-экран с инициализацией дисплея и чтением touch из старого `shine_homeserver_ui`; подтверждён на реальном устройстве
|
- `lvgl_subserver_touch_test/` - старый гибридный тест: `LVGL`-экран с инициализацией дисплея и чтением touch из старого `shine_homeserver_ui`; подтверждён на реальном устройстве
|
||||||
- `lvgl_russian_font_test/` - тест кастомного кириллического `LVGL`-шрифта с русскими кнопками, длинными строками и рабочим touch
|
- `lvgl_russian_font_test/` - тест кастомного кириллического `LVGL`-шрифта с русскими кнопками, длинными строками и рабочим touch
|
||||||
|
- `usb_contact_sensor_test/` - тест переключения нативных USB D-/D+ (`GPIO19/20`) в режим простого замыкаемого контакта после нажатия Start; после перезагрузки снова обычный USB
|
||||||
|
- `usb_contact_sensor_debug_test/` - debug-версия теста замыкания контакта: экранная кнопка проверяет touch, а переход в sensor mode выполняется физической кнопкой BOOT
|
||||||
|
- `usb_contact_resistance_test/` - тест измерения сопротивления между USB D-/D+ через ADC на GPIO20; рассчитан на внешний известный резистор 10 kΩ с D+ на GND
|
||||||
- `lvgl_nav_minimal_test/` - старое тестовое имя, этот скетч перенесён в `shine_homeserver_main/` и теперь является основным
|
- `lvgl_nav_minimal_test/` - старое тестовое имя, этот скетч перенесён в `shine_homeserver_main/` и теперь является основным
|
||||||
|
|
||||||
## Запуск
|
## Запуск
|
||||||
@@ -29,3 +32,6 @@
|
|||||||
- `./burn.sh lvgl-official-based-test`
|
- `./burn.sh lvgl-official-based-test`
|
||||||
- `./burn.sh lvgl-subserver-touch-test`
|
- `./burn.sh lvgl-subserver-touch-test`
|
||||||
- `./burn.sh lvgl-russian-font-test`
|
- `./burn.sh lvgl-russian-font-test`
|
||||||
|
- `./burn.sh usb-contact-test`
|
||||||
|
- `./burn.sh usb-contact-debug-test`
|
||||||
|
- `./burn.sh usb-contact-resistance-test`
|
||||||
|
|||||||
+295
@@ -0,0 +1,295 @@
|
|||||||
|
#include <Arduino.h>
|
||||||
|
#include <Wire.h>
|
||||||
|
#include <lvgl.h>
|
||||||
|
#include <Arduino_GFX_Library.h>
|
||||||
|
#include "pin_config.h"
|
||||||
|
#include "TouchDrvCSTXXX.hpp"
|
||||||
|
|
||||||
|
#define EXAMPLE_LVGL_TICK_PERIOD_MS 2
|
||||||
|
|
||||||
|
// ESP32-S3 native USB data pins.
|
||||||
|
static constexpr int kUsbDmPin = 19; // USB D-
|
||||||
|
static constexpr int kUsbDpPin = 20; // USB D+, ADC input in resistance mode.
|
||||||
|
static constexpr uint32_t kUiRefreshMs = 120;
|
||||||
|
static constexpr uint32_t kAdcSamples = 32;
|
||||||
|
|
||||||
|
// For a stable ohm reading connect a known resistor from D+ / GPIO20 to GND.
|
||||||
|
// The measured resistance must be connected between D- / GPIO19 and D+ / GPIO20.
|
||||||
|
static constexpr float kKnownPulldownOhms = 10000.0f;
|
||||||
|
static constexpr float kSourceMillivolts = 3300.0f;
|
||||||
|
static constexpr float kOpenThresholdMillivolts = 25.0f;
|
||||||
|
|
||||||
|
static lv_disp_draw_buf_t gDrawBuf;
|
||||||
|
static lv_color_t *gBuf1 = nullptr;
|
||||||
|
static lv_color_t *gBuf2 = nullptr;
|
||||||
|
static lv_obj_t *gModeLabel = nullptr;
|
||||||
|
static lv_obj_t *gResistanceLabel = nullptr;
|
||||||
|
static lv_obj_t *gRawLabel = nullptr;
|
||||||
|
static lv_obj_t *gHintLabel = nullptr;
|
||||||
|
static lv_obj_t *gActionButton = nullptr;
|
||||||
|
static lv_obj_t *gActionButtonLabel = nullptr;
|
||||||
|
|
||||||
|
static TouchDrvCST92xx gTouch;
|
||||||
|
static int16_t gTouchX[5];
|
||||||
|
static int16_t gTouchY[5];
|
||||||
|
|
||||||
|
static bool gSensorMode = false;
|
||||||
|
static uint32_t gLastUiRefreshMs = 0;
|
||||||
|
|
||||||
|
Arduino_DataBus *gBus = new Arduino_ESP32QSPI(
|
||||||
|
LCD_CS, LCD_SCLK, LCD_SDIO0, LCD_SDIO1, LCD_SDIO2, LCD_SDIO3);
|
||||||
|
Arduino_CO5300 *gfx = new Arduino_CO5300(
|
||||||
|
gBus, LCD_RESET, 0, LCD_WIDTH, LCD_HEIGHT, 0, 0, 0, 0);
|
||||||
|
|
||||||
|
static void lvglFlushCb(lv_disp_drv_t *disp, const lv_area_t *area, lv_color_t *colorP) {
|
||||||
|
uint32_t w = area->x2 - area->x1 + 1;
|
||||||
|
uint32_t h = area->y2 - area->y1 + 1;
|
||||||
|
#if (LV_COLOR_16_SWAP != 0)
|
||||||
|
gfx->draw16bitBeRGBBitmap(area->x1, area->y1, (uint16_t *)&colorP->full, w, h);
|
||||||
|
#else
|
||||||
|
gfx->draw16bitRGBBitmap(area->x1, area->y1, (uint16_t *)&colorP->full, w, h);
|
||||||
|
#endif
|
||||||
|
lv_disp_flush_ready(disp);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void lvglTick(void *arg) {
|
||||||
|
LV_UNUSED(arg);
|
||||||
|
lv_tick_inc(EXAMPLE_LVGL_TICK_PERIOD_MS);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void lvglTouchRead(lv_indev_drv_t *indevDrv, lv_indev_data_t *data) {
|
||||||
|
LV_UNUSED(indevDrv);
|
||||||
|
uint8_t touched = gTouch.getPoint(gTouchX, gTouchY, gTouch.getSupportTouchPoint());
|
||||||
|
if (touched > 0) {
|
||||||
|
data->state = LV_INDEV_STATE_PR;
|
||||||
|
data->point.x = gTouchX[0];
|
||||||
|
data->point.y = gTouchY[0];
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
data->state = LV_INDEV_STATE_REL;
|
||||||
|
}
|
||||||
|
|
||||||
|
static uint32_t readAverageRaw() {
|
||||||
|
uint32_t sum = 0;
|
||||||
|
for (uint32_t i = 0; i < kAdcSamples; i++) {
|
||||||
|
sum += analogRead(kUsbDpPin);
|
||||||
|
delayMicroseconds(250);
|
||||||
|
}
|
||||||
|
return sum / kAdcSamples;
|
||||||
|
}
|
||||||
|
|
||||||
|
static uint32_t readAverageMillivolts() {
|
||||||
|
uint32_t sum = 0;
|
||||||
|
for (uint32_t i = 0; i < kAdcSamples; i++) {
|
||||||
|
sum += analogReadMilliVolts(kUsbDpPin);
|
||||||
|
delayMicroseconds(250);
|
||||||
|
}
|
||||||
|
return sum / kAdcSamples;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void setResistanceText(float ohms) {
|
||||||
|
if (ohms >= 1000000.0f) {
|
||||||
|
String text = String(ohms / 1000000.0f, 2) + " Mohm";
|
||||||
|
lv_label_set_text(gResistanceLabel, text.c_str());
|
||||||
|
} else if (ohms >= 1000.0f) {
|
||||||
|
String text = String(ohms / 1000.0f, 2) + " kohm";
|
||||||
|
lv_label_set_text(gResistanceLabel, text.c_str());
|
||||||
|
} else {
|
||||||
|
String text = String(ohms, 0) + " ohm";
|
||||||
|
lv_label_set_text(gResistanceLabel, text.c_str());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void updateResistanceUi() {
|
||||||
|
if (!gSensorMode) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32_t now = millis();
|
||||||
|
if (now - gLastUiRefreshMs < kUiRefreshMs) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
gLastUiRefreshMs = now;
|
||||||
|
|
||||||
|
uint32_t raw = readAverageRaw();
|
||||||
|
uint32_t millivolts = readAverageMillivolts();
|
||||||
|
|
||||||
|
if (millivolts <= kOpenThresholdMillivolts) {
|
||||||
|
lv_label_set_text(gResistanceLabel, "OPEN");
|
||||||
|
lv_obj_set_style_text_color(gResistanceLabel, lv_color_hex(0xFFD166), 0);
|
||||||
|
} else if (millivolts >= (uint32_t)(kSourceMillivolts - 80.0f)) {
|
||||||
|
lv_label_set_text(gResistanceLabel, "SHORT / LOW");
|
||||||
|
lv_obj_set_style_text_color(gResistanceLabel, lv_color_hex(0x7CFF8A), 0);
|
||||||
|
} else {
|
||||||
|
float rx = kKnownPulldownOhms * ((kSourceMillivolts / (float)millivolts) - 1.0f);
|
||||||
|
lv_obj_set_style_text_color(gResistanceLabel, lv_color_hex(0x7CFF8A), 0);
|
||||||
|
setResistanceText(rx);
|
||||||
|
}
|
||||||
|
|
||||||
|
String rawText = "ADC raw: " + String(raw);
|
||||||
|
rawText += "\nD+ voltage: " + String(millivolts) + " mV";
|
||||||
|
rawText += "\nKnown pulldown: 10 kohm to GND";
|
||||||
|
lv_label_set_text(gRawLabel, rawText.c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
static void enterSensorMode() {
|
||||||
|
Serial.flush();
|
||||||
|
delay(30);
|
||||||
|
|
||||||
|
pinMode(kUsbDmPin, OUTPUT);
|
||||||
|
digitalWrite(kUsbDmPin, HIGH);
|
||||||
|
|
||||||
|
pinMode(kUsbDpPin, INPUT);
|
||||||
|
analogReadResolution(12);
|
||||||
|
analogSetPinAttenuation(kUsbDpPin, ADC_11db);
|
||||||
|
|
||||||
|
gSensorMode = true;
|
||||||
|
gLastUiRefreshMs = 0;
|
||||||
|
|
||||||
|
lv_label_set_text(gModeLabel, "Resistance mode");
|
||||||
|
lv_label_set_text(gHintLabel, "D- is 3.3V source. D+ is ADC input.\nUse 10 kohm from D+ to GND for accurate readings.");
|
||||||
|
lv_label_set_text(gActionButtonLabel, "Restart to USB");
|
||||||
|
updateResistanceUi();
|
||||||
|
}
|
||||||
|
|
||||||
|
static void actionButtonEventCb(lv_event_t *event) {
|
||||||
|
if (lv_event_get_code(event) != LV_EVENT_CLICKED) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!gSensorMode) {
|
||||||
|
enterSensorMode();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
lv_label_set_text(gModeLabel, "Restarting...");
|
||||||
|
lv_label_set_text(gHintLabel, "USB mode will return after reboot.");
|
||||||
|
lv_timer_handler();
|
||||||
|
delay(150);
|
||||||
|
ESP.restart();
|
||||||
|
}
|
||||||
|
|
||||||
|
static void createUi() {
|
||||||
|
lv_obj_t *screen = lv_scr_act();
|
||||||
|
lv_obj_set_style_bg_color(screen, lv_color_hex(0x0B1320), 0);
|
||||||
|
lv_obj_set_style_bg_opa(screen, LV_OPA_COVER, 0);
|
||||||
|
|
||||||
|
lv_obj_t *title = lv_label_create(screen);
|
||||||
|
lv_label_set_text(title, "USB RESISTANCE TEST");
|
||||||
|
lv_obj_set_style_text_color(title, lv_color_hex(0xFFFFFF), 0);
|
||||||
|
lv_obj_set_style_text_font(title, &lv_font_montserrat_22, 0);
|
||||||
|
lv_obj_align(title, LV_ALIGN_TOP_MID, 0, 24);
|
||||||
|
|
||||||
|
gModeLabel = lv_label_create(screen);
|
||||||
|
lv_label_set_text(gModeLabel, "USB mode");
|
||||||
|
lv_obj_set_style_text_color(gModeLabel, lv_color_hex(0xB8C8DC), 0);
|
||||||
|
lv_obj_set_style_text_font(gModeLabel, &lv_font_montserrat_18, 0);
|
||||||
|
lv_obj_align(gModeLabel, LV_ALIGN_TOP_MID, 0, 68);
|
||||||
|
|
||||||
|
gResistanceLabel = lv_label_create(screen);
|
||||||
|
lv_label_set_text(gResistanceLabel, "READY");
|
||||||
|
lv_obj_set_style_text_color(gResistanceLabel, lv_color_hex(0x72D6FF), 0);
|
||||||
|
lv_obj_set_style_text_font(gResistanceLabel, &lv_font_montserrat_40, 0);
|
||||||
|
lv_obj_align(gResistanceLabel, LV_ALIGN_CENTER, 0, -72);
|
||||||
|
|
||||||
|
gRawLabel = lv_label_create(screen);
|
||||||
|
lv_label_set_text(gRawLabel, "ADC raw: -\nD+ voltage: -\nKnown pulldown: 10 kohm to GND");
|
||||||
|
lv_obj_set_width(gRawLabel, 420);
|
||||||
|
lv_label_set_long_mode(gRawLabel, LV_LABEL_LONG_WRAP);
|
||||||
|
lv_obj_set_style_text_align(gRawLabel, LV_TEXT_ALIGN_CENTER, 0);
|
||||||
|
lv_obj_set_style_text_color(gRawLabel, lv_color_hex(0xD5DCE5), 0);
|
||||||
|
lv_obj_set_style_text_font(gRawLabel, &lv_font_montserrat_16, 0);
|
||||||
|
lv_obj_align(gRawLabel, LV_ALIGN_CENTER, 0, -8);
|
||||||
|
|
||||||
|
gHintLabel = lv_label_create(screen);
|
||||||
|
lv_label_set_text(gHintLabel, "USB is normal now.\nTap Start to measure resistance between D- and D+.");
|
||||||
|
lv_obj_set_width(gHintLabel, 420);
|
||||||
|
lv_label_set_long_mode(gHintLabel, LV_LABEL_LONG_WRAP);
|
||||||
|
lv_obj_set_style_text_align(gHintLabel, LV_TEXT_ALIGN_CENTER, 0);
|
||||||
|
lv_obj_set_style_text_color(gHintLabel, lv_color_hex(0xAAB7C6), 0);
|
||||||
|
lv_obj_set_style_text_font(gHintLabel, &lv_font_montserrat_14, 0);
|
||||||
|
lv_obj_align(gHintLabel, LV_ALIGN_CENTER, 0, 72);
|
||||||
|
|
||||||
|
gActionButton = lv_btn_create(screen);
|
||||||
|
lv_obj_set_size(gActionButton, 260, 72);
|
||||||
|
lv_obj_align(gActionButton, LV_ALIGN_BOTTOM_MID, 0, -42);
|
||||||
|
lv_obj_set_style_radius(gActionButton, 18, 0);
|
||||||
|
lv_obj_set_style_bg_color(gActionButton, lv_color_hex(0x2A9D8F), 0);
|
||||||
|
lv_obj_set_style_border_width(gActionButton, 0, 0);
|
||||||
|
lv_obj_add_event_cb(gActionButton, actionButtonEventCb, LV_EVENT_CLICKED, nullptr);
|
||||||
|
|
||||||
|
gActionButtonLabel = lv_label_create(gActionButton);
|
||||||
|
lv_label_set_text(gActionButtonLabel, "Start");
|
||||||
|
lv_obj_set_style_text_color(gActionButtonLabel, lv_color_hex(0xFFFFFF), 0);
|
||||||
|
lv_obj_set_style_text_font(gActionButtonLabel, &lv_font_montserrat_22, 0);
|
||||||
|
lv_obj_center(gActionButtonLabel);
|
||||||
|
}
|
||||||
|
|
||||||
|
void setup() {
|
||||||
|
Serial.begin(115200);
|
||||||
|
|
||||||
|
Wire.begin(IIC_SDA, IIC_SCL);
|
||||||
|
|
||||||
|
pinMode(TP_RST, OUTPUT);
|
||||||
|
pinMode(TP_INT, INPUT);
|
||||||
|
digitalWrite(TP_RST, LOW);
|
||||||
|
delay(30);
|
||||||
|
digitalWrite(TP_RST, HIGH);
|
||||||
|
delay(50);
|
||||||
|
delay(1000);
|
||||||
|
|
||||||
|
gTouch.setPins(TP_RST, TP_INT);
|
||||||
|
bool touchOk = gTouch.begin(Wire, 0x5A, IIC_SDA, IIC_SCL);
|
||||||
|
if (!touchOk) {
|
||||||
|
Serial.println("Touch init failed");
|
||||||
|
} else {
|
||||||
|
gTouch.sleep();
|
||||||
|
gTouch.reset();
|
||||||
|
gTouch.setMaxCoordinates(480, 480);
|
||||||
|
gTouch.setSwapXY(true);
|
||||||
|
gTouch.setMirrorXY(true, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
gfx->begin();
|
||||||
|
gBus->writeC8D8(0x36, 0xA0);
|
||||||
|
gfx->setBrightness(220);
|
||||||
|
gfx->fillScreen(0x0000);
|
||||||
|
|
||||||
|
lv_init();
|
||||||
|
|
||||||
|
uint32_t screenWidth = gfx->width();
|
||||||
|
uint32_t screenHeight = gfx->height();
|
||||||
|
gBuf1 = (lv_color_t *)heap_caps_malloc(screenWidth * screenHeight / 4 * sizeof(lv_color_t), MALLOC_CAP_DMA);
|
||||||
|
gBuf2 = (lv_color_t *)heap_caps_malloc(screenWidth * screenHeight / 4 * sizeof(lv_color_t), MALLOC_CAP_DMA);
|
||||||
|
lv_disp_draw_buf_init(&gDrawBuf, gBuf1, gBuf2, screenWidth * screenHeight / 4);
|
||||||
|
|
||||||
|
static lv_disp_drv_t dispDrv;
|
||||||
|
lv_disp_drv_init(&dispDrv);
|
||||||
|
dispDrv.hor_res = screenWidth;
|
||||||
|
dispDrv.ver_res = screenHeight;
|
||||||
|
dispDrv.flush_cb = lvglFlushCb;
|
||||||
|
dispDrv.draw_buf = &gDrawBuf;
|
||||||
|
lv_disp_drv_register(&dispDrv);
|
||||||
|
|
||||||
|
static lv_indev_drv_t indevDrv;
|
||||||
|
lv_indev_drv_init(&indevDrv);
|
||||||
|
indevDrv.type = LV_INDEV_TYPE_POINTER;
|
||||||
|
indevDrv.read_cb = lvglTouchRead;
|
||||||
|
lv_indev_drv_register(&indevDrv);
|
||||||
|
|
||||||
|
const esp_timer_create_args_t lvglTickTimerArgs = {
|
||||||
|
.callback = &lvglTick,
|
||||||
|
.name = "lvgl_tick"};
|
||||||
|
esp_timer_handle_t lvglTickTimer = nullptr;
|
||||||
|
esp_timer_create(&lvglTickTimerArgs, &lvglTickTimer);
|
||||||
|
esp_timer_start_periodic(lvglTickTimer, EXAMPLE_LVGL_TICK_PERIOD_MS * 1000);
|
||||||
|
|
||||||
|
createUi();
|
||||||
|
Serial.println("USB resistance test ready; native USB remains active until Start is tapped.");
|
||||||
|
}
|
||||||
|
|
||||||
|
void loop() {
|
||||||
|
updateResistanceUi();
|
||||||
|
lv_timer_handler();
|
||||||
|
delay(5);
|
||||||
|
}
|
||||||
+600
@@ -0,0 +1,600 @@
|
|||||||
|
#include <Arduino.h>
|
||||||
|
#include <Wire.h>
|
||||||
|
#include <math.h>
|
||||||
|
#include <Preferences.h>
|
||||||
|
#include <Arduino_GFX_Library.h>
|
||||||
|
#include <TouchDrvCSTXXX.hpp>
|
||||||
|
#include "ESP_I2S.h"
|
||||||
|
#include "es8311.h"
|
||||||
|
|
||||||
|
#define PIN_LCD_CS 12
|
||||||
|
#define PIN_LCD_SCLK 38
|
||||||
|
#define PIN_LCD_D0 4
|
||||||
|
#define PIN_LCD_D1 5
|
||||||
|
#define PIN_LCD_D2 6
|
||||||
|
#define PIN_LCD_D3 7
|
||||||
|
#define PIN_LCD_RST 2
|
||||||
|
#define PIN_I2C_SDA 15
|
||||||
|
#define PIN_I2C_SCL 14
|
||||||
|
#define PIN_TP_INT 11
|
||||||
|
#define PIN_USER_BTN 0
|
||||||
|
#define PIN_PA 46
|
||||||
|
#define PIN_I2S_BCLK 9
|
||||||
|
#define PIN_I2S_LRCK 45
|
||||||
|
#define PIN_I2S_DOUT 8
|
||||||
|
#define PIN_I2S_DIN 10
|
||||||
|
#define PIN_I2S_MCLK 42
|
||||||
|
|
||||||
|
#define DISP_W 480
|
||||||
|
#define DISP_H 480
|
||||||
|
|
||||||
|
static constexpr int kUsbDmPin = 19;
|
||||||
|
static constexpr int kUsbDpPin = 20;
|
||||||
|
static constexpr uint32_t kContactDebounceMs = 80;
|
||||||
|
static constexpr uint32_t kButtonDebounceMs = 45;
|
||||||
|
static constexpr uint32_t kUiPeriodMs = 200;
|
||||||
|
static constexpr uint32_t kSampleRate = 16000;
|
||||||
|
static constexpr uint32_t kMinCycleMs = 1500;
|
||||||
|
static constexpr uint32_t kPauseAfterMs = 60000;
|
||||||
|
|
||||||
|
#define C_BG 0x0841u
|
||||||
|
#define C_PANEL 0x1082u
|
||||||
|
#define C_CARD 0x18C3u
|
||||||
|
#define C_BORDER 0x39C7u
|
||||||
|
#define C_TEXT 0xFFFFu
|
||||||
|
#define C_MUTE 0xBDF7u
|
||||||
|
#define C_ACCENT 0x5D5Fu
|
||||||
|
#define C_OK 0x3666u
|
||||||
|
#define C_BAD 0xD145u
|
||||||
|
#define C_BUTTON 0x2145u
|
||||||
|
|
||||||
|
Arduino_DataBus *gBus = new Arduino_ESP32QSPI(
|
||||||
|
PIN_LCD_CS, PIN_LCD_SCLK, PIN_LCD_D0, PIN_LCD_D1, PIN_LCD_D2, PIN_LCD_D3);
|
||||||
|
Arduino_CO5300 *gfx = new Arduino_CO5300(
|
||||||
|
gBus, PIN_LCD_RST, 0, DISP_W, DISP_H, 0, 0, 0, 0);
|
||||||
|
|
||||||
|
TouchDrvCST92xx gTouch;
|
||||||
|
I2SClass gI2s;
|
||||||
|
Preferences gPrefs;
|
||||||
|
|
||||||
|
struct Rect {
|
||||||
|
int16_t x;
|
||||||
|
int16_t y;
|
||||||
|
int16_t w;
|
||||||
|
int16_t h;
|
||||||
|
};
|
||||||
|
|
||||||
|
static const Rect kStartButton = {96, 348, 288, 78};
|
||||||
|
static const Rect kLimitSlider = {42, 132, 396, 44};
|
||||||
|
static const Rect kTickSlider = {42, 246, 396, 44};
|
||||||
|
static const Rect kAlertSlider = {42, 360, 396, 44};
|
||||||
|
static const uint16_t kLimitsSec[] = {5, 7, 10, 15, 20};
|
||||||
|
static const int16_t kTickAmpByVolume[] = {0, 40, 80, 140, 220, 320, 440, 580, 720, 800, 1600};
|
||||||
|
static const int16_t kAlertAmpByVolume[] = {0, 150, 300, 500, 800, 12000, 12000, 12000, 12000, 12000, 12000};
|
||||||
|
|
||||||
|
static bool gStarted = false;
|
||||||
|
static bool gSettingsOpen = false;
|
||||||
|
static bool gAudioReady = false;
|
||||||
|
static bool gStableClosed = false;
|
||||||
|
static bool gLastRawClosed = false;
|
||||||
|
static bool gStaticDrawn = false;
|
||||||
|
static bool gNeedRedraw = true;
|
||||||
|
static bool gNeedStaticRedraw = true;
|
||||||
|
static bool gLastDrawnClosed = false;
|
||||||
|
static bool gLastDrawnPaused = false;
|
||||||
|
static bool gTouchDown = false;
|
||||||
|
static bool gUserButtonDown = false;
|
||||||
|
static int16_t gTouchStartX = 0;
|
||||||
|
static int16_t gTouchStartY = 0;
|
||||||
|
static int16_t gTouchLastX = 0;
|
||||||
|
static int16_t gTouchLastY = 0;
|
||||||
|
static uint32_t gLastRawChangeMs = 0;
|
||||||
|
static uint32_t gStartedMs = 0;
|
||||||
|
static uint32_t gLastCycleStartMs = 0;
|
||||||
|
static uint32_t gLastUiMs = 0;
|
||||||
|
static uint32_t gUserButtonChangeMs = 0;
|
||||||
|
static uint32_t gCycleMs[5] = {};
|
||||||
|
static uint8_t gCycleCount = 0;
|
||||||
|
static uint8_t gCycleNext = 0;
|
||||||
|
static uint8_t gLimitIndex = 2;
|
||||||
|
static uint8_t gTickVolume = 3;
|
||||||
|
static uint8_t gAlertVolume = 10;
|
||||||
|
static uint8_t gShortStreak = 0;
|
||||||
|
static char gLastTopLine[48] = "";
|
||||||
|
static char gLastStreakLine[48] = "";
|
||||||
|
|
||||||
|
static void drawPanel(int x, int y, int w, int h, uint16_t fill, uint16_t border, int radius = 10) {
|
||||||
|
gfx->fillRoundRect(x, y, w, h, radius, fill);
|
||||||
|
gfx->drawRoundRect(x, y, w, h, radius, border);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void drawText(int x, int y, const char *text, uint16_t color, uint8_t size = 2) {
|
||||||
|
gfx->setFont();
|
||||||
|
gfx->setTextSize(size);
|
||||||
|
gfx->setTextColor(color);
|
||||||
|
gfx->setCursor(x, y);
|
||||||
|
gfx->print(text);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void drawCenteredText(int x, int y, int w, const char *text, uint16_t color, uint8_t size = 2) {
|
||||||
|
int textW = strlen(text) * 6 * size;
|
||||||
|
int textX = x + (w - textW) / 2;
|
||||||
|
if (textX < x + 8) {
|
||||||
|
textX = x + 8;
|
||||||
|
}
|
||||||
|
drawText(textX, y, text, color, size);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void drawButton(const Rect &rect, const char *label, uint8_t size = 2) {
|
||||||
|
drawPanel(rect.x, rect.y, rect.w, rect.h, C_BUTTON, C_BORDER, 12);
|
||||||
|
drawCenteredText(rect.x, rect.y + 18, rect.w, label, C_TEXT, size);
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool contains(const Rect &rect, int16_t x, int16_t y) {
|
||||||
|
return x >= rect.x && x < rect.x + rect.w && y >= rect.y && y < rect.y + rect.h;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void clearArea(int x, int y, int w, int h, uint16_t fill) {
|
||||||
|
gfx->fillRect(x, y, w, h, fill);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void formatSec(char *out, size_t outSize, uint32_t ms) {
|
||||||
|
snprintf(out, outSize, "%lu.%01lus", (unsigned long)(ms / 1000), (unsigned long)((ms % 1000) / 100));
|
||||||
|
}
|
||||||
|
|
||||||
|
static void formatClock(char *out, size_t outSize, uint32_t ms) {
|
||||||
|
uint32_t sec = ms / 1000;
|
||||||
|
snprintf(out, outSize, "%02lu:%02lu", (unsigned long)(sec / 60), (unsigned long)(sec % 60));
|
||||||
|
}
|
||||||
|
|
||||||
|
static uint32_t averageCycleMs() {
|
||||||
|
if (gCycleCount == 0) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
uint32_t sum = 0;
|
||||||
|
for (uint8_t i = 0; i < gCycleCount; i++) {
|
||||||
|
sum += gCycleMs[i];
|
||||||
|
}
|
||||||
|
return sum / gCycleCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void resetCachedUiText() {
|
||||||
|
gLastTopLine[0] = '\0';
|
||||||
|
gLastStreakLine[0] = '\0';
|
||||||
|
}
|
||||||
|
|
||||||
|
static void loadSettings() {
|
||||||
|
gPrefs.begin("breath-mon", false);
|
||||||
|
gLimitIndex = gPrefs.getUChar("limit", gLimitIndex);
|
||||||
|
gTickVolume = gPrefs.getUChar("tick", gTickVolume);
|
||||||
|
gAlertVolume = gPrefs.getUChar("alert", gAlertVolume);
|
||||||
|
if (gLimitIndex > 4) {
|
||||||
|
gLimitIndex = 2;
|
||||||
|
}
|
||||||
|
if (gTickVolume > 10) {
|
||||||
|
gTickVolume = 3;
|
||||||
|
}
|
||||||
|
if (gAlertVolume > 10) {
|
||||||
|
gAlertVolume = 10;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void saveSettings() {
|
||||||
|
gPrefs.putUChar("limit", gLimitIndex);
|
||||||
|
gPrefs.putUChar("tick", gTickVolume);
|
||||||
|
gPrefs.putUChar("alert", gAlertVolume);
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool isAutoPaused() {
|
||||||
|
return gStarted && gLastCycleStartMs != 0 && (millis() - gLastCycleStartMs) > kPauseAfterMs;
|
||||||
|
}
|
||||||
|
|
||||||
|
static esp_err_t codecInit() {
|
||||||
|
es8311_handle_t esHandle = es8311_create(0, ES8311_ADDRRES_0);
|
||||||
|
if (!esHandle) {
|
||||||
|
return ESP_FAIL;
|
||||||
|
}
|
||||||
|
const es8311_clock_config_t clk = {
|
||||||
|
.mclk_inverted = false,
|
||||||
|
.sclk_inverted = false,
|
||||||
|
.mclk_from_mclk_pin = true,
|
||||||
|
.mclk_frequency = (int)kSampleRate * 256,
|
||||||
|
.sample_frequency = (int)kSampleRate,
|
||||||
|
};
|
||||||
|
if (es8311_init(esHandle, &clk, ES8311_RESOLUTION_16, ES8311_RESOLUTION_16) != ESP_OK) {
|
||||||
|
return ESP_FAIL;
|
||||||
|
}
|
||||||
|
es8311_voice_volume_set(esHandle, 100, nullptr);
|
||||||
|
es8311_voice_mute(esHandle, false);
|
||||||
|
return ESP_OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void initAudio() {
|
||||||
|
pinMode(PIN_PA, OUTPUT);
|
||||||
|
digitalWrite(PIN_PA, HIGH);
|
||||||
|
gI2s.setPins(PIN_I2S_BCLK, PIN_I2S_LRCK, PIN_I2S_DOUT, PIN_I2S_DIN, PIN_I2S_MCLK);
|
||||||
|
if (!gI2s.begin(I2S_MODE_STD, kSampleRate, I2S_DATA_BIT_WIDTH_16BIT, I2S_SLOT_MODE_STEREO, I2S_STD_SLOT_BOTH)) {
|
||||||
|
Serial.println("I2S init failed");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
gAudioReady = (codecInit() == ESP_OK);
|
||||||
|
Serial.println(gAudioReady ? "Audio init OK" : "Audio codec init failed");
|
||||||
|
}
|
||||||
|
|
||||||
|
static void playBeep(uint16_t freq, uint16_t samples, int16_t amp) {
|
||||||
|
if (!gAudioReady || amp <= 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
static int16_t toneBuf[1600 * 2];
|
||||||
|
if (samples > 1600) {
|
||||||
|
samples = 1600;
|
||||||
|
}
|
||||||
|
for (int i = 0; i < samples; i++) {
|
||||||
|
float s = sinf(2.0f * 3.1415926f * (float)freq * ((float)i / (float)kSampleRate));
|
||||||
|
int16_t v = (int16_t)(s * amp);
|
||||||
|
toneBuf[i * 2] = v;
|
||||||
|
toneBuf[i * 2 + 1] = v;
|
||||||
|
}
|
||||||
|
gI2s.write((uint8_t *)toneBuf, samples * 2 * sizeof(int16_t));
|
||||||
|
}
|
||||||
|
|
||||||
|
static void playCycleTick() {
|
||||||
|
playBeep(880, 480, kTickAmpByVolume[gTickVolume]);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void playAlertBeep() {
|
||||||
|
playBeep(1200, 1600, kAlertAmpByVolume[gAlertVolume]);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void alertIfNeeded() {
|
||||||
|
if (gShortStreak == 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
uint8_t count = min<uint8_t>(gShortStreak, 5);
|
||||||
|
for (uint8_t i = 0; i < count; i++) {
|
||||||
|
playAlertBeep();
|
||||||
|
delay(80);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void addCycle(uint32_t cycleMs) {
|
||||||
|
gCycleMs[gCycleNext] = cycleMs;
|
||||||
|
gCycleNext = (gCycleNext + 1) % 5;
|
||||||
|
if (gCycleCount < 5) {
|
||||||
|
gCycleCount++;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32_t avgMs = averageCycleMs();
|
||||||
|
if (avgMs > 0 && avgMs < (uint32_t)kLimitsSec[gLimitIndex] * 1000UL) {
|
||||||
|
if (gShortStreak < 5) {
|
||||||
|
gShortStreak++;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
gShortStreak = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void drawReadyScreen() {
|
||||||
|
gfx->fillScreen(C_BG);
|
||||||
|
drawPanel(12, 12, 456, 456, C_PANEL, C_BORDER, 16);
|
||||||
|
drawText(28, 42, "BREATH MONITOR", C_TEXT, 3);
|
||||||
|
drawText(28, 78, "USB contact sensor", C_MUTE, 2);
|
||||||
|
drawPanel(34, 132, 412, 160, C_CARD, C_BORDER, 14);
|
||||||
|
drawCenteredText(34, 166, 412, "READY", C_ACCENT, 4);
|
||||||
|
drawCenteredText(34, 222, 412, "Closed = exhale", C_TEXT, 2);
|
||||||
|
drawCenteredText(34, 252, 412, "Open = inhale", C_MUTE, 2);
|
||||||
|
drawButton(kStartButton, "START", 3);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void drawSlider(const Rect &rect, const char *title, const char *value, uint8_t pos, uint8_t maxPos) {
|
||||||
|
drawText(rect.x, rect.y - 28, title, C_TEXT, 2);
|
||||||
|
drawText(rect.x + 278, rect.y - 28, value, C_ACCENT, 2);
|
||||||
|
drawPanel(rect.x, rect.y, rect.w, rect.h, C_BUTTON, C_BORDER, 12);
|
||||||
|
int trackX = rect.x + 22;
|
||||||
|
int trackW = rect.w - 44;
|
||||||
|
int trackY = rect.y + rect.h / 2 - 3;
|
||||||
|
gfx->fillRect(trackX, trackY, trackW, 6, C_BORDER);
|
||||||
|
int knobX = trackX + (trackW * pos) / max<uint8_t>(1, maxPos);
|
||||||
|
gfx->fillRoundRect(knobX - 10, rect.y + 8, 20, rect.h - 16, 8, C_ACCENT);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void drawSettingsScreen() {
|
||||||
|
char value[24];
|
||||||
|
gfx->fillScreen(C_BG);
|
||||||
|
drawPanel(12, 12, 456, 456, C_PANEL, C_BORDER, 16);
|
||||||
|
drawText(28, 36, "SETTINGS", C_TEXT, 3);
|
||||||
|
drawText(28, 72, "Press top button to close", C_MUTE, 2);
|
||||||
|
|
||||||
|
snprintf(value, sizeof(value), "%us", kLimitsSec[gLimitIndex]);
|
||||||
|
drawSlider(kLimitSlider, "Limit", value, gLimitIndex, 4);
|
||||||
|
snprintf(value, sizeof(value), "%u/10", gTickVolume);
|
||||||
|
drawSlider(kTickSlider, "Cycle tick volume", value, gTickVolume, 10);
|
||||||
|
snprintf(value, sizeof(value), "%u/10", gAlertVolume);
|
||||||
|
drawSlider(kAlertSlider, "Alert volume", value, gAlertVolume, 10);
|
||||||
|
|
||||||
|
gStaticDrawn = false;
|
||||||
|
gNeedStaticRedraw = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void drawMonitorStatic() {
|
||||||
|
gfx->fillScreen(C_BG);
|
||||||
|
drawPanel(12, 12, 456, 456, C_PANEL, C_BORDER, 16);
|
||||||
|
drawText(28, 32, "BREATH MONITOR", C_TEXT, 2);
|
||||||
|
drawPanel(28, 96, 424, 104, C_CARD, C_BORDER, 14);
|
||||||
|
drawPanel(28, 216, 200, 72, C_CARD, C_BORDER, 10);
|
||||||
|
drawText(42, 236, "Current", C_MUTE, 1);
|
||||||
|
drawPanel(252, 216, 200, 72, C_CARD, C_BORDER, 10);
|
||||||
|
drawText(266, 236, "Average 5", C_MUTE, 1);
|
||||||
|
drawPanel(28, 304, 200, 64, C_CARD, C_BORDER, 10);
|
||||||
|
drawText(42, 322, "From start", C_MUTE, 1);
|
||||||
|
drawPanel(252, 304, 200, 64, C_CARD, C_BORDER, 10);
|
||||||
|
drawText(266, 322, "Limit", C_MUTE, 1);
|
||||||
|
gStaticDrawn = true;
|
||||||
|
gLastDrawnClosed = !gStableClosed;
|
||||||
|
gLastDrawnPaused = !isAutoPaused();
|
||||||
|
resetCachedUiText();
|
||||||
|
}
|
||||||
|
|
||||||
|
static void updateMonitorValues(bool force) {
|
||||||
|
char line[48];
|
||||||
|
char value[16];
|
||||||
|
uint32_t now = millis();
|
||||||
|
uint32_t runMs = now - gStartedMs;
|
||||||
|
uint32_t currentMs = (gLastCycleStartMs == 0) ? 0 : now - gLastCycleStartMs;
|
||||||
|
bool paused = isAutoPaused();
|
||||||
|
if (paused) {
|
||||||
|
currentMs = now - gLastCycleStartMs - kPauseAfterMs;
|
||||||
|
}
|
||||||
|
uint32_t avgMs = averageCycleMs();
|
||||||
|
|
||||||
|
if (force || gLastDrawnClosed != gStableClosed || gLastDrawnPaused != paused) {
|
||||||
|
clearArea(42, 118, 396, 68, C_CARD);
|
||||||
|
if (paused) {
|
||||||
|
drawCenteredText(28, 122, 424, "PAUSE", C_BAD, 4);
|
||||||
|
drawCenteredText(28, 172, 424, "no cycle for 60s", C_MUTE, 2);
|
||||||
|
} else {
|
||||||
|
drawCenteredText(28, 122, 424, gStableClosed ? "EXHALE" : "INHALE",
|
||||||
|
gStableClosed ? C_OK : C_ACCENT, 4);
|
||||||
|
drawCenteredText(28, 172, 424, gStableClosed ? "contact closed" : "contact open", C_MUTE, 2);
|
||||||
|
}
|
||||||
|
gLastDrawnClosed = gStableClosed;
|
||||||
|
gLastDrawnPaused = paused;
|
||||||
|
}
|
||||||
|
|
||||||
|
snprintf(line, sizeof(line), "Limit: %us top button: settings", kLimitsSec[gLimitIndex]);
|
||||||
|
if (strcmp(line, gLastTopLine) != 0) {
|
||||||
|
clearArea(28, 58, 424, 28, C_PANEL);
|
||||||
|
drawText(28, 60, line, C_MUTE, 2);
|
||||||
|
strncpy(gLastTopLine, line, sizeof(gLastTopLine) - 1);
|
||||||
|
gLastTopLine[sizeof(gLastTopLine) - 1] = '\0';
|
||||||
|
}
|
||||||
|
|
||||||
|
clearArea(42, 254, 160, 28, C_CARD);
|
||||||
|
formatSec(value, sizeof(value), currentMs);
|
||||||
|
drawText(42, 256, value, C_TEXT, 3);
|
||||||
|
|
||||||
|
clearArea(266, 254, 160, 28, C_CARD);
|
||||||
|
if (avgMs > 0) {
|
||||||
|
formatSec(value, sizeof(value), avgMs);
|
||||||
|
} else {
|
||||||
|
snprintf(value, sizeof(value), "--");
|
||||||
|
}
|
||||||
|
drawText(266, 256, value, C_TEXT, 3);
|
||||||
|
|
||||||
|
clearArea(42, 340, 160, 24, C_CARD);
|
||||||
|
formatClock(value, sizeof(value), runMs);
|
||||||
|
drawText(42, 342, value, C_TEXT, 2);
|
||||||
|
|
||||||
|
clearArea(266, 340, 160, 24, C_CARD);
|
||||||
|
snprintf(value, sizeof(value), "%us", kLimitsSec[gLimitIndex]);
|
||||||
|
drawText(266, 342, value, C_TEXT, 2);
|
||||||
|
|
||||||
|
snprintf(line, sizeof(line), "Short avg streak: %u", gShortStreak);
|
||||||
|
if (strcmp(line, gLastStreakLine) != 0) {
|
||||||
|
clearArea(28, 398, 280, 28, C_PANEL);
|
||||||
|
drawText(32, 402, line, gShortStreak > 0 ? C_BAD : C_MUTE, 2);
|
||||||
|
strncpy(gLastStreakLine, line, sizeof(gLastStreakLine) - 1);
|
||||||
|
gLastStreakLine[sizeof(gLastStreakLine) - 1] = '\0';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void redrawScreen() {
|
||||||
|
if (gSettingsOpen) {
|
||||||
|
drawSettingsScreen();
|
||||||
|
} else if (gStarted) {
|
||||||
|
if (gNeedStaticRedraw || !gStaticDrawn) {
|
||||||
|
drawMonitorStatic();
|
||||||
|
gNeedStaticRedraw = false;
|
||||||
|
}
|
||||||
|
updateMonitorValues(true);
|
||||||
|
} else {
|
||||||
|
drawReadyScreen();
|
||||||
|
}
|
||||||
|
gNeedRedraw = false;
|
||||||
|
gLastUiMs = millis();
|
||||||
|
}
|
||||||
|
|
||||||
|
static void enterSensorMode() {
|
||||||
|
Serial.flush();
|
||||||
|
delay(30);
|
||||||
|
pinMode(kUsbDmPin, OUTPUT);
|
||||||
|
digitalWrite(kUsbDmPin, LOW);
|
||||||
|
pinMode(kUsbDpPin, INPUT_PULLUP);
|
||||||
|
|
||||||
|
uint32_t now = millis();
|
||||||
|
gStarted = true;
|
||||||
|
gStartedMs = now;
|
||||||
|
gLastCycleStartMs = 0;
|
||||||
|
gLastRawClosed = (digitalRead(kUsbDpPin) == LOW);
|
||||||
|
gStableClosed = gLastRawClosed;
|
||||||
|
gLastRawChangeMs = now;
|
||||||
|
if (gStableClosed) {
|
||||||
|
gLastCycleStartMs = now;
|
||||||
|
playCycleTick();
|
||||||
|
}
|
||||||
|
gNeedStaticRedraw = true;
|
||||||
|
gNeedRedraw = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void toggleSettings() {
|
||||||
|
gSettingsOpen = !gSettingsOpen;
|
||||||
|
gNeedStaticRedraw = true;
|
||||||
|
gNeedRedraw = true;
|
||||||
|
resetCachedUiText();
|
||||||
|
}
|
||||||
|
|
||||||
|
static void handleStableContact(bool closed) {
|
||||||
|
uint32_t now = millis();
|
||||||
|
gStableClosed = closed;
|
||||||
|
if (closed) {
|
||||||
|
if (gLastCycleStartMs != 0) {
|
||||||
|
uint32_t cycleMs = now - gLastCycleStartMs;
|
||||||
|
if (cycleMs >= kPauseAfterMs) {
|
||||||
|
gShortStreak = 0;
|
||||||
|
gLastCycleStartMs = now;
|
||||||
|
playCycleTick();
|
||||||
|
} else if (cycleMs >= kMinCycleMs) {
|
||||||
|
addCycle(cycleMs);
|
||||||
|
gLastCycleStartMs = now;
|
||||||
|
playCycleTick();
|
||||||
|
alertIfNeeded();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
gLastCycleStartMs = now;
|
||||||
|
playCycleTick();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
gNeedRedraw = !gSettingsOpen;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void pollContact() {
|
||||||
|
if (!gStarted) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
bool rawClosed = (digitalRead(kUsbDpPin) == LOW);
|
||||||
|
uint32_t now = millis();
|
||||||
|
if (rawClosed != gLastRawClosed) {
|
||||||
|
gLastRawClosed = rawClosed;
|
||||||
|
gLastRawChangeMs = now;
|
||||||
|
}
|
||||||
|
if ((now - gLastRawChangeMs) >= kContactDebounceMs && gStableClosed != gLastRawClosed) {
|
||||||
|
handleStableContact(gLastRawClosed);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void pollUserButton() {
|
||||||
|
bool down = digitalRead(PIN_USER_BTN) == LOW;
|
||||||
|
uint32_t now = millis();
|
||||||
|
if (down != gUserButtonDown && (now - gUserButtonChangeMs) >= kButtonDebounceMs) {
|
||||||
|
gUserButtonDown = down;
|
||||||
|
gUserButtonChangeMs = now;
|
||||||
|
if (down) {
|
||||||
|
toggleSettings();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static uint8_t sliderValueFromX(const Rect &rect, int16_t x, uint8_t maxValue) {
|
||||||
|
int16_t left = rect.x + 22;
|
||||||
|
int16_t right = rect.x + rect.w - 22;
|
||||||
|
if (x < left) x = left;
|
||||||
|
if (x > right) x = right;
|
||||||
|
return (uint8_t)(((uint32_t)(x - left) * maxValue + (right - left) / 2) / (right - left));
|
||||||
|
}
|
||||||
|
|
||||||
|
static void handleSettingsTouch(int16_t x, int16_t y) {
|
||||||
|
if (contains(kLimitSlider, x, y)) {
|
||||||
|
uint8_t next = sliderValueFromX(kLimitSlider, x, 4);
|
||||||
|
if (next == gLimitIndex) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
gLimitIndex = next;
|
||||||
|
} else if (contains(kTickSlider, x, y)) {
|
||||||
|
uint8_t next = sliderValueFromX(kTickSlider, x, 10);
|
||||||
|
if (next == gTickVolume) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
gTickVolume = next;
|
||||||
|
playCycleTick();
|
||||||
|
} else if (contains(kAlertSlider, x, y)) {
|
||||||
|
uint8_t next = sliderValueFromX(kAlertSlider, x, 10);
|
||||||
|
if (next == gAlertVolume) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
gAlertVolume = next;
|
||||||
|
playAlertBeep();
|
||||||
|
} else {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
saveSettings();
|
||||||
|
gNeedRedraw = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void pollTouch() {
|
||||||
|
int16_t x = 0;
|
||||||
|
int16_t y = 0;
|
||||||
|
bool touching = gTouch.getPoint(&x, &y, 1) > 0;
|
||||||
|
if (touching && !gTouchDown) {
|
||||||
|
gTouchDown = true;
|
||||||
|
gTouchStartX = x;
|
||||||
|
gTouchStartY = y;
|
||||||
|
gTouchLastX = x;
|
||||||
|
gTouchLastY = y;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (touching && gTouchDown) {
|
||||||
|
gTouchLastX = x;
|
||||||
|
gTouchLastY = y;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (!touching && gTouchDown) {
|
||||||
|
gTouchDown = false;
|
||||||
|
int dx = abs(gTouchLastX - gTouchStartX);
|
||||||
|
int dy = abs(gTouchLastY - gTouchStartY);
|
||||||
|
if (dx >= 14 || dy >= 14) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (gSettingsOpen) {
|
||||||
|
handleSettingsTouch(gTouchLastX, gTouchLastY);
|
||||||
|
} else if (!gStarted && contains(kStartButton, gTouchLastX, gTouchLastY)) {
|
||||||
|
enterSensorMode();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void setup() {
|
||||||
|
Serial.begin(115200);
|
||||||
|
Wire.begin(PIN_I2C_SDA, PIN_I2C_SCL);
|
||||||
|
pinMode(PIN_USER_BTN, INPUT_PULLUP);
|
||||||
|
loadSettings();
|
||||||
|
initAudio();
|
||||||
|
|
||||||
|
gfx->begin();
|
||||||
|
gBus->writeC8D8(0x36, 0xA0);
|
||||||
|
gfx->setBrightness(220);
|
||||||
|
gfx->fillScreen(C_BG);
|
||||||
|
|
||||||
|
gTouch.setPins(PIN_TP_INT, -1);
|
||||||
|
bool touchOk = gTouch.begin(Wire, CST92XX_SLAVE_ADDRESS, PIN_I2C_SDA, PIN_I2C_SCL);
|
||||||
|
gTouch.setMaxCoordinates(DISP_W, DISP_H);
|
||||||
|
gTouch.setSwapXY(true);
|
||||||
|
gTouch.setMirrorXY(true, false);
|
||||||
|
|
||||||
|
Serial.println("Breath monitor ready.");
|
||||||
|
Serial.println(touchOk ? "Touch init OK" : "Touch init failed");
|
||||||
|
gNeedRedraw = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void loop() {
|
||||||
|
pollUserButton();
|
||||||
|
pollTouch();
|
||||||
|
pollContact();
|
||||||
|
if (gStarted && !gSettingsOpen && millis() - gLastUiMs >= kUiPeriodMs) {
|
||||||
|
updateMonitorValues(false);
|
||||||
|
gLastUiMs = millis();
|
||||||
|
}
|
||||||
|
if (gNeedRedraw) {
|
||||||
|
redrawScreen();
|
||||||
|
}
|
||||||
|
delay(10);
|
||||||
|
}
|
||||||
+407
@@ -0,0 +1,407 @@
|
|||||||
|
#include <Arduino.h>
|
||||||
|
#include <Wire.h>
|
||||||
|
#include <lvgl.h>
|
||||||
|
#include <Arduino_GFX_Library.h>
|
||||||
|
#include "pin_config.h"
|
||||||
|
#include "TouchDrvCSTXXX.hpp"
|
||||||
|
|
||||||
|
#define EXAMPLE_LVGL_TICK_PERIOD_MS 2
|
||||||
|
|
||||||
|
// ESP32-S3 native USB data pins.
|
||||||
|
static constexpr int kUsbDmPin = 19; // USB D-
|
||||||
|
static constexpr int kUsbDpPin = 20; // USB D+
|
||||||
|
static constexpr int kUserButtonPin = 0; // BOOT/user button, active LOW.
|
||||||
|
static constexpr uint32_t kDebounceMs = 20;
|
||||||
|
static constexpr uint32_t kEnterDelayMs = 250;
|
||||||
|
static constexpr uint32_t kButtonDebounceMs = 35;
|
||||||
|
|
||||||
|
static lv_disp_draw_buf_t gDrawBuf;
|
||||||
|
static lv_color_t *gBuf1 = nullptr;
|
||||||
|
static lv_color_t *gBuf2 = nullptr;
|
||||||
|
|
||||||
|
static lv_obj_t *gRawLabel = nullptr;
|
||||||
|
static lv_obj_t *gEventLabel = nullptr;
|
||||||
|
static lv_obj_t *gModeLabel = nullptr;
|
||||||
|
static lv_obj_t *gStateLabel = nullptr;
|
||||||
|
static lv_obj_t *gActionButton = nullptr;
|
||||||
|
static lv_obj_t *gActionButtonLabel = nullptr;
|
||||||
|
static lv_obj_t *gMarker = nullptr;
|
||||||
|
|
||||||
|
static TouchDrvCST92xx gTouch;
|
||||||
|
static int16_t gTouchX[5];
|
||||||
|
static int16_t gTouchY[5];
|
||||||
|
|
||||||
|
static volatile bool gTouchPressed = false;
|
||||||
|
static volatile int16_t gLastTouchX = -1;
|
||||||
|
static volatile int16_t gLastTouchY = -1;
|
||||||
|
static volatile uint32_t gRawTouchCount = 0;
|
||||||
|
static uint32_t gButtonPressCount = 0;
|
||||||
|
static uint32_t gButtonClickCount = 0;
|
||||||
|
static bool gLastButtonRawPressed = false;
|
||||||
|
static bool gButtonStablePressed = false;
|
||||||
|
static uint32_t gLastButtonRawChangeMs = 0;
|
||||||
|
|
||||||
|
static bool gSensorMode = false;
|
||||||
|
static bool gEnterPending = false;
|
||||||
|
static uint32_t gEnterAtMs = 0;
|
||||||
|
static bool gStableClosed = false;
|
||||||
|
static bool gLastRawClosed = false;
|
||||||
|
static uint32_t gLastRawChangeMs = 0;
|
||||||
|
static uint32_t gLastUiRefreshMs = 0;
|
||||||
|
|
||||||
|
Arduino_DataBus *gBus = new Arduino_ESP32QSPI(
|
||||||
|
LCD_CS, LCD_SCLK, LCD_SDIO0, LCD_SDIO1, LCD_SDIO2, LCD_SDIO3);
|
||||||
|
Arduino_CO5300 *gfx = new Arduino_CO5300(
|
||||||
|
gBus, LCD_RESET, 0, LCD_WIDTH, LCD_HEIGHT, 0, 0, 0, 0);
|
||||||
|
|
||||||
|
static void lvglFlushCb(lv_disp_drv_t *disp, const lv_area_t *area, lv_color_t *colorP) {
|
||||||
|
uint32_t w = area->x2 - area->x1 + 1;
|
||||||
|
uint32_t h = area->y2 - area->y1 + 1;
|
||||||
|
#if (LV_COLOR_16_SWAP != 0)
|
||||||
|
gfx->draw16bitBeRGBBitmap(area->x1, area->y1, (uint16_t *)&colorP->full, w, h);
|
||||||
|
#else
|
||||||
|
gfx->draw16bitRGBBitmap(area->x1, area->y1, (uint16_t *)&colorP->full, w, h);
|
||||||
|
#endif
|
||||||
|
lv_disp_flush_ready(disp);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void lvglTick(void *arg) {
|
||||||
|
LV_UNUSED(arg);
|
||||||
|
lv_tick_inc(EXAMPLE_LVGL_TICK_PERIOD_MS);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void lvglTouchRead(lv_indev_drv_t *indevDrv, lv_indev_data_t *data) {
|
||||||
|
LV_UNUSED(indevDrv);
|
||||||
|
uint8_t touched = gTouch.getPoint(gTouchX, gTouchY, gTouch.getSupportTouchPoint());
|
||||||
|
|
||||||
|
if (touched > 0) {
|
||||||
|
gTouchPressed = true;
|
||||||
|
gLastTouchX = gTouchX[0];
|
||||||
|
gLastTouchY = gTouchY[0];
|
||||||
|
gRawTouchCount++;
|
||||||
|
|
||||||
|
data->state = LV_INDEV_STATE_PR;
|
||||||
|
data->point.x = gTouchX[0];
|
||||||
|
data->point.y = gTouchY[0];
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
gTouchPressed = false;
|
||||||
|
data->state = LV_INDEV_STATE_REL;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void setStateUi(bool closed) {
|
||||||
|
if (closed) {
|
||||||
|
lv_label_set_text(gStateLabel, "CLOSED");
|
||||||
|
lv_obj_set_style_text_color(gStateLabel, lv_color_hex(0x6DFF8B), 0);
|
||||||
|
} else {
|
||||||
|
lv_label_set_text(gStateLabel, "OPEN");
|
||||||
|
lv_obj_set_style_text_color(gStateLabel, lv_color_hex(0xFFD166), 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void updateTouchDiagnostics() {
|
||||||
|
uint32_t now = millis();
|
||||||
|
if (now - gLastUiRefreshMs < 40) return;
|
||||||
|
gLastUiRefreshMs = now;
|
||||||
|
|
||||||
|
String raw = gTouchPressed ? "RAW: PRESSED" : "RAW: released";
|
||||||
|
raw += "\nx=" + String((int)gLastTouchX) + " y=" + String((int)gLastTouchY);
|
||||||
|
raw += " n=" + String((uint32_t)gRawTouchCount);
|
||||||
|
lv_label_set_text(gRawLabel, raw.c_str());
|
||||||
|
|
||||||
|
if (gTouchPressed && gLastTouchX >= 0 && gLastTouchY >= 0) {
|
||||||
|
int markerX = gLastTouchX - 8;
|
||||||
|
int markerY = gLastTouchY - 8;
|
||||||
|
if (markerX < 0) markerX = 0;
|
||||||
|
if (markerY < 0) markerY = 0;
|
||||||
|
lv_obj_set_pos(gMarker, markerX, markerY);
|
||||||
|
lv_obj_clear_flag(gMarker, LV_OBJ_FLAG_HIDDEN);
|
||||||
|
} else {
|
||||||
|
lv_obj_add_flag(gMarker, LV_OBJ_FLAG_HIDDEN);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void actuallyEnterSensorMode() {
|
||||||
|
gEnterPending = false;
|
||||||
|
|
||||||
|
// Make the visual transition happen BEFORE the USB data pins are repurposed.
|
||||||
|
lv_label_set_text(gModeLabel, "SENSOR MODE");
|
||||||
|
lv_label_set_text(gActionButtonLabel, "Restart to USB");
|
||||||
|
lv_obj_set_style_bg_color(gActionButton, lv_color_hex(0xA33D4F), LV_PART_MAIN | LV_STATE_DEFAULT);
|
||||||
|
lv_obj_set_style_bg_color(gActionButton, lv_color_hex(0xC94F65), LV_PART_MAIN | LV_STATE_PRESSED);
|
||||||
|
lv_label_set_text(gEventLabel, "GPIO19=D- LOW GPIO20=D+ INPUT_PULLUP");
|
||||||
|
lv_label_set_text(gStateLabel, "SWITCHING...");
|
||||||
|
lv_obj_set_style_text_color(gStateLabel, lv_color_hex(0x72D6FF), 0);
|
||||||
|
lv_refr_now(nullptr);
|
||||||
|
delay(60);
|
||||||
|
|
||||||
|
// Intentionally repurpose only USB D-/D+. These are not LCD or touch pins.
|
||||||
|
// Do NOT call Serial.flush() here: USB CDC may already be disappearing.
|
||||||
|
pinMode(kUsbDmPin, OUTPUT);
|
||||||
|
digitalWrite(kUsbDmPin, LOW);
|
||||||
|
pinMode(kUsbDpPin, INPUT_PULLUP);
|
||||||
|
|
||||||
|
gSensorMode = true;
|
||||||
|
gLastRawClosed = (digitalRead(kUsbDpPin) == LOW);
|
||||||
|
gStableClosed = gLastRawClosed;
|
||||||
|
gLastRawChangeMs = millis();
|
||||||
|
setStateUi(gStableClosed);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void actionButtonEventCb(lv_event_t *event) {
|
||||||
|
lv_event_code_t code = lv_event_get_code(event);
|
||||||
|
|
||||||
|
if (code == LV_EVENT_PRESSED) {
|
||||||
|
gButtonPressCount++;
|
||||||
|
String text = "BUTTON PRESSED #" + String(gButtonPressCount);
|
||||||
|
lv_label_set_text(gEventLabel, text.c_str());
|
||||||
|
|
||||||
|
if (!gSensorMode && !gEnterPending) {
|
||||||
|
lv_label_set_text(gActionButtonLabel, "Starting...");
|
||||||
|
lv_label_set_text(gStateLabel, "TOUCH OK");
|
||||||
|
lv_obj_set_style_text_color(gStateLabel, lv_color_hex(0x7CFF8A), 0);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (code != LV_EVENT_CLICKED) return;
|
||||||
|
|
||||||
|
gButtonClickCount++;
|
||||||
|
|
||||||
|
if (!gSensorMode) {
|
||||||
|
lv_label_set_text(gModeLabel, "USB MODE");
|
||||||
|
lv_label_set_text(gActionButtonLabel, "TOUCH OK");
|
||||||
|
lv_label_set_text(gStateLabel, "PRESS BOOT");
|
||||||
|
lv_obj_set_style_text_color(gStateLabel, lv_color_hex(0xFFD166), 0);
|
||||||
|
String text = "TOUCH CLICK OK #" + String(gButtonClickCount) + " use BOOT button";
|
||||||
|
lv_label_set_text(gEventLabel, text.c_str());
|
||||||
|
lv_refr_now(nullptr);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
lv_label_set_text(gModeLabel, "RESTARTING TO USB...");
|
||||||
|
lv_label_set_text(gActionButtonLabel, "Restarting...");
|
||||||
|
lv_label_set_text(gStateLabel, "USB NEXT BOOT");
|
||||||
|
lv_refr_now(nullptr);
|
||||||
|
delay(180);
|
||||||
|
ESP.restart();
|
||||||
|
}
|
||||||
|
|
||||||
|
static void requestEnterSensorMode(const char *source) {
|
||||||
|
if (gSensorMode || gEnterPending) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
gEnterPending = true;
|
||||||
|
gEnterAtMs = millis() + kEnterDelayMs;
|
||||||
|
lv_label_set_text(gModeLabel, "START RECEIVED");
|
||||||
|
lv_label_set_text(gActionButtonLabel, "Starting sensor...");
|
||||||
|
String text = String(source) + " OK waiting 250 ms";
|
||||||
|
lv_label_set_text(gEventLabel, text.c_str());
|
||||||
|
lv_label_set_text(gStateLabel, "STARTING...");
|
||||||
|
lv_obj_set_style_text_color(gStateLabel, lv_color_hex(0x7CFF8A), 0);
|
||||||
|
lv_refr_now(nullptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void pollUserButton() {
|
||||||
|
bool rawPressed = (digitalRead(kUserButtonPin) == LOW);
|
||||||
|
uint32_t now = millis();
|
||||||
|
|
||||||
|
if (rawPressed != gLastButtonRawPressed) {
|
||||||
|
gLastButtonRawPressed = rawPressed;
|
||||||
|
gLastButtonRawChangeMs = now;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((now - gLastButtonRawChangeMs) < kButtonDebounceMs || rawPressed == gButtonStablePressed) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
gButtonStablePressed = rawPressed;
|
||||||
|
if (!gButtonStablePressed) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
gButtonClickCount++;
|
||||||
|
if (!gSensorMode) {
|
||||||
|
requestEnterSensorMode("BOOT BUTTON");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
lv_label_set_text(gModeLabel, "RESTARTING TO USB...");
|
||||||
|
lv_label_set_text(gActionButtonLabel, "Restarting...");
|
||||||
|
lv_label_set_text(gStateLabel, "USB NEXT BOOT");
|
||||||
|
lv_refr_now(nullptr);
|
||||||
|
delay(180);
|
||||||
|
ESP.restart();
|
||||||
|
}
|
||||||
|
|
||||||
|
static void createUi() {
|
||||||
|
lv_obj_t *screen = lv_scr_act();
|
||||||
|
lv_obj_set_style_bg_color(screen, lv_color_hex(0x000000), 0);
|
||||||
|
lv_obj_set_style_bg_opa(screen, LV_OPA_COVER, 0);
|
||||||
|
|
||||||
|
lv_obj_t *title = lv_label_create(screen);
|
||||||
|
lv_label_set_text(title, "USB CONTACT DEBUG");
|
||||||
|
lv_obj_set_style_text_font(title, &lv_font_montserrat_22, 0);
|
||||||
|
lv_obj_set_style_text_color(title, lv_color_hex(0xFFFFFF), 0);
|
||||||
|
lv_obj_align(title, LV_ALIGN_TOP_MID, 0, 10);
|
||||||
|
|
||||||
|
gRawLabel = lv_label_create(screen);
|
||||||
|
lv_label_set_text(gRawLabel, "RAW: released\nx=-1 y=-1 n=0");
|
||||||
|
lv_obj_set_style_text_font(gRawLabel, &lv_font_montserrat_16, 0);
|
||||||
|
lv_obj_set_style_text_color(gRawLabel, lv_color_hex(0x9EE493), 0);
|
||||||
|
lv_obj_align(gRawLabel, LV_ALIGN_TOP_LEFT, 14, 48);
|
||||||
|
|
||||||
|
gModeLabel = lv_label_create(screen);
|
||||||
|
lv_label_set_text(gModeLabel, "USB MODE");
|
||||||
|
lv_obj_set_style_text_font(gModeLabel, &lv_font_montserrat_18, 0);
|
||||||
|
lv_obj_set_style_text_color(gModeLabel, lv_color_hex(0x72D6FF), 0);
|
||||||
|
lv_obj_align(gModeLabel, LV_ALIGN_TOP_RIGHT, -14, 50);
|
||||||
|
|
||||||
|
gEventLabel = lv_label_create(screen);
|
||||||
|
lv_label_set_text(gEventLabel, "Button events: waiting");
|
||||||
|
lv_obj_set_width(gEventLabel, 440);
|
||||||
|
lv_label_set_long_mode(gEventLabel, LV_LABEL_LONG_WRAP);
|
||||||
|
lv_obj_set_style_text_align(gEventLabel, LV_TEXT_ALIGN_CENTER, 0);
|
||||||
|
lv_obj_set_style_text_font(gEventLabel, &lv_font_montserrat_16, 0);
|
||||||
|
lv_obj_set_style_text_color(gEventLabel, lv_color_hex(0xFFD166), 0);
|
||||||
|
lv_obj_align(gEventLabel, LV_ALIGN_TOP_MID, 0, 102);
|
||||||
|
|
||||||
|
gStateLabel = lv_label_create(screen);
|
||||||
|
lv_label_set_text(gStateLabel, "READY");
|
||||||
|
lv_obj_set_style_text_font(gStateLabel, &lv_font_montserrat_40, 0);
|
||||||
|
lv_obj_set_style_text_color(gStateLabel, lv_color_hex(0x72D6FF), 0);
|
||||||
|
lv_obj_align(gStateLabel, LV_ALIGN_CENTER, 0, -52);
|
||||||
|
|
||||||
|
// Put the button in almost the same position/size as the known-working touch debug sketch.
|
||||||
|
gActionButton = lv_btn_create(screen);
|
||||||
|
lv_obj_set_size(gActionButton, 360, 110);
|
||||||
|
lv_obj_align(gActionButton, LV_ALIGN_CENTER, 0, 52);
|
||||||
|
lv_obj_set_style_radius(gActionButton, 18, 0);
|
||||||
|
lv_obj_set_style_bg_color(gActionButton, lv_color_hex(0x2A9D8F), LV_PART_MAIN | LV_STATE_DEFAULT);
|
||||||
|
lv_obj_set_style_bg_color(gActionButton, lv_color_hex(0x47C7B6), LV_PART_MAIN | LV_STATE_PRESSED);
|
||||||
|
lv_obj_set_style_border_width(gActionButton, 3, 0);
|
||||||
|
lv_obj_set_style_border_color(gActionButton, lv_color_hex(0xBDE0FE), 0);
|
||||||
|
lv_obj_add_event_cb(gActionButton, actionButtonEventCb, LV_EVENT_ALL, nullptr);
|
||||||
|
|
||||||
|
gActionButtonLabel = lv_label_create(gActionButton);
|
||||||
|
lv_label_set_text(gActionButtonLabel, "START");
|
||||||
|
lv_obj_set_style_text_font(gActionButtonLabel, &lv_font_montserrat_28, 0);
|
||||||
|
lv_obj_set_style_text_color(gActionButtonLabel, lv_color_hex(0xFFFFFF), 0);
|
||||||
|
lv_obj_center(gActionButtonLabel);
|
||||||
|
|
||||||
|
lv_obj_t *hint = lv_label_create(screen);
|
||||||
|
lv_label_set_text(hint, "Press BOOT button to START. Touch button only checks touch UI.");
|
||||||
|
lv_obj_set_width(hint, 440);
|
||||||
|
lv_label_set_long_mode(hint, LV_LABEL_LONG_WRAP);
|
||||||
|
lv_obj_set_style_text_align(hint, LV_TEXT_ALIGN_CENTER, 0);
|
||||||
|
lv_obj_set_style_text_font(hint, &lv_font_montserrat_14, 0);
|
||||||
|
lv_obj_set_style_text_color(hint, lv_color_hex(0xD9D9D9), 0);
|
||||||
|
lv_obj_align(hint, LV_ALIGN_BOTTOM_MID, 0, -18);
|
||||||
|
|
||||||
|
gMarker = lv_obj_create(screen);
|
||||||
|
lv_obj_set_size(gMarker, 16, 16);
|
||||||
|
lv_obj_set_style_radius(gMarker, LV_RADIUS_CIRCLE, 0);
|
||||||
|
lv_obj_set_style_bg_color(gMarker, lv_color_hex(0xFF4D6D), 0);
|
||||||
|
lv_obj_set_style_border_width(gMarker, 2, 0);
|
||||||
|
lv_obj_set_style_border_color(gMarker, lv_color_hex(0xFFFFFF), 0);
|
||||||
|
lv_obj_add_flag(gMarker, LV_OBJ_FLAG_HIDDEN);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void pollContact() {
|
||||||
|
if (!gSensorMode) return;
|
||||||
|
|
||||||
|
bool rawClosed = (digitalRead(kUsbDpPin) == LOW);
|
||||||
|
uint32_t now = millis();
|
||||||
|
|
||||||
|
if (rawClosed != gLastRawClosed) {
|
||||||
|
gLastRawClosed = rawClosed;
|
||||||
|
gLastRawChangeMs = now;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((now - gLastRawChangeMs) >= kDebounceMs && gStableClosed != gLastRawClosed) {
|
||||||
|
gStableClosed = gLastRawClosed;
|
||||||
|
setStateUi(gStableClosed);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void setup() {
|
||||||
|
Serial.begin(115200);
|
||||||
|
|
||||||
|
pinMode(kUserButtonPin, INPUT_PULLUP);
|
||||||
|
|
||||||
|
Wire.begin(IIC_SDA, IIC_SCL);
|
||||||
|
|
||||||
|
pinMode(TP_RST, OUTPUT);
|
||||||
|
pinMode(TP_INT, INPUT);
|
||||||
|
digitalWrite(TP_RST, LOW);
|
||||||
|
delay(30);
|
||||||
|
digitalWrite(TP_RST, HIGH);
|
||||||
|
delay(50);
|
||||||
|
delay(1000);
|
||||||
|
|
||||||
|
gTouch.setPins(TP_RST, TP_INT);
|
||||||
|
bool touchOk = gTouch.begin(Wire, 0x5A, IIC_SDA, IIC_SCL);
|
||||||
|
if (!touchOk) {
|
||||||
|
Serial.println("Touch init failed");
|
||||||
|
} else {
|
||||||
|
Serial.print("Touch model: ");
|
||||||
|
Serial.println(gTouch.getModelName());
|
||||||
|
gTouch.sleep();
|
||||||
|
gTouch.reset();
|
||||||
|
gTouch.setMaxCoordinates(480, 480);
|
||||||
|
gTouch.setSwapXY(true);
|
||||||
|
gTouch.setMirrorXY(true, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
gfx->begin();
|
||||||
|
gBus->writeC8D8(0x36, 0xA0);
|
||||||
|
gfx->setBrightness(220);
|
||||||
|
gfx->fillScreen(0x0000);
|
||||||
|
|
||||||
|
lv_init();
|
||||||
|
|
||||||
|
uint32_t screenWidth = gfx->width();
|
||||||
|
uint32_t screenHeight = gfx->height();
|
||||||
|
gBuf1 = (lv_color_t *)heap_caps_malloc(screenWidth * screenHeight / 4 * sizeof(lv_color_t), MALLOC_CAP_DMA);
|
||||||
|
gBuf2 = (lv_color_t *)heap_caps_malloc(screenWidth * screenHeight / 4 * sizeof(lv_color_t), MALLOC_CAP_DMA);
|
||||||
|
lv_disp_draw_buf_init(&gDrawBuf, gBuf1, gBuf2, screenWidth * screenHeight / 4);
|
||||||
|
|
||||||
|
static lv_disp_drv_t dispDrv;
|
||||||
|
lv_disp_drv_init(&dispDrv);
|
||||||
|
dispDrv.hor_res = screenWidth;
|
||||||
|
dispDrv.ver_res = screenHeight;
|
||||||
|
dispDrv.flush_cb = lvglFlushCb;
|
||||||
|
dispDrv.draw_buf = &gDrawBuf;
|
||||||
|
lv_disp_drv_register(&dispDrv);
|
||||||
|
|
||||||
|
static lv_indev_drv_t indevDrv;
|
||||||
|
lv_indev_drv_init(&indevDrv);
|
||||||
|
indevDrv.type = LV_INDEV_TYPE_POINTER;
|
||||||
|
indevDrv.read_cb = lvglTouchRead;
|
||||||
|
lv_indev_drv_register(&indevDrv);
|
||||||
|
|
||||||
|
const esp_timer_create_args_t lvglTickTimerArgs = {
|
||||||
|
.callback = &lvglTick,
|
||||||
|
.name = "lvgl_tick"};
|
||||||
|
esp_timer_handle_t lvglTickTimer = nullptr;
|
||||||
|
esp_timer_create(&lvglTickTimerArgs, &lvglTickTimer);
|
||||||
|
esp_timer_start_periodic(lvglTickTimer, EXAMPLE_LVGL_TICK_PERIOD_MS * 1000);
|
||||||
|
|
||||||
|
createUi();
|
||||||
|
Serial.println("USB contact sensor DEBUG ready. USB pins remain untouched until START click.");
|
||||||
|
}
|
||||||
|
|
||||||
|
void loop() {
|
||||||
|
updateTouchDiagnostics();
|
||||||
|
pollUserButton();
|
||||||
|
pollContact();
|
||||||
|
|
||||||
|
if (gEnterPending && (int32_t)(millis() - gEnterAtMs) >= 0) {
|
||||||
|
actuallyEnterSensorMode();
|
||||||
|
}
|
||||||
|
|
||||||
|
lv_timer_handler();
|
||||||
|
delay(5);
|
||||||
|
}
|
||||||
+250
@@ -0,0 +1,250 @@
|
|||||||
|
#include <Arduino.h>
|
||||||
|
#include <Wire.h>
|
||||||
|
#include <lvgl.h>
|
||||||
|
#include <Arduino_GFX_Library.h>
|
||||||
|
#include "pin_config.h"
|
||||||
|
#include "TouchDrvCSTXXX.hpp"
|
||||||
|
|
||||||
|
#define EXAMPLE_LVGL_TICK_PERIOD_MS 2
|
||||||
|
|
||||||
|
// ESP32-S3 native USB pins.
|
||||||
|
static constexpr int kUsbDmPin = 19; // USB D-
|
||||||
|
static constexpr int kUsbDpPin = 20; // USB D+
|
||||||
|
static constexpr uint32_t kDebounceMs = 20;
|
||||||
|
|
||||||
|
static lv_disp_draw_buf_t gDrawBuf;
|
||||||
|
static lv_color_t *gBuf1 = nullptr;
|
||||||
|
static lv_color_t *gBuf2 = nullptr;
|
||||||
|
static lv_obj_t *gModeLabel = nullptr;
|
||||||
|
static lv_obj_t *gStateLabel = nullptr;
|
||||||
|
static lv_obj_t *gHintLabel = nullptr;
|
||||||
|
static lv_obj_t *gActionButton = nullptr;
|
||||||
|
static lv_obj_t *gActionButtonLabel = nullptr;
|
||||||
|
|
||||||
|
static TouchDrvCST92xx gTouch;
|
||||||
|
static int16_t gTouchX[5];
|
||||||
|
static int16_t gTouchY[5];
|
||||||
|
|
||||||
|
static bool gSensorMode = false;
|
||||||
|
static bool gStableClosed = false;
|
||||||
|
static bool gLastRawClosed = false;
|
||||||
|
static uint32_t gLastRawChangeMs = 0;
|
||||||
|
|
||||||
|
Arduino_DataBus *gBus = new Arduino_ESP32QSPI(
|
||||||
|
LCD_CS, LCD_SCLK, LCD_SDIO0, LCD_SDIO1, LCD_SDIO2, LCD_SDIO3);
|
||||||
|
Arduino_CO5300 *gfx = new Arduino_CO5300(
|
||||||
|
gBus, LCD_RESET, 0, LCD_WIDTH, LCD_HEIGHT, 0, 0, 0, 0);
|
||||||
|
|
||||||
|
static void lvglFlushCb(lv_disp_drv_t *disp, const lv_area_t *area, lv_color_t *colorP) {
|
||||||
|
uint32_t w = area->x2 - area->x1 + 1;
|
||||||
|
uint32_t h = area->y2 - area->y1 + 1;
|
||||||
|
#if (LV_COLOR_16_SWAP != 0)
|
||||||
|
gfx->draw16bitBeRGBBitmap(area->x1, area->y1, (uint16_t *)&colorP->full, w, h);
|
||||||
|
#else
|
||||||
|
gfx->draw16bitRGBBitmap(area->x1, area->y1, (uint16_t *)&colorP->full, w, h);
|
||||||
|
#endif
|
||||||
|
lv_disp_flush_ready(disp);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void lvglTick(void *arg) {
|
||||||
|
LV_UNUSED(arg);
|
||||||
|
lv_tick_inc(EXAMPLE_LVGL_TICK_PERIOD_MS);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void lvglTouchRead(lv_indev_drv_t *indevDrv, lv_indev_data_t *data) {
|
||||||
|
LV_UNUSED(indevDrv);
|
||||||
|
uint8_t touched = gTouch.getPoint(gTouchX, gTouchY, gTouch.getSupportTouchPoint());
|
||||||
|
if (touched > 0) {
|
||||||
|
data->state = LV_INDEV_STATE_PR;
|
||||||
|
data->point.x = gTouchX[0];
|
||||||
|
data->point.y = gTouchY[0];
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
data->state = LV_INDEV_STATE_REL;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void setStateUi(bool closed) {
|
||||||
|
if (closed) {
|
||||||
|
lv_label_set_text(gStateLabel, "CLOSED");
|
||||||
|
lv_obj_set_style_text_color(gStateLabel, lv_color_hex(0x7CFF8A), 0);
|
||||||
|
} else {
|
||||||
|
lv_label_set_text(gStateLabel, "OPEN");
|
||||||
|
lv_obj_set_style_text_color(gStateLabel, lv_color_hex(0xFFCC66), 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void enterSensorMode() {
|
||||||
|
// From this moment the native USB data pair is no longer USB.
|
||||||
|
// D- is held LOW, D+ is read with the ESP32-S3 internal pull-up.
|
||||||
|
// A passive switch between D- and D+ therefore reads LOW when closed.
|
||||||
|
Serial.flush();
|
||||||
|
delay(30);
|
||||||
|
|
||||||
|
pinMode(kUsbDmPin, OUTPUT);
|
||||||
|
digitalWrite(kUsbDmPin, LOW);
|
||||||
|
pinMode(kUsbDpPin, INPUT_PULLUP);
|
||||||
|
|
||||||
|
gSensorMode = true;
|
||||||
|
gLastRawClosed = (digitalRead(kUsbDpPin) == LOW);
|
||||||
|
gStableClosed = gLastRawClosed;
|
||||||
|
gLastRawChangeMs = millis();
|
||||||
|
|
||||||
|
lv_label_set_text(gModeLabel, "Sensor mode");
|
||||||
|
lv_label_set_text(gHintLabel, "USB D- / D+ are now the contact input.\nDo not connect this port to a computer.");
|
||||||
|
lv_label_set_text(gActionButtonLabel, "Restart to USB");
|
||||||
|
setStateUi(gStableClosed);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void actionButtonEventCb(lv_event_t *event) {
|
||||||
|
if (lv_event_get_code(event) != LV_EVENT_CLICKED) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!gSensorMode) {
|
||||||
|
enterSensorMode();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
lv_label_set_text(gModeLabel, "Restarting...");
|
||||||
|
lv_label_set_text(gHintLabel, "USB mode will return after reboot.");
|
||||||
|
lv_timer_handler();
|
||||||
|
delay(150);
|
||||||
|
ESP.restart();
|
||||||
|
}
|
||||||
|
|
||||||
|
static void createUi() {
|
||||||
|
lv_obj_t *screen = lv_scr_act();
|
||||||
|
lv_obj_set_style_bg_color(screen, lv_color_hex(0x0B1320), 0);
|
||||||
|
lv_obj_set_style_bg_opa(screen, LV_OPA_COVER, 0);
|
||||||
|
|
||||||
|
lv_obj_t *title = lv_label_create(screen);
|
||||||
|
lv_label_set_text(title, "USB CONTACT TEST");
|
||||||
|
lv_obj_set_style_text_color(title, lv_color_hex(0xFFFFFF), 0);
|
||||||
|
lv_obj_set_style_text_font(title, &lv_font_montserrat_22, 0);
|
||||||
|
lv_obj_align(title, LV_ALIGN_TOP_MID, 0, 26);
|
||||||
|
|
||||||
|
gModeLabel = lv_label_create(screen);
|
||||||
|
lv_label_set_text(gModeLabel, "USB mode");
|
||||||
|
lv_obj_set_style_text_color(gModeLabel, lv_color_hex(0xB8C8DC), 0);
|
||||||
|
lv_obj_set_style_text_font(gModeLabel, &lv_font_montserrat_18, 0);
|
||||||
|
lv_obj_align(gModeLabel, LV_ALIGN_TOP_MID, 0, 72);
|
||||||
|
|
||||||
|
gStateLabel = lv_label_create(screen);
|
||||||
|
lv_label_set_text(gStateLabel, "READY");
|
||||||
|
lv_obj_set_style_text_color(gStateLabel, lv_color_hex(0x72D6FF), 0);
|
||||||
|
lv_obj_set_style_text_font(gStateLabel, &lv_font_montserrat_40, 0);
|
||||||
|
lv_obj_align(gStateLabel, LV_ALIGN_CENTER, 0, -56);
|
||||||
|
|
||||||
|
gHintLabel = lv_label_create(screen);
|
||||||
|
lv_label_set_text(gHintLabel, "USB is normal now.\nTap Start to use D- / D+ as a contact sensor.");
|
||||||
|
lv_obj_set_width(gHintLabel, 390);
|
||||||
|
lv_label_set_long_mode(gHintLabel, LV_LABEL_LONG_WRAP);
|
||||||
|
lv_obj_set_style_text_align(gHintLabel, LV_TEXT_ALIGN_CENTER, 0);
|
||||||
|
lv_obj_set_style_text_color(gHintLabel, lv_color_hex(0xD5DCE5), 0);
|
||||||
|
lv_obj_set_style_text_font(gHintLabel, &lv_font_montserrat_16, 0);
|
||||||
|
lv_obj_align(gHintLabel, LV_ALIGN_CENTER, 0, 18);
|
||||||
|
|
||||||
|
gActionButton = lv_btn_create(screen);
|
||||||
|
lv_obj_set_size(gActionButton, 260, 72);
|
||||||
|
lv_obj_align(gActionButton, LV_ALIGN_BOTTOM_MID, 0, -48);
|
||||||
|
lv_obj_set_style_radius(gActionButton, 18, 0);
|
||||||
|
lv_obj_set_style_bg_color(gActionButton, lv_color_hex(0x2A9D8F), 0);
|
||||||
|
lv_obj_set_style_border_width(gActionButton, 0, 0);
|
||||||
|
lv_obj_add_event_cb(gActionButton, actionButtonEventCb, LV_EVENT_CLICKED, nullptr);
|
||||||
|
|
||||||
|
gActionButtonLabel = lv_label_create(gActionButton);
|
||||||
|
lv_label_set_text(gActionButtonLabel, "Start");
|
||||||
|
lv_obj_set_style_text_color(gActionButtonLabel, lv_color_hex(0xFFFFFF), 0);
|
||||||
|
lv_obj_set_style_text_font(gActionButtonLabel, &lv_font_montserrat_22, 0);
|
||||||
|
lv_obj_center(gActionButtonLabel);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void pollContact() {
|
||||||
|
if (!gSensorMode) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool rawClosed = (digitalRead(kUsbDpPin) == LOW);
|
||||||
|
uint32_t now = millis();
|
||||||
|
|
||||||
|
if (rawClosed != gLastRawClosed) {
|
||||||
|
gLastRawClosed = rawClosed;
|
||||||
|
gLastRawChangeMs = now;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((now - gLastRawChangeMs) >= kDebounceMs && gStableClosed != gLastRawClosed) {
|
||||||
|
gStableClosed = gLastRawClosed;
|
||||||
|
setStateUi(gStableClosed);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void setup() {
|
||||||
|
// With the project's FQBN this is the normal ESP32-S3 native USB serial mode.
|
||||||
|
// No sensor mode is persisted: every reset starts here with normal USB again.
|
||||||
|
Serial.begin(115200);
|
||||||
|
|
||||||
|
Wire.begin(IIC_SDA, IIC_SCL);
|
||||||
|
|
||||||
|
pinMode(TP_RST, OUTPUT);
|
||||||
|
pinMode(TP_INT, INPUT);
|
||||||
|
digitalWrite(TP_RST, LOW);
|
||||||
|
delay(30);
|
||||||
|
digitalWrite(TP_RST, HIGH);
|
||||||
|
delay(50);
|
||||||
|
delay(1000);
|
||||||
|
|
||||||
|
gTouch.setPins(TP_RST, TP_INT);
|
||||||
|
bool touchOk = gTouch.begin(Wire, 0x5A, IIC_SDA, IIC_SCL);
|
||||||
|
if (!touchOk) {
|
||||||
|
Serial.println("Touch init failed");
|
||||||
|
} else {
|
||||||
|
gTouch.sleep();
|
||||||
|
gTouch.reset();
|
||||||
|
gTouch.setMaxCoordinates(480, 480);
|
||||||
|
gTouch.setSwapXY(true);
|
||||||
|
gTouch.setMirrorXY(true, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
gfx->begin();
|
||||||
|
gBus->writeC8D8(0x36, 0xA0);
|
||||||
|
gfx->setBrightness(220);
|
||||||
|
gfx->fillScreen(0x0000);
|
||||||
|
|
||||||
|
lv_init();
|
||||||
|
|
||||||
|
uint32_t screenWidth = gfx->width();
|
||||||
|
uint32_t screenHeight = gfx->height();
|
||||||
|
gBuf1 = (lv_color_t *)heap_caps_malloc(screenWidth * screenHeight / 4 * sizeof(lv_color_t), MALLOC_CAP_DMA);
|
||||||
|
gBuf2 = (lv_color_t *)heap_caps_malloc(screenWidth * screenHeight / 4 * sizeof(lv_color_t), MALLOC_CAP_DMA);
|
||||||
|
lv_disp_draw_buf_init(&gDrawBuf, gBuf1, gBuf2, screenWidth * screenHeight / 4);
|
||||||
|
|
||||||
|
static lv_disp_drv_t dispDrv;
|
||||||
|
lv_disp_drv_init(&dispDrv);
|
||||||
|
dispDrv.hor_res = screenWidth;
|
||||||
|
dispDrv.ver_res = screenHeight;
|
||||||
|
dispDrv.flush_cb = lvglFlushCb;
|
||||||
|
dispDrv.draw_buf = &gDrawBuf;
|
||||||
|
lv_disp_drv_register(&dispDrv);
|
||||||
|
|
||||||
|
static lv_indev_drv_t indevDrv;
|
||||||
|
lv_indev_drv_init(&indevDrv);
|
||||||
|
indevDrv.type = LV_INDEV_TYPE_POINTER;
|
||||||
|
indevDrv.read_cb = lvglTouchRead;
|
||||||
|
lv_indev_drv_register(&indevDrv);
|
||||||
|
|
||||||
|
const esp_timer_create_args_t lvglTickTimerArgs = {
|
||||||
|
.callback = &lvglTick,
|
||||||
|
.name = "lvgl_tick"};
|
||||||
|
esp_timer_handle_t lvglTickTimer = nullptr;
|
||||||
|
esp_timer_create(&lvglTickTimerArgs, &lvglTickTimer);
|
||||||
|
esp_timer_start_periodic(lvglTickTimer, EXAMPLE_LVGL_TICK_PERIOD_MS * 1000);
|
||||||
|
|
||||||
|
createUi();
|
||||||
|
Serial.println("USB contact sensor test ready; native USB remains active until Start is tapped.");
|
||||||
|
}
|
||||||
|
|
||||||
|
void loop() {
|
||||||
|
pollContact();
|
||||||
|
lv_timer_handler();
|
||||||
|
delay(5);
|
||||||
|
}
|
||||||
@@ -0,0 +1,203 @@
|
|||||||
|
# USB contact sensor test
|
||||||
|
|
||||||
|
Diagnostic sketches:
|
||||||
|
|
||||||
|
- `main-device/test_sketches/usb_contact_sensor_test/usb_contact_sensor_test.ino`
|
||||||
|
- `main-device/test_sketches/usb_contact_sensor_debug_test/usb_contact_sensor_debug_test.ino`
|
||||||
|
- `main-device/test_sketches/breath_dual_mode_monitor/breath_dual_mode_monitor.ino`
|
||||||
|
- `main-device/test_sketches/usb_contact_resistance_test/usb_contact_resistance_test.ino`
|
||||||
|
- `main-device/test_sketches/usb_contact_screen_start_stub/usb_contact_screen_start_stub.ino`
|
||||||
|
|
||||||
|
## Purpose
|
||||||
|
|
||||||
|
Use the ESP32-S3 native USB data pair as a removable two-wire dry-contact input without making this mode persistent.
|
||||||
|
|
||||||
|
- `GPIO19` = native USB `D-`
|
||||||
|
- `GPIO20` = native USB `D+`
|
||||||
|
|
||||||
|
## Boot behavior
|
||||||
|
|
||||||
|
Every normal reset starts in ordinary native USB mode. The sketch does not save sensor mode in NVS or any other persistent storage.
|
||||||
|
|
||||||
|
Initial screen:
|
||||||
|
|
||||||
|
- title: `USB CONTACT TEST`
|
||||||
|
- mode: `USB mode`
|
||||||
|
- state: `READY`
|
||||||
|
- action button: `Start`
|
||||||
|
|
||||||
|
Until `Start` is pressed, the sketch does not reconfigure GPIO19/20.
|
||||||
|
|
||||||
|
## Sensor mode
|
||||||
|
|
||||||
|
After `Start`:
|
||||||
|
|
||||||
|
- GPIO19 is configured as `OUTPUT LOW`
|
||||||
|
- GPIO20 is configured as `INPUT_PULLUP`
|
||||||
|
- a passive switch/contact is connected between USB `D-` and `D+`
|
||||||
|
- open contact => GPIO20 reads HIGH => UI shows `OPEN`
|
||||||
|
- closed contact => GPIO20 reads LOW => UI shows `CLOSED`
|
||||||
|
- contact changes use a 20 ms debounce
|
||||||
|
|
||||||
|
Native USB data is intentionally unavailable while sensor mode owns GPIO19/20. The UI warns not to connect the port to a computer in this state.
|
||||||
|
|
||||||
|
The action button changes to `Restart to USB`. Pressing it calls `ESP.restart()`; after reboot normal USB mode is restored.
|
||||||
|
|
||||||
|
A physical reset/power cycle has the same effect. The ESP32-S3 ROM download mode remains available through the board's BOOT procedure if recovery is needed.
|
||||||
|
|
||||||
|
## Debug version
|
||||||
|
|
||||||
|
The debug sketch starts in normal USB mode and shows raw touch diagnostics on screen. The on-screen `START` button is intentionally diagnostic only: it confirms touch/LVGL button events and does not reconfigure GPIO19/20.
|
||||||
|
|
||||||
|
Sensor mode starts from the physical BOOT/user button on GPIO0, active LOW. The button is debounced for 35 ms, then the UI shows `START RECEIVED` / `STARTING...`, waits 250 ms so the visual transition is rendered, and only then reconfigures USB D-/D+ as the contact input.
|
||||||
|
|
||||||
|
While in sensor mode, pressing the BOOT/user button again restarts the device and returns normal USB mode on the next boot.
|
||||||
|
|
||||||
|
## Resistance version
|
||||||
|
|
||||||
|
The `usb_contact_resistance_test` sketch starts in normal USB mode and does not reconfigure GPIO19/20 until `Start` is tapped.
|
||||||
|
|
||||||
|
Initial screen:
|
||||||
|
|
||||||
|
- title: `USB RESISTANCE TEST`
|
||||||
|
- mode: `USB mode`
|
||||||
|
- state: `READY`
|
||||||
|
- action button: `Start`
|
||||||
|
|
||||||
|
After `Start`:
|
||||||
|
|
||||||
|
- GPIO19 / USB `D-` is configured as `OUTPUT HIGH`
|
||||||
|
- GPIO20 / USB `D+` is configured as ADC input
|
||||||
|
- the measured resistance is connected between `D-` and `D+`
|
||||||
|
- a known external 10 kΩ pulldown resistor must be connected from `D+` to `GND` for meaningful ohm calculation
|
||||||
|
- UI shows calculated resistance, raw ADC value, and measured `D+` millivolts
|
||||||
|
- very low ADC voltage is shown as `OPEN`
|
||||||
|
- near-source voltage is shown as `SHORT / LOW`
|
||||||
|
|
||||||
|
The calculation assumes a divider where the unknown resistance is the high-side resistor from 3.3 V to ADC and the known 10 kΩ resistor is the low-side resistor from ADC to GND:
|
||||||
|
|
||||||
|
`Rx = 10000 * (3300 / Vadc - 1)`
|
||||||
|
|
||||||
|
This test is intended to check whether the USB contact pair can be reused as an ADC-measured resistance input, for example before wiring a 10 kΩ potentiometer. Native USB data is unavailable while resistance mode owns GPIO19/20. Pressing `Restart to USB` calls `ESP.restart()`; after reboot normal USB mode is restored.
|
||||||
|
|
||||||
|
## GFX breath monitor version
|
||||||
|
|
||||||
|
The `usb_contact_screen_start_stub` sketch is a breath monitor firmware based on the production `Arduino_GFX` display path instead of LVGL.
|
||||||
|
|
||||||
|
Initial screen:
|
||||||
|
|
||||||
|
- title: `USB CONTACT`
|
||||||
|
- title in the current version: `BREATH MONITOR`
|
||||||
|
- state: `READY`
|
||||||
|
- action button: `START`
|
||||||
|
|
||||||
|
After tapping `START`:
|
||||||
|
|
||||||
|
- GPIO19 is configured as `OUTPUT LOW`
|
||||||
|
- GPIO20 is configured as `INPUT_PULLUP`
|
||||||
|
- closed contact is treated as `EXHALE`
|
||||||
|
- open contact is treated as `INHALE`
|
||||||
|
- one breathing cycle is measured from one stable `EXHALE` start to the next stable `EXHALE` start
|
||||||
|
- contact changes use an 80 ms debounce
|
||||||
|
- UI shows current cycle duration, arithmetic average duration over the last 5 completed cycles, and elapsed time from start
|
||||||
|
- the physical user/BOOT button opens and closes the settings screen
|
||||||
|
- settings screen has three touch sliders: limit `5/7/10/15/20` seconds, quiet cycle tick volume `0..10`, and alert volume `0..10`
|
||||||
|
- settings are persisted in NVS and restored after power off/on
|
||||||
|
- quiet cycle tick volume uses a compressed quiet scale: previous low audible levels are moved near `9..10`
|
||||||
|
- alert volume uses a gentler low range; level `5` equals the previous maximum alert level
|
||||||
|
- the working screen uses a static frame and only updates value regions to avoid display flicker
|
||||||
|
- the main screen header/status line and the bottom short-average streak line redraw only when their text changes
|
||||||
|
- the `START` button is a flat rounded rectangle with a border; there is no pause button in this version
|
||||||
|
- every new cycle start plays one quiet confirmation beep
|
||||||
|
- if the arithmetic average of the last up to 5 completed cycles is shorter than the selected limit, the device plays warning beeps: 1 beep for the first short average in a row, 2 beeps for the second, up to 5 beeps
|
||||||
|
- completed cycles shorter than 1.5 seconds are ignored as contact bounce
|
||||||
|
- if the current cycle exceeds 60 seconds, the main screen shows `PAUSE`; that long cycle is skipped and the next `EXHALE` start begins a fresh cycle from zero
|
||||||
|
- reset/power cycle restores ordinary native USB boot
|
||||||
|
|
||||||
|
This version is intended to monitor breathing cadence from a dry-contact USB D-/D+ sensor.
|
||||||
|
|
||||||
|
## Dual-mode GFX breath monitor version
|
||||||
|
|
||||||
|
The `breath_dual_mode_monitor` sketch reuses the production-style `Arduino_GFX` visual approach, audio path, settings sliders, and average-cycle alert behavior from the USB contact breath monitor. It supports two start modes on one firmware: USB contact sensor mode and external button mode.
|
||||||
|
|
||||||
|
Initial screen:
|
||||||
|
|
||||||
|
- title: `BREATH MONITOR`
|
||||||
|
- state: `READY`
|
||||||
|
- action button: `START USB SENSOR`
|
||||||
|
- action button: `START MANUAL MONITOR`
|
||||||
|
- action button: `START POT 3-WIRE`
|
||||||
|
- action button: `START POT 2-WIRE`
|
||||||
|
- action button: `START POT CAL`
|
||||||
|
- action button: `START PIN DIAG`
|
||||||
|
|
||||||
|
After `START USB SENSOR`:
|
||||||
|
|
||||||
|
- GPIO19 / USB `D-` is configured as `OUTPUT LOW`
|
||||||
|
- GPIO20 / USB `D+` is configured as `INPUT_PULLUP`
|
||||||
|
- closed contact is treated as `EXHALE`
|
||||||
|
- open contact is treated as `INHALE`
|
||||||
|
- USB sensor cycles shorter than 3 seconds are ignored without resetting the current cycle timer
|
||||||
|
- a short `KEY3 / GPIO18` press opens or closes settings in USB sensor mode
|
||||||
|
- the bottom line shows the durations of the last 5 accepted USB sensor cycles
|
||||||
|
|
||||||
|
After `START MANUAL MONITOR`:
|
||||||
|
|
||||||
|
- `KEY3 / GPIO18` is the external `INHALE` button, active LOW
|
||||||
|
- `BOOT / GPIO0` is the external `EXHALE` button, active LOW
|
||||||
|
- do not hold `BOOT` while booting or resetting the board
|
||||||
|
- the mode title is `MANUAL MONITOR`
|
||||||
|
- accepted manual phases strictly alternate: `INHALE`, then `EXHALE`; a repeated current button or `EXHALE` before the first `INHALE` is ignored without a beep or timer reset
|
||||||
|
- each accepted button press plays one quiet confirmation beep and starts a fresh `Phase time` timer for that inhale or exhale
|
||||||
|
- the working screen does not show touch `INHALE`/`EXHALE` buttons
|
||||||
|
- long-holding `KEY3 / INHALE` for about 850 ms opens settings; the long press still counts as an inhale press
|
||||||
|
- while settings are open, the next `KEY3 / INHALE` press closes settings and also counts as an inhale press
|
||||||
|
|
||||||
|
After `START POT 3-WIRE`:
|
||||||
|
|
||||||
|
- `GPIO19 / USB D-` is configured as `OUTPUT HIGH` and works as the 3.3 V side of the potentiometer test
|
||||||
|
- `GPIO20 / USB D+` is configured as ADC input and must be connected to the potentiometer wiper
|
||||||
|
- `USB GND` must be connected to the other edge pin of the potentiometer
|
||||||
|
- the screen shows position `0..100%`, a bar, ADC raw value, measured millivolts, and estimated `0..50 kΩ` resistance
|
||||||
|
- if ADC saturates or reaches an unsafe high-voltage threshold, the firmware releases `D-` and `D+` to `INPUT`, beeps, and shows `USB/PIN FAULT`
|
||||||
|
- this is only best-effort software protection; ESP32-S3 GPIO pins are not 5 V tolerant, so external wiring must still prevent 5 V from reaching `D+` or `D-`
|
||||||
|
|
||||||
|
After `START POT 2-WIRE`:
|
||||||
|
|
||||||
|
- `GPIO19 / USB D-` is configured as `OUTPUT HIGH`
|
||||||
|
- `GPIO20 / USB D+` is configured as ADC input with internal pulldown
|
||||||
|
- connect only two potentiometer pins between `D-` and `D+`: the wiper and one edge pin
|
||||||
|
- the screen shows rough position, raw ADC, millivolts, and rough estimated resistance
|
||||||
|
- this mode is intentionally approximate because the ESP32 internal pulldown value is not precise and can vary between boards
|
||||||
|
- use `START POT 3-WIRE` for stable and more linear future breath sensing
|
||||||
|
|
||||||
|
After `START POT CAL`:
|
||||||
|
|
||||||
|
- `GPIO19 / USB D-` is configured as `OUTPUT HIGH`
|
||||||
|
- `GPIO20 / USB D+` is configured as ADC input with internal pulldown
|
||||||
|
- connect only two potentiometer pins between `D-` and `D+`: the wiper and one edge pin
|
||||||
|
- the firmware tracks the observed minimum and maximum ADC millivolts
|
||||||
|
- the screen shows a calibrated `0..100%` position within the observed range, current millivolts, raw ADC, min-max range, and state
|
||||||
|
- `KEY3 / GPIO18` resets the learned min-max calibration
|
||||||
|
- this mode is for relative position testing on weak or shifted USB-pin ranges; it does not report real resistance
|
||||||
|
|
||||||
|
After `START PIN DIAG`:
|
||||||
|
|
||||||
|
- the firmware runs two alternating USB pin drive/read checks
|
||||||
|
- Test A drives `GPIO19 / USB D-` HIGH and reads `GPIO20 / USB D+` as ADC
|
||||||
|
- Test B drives `GPIO20 / USB D+` HIGH and reads `GPIO19 / USB D-` as ADC
|
||||||
|
- shorting `D-` and `D+` should make the ADC side rise if the pins are actually controllable as GPIO
|
||||||
|
- if both tests stay near 0 mV, the USB cable/host, USB PHY, or board wiring is likely holding the lines and the USB data pins are not usable as an analog sensor in that setup
|
||||||
|
|
||||||
|
In both modes:
|
||||||
|
|
||||||
|
- one breathing cycle is measured from one `EXHALE` tap to the next `EXHALE` tap
|
||||||
|
- inhale before any exhale does not create a cycle
|
||||||
|
- button-mode cycles shorter than 1.5 seconds are ignored
|
||||||
|
- USB sensor cycles shorter than 3 seconds are ignored
|
||||||
|
- the UI shows current cycle time, arithmetic average over the last 5 completed cycles, elapsed session time, selected limit, long-pause count, short-average count, and current short-average streak
|
||||||
|
- the lower numeric fields use a larger font than before
|
||||||
|
- if the average of the last up to 5 completed cycles is shorter than the selected limit, warning beeps are played like in the USB contact breath monitor
|
||||||
|
- if the current cycle reaches 60 seconds, 5 loud warning beeps are played, then after 5 seconds another 5 loud warning beeps are played, repeating until the user changes phase / exits the long cycle
|
||||||
|
- in manual monitor mode, a single loud warning beep is also played at 35, 40, 45, 50, and 55 seconds of an unchanged inhale or exhale; the repeated five-beep alarm starts at 60 seconds
|
||||||
|
- settings keep the same sliders: limit `5/7/10/15/20` seconds, quiet cycle tick volume `0..10`, and alert volume `0..10`
|
||||||
@@ -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
|
# 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).
|
||||||
|
|||||||
@@ -52,113 +52,84 @@ function readStrU8(bytes, cursorRef) {
|
|||||||
|
|
||||||
function parseServerFieldsFromUserPda(dataBytes) {
|
function parseServerFieldsFromUserPda(dataBytes) {
|
||||||
const bytes = dataBytes instanceof Uint8Array ? dataBytes : new Uint8Array(dataBytes || []);
|
const bytes = dataBytes instanceof Uint8Array ? dataBytes : new Uint8Array(dataBytes || []);
|
||||||
if (bytes.length < 5) throw new Error('Некорректный формат PDA');
|
if (bytes.length < 9) throw new Error('Некорректный формат PDA');
|
||||||
|
const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
|
||||||
const cursorRef = { value: 0 };
|
const cursorRef = { value: 0 };
|
||||||
|
const readU16 = () => { if (cursorRef.value + 2 > bytes.length) throw new Error('Повреждённый формат PDA'); const v = view.getUint16(cursorRef.value, true); cursorRef.value += 2; return v; };
|
||||||
|
const readU32 = () => { if (cursorRef.value + 4 > bytes.length) throw new Error('Повреждённый формат PDA'); const v = view.getUint32(cursorRef.value, true); cursorRef.value += 4; return v; };
|
||||||
|
const readU64 = () => { if (cursorRef.value + 8 > bytes.length) throw new Error('Повреждённый формат PDA'); const v = view.getBigUint64(cursorRef.value, true); cursorRef.value += 8; return v; };
|
||||||
const magic = new TextDecoder().decode(readBytes(bytes, cursorRef, 5));
|
const magic = new TextDecoder().decode(readBytes(bytes, cursorRef, 5));
|
||||||
if (magic !== 'SHiNE') throw new Error('Некорректный формат PDA');
|
if (magic !== 'SHiNE') throw new Error('Некорректный формат PDA');
|
||||||
cursorRef.value += 1; // format_major
|
const formatMajor = readU8(bytes, cursorRef);
|
||||||
cursorRef.value += 1; // format_minor
|
const formatMinor = readU8(bytes, cursorRef);
|
||||||
cursorRef.value += 2; // record_len
|
if (formatMajor !== 1 || formatMinor !== 2) throw new Error(`Неподдерживаемый формат PDA ${formatMajor}.${formatMinor}`);
|
||||||
|
const recordLen = readU16();
|
||||||
|
if (recordLen < 73 || recordLen > bytes.length) throw new Error('Некорректный record_len PDA');
|
||||||
cursorRef.value += 8; // created_at_ms
|
cursorRef.value += 8; // created_at_ms
|
||||||
cursorRef.value += 8; // updated_at_ms
|
cursorRef.value += 8; // updated_at_ms
|
||||||
cursorRef.value += 4; // record_number
|
cursorRef.value += 4; // record_number
|
||||||
cursorRef.value += 32; // prev_record_hash
|
cursorRef.value += 32; // prev_record_hash
|
||||||
readStrU8(bytes, cursorRef); // login
|
const login = readStrU8(bytes, cursorRef);
|
||||||
const blocksCount = readU8(bytes, cursorRef);
|
const blocksCount = readU8(bytes, cursorRef);
|
||||||
|
|
||||||
let isServer = false;
|
|
||||||
let serverAddress = '';
|
let serverAddress = '';
|
||||||
let accessServers = [];
|
let accessServers = [];
|
||||||
let recoveryKey32 = null;
|
|
||||||
let rootKey32 = null;
|
let rootKey32 = null;
|
||||||
let clientKey32 = null;
|
let clientKey32 = null;
|
||||||
let blockchainKey32 = null;
|
let blockchainKey32 = null;
|
||||||
let blockchainName = '';
|
let forkCount = 0;
|
||||||
let homeserverSessions = [];
|
|
||||||
|
|
||||||
for (let i = 0; i < blocksCount; i += 1) {
|
for (let i = 0; i < blocksCount; i += 1) {
|
||||||
const blockType = readU8(bytes, cursorRef);
|
const blockType = readU8(bytes, cursorRef);
|
||||||
cursorRef.value += 1; // block_version
|
const blockVersion = readU8(bytes, cursorRef);
|
||||||
|
if (blockVersion !== 0) throw new Error('Неподдерживаемая версия блока PDA');
|
||||||
if (blockType === 0 || blockType === 1 || blockType === 2) {
|
if (blockType === 1 || blockType === 2) {
|
||||||
const key32 = readBytes(bytes, cursorRef, 32);
|
const key32 = readBytes(bytes, cursorRef, 32);
|
||||||
if (blockType === 0) recoveryKey32 = key32;
|
|
||||||
if (blockType === 1) rootKey32 = key32;
|
if (blockType === 1) rootKey32 = key32;
|
||||||
if (blockType === 2) clientKey32 = key32;
|
else clientKey32 = key32;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const payloadLen = readU16();
|
||||||
|
const payloadEnd = cursorRef.value + payloadLen;
|
||||||
|
if (payloadEnd > recordLen - 64) throw new Error('Повреждённый variable block PDA');
|
||||||
|
|
||||||
if (blockType === 3) {
|
if (blockType === 3) {
|
||||||
const count = readU8(bytes, cursorRef);
|
forkCount = readU16();
|
||||||
for (let j = 0; j < count; j += 1) {
|
if (forkCount < 1) throw new Error('BlockchainRegistry пуст');
|
||||||
cursorRef.value += 1;
|
for (let j = 0; j < forkCount; j += 1) {
|
||||||
const currentBlockchainName = readStrU8(bytes, cursorRef);
|
blockchainKey32 = readBytes(bytes, cursorRef, 32);
|
||||||
const currentBlockchainKey32 = readBytes(bytes, cursorRef, 32);
|
readU64(); // created_at_ms fork
|
||||||
if (!blockchainKey32) {
|
readU32(); // paid_limit_bytes
|
||||||
blockchainKey32 = currentBlockchainKey32;
|
|
||||||
blockchainName = currentBlockchainName;
|
|
||||||
}
|
|
||||||
cursorRef.value += 8 + 8 + 4 + 32 + 64;
|
|
||||||
const arPresent = readU8(bytes, cursorRef);
|
|
||||||
if (arPresent === 1) readStrU8(bytes, cursorRef);
|
|
||||||
}
|
}
|
||||||
continue;
|
} else if (blockType === 30) {
|
||||||
}
|
const addressCount = readU8(bytes, cursorRef);
|
||||||
if (blockType === 30) {
|
if (addressCount !== 1) throw new Error('PDA 1.2 допускает ровно один адрес сервера');
|
||||||
isServer = readU8(bytes, cursorRef) === 1;
|
readU8(bytes, cursorRef); // address_format_type
|
||||||
if (isServer) {
|
readU8(bytes, cursorRef); // address_format_version
|
||||||
cursorRef.value += 1; // address_format_type
|
serverAddress = readStrU8(bytes, cursorRef);
|
||||||
cursorRef.value += 1; // address_format_version
|
} else if (blockType === 40) {
|
||||||
serverAddress = readStrU8(bytes, cursorRef);
|
|
||||||
const syncCount = readU8(bytes, cursorRef);
|
|
||||||
for (let j = 0; j < syncCount; j += 1) readStrU8(bytes, cursorRef);
|
|
||||||
}
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (blockType === 40) {
|
|
||||||
const accessCount = readU8(bytes, cursorRef);
|
const accessCount = readU8(bytes, cursorRef);
|
||||||
|
if (accessCount > 1) throw new Error('PDA 1.2 допускает максимум один access server');
|
||||||
accessServers = [];
|
accessServers = [];
|
||||||
for (let j = 0; j < accessCount; j += 1) accessServers.push(readStrU8(bytes, cursorRef));
|
for (let j = 0; j < accessCount; j += 1) accessServers.push(readStrU8(bytes, cursorRef));
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
if (blockType === 50) {
|
cursorRef.value = payloadEnd;
|
||||||
cursorRef.value += 1;
|
|
||||||
const sessionsCount = readU8(bytes, cursorRef);
|
|
||||||
for (let j = 0; j < sessionsCount; j += 1) {
|
|
||||||
const sessionType = readU8(bytes, cursorRef);
|
|
||||||
const sessionVersion = readU8(bytes, cursorRef);
|
|
||||||
const sessionName = readStrU8(bytes, cursorRef);
|
|
||||||
const sessionPubKey32 = readBytes(bytes, cursorRef, 32);
|
|
||||||
if (sessionType === 100) {
|
|
||||||
homeserverSessions.push({
|
|
||||||
sessionType,
|
|
||||||
sessionVersion,
|
|
||||||
sessionName,
|
|
||||||
sessionPubKeyBase58: new PublicKey(sessionPubKey32).toBase58(),
|
|
||||||
sessionPubKeyB64: `ed25519/${btoa(String.fromCharCode(...sessionPubKey32))}`,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (blockType === 70) {
|
|
||||||
cursorRef.value += 1;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
throw new Error(`Неизвестный блок PDA: ${blockType}`);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!rootKey32 || !clientKey32 || !blockchainKey32) throw new Error('PDA 1.2 не содержит обязательные ключи');
|
||||||
return {
|
return {
|
||||||
isServer,
|
isServer: Boolean(serverAddress),
|
||||||
serverAddress: normalizeHostLike(serverAddress),
|
serverAddress: normalizeHostLike(serverAddress),
|
||||||
accessServers: accessServers.map((value) => normalizeServerLogin(value)).filter(Boolean),
|
accessServers: accessServers.map((value) => normalizeServerLogin(value)).filter(Boolean),
|
||||||
publicKeys: {
|
publicKeys: {
|
||||||
recoveryKeyBase58: recoveryKey32 ? new PublicKey(recoveryKey32).toBase58() : '',
|
recoveryKeyBase58: '',
|
||||||
rootKeyBase58: rootKey32 ? new PublicKey(rootKey32).toBase58() : '',
|
rootKeyBase58: new PublicKey(rootKey32).toBase58(),
|
||||||
clientKeyBase58: clientKey32 ? new PublicKey(clientKey32).toBase58() : '',
|
clientKeyBase58: new PublicKey(clientKey32).toBase58(),
|
||||||
blockchainKeyBase58: blockchainKey32 ? new PublicKey(blockchainKey32).toBase58() : '',
|
blockchainKeyBase58: new PublicKey(blockchainKey32).toBase58(),
|
||||||
blockchainName,
|
blockchainName: `${normalizeServerLogin(login)}-${String(forkCount).padStart(3, '0')}`,
|
||||||
},
|
},
|
||||||
homeserverSessions,
|
homeserverSessions: [],
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -7,7 +7,7 @@
|
|||||||
"": {
|
"": {
|
||||||
"name": "shine-browser-plugin-wallet",
|
"name": "shine-browser-plugin-wallet",
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"license": "ISC",
|
"license": "UNLICENSED",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@noble/curves": "^1.5.0",
|
"@noble/curves": "^1.5.0",
|
||||||
"@solana/web3.js": "^1.98.4"
|
"@solana/web3.js": "^1.98.4"
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "shine-browser-plugin-wallet",
|
"name": "shine-browser-plugin-wallet",
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
|
"private": true,
|
||||||
"description": "Chrome-compatible Manifest V3 plugin for SHiNE wallet-session login.",
|
"description": "Chrome-compatible Manifest V3 plugin for SHiNE wallet-session login.",
|
||||||
"main": "popup.js",
|
"main": "popup.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
@@ -8,7 +9,7 @@
|
|||||||
},
|
},
|
||||||
"keywords": [],
|
"keywords": [],
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC",
|
"license": "UNLICENSED",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@noble/curves": "^1.5.0",
|
"@noble/curves": "^1.5.0",
|
||||||
"@solana/web3.js": "^1.98.4"
|
"@solana/web3.js": "^1.98.4"
|
||||||
|
|||||||
+18
-15
@@ -15,18 +15,25 @@ SHiNE-server — серверная часть мессенджера SHiNE: Web
|
|||||||
- `shine-server-config/` — конфигурация сервера
|
- `shine-server-config/` — конфигурация сервера
|
||||||
- `shine-server-log/` — логирование
|
- `shine-server-log/` — логирование
|
||||||
- `shine-server-geo/` — геолокация IP
|
- `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)
|
## Настройка сервера в Solana (Solana PDA)
|
||||||
|
|
||||||
Серверный аккаунт SHiNE регистрируется в Solana в виде `user_pda` с флагом `is_server=true`.
|
Серверный аккаунт SHiNE регистрируется как обычный `user_pda` формата 1.2 с присутствующим `ServerProfileBlock`. Отдельного `is_server` в PDA нет: наличие server profile означает, что аккаунт объявляет серверный endpoint.
|
||||||
В PDA хранятся:
|
|
||||||
|
|
||||||
- **адрес сервера** (URL WebSocket/HTTPS, например `https://shineup.me/ws`);
|
PDA 1.2 сейчас допускает **один** адрес сервера (`address_format_type + address_format_version + address`). Бинарный блок использует count/array, чтобы будущая версия протокола могла увеличить лимит без смены структуры блока. Прямой список `sync_servers` удалён: пользовательские blockchain синхронизируются через Arweave.
|
||||||
- **список серверов синхронизации** (`sync_servers`) — логины SHiNE-аккаунтов серверов-партнёров,
|
|
||||||
с которыми синхронизируются пользовательские блокчейны;
|
|
||||||
- **корневой ключ** сервера (`root_key`).
|
|
||||||
|
|
||||||
Клиенты читают PDA напрямую из Solana, чтобы узнать адрес сервера и при необходимости подключиться.
|
Клиенты читают server PDA из Solana, получают опубликованный endpoint и подключаются к нему. Межсерверная доставка DM через access-server routing остаётся отдельным механизмом.
|
||||||
|
|
||||||
**Управление серверной PDA выполняется через Web-панель администратора:**
|
**Управление серверной PDA выполняется через Web-панель администратора:**
|
||||||
|
|
||||||
@@ -36,10 +43,9 @@ shine-UI/server-ui.html
|
|||||||
|
|
||||||
Страницы:
|
Страницы:
|
||||||
- `shine-UI/server-ui/create-server-pda.html` — первичная регистрация серверного аккаунта;
|
- `shine-UI/server-ui/create-server-pda.html` — первичная регистрация серверного аккаунта;
|
||||||
- `shine-UI/server-ui/update-server-pda.html` — обновление адреса или списка sync_servers.
|
- `shine-UI/server-ui/update-server-pda.html` — обновление адреса сервера.
|
||||||
|
|
||||||
Для регистрации нужен полный keyBundle (root + device + blockchain).
|
PDA 1.2 использует три постоянные роли ключей: `root` (cold recovery), `blockchain` (обычный authority и подпись блоков) и `client` (клиент/кошелёк). Обычный update авторизуется активным последним blockchain key; root используется для recovery и может менять root.
|
||||||
Для обновления — только root + device (blockchain-ключ не нужен).
|
|
||||||
|
|
||||||
Актуальные адреса программ Solana (devnet):
|
Актуальные адреса программ Solana (devnet):
|
||||||
- `shine_users`: `SHiNEPr1APdAgNBteUyBXcNovaHctpSjUu8oH2ZJdN6`
|
- `shine_users`: `SHiNEPr1APdAgNBteUyBXcNovaHctpSjUu8oH2ZJdN6`
|
||||||
@@ -47,12 +53,9 @@ shine-UI/server-ui.html
|
|||||||
|
|
||||||
Подробнее: `docs/Инициализация_Solana_регистрации/README.md`
|
Подробнее: `docs/Инициализация_Solana_регистрации/README.md`
|
||||||
|
|
||||||
## Синхронизация с партнёрскими серверами
|
## Синхронизация пользовательских blockchain
|
||||||
|
|
||||||
Сервер должен синхронизировать блоки пользовательских блокчейнов с
|
Прямой peer-to-peer blockchain sync через `sync_servers` отключён. Сервер восстанавливает и синхронизирует пользовательские записи через Arweave. Код старого peer-sync пока может оставаться как inert legacy, но не должен включаться в runtime.
|
||||||
серверами-партнёрами из `sync_servers`. DM между партнёрами не реплицируются:
|
|
||||||
они доставляются только на первый access-сервер получателя.
|
|
||||||
Детали: `docs/Blockchain/sync-between-servers.md`
|
|
||||||
|
|
||||||
## Деплой
|
## Деплой
|
||||||
|
|
||||||
|
|||||||
+113
-8
@@ -2,17 +2,32 @@ package server.archive;
|
|||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import server.sync.ArweavePublishSignal;
|
||||||
|
|
||||||
|
import java.util.Base64;
|
||||||
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
import java.util.concurrent.ConcurrentLinkedQueue;
|
||||||
import java.util.concurrent.Executors;
|
import java.util.concurrent.Executors;
|
||||||
import java.util.concurrent.ScheduledExecutorService;
|
import java.util.concurrent.ScheduledExecutorService;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
|
|
||||||
/** Fixed-delay publisher. Empty cycles are no-ops. */
|
/**
|
||||||
|
* Publisher с двумя путями доставки:
|
||||||
|
* 1) Turbo — немедленная неблокирующая попытка для только что принятого блока;
|
||||||
|
* 2) плановый fixed-delay цикл — страховочная добивка только зависших pending-записей.
|
||||||
|
*/
|
||||||
public final class ArweaveBlockPublisherScheduler {
|
public final class ArweaveBlockPublisherScheduler {
|
||||||
private static final Logger log = LoggerFactory.getLogger(ArweaveBlockPublisherScheduler.class);
|
private static final Logger log = LoggerFactory.getLogger(ArweaveBlockPublisherScheduler.class);
|
||||||
|
private static final long RETRY_MIN_PENDING_AGE_MS = 60_000L;
|
||||||
private static final AtomicBoolean STARTED = new AtomicBoolean(false);
|
private static final AtomicBoolean STARTED = new AtomicBoolean(false);
|
||||||
|
private static final AtomicBoolean IMMEDIATE_DRAIN_SCHEDULED = new AtomicBoolean(false);
|
||||||
|
private static final ConcurrentLinkedQueue<ArweavePublishSignal.PendingRef> IMMEDIATE_QUEUE = new ConcurrentLinkedQueue<>();
|
||||||
|
private static final ConcurrentHashMap<String, Long> PENDING_SINCE_MS = new ConcurrentHashMap<>();
|
||||||
|
|
||||||
private static ScheduledExecutorService executor;
|
private static ScheduledExecutorService executor;
|
||||||
|
private static ArweaveBlockPublisherService service;
|
||||||
|
private static ArweaveBlocksConfig config;
|
||||||
|
|
||||||
private ArweaveBlockPublisherScheduler() {}
|
private ArweaveBlockPublisherScheduler() {}
|
||||||
|
|
||||||
@@ -20,18 +35,108 @@ public final class ArweaveBlockPublisherScheduler {
|
|||||||
ArweaveBlocksConfig cfg;
|
ArweaveBlocksConfig cfg;
|
||||||
try { cfg = ArweaveBlocksConfig.load(); cfg.validatePublisher(); }
|
try { cfg = ArweaveBlocksConfig.load(); cfg.validatePublisher(); }
|
||||||
catch (Exception e) { log.error("Cannot read/validate Arweave block publisher config", e); return; }
|
catch (Exception e) { log.error("Cannot read/validate Arweave block publisher config", e); return; }
|
||||||
if (!cfg.publishEnabled()) { log.info("Arweave user-block publisher disabled"); return; }
|
if (!cfg.publishEnabled()) { log.info("Arweave user-block publisher disabled (mode=none)"); return; }
|
||||||
if (!STARTED.compareAndSet(false,true)) return;
|
if (!STARTED.compareAndSet(false,true)) return;
|
||||||
try {
|
try {
|
||||||
ArweaveBlockPublisherService service = new ArweaveBlockPublisherService(cfg);
|
config = cfg;
|
||||||
|
service = new ArweaveBlockPublisherService(cfg);
|
||||||
executor = Executors.newSingleThreadScheduledExecutor(r -> {
|
executor = Executors.newSingleThreadScheduledExecutor(r -> {
|
||||||
Thread t = new Thread(r, "shine-arweave-block-publisher"); t.setDaemon(true); return t;
|
Thread t = new Thread(r, "shine-arweave-block-publisher"); t.setDaemon(true); return t;
|
||||||
});
|
});
|
||||||
Runnable task = () -> { try { service.runCycle(); } catch (Exception e) { log.error("Arweave block publish cycle failed", e); } };
|
|
||||||
executor.scheduleWithFixedDelay(task, 0, cfg.publishIntervalMinutes(), TimeUnit.MINUTES);
|
if (cfg.publishMode() == ArweaveBlocksConfig.PublishMode.TURBO) {
|
||||||
log.info("Arweave user-block publisher enabled: interval={}m gateway={}", cfg.publishIntervalMinutes(), cfg.publishGateway());
|
ArweavePublishSignal.setListener(ArweaveBlockPublisherScheduler::enqueueImmediateTurboPublish);
|
||||||
} catch (Exception e) { STARTED.set(false); log.error("Arweave user-block publisher failed to start", e); }
|
}
|
||||||
|
|
||||||
|
Runnable retryTask = () -> {
|
||||||
|
try {
|
||||||
|
if (config.publishMode() == ArweaveBlocksConfig.PublishMode.TURBO) {
|
||||||
|
long nowMs = System.currentTimeMillis();
|
||||||
|
service.runRetryCycle(
|
||||||
|
id -> isOldEnoughForRetry(id, nowMs),
|
||||||
|
id -> PENDING_SINCE_MS.remove(idKey(id))
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
service.runCycle();
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Arweave block publish retry cycle failed", e);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
long retryInitialDelayMinutes = cfg.publishMode() == ArweaveBlocksConfig.PublishMode.TURBO
|
||||||
|
? cfg.publishIntervalMinutes()
|
||||||
|
: 0L;
|
||||||
|
executor.scheduleWithFixedDelay(retryTask, retryInitialDelayMinutes, cfg.publishIntervalMinutes(), TimeUnit.MINUTES);
|
||||||
|
log.info("Arweave user-block publisher enabled: mode={} immediateTurbo={} retryInterval={}m retryMinAge={}s",
|
||||||
|
cfg.publishMode(), cfg.publishMode() == ArweaveBlocksConfig.PublishMode.TURBO,
|
||||||
|
cfg.publishIntervalMinutes(), RETRY_MIN_PENDING_AGE_MS / 1000L);
|
||||||
|
} catch (Exception e) {
|
||||||
|
ArweavePublishSignal.clearListener();
|
||||||
|
STARTED.set(false);
|
||||||
|
log.error("Arweave user-block publisher failed to start", e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void close() { ScheduledExecutorService e=executor; if(e!=null)e.shutdownNow(); }
|
private static void enqueueImmediateTurboPublish(ArweavePublishSignal.PendingRef item) {
|
||||||
|
if (!STARTED.get() || config == null || config.publishMode() != ArweaveBlocksConfig.PublishMode.TURBO) return;
|
||||||
|
PENDING_SINCE_MS.putIfAbsent(idKey(item.dataItemId()), System.currentTimeMillis());
|
||||||
|
IMMEDIATE_QUEUE.offer(item);
|
||||||
|
scheduleImmediateDrain();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean isOldEnoughForRetry(byte[] dataItemId, long nowMs) {
|
||||||
|
Long pendingSince = PENDING_SINCE_MS.get(idKey(dataItemId));
|
||||||
|
// Нет записи в памяти => pending пережил старт процесса и уже считается зависшим.
|
||||||
|
return pendingSince == null || nowMs - pendingSince >= RETRY_MIN_PENDING_AGE_MS;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String idKey(byte[] dataItemId) {
|
||||||
|
return Base64.getUrlEncoder().withoutPadding().encodeToString(dataItemId);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void scheduleImmediateDrain() {
|
||||||
|
ScheduledExecutorService currentExecutor = executor;
|
||||||
|
if (currentExecutor == null || currentExecutor.isShutdown()) return;
|
||||||
|
if (!IMMEDIATE_DRAIN_SCHEDULED.compareAndSet(false, true)) return;
|
||||||
|
try {
|
||||||
|
currentExecutor.execute(ArweaveBlockPublisherScheduler::drainImmediateQueue);
|
||||||
|
} catch (RuntimeException e) {
|
||||||
|
IMMEDIATE_DRAIN_SCHEDULED.set(false);
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void drainImmediateQueue() {
|
||||||
|
try {
|
||||||
|
ArweavePublishSignal.PendingRef item;
|
||||||
|
while ((item = IMMEDIATE_QUEUE.poll()) != null) {
|
||||||
|
try {
|
||||||
|
boolean resolved = service.publishAcceptedNow(item);
|
||||||
|
if (resolved) PENDING_SINCE_MS.remove(idKey(item.dataItemId()));
|
||||||
|
} catch (Exception e) {
|
||||||
|
// Turbo недоступен: не держим поток клиента и не молотим всю очередь одной и той же ошибкой.
|
||||||
|
// Все элементы уже надёжно лежат в БД с pending=TRUE; плановый цикл подберёт их после min-age.
|
||||||
|
log.warn("Immediate Turbo publish failed; pending blocks will be retried by the periodic cycle: {}", e.getMessage());
|
||||||
|
IMMEDIATE_QUEUE.clear();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
IMMEDIATE_DRAIN_SCHEDULED.set(false);
|
||||||
|
if (!IMMEDIATE_QUEUE.isEmpty()) scheduleImmediateDrain();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void close() {
|
||||||
|
ArweavePublishSignal.clearListener();
|
||||||
|
IMMEDIATE_QUEUE.clear();
|
||||||
|
PENDING_SINCE_MS.clear();
|
||||||
|
IMMEDIATE_DRAIN_SCHEDULED.set(false);
|
||||||
|
ScheduledExecutorService e = executor;
|
||||||
|
executor = null;
|
||||||
|
service = null;
|
||||||
|
config = null;
|
||||||
|
STARTED.set(false);
|
||||||
|
if (e != null) e.shutdownNow();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+174
-12
@@ -3,28 +3,189 @@ package server.archive;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import shine.db.dao.BlocksDAO;
|
import shine.db.dao.BlocksDAO;
|
||||||
|
import shine.db.dao.KeyRotationCandidateBlocksDAO;
|
||||||
import shine.db.entities.BlockEntry;
|
import shine.db.entities.BlockEntry;
|
||||||
|
import shine.db.entities.KeyRotationCandidateBlockEntry;
|
||||||
|
import server.sync.ArweavePublishSignal;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.function.Consumer;
|
||||||
|
import java.util.function.Predicate;
|
||||||
|
|
||||||
/** Publishes locally-created signed user DataItems as one standard ANS-104 bundle. */
|
/** Publishes locally-created signed user DataItems through the configured transport. */
|
||||||
public final class ArweaveBlockPublisherService {
|
public final class ArweaveBlockPublisherService {
|
||||||
private static final Logger log = LoggerFactory.getLogger(ArweaveBlockPublisherService.class);
|
private static final Logger log = LoggerFactory.getLogger(ArweaveBlockPublisherService.class);
|
||||||
|
|
||||||
private final ArweaveBlocksConfig cfg;
|
private final ArweaveBlocksConfig cfg;
|
||||||
private final BlocksDAO blocksDAO = BlocksDAO.getInstance();
|
private final BlocksDAO blocksDAO = BlocksDAO.getInstance();
|
||||||
private final ArweaveL1Uploader uploader;
|
private final KeyRotationCandidateBlocksDAO candidateBlocksDAO = KeyRotationCandidateBlocksDAO.getInstance();
|
||||||
|
private final ArweaveL1Uploader arweaveUploader;
|
||||||
|
private final TurboDataItemUploader turboUploader;
|
||||||
|
|
||||||
public ArweaveBlockPublisherService(ArweaveBlocksConfig cfg) {
|
public ArweaveBlockPublisherService(ArweaveBlocksConfig cfg) {
|
||||||
this.cfg = cfg;
|
this.cfg = cfg;
|
||||||
this.uploader = new ArweaveL1Uploader(cfg);
|
this.arweaveUploader = cfg.publishMode() == ArweaveBlocksConfig.PublishMode.ARWEAVE ? new ArweaveL1Uploader(cfg) : null;
|
||||||
|
this.turboUploader = cfg.publishMode() == ArweaveBlocksConfig.PublishMode.TURBO ? new TurboDataItemUploader(cfg) : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Мгновенная попытка для только что принятого DataItem. Вызывается только из фонового executor-а:
|
||||||
|
* сетевой запрос AddBlock не ждёт результат Turbo. Если запись уже успел обработать другой цикл, это no-op.
|
||||||
|
* При ошибке pending-флаг в БД не меняется, поэтому обычный runCycle() повторит публикацию позже.
|
||||||
|
*/
|
||||||
|
public boolean publishAcceptedNow(ArweavePublishSignal.PendingRef pending) throws Exception {
|
||||||
|
if (cfg.publishMode() != ArweaveBlocksConfig.PublishMode.TURBO) return false;
|
||||||
|
byte[] id = pending.dataItemId();
|
||||||
|
if (pending.kind() == ArweavePublishSignal.Kind.KEY_ROTATION_CANDIDATE) {
|
||||||
|
KeyRotationCandidateBlockEntry entry = candidateBlocksDAO.getPendingArweaveByDataItemId(id);
|
||||||
|
if (entry == null) return true;
|
||||||
|
byte[] raw = entry.getBlockBytes();
|
||||||
|
if (raw == null || raw.length == 0) return false;
|
||||||
|
TurboDataItemUploader.UploadResult result = turboUploader.upload(raw, id);
|
||||||
|
candidateBlocksDAO.markArweavePublished(List.of(id), System.currentTimeMillis());
|
||||||
|
log.debug("Turbo immediately published key-rotation DataItem {} chain={} block={}",
|
||||||
|
result.dataItemId(), entry.getCandidateBlockchainName(), entry.getBlockNumber());
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
BlockEntry entry = blocksDAO.getPendingArweaveByDataItemId(id);
|
||||||
|
if (entry == null) return true;
|
||||||
|
byte[] raw = entry.getBlockBytes();
|
||||||
|
if (raw == null || raw.length == 0) return false;
|
||||||
|
TurboDataItemUploader.UploadResult result = turboUploader.upload(raw, id);
|
||||||
|
blocksDAO.markArweavePublished(List.of(id), System.currentTimeMillis());
|
||||||
|
log.debug("Turbo immediately published SHiNE DataItem {} chain={} block={}",
|
||||||
|
result.dataItemId(), entry.getBchName(), entry.getBlockNumber());
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int runCycle() throws Exception {
|
public int runCycle() throws Exception {
|
||||||
List<BlockEntry> candidates = blocksDAO.listPendingArweave(cfg.publishMaxItems());
|
return runCycle(id -> true, id -> {});
|
||||||
if (candidates.isEmpty()) return 0;
|
}
|
||||||
|
|
||||||
|
/** Плановый retry может отфильтровать слишком свежие pending-записи и получить callback успешных id. */
|
||||||
|
public int runRetryCycle(Predicate<byte[]> eligible, Consumer<byte[]> onPublished) throws Exception {
|
||||||
|
return runCycle(eligible == null ? id -> true : eligible, onPublished == null ? id -> {} : onPublished);
|
||||||
|
}
|
||||||
|
|
||||||
|
private int runCycle(Predicate<byte[]> eligible, Consumer<byte[]> onPublished) throws Exception {
|
||||||
|
if (cfg.publishMode() == ArweaveBlocksConfig.PublishMode.NONE) return 0;
|
||||||
|
|
||||||
|
int maxItems = cfg.publishMaxItems();
|
||||||
|
int attempted = 0;
|
||||||
|
int published = 0;
|
||||||
|
|
||||||
|
// Ротация приоритетна: пользователь уже заблокирован для обычной записи и ждёт завершения копирования.
|
||||||
|
List<KeyRotationCandidateBlockEntry> rotationCandidates = candidateBlocksDAO.listPendingArweave(maxItems);
|
||||||
|
rotationCandidates = rotationCandidates.stream().filter(e -> eligible.test(e.getDataItemId())).toList();
|
||||||
|
if (!rotationCandidates.isEmpty()) {
|
||||||
|
attempted += rotationCandidates.size();
|
||||||
|
published += switch (cfg.publishMode()) {
|
||||||
|
case TURBO -> publishTurboRotation(rotationCandidates, onPublished);
|
||||||
|
case ARWEAVE -> publishDirectArweaveRotation(rotationCandidates);
|
||||||
|
case NONE -> 0;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
int remaining = Math.max(0, maxItems - attempted);
|
||||||
|
if (remaining == 0) return published;
|
||||||
|
|
||||||
|
List<BlockEntry> candidates = blocksDAO.listPendingArweave(remaining);
|
||||||
|
candidates = candidates.stream().filter(e -> eligible.test(e.getDataItemId())).toList();
|
||||||
|
if (candidates.isEmpty()) return published;
|
||||||
|
published += switch (cfg.publishMode()) {
|
||||||
|
case TURBO -> publishTurbo(candidates, onPublished);
|
||||||
|
case ARWEAVE -> publishDirectArweave(candidates);
|
||||||
|
case NONE -> 0;
|
||||||
|
};
|
||||||
|
return published;
|
||||||
|
}
|
||||||
|
|
||||||
|
private int publishTurboRotation(List<KeyRotationCandidateBlockEntry> candidates, Consumer<byte[]> onPublished) throws Exception {
|
||||||
|
int published = 0;
|
||||||
|
Exception firstFailure = null;
|
||||||
|
for (KeyRotationCandidateBlockEntry e : candidates) {
|
||||||
|
byte[] raw = e.getBlockBytes();
|
||||||
|
byte[] id = e.getDataItemId();
|
||||||
|
if (raw == null || raw.length == 0 || id == null || id.length != 32) continue;
|
||||||
|
try {
|
||||||
|
TurboDataItemUploader.UploadResult result = turboUploader.upload(raw, id);
|
||||||
|
candidateBlocksDAO.markArweavePublished(List.of(id), System.currentTimeMillis());
|
||||||
|
onPublished.accept(id);
|
||||||
|
published++;
|
||||||
|
log.debug("Turbo published key-rotation DataItem {} chain={} block={}",
|
||||||
|
result.dataItemId(), e.getCandidateBlockchainName(), e.getBlockNumber());
|
||||||
|
} catch (Exception ex) {
|
||||||
|
if (firstFailure == null) firstFailure = ex;
|
||||||
|
log.warn("Turbo key-rotation publish failed: chain={} block={} bytes={} error={}",
|
||||||
|
e.getCandidateBlockchainName(), e.getBlockNumber(), raw.length, ex.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (published > 0) log.info("Published {} SHiNE key-rotation DataItems through Turbo", published);
|
||||||
|
if (published == 0 && firstFailure != null) throw firstFailure;
|
||||||
|
return published;
|
||||||
|
}
|
||||||
|
|
||||||
|
private int publishTurbo(List<BlockEntry> candidates, Consumer<byte[]> onPublished) throws Exception {
|
||||||
|
int published = 0;
|
||||||
|
Exception firstFailure = null;
|
||||||
|
for (BlockEntry e : candidates) {
|
||||||
|
byte[] raw = e.getBlockBytes();
|
||||||
|
byte[] id = e.getDataItemId();
|
||||||
|
if (raw == null || raw.length == 0 || id == null || id.length != 32) continue;
|
||||||
|
try {
|
||||||
|
TurboDataItemUploader.UploadResult result = turboUploader.upload(raw, id);
|
||||||
|
blocksDAO.markArweavePublished(List.of(id), System.currentTimeMillis());
|
||||||
|
onPublished.accept(id);
|
||||||
|
published++;
|
||||||
|
log.debug("Turbo published SHiNE DataItem {} chain={} block={}", result.dataItemId(), e.getBchName(), e.getBlockNumber());
|
||||||
|
} catch (Exception ex) {
|
||||||
|
if (firstFailure == null) firstFailure = ex;
|
||||||
|
log.warn("Turbo publish failed: chain={} block={} bytes={} error={}",
|
||||||
|
e.getBchName(), e.getBlockNumber(), raw.length, ex.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (published > 0) log.info("Published {} SHiNE test DataItems through Turbo", published);
|
||||||
|
if (published == 0 && firstFailure != null) throw firstFailure;
|
||||||
|
return published;
|
||||||
|
}
|
||||||
|
|
||||||
|
private int publishDirectArweaveRotation(List<KeyRotationCandidateBlockEntry> candidates) throws Exception {
|
||||||
|
List<byte[]> items = new ArrayList<>();
|
||||||
|
List<byte[]> ids = new ArrayList<>();
|
||||||
|
long estimated = 32;
|
||||||
|
for (KeyRotationCandidateBlockEntry e : candidates) {
|
||||||
|
byte[] raw = e.getBlockBytes();
|
||||||
|
byte[] id = e.getDataItemId();
|
||||||
|
if (raw == null || raw.length == 0 || id == null || id.length != 32) continue;
|
||||||
|
long next = estimated + 64L + raw.length;
|
||||||
|
if (!items.isEmpty() && next > cfg.publishMaxBundleBytes()) break;
|
||||||
|
if (next > cfg.publishMaxBundleBytes()) {
|
||||||
|
log.error("One key-rotation DataItem exceeds arweave.blocks.publish.maxBundleBytes: chain={} block={} bytes={}",
|
||||||
|
e.getCandidateBlockchainName(), e.getBlockNumber(), raw.length);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
items.add(raw);
|
||||||
|
ids.add(id);
|
||||||
|
estimated = next;
|
||||||
|
}
|
||||||
|
if (items.isEmpty()) return 0;
|
||||||
|
|
||||||
|
byte[] bundle = Ans104Bundle.write(items);
|
||||||
|
List<ArweaveL1Uploader.Tag> rootTags = List.of(
|
||||||
|
new ArweaveL1Uploader.Tag("Content-Type", "application/octet-stream"),
|
||||||
|
new ArweaveL1Uploader.Tag("Bundle-Format", "binary"),
|
||||||
|
new ArweaveL1Uploader.Tag("Bundle-Version", "2.0.0")
|
||||||
|
);
|
||||||
|
ArweaveL1Uploader.UploadResult result = arweaveUploader.upload(bundle, rootTags);
|
||||||
|
candidateBlocksDAO.markArweavePublished(ids, System.currentTimeMillis());
|
||||||
|
log.info("Published {} SHiNE key-rotation DataItems in direct Arweave root tx {} (bundle={} bytes)",
|
||||||
|
items.size(), result.txId(), bundle.length);
|
||||||
|
return items.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
private int publishDirectArweave(List<BlockEntry> candidates) throws Exception {
|
||||||
List<byte[]> items = new ArrayList<>();
|
List<byte[]> items = new ArrayList<>();
|
||||||
List<byte[]> ids = new ArrayList<>();
|
List<byte[]> ids = new ArrayList<>();
|
||||||
long estimated = 32;
|
long estimated = 32;
|
||||||
@@ -39,7 +200,9 @@ public final class ArweaveBlockPublisherService {
|
|||||||
e.getBchName(), e.getBlockNumber(), raw.length);
|
e.getBchName(), e.getBlockNumber(), raw.length);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
items.add(raw); ids.add(id); estimated = next;
|
items.add(raw);
|
||||||
|
ids.add(id);
|
||||||
|
estimated = next;
|
||||||
}
|
}
|
||||||
if (items.isEmpty()) return 0;
|
if (items.isEmpty()) return 0;
|
||||||
|
|
||||||
@@ -47,13 +210,12 @@ public final class ArweaveBlockPublisherService {
|
|||||||
List<ArweaveL1Uploader.Tag> rootTags = List.of(
|
List<ArweaveL1Uploader.Tag> rootTags = List.of(
|
||||||
new ArweaveL1Uploader.Tag("Content-Type", "application/octet-stream"),
|
new ArweaveL1Uploader.Tag("Content-Type", "application/octet-stream"),
|
||||||
new ArweaveL1Uploader.Tag("Bundle-Format", "binary"),
|
new ArweaveL1Uploader.Tag("Bundle-Format", "binary"),
|
||||||
new ArweaveL1Uploader.Tag("Bundle-Version", "2.0.0"),
|
new ArweaveL1Uploader.Tag("Bundle-Version", "2.0.0")
|
||||||
// Deliberately different from App=test5590 so discovery returns child DataItems only.
|
|
||||||
new ArweaveL1Uploader.Tag("App", "test5590-batch")
|
|
||||||
);
|
);
|
||||||
ArweaveL1Uploader.UploadResult result = uploader.upload(bundle, rootTags);
|
ArweaveL1Uploader.UploadResult result = arweaveUploader.upload(bundle, rootTags);
|
||||||
blocksDAO.markArweavePublished(ids, result.txId(), System.currentTimeMillis());
|
blocksDAO.markArweavePublished(ids, System.currentTimeMillis());
|
||||||
log.info("Published {} SHiNE test DataItems in root tx {} (bundle={} bytes)", items.size(), result.txId(), bundle.length);
|
log.info("Published {} SHiNE test DataItems in direct Arweave root tx {} (bundle={} bytes)",
|
||||||
|
items.size(), result.txId(), bundle.length);
|
||||||
return items.size();
|
return items.size();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+5
-1
@@ -22,10 +22,14 @@ public final class ArweaveBlockSyncScheduler {
|
|||||||
if (!STARTED.compareAndSet(false,true)) return;
|
if (!STARTED.compareAndSet(false,true)) return;
|
||||||
try {
|
try {
|
||||||
ArweaveBlockSyncService service = new ArweaveBlockSyncService(cfg);
|
ArweaveBlockSyncService service = new ArweaveBlockSyncService(cfg);
|
||||||
|
// Один поток намеренно сериализует полный discovery и быстрые retry уже найденных DataItem.
|
||||||
executor = Executors.newSingleThreadScheduledExecutor(r -> { Thread t=new Thread(r,"shine-arweave-block-sync");t.setDaemon(true);return t; });
|
executor = Executors.newSingleThreadScheduledExecutor(r -> { Thread t=new Thread(r,"shine-arweave-block-sync");t.setDaemon(true);return t; });
|
||||||
Runnable task=()->{try{service.runCycle();}catch(Exception e){log.error("Arweave block sync cycle failed",e);}};
|
Runnable task=()->{try{service.runCycle();}catch(Exception e){log.error("Arweave block sync cycle failed",e);}};
|
||||||
|
Runnable retryTask=()->{try{service.runRetryCycle();}catch(Exception e){log.error("Arweave block fast retry failed",e);}};
|
||||||
executor.scheduleWithFixedDelay(task,0,cfg.syncIntervalMinutes(),TimeUnit.MINUTES);
|
executor.scheduleWithFixedDelay(task,0,cfg.syncIntervalMinutes(),TimeUnit.MINUTES);
|
||||||
log.info("Arweave user-block sync enabled: interval={}m gateway={}",cfg.syncIntervalMinutes(),cfg.syncGateway());
|
executor.scheduleWithFixedDelay(retryTask,cfg.syncLocationRetrySeconds(),cfg.syncLocationRetrySeconds(),TimeUnit.SECONDS);
|
||||||
|
log.info("Arweave user-block sync enabled: interval={}m locationRetry={}s gateway={} turboApi={}",
|
||||||
|
cfg.syncIntervalMinutes(),cfg.syncLocationRetrySeconds(),cfg.syncGateway(),cfg.syncTurboApiBase());
|
||||||
} catch (Exception e) { STARTED.set(false); log.error("Arweave user-block sync failed to start",e); }
|
} catch (Exception e) { STARTED.set(false); log.error("Arweave user-block sync failed to start",e); }
|
||||||
}
|
}
|
||||||
public static void close(){ScheduledExecutorService e=executor;if(e!=null)e.shutdownNow();}
|
public static void close(){ScheduledExecutorService e=executor;if(e!=null)e.shutdownNow();}
|
||||||
|
|||||||
+668
-62
@@ -2,30 +2,45 @@ package server.archive;
|
|||||||
|
|
||||||
import blockchain.Ans104DataItem;
|
import blockchain.Ans104DataItem;
|
||||||
import blockchain.BchBlockEntry;
|
import blockchain.BchBlockEntry;
|
||||||
|
import server.archive.registration.VerifiedFreeRegistrationImporter;
|
||||||
import com.fasterxml.jackson.databind.JsonNode;
|
import com.fasterxml.jackson.databind.JsonNode;
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import server.logic.ws_protocol.JSON.handlers.blockchain.Net_AddBlock_Handler;
|
import server.logic.ws_protocol.JSON.handlers.blockchain.Net_AddBlock_Handler;
|
||||||
|
import server.sync.BlockchainResyncGuard;
|
||||||
|
import shine.db.DbController;
|
||||||
|
import utils.config.AppConfig;
|
||||||
import shine.db.dao.ArweaveBlockImportDAO;
|
import shine.db.dao.ArweaveBlockImportDAO;
|
||||||
import shine.db.dao.BlockchainStateDAO;
|
import shine.db.dao.BlockchainStateDAO;
|
||||||
import shine.db.dao.BlocksDAO;
|
import shine.db.dao.BlocksDAO;
|
||||||
|
import shine.db.dao.BlockchainForkSegmentsDAO;
|
||||||
|
import shine.db.dao.CanonicalChainResolver;
|
||||||
|
import shine.db.dao.ChannelReadStateDAO;
|
||||||
|
import shine.db.dao.BlockchainResyncCleanupDAO;
|
||||||
import shine.db.dao.SolanaUserPdaCurrentDAO;
|
import shine.db.dao.SolanaUserPdaCurrentDAO;
|
||||||
import shine.db.entities.BlockchainStateEntry;
|
import shine.db.entities.BlockchainStateEntry;
|
||||||
import shine.db.entities.SolanaUserPdaCurrentEntry;
|
import shine.db.entities.SolanaUserPdaCurrentEntry;
|
||||||
|
|
||||||
|
import java.io.ByteArrayOutputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
import java.net.URI;
|
import java.net.URI;
|
||||||
import java.net.http.HttpClient;
|
import java.net.http.HttpClient;
|
||||||
import java.net.http.HttpRequest;
|
import java.net.http.HttpRequest;
|
||||||
import java.net.http.HttpResponse;
|
import java.net.http.HttpResponse;
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.sql.Connection;
|
||||||
|
import java.sql.PreparedStatement;
|
||||||
|
import java.sql.ResultSet;
|
||||||
|
import java.sql.SQLException;
|
||||||
import java.time.Duration;
|
import java.time.Duration;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Discovers App=test5590 child DataItems, extracts their exact serialized bytes
|
* Discovers individual App=test5592 DataItems and imports the exact signed ANS-104 bytes.
|
||||||
* from the root ANS-104 bundle and imports them through the normal AddBlock checks.
|
* The importer is transport-agnostic: a DataItem may have reached Arweave through Turbo
|
||||||
|
* or inside a direct server-created ANS-104 bundle.
|
||||||
*/
|
*/
|
||||||
public final class ArweaveBlockSyncService {
|
public final class ArweaveBlockSyncService {
|
||||||
private static final Logger log = LoggerFactory.getLogger(ArweaveBlockSyncService.class);
|
private static final Logger log = LoggerFactory.getLogger(ArweaveBlockSyncService.class);
|
||||||
@@ -33,26 +48,46 @@ public final class ArweaveBlockSyncService {
|
|||||||
private static final Base64.Decoder B64URL = Base64.getUrlDecoder();
|
private static final Base64.Decoder B64URL = Base64.getUrlDecoder();
|
||||||
|
|
||||||
private final ArweaveBlocksConfig cfg;
|
private final ArweaveBlocksConfig cfg;
|
||||||
private final HttpClient http = HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(20)).build();
|
private final HttpClient http = HttpClient.newBuilder()
|
||||||
|
.connectTimeout(Duration.ofSeconds(20))
|
||||||
|
.followRedirects(HttpClient.Redirect.NORMAL)
|
||||||
|
.build();
|
||||||
|
private final VerifiedFreeRegistrationImporter registrationImporter = new VerifiedFreeRegistrationImporter(
|
||||||
|
AppConfig.getInstance().getBoolean("freeRegistration.email.allowReuse", false));
|
||||||
private final ArweaveBlockImportDAO importDAO = ArweaveBlockImportDAO.getInstance();
|
private final ArweaveBlockImportDAO importDAO = ArweaveBlockImportDAO.getInstance();
|
||||||
private final BlocksDAO blocksDAO = BlocksDAO.getInstance();
|
private final BlocksDAO blocksDAO = BlocksDAO.getInstance();
|
||||||
private final SolanaUserPdaCurrentDAO usersDAO = SolanaUserPdaCurrentDAO.getInstance();
|
private final SolanaUserPdaCurrentDAO usersDAO = SolanaUserPdaCurrentDAO.getInstance();
|
||||||
private final BlockchainStateDAO stateDAO = BlockchainStateDAO.getInstance();
|
private final BlockchainStateDAO stateDAO = BlockchainStateDAO.getInstance();
|
||||||
private final Net_AddBlock_Handler addBlock = new Net_AddBlock_Handler();
|
private final Net_AddBlock_Handler addBlock = new Net_AddBlock_Handler();
|
||||||
|
private final BlockchainForkSegmentsDAO segmentsDAO = BlockchainForkSegmentsDAO.getInstance();
|
||||||
|
private final CanonicalChainResolver canonical = CanonicalChainResolver.getInstance();
|
||||||
|
private final BlockchainResyncCleanupDAO cleanupDAO = BlockchainResyncCleanupDAO.getInstance();
|
||||||
|
|
||||||
|
// DataItem уже виден через GraphQL, но его физические координаты внутри ANS-104 bundle
|
||||||
|
// ещё не появились у индексатора. Полный discovery остаётся редким, а эти ID ретраятся часто.
|
||||||
|
private final Map<String, PendingDownload> unresolvedDownloads = new LinkedHashMap<>();
|
||||||
|
|
||||||
public ArweaveBlockSyncService(ArweaveBlocksConfig cfg) { this.cfg = cfg; }
|
public ArweaveBlockSyncService(ArweaveBlocksConfig cfg) { this.cfg = cfg; }
|
||||||
|
|
||||||
public void runCycle() throws Exception {
|
public void runCycle() throws Exception {
|
||||||
|
recoverInterruptedCanonicalRebuilds();
|
||||||
discover();
|
discover();
|
||||||
|
discoverFreeRegistrations();
|
||||||
drainQueue();
|
drainQueue();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Быстрый retry только для уже обнаруженных DataItem, без повторного полного GraphQL discovery. */
|
||||||
|
public void runRetryCycle() throws Exception {
|
||||||
|
int queued = retryPendingDownloads();
|
||||||
|
if (queued > 0) drainQueue();
|
||||||
|
}
|
||||||
|
|
||||||
private void discover() throws Exception {
|
private void discover() throws Exception {
|
||||||
long stored = importDAO.getLastBlockHeight();
|
long stored = importDAO.getLastBlockHeight();
|
||||||
long minHeight = Math.max(cfg.syncStartBlockHeight(), stored);
|
long minHeight = Math.max(cfg.syncStartBlockHeight(), stored);
|
||||||
String cursor = null;
|
String cursor = null;
|
||||||
long maxHeight = minHeight;
|
long maxHeight = minHeight;
|
||||||
Map<String, byte[]> rootCache = new HashMap<>();
|
long lowestRetryHeight = Long.MAX_VALUE;
|
||||||
int discovered = 0;
|
int discovered = 0;
|
||||||
|
|
||||||
do {
|
do {
|
||||||
@@ -66,70 +101,180 @@ public final class ArweaveBlockSyncService {
|
|||||||
for (JsonNode edge : edges) {
|
for (JsonNode edge : edges) {
|
||||||
nextCursor = edge.path("cursor").asText(null);
|
nextCursor = edge.path("cursor").asText(null);
|
||||||
JsonNode node = edge.path("node");
|
JsonNode node = edge.path("node");
|
||||||
String itemIdText = node.path("id").asText("").trim();
|
String dataItemId = node.path("id").asText("").trim();
|
||||||
String rootTx = node.path("bundledIn").path("id").asText("").trim();
|
|
||||||
long height = node.path("block").path("height").asLong(-1L);
|
long height = node.path("block").path("height").asLong(-1L);
|
||||||
if (itemIdText.isBlank() || rootTx.isBlank() || height < 0) continue;
|
if (dataItemId.isBlank() || height < 0) continue;
|
||||||
maxHeight = Math.max(maxHeight, height);
|
maxHeight = Math.max(maxHeight, height);
|
||||||
byte[] id32;
|
|
||||||
try { id32 = B64URL.decode(itemIdText); }
|
|
||||||
catch (IllegalArgumentException bad) { continue; }
|
|
||||||
if (id32.length != 32 || blocksDAO.existsByDataItemId(id32) || importDAO.exists(id32)) continue;
|
|
||||||
|
|
||||||
byte[] bundle = rootCache.computeIfAbsent(rootTx, key -> {
|
byte[] id32;
|
||||||
try { return downloadRootBundle(key); }
|
try {
|
||||||
catch (Exception e) { throw new RootDownloadRuntimeException(e); }
|
id32 = B64URL.decode(dataItemId);
|
||||||
});
|
if (id32.length != 32) throw new IllegalArgumentException("id length=" + id32.length);
|
||||||
byte[] raw = Ans104Bundle.find(bundle, id32, Math.max(cfg.publishMaxItems() * 4, 100_000));
|
} catch (Exception e) {
|
||||||
if (raw == null) throw new IOException("DataItem " + itemIdText + " not found in root bundle " + rootTx);
|
log.warn("Ignoring malformed Arweave DataItem id {}: {}", dataItemId, e.getMessage());
|
||||||
Ans104DataItem parsed = new Ans104DataItem(raw);
|
continue;
|
||||||
if (!parsed.hasTag(ArweaveBlocksConfig.TEST_TAG_NAME, ArweaveBlocksConfig.TEST_TAG_VALUE)) continue;
|
}
|
||||||
if (!parsed.verifySignature()) throw new IOException("Bad ANS-104 signature for " + itemIdText);
|
if (blocksDAO.existsByDataItemId(id32) || importDAO.exists(id32)) {
|
||||||
importDAO.enqueueIfMissing(id32, rootTx, height, raw, System.currentTimeMillis());
|
unresolvedDownloads.remove(dataItemId);
|
||||||
discovered++;
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
DownloadedDataItem downloaded = downloadSignedDataItem(dataItemId);
|
||||||
|
if (isRegistrationItem(downloaded.rawDataItem())) {
|
||||||
|
registrationImporter.importSigned(downloaded.rawDataItem(),
|
||||||
|
VerifiedFreeRegistrationImporter.Provenance.ARWEAVE_CONFIRMED);
|
||||||
|
unresolvedDownloads.remove(dataItemId);
|
||||||
|
continue; // Не парсить регистрацию как BchBlockEntry.
|
||||||
|
}
|
||||||
|
unresolvedDownloads.remove(dataItemId);
|
||||||
|
if (importDAO.enqueueIfMissing(id32, downloaded.rootTxId(), height, downloaded.rawDataItem(), System.currentTimeMillis())) discovered++;
|
||||||
|
} catch (RetryableDataItemDownloadException e) {
|
||||||
|
lowestRetryHeight = Math.min(lowestRetryHeight, height);
|
||||||
|
unresolvedDownloads.put(dataItemId, new PendingDownload(dataItemId, id32, height));
|
||||||
|
log.info("Signed DataItem {} visible at height {} but raw ANS-104 bytes are not ready yet; queued for fast retry: {}",
|
||||||
|
dataItemId, height, e.getMessage());
|
||||||
|
} catch (Exception e) {
|
||||||
|
lowestRetryHeight = Math.min(lowestRetryHeight, height);
|
||||||
|
log.warn("Cannot retrieve signed DataItem {} at height {} yet: {}", dataItemId, height, e.getMessage());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
boolean hasNext = txs.path("pageInfo").path("hasNextPage").asBoolean(false);
|
boolean hasNext = txs.path("pageInfo").path("hasNextPage").asBoolean(false);
|
||||||
cursor = hasNext ? nextCursor : null;
|
cursor = hasNext ? nextCursor : null;
|
||||||
if (hasNext && (cursor == null || cursor.isBlank())) throw new IOException("GraphQL hasNextPage without cursor");
|
if (hasNext && (cursor == null || cursor.isBlank())) throw new IOException("GraphQL hasNextPage without cursor");
|
||||||
} while (cursor != null);
|
} while (cursor != null);
|
||||||
|
|
||||||
// Keep one-height overlap: the next query includes this height and deduplicates IDs.
|
// Keep inclusive overlap. If a gateway has indexed GraphQL before offsets, do not advance past that item.
|
||||||
importDAO.setLastBlockHeight(maxHeight, System.currentTimeMillis());
|
long checkpoint = lowestRetryHeight == Long.MAX_VALUE ? maxHeight : Math.min(maxHeight, lowestRetryHeight);
|
||||||
if (discovered > 0) log.info("Arweave discovery queued {} new SHiNE test DataItems through height {}", discovered, maxHeight);
|
importDAO.setLastBlockHeight(checkpoint, System.currentTimeMillis());
|
||||||
|
if (discovered > 0) {
|
||||||
|
log.info("Arweave discovery queued {} new SHiNE test DataItems; checkpoint={}", discovered, checkpoint);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private int retryPendingDownloads() throws Exception {
|
||||||
|
if (unresolvedDownloads.isEmpty()) return 0;
|
||||||
|
|
||||||
|
int queued = 0;
|
||||||
|
int attempted = 0;
|
||||||
|
List<PendingDownload> snapshot = new ArrayList<>(unresolvedDownloads.values());
|
||||||
|
for (PendingDownload pending : snapshot) {
|
||||||
|
if (attempted >= cfg.syncPageSize()) break;
|
||||||
|
attempted++;
|
||||||
|
|
||||||
|
if (blocksDAO.existsByDataItemId(pending.id32()) || importDAO.exists(pending.id32())) {
|
||||||
|
unresolvedDownloads.remove(pending.dataItemId());
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
DownloadedDataItem downloaded;
|
||||||
|
try {
|
||||||
|
downloaded = downloadSignedDataItem(pending.dataItemId());
|
||||||
|
} catch (RetryableDataItemDownloadException e) {
|
||||||
|
// Переносим в конец LinkedHashMap, чтобы первые 100 зависших ID не блокировали retry следующих.
|
||||||
|
unresolvedDownloads.remove(pending.dataItemId());
|
||||||
|
unresolvedDownloads.put(pending.dataItemId(), pending);
|
||||||
|
log.debug("ANS-104 DataItem {} still waits for location/raw bytes: {}", pending.dataItemId(), e.getMessage());
|
||||||
|
continue;
|
||||||
|
} catch (Exception e) {
|
||||||
|
// Не долбим явно плохой ответ каждые 30 секунд. Полный discovery попробует его снова позднее.
|
||||||
|
unresolvedDownloads.remove(pending.dataItemId());
|
||||||
|
log.warn("Fast retry stopped for signed DataItem {} until next discovery: {}", pending.dataItemId(), e.getMessage());
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isRegistrationItem(downloaded.rawDataItem())) {
|
||||||
|
try {
|
||||||
|
registrationImporter.importSigned(downloaded.rawDataItem(),
|
||||||
|
VerifiedFreeRegistrationImporter.Provenance.ARWEAVE_CONFIRMED);
|
||||||
|
unresolvedDownloads.remove(pending.dataItemId());
|
||||||
|
} catch (Exception e) {
|
||||||
|
unresolvedDownloads.remove(pending.dataItemId());
|
||||||
|
unresolvedDownloads.put(pending.dataItemId(), pending);
|
||||||
|
log.debug("Registration {} awaits namespace/DB sync or retry: {}", pending.dataItemId(), e.getMessage());
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (importDAO.enqueueIfMissing(pending.id32(), downloaded.rootTxId(), pending.height(),
|
||||||
|
downloaded.rawDataItem(), System.currentTimeMillis())) {
|
||||||
|
queued++;
|
||||||
|
}
|
||||||
|
unresolvedDownloads.remove(pending.dataItemId());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (queued > 0) {
|
||||||
|
log.info("Fast Arweave retry queued {} signed DataItems; {} still unresolved", queued, unresolvedDownloads.size());
|
||||||
|
}
|
||||||
|
return queued;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void drainQueue() throws Exception {
|
private void drainQueue() throws Exception {
|
||||||
int passes = 0;
|
int passes = 0;
|
||||||
int importedTotal = 0;
|
int importedTotal = 0;
|
||||||
boolean progress;
|
boolean progress;
|
||||||
|
Set<String> replayedLogins = new HashSet<>();
|
||||||
do {
|
do {
|
||||||
progress = false;
|
progress = false;
|
||||||
List<ArweaveBlockImportDAO.QueueItem> pending = importDAO.listPending(cfg.syncQueueBatchSize());
|
|
||||||
|
// Phase 1 is global: validate every pending DataItem and discover all signed segment
|
||||||
|
// ancestry before any canonical/orphan decision is made.
|
||||||
|
prepareAllSegmentMetadata();
|
||||||
|
|
||||||
|
// Phase 2 is deterministic logical replay order, never Arweave height/order.
|
||||||
|
List<ArweaveBlockImportDAO.QueueItem> pending = importDAO.listPendingValidated(cfg.syncQueueBatchSize());
|
||||||
if (pending.isEmpty()) break;
|
if (pending.isEmpty()) break;
|
||||||
for (ArweaveBlockImportDAO.QueueItem q : pending) {
|
for (ArweaveBlockImportDAO.QueueItem q : pending) {
|
||||||
Ans104DataItem item;
|
if (q.parsedLogin() == null || q.parsedForkNumber() == null || q.parsedBlockNumber() == null) continue;
|
||||||
BchBlockEntry block;
|
SolanaUserPdaCurrentEntry activeUser = usersDAO.getByLogin(q.parsedLogin());
|
||||||
try {
|
if (activeUser == null || activeUser.getBlockchainName() == null || activeUser.getBlockchainName().isBlank()) {
|
||||||
item = new Ans104DataItem(q.rawDataItem());
|
importDAO.setPendingError(q.dataItemId(), "active_user_missing", System.currentTimeMillis());
|
||||||
if (!Arrays.equals(item.id32(), q.dataItemId())) throw new IllegalArgumentException("data_item_id mismatch");
|
continue;
|
||||||
if (!item.hasTag(ArweaveBlocksConfig.TEST_TAG_NAME, ArweaveBlocksConfig.TEST_TAG_VALUE)) throw new IllegalArgumentException("bad App tag");
|
}
|
||||||
if (!item.verifySignature()) throw new IllegalArgumentException("bad ANS-104 signature");
|
int activeFork = forkOf(activeUser.getBlockchainName());
|
||||||
block = new BchBlockEntry(q.rawDataItem());
|
if (!isAncestryComplete(q.parsedLogin(), activeFork)) {
|
||||||
} catch (Exception e) {
|
importDAO.setPendingError(q.dataItemId(), "ancestry_incomplete", System.currentTimeMillis());
|
||||||
importDAO.reject(q.dataItemId(), "invalid_data_item: " + e.getMessage(), System.currentTimeMillis());
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
SolanaUserPdaCurrentEntry user = usersDAO.getByBlockchainKey(item.owner32());
|
int canonicalFork;
|
||||||
if (user == null || user.getBlockchainName() == null || user.getBlockchainName().isBlank()) {
|
try (Connection cc = DbController.getInstance().getConnection()) {
|
||||||
importDAO.setPendingError(q.dataItemId(), "unknown_owner", System.currentTimeMillis());
|
canonicalFork = canonical.resolveFork(cc, q.parsedLogin(), activeFork, q.parsedBlockNumber());
|
||||||
|
}
|
||||||
|
if (canonicalFork != q.parsedForkNumber()) {
|
||||||
|
importDAO.reject(q.dataItemId(), "orphan_noncanonical", System.currentTimeMillis());
|
||||||
|
progress = true;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
ensureState(user);
|
|
||||||
Net_AddBlock_Handler.ArweaveImportResult result = addBlock.addBlockFromArweave(user.getBlockchainName(), q.rawDataItem());
|
Ans104DataItem item;
|
||||||
|
BchBlockEntry parsedBlock;
|
||||||
|
try {
|
||||||
|
item = new Ans104DataItem(q.rawDataItem());
|
||||||
|
parsedBlock = new BchBlockEntry(q.rawDataItem());
|
||||||
|
} catch (Exception e) {
|
||||||
|
// Should be impossible after metadata validation, but never trust persisted bytes blindly.
|
||||||
|
importDAO.reject(q.dataItemId(), "validated_item_reparse_failed: " + e.getMessage(), System.currentTimeMillis());
|
||||||
|
progress = true;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
SolanaUserPdaCurrentEntry physicalUser = usersDAO.getByBlockchainKey(item.owner32());
|
||||||
|
if (physicalUser == null || physicalUser.getBlockchainName() == null
|
||||||
|
|| !q.parsedLogin().equalsIgnoreCase(physicalUser.getLogin())
|
||||||
|
|| forkOf(physicalUser.getBlockchainName()) != q.parsedForkNumber()) {
|
||||||
|
importDAO.reject(q.dataItemId(), "validated_owner_mapping_changed", System.currentTimeMillis());
|
||||||
|
progress = true;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
ensureState(physicalUser, parsedBlock);
|
||||||
|
Net_AddBlock_Handler.ArweaveImportResult result = addBlock.addBlockFromReplay(
|
||||||
|
physicalUser.getBlockchainName(), q.rawDataItem());
|
||||||
if (result.ok()) {
|
if (result.ok()) {
|
||||||
importDAO.delete(q.dataItemId());
|
importDAO.delete(q.dataItemId());
|
||||||
importedTotal++; progress = true;
|
importedTotal++;
|
||||||
|
replayedLogins.add(q.parsedLogin());
|
||||||
|
progress = true;
|
||||||
|
rebuildIfLocalOrphansExist(q.parsedLogin(), activeFork);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
String reason = result.reasonCode();
|
String reason = result.reasonCode();
|
||||||
@@ -139,26 +284,299 @@ public final class ArweaveBlockSyncService {
|
|||||||
importDAO.setPendingError(q.dataItemId(), reason, System.currentTimeMillis());
|
importDAO.setPendingError(q.dataItemId(), reason, System.currentTimeMillis());
|
||||||
} else {
|
} else {
|
||||||
importDAO.reject(q.dataItemId(), reason, System.currentTimeMillis());
|
importDAO.reject(q.dataItemId(), reason, System.currentTimeMillis());
|
||||||
|
progress = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
passes++;
|
passes++;
|
||||||
} while (progress && passes < 8);
|
} while (progress && passes < 1000);
|
||||||
|
|
||||||
|
// Replay deliberately suppresses live unread/push side effects. Recompute the server-owned
|
||||||
|
// unread projection from final canonical channel contents and preserved signed read_count.
|
||||||
|
if (!replayedLogins.isEmpty()) {
|
||||||
|
try (Connection c = DbController.getInstance().getConnection()) {
|
||||||
|
boolean ac = c.getAutoCommit(); c.setAutoCommit(false);
|
||||||
|
try {
|
||||||
|
for (String login : replayedLogins) {
|
||||||
|
ChannelReadStateDAO.getInstance().recalculateUnreadForOwnedChannels(c, login, System.currentTimeMillis());
|
||||||
|
}
|
||||||
|
c.commit();
|
||||||
|
} catch (Exception e) {
|
||||||
|
c.rollback(); throw e;
|
||||||
|
} finally { c.setAutoCommit(ac); }
|
||||||
|
}
|
||||||
|
}
|
||||||
if (importedTotal > 0) log.info("Imported {} SHiNE test DataItems from Arweave", importedTotal);
|
if (importedTotal > 0) log.info("Imported {} SHiNE test DataItems from Arweave", importedTotal);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ensureState(SolanaUserPdaCurrentEntry user) throws Exception {
|
/**
|
||||||
BlockchainStateEntry existing = stateDAO.getByBlockchainName(user.getBlockchainName());
|
* Phase 1 of Arweave recovery: scan the complete persistent PENDING queue and register only
|
||||||
if (existing != null) return;
|
* immutable segment ancestry metadata. No block is applied or rejected here.
|
||||||
BlockchainStateEntry s = new BlockchainStateEntry();
|
*/
|
||||||
s.setBlockchainName(user.getBlockchainName()); s.setLogin(user.getLogin()); s.setBlockchainKey(user.getBlockchainKey());
|
private void prepareAllSegmentMetadata() throws Exception {
|
||||||
s.setSizeLimit(user.getPaidLimitBytes() > 0 ? user.getPaidLimitBytes() : 100_000L);
|
String sql = "SELECT data_item_id,raw_data_item FROM arweave_block_import_queue WHERE status=? AND metadata_validated=FALSE ORDER BY block_height DESC, first_seen_at_ms DESC";
|
||||||
s.setFileSizeBytes(0L); s.setLastBlockNumber(-1); s.setLastBlockHash(null); s.setUpdatedAtMs(System.currentTimeMillis());
|
try (Connection c = DbController.getInstance().getConnection();
|
||||||
stateDAO.insertIfMissing(s);
|
PreparedStatement ps = c.prepareStatement(sql)) {
|
||||||
|
ps.setString(1, ArweaveBlockImportDAO.STATUS_PENDING);
|
||||||
|
ps.setFetchSize(Math.max(100, cfg.syncQueueBatchSize()));
|
||||||
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
|
while (rs.next()) {
|
||||||
|
byte[] id = rs.getBytes(1);
|
||||||
|
byte[] raw = rs.getBytes(2);
|
||||||
|
if (raw == null || raw.length == 0) {
|
||||||
|
importDAO.reject(id, "empty_data_item", System.currentTimeMillis());
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
// Metadata is trusted only after complete ANS-104 validation.
|
||||||
|
Ans104DataItem item = new Ans104DataItem(raw);
|
||||||
|
if (!Arrays.equals(item.id32(), id)) throw new IllegalArgumentException("data_item_id mismatch");
|
||||||
|
if (!item.hasTag(ArweaveBlocksConfig.TEST_TAG_NAME, ArweaveBlocksConfig.TEST_TAG_VALUE))
|
||||||
|
throw new IllegalArgumentException("bad App tag");
|
||||||
|
if (!item.verifySignature()) throw new IllegalArgumentException("bad ANS-104 signature");
|
||||||
|
BchBlockEntry b = new BchBlockEntry(raw);
|
||||||
|
|
||||||
|
SolanaUserPdaCurrentEntry owner = usersDAO.getByBlockchainKey(item.owner32());
|
||||||
|
if (owner == null || owner.getBlockchainName() == null || owner.getLogin() == null) {
|
||||||
|
importDAO.setPendingError(id, "unknown_owner", System.currentTimeMillis());
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
int fork = forkOf(owner.getBlockchainName());
|
||||||
|
|
||||||
|
// Only signed structural anchor blocks can create/modify ancestry metadata.
|
||||||
|
if (fork == 1 && b.blockNumber == 0) {
|
||||||
|
if (!(b.body instanceof blockchain.body.HeaderBody))
|
||||||
|
throw new IllegalArgumentException("fork1 block #0 is not HEADER");
|
||||||
|
segmentsDAO.upsert(c, new BlockchainForkSegmentsDAO.Segment(
|
||||||
|
owner.getLogin(), 1, null, -1, null, 0, System.currentTimeMillis()));
|
||||||
|
} else if (b.body instanceof blockchain.body.ForkBody fb) {
|
||||||
|
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);
|
||||||
|
if (parent == null || parent.getBlockchainName() == null
|
||||||
|
|| !owner.getLogin().equalsIgnoreCase(parent.getLogin()))
|
||||||
|
throw new IllegalArgumentException("TECH_FORK parent owner mismatch");
|
||||||
|
int parentFork = forkOf(parent.getBlockchainName());
|
||||||
|
if (parentFork >= fork) throw new IllegalArgumentException("TECH_FORK parent fork is not older");
|
||||||
|
segmentsDAO.upsert(c, new BlockchainForkSegmentsDAO.Segment(
|
||||||
|
owner.getLogin(), fork, parentFork,
|
||||||
|
fb.forkPointBlockNumber, fb.forkPointBlockHash32,
|
||||||
|
fb.forkPointBlockNumber + 1, System.currentTimeMillis()));
|
||||||
|
}
|
||||||
|
|
||||||
|
importDAO.markMetadataValidated(id, owner.getLogin(), fork, b.blockNumber, b.getHash32(), System.currentTimeMillis());
|
||||||
|
} catch (Exception e) {
|
||||||
|
importDAO.reject(id, "invalid_data_item: " + e.getMessage(), System.currentTimeMillis());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** True only when rotation ancestry is known all the way back to fork1. */
|
||||||
|
private boolean isAncestryComplete(String login, int activeFork) throws Exception {
|
||||||
|
int f = activeFork;
|
||||||
|
Set<Integer> seen = new HashSet<>();
|
||||||
|
while (true) {
|
||||||
|
if (f < 1 || !seen.add(f)) return false;
|
||||||
|
BlockchainForkSegmentsDAO.Segment seg = segmentsDAO.get(login, f);
|
||||||
|
if (seg == null) return false;
|
||||||
|
if (seg.parentForkNumber() == null) {
|
||||||
|
return f == 1 && seg.firstPhysicalBlockNumber() == 0;
|
||||||
|
}
|
||||||
|
f = seg.parentForkNumber();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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);
|
||||||
|
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;
|
||||||
|
if(seg!=null&&seg.parentForkNumber()!=null){
|
||||||
|
s.setLastBlockNumber(seg.forkPointBlockNumber());s.setLastBlockHash(seg.forkPointBlockHash());
|
||||||
|
try(var c=shine.db.DbController.getInstance().getConnection();var ps=c.prepareStatement("SELECT COALESCE(SUM(octet_length(block_bytes)),0) FROM blocks_store WHERE LOWER(login)=LOWER(?) AND block_number<=? AND fork_number=shine_canonical_fork(?,?,block_number)")){
|
||||||
|
ps.setString(1,user.getLogin());ps.setInt(2,seg.forkPointBlockNumber());ps.setString(3,user.getLogin());ps.setInt(4,seg.parentForkNumber());try(var rs=ps.executeQuery()){if(rs.next())s.setFileSizeBytes(rs.getLong(1));}
|
||||||
|
}
|
||||||
|
} else{s.setLastBlockNumber(-1);s.setLastBlockHash(null);}
|
||||||
|
s.setUpdatedAtMs(System.currentTimeMillis());stateDAO.insertIfMissing(s);
|
||||||
|
if(existing!=null)stateDAO.upsert(s);
|
||||||
|
}
|
||||||
|
private static int forkOf(String n){int d=n.lastIndexOf('-');return Integer.parseInt(n.substring(d+1));}
|
||||||
|
|
||||||
|
/** Resume a durable canonical rebuild that was interrupted after staging/cleanup/replay. */
|
||||||
|
private void recoverInterruptedCanonicalRebuilds() throws Exception {
|
||||||
|
List<String> logins=new ArrayList<>();
|
||||||
|
try(Connection c=DbController.getInstance().getConnection();
|
||||||
|
PreparedStatement ps=c.prepareStatement("SELECT DISTINCT login FROM canonical_rebuild_staging ORDER BY login");
|
||||||
|
ResultSet rs=ps.executeQuery()){
|
||||||
|
while(rs.next())logins.add(rs.getString(1));
|
||||||
|
}
|
||||||
|
for(String login:logins){
|
||||||
|
SolanaUserPdaCurrentEntry u=usersDAO.getByLogin(login);
|
||||||
|
if(u==null||u.getBlockchainName()==null)continue;
|
||||||
|
replayDurableCanonicalStaging(login,forkOf(u.getBlockchainName()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A server may learn a deep fork only through Arweave after already materializing the old branch.
|
||||||
|
* If any local raw block is non-canonical under the current PDA fork, stage the canonical raw set
|
||||||
|
* and rebuild projections exactly like local key rotation does.
|
||||||
|
*/
|
||||||
|
private void rebuildIfLocalOrphansExist(String login,int activeFork)throws Exception{
|
||||||
|
if(!hasNonCanonicalLocalBlocks(login,activeFork))return;
|
||||||
|
if(!hasGenericStaging(login))stageLocalCanonicalBlocks(login,activeFork);
|
||||||
|
validateGenericStaging(login);
|
||||||
|
replayDurableCanonicalStaging(login,activeFork);
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean hasNonCanonicalLocalBlocks(String login,int activeFork)throws SQLException{
|
||||||
|
String sql="SELECT 1 FROM blocks_store b WHERE LOWER(b.login)=LOWER(?) AND b.fork_number<>shine_canonical_fork(?,?,b.block_number) LIMIT 1";
|
||||||
|
try(Connection c=DbController.getInstance().getConnection();PreparedStatement ps=c.prepareStatement(sql)){
|
||||||
|
ps.setString(1,login);ps.setString(2,login);ps.setInt(3,activeFork);try(ResultSet rs=ps.executeQuery()){return rs.next();}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
private boolean hasGenericStaging(String login)throws SQLException{
|
||||||
|
try(Connection c=DbController.getInstance().getConnection();PreparedStatement ps=c.prepareStatement("SELECT 1 FROM canonical_rebuild_staging WHERE LOWER(login)=LOWER(?) LIMIT 1")){
|
||||||
|
ps.setString(1,login);try(ResultSet rs=ps.executeQuery()){return rs.next();}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
private void stageLocalCanonicalBlocks(String login,int activeFork)throws Exception{
|
||||||
|
try(Connection c=DbController.getInstance().getConnection()){boolean ac=c.getAutoCommit();c.setAutoCommit(false);try{
|
||||||
|
try(PreparedStatement d=c.prepareStatement("DELETE FROM canonical_rebuild_staging WHERE LOWER(login)=LOWER(?)")){d.setString(1,login);d.executeUpdate();}
|
||||||
|
String q="""
|
||||||
|
SELECT block_number,fork_number,block_bytes,block_hash
|
||||||
|
FROM blocks_store b
|
||||||
|
WHERE LOWER(login)=LOWER(?) AND fork_number=shine_canonical_fork(?,?,block_number)
|
||||||
|
ORDER BY block_number ASC
|
||||||
|
""";
|
||||||
|
String ins="INSERT INTO canonical_rebuild_staging(login,logical_block_number,physical_fork_number,block_bytes,block_hash) VALUES(?,?,?,?,?)";
|
||||||
|
try(PreparedStatement ps=c.prepareStatement(q);PreparedStatement out=c.prepareStatement(ins)){
|
||||||
|
ps.setString(1,login);ps.setString(2,login);ps.setInt(3,activeFork);
|
||||||
|
try(ResultSet rs=ps.executeQuery()){while(rs.next()){
|
||||||
|
out.setString(1,login);out.setInt(2,rs.getInt(1));out.setInt(3,rs.getInt(2));out.setBytes(4,rs.getBytes(3));out.setBytes(5,rs.getBytes(4));out.addBatch();
|
||||||
|
}}out.executeBatch();
|
||||||
|
}
|
||||||
|
c.commit();
|
||||||
|
}catch(Exception e){c.rollback();throw e;}finally{c.setAutoCommit(ac);}}
|
||||||
|
}
|
||||||
|
private void validateGenericStaging(String login)throws Exception{
|
||||||
|
int expected=0,last=-1;byte[] previous=null;
|
||||||
|
try(Connection c=DbController.getInstance().getConnection();PreparedStatement ps=c.prepareStatement("SELECT logical_block_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);byte[] raw=rs.getBytes(2),hash=rs.getBytes(3);if(n!=expected)throw new IllegalStateException("canonical staging gap for "+login+": expected #"+expected+" got #"+n);
|
||||||
|
BchBlockEntry b=new BchBlockEntry(raw);if(b.blockNumber!=n)throw new IllegalStateException("canonical staging block mismatch #"+n);
|
||||||
|
if(n==0&&!(b.body instanceof blockchain.body.HeaderBody))throw new IllegalStateException("canonical staging must start HEADER #0");
|
||||||
|
if(n>0&&(previous==null||!Arrays.equals(b.prevHash32,previous)))throw new IllegalStateException("canonical staging prevHash mismatch #"+n);
|
||||||
|
if(hash==null||hash.length!=32||!Arrays.equals(hash,b.getHash32()))throw new IllegalStateException("canonical staging hash mismatch #"+n);
|
||||||
|
previous=hash;last=n;expected++;
|
||||||
|
}}
|
||||||
|
}
|
||||||
|
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);
|
||||||
|
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;
|
||||||
|
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;}
|
||||||
|
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;
|
||||||
|
}}
|
||||||
|
}
|
||||||
|
cleanupDAO.finalizeCanonicalReplay(login);
|
||||||
|
try(Connection c=DbController.getInstance().getConnection();PreparedStatement ps=c.prepareStatement("DELETE FROM canonical_rebuild_staging WHERE LOWER(login)=LOWER(?)")){ps.setString(1,login);ps.executeUpdate();}
|
||||||
|
}finally{BlockchainResyncGuard.end(activeName);}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/** Независимый GraphQL курсор для t=reg: не смешивается с блоковой очередью. */
|
||||||
|
private void discoverFreeRegistrations() throws Exception {
|
||||||
|
long stored;
|
||||||
|
try (Connection c = DbController.getInstance().getConnection();
|
||||||
|
PreparedStatement ps = c.prepareStatement(
|
||||||
|
"SELECT last_block_height FROM free_registration_arweave_sync_state WHERE id=1");
|
||||||
|
ResultSet rs = ps.executeQuery()) {
|
||||||
|
stored = rs.next() ? rs.getLong(1) : 0;
|
||||||
|
}
|
||||||
|
long minHeight = Math.max(cfg.syncStartBlockHeight(), stored);
|
||||||
|
long high = minHeight;
|
||||||
|
long retryFrom = Long.MAX_VALUE;
|
||||||
|
String cursor = null;
|
||||||
|
int count = 0;
|
||||||
|
do {
|
||||||
|
JsonNode response = graphQlPage(minHeight, cursor, true);
|
||||||
|
if (response.has("errors")) throw new IOException("Registration GraphQL errors: " + response.path("errors"));
|
||||||
|
JsonNode txs = response.path("data").path("transactions");
|
||||||
|
JsonNode edges = txs.path("edges");
|
||||||
|
if (!edges.isArray()) throw new IOException("Registration GraphQL returned no edges");
|
||||||
|
String next = null;
|
||||||
|
for (JsonNode edge : edges) {
|
||||||
|
next = edge.path("cursor").asText(null);
|
||||||
|
JsonNode node = edge.path("node");
|
||||||
|
String id = node.path("id").asText("").trim();
|
||||||
|
long height = node.path("block").path("height").asLong(-1);
|
||||||
|
if (id.isBlank() || height < 0) continue; // мгновенный Turbo-импорт не зависит от height
|
||||||
|
high = Math.max(high, height);
|
||||||
|
try {
|
||||||
|
byte[] idBytes = B64URL.decode(id);
|
||||||
|
if (idBytes.length != 32) throw new IllegalArgumentException("Malformed id");
|
||||||
|
DownloadedDataItem item = downloadSignedDataItem(id);
|
||||||
|
if (!isRegistrationItem(item.rawDataItem()))
|
||||||
|
throw new IllegalArgumentException("GraphQL registration tag is not present in signed bytes");
|
||||||
|
registrationImporter.importSigned(item.rawDataItem(),
|
||||||
|
VerifiedFreeRegistrationImporter.Provenance.ARWEAVE_CONFIRMED);
|
||||||
|
count++;
|
||||||
|
} catch (RetryableDataItemDownloadException e) {
|
||||||
|
retryFrom = Math.min(retryFrom, height);
|
||||||
|
log.debug("Registration DataItem {} is not downloadable yet", id);
|
||||||
|
} catch (IllegalArgumentException e) {
|
||||||
|
log.warn("Rejecting invalid registration DataItem {}: {}", id, e.getMessage());
|
||||||
|
} catch (Exception e) {
|
||||||
|
retryFrom = Math.min(retryFrom, height);
|
||||||
|
log.warn("Registration DataItem {} import deferred: {}", id, e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
cursor = txs.path("pageInfo").path("hasNextPage").asBoolean(false) ? next : null;
|
||||||
|
if (txs.path("pageInfo").path("hasNextPage").asBoolean(false) && (cursor == null || cursor.isBlank()))
|
||||||
|
throw new IOException("Registration GraphQL cursor missing");
|
||||||
|
} while (cursor != null);
|
||||||
|
long checkpoint = retryFrom == Long.MAX_VALUE ? high : Math.min(high, retryFrom);
|
||||||
|
try (Connection c = DbController.getInstance().getConnection();
|
||||||
|
PreparedStatement ps = c.prepareStatement("""
|
||||||
|
UPDATE free_registration_arweave_sync_state
|
||||||
|
SET last_block_height=?, updated_at_ms=? WHERE id=1
|
||||||
|
""")) {
|
||||||
|
ps.setLong(1, checkpoint); ps.setLong(2, System.currentTimeMillis()); ps.executeUpdate();
|
||||||
|
}
|
||||||
|
if (count > 0) log.info("Registration discovery verified {} DataItems; checkpoint={}", count, checkpoint);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean isRegistrationItem(byte[] raw) {
|
||||||
|
Ans104DataItem item = new Ans104DataItem(raw);
|
||||||
|
return item.tags().contains(new Ans104DataItem.Tag("t", "reg"));
|
||||||
}
|
}
|
||||||
|
|
||||||
private JsonNode graphQlPage(long minHeight, String cursor) throws Exception {
|
private JsonNode graphQlPage(long minHeight, String cursor) throws Exception {
|
||||||
|
return graphQlPage(minHeight, cursor, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
private JsonNode graphQlPage(long minHeight, String cursor, boolean registrationsOnly) throws Exception {
|
||||||
String after = cursor == null ? "null" : "\"" + escapeGraphQl(cursor) + "\"";
|
String after = cursor == null ? "null" : "\"" + escapeGraphQl(cursor) + "\"";
|
||||||
String query = "query { transactions(tags:[{name:\"App\",values:[\"test5590\"]}], block:{min:" + minHeight + "}, first:" + cfg.syncPageSize() + ", after:" + after + ", sort:HEIGHT_ASC) { pageInfo { hasNextPage } edges { cursor node { id bundledIn { id } block { height } } } } }";
|
String tagFilter = "{name:\"" + ArweaveBlocksConfig.TEST_TAG_NAME + "\",values:[\""
|
||||||
|
+ ArweaveBlocksConfig.TEST_TAG_VALUE + "\"]}" +
|
||||||
|
(registrationsOnly ? ",{name:\"t\",values:[\"reg\"]}" : "");
|
||||||
|
String query = "query { transactions(tags:[" + tagFilter + "], block:{min:" + minHeight + "}, first:"
|
||||||
|
+ cfg.syncPageSize() + ", after:" + after
|
||||||
|
+ ", sort:HEIGHT_ASC) { pageInfo { hasNextPage } edges { cursor node { id block { height } } } } }";
|
||||||
String body = MAPPER.writeValueAsString(Map.of("query", query));
|
String body = MAPPER.writeValueAsString(Map.of("query", query));
|
||||||
HttpRequest req = HttpRequest.newBuilder(URI.create(trim(cfg.syncGateway()) + "/graphql"))
|
HttpRequest req = HttpRequest.newBuilder(URI.create(trim(cfg.syncGateway()) + "/graphql"))
|
||||||
.timeout(Duration.ofSeconds(60)).header("Content-Type","application/json").header("Accept","application/json")
|
.timeout(Duration.ofSeconds(60)).header("Content-Type","application/json").header("Accept","application/json")
|
||||||
@@ -168,18 +586,206 @@ public final class ArweaveBlockSyncService {
|
|||||||
return MAPPER.readTree(resp.body());
|
return MAPPER.readTree(resp.body());
|
||||||
}
|
}
|
||||||
|
|
||||||
private byte[] downloadRootBundle(String txId) throws Exception {
|
/**
|
||||||
HttpRequest req = HttpRequest.newBuilder(URI.create(trim(cfg.syncGateway()) + "/" + txId))
|
* Gateway по /{dataItemId} обычно отдаёт только payload. Для импорта SHiNE нужен полный
|
||||||
.timeout(Duration.ofMinutes(5)).GET().build();
|
* подписанный ANS-104 DataItem, поэтому сначала резолвим rootTx + offset + size, а затем
|
||||||
HttpResponse<byte[]> resp = http.send(req, HttpResponse.BodyHandlers.ofByteArray());
|
* читаем точный range из root L1 transaction.
|
||||||
if (resp.statusCode() < 200 || resp.statusCode() >= 300) throw new IOException("Arweave root HTTP " + resp.statusCode() + " tx=" + txId);
|
*/
|
||||||
byte[] body = resp.body();
|
private DownloadedDataItem downloadSignedDataItem(String dataItemId) throws Exception {
|
||||||
if (body == null || body.length == 0) throw new IOException("Empty Arweave root bundle " + txId);
|
DataItemLocation location = resolveDataItemLocation(dataItemId);
|
||||||
if (body.length > cfg.syncMaxRootBundleBytes()) throw new IOException("Root bundle exceeds syncMaxRootBundleBytes: " + body.length);
|
long endInclusive = location.rootOffset() + location.size() - 1;
|
||||||
return body;
|
|
||||||
|
HttpRequest req = HttpRequest.newBuilder(URI.create(trim(cfg.syncGateway()) + "/raw/" + location.rootTxId()))
|
||||||
|
.timeout(Duration.ofMinutes(2))
|
||||||
|
.header("Range", "bytes=" + location.rootOffset() + "-" + endInclusive)
|
||||||
|
.header("Accept", "application/octet-stream")
|
||||||
|
.GET().build();
|
||||||
|
HttpResponse<InputStream> resp = http.send(req, HttpResponse.BodyHandlers.ofInputStream());
|
||||||
|
try (InputStream in = resp.body()) {
|
||||||
|
if (resp.statusCode() != 206) {
|
||||||
|
if (isRetryableHttpStatus(resp.statusCode())) {
|
||||||
|
throw new RetryableDataItemDownloadException(
|
||||||
|
"root range is temporarily unavailable via " + location.source() + ": HTTP " + resp.statusCode());
|
||||||
|
}
|
||||||
|
throw new IOException("Gateway ignored root range for DataItem " + dataItemId + ": HTTP " + resp.statusCode());
|
||||||
|
}
|
||||||
|
byte[] bytes = readExactlyBounded(in, Math.toIntExact(location.size()));
|
||||||
|
if (bytes.length != location.size()) {
|
||||||
|
throw new RetryableDataItemDownloadException(
|
||||||
|
"truncated DataItem range: expected=" + location.size() + " got=" + bytes.length);
|
||||||
|
}
|
||||||
|
Ans104DataItem parsed = new Ans104DataItem(bytes);
|
||||||
|
byte[] expectedId = B64URL.decode(dataItemId);
|
||||||
|
if (!Arrays.equals(parsed.id32(), expectedId)) {
|
||||||
|
throw new IOException("Range returned another ANS-104 DataItem for " + dataItemId);
|
||||||
|
}
|
||||||
|
return new DownloadedDataItem(location.rootTxId(), bytes);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Координаты считаются только подсказкой транспорта: источник может ошибиться, поэтому после
|
||||||
|
* range-read всё равно обязательно сверяется настоящий ANS-104 DataItem ID и затем подпись.
|
||||||
|
*/
|
||||||
|
private DataItemLocation resolveDataItemLocation(String dataItemId) throws Exception {
|
||||||
|
List<String> misses = new ArrayList<>(3);
|
||||||
|
|
||||||
|
try {
|
||||||
|
DataItemLocation location = getArIoIndexedLocation(dataItemId);
|
||||||
|
if (location != null) return location;
|
||||||
|
misses.add("ar-io=404");
|
||||||
|
} catch (Exception e) {
|
||||||
|
misses.add("ar-io=" + shortError(e));
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
DataItemLocation location = getTurboLocation(dataItemId);
|
||||||
|
if (location != null) return location;
|
||||||
|
misses.add("turbo=404");
|
||||||
|
} catch (Exception e) {
|
||||||
|
misses.add("turbo=" + shortError(e));
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
DataItemLocation location = getHeadLocation(dataItemId);
|
||||||
|
if (location != null) return location;
|
||||||
|
misses.add("head=no-location");
|
||||||
|
} catch (Exception e) {
|
||||||
|
misses.add("head=" + shortError(e));
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new RetryableDataItemDownloadException(
|
||||||
|
"ANS-104 location not available yet (" + String.join(", ", misses) + ")");
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Самый дешёвый путь: локальный индекс AR.IO gateway. */
|
||||||
|
private DataItemLocation getArIoIndexedLocation(String dataItemId) throws Exception {
|
||||||
|
HttpRequest req = HttpRequest.newBuilder(URI.create(trim(cfg.syncGateway()) + "/ar-io/offsets/" + dataItemId))
|
||||||
|
.timeout(Duration.ofSeconds(30)).header("Accept", "application/json").GET().build();
|
||||||
|
HttpResponse<String> resp = http.send(req, HttpResponse.BodyHandlers.ofString(StandardCharsets.UTF_8));
|
||||||
|
if (resp.statusCode() == 404) return null;
|
||||||
|
if (resp.statusCode() < 200 || resp.statusCode() >= 300) {
|
||||||
|
throw new IOException("HTTP " + resp.statusCode() + ": " + safe(resp.body()));
|
||||||
|
}
|
||||||
|
JsonNode offsets = MAPPER.readTree(resp.body());
|
||||||
|
return validateLocation("ar-io", dataItemId,
|
||||||
|
offsets.path("rootTxId").asText("").trim(),
|
||||||
|
offsets.path("rootOffset").asLong(-1L),
|
||||||
|
offsets.path("size").asLong(-1L));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Turbo часто знает координаты раньше общего gateway index. */
|
||||||
|
private DataItemLocation getTurboLocation(String dataItemId) throws Exception {
|
||||||
|
HttpRequest req = HttpRequest.newBuilder(URI.create(trim(cfg.syncTurboApiBase()) + "/tx/" + dataItemId + "/offsets"))
|
||||||
|
.timeout(Duration.ofSeconds(30)).header("Accept", "application/json").GET().build();
|
||||||
|
HttpResponse<String> resp = http.send(req, HttpResponse.BodyHandlers.ofString(StandardCharsets.UTF_8));
|
||||||
|
if (resp.statusCode() == 404) return null;
|
||||||
|
if (resp.statusCode() < 200 || resp.statusCode() >= 300) {
|
||||||
|
throw new IOException("HTTP " + resp.statusCode() + ": " + safe(resp.body()));
|
||||||
|
}
|
||||||
|
JsonNode offsets = MAPPER.readTree(resp.body());
|
||||||
|
return validateLocation("turbo", dataItemId,
|
||||||
|
offsets.path("rootBundleId").asText("").trim(),
|
||||||
|
offsets.path("startOffsetInRootBundle").asLong(-1L),
|
||||||
|
offsets.path("rawContentLength").asLong(-1L));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Последний fallback: успешный HEAD/GET AR.IO может вернуть координаты DataItem в headers.
|
||||||
|
* Поддерживаем несколько имён headers, чтобы пережить различия версий gateway.
|
||||||
|
*/
|
||||||
|
private DataItemLocation getHeadLocation(String dataItemId) throws Exception {
|
||||||
|
HttpRequest req = HttpRequest.newBuilder(URI.create(trim(cfg.syncGateway()) + "/" + dataItemId))
|
||||||
|
.timeout(Duration.ofSeconds(45))
|
||||||
|
.header("Accept", "application/octet-stream")
|
||||||
|
.method("HEAD", HttpRequest.BodyPublishers.noBody())
|
||||||
|
.build();
|
||||||
|
HttpResponse<Void> resp = http.send(req, HttpResponse.BodyHandlers.discarding());
|
||||||
|
if (resp.statusCode() == 404) return null;
|
||||||
|
if (resp.statusCode() < 200 || resp.statusCode() >= 300) {
|
||||||
|
throw new IOException("HTTP " + resp.statusCode());
|
||||||
|
}
|
||||||
|
|
||||||
|
String rootTxId = firstHeader(resp, "X-AR-IO-Root-Transaction-Id");
|
||||||
|
long offset = firstLongHeader(resp,
|
||||||
|
"X-AR-IO-Root-Item-Offset",
|
||||||
|
"X-AR-IO-Root-Data-Item-Offset",
|
||||||
|
"X-AR-IO-Data-Item-Offset");
|
||||||
|
long size = firstLongHeader(resp,
|
||||||
|
"X-AR-IO-Root-Item-Size",
|
||||||
|
"X-AR-IO-Data-Item-Size");
|
||||||
|
if (rootTxId == null || offset < 0 || size <= 0) return null;
|
||||||
|
return validateLocation("head", dataItemId, rootTxId, offset, size);
|
||||||
|
}
|
||||||
|
|
||||||
|
private DataItemLocation validateLocation(String source, String dataItemId, String rootTxId, long rootOffset, long size)
|
||||||
|
throws IOException {
|
||||||
|
if (!isArweaveId(rootTxId) || rootOffset < 0 || size <= 0) {
|
||||||
|
throw new IOException("bad location for " + dataItemId + ": rootTxId=" + rootTxId
|
||||||
|
+ " offset=" + rootOffset + " size=" + size);
|
||||||
|
}
|
||||||
|
if (size > cfg.syncMaxDataItemBytes()) {
|
||||||
|
throw new IOException("DataItem exceeds syncMaxDataItemBytes: " + size);
|
||||||
|
}
|
||||||
|
if (size > Integer.MAX_VALUE) throw new IOException("DataItem is too large for in-memory import: " + size);
|
||||||
|
if (rootOffset > Long.MAX_VALUE - size) throw new IOException("DataItem offset overflow");
|
||||||
|
return new DataItemLocation(rootTxId, rootOffset, size, source);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String firstHeader(HttpResponse<?> response, String name) {
|
||||||
|
return response.headers().firstValue(name).map(String::trim).filter(v -> !v.isEmpty()).orElse(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static long firstLongHeader(HttpResponse<?> response, String... names) {
|
||||||
|
for (String name : names) {
|
||||||
|
String value = firstHeader(response, name);
|
||||||
|
if (value == null) continue;
|
||||||
|
try { return Long.parseLong(value); }
|
||||||
|
catch (NumberFormatException ignored) { }
|
||||||
|
}
|
||||||
|
return -1L;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean isArweaveId(String value) {
|
||||||
|
if (value == null || value.length() != 43) return false;
|
||||||
|
try { return B64URL.decode(value).length == 32; }
|
||||||
|
catch (IllegalArgumentException e) { return false; }
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean isRetryableHttpStatus(int status) {
|
||||||
|
return status == 404 || status == 408 || status == 425 || status == 429 || status >= 500;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String shortError(Exception e) {
|
||||||
|
String message = e.getMessage();
|
||||||
|
return safe(message == null || message.isBlank() ? e.getClass().getSimpleName() : message);
|
||||||
|
}
|
||||||
|
|
||||||
|
private record PendingDownload(String dataItemId, byte[] id32, long height) {}
|
||||||
|
private record DownloadedDataItem(String rootTxId, byte[] rawDataItem) {}
|
||||||
|
private record DataItemLocation(String rootTxId, long rootOffset, long size, String source) {}
|
||||||
|
|
||||||
|
private static final class RetryableDataItemDownloadException extends IOException {
|
||||||
|
private RetryableDataItemDownloadException(String message) { super(message); }
|
||||||
|
}
|
||||||
|
|
||||||
|
private static byte[] readExactlyBounded(InputStream in, int expected) throws IOException {
|
||||||
|
ByteArrayOutputStream out = new ByteArrayOutputStream(expected);
|
||||||
|
byte[] buf = new byte[Math.min(64 * 1024, Math.max(1024, expected))];
|
||||||
|
int remaining = expected;
|
||||||
|
while (remaining > 0) {
|
||||||
|
int n = in.read(buf, 0, Math.min(buf.length, remaining));
|
||||||
|
if (n < 0) break;
|
||||||
|
out.write(buf, 0, n);
|
||||||
|
remaining -= n;
|
||||||
|
}
|
||||||
|
return out.toByteArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String safe(String value) {
|
||||||
|
String v = value == null ? "" : value.replace('\n',' ').replace('\r',' ').trim();
|
||||||
|
return v.length() <= 500 ? v : v.substring(0, 500);
|
||||||
|
}
|
||||||
private static String trim(String s){return String.valueOf(s==null?"":s).trim().replaceAll("/+$","");}
|
private static String trim(String s){return String.valueOf(s==null?"":s).trim().replaceAll("/+$","");}
|
||||||
private static String escapeGraphQl(String s){return s.replace("\\","\\\\").replace("\"","\\\"");}
|
private static String escapeGraphQl(String s){return s.replace("\\","\\\\").replace("\"","\\\"");}
|
||||||
private static final class RootDownloadRuntimeException extends RuntimeException { RootDownloadRuntimeException(Throwable cause){super(cause);} }
|
|
||||||
}
|
}
|
||||||
|
|||||||
+50
-12
@@ -1,12 +1,15 @@
|
|||||||
package server.archive;
|
package server.archive;
|
||||||
|
|
||||||
|
import blockchain.Ans104DataItem;
|
||||||
|
import blockchain.ShineProtocolTags;
|
||||||
import utils.config.AppConfig;
|
import utils.config.AppConfig;
|
||||||
|
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
|
import java.util.Locale;
|
||||||
|
|
||||||
/** Configuration of the new per-user-block ANS-104 Arweave transport. */
|
/** Configuration of per-user-block ANS-104 Arweave/Turbo transport. */
|
||||||
public record ArweaveBlocksConfig(
|
public record ArweaveBlocksConfig(
|
||||||
boolean publishEnabled,
|
PublishMode publishMode,
|
||||||
int publishIntervalMinutes,
|
int publishIntervalMinutes,
|
||||||
int publishMaxItems,
|
int publishMaxItems,
|
||||||
long publishMaxBundleBytes,
|
long publishMaxBundleBytes,
|
||||||
@@ -15,22 +18,46 @@ public record ArweaveBlocksConfig(
|
|||||||
int minConfirmations,
|
int minConfirmations,
|
||||||
int confirmPollSeconds,
|
int confirmPollSeconds,
|
||||||
int confirmTimeoutMinutes,
|
int confirmTimeoutMinutes,
|
||||||
|
String turboUploadUrl,
|
||||||
|
String turboPaidByAddress,
|
||||||
|
Path turboWalletJwkPath,
|
||||||
boolean syncEnabled,
|
boolean syncEnabled,
|
||||||
int syncIntervalMinutes,
|
int syncIntervalMinutes,
|
||||||
int syncPageSize,
|
int syncPageSize,
|
||||||
int syncQueueBatchSize,
|
int syncQueueBatchSize,
|
||||||
long syncStartBlockHeight,
|
long syncStartBlockHeight,
|
||||||
long syncMaxRootBundleBytes,
|
long syncMaxDataItemBytes,
|
||||||
String syncGateway
|
String syncGateway,
|
||||||
|
String syncTurboApiBase,
|
||||||
|
int syncLocationRetrySeconds
|
||||||
) {
|
) {
|
||||||
public static final String TEST_TAG_NAME = "App";
|
public enum PublishMode {
|
||||||
public static final String TEST_TAG_VALUE = "test5590";
|
TURBO,
|
||||||
public static final String CHANNEL_TAG_NAME = "c";
|
ARWEAVE,
|
||||||
|
NONE;
|
||||||
|
|
||||||
|
static PublishMode parse(String value) {
|
||||||
|
String normalized = value == null ? "none" : value.trim().toLowerCase(Locale.ROOT);
|
||||||
|
return switch (normalized) {
|
||||||
|
case "turbo" -> TURBO;
|
||||||
|
case "arweave" -> ARWEAVE;
|
||||||
|
case "none", "" -> NONE;
|
||||||
|
default -> throw new IllegalArgumentException(
|
||||||
|
"arweave.blocks.publish.mode must be turbo, arweave or none; got: " + value);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static final String TEST_TAG_NAME = ShineProtocolTags.APP_TAG_NAME;
|
||||||
|
public static final String TEST_TAG_VALUE = ShineProtocolTags.APP_TAG_VALUE;
|
||||||
|
public static final String CHANNEL_TAG_NAME = ShineProtocolTags.CHANNEL_TAG_NAME;
|
||||||
|
|
||||||
public static ArweaveBlocksConfig load() {
|
public static ArweaveBlocksConfig load() {
|
||||||
AppConfig c = AppConfig.getInstance();
|
AppConfig c = AppConfig.getInstance();
|
||||||
|
long maxDataItemBytes = parseLong(c.getParam("arweave.blocks.sync.maxDataItemBytes"), Ans104DataItem.MAX_DATA_ITEM_BYTES);
|
||||||
|
if (maxDataItemBytes > Ans104DataItem.MAX_DATA_ITEM_BYTES) maxDataItemBytes = Ans104DataItem.MAX_DATA_ITEM_BYTES;
|
||||||
return new ArweaveBlocksConfig(
|
return new ArweaveBlocksConfig(
|
||||||
c.getBoolean("arweave.blocks.publish.enabled", false),
|
PublishMode.parse(c.getParam("arweave.blocks.publish.mode")),
|
||||||
positive(c.getInt("arweave.blocks.publish.intervalMinutes", 15), "publish.intervalMinutes"),
|
positive(c.getInt("arweave.blocks.publish.intervalMinutes", 15), "publish.intervalMinutes"),
|
||||||
positive(c.getInt("arweave.blocks.publish.maxItems", 10_000), "publish.maxItems"),
|
positive(c.getInt("arweave.blocks.publish.maxItems", 10_000), "publish.maxItems"),
|
||||||
positiveLong(parseLong(c.getParam("arweave.blocks.publish.maxBundleBytes"), 128L * 1024 * 1024), "publish.maxBundleBytes"),
|
positiveLong(parseLong(c.getParam("arweave.blocks.publish.maxBundleBytes"), 128L * 1024 * 1024), "publish.maxBundleBytes"),
|
||||||
@@ -39,23 +66,34 @@ public record ArweaveBlocksConfig(
|
|||||||
nonNegative(c.getInt("arweave.blocks.publish.minConfirmations", 0), "publish.minConfirmations"),
|
nonNegative(c.getInt("arweave.blocks.publish.minConfirmations", 0), "publish.minConfirmations"),
|
||||||
positive(c.getInt("arweave.blocks.publish.confirmPollSeconds", 30), "publish.confirmPollSeconds"),
|
positive(c.getInt("arweave.blocks.publish.confirmPollSeconds", 30), "publish.confirmPollSeconds"),
|
||||||
positive(c.getInt("arweave.blocks.publish.confirmTimeoutMinutes", 180), "publish.confirmTimeoutMinutes"),
|
positive(c.getInt("arweave.blocks.publish.confirmTimeoutMinutes", 180), "publish.confirmTimeoutMinutes"),
|
||||||
|
orDefault(c.getParam("arweave.blocks.publish.turbo.uploadUrl"), "https://turbo.ardrive.io/tx"),
|
||||||
|
blankToNull(c.getParam("arweave.blocks.publish.turbo.paidByAddress")),
|
||||||
|
optionalPath(c.getParam("arweave.blocks.publish.turbo.walletJwkPath")),
|
||||||
c.getBoolean("arweave.blocks.sync.enabled", false),
|
c.getBoolean("arweave.blocks.sync.enabled", false),
|
||||||
positive(c.getInt("arweave.blocks.sync.intervalMinutes", 15), "sync.intervalMinutes"),
|
positive(c.getInt("arweave.blocks.sync.intervalMinutes", 15), "sync.intervalMinutes"),
|
||||||
clamp(c.getInt("arweave.blocks.sync.pageSize", 100), 1, 100),
|
clamp(c.getInt("arweave.blocks.sync.pageSize", 100), 1, 100),
|
||||||
positive(c.getInt("arweave.blocks.sync.queueBatchSize", 10_000), "sync.queueBatchSize"),
|
positive(c.getInt("arweave.blocks.sync.queueBatchSize", 10_000), "sync.queueBatchSize"),
|
||||||
nonNegativeLong(parseLong(c.getParam("arweave.blocks.sync.startBlockHeight"), 0L), "sync.startBlockHeight"),
|
nonNegativeLong(parseLong(c.getParam("arweave.blocks.sync.startBlockHeight"), 0L), "sync.startBlockHeight"),
|
||||||
positiveLong(parseLong(c.getParam("arweave.blocks.sync.maxRootBundleBytes"), 256L * 1024 * 1024), "sync.maxRootBundleBytes"),
|
positiveLong(maxDataItemBytes, "sync.maxDataItemBytes"),
|
||||||
orDefault(c.getParam("arweave.blocks.sync.gateway"), "https://turbo-gateway.com")
|
orDefault(c.getParam("arweave.blocks.sync.gateway"), "https://turbo-gateway.com"),
|
||||||
|
orDefault(c.getParam("arweave.blocks.sync.turboApiBase"), "https://turbo.ardrive.io"),
|
||||||
|
positive(c.getInt("arweave.blocks.sync.locationRetrySeconds", 30), "sync.locationRetrySeconds")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean publishEnabled() { return publishMode != PublishMode.NONE; }
|
||||||
|
|
||||||
public void validatePublisher() {
|
public void validatePublisher() {
|
||||||
if (publishEnabled && walletJwkPath == null) {
|
if (publishMode == PublishMode.ARWEAVE && walletJwkPath == null) {
|
||||||
throw new IllegalArgumentException("arweave.blocks.publish.walletJwkPath is required when publisher is enabled");
|
throw new IllegalArgumentException("arweave.blocks.publish.walletJwkPath is required for mode=arweave");
|
||||||
|
}
|
||||||
|
if (publishMode == PublishMode.TURBO && (turboUploadUrl == null || turboUploadUrl.isBlank())) {
|
||||||
|
throw new IllegalArgumentException("arweave.blocks.publish.turbo.uploadUrl is required for mode=turbo");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String orDefault(String v, String d) { return v == null || v.isBlank() ? d : v.trim(); }
|
private static String orDefault(String v, String d) { return v == null || v.isBlank() ? d : v.trim(); }
|
||||||
|
private static String blankToNull(String v) { return v == null || v.isBlank() ? null : v.trim(); }
|
||||||
private static Path optionalPath(String v) { return v == null || v.isBlank() ? null : Path.of(v.trim()); }
|
private static Path optionalPath(String v) { return v == null || v.isBlank() ? null : Path.of(v.trim()); }
|
||||||
private static long parseLong(String v, long d) { return v == null || v.isBlank() ? d : Long.parseLong(v.trim()); }
|
private static long parseLong(String v, long d) { return v == null || v.isBlank() ? d : Long.parseLong(v.trim()); }
|
||||||
private static int positive(int v,String n){if(v<=0)throw new IllegalArgumentException(n+" must be >0");return v;}
|
private static int positive(int v,String n){if(v<=0)throw new IllegalArgumentException(n+" must be >0");return v;}
|
||||||
|
|||||||
+106
@@ -0,0 +1,106 @@
|
|||||||
|
package server.archive;
|
||||||
|
|
||||||
|
import blockchain.Ans104DataItem;
|
||||||
|
import com.fasterxml.jackson.databind.JsonNode;
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
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.security.MessageDigest;
|
||||||
|
import java.time.Duration;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.Base64;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
/** Uploads an already user-signed ANS-104 DataItem to Turbo without modifying it. */
|
||||||
|
public final class TurboDataItemUploader {
|
||||||
|
private static final ObjectMapper MAPPER = new ObjectMapper();
|
||||||
|
private static final Base64.Encoder B64URL = Base64.getUrlEncoder().withoutPadding();
|
||||||
|
private static final Base64.Decoder B64URL_DECODER = Base64.getUrlDecoder();
|
||||||
|
|
||||||
|
public record UploadResult(String dataItemId, String owner) {}
|
||||||
|
|
||||||
|
private final ArweaveBlocksConfig cfg;
|
||||||
|
private final HttpClient http = HttpClient.newBuilder()
|
||||||
|
.connectTimeout(Duration.ofSeconds(20))
|
||||||
|
.followRedirects(HttpClient.Redirect.NORMAL)
|
||||||
|
.build();
|
||||||
|
private volatile String resolvedPaidByAddress;
|
||||||
|
|
||||||
|
public TurboDataItemUploader(ArweaveBlocksConfig cfg) {
|
||||||
|
this.cfg = Objects.requireNonNull(cfg);
|
||||||
|
}
|
||||||
|
|
||||||
|
public UploadResult upload(byte[] rawDataItem, byte[] expectedId32) throws Exception {
|
||||||
|
if (rawDataItem == null || rawDataItem.length == 0) throw new IllegalArgumentException("Turbo DataItem is empty");
|
||||||
|
Ans104DataItem item = new Ans104DataItem(rawDataItem);
|
||||||
|
if (!item.verifySignature()) throw new IllegalArgumentException("Turbo DataItem has bad ANS-104 signature");
|
||||||
|
if (expectedId32 != null && !Arrays.equals(item.id32(), expectedId32)) {
|
||||||
|
throw new IllegalArgumentException("Turbo DataItem id does not match blocks.data_item_id");
|
||||||
|
}
|
||||||
|
|
||||||
|
String expectedId = B64URL.encodeToString(item.id32());
|
||||||
|
HttpRequest.Builder request = HttpRequest.newBuilder(URI.create(cfg.turboUploadUrl()))
|
||||||
|
.timeout(Duration.ofMinutes(2))
|
||||||
|
.header("Content-Type", "application/octet-stream")
|
||||||
|
.header("Accept", "application/json")
|
||||||
|
.POST(HttpRequest.BodyPublishers.ofByteArray(rawDataItem));
|
||||||
|
String paidBy = paidByAddress();
|
||||||
|
if (paidBy != null) request.header("x-paid-by", paidBy);
|
||||||
|
|
||||||
|
HttpResponse<String> response = http.send(request.build(), HttpResponse.BodyHandlers.ofString(StandardCharsets.UTF_8));
|
||||||
|
String body = response.body() == null ? "" : response.body().trim();
|
||||||
|
if (response.statusCode() == 409 && body.toLowerCase().contains("data item exists")) {
|
||||||
|
return new UploadResult(expectedId, B64URL.encodeToString(item.owner32()));
|
||||||
|
}
|
||||||
|
if (response.statusCode() < 200 || response.statusCode() >= 300) {
|
||||||
|
String hint = response.statusCode() == 402
|
||||||
|
? " (Turbo payment required: check server credits / Credit Share Approval / x-paid-by)"
|
||||||
|
: "";
|
||||||
|
throw new IOException("Turbo HTTP " + response.statusCode() + hint + ": " + safe(body));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (body.isBlank()) return new UploadResult(expectedId, B64URL.encodeToString(item.owner32()));
|
||||||
|
JsonNode json;
|
||||||
|
try { json = MAPPER.readTree(body); }
|
||||||
|
catch (Exception ignored) { return new UploadResult(expectedId, B64URL.encodeToString(item.owner32())); }
|
||||||
|
String returnedId = json.path("id").asText("").trim();
|
||||||
|
if (!returnedId.isBlank() && !returnedId.equals(expectedId)) {
|
||||||
|
throw new IOException("Turbo returned another DataItem id: expected=" + expectedId + " got=" + returnedId);
|
||||||
|
}
|
||||||
|
return new UploadResult(expectedId, json.path("owner").asText(""));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* x-paid-by contains the payer's public native address, never the private key.
|
||||||
|
* A configured Arweave JWK is used only to derive that public address.
|
||||||
|
*/
|
||||||
|
private String paidByAddress() throws Exception {
|
||||||
|
if (resolvedPaidByAddress != null) return resolvedPaidByAddress.isBlank() ? null : resolvedPaidByAddress;
|
||||||
|
synchronized (this) {
|
||||||
|
if (resolvedPaidByAddress != null) return resolvedPaidByAddress.isBlank() ? null : resolvedPaidByAddress;
|
||||||
|
String explicit = cfg.turboPaidByAddress();
|
||||||
|
if (explicit != null && !explicit.isBlank()) return resolvedPaidByAddress = explicit.trim();
|
||||||
|
if (cfg.turboWalletJwkPath() == null) {
|
||||||
|
resolvedPaidByAddress = "";
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
JsonNode jwk = MAPPER.readTree(Files.readString(cfg.turboWalletJwkPath(), StandardCharsets.UTF_8));
|
||||||
|
String modulus = jwk.path("n").asText("").trim();
|
||||||
|
if (modulus.isBlank()) throw new IllegalStateException("Turbo payer JWK missing n");
|
||||||
|
byte[] owner = B64URL_DECODER.decode(modulus);
|
||||||
|
resolvedPaidByAddress = B64URL.encodeToString(MessageDigest.getInstance("SHA-256").digest(owner));
|
||||||
|
return resolvedPaidByAddress;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String safe(String value) {
|
||||||
|
String v = value == null ? "" : value.replace('\n',' ').replace('\r',' ').trim();
|
||||||
|
return v.length() <= 500 ? v : v.substring(0, 500);
|
||||||
|
}
|
||||||
|
}
|
||||||
+50
@@ -0,0 +1,50 @@
|
|||||||
|
package server.archive.registration;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Locale;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
|
/** Список разрешённых доменов для бесплатной регистрации; читается при старте Java-сервера. */
|
||||||
|
public final class AllowedEmailDomains {
|
||||||
|
// Обычные ASCII-домены (в том числе punycode), без масок, пробелов и URL.
|
||||||
|
private static final Pattern DOMAIN = Pattern.compile(
|
||||||
|
"(?=.{1,253}$)[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?(?:\\.[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?)+");
|
||||||
|
private final Set<String> domains;
|
||||||
|
|
||||||
|
private AllowedEmailDomains(Set<String> domains) {
|
||||||
|
this.domains = Set.copyOf(domains);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Ошибки чтения, пустой или неверный список — ошибка запуска регистрации (fail-closed). */
|
||||||
|
public static AllowedEmailDomains load(Path file) throws IOException {
|
||||||
|
if (!Files.isRegularFile(file))
|
||||||
|
throw new IOException("Email domain allowlist is missing: " + file.toAbsolutePath());
|
||||||
|
Set<String> result = new HashSet<>();
|
||||||
|
int lineNumber = 0;
|
||||||
|
for (String line : Files.readAllLines(file, StandardCharsets.UTF_8)) {
|
||||||
|
lineNumber++;
|
||||||
|
String domain = line.strip().toLowerCase(Locale.ROOT);
|
||||||
|
if (domain.isEmpty() || domain.startsWith("#")) continue;
|
||||||
|
if (!DOMAIN.matcher(domain).matches())
|
||||||
|
throw new IOException("Invalid allowed email domain at " + file + ":" + lineNumber);
|
||||||
|
result.add(domain);
|
||||||
|
}
|
||||||
|
if (result.isEmpty())
|
||||||
|
throw new IOException("Email domain allowlist is empty: " + file.toAbsolutePath());
|
||||||
|
return new AllowedEmailDomains(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Сопоставление строго по части после одного символа @, без wildcard и суффиксов. */
|
||||||
|
public boolean permits(String email) {
|
||||||
|
if (email == null) return false;
|
||||||
|
String value = email.strip().toLowerCase(Locale.ROOT);
|
||||||
|
int at = value.indexOf('@');
|
||||||
|
if (at <= 0 || at != value.lastIndexOf('@')) return false;
|
||||||
|
return domains.contains(value.substring(at + 1));
|
||||||
|
}
|
||||||
|
}
|
||||||
+140
@@ -0,0 +1,140 @@
|
|||||||
|
package server.archive.registration;
|
||||||
|
|
||||||
|
import server.archive.ArweaveBlocksConfig;
|
||||||
|
import server.archive.TurboDataItemUploader;
|
||||||
|
import server.logic.ws_protocol.JSON.handlers.registration.RegistrationApiBridge;
|
||||||
|
import server.logic.ws_protocol.JSON.handlers.registration.Net_Registration_Request;
|
||||||
|
import shine.db.DbController;
|
||||||
|
import utils.config.AppConfig;
|
||||||
|
|
||||||
|
import javax.sql.DataSource;
|
||||||
|
import java.io.PrintWriter;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.sql.Connection;
|
||||||
|
import java.sql.SQLException;
|
||||||
|
import java.sql.SQLFeatureNotSupportedException;
|
||||||
|
import java.util.Base64;
|
||||||
|
import java.util.LinkedHashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.logging.Logger;
|
||||||
|
|
||||||
|
/** Единственная точка подключения API без циклической зависимости Gradle-модулей. */
|
||||||
|
public final class FreeRegistrationApiBootstrap {
|
||||||
|
private static volatile FreeRegistrationWorkflow workflow;
|
||||||
|
private static volatile LocalRegistrarSigner signer;
|
||||||
|
private FreeRegistrationApiBootstrap() {}
|
||||||
|
|
||||||
|
public static synchronized void startOrThrow() throws Exception {
|
||||||
|
if (workflow != null) return;
|
||||||
|
AppConfig cfg=AppConfig.getInstance();
|
||||||
|
LocalRegistrarSigner newSigner=null;
|
||||||
|
FreeRegistrationIssuer issuer=null;
|
||||||
|
FreeRegistrationPublisher publisher=null;
|
||||||
|
RegistrationEmailSender emailSender=null;
|
||||||
|
AllowedEmailDomains allowedEmailDomains=null;
|
||||||
|
if (cfg.getBoolean("freeRegistration.enabled",false)) {
|
||||||
|
String domainsFile = cfg.getStringOrEmpty("freeRegistration.email.allowedDomainsFile");
|
||||||
|
if (domainsFile.isBlank()) domainsFile = "allowed-email-domains.txt";
|
||||||
|
// Относительный путь — от WorkingDirectory процесса Java.
|
||||||
|
allowedEmailDomains = AllowedEmailDomains.load(Path.of(domainsFile));
|
||||||
|
boolean allowEmailReuse=cfg.getBoolean("freeRegistration.email.allowReuse",false);
|
||||||
|
// Не выводить seed/path в журнал ни при успешном старте, ни при ошибке.
|
||||||
|
ArweaveBlocksConfig transport=ArweaveBlocksConfig.load();
|
||||||
|
if(transport.publishMode()!=ArweaveBlocksConfig.PublishMode.TURBO)
|
||||||
|
throw new IllegalStateException("Free registration requires Turbo transport");
|
||||||
|
newSigner=LocalRegistrarSigner.fromConfig(cfg);
|
||||||
|
issuer=new FreeRegistrationIssuer(dbSource(),newSigner,allowEmailReuse);
|
||||||
|
publisher=new FreeRegistrationPublisher(issuer,new TurboDataItemUploader(transport),
|
||||||
|
new VerifiedFreeRegistrationImporter(allowEmailReuse));
|
||||||
|
// Секрет берём ТОЛЬКО из окружения, не из файлов репозитория.
|
||||||
|
String resendKey=System.getenv("RESEND_API_KEY");
|
||||||
|
if(resendKey==null || resendKey.isBlank())
|
||||||
|
resendKey=cfg.getStringOrEmpty("freeRegistration.email.apiKey");
|
||||||
|
emailSender=new ResendRegistrationEmailSender(resendKey,
|
||||||
|
cfg.getStringOrEmpty("freeRegistration.email.from").isBlank()
|
||||||
|
? "SHiNE <noreply@shineup.me>"
|
||||||
|
: cfg.getStringOrEmpty("freeRegistration.email.from"));
|
||||||
|
}
|
||||||
|
FreeRegistrationWorkflow newWorkflow=new FreeRegistrationWorkflow(issuer,publisher,emailSender,
|
||||||
|
cfg.getBoolean("freeRegistration.email.allowTestCode",false),
|
||||||
|
cfg.getBoolean("freeRegistration.email.allowReuse",false), allowedEmailDomains);
|
||||||
|
RegistrationApiBridge.install((op,req)->dispatch(newWorkflow,op,req));
|
||||||
|
signer=newSigner; workflow=newWorkflow;
|
||||||
|
}
|
||||||
|
public static synchronized void close() {
|
||||||
|
RegistrationApiBridge.uninstall();
|
||||||
|
workflow=null;
|
||||||
|
if(signer!=null) signer.close();
|
||||||
|
signer=null;
|
||||||
|
}
|
||||||
|
public static Map<String,Object> dispatch(FreeRegistrationWorkflow w, String op,Net_Registration_Request req) throws Exception {
|
||||||
|
Map<String,Object> out=new LinkedHashMap<>();
|
||||||
|
switch(op) {
|
||||||
|
case "GetNamespaces" -> {
|
||||||
|
out.put("namespaces",w.listNamespaces().stream().map(ns->Map.of(
|
||||||
|
"name",ns.namespace(), "type",ns.type(), "minLocalLength",ns.minLoginLength(),
|
||||||
|
"registrationFeeLamports",ns.priceLamports(), "currencyCode",ns.currencyCode(), "defaultServerLogin",ns.serverLogin()==null?"":ns.serverLogin()
|
||||||
|
)).toList());
|
||||||
|
}
|
||||||
|
case "CheckRegistrationLogin" -> {
|
||||||
|
var info=w.checkLogin(req.getFullLogin());
|
||||||
|
out.put("loginAvailable",info.loginAvailable());
|
||||||
|
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());
|
||||||
|
out.put("emailAvailable",check.emailAvailable());
|
||||||
|
out.put("emailStatus",check.emailStatus());
|
||||||
|
}
|
||||||
|
case "StartFreeRegistration" -> {
|
||||||
|
var state=w.start(req.getFullLogin(),decodeKey(req.getRootPublicKeyB64()),
|
||||||
|
decodeKey(req.getBlockchainPublicKeyB64()),decodeKey(req.getClientPublicKeyB64()),req.getEmail());
|
||||||
|
out.put("challengeId",state.challengeId()); out.put("expiresAtMs",state.expiresAtMs());
|
||||||
|
}
|
||||||
|
case "ConfirmFreeRegistration" -> {
|
||||||
|
var value=w.confirm(req.getChallengeId(),req.getCode());
|
||||||
|
out.put("fullLogin",value.fullLogin());out.put("dataItemId",value.dataItemId());
|
||||||
|
out.put("publicationStatus",value.state());out.put("chainConfirmed",false);
|
||||||
|
}
|
||||||
|
case "GetRegistrationStatus" -> {
|
||||||
|
var value=w.getStatus(req.getFullLogin());
|
||||||
|
out.put("registrationStatus",value.status());
|
||||||
|
out.put("dataItemId",value.dataItemId()==null?"":value.dataItemId());
|
||||||
|
out.put("publicationStatus",value.publicationStatus()==null?"":value.publicationStatus());
|
||||||
|
// Публичная историческая часть сертификата для бесплатного → Solana upgrade.
|
||||||
|
if("FREE_CERT".equals(value.status())) {
|
||||||
|
out.put("innerSignature64B64",value.innerSignature64B64()==null?"":value.innerSignature64B64());
|
||||||
|
out.put("rootPublicKey",value.rootPublicKey()==null?"":value.rootPublicKey());
|
||||||
|
out.put("blockchainPublicKey",value.blockchainPublicKey()==null?"":value.blockchainPublicKey());
|
||||||
|
out.put("clientPublicKey",value.clientPublicKey()==null?"":value.clientPublicKey());
|
||||||
|
out.put("defaultServerLogin",value.defaultServerLogin()==null?"":value.defaultServerLogin());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
default -> throw new IllegalArgumentException("Unknown registration operation");
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
private static byte[] decodeKey(String base64) {
|
||||||
|
if(base64==null || base64.length()>64)throw new IllegalArgumentException("Invalid public key");
|
||||||
|
byte[] decoded=Base64.getDecoder().decode(base64);
|
||||||
|
if(decoded.length!=32)throw new IllegalArgumentException("Invalid public key length");
|
||||||
|
return decoded;
|
||||||
|
}
|
||||||
|
private static DataSource dbSource() {
|
||||||
|
return new DataSource() {
|
||||||
|
@Override public Connection getConnection() throws SQLException {return DbController.getInstance().getConnection();}
|
||||||
|
@Override public Connection getConnection(String u,String p) throws SQLException {throw new SQLFeatureNotSupportedException();}
|
||||||
|
@Override public PrintWriter getLogWriter(){return null;}
|
||||||
|
@Override public void setLogWriter(PrintWriter p){}
|
||||||
|
@Override public void setLoginTimeout(int t){}
|
||||||
|
@Override public int getLoginTimeout(){return 0;}
|
||||||
|
@Override public Logger getParentLogger(){return Logger.getGlobal();}
|
||||||
|
@Override public <T> T unwrap(Class<T> type) throws SQLException {throw new SQLFeatureNotSupportedException();}
|
||||||
|
@Override public boolean isWrapperFor(Class<?> type){return false;}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
+115
@@ -0,0 +1,115 @@
|
|||||||
|
package server.archive.registration;
|
||||||
|
|
||||||
|
import blockchain.Ans104DataItem;
|
||||||
|
import blockchain.ShineProtocolTags;
|
||||||
|
import utils.crypto.Ed25519Util;
|
||||||
|
|
||||||
|
import java.io.ByteArrayOutputStream;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.security.MessageDigest;
|
||||||
|
import java.text.Normalizer;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.Base64;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Locale;
|
||||||
|
|
||||||
|
/** Строгое формирование и проверка двух подписей нового независимого DataItem `t=reg`. */
|
||||||
|
public final class FreeRegistrationCertificateV1 {
|
||||||
|
private static final byte[] DOMAIN = "SHiNE_FREE_REG_V1\0".getBytes(StandardCharsets.UTF_8);
|
||||||
|
private static final List<Ans104DataItem.Tag> TAGS = List.of(
|
||||||
|
new Ans104DataItem.Tag(ShineProtocolTags.APP_TAG_NAME, ShineProtocolTags.APP_TAG_VALUE),
|
||||||
|
new Ans104DataItem.Tag("t", "reg"),
|
||||||
|
new Ans104DataItem.Tag("Protocol", "SHiNE-Free-Registration-V1"));
|
||||||
|
|
||||||
|
public record Verified(String login, byte[] rootKey, byte[] blockchainKey,
|
||||||
|
byte[] clientKey, byte[] innerSignature,
|
||||||
|
byte[] emailSha256, byte[] owner32, String idBase64Url) {}
|
||||||
|
|
||||||
|
private FreeRegistrationCertificateV1() {}
|
||||||
|
|
||||||
|
public static String validateLogin(String login) {
|
||||||
|
if (login == null || !login.matches("[A-Za-z0-9_]+@[a-z0-9_]+") || login.length() > 30)
|
||||||
|
throw new IllegalArgumentException("Full login must use ASCII letters (any local-part case), lowercase namespace, <= 30 bytes");
|
||||||
|
return login;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static byte[] identityFields(String login, byte[] root32, byte[] blockchain32, byte[] client32) {
|
||||||
|
byte[] name = validateLogin(login).getBytes(StandardCharsets.UTF_8);
|
||||||
|
require32(root32); require32(blockchain32); require32(client32);
|
||||||
|
ByteArrayOutputStream out = new ByteArrayOutputStream();
|
||||||
|
out.write(1); out.write(0); out.write(name.length); out.writeBytes(name);
|
||||||
|
out.writeBytes(root32); out.writeBytes(blockchain32); out.writeBytes(client32);
|
||||||
|
return out.toByteArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static byte[] innerMessage(byte[] identity) {
|
||||||
|
ByteArrayOutputStream out = new ByteArrayOutputStream();
|
||||||
|
out.writeBytes(DOMAIN); out.writeBytes(identity);
|
||||||
|
return out.toByteArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String normalizeEmail(String email) {
|
||||||
|
if (email == null) throw new IllegalArgumentException("Email is required");
|
||||||
|
String value = Normalizer.normalize(email.strip(), Normalizer.Form.NFC).toLowerCase(Locale.ROOT);
|
||||||
|
if (value.isBlank() || value.indexOf('@') < 1 || value.contains(" "))
|
||||||
|
throw new IllegalArgumentException("Invalid email");
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static byte[] emailHash(String email) {
|
||||||
|
return sha256(normalizeEmail(email).getBytes(StandardCharsets.UTF_8));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static byte[] issue(String login, byte[] root32, byte[] blockchain32,
|
||||||
|
byte[] client32, String email, RegistrarSigner signer) {
|
||||||
|
byte[] fields = identityFields(login, root32, blockchain32, client32);
|
||||||
|
byte[] inner = signer.sign(innerMessage(fields));
|
||||||
|
if (inner.length != 64) throw new IllegalStateException("Invalid inner signature length");
|
||||||
|
ByteArrayOutputStream payload = new ByteArrayOutputStream();
|
||||||
|
payload.writeBytes(fields);
|
||||||
|
payload.writeBytes(inner);
|
||||||
|
payload.writeBytes(emailHash(email));
|
||||||
|
byte[] data = payload.toByteArray();
|
||||||
|
byte[] owner = signer.publicKey32();
|
||||||
|
require32(owner);
|
||||||
|
byte[] outer = signer.sign(Ans104DataItem.buildSigningMessage(owner, TAGS, data));
|
||||||
|
byte[] raw = Ans104DataItem.serializeEd25519(outer, owner, TAGS, data);
|
||||||
|
verify(raw, owner);
|
||||||
|
return raw;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Verified verify(byte[] signedDataItem, byte[] registrarPublicKey32) {
|
||||||
|
require32(registrarPublicKey32);
|
||||||
|
Ans104DataItem item = new Ans104DataItem(signedDataItem);
|
||||||
|
if (!item.ownerEquals(registrarPublicKey32) || !item.verifySignature())
|
||||||
|
throw new IllegalArgumentException("Invalid outer ANS-104 registrar signature");
|
||||||
|
if (!item.tags().equals(TAGS) || item.target().length != 0 || item.anchor().length != 0)
|
||||||
|
throw new IllegalArgumentException("Unexpected registration tags/target/anchor");
|
||||||
|
byte[] data = item.data();
|
||||||
|
if (data.length < 3 + 96 + 64 + 32 || data[0] != 1 || data[1] != 0)
|
||||||
|
throw new IllegalArgumentException("Invalid certificate version/length");
|
||||||
|
int len = data[2] & 0xff;
|
||||||
|
if (data.length != 3 + len + 96 + 64 + 32)
|
||||||
|
throw new IllegalArgumentException("Invalid certificate byte length");
|
||||||
|
String login = validateLogin(new String(data, 3, len, StandardCharsets.UTF_8));
|
||||||
|
int offset = 3 + len;
|
||||||
|
byte[] root = Arrays.copyOfRange(data, offset, offset+32); offset += 32;
|
||||||
|
byte[] blockchain = Arrays.copyOfRange(data, offset, offset+32); offset += 32;
|
||||||
|
byte[] client = Arrays.copyOfRange(data, offset, offset+32); offset += 32;
|
||||||
|
byte[] innerSig = Arrays.copyOfRange(data, offset, offset+64); offset += 64;
|
||||||
|
byte[] emailSha = Arrays.copyOfRange(data, offset, offset+32);
|
||||||
|
byte[] fields = Arrays.copyOfRange(data, 0, 3 + len + 96);
|
||||||
|
if (!Ed25519Util.verify(innerMessage(fields), innerSig, registrarPublicKey32))
|
||||||
|
throw new IllegalArgumentException("Invalid inner certificate signature");
|
||||||
|
return new Verified(login, root, blockchain, client, innerSig, emailSha,
|
||||||
|
item.owner32(), Base64.getUrlEncoder().withoutPadding().encodeToString(item.id32()));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void require32(byte[] key) {
|
||||||
|
if (key == null || key.length != 32) throw new IllegalArgumentException("Expected 32-byte public key");
|
||||||
|
}
|
||||||
|
private static byte[] sha256(byte[] data) {
|
||||||
|
try { return MessageDigest.getInstance("SHA-256").digest(data); }
|
||||||
|
catch (Exception e) { throw new IllegalStateException("SHA-256 unavailable", e); }
|
||||||
|
}
|
||||||
|
}
|
||||||
+74
@@ -0,0 +1,74 @@
|
|||||||
|
package server.archive.registration;
|
||||||
|
|
||||||
|
import sync.util.Base58Util;
|
||||||
|
|
||||||
|
import javax.sql.DataSource;
|
||||||
|
import java.sql.Connection;
|
||||||
|
import java.sql.PreparedStatement;
|
||||||
|
import java.sql.ResultSet;
|
||||||
|
import java.util.Arrays;
|
||||||
|
|
||||||
|
/** Выдача (без публикации). Stage 8 публикует через Turbo и импортирует тот же raw DataItem. */
|
||||||
|
public final class FreeRegistrationIssuer {
|
||||||
|
private final DataSource db;
|
||||||
|
private final RegistrarSigner signer;
|
||||||
|
private final boolean allowEmailReuse;
|
||||||
|
|
||||||
|
public FreeRegistrationIssuer(DataSource db, RegistrarSigner signer) {
|
||||||
|
this(db, signer, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
public FreeRegistrationIssuer(DataSource db, RegistrarSigner signer, boolean allowEmailReuse) {
|
||||||
|
this.db = java.util.Objects.requireNonNull(db);
|
||||||
|
this.signer = java.util.Objects.requireNonNull(signer);
|
||||||
|
this.allowEmailReuse = allowEmailReuse;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Выдаётся только после успешной проверки challenge в FreeRegistrationWorkflow. */
|
||||||
|
synchronized byte[] issue(String fullLogin, byte[] root32, byte[] blockchain32,
|
||||||
|
byte[] client32, String email) throws Exception {
|
||||||
|
FreeRegistrationCertificateV1.validateLogin(fullLogin);
|
||||||
|
String namespace = fullLogin.substring(fullLogin.indexOf('@') + 1);
|
||||||
|
byte[] expectedEmail = FreeRegistrationCertificateV1.emailHash(email);
|
||||||
|
try (Connection conn = db.getConnection()) {
|
||||||
|
conn.setReadOnly(true);
|
||||||
|
String sql = """
|
||||||
|
SELECT namespace_type, min_localpart_len, registrar_pubkey, default_server_login
|
||||||
|
FROM shine_namespace_current WHERE namespace = ?
|
||||||
|
""";
|
||||||
|
try (PreparedStatement statement = conn.prepareStatement(sql)) {
|
||||||
|
statement.setString(1, namespace);
|
||||||
|
try (ResultSet rs = statement.executeQuery()) {
|
||||||
|
if (!rs.next() || rs.getInt("namespace_type") != 2 ||
|
||||||
|
fullLogin.indexOf('@') < rs.getInt("min_localpart_len"))
|
||||||
|
throw new IllegalArgumentException("Free namespace is unavailable");
|
||||||
|
byte[] nsPub = Base58Util.decode(rs.getString("registrar_pubkey"));
|
||||||
|
if (!Arrays.equals(nsPub, signer.publicKey32()))
|
||||||
|
throw new IllegalStateException("Registrar public key does not match on-chain namespace");
|
||||||
|
String server = rs.getString("default_server_login");
|
||||||
|
if (server == null || server.isBlank())
|
||||||
|
throw new IllegalStateException("Free namespace server is not configured");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
try (PreparedStatement ps = conn.prepareStatement(
|
||||||
|
"SELECT 1 FROM user_identity_current WHERE normalized_login = ?")) {
|
||||||
|
ps.setString(1, fullLogin.toLowerCase(java.util.Locale.ROOT));
|
||||||
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
|
if (rs.next()) throw new IllegalArgumentException("Login is already registered");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!allowEmailReuse) {
|
||||||
|
try (PreparedStatement ps = conn.prepareStatement(
|
||||||
|
"SELECT 1 FROM free_registration_certificate WHERE email_sha256 = ?")) {
|
||||||
|
ps.setBytes(1, expectedEmail);
|
||||||
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
|
if (rs.next()) throw new IllegalArgumentException("Email hash already registered");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Это только подписанный артефакт, не активная регистрация. Перед Turbo
|
||||||
|
// и локальным импортом обязательно повторять уникальность в транзакции БД.
|
||||||
|
return FreeRegistrationCertificateV1.issue(fullLogin, root32, blockchain32, client32, email, signer);
|
||||||
|
}
|
||||||
|
}
|
||||||
+30
@@ -0,0 +1,30 @@
|
|||||||
|
package server.archive.registration;
|
||||||
|
|
||||||
|
import server.archive.TurboDataItemUploader;
|
||||||
|
import blockchain.Ans104DataItem;
|
||||||
|
|
||||||
|
/** Отдельный транспорт регистрации. Публикация не является пользовательским AddBlock. */
|
||||||
|
public final class FreeRegistrationPublisher {
|
||||||
|
private final FreeRegistrationIssuer issuer;
|
||||||
|
private final TurboDataItemUploader uploader;
|
||||||
|
private final VerifiedFreeRegistrationImporter importer;
|
||||||
|
|
||||||
|
public FreeRegistrationPublisher(FreeRegistrationIssuer issuer, TurboDataItemUploader uploader,
|
||||||
|
VerifiedFreeRegistrationImporter importer) {
|
||||||
|
this.issuer = java.util.Objects.requireNonNull(issuer);
|
||||||
|
this.uploader = java.util.Objects.requireNonNull(uploader);
|
||||||
|
this.importer = java.util.Objects.requireNonNull(importer);
|
||||||
|
}
|
||||||
|
/** Для повтора ПОСЛЕ потери ACK передавайте точно те же signedBytes. */
|
||||||
|
public VerifiedFreeRegistrationImporter.ImportResult publishSigned(byte[] signedBytes) throws Exception {
|
||||||
|
Ans104DataItem parsed = new Ans104DataItem(signedBytes);
|
||||||
|
importer.validateForUpload(signedBytes); // строго до HTTP/Turbo списания кредитов
|
||||||
|
// Импорт на этой точке вызовет полную проверку обеих подписей и namespace
|
||||||
|
// ПОСЛЕ успешного ACK Turbo, а не до окончательного подтверждения Arweave.
|
||||||
|
TurboDataItemUploader.UploadResult acknowledged = uploader.upload(signedBytes, parsed.id32());
|
||||||
|
String expectedId = java.util.Base64.getUrlEncoder().withoutPadding().encodeToString(parsed.id32());
|
||||||
|
if (!expectedId.equals(acknowledged.dataItemId()))
|
||||||
|
throw new IllegalStateException("Unexpected Turbo DataItem id");
|
||||||
|
return importer.importSigned(signedBytes, VerifiedFreeRegistrationImporter.Provenance.TURBO_ACCEPTED);
|
||||||
|
}
|
||||||
|
}
|
||||||
+251
@@ -0,0 +1,251 @@
|
|||||||
|
package server.archive.registration;
|
||||||
|
|
||||||
|
import shine.db.DbController;
|
||||||
|
import java.security.SecureRandom;
|
||||||
|
import java.sql.Connection;
|
||||||
|
import java.sql.PreparedStatement;
|
||||||
|
import java.sql.ResultSet;
|
||||||
|
import java.time.Duration;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Base64;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
|
||||||
|
/** Внутренний state machine публичных операций регистрации v2. */
|
||||||
|
public final class FreeRegistrationWorkflow {
|
||||||
|
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, 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) {}
|
||||||
|
public record State(String status, String dataItemId, String publicationStatus, String innerSignature64B64,
|
||||||
|
String rootPublicKey, String blockchainPublicKey, String clientPublicKey,
|
||||||
|
String defaultServerLogin) {}
|
||||||
|
|
||||||
|
private record Draft(String login, byte[] root, byte[] blockchain, byte[] client, String email,
|
||||||
|
long expiresAtMs, byte[] codeHash, int attempts, boolean delivered,
|
||||||
|
boolean verified, byte[] signedBytes) {
|
||||||
|
Draft update(int attempts, boolean delivered, boolean verified, byte[] signedBytes) {
|
||||||
|
return new Draft(login, root, blockchain, client, email, expiresAtMs,
|
||||||
|
codeHash, attempts, delivered, verified, signedBytes);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
private final Map<String, Draft> pending = new ConcurrentHashMap<>();
|
||||||
|
// Не храним в БД почтовые адреса, пока регистрация не завершилась.
|
||||||
|
private final Map<String, Long> recentEmails = new HashMap<>();
|
||||||
|
private final Map<String, Long> recentLogins = new HashMap<>();
|
||||||
|
private final java.util.ArrayDeque<Long> globalSendTimes = new java.util.ArrayDeque<>();
|
||||||
|
private static final long TTL_MS = Duration.ofHours(1).toMillis();
|
||||||
|
private static final long EMAIL_COOLDOWN_MS = Duration.ofMinutes(1).toMillis();
|
||||||
|
private static final long GLOBAL_WINDOW_MS = Duration.ofHours(1).toMillis();
|
||||||
|
private static final int MAX_EMAILS_PER_HOUR = 60;
|
||||||
|
private static final int MAX_ATTEMPTS = 5;
|
||||||
|
private static final int MAX_PENDING = 512;
|
||||||
|
private static final SecureRandom RANDOM = new SecureRandom();
|
||||||
|
private final FreeRegistrationIssuer issuer;
|
||||||
|
private final FreeRegistrationPublisher publisher;
|
||||||
|
private final RegistrationEmailSender emailSender;
|
||||||
|
private final boolean allowTestCode;
|
||||||
|
private final boolean allowEmailReuse;
|
||||||
|
private final AllowedEmailDomains allowedEmailDomains;
|
||||||
|
|
||||||
|
public FreeRegistrationWorkflow(FreeRegistrationIssuer issuer, FreeRegistrationPublisher publisher,
|
||||||
|
RegistrationEmailSender emailSender, boolean allowTestCode, boolean allowEmailReuse,
|
||||||
|
AllowedEmailDomains allowedEmailDomains) {
|
||||||
|
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)
|
||||||
|
throw new IllegalArgumentException("Allowed email domain list is required");
|
||||||
|
this.allowedEmailDomains = allowedEmailDomains;
|
||||||
|
this.issuer = issuer;
|
||||||
|
this.publisher = publisher;
|
||||||
|
this.emailSender = emailSender;
|
||||||
|
this.allowTestCode = allowTestCode;
|
||||||
|
this.allowEmailReuse = allowEmailReuse;
|
||||||
|
}
|
||||||
|
public FreeRegistrationWorkflow(FreeRegistrationIssuer issuer, FreeRegistrationPublisher publisher,
|
||||||
|
RegistrationEmailSender emailSender, boolean allowTestCode, boolean allowEmailReuse) {
|
||||||
|
this(issuer, publisher, emailSender, allowTestCode, allowEmailReuse,
|
||||||
|
emailSender == null ? null : loadDefaultEmailDomains());
|
||||||
|
}
|
||||||
|
private static AllowedEmailDomains loadDefaultEmailDomains() {
|
||||||
|
try {
|
||||||
|
return AllowedEmailDomains.load(java.nio.file.Path.of("allowed-email-domains.txt"));
|
||||||
|
} catch (java.io.IOException e) {
|
||||||
|
throw new IllegalStateException("Cannot load allowed email domains", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public FreeRegistrationWorkflow(FreeRegistrationIssuer issuer, FreeRegistrationPublisher publisher,
|
||||||
|
RegistrationEmailSender emailSender, boolean allowTestCode) {
|
||||||
|
this(issuer, publisher, emailSender, allowTestCode, false);
|
||||||
|
}
|
||||||
|
public FreeRegistrationWorkflow(FreeRegistrationIssuer issuer, FreeRegistrationPublisher publisher,
|
||||||
|
RegistrationEmailSender emailSender) {
|
||||||
|
this(issuer, publisher, emailSender, false);
|
||||||
|
}
|
||||||
|
public FreeRegistrationWorkflow(FreeRegistrationIssuer issuer, FreeRegistrationPublisher publisher) {
|
||||||
|
this(issuer, publisher, null);
|
||||||
|
}
|
||||||
|
public List<NamespaceInfo> listNamespaces() throws Exception {
|
||||||
|
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,currency_code,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.getInt(5),rs.getString(6)));
|
||||||
|
}
|
||||||
|
return List.copyOf(result);
|
||||||
|
}
|
||||||
|
public LoginCheck checkLogin(String login) throws Exception {
|
||||||
|
FreeRegistrationCertificateV1.validateLogin(login);
|
||||||
|
String namespace=login.substring(login.indexOf('@')+1);
|
||||||
|
try (Connection c=DbController.getInstance().getConnection()) {
|
||||||
|
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); currencyCode=rs.getInt(4);
|
||||||
|
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,currencyCode); }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public EmailCheck checkEmail(String email) throws Exception {
|
||||||
|
// До запроса к БД: отсутствие разрешения не должно раскрывать занятость email.
|
||||||
|
String normalizedEmail = FreeRegistrationCertificateV1.normalizeEmail(email);
|
||||||
|
if (allowedEmailDomains == null || !allowedEmailDomains.permits(normalizedEmail))
|
||||||
|
return new EmailCheck(false, "DOMAIN_NOT_ALLOWED");
|
||||||
|
byte[] hash=FreeRegistrationCertificateV1.emailHash(normalizedEmail);
|
||||||
|
if (allowEmailReuse) return new EmailCheck(true, "AVAILABLE");
|
||||||
|
try (Connection c=DbController.getInstance().getConnection();
|
||||||
|
PreparedStatement p=c.prepareStatement("SELECT 1 FROM free_registration_certificate WHERE email_sha256=?")) {
|
||||||
|
p.setBytes(1,hash);
|
||||||
|
try(ResultSet rs=p.executeQuery()) { return rs.next() ? new EmailCheck(false, "ALREADY_REGISTERED")
|
||||||
|
: new EmailCheck(true, "AVAILABLE"); }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/** Устаревший внутренний helper: внешний API использует две отдельные операции. */
|
||||||
|
public Availability availability(String login,String email) throws Exception {
|
||||||
|
return new Availability(checkLogin(login).loginAvailable(),checkEmail(email).emailAvailable());
|
||||||
|
}
|
||||||
|
public Started start(String login, byte[] root, byte[] blockchain, byte[] client, String email) throws Exception {
|
||||||
|
if (issuer == null || publisher == null || emailSender == null)
|
||||||
|
throw new IllegalStateException("Free registration is disabled");
|
||||||
|
FreeRegistrationCertificateV1.identityFields(login,root,blockchain,client);
|
||||||
|
LoginCheck checked = checkLogin(login);
|
||||||
|
if (checked.namespaceType()!=2 || !checked.loginAvailable())
|
||||||
|
throw new IllegalStateException("Login is unavailable");
|
||||||
|
if (!checkEmail(email).emailAvailable()) throw new IllegalStateException("Email is unavailable");
|
||||||
|
String cleanEmail=FreeRegistrationCertificateV1.normalizeEmail(email);
|
||||||
|
String normalizedLogin=login.toLowerCase(java.util.Locale.ROOT);
|
||||||
|
byte[] id=new byte[32]; RANDOM.nextBytes(id);
|
||||||
|
String challenge=Base64.getUrlEncoder().withoutPadding().encodeToString(id);
|
||||||
|
String code=RegistrationEmailCode.generate();
|
||||||
|
long now=System.currentTimeMillis();
|
||||||
|
long expires=now+TTL_MS;
|
||||||
|
Draft draft=new Draft(login,root.clone(),blockchain.clone(),client.clone(),cleanEmail,
|
||||||
|
expires,RegistrationEmailCode.hash(challenge,code),0,false,false,null);
|
||||||
|
synchronized (this) {
|
||||||
|
pending.entrySet().removeIf(e->e.getValue().expiresAtMs < now);
|
||||||
|
recentEmails.entrySet().removeIf(e->e.getValue() < now-TTL_MS);
|
||||||
|
recentLogins.entrySet().removeIf(e->e.getValue() < now-TTL_MS);
|
||||||
|
while(!globalSendTimes.isEmpty() && globalSendTimes.peekFirst() < now-GLOBAL_WINDOW_MS)
|
||||||
|
globalSendTimes.removeFirst();
|
||||||
|
if (pending.size() >= MAX_PENDING) throw new IllegalStateException("Too many pending registrations");
|
||||||
|
if (now-recentEmails.getOrDefault(cleanEmail,0L) < EMAIL_COOLDOWN_MS ||
|
||||||
|
now-recentLogins.getOrDefault(normalizedLogin,0L) < EMAIL_COOLDOWN_MS)
|
||||||
|
throw new IllegalStateException("Please wait before requesting another code");
|
||||||
|
if (globalSendTimes.size() >= MAX_EMAILS_PER_HOUR)
|
||||||
|
throw new IllegalStateException("Email verification temporarily limited");
|
||||||
|
recentEmails.put(cleanEmail,now);
|
||||||
|
recentLogins.put(normalizedLogin,now);
|
||||||
|
globalSendTimes.addLast(now);
|
||||||
|
pending.put(challenge,draft);
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
// Не блокируем monitor workflow на время HTTP-запроса к Resend.
|
||||||
|
emailSender.sendVerificationCode(cleanEmail,code);
|
||||||
|
} catch (Exception e) {
|
||||||
|
synchronized (this) {
|
||||||
|
pending.remove(challenge);
|
||||||
|
recentEmails.remove(cleanEmail,now);
|
||||||
|
recentLogins.remove(normalizedLogin,now);
|
||||||
|
globalSendTimes.removeFirstOccurrence(now);
|
||||||
|
}
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
synchronized (this) {
|
||||||
|
// Новый успешно отправленный код заменяет старые заявки на тот же login/email.
|
||||||
|
pending.entrySet().removeIf(e -> !e.getKey().equals(challenge) &&
|
||||||
|
(e.getValue().email.equals(cleanEmail) ||
|
||||||
|
e.getValue().login.equalsIgnoreCase(login)));
|
||||||
|
pending.computeIfPresent(challenge,(key,d)->d.update(d.attempts,true,d.verified,d.signedBytes));
|
||||||
|
}
|
||||||
|
return new Started(challenge,expires);
|
||||||
|
}
|
||||||
|
boolean isValidVerificationCode(byte[] expectedHash, String challenge, String code) {
|
||||||
|
return (allowTestCode && "777777".equals(code))
|
||||||
|
|| RegistrationEmailCode.matches(expectedHash, challenge, code);
|
||||||
|
}
|
||||||
|
|
||||||
|
public synchronized Completed confirm(String challenge, String code) throws Exception {
|
||||||
|
if (publisher == null) throw new IllegalStateException("Free registration disabled");
|
||||||
|
if (challenge == null || challenge.isBlank())
|
||||||
|
throw new IllegalArgumentException("Registration challenge missing");
|
||||||
|
Draft d=pending.get(challenge);
|
||||||
|
if (d==null || d.expiresAtMs < System.currentTimeMillis()) {
|
||||||
|
pending.remove(challenge); throw new IllegalArgumentException("Registration challenge missing or expired");
|
||||||
|
}
|
||||||
|
if (!d.delivered) throw new IllegalStateException("Verification email is not delivered yet");
|
||||||
|
if (!d.verified) {
|
||||||
|
if (!isValidVerificationCode(d.codeHash, challenge, code)) {
|
||||||
|
if (d.attempts+1 >= MAX_ATTEMPTS) pending.remove(challenge);
|
||||||
|
else pending.put(challenge,d.update(d.attempts+1,true,false,d.signedBytes));
|
||||||
|
throw new IllegalArgumentException("Invalid email code");
|
||||||
|
}
|
||||||
|
// Если Turbo не ответит, подтверждённая заявка может быть повторена до TTL.
|
||||||
|
d=d.update(d.attempts,true,true,d.signedBytes);
|
||||||
|
pending.put(challenge,d);
|
||||||
|
}
|
||||||
|
byte[] signed=d.signedBytes;
|
||||||
|
if(signed==null) {
|
||||||
|
signed=issuer.issue(d.login,d.root,d.blockchain,d.client,d.email);
|
||||||
|
d=d.update(d.attempts,true,true,signed);
|
||||||
|
pending.put(challenge,d);
|
||||||
|
}
|
||||||
|
VerifiedFreeRegistrationImporter.ImportResult result=publisher.publishSigned(signed);
|
||||||
|
// Повтор использует тот же подписанный DataItem, без смены ключей и адреса email.
|
||||||
|
return new Completed(result.login(),result.dataItemId(),"TURBO_ACCEPTED",result.alreadyImported());
|
||||||
|
}
|
||||||
|
public State getStatus(String login) throws Exception {
|
||||||
|
FreeRegistrationCertificateV1.validateLogin(login);
|
||||||
|
try (Connection c=DbController.getInstance().getConnection();
|
||||||
|
PreparedStatement p=c.prepareStatement("""
|
||||||
|
SELECT i.registration_status,i.free_data_item_id,f.publication_status,f.inner_signature,
|
||||||
|
i.root_key,i.blockchain_key,i.client_key,n.default_server_login
|
||||||
|
FROM user_identity_current i
|
||||||
|
LEFT JOIN free_registration_certificate f ON f.data_item_id=i.free_data_item_id
|
||||||
|
LEFT JOIN shine_namespace_current n ON n.namespace=i.namespace
|
||||||
|
WHERE i.normalized_login=?
|
||||||
|
""")) {
|
||||||
|
p.setString(1,login.toLowerCase(java.util.Locale.ROOT));
|
||||||
|
try (ResultSet r=p.executeQuery()) {
|
||||||
|
return r.next()?new State(r.getString(1),r.getString(2),r.getString(3),
|
||||||
|
r.getBytes(4)==null?null:Base64.getEncoder().encodeToString(r.getBytes(4)),
|
||||||
|
r.getString(5),r.getString(6),r.getString(7),r.getString(8))
|
||||||
|
:new State("NOT_FOUND",null,null,null,null,null,null,null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+43
@@ -0,0 +1,43 @@
|
|||||||
|
package server.archive.registration;
|
||||||
|
|
||||||
|
import utils.crypto.Ed25519Util;
|
||||||
|
import utils.config.AppConfig;
|
||||||
|
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.Base64;
|
||||||
|
|
||||||
|
/** Временный signer. Файл вне Git: одно значение Base64 от 32-байтного Ed25519 seed. */
|
||||||
|
public final class LocalRegistrarSigner implements RegistrarSigner {
|
||||||
|
private final byte[] seed32;
|
||||||
|
private final byte[] publicKey32;
|
||||||
|
private boolean closed;
|
||||||
|
|
||||||
|
public LocalRegistrarSigner(byte[] seed) {
|
||||||
|
if (seed == null || seed.length != 32) throw new IllegalArgumentException("Registrar seed must be 32 bytes");
|
||||||
|
this.seed32 = seed.clone();
|
||||||
|
this.publicKey32 = Ed25519Util.derivePublicKey(seed32);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static LocalRegistrarSigner fromConfig(AppConfig config) throws Exception {
|
||||||
|
if (!config.getBoolean("freeRegistration.enabled", false))
|
||||||
|
throw new IllegalStateException("Free registration is disabled");
|
||||||
|
String path = config.getStringOrEmpty("freeRegistration.registrarSeedFile");
|
||||||
|
if (path.isEmpty()) throw new IllegalStateException("Registrar key path is not configured");
|
||||||
|
byte[] seed = Base64.getDecoder().decode(Files.readString(Path.of(path), StandardCharsets.UTF_8).trim());
|
||||||
|
try { return new LocalRegistrarSigner(seed); }
|
||||||
|
finally { Arrays.fill(seed, (byte) 0); }
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override public synchronized byte[] publicKey32() { return publicKey32.clone(); }
|
||||||
|
@Override public synchronized byte[] sign(byte[] message) {
|
||||||
|
if (closed) throw new IllegalStateException("Signer closed");
|
||||||
|
return Ed25519Util.sign(message, seed32);
|
||||||
|
}
|
||||||
|
@Override public synchronized void close() {
|
||||||
|
Arrays.fill(seed32, (byte) 0);
|
||||||
|
closed = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
+8
@@ -0,0 +1,8 @@
|
|||||||
|
package server.archive.registration;
|
||||||
|
|
||||||
|
/** Интерфейс приватного регистратора: private key не передаётся в бизнес-логику. */
|
||||||
|
public interface RegistrarSigner extends AutoCloseable {
|
||||||
|
byte[] publicKey32();
|
||||||
|
byte[] sign(byte[] message);
|
||||||
|
@Override default void close() {}
|
||||||
|
}
|
||||||
+31
@@ -0,0 +1,31 @@
|
|||||||
|
package server.archive.registration;
|
||||||
|
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.security.MessageDigest;
|
||||||
|
import java.security.NoSuchAlgorithmException;
|
||||||
|
import java.security.SecureRandom;
|
||||||
|
import java.util.HexFormat;
|
||||||
|
|
||||||
|
/** Одноразовый код не сохраняется в открытом виде и не попадает в журнал. */
|
||||||
|
final class RegistrationEmailCode {
|
||||||
|
private static final SecureRandom RANDOM = new SecureRandom();
|
||||||
|
private RegistrationEmailCode() {}
|
||||||
|
|
||||||
|
static String generate() {
|
||||||
|
return String.format(java.util.Locale.ROOT, "%06d", RANDOM.nextInt(1_000_000));
|
||||||
|
}
|
||||||
|
|
||||||
|
static byte[] hash(String challengeId, String code) {
|
||||||
|
try {
|
||||||
|
MessageDigest md = MessageDigest.getInstance("SHA-256");
|
||||||
|
return md.digest((challengeId + ":" + code).getBytes(StandardCharsets.UTF_8));
|
||||||
|
} catch (NoSuchAlgorithmException e) {
|
||||||
|
throw new IllegalStateException("SHA-256 unavailable", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static boolean matches(byte[] expectedHash, String challengeId, String submitted) {
|
||||||
|
return submitted != null && submitted.matches("[0-9]{6}") &&
|
||||||
|
MessageDigest.isEqual(expectedHash, hash(challengeId, submitted));
|
||||||
|
}
|
||||||
|
}
|
||||||
+7
@@ -0,0 +1,7 @@
|
|||||||
|
package server.archive.registration;
|
||||||
|
|
||||||
|
/** Отправка кода. Детали внешнего почтового провайдера не влияют на протокол регистрации. */
|
||||||
|
@FunctionalInterface
|
||||||
|
public interface RegistrationEmailSender {
|
||||||
|
void sendVerificationCode(String recipient, String code) throws Exception;
|
||||||
|
}
|
||||||
+63
@@ -0,0 +1,63 @@
|
|||||||
|
package server.archive.registration;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
|
||||||
|
import java.net.URI;
|
||||||
|
import java.net.http.HttpClient;
|
||||||
|
import java.net.http.HttpRequest;
|
||||||
|
import java.net.http.HttpResponse;
|
||||||
|
import java.time.Duration;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
/** Транзакционная отправка через Resend: HTTP API, без SMTP и внешней Java SDK. */
|
||||||
|
public final class ResendRegistrationEmailSender implements RegistrationEmailSender {
|
||||||
|
private static final URI ENDPOINT = URI.create("https://api.resend.com/emails");
|
||||||
|
private static final String SUBJECT = "SHiNE — код подтверждения email";
|
||||||
|
private final HttpClient client = HttpClient.newBuilder()
|
||||||
|
.connectTimeout(Duration.ofSeconds(5)).build();
|
||||||
|
private final ObjectMapper mapper = new ObjectMapper();
|
||||||
|
private final String apiKey;
|
||||||
|
private final String from;
|
||||||
|
|
||||||
|
public ResendRegistrationEmailSender(String apiKey, String from) {
|
||||||
|
if (apiKey == null || apiKey.isBlank())
|
||||||
|
throw new IllegalStateException("Resend API key is required for free registration");
|
||||||
|
if (from == null || from.isBlank())
|
||||||
|
throw new IllegalStateException("Sender email is missing");
|
||||||
|
this.apiKey = apiKey.trim();
|
||||||
|
this.from = from.trim();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void sendVerificationCode(String recipient, String code) throws Exception {
|
||||||
|
if (recipient == null || recipient.isBlank() || !code.matches("[0-9]{6}"))
|
||||||
|
throw new IllegalArgumentException("Invalid email verification request");
|
||||||
|
String text = "Добро пожаловать в SHiNE!\n\n"
|
||||||
|
+ "Для завершения регистрации введите код подтверждения:\n\n"
|
||||||
|
+ code + "\n\n"
|
||||||
|
+ "Код действителен в течение 1 часа.\n\n"
|
||||||
|
+ "Если вы не регистрировались в SHiNE, просто проигнорируйте это письмо.\n\n"
|
||||||
|
+ "Команда SHiNE";
|
||||||
|
String html = "<div style=\"font-family:Arial,sans-serif;max-width:520px;margin:auto;"
|
||||||
|
+ "padding:24px;color:#1d2433;line-height:1.6\">"
|
||||||
|
+ "<h2 style=\"margin:0 0 20px\">Добро пожаловать в SHiNE!</h2>"
|
||||||
|
+ "<p>Для завершения регистрации введите код подтверждения:</p>"
|
||||||
|
+ "<p style=\"font-size:32px;font-weight:700;letter-spacing:6px\">" + code + "</p>"
|
||||||
|
+ "<p>Код действителен в течение 1 часа.</p>"
|
||||||
|
+ "<p style=\"color:#5d6470\">Если вы не регистрировались в SHiNE, "
|
||||||
|
+ "просто проигнорируйте это письмо.</p><p>Команда SHiNE</p></div>";
|
||||||
|
String json = mapper.writeValueAsString(Map.of(
|
||||||
|
"from", from, "to", new String[]{recipient}, "subject", SUBJECT,
|
||||||
|
"text", text, "html", html));
|
||||||
|
HttpRequest request = HttpRequest.newBuilder(ENDPOINT)
|
||||||
|
.header("Authorization", "Bearer " + apiKey)
|
||||||
|
.header("Content-Type", "application/json")
|
||||||
|
.timeout(Duration.ofSeconds(12))
|
||||||
|
.POST(HttpRequest.BodyPublishers.ofString(json))
|
||||||
|
.build();
|
||||||
|
// Тело ошибки не выводим: нельзя логировать email или токен провайдера.
|
||||||
|
HttpResponse<Void> response = client.send(request, HttpResponse.BodyHandlers.discarding());
|
||||||
|
if (response.statusCode() < 200 || response.statusCode() >= 300)
|
||||||
|
throw new IllegalStateException("Resend delivery rejected (HTTP " + response.statusCode() + ")");
|
||||||
|
}
|
||||||
|
}
|
||||||
+184
@@ -0,0 +1,184 @@
|
|||||||
|
package server.archive.registration;
|
||||||
|
|
||||||
|
import shine.db.DbController;
|
||||||
|
import sync.util.Base58Util;
|
||||||
|
|
||||||
|
import java.sql.Connection;
|
||||||
|
import java.sql.PreparedStatement;
|
||||||
|
import java.sql.ResultSet;
|
||||||
|
import java.sql.SQLException;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.Base64;
|
||||||
|
|
||||||
|
/** Только верифицированный сертификат. Локальная БД — проекция Arweave/Solana. */
|
||||||
|
public final class VerifiedFreeRegistrationImporter {
|
||||||
|
public enum Provenance { TURBO_ACCEPTED, ARWEAVE_CONFIRMED }
|
||||||
|
public record ImportResult(String login, String dataItemId, boolean alreadyImported, Provenance provenance) {}
|
||||||
|
private final boolean allowEmailReuse;
|
||||||
|
|
||||||
|
public VerifiedFreeRegistrationImporter() {
|
||||||
|
this(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
public VerifiedFreeRegistrationImporter(boolean allowEmailReuse) {
|
||||||
|
this.allowEmailReuse = allowEmailReuse;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Предварительная проверка ДО Turbo: не расходовать кредиты на чужую/битую запись. */
|
||||||
|
public FreeRegistrationCertificateV1.Verified validateForUpload(byte[] raw) throws Exception {
|
||||||
|
if (raw == null || raw.length < 200 || raw.length > 16_384)
|
||||||
|
throw new IllegalArgumentException("Invalid registration size");
|
||||||
|
blockchain.Ans104DataItem item = new blockchain.Ans104DataItem(raw);
|
||||||
|
String login = extractCanonicalLogin(item);
|
||||||
|
try (Connection c = DbController.getInstance().getConnection()) {
|
||||||
|
String namespace = login.substring(login.indexOf('@') + 1);
|
||||||
|
var cert = FreeRegistrationCertificateV1.verify(raw, readRegistrar(c, namespace, login));
|
||||||
|
try (PreparedStatement ps = c.prepareStatement(
|
||||||
|
"SELECT free_data_item_id FROM user_identity_current WHERE normalized_login=?")) {
|
||||||
|
ps.setString(1, login.toLowerCase(java.util.Locale.ROOT));
|
||||||
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
|
if (rs.next() && !cert.idBase64Url().equals(rs.getString(1)))
|
||||||
|
throw new IllegalArgumentException("Login is already registered");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!allowEmailReuse) {
|
||||||
|
try (PreparedStatement ps = c.prepareStatement(
|
||||||
|
"SELECT data_item_id FROM free_registration_certificate WHERE email_sha256=?")) {
|
||||||
|
ps.setBytes(1, cert.emailSha256());
|
||||||
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
|
if (rs.next() && !cert.idBase64Url().equals(rs.getString(1)))
|
||||||
|
throw new IllegalArgumentException("Email hash belongs to another account");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return cert;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Единая точка импорта: один и тот же raw ANS-104 из Turbo и Arweave. */
|
||||||
|
public ImportResult importSigned(byte[] raw, Provenance provenance) throws Exception {
|
||||||
|
if (raw == null || raw.length > 16_384 || raw.length < 200)
|
||||||
|
throw new IllegalArgumentException("Invalid registration data item size");
|
||||||
|
// Сначала разбираем/проверяем структурный контейнер, затем сверяем owner с on-chain namespace.
|
||||||
|
blockchain.Ans104DataItem item = new blockchain.Ans104DataItem(raw);
|
||||||
|
String login = extractCanonicalLogin(item);
|
||||||
|
String namespace = login.substring(login.indexOf('@') + 1);
|
||||||
|
try (Connection c = DbController.getInstance().getConnection()) {
|
||||||
|
boolean oldAutoCommit = c.getAutoCommit();
|
||||||
|
c.setAutoCommit(false);
|
||||||
|
try {
|
||||||
|
byte[] registrar = readRegistrar(c, namespace, login);
|
||||||
|
FreeRegistrationCertificateV1.Verified cert = FreeRegistrationCertificateV1.verify(raw, registrar);
|
||||||
|
String id = cert.idBase64Url();
|
||||||
|
String publication = provenance == Provenance.ARWEAVE_CONFIRMED ? "ARWEAVE_CONFIRMED" : "TURBO_ACCEPTED";
|
||||||
|
long now = System.currentTimeMillis();
|
||||||
|
// Защита от коллизий и двойного импорта: имя и email захвачены индексами UNIQUE.
|
||||||
|
try (PreparedStatement check = c.prepareStatement("""
|
||||||
|
SELECT f.raw_signed_data_item, f.publication_status, u.root_key, u.client_key,
|
||||||
|
u.blockchain_key FROM free_registration_certificate f
|
||||||
|
JOIN user_identity_current u ON u.login=f.login
|
||||||
|
WHERE f.data_item_id=? FOR UPDATE OF f
|
||||||
|
""")) {
|
||||||
|
check.setString(1, id);
|
||||||
|
try (ResultSet r = check.executeQuery()) {
|
||||||
|
if (r.next()) {
|
||||||
|
if (!Arrays.equals(raw, r.getBytes(1)))
|
||||||
|
throw new SQLException("DataItem id collision with different raw bytes");
|
||||||
|
if (!r.getString(3).equals(Base58Util.encode(cert.rootKey())) ||
|
||||||
|
!r.getString(4).equals(Base58Util.encode(cert.clientKey())) ||
|
||||||
|
!r.getString(5).equals(Base58Util.encode(cert.blockchainKey())))
|
||||||
|
throw new SQLException("Accepted identity keys conflict with certificate");
|
||||||
|
if (provenance == Provenance.ARWEAVE_CONFIRMED) {
|
||||||
|
try (PreparedStatement up = c.prepareStatement("""
|
||||||
|
UPDATE free_registration_certificate SET publication_status='ARWEAVE_CONFIRMED',last_seen_at_ms=?
|
||||||
|
WHERE data_item_id=?
|
||||||
|
""")) {
|
||||||
|
up.setLong(1, now); up.setString(2, id); up.executeUpdate();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
c.commit();
|
||||||
|
return new ImportResult(login, id, true, provenance);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
try (PreparedStatement insert = c.prepareStatement("""
|
||||||
|
INSERT INTO user_identity_current (
|
||||||
|
login, normalized_login, namespace, registration_source, registration_status,
|
||||||
|
solana_pda_address, free_data_item_id, root_key, client_key, blockchain_key,
|
||||||
|
blockchain_name, is_server, registered_at_ms, updated_at_ms)
|
||||||
|
VALUES (?, ?, ?, 'ARWEAVE', 'FREE_CERT', NULL, ?, ?, ?, ?, ?, false, ?, ?)
|
||||||
|
""")) {
|
||||||
|
insert.setString(1, login); insert.setString(2, login.toLowerCase(java.util.Locale.ROOT)); insert.setString(3, namespace);
|
||||||
|
insert.setString(4, id); insert.setString(5, Base58Util.encode(cert.rootKey()));
|
||||||
|
insert.setString(6, Base58Util.encode(cert.clientKey()));
|
||||||
|
insert.setString(7, Base58Util.encode(cert.blockchainKey()));
|
||||||
|
insert.setString(8, login.toLowerCase(java.util.Locale.ROOT) + "-001"); insert.setLong(9, now); insert.setLong(10, now);
|
||||||
|
insert.executeUpdate();
|
||||||
|
}
|
||||||
|
// blockchain_state — обязательная runtime-проекция новой цепочки.
|
||||||
|
// Без неё первый пользовательский AddBlock (например, «О себе») будет
|
||||||
|
// отклонён ещё до проверки подписи.
|
||||||
|
try (PreparedStatement insert = c.prepareStatement("""
|
||||||
|
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, ?, ?)
|
||||||
|
""")) {
|
||||||
|
insert.setString(1, login);
|
||||||
|
// blockchain_state — runtime-слой: его ключ всегда Base64(32),
|
||||||
|
// как и у пользователей, импортированных из Solana PDA.
|
||||||
|
insert.setString(2, Base64.getEncoder().encodeToString(cert.blockchainKey()));
|
||||||
|
insert.setBytes(3, new byte[32]);
|
||||||
|
insert.setLong(4, now);
|
||||||
|
insert.executeUpdate();
|
||||||
|
}
|
||||||
|
try (PreparedStatement insert = c.prepareStatement("""
|
||||||
|
INSERT INTO free_registration_certificate (
|
||||||
|
data_item_id, login, namespace, email_sha256, inner_signature,
|
||||||
|
raw_signed_data_item, publication_status, registered_at_ms, last_seen_at_ms)
|
||||||
|
VALUES (?,?,?,?,?,?,?,?,?)
|
||||||
|
""")) {
|
||||||
|
insert.setString(1, id); insert.setString(2, login); insert.setString(3, namespace);
|
||||||
|
insert.setBytes(4, cert.emailSha256()); insert.setBytes(5, cert.innerSignature());
|
||||||
|
insert.setBytes(6, raw); insert.setString(7, publication);
|
||||||
|
insert.setLong(8, now); insert.setLong(9, now); insert.executeUpdate();
|
||||||
|
}
|
||||||
|
c.commit();
|
||||||
|
return new ImportResult(login, id, false, provenance);
|
||||||
|
} catch (Exception e) {
|
||||||
|
c.rollback(); throw e;
|
||||||
|
} finally { c.setAutoCommit(oldAutoCommit); }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String extractCanonicalLogin(blockchain.Ans104DataItem item) {
|
||||||
|
boolean marker = item.tags().contains(new blockchain.Ans104DataItem.Tag("t", "reg"));
|
||||||
|
if (!marker) throw new IllegalArgumentException("Not a registration DataItem");
|
||||||
|
byte[] bytes = item.data();
|
||||||
|
if (bytes.length < 3 || bytes[0] != 1 || bytes[1] != 0) throw new IllegalArgumentException("Bad certificate header");
|
||||||
|
int len = bytes[2] & 0xff;
|
||||||
|
if (len < 3 || len > 30 || bytes.length < 3 + len + 96 + 64 + 32)
|
||||||
|
throw new IllegalArgumentException("Invalid certificate login length");
|
||||||
|
return FreeRegistrationCertificateV1.validateLogin(
|
||||||
|
new String(bytes, 3, len, java.nio.charset.StandardCharsets.UTF_8));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static byte[] readRegistrar(Connection c, String namespace, String login) throws Exception {
|
||||||
|
try (PreparedStatement ps = c.prepareStatement("""
|
||||||
|
SELECT registrar_pubkey, min_localpart_len, default_server_login
|
||||||
|
FROM shine_namespace_current WHERE namespace=? AND namespace_type=2
|
||||||
|
""")) {
|
||||||
|
ps.setString(1, namespace);
|
||||||
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
|
if (!rs.next()) throw new IllegalStateException("Unknown/free namespace not yet synchronized");
|
||||||
|
if (login.indexOf('@') < rs.getInt("min_localpart_len"))
|
||||||
|
throw new IllegalArgumentException("Login shorter than namespace minimum");
|
||||||
|
if (rs.getString("default_server_login") == null || rs.getString("default_server_login").isBlank())
|
||||||
|
throw new IllegalArgumentException("Namespace has no access server");
|
||||||
|
byte[] key = Base58Util.decode(rs.getString("registrar_pubkey"));
|
||||||
|
if (key.length != 32) throw new IllegalArgumentException("Invalid registrar pubkey");
|
||||||
|
return key;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
0200a9de19b3551ace117973b80d632503bf2a55f0aa2490deb1474a280b675fa01bb2ccb5890faadcb213d3882fb21a7af13702526a569f7807b1c8b6963c0be402174553b456dddfc6908ecab1c101fe6ab21e2baa0617795b7d43a63482993fd500000300000000000000390000000000000006064170701074657374353539310274067265671050726f746f636f6c345348694e452d467265652d526567697374726174696f6e2d563100010008626f62406672656503a107bff3ce10be1d70dd18e74bc09967e4d6309ba50d5f1ddc8664125531b829acbae141bccaf0b22e1a94d34d0bc7361e526d0bfe12c89794bc9322966dd72543b92ff1095511476adc8369db6ddc933665a11978dda1404ee1066ca9559de2edfcd8b1b7a1823f56b827ddfa8a3682793e036141b526467ae346e220d08757d0a878a2f722562e6d3132ef9df04b1ab9e2f65d72bb0f48c17b7ada3e5a0acbc605c49fd774ff4d9ea789d8f6bffa719e9774cb86f62d11fd244121150956
|
||||||
+1
-1
@@ -29,7 +29,7 @@ final class Ans104BundleTest {
|
|||||||
byte[] privateKey = Ed25519Util.generatePrivateKeyFromString("bundle-" + payload);
|
byte[] privateKey = Ed25519Util.generatePrivateKeyFromString("bundle-" + payload);
|
||||||
byte[] owner = Ed25519Util.derivePublicKey(privateKey);
|
byte[] owner = Ed25519Util.derivePublicKey(privateKey);
|
||||||
byte[] data = payload.getBytes(StandardCharsets.UTF_8);
|
byte[] data = payload.getBytes(StandardCharsets.UTF_8);
|
||||||
List<Ans104DataItem.Tag> tags = List.of(new Ans104DataItem.Tag("App", "test5590"));
|
List<Ans104DataItem.Tag> tags = List.of(new Ans104DataItem.Tag(blockchain.ShineProtocolTags.APP_TAG_NAME, blockchain.ShineProtocolTags.APP_TAG_VALUE));
|
||||||
byte[] signature = Ed25519Util.sign(Ans104DataItem.buildSigningMessage(owner, tags, data), privateKey);
|
byte[] signature = Ed25519Util.sign(Ans104DataItem.buildSigningMessage(owner, tags, data), privateKey);
|
||||||
return Ans104DataItem.serializeEd25519(signature, owner, tags, data);
|
return Ans104DataItem.serializeEd25519(signature, owner, tags, data);
|
||||||
}
|
}
|
||||||
|
|||||||
+43
@@ -0,0 +1,43 @@
|
|||||||
|
package server.archive;
|
||||||
|
|
||||||
|
import server.archive.registration.*;
|
||||||
|
import blockchain.Ans104DataItem;
|
||||||
|
import blockchain.ShineProtocolTags;
|
||||||
|
import utils.crypto.Ed25519Util;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.HexFormat;
|
||||||
|
|
||||||
|
/** Standalone test (no legacy signed fixture): certificate issue/verify for CURRENT App tag. */
|
||||||
|
public final class FreeRegistrationCertificateV1Check {
|
||||||
|
static final HexFormat HEX = HexFormat.of();
|
||||||
|
public static void main(String[] args) throws Exception {
|
||||||
|
byte[] seed = Ed25519Util.generatePrivateKeyFromString("TEST-only-reg-v1-check");
|
||||||
|
byte[] root = HEX.parseHex("03a107bff3ce10be1d70dd18e74bc09967e4d6309ba50d5f1ddc8664125531b8");
|
||||||
|
byte[] chain = HEX.parseHex("29acbae141bccaf0b22e1a94d34d0bc7361e526d0bfe12c89794bc9322966dd7");
|
||||||
|
byte[] client = HEX.parseHex("2543b92ff1095511476adc8369db6ddc933665a11978dda1404ee1066ca9559d");
|
||||||
|
try (var signer = new LocalRegistrarSigner(seed)) {
|
||||||
|
byte[] cert = FreeRegistrationCertificateV1.issue("SuperMan@free", root, chain, client,
|
||||||
|
" Alice.Example+Tag@Example.COM ", signer);
|
||||||
|
var item = new Ans104DataItem(cert);
|
||||||
|
if (!item.hasTag(ShineProtocolTags.APP_TAG_NAME, ShineProtocolTags.APP_TAG_VALUE))
|
||||||
|
throw new AssertionError("Current App tag missing");
|
||||||
|
var result = FreeRegistrationCertificateV1.verify(cert, signer.publicKey32());
|
||||||
|
if (!"SuperMan@free".equals(result.login()) || !Arrays.equals(result.rootKey(), root)
|
||||||
|
|| !Arrays.equals(result.blockchainKey(), chain) || !Arrays.equals(result.clientKey(), client))
|
||||||
|
throw new AssertionError("Certificate identity corrupted");
|
||||||
|
if (!Arrays.equals(result.emailSha256(), HEX.parseHex(
|
||||||
|
"cbc605c49fd774ff4d9ea789d8f6bffa719e9774cb86f62d11fd244121150956")))
|
||||||
|
throw new AssertionError("Email normalization differs");
|
||||||
|
byte[] bad = cert.clone(); bad[bad.length - 1] ^= 1;
|
||||||
|
try { FreeRegistrationCertificateV1.verify(bad, signer.publicKey32());
|
||||||
|
throw new AssertionError("Email bit flip accepted"); }
|
||||||
|
catch (IllegalArgumentException expected) {}
|
||||||
|
bad = cert.clone(); bad[bad.length - 40] ^= 1;
|
||||||
|
try { FreeRegistrationCertificateV1.verify(bad, signer.publicKey32());
|
||||||
|
throw new AssertionError("Inner signature tampering accepted"); }
|
||||||
|
catch (IllegalArgumentException expected) {}
|
||||||
|
}
|
||||||
|
System.out.println("PASS: current App=" + ShineProtocolTags.APP_TAG_VALUE
|
||||||
|
+ ", Java registrar inner+outer Ed25519, original case, email, tamper rejection");
|
||||||
|
}
|
||||||
|
}
|
||||||
+41
@@ -0,0 +1,41 @@
|
|||||||
|
package server.archive;
|
||||||
|
|
||||||
|
import server.archive.registration.*;
|
||||||
|
import javax.sql.DataSource;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.util.HexFormat;
|
||||||
|
|
||||||
|
/** Только проверки без БД/сети; полное E2E требует PostgreSQL и Turbo. */
|
||||||
|
public final class FreeRegistrationWorkflowLocalCheck {
|
||||||
|
public static void main(String[] args) throws Exception {
|
||||||
|
var signer = new RegistrarSigner() {
|
||||||
|
public byte[] publicKey32() { return new byte[32]; }
|
||||||
|
public byte[] sign(byte[] message) { return new byte[64]; }
|
||||||
|
};
|
||||||
|
DataSource noDb = new DataSource() {
|
||||||
|
public java.sql.Connection getConnection() throws java.sql.SQLException { throw new java.sql.SQLException("No database in local test"); }
|
||||||
|
public java.sql.Connection getConnection(String u, String p) throws java.sql.SQLException { return getConnection(); }
|
||||||
|
public java.io.PrintWriter getLogWriter() {return null;}
|
||||||
|
public void setLogWriter(java.io.PrintWriter x) {}
|
||||||
|
public void setLoginTimeout(int x) {}
|
||||||
|
public int getLoginTimeout() {return 0;}
|
||||||
|
public java.util.logging.Logger getParentLogger() {return java.util.logging.Logger.getAnonymousLogger();}
|
||||||
|
public <T> T unwrap(Class<T> iface) throws java.sql.SQLException {throw new java.sql.SQLException("unsupported");}
|
||||||
|
public boolean isWrapperFor(Class<?> iface) {return false;}
|
||||||
|
};
|
||||||
|
var issuer = new FreeRegistrationIssuer(noDb, signer);
|
||||||
|
var importer = new VerifiedFreeRegistrationImporter();
|
||||||
|
var workflow = new FreeRegistrationWorkflow(issuer,
|
||||||
|
new FreeRegistrationPublisher(issuer, new TurboDataItemUploader(ArweaveBlocksConfig.load()), importer),
|
||||||
|
(email, code) -> { throw new AssertionError("No real email in an offline check"); },
|
||||||
|
false, false, AllowedEmailDomains.load(Files.isRegularFile(Path.of("allowed-email-domains.txt"))
|
||||||
|
? Path.of("allowed-email-domains.txt") : Path.of("../allowed-email-domains.txt")));
|
||||||
|
try { workflow.confirm("unknown", "123456"); throw new AssertionError("Missing challenge accepted"); }
|
||||||
|
catch (IllegalArgumentException expected) { }
|
||||||
|
try { importer.importSigned(new byte[]{1,2,3}, VerifiedFreeRegistrationImporter.Provenance.TURBO_ACCEPTED);
|
||||||
|
throw new AssertionError("Invalid bytes accepted"); }
|
||||||
|
catch (IllegalArgumentException expected) { }
|
||||||
|
System.out.println("PASS: workflow missing challenge + reject invalid signed bytes");
|
||||||
|
}
|
||||||
|
}
|
||||||
+47
@@ -0,0 +1,47 @@
|
|||||||
|
package server.archive.registration;
|
||||||
|
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
|
||||||
|
/** Самостоятельный офлайн-тест: javac AllowedEmailDomains.java AllowedEmailDomainsCheck.java + java. */
|
||||||
|
public final class AllowedEmailDomainsCheck {
|
||||||
|
public static void main(String[] args) throws Exception {
|
||||||
|
Path dir = Files.createTempDirectory("shine-email-domains-test-");
|
||||||
|
try {
|
||||||
|
Path file = dir.resolve("allowed-email-domains.txt");
|
||||||
|
Files.writeString(file, "# Test\n Gmail.com \nproton.me\n\n", StandardCharsets.UTF_8);
|
||||||
|
AllowedEmailDomains allowed = AllowedEmailDomains.load(file);
|
||||||
|
expect(allowed.permits("User@GMAIL.COM"), "case insensitive match");
|
||||||
|
expect(allowed.permits(" user@proton.me "), "trimmed match");
|
||||||
|
expect(!allowed.permits("user@gmail.com.evil.org"), "suffix bypass");
|
||||||
|
expect(!allowed.permits("user@sub.gmail.com"), "subdomain bypass");
|
||||||
|
expect(!allowed.permits("user@other.com"), "unknown domain");
|
||||||
|
expect(!allowed.permits("user@@gmail.com"), "invalid multiple @");
|
||||||
|
expect(!allowed.permits("@gmail.com"), "missing local part");
|
||||||
|
expect(!allowed.permits(null), "null address");
|
||||||
|
Files.writeString(file, "# no domains\n \n", StandardCharsets.UTF_8);
|
||||||
|
expectLoadFailure(file, "empty file");
|
||||||
|
Files.writeString(file, "*.gmail.com\n", StandardCharsets.UTF_8);
|
||||||
|
expectLoadFailure(file, "wildcard not allowed");
|
||||||
|
Files.writeString(file, "gmail.com\ninvalid_domain\n", StandardCharsets.UTF_8);
|
||||||
|
expectLoadFailure(file, "invalid line not ignored");
|
||||||
|
Files.delete(file);
|
||||||
|
expectLoadFailure(file, "missing file");
|
||||||
|
System.out.println("PASS: allowed email domains, strict matching, fail-closed");
|
||||||
|
} finally {
|
||||||
|
try (var files = Files.list(dir)) { files.forEach(path -> {try {Files.deleteIfExists(path);}catch(Exception ex){throw new RuntimeException(ex);}}); }
|
||||||
|
Files.deleteIfExists(dir);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void expect(boolean condition, String scenario) {
|
||||||
|
if (!condition) throw new AssertionError(scenario);
|
||||||
|
}
|
||||||
|
private static void expectLoadFailure(Path file, String scenario) throws Exception {
|
||||||
|
try {
|
||||||
|
AllowedEmailDomains.load(file);
|
||||||
|
throw new AssertionError("Invalid allowlist accepted: " + scenario);
|
||||||
|
} catch (java.io.IOException expected) { }
|
||||||
|
}
|
||||||
|
}
|
||||||
+17
@@ -0,0 +1,17 @@
|
|||||||
|
package server.archive.registration;
|
||||||
|
|
||||||
|
/** Локальная проверка генератора и сверки кода без БД/HTTP. */
|
||||||
|
public final class RegistrationEmailCodeCheck {
|
||||||
|
public static void main(String[] args) {
|
||||||
|
for (int i=0; i<1000; ++i) {
|
||||||
|
String code = RegistrationEmailCode.generate();
|
||||||
|
if (!code.matches("[0-9]{6}")) throw new AssertionError("Wrong length");
|
||||||
|
byte[] hash = RegistrationEmailCode.hash("challenge-id", code);
|
||||||
|
if (!RegistrationEmailCode.matches(hash, "challenge-id", code)) throw new AssertionError("Cannot verify");
|
||||||
|
if (RegistrationEmailCode.matches(hash, "another-challenge", code)) throw new AssertionError("Challenge replay");
|
||||||
|
if (RegistrationEmailCode.matches(hash, "challenge-id", "1111")) throw new AssertionError("Old demo code accepted");
|
||||||
|
if (RegistrationEmailCode.matches(hash, "challenge-id", "bad")) throw new AssertionError("Bad code accepted");
|
||||||
|
}
|
||||||
|
System.out.println("PASS: email code generation and challenge binding");
|
||||||
|
}
|
||||||
|
}
|
||||||
+21
@@ -0,0 +1,21 @@
|
|||||||
|
package server.archive.registration;
|
||||||
|
|
||||||
|
/** Offline проверка часового TTL на уровне UX отдельно; bypass должен быть строго opt-in. */
|
||||||
|
public final class RegistrationEmailSettingsCheck {
|
||||||
|
public static void main(String[] args) {
|
||||||
|
byte[] digest = RegistrationEmailCode.hash("challenge", "123456");
|
||||||
|
var safe = new FreeRegistrationWorkflow(null, null, null, false);
|
||||||
|
var test = new FreeRegistrationWorkflow(null, null, null, true);
|
||||||
|
if (safe.isValidVerificationCode(digest, "challenge", "777777"))
|
||||||
|
throw new AssertionError("Cheat unexpectedly enabled by default");
|
||||||
|
if (!test.isValidVerificationCode(digest, "challenge", "777777"))
|
||||||
|
throw new AssertionError("Explicit test code not accepted");
|
||||||
|
if (!safe.isValidVerificationCode(digest, "challenge", "123456"))
|
||||||
|
throw new AssertionError("Real code rejected");
|
||||||
|
if (test.isValidVerificationCode(digest, "challenge", "1111"))
|
||||||
|
throw new AssertionError("Old demo code unexpectedly accepted");
|
||||||
|
if (test.isValidVerificationCode(digest, "challenge", "777778"))
|
||||||
|
throw new AssertionError("Invalid code unexpectedly accepted");
|
||||||
|
System.out.println("PASS: real code and opt-in test code");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -17,6 +17,7 @@ import java.util.Objects;
|
|||||||
* SHiNE Frame v1 (all integer fields BigEndian):
|
* SHiNE Frame v1 (all integer fields BigEndian):
|
||||||
* [2] frameCode = 0x0001
|
* [2] frameCode = 0x0001
|
||||||
* [32] prevHash32 = SHA-256(Frame v1 bytes of previous SHiNE block)
|
* [32] prevHash32 = SHA-256(Frame v1 bytes of previous SHiNE block)
|
||||||
|
* [32] back32Hash32 = SHA-256(Frame v1 bytes of block N-32), or zero for N<32
|
||||||
* [4] blockSize = exact Frame v1 byte length
|
* [4] blockSize = exact Frame v1 byte length
|
||||||
* [4] blockNumber
|
* [4] blockNumber
|
||||||
* [8] timestamp unix seconds
|
* [8] timestamp unix seconds
|
||||||
@@ -33,10 +34,11 @@ public final class BchBlockEntry {
|
|||||||
public static final int FRAME_CODE_V1 = 0x0001;
|
public static final int FRAME_CODE_V1 = 0x0001;
|
||||||
public static final int MAX_BLOCK_FULL_BYTES = Ans104DataItem.MAX_DATA_ITEM_BYTES;
|
public static final int MAX_BLOCK_FULL_BYTES = Ans104DataItem.MAX_DATA_ITEM_BYTES;
|
||||||
public static final long MAX_FUTURE_SECONDS = 60;
|
public static final long MAX_FUTURE_SECONDS = 60;
|
||||||
public static final int FRAME_HEADER_SIZE = 2 + 32 + 4 + 4 + 8 + 2 + 2 + 2;
|
public static final int FRAME_HEADER_SIZE = 2 + 32 + 32 + 4 + 4 + 8 + 2 + 2 + 2;
|
||||||
|
|
||||||
public final int frameCode;
|
public final int frameCode;
|
||||||
public final byte[] prevHash32;
|
public final byte[] prevHash32;
|
||||||
|
public final byte[] back32Hash32;
|
||||||
public final int blockSize;
|
public final int blockSize;
|
||||||
public final int blockNumber;
|
public final int blockNumber;
|
||||||
public final long timestamp;
|
public final long timestamp;
|
||||||
@@ -66,6 +68,8 @@ public final class BchBlockEntry {
|
|||||||
}
|
}
|
||||||
this.prevHash32 = new byte[32];
|
this.prevHash32 = new byte[32];
|
||||||
bb.get(prevHash32);
|
bb.get(prevHash32);
|
||||||
|
this.back32Hash32 = new byte[32];
|
||||||
|
bb.get(back32Hash32);
|
||||||
this.blockSize = bb.getInt();
|
this.blockSize = bb.getInt();
|
||||||
if (blockSize != frameBytes.length || blockSize < FRAME_HEADER_SIZE) {
|
if (blockSize != frameBytes.length || blockSize < FRAME_HEADER_SIZE) {
|
||||||
throw new IllegalArgumentException("SHiNE blockSize mismatch: declared=" + blockSize + " actual=" + frameBytes.length);
|
throw new IllegalArgumentException("SHiNE blockSize mismatch: declared=" + blockSize + " actual=" + frameBytes.length);
|
||||||
|
|||||||
@@ -18,13 +18,18 @@ public final class BodyRecordParser {
|
|||||||
|
|
||||||
// TECH supports Header v1 and CreateChannel current format (ver=1).
|
// TECH supports Header v1 and CreateChannel current format (ver=1).
|
||||||
if (t == (CreateChannelBody.TYPE & 0xFFFF)) {
|
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();
|
return new HeaderBody(subType, version, bodyBytes).check();
|
||||||
}
|
}
|
||||||
if (st == (CreateChannelBody.SUBTYPE & 0xFFFF)
|
if (st == (CreateChannelBody.SUBTYPE & 0xFFFF)
|
||||||
&& (v == (CreateChannelBody.VER & 0xFFFF))) {
|
&& (v == (CreateChannelBody.VER & 0xFFFF))) {
|
||||||
return new CreateChannelBody(subType, version, bodyBytes).check();
|
return new CreateChannelBody(subType, version, bodyBytes).check();
|
||||||
}
|
}
|
||||||
|
if (st == (ForkBody.SUBTYPE & 0xFFFF)
|
||||||
|
&& (v == (ForkBody.VER & 0xFFFF))) {
|
||||||
|
return new ForkBody(subType, version, bodyBytes).check();
|
||||||
|
}
|
||||||
throw new IllegalArgumentException(
|
throw new IllegalArgumentException(
|
||||||
String.format("Unknown TECH body type/version/subType: type=%d ver=%d subType=%d", t, v, st)
|
String.format("Unknown TECH body type/version/subType: type=%d ver=%d subType=%d", t, v, st)
|
||||||
);
|
);
|
||||||
@@ -33,7 +38,7 @@ public final class BodyRecordParser {
|
|||||||
int key = (t << 16) | v;
|
int key = (t << 16) | v;
|
||||||
|
|
||||||
BodyRecord r = switch (key) {
|
BodyRecord r = switch (key) {
|
||||||
case TextBody.KEY -> {
|
case TextLineBody.KEY -> {
|
||||||
if (st == (MsgSubType.TEXT_POST & 0xFFFF)
|
if (st == (MsgSubType.TEXT_POST & 0xFFFF)
|
||||||
|| st == (MsgSubType.TEXT_EDIT_POST & 0xFFFF)
|
|| st == (MsgSubType.TEXT_EDIT_POST & 0xFFFF)
|
||||||
|| st == (MsgSubType.TEXT_EXERCISE & 0xFFFF)
|
|| st == (MsgSubType.TEXT_EXERCISE & 0xFFFF)
|
||||||
@@ -41,7 +46,8 @@ public final class BodyRecordParser {
|
|||||||
|| st == (MsgSubType.TEXT_COURSE & 0xFFFF)
|
|| st == (MsgSubType.TEXT_COURSE & 0xFFFF)
|
||||||
|| st == (MsgSubType.TEXT_ENTRYPOINT & 0xFFFF)
|
|| st == (MsgSubType.TEXT_ENTRYPOINT & 0xFFFF)
|
||||||
|| st == (MsgSubType.TEXT_REPOST & 0xFFFF)
|
|| st == (MsgSubType.TEXT_REPOST & 0xFFFF)
|
||||||
|| st == (MsgSubType.TEXT_CHANNEL_META & 0xFFFF)) {
|
|| st == (MsgSubType.TEXT_CHANNEL_META & 0xFFFF)
|
||||||
|
|| st == (MsgSubType.TEXT_CHANNEL_DELETE & 0xFFFF)) {
|
||||||
yield new TextLineBody(subType, version, bodyBytes);
|
yield new TextLineBody(subType, version, bodyBytes);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -13,5 +13,5 @@
|
|||||||
// public static final short TEXT = 1; // сообщения да надо
|
// public static final short TEXT = 1; // сообщения да надо
|
||||||
// public static final short REACTION = 2; // реакции не надо
|
// public static final short REACTION = 2; // реакции не надо
|
||||||
// public static final short CONNECTION = 3; // связи (friend/contact/follow) да надо
|
// public static final short CONNECTION = 3; // связи (friend/contact/follow) да надо
|
||||||
// public static final short USER_PARAM = 4; // параметры профиля да надо
|
// public static final short USER_PROFILE= 4; // профиль пользователя да надо
|
||||||
//}
|
//}
|
||||||
@@ -35,6 +35,8 @@ public final class MsgSubType {
|
|||||||
/** HeaderBody: subType всегда 0 (compat). */
|
/** HeaderBody: subType всегда 0 (compat). */
|
||||||
public static final short HEADER_COMPAT = 0;
|
public static final short HEADER_COMPAT = 0;
|
||||||
public static final short TECH_CREATE_CHANNEL = 1;
|
public static final short TECH_CREATE_CHANNEL = 1;
|
||||||
|
/** Новый fork/ротация ключей: ссылка на родительскую цепочку и точку отката. */
|
||||||
|
public static final short TECH_FORK = 2;
|
||||||
|
|
||||||
/* ===================== TEXT (msg_type=1) ===================== */
|
/* ===================== TEXT (msg_type=1) ===================== */
|
||||||
|
|
||||||
@@ -53,7 +55,7 @@ public final class MsgSubType {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* REPLY — ответ на сообщение.
|
* REPLY — ответ на сообщение.
|
||||||
* НЕ в линии. Имеет target (toBlockchainName + blockNumber + hash32).
|
* НЕ в линии. Имеет target (toLogin + blockNumber + hash32).
|
||||||
* Может указывать на чужой блокчейн/чужую линию/чужой канал.
|
* Может указывать на чужой блокчейн/чужую линию/чужой канал.
|
||||||
*/
|
*/
|
||||||
public static final short TEXT_REPLY = 20;
|
public static final short TEXT_REPLY = 20;
|
||||||
@@ -69,7 +71,7 @@ public final class MsgSubType {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* REPOST — отложенная будущая заготовка репоста сообщения в линии канала.
|
* REPOST — отложенная будущая заготовка репоста сообщения в линии канала.
|
||||||
* Имеет hasLine + target (toBlockchainName + toBlockGlobalNumber + toBlockHash32) + текст комментария.
|
* Имеет hasLine + target (toLogin + toBlockGlobalNumber + toBlockHash32) + текст комментария.
|
||||||
*/
|
*/
|
||||||
public static final short TEXT_REPOST = 50;
|
public static final short TEXT_REPOST = 50;
|
||||||
|
|
||||||
@@ -79,6 +81,9 @@ public final class MsgSubType {
|
|||||||
*/
|
*/
|
||||||
public static final short TEXT_CHANNEL_META = 90;
|
public static final short TEXT_CHANNEL_META = 90;
|
||||||
|
|
||||||
|
/** CHANNEL_DELETE — soft-delete marker for a channel line. */
|
||||||
|
public static final short TEXT_CHANNEL_DELETE = 92;
|
||||||
|
|
||||||
/** ENTRYPOINT — входная страница канала (line-based). */
|
/** ENTRYPOINT — входная страница канала (line-based). */
|
||||||
public static final short TEXT_ENTRYPOINT = 100;
|
public static final short TEXT_ENTRYPOINT = 100;
|
||||||
/** EXERCISE — упражнение/комплекс (line-based). */
|
/** EXERCISE — упражнение/комплекс (line-based). */
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package blockchain;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Канонические ANS-104 tag names/value текущего SHiNE transport namespace на сервере.
|
||||||
|
*
|
||||||
|
* При смене тестовой эпохи namespace меняется отдельно в трёх рабочих местах:
|
||||||
|
* сервер, UI и актуальный Arweave Viewer.
|
||||||
|
*/
|
||||||
|
public final class ShineProtocolTags {
|
||||||
|
private ShineProtocolTags() {}
|
||||||
|
|
||||||
|
public static final String NAMESPACE = "test5592";
|
||||||
|
public static final String APP_TAG_NAME = "App";
|
||||||
|
public static final String APP_TAG_VALUE = NAMESPACE;
|
||||||
|
public static final String CHANNEL_TAG_NAME = "c";
|
||||||
|
public static final String TYPE_TAG_NAME = "t";
|
||||||
|
}
|
||||||
+14
-12
@@ -1,21 +1,23 @@
|
|||||||
package blockchain.body;
|
package blockchain.body;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BodyHasLine — для типов, которые имеют линейные поля в body.
|
* BodyHasLine — типы блоков, которые входят в проверяемую логическую линию.
|
||||||
*
|
*
|
||||||
* Line-prefix (BigEndian) в НАЧАЛЕ bodyBytes:
|
* Общая семантика:
|
||||||
* [4] lineCode код линии (root-идентификатор):
|
* prevLineBlockGlobalNumber — GLOBAL blockNumber предыдущего блока этой линии;
|
||||||
* - 0 для дефолтной линии/канала "0" (root = HEADER, blockNumber=0)
|
* prevLineBlockHash32 — hash32 предыдущего блока этой линии;
|
||||||
* - для канала "X": blockNumber root-блока канала (CREATE_CHANNEL)
|
* lineSeq — порядковый номер шага линии.
|
||||||
*
|
*
|
||||||
* [4] prevLineBlockGlobalNumber глобальный номер предыдущего блока в этой линии
|
* lineCode — логический идентификатор линии:
|
||||||
* [32] prevLineBlockHash32 hash32 предыдущего блока в этой линии
|
* - 0 для фиксированных системных линий (TECH, CONNECTION, USER_PROFILE)
|
||||||
|
* и для дефолтного канала, корнем которого является HEADER #0;
|
||||||
|
* - для пользовательского канала: GLOBAL blockNumber его CREATE_CHANNEL root.
|
||||||
*
|
*
|
||||||
* [4] lineSeq порядковый номер сообщения внутри линии (1..N)
|
* Важно: lineCode не обязан физически присутствовать в body. Для фиксированных
|
||||||
|
* USER_PROFILE и CONNECTION он выводится из msg_type и метод lineCode() возвращает 0.
|
||||||
|
* Для TEXT-каналов и TECH-блоков lineCode хранится в body явно.
|
||||||
*
|
*
|
||||||
* Важно:
|
* Полная проверка хвоста линии, prev hash и lineSeq выполняется сервером при AddBlock.
|
||||||
* - Проверка связности линии (prevLineBlockGlobalNumber ↔ prevLineBlockHash32) и корректности lineSeq
|
|
||||||
* выполняется на сервере/в БД при вставке (а не в body.check()).
|
|
||||||
*/
|
*/
|
||||||
public interface BodyHasLine {
|
public interface BodyHasLine {
|
||||||
|
|
||||||
@@ -26,4 +28,4 @@ public interface BodyHasLine {
|
|||||||
byte[] prevLineBlockHash32();
|
byte[] prevLineBlockHash32();
|
||||||
|
|
||||||
int lineSeq();
|
int lineSeq();
|
||||||
}
|
}
|
||||||
|
|||||||
+14
-20
@@ -1,31 +1,25 @@
|
|||||||
package blockchain.body;
|
package blockchain.body;
|
||||||
|
|
||||||
import utils.blockchain.BlockchainNameUtil;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BodyHasTarget — дополнительный интерфейс для body, которые "ссылаются" на цель (to-поля).
|
* Body that refers to a logical block target.
|
||||||
*
|
*
|
||||||
* Новое правило:
|
* Canonical rules:
|
||||||
* - toLogin НЕ храним в байтах блока.
|
* - external target: login + forkNumber + blockNumber + blockHash;
|
||||||
* - toLogin всегда вычисляется из toBchName по стандарту login+"-NNN".
|
* - own EDIT target: blockNumber + blockHash only;
|
||||||
*
|
* - logical identity NEVER includes forkNumber: login + blockNumber + blockHash;
|
||||||
* Все методы могут возвращать null.
|
* - forkNumber is informational/historical only and must be in 1..999.
|
||||||
*/
|
*/
|
||||||
public interface BodyHasTarget {
|
public interface BodyHasTarget {
|
||||||
|
/** Target login; null for own-chain compact EDIT targets. */
|
||||||
|
default String toLogin() { return null; }
|
||||||
|
|
||||||
/** login цели (nullable). Вычисляется из toBchName(). */
|
/** Historical fork number recorded by the author; null for compact EDIT targets. */
|
||||||
default String toLogin() {
|
default Integer toForkNumber() { return null; }
|
||||||
String bch = toBchName();
|
|
||||||
if (bch == null) return null;
|
|
||||||
return BlockchainNameUtil.loginFromBlockchainName(bch);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** blockchainName цели (nullable). */
|
/** Runtime-only physical blockchain cache; never serialized in canonical targets. */
|
||||||
String toBchName();
|
@Deprecated
|
||||||
|
default String toBchName() { return null; }
|
||||||
|
|
||||||
/** globalNumber цели (nullable). */
|
|
||||||
Integer toBlockGlobalNumber();
|
Integer toBlockGlobalNumber();
|
||||||
|
|
||||||
/** hash целевого блока (обычно 32 байта). Может быть null, если ссылки нет. */
|
|
||||||
byte[] toBlockHashBytes();
|
byte[] toBlockHashBytes();
|
||||||
}
|
}
|
||||||
|
|||||||
+115
@@ -0,0 +1,115 @@
|
|||||||
|
package blockchain.body;
|
||||||
|
|
||||||
|
import java.nio.ByteBuffer;
|
||||||
|
import java.nio.charset.CharacterCodingException;
|
||||||
|
import java.nio.charset.CodingErrorAction;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.util.Arrays;
|
||||||
|
|
||||||
|
/** Shared codec/validation for canonical SHiNE target formats. */
|
||||||
|
final class BodyTargetSupport {
|
||||||
|
private BodyTargetSupport() {}
|
||||||
|
|
||||||
|
record ExternalTarget(String login, int forkNumber, int blockNumber, byte[] blockHash32) {}
|
||||||
|
|
||||||
|
static ExternalTarget readExternal(ByteBuffer bb, String ctx, int bytesRequiredAfterTarget) {
|
||||||
|
ensureMin(bb, 1 + 1 + 2 + 4 + 32 + bytesRequiredAfterTarget, ctx + " target too short");
|
||||||
|
int loginLen = Byte.toUnsignedInt(bb.get());
|
||||||
|
if (loginLen <= 0) throw new IllegalArgumentException(ctx + " toLoginLen is 0");
|
||||||
|
ensureMin(bb, loginLen + 2 + 4 + 32 + bytesRequiredAfterTarget, ctx + " target payload too short");
|
||||||
|
|
||||||
|
byte[] loginBytes = new byte[loginLen];
|
||||||
|
bb.get(loginBytes);
|
||||||
|
String login = decodeStrictUtf8(loginBytes, ctx + " toLogin");
|
||||||
|
if (login.isBlank()) throw new IllegalArgumentException(ctx + " toLogin is blank");
|
||||||
|
|
||||||
|
int forkNumber = Short.toUnsignedInt(bb.getShort());
|
||||||
|
validateForkNumber(forkNumber, ctx);
|
||||||
|
int blockNumber = bb.getInt();
|
||||||
|
if (blockNumber < 0) throw new IllegalArgumentException(ctx + " toBlockGlobalNumber < 0");
|
||||||
|
|
||||||
|
byte[] hash = new byte[32];
|
||||||
|
bb.get(hash);
|
||||||
|
requireNonZeroHash32(hash, ctx + " toBlockHash32");
|
||||||
|
return new ExternalTarget(login, forkNumber, blockNumber, hash);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int externalSize(String login) {
|
||||||
|
return 1 + loginBytes(login).length + 2 + 4 + 32;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void writeExternal(ByteBuffer bb, String login, int forkNumber, int blockNumber, byte[] hash32, String ctx) {
|
||||||
|
byte[] loginBytes = loginBytes(login);
|
||||||
|
validateForkNumber(forkNumber, ctx);
|
||||||
|
if (blockNumber < 0) throw new IllegalArgumentException(ctx + " toBlockGlobalNumber < 0");
|
||||||
|
requireNonZeroHash32(hash32, ctx + " toBlockHash32");
|
||||||
|
|
||||||
|
bb.put((byte) loginBytes.length);
|
||||||
|
bb.put(loginBytes);
|
||||||
|
bb.putShort((short) forkNumber);
|
||||||
|
bb.putInt(blockNumber);
|
||||||
|
bb.put(hash32);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void validateExternal(String login, Integer forkNumber, Integer blockNumber, byte[] hash32, String ctx) {
|
||||||
|
loginBytes(login);
|
||||||
|
if (forkNumber == null) throw new IllegalArgumentException(ctx + " toForkNumber is null");
|
||||||
|
validateForkNumber(forkNumber, ctx);
|
||||||
|
if (blockNumber == null || blockNumber < 0) throw new IllegalArgumentException(ctx + " toBlockGlobalNumber invalid");
|
||||||
|
requireNonZeroHash32(hash32, ctx + " toBlockHash32");
|
||||||
|
}
|
||||||
|
|
||||||
|
static void validateCompact(Integer blockNumber, byte[] hash32, String ctx) {
|
||||||
|
if (blockNumber == null || blockNumber < 0) throw new IllegalArgumentException(ctx + " toBlockGlobalNumber invalid");
|
||||||
|
requireNonZeroHash32(hash32, ctx + " toBlockHash32");
|
||||||
|
}
|
||||||
|
|
||||||
|
static byte[] readCompactHash(ByteBuffer bb, String ctx) {
|
||||||
|
ensureMin(bb, 4 + 32, ctx + " target too short");
|
||||||
|
int blockNumber = bb.getInt();
|
||||||
|
if (blockNumber < 0) throw new IllegalArgumentException(ctx + " toBlockGlobalNumber < 0");
|
||||||
|
byte[] hash = new byte[32];
|
||||||
|
bb.get(hash);
|
||||||
|
requireNonZeroHash32(hash, ctx + " toBlockHash32");
|
||||||
|
return hash;
|
||||||
|
}
|
||||||
|
|
||||||
|
static byte[] loginBytes(String login) {
|
||||||
|
if (login == null || login.isBlank()) throw new IllegalArgumentException("toLogin is blank");
|
||||||
|
byte[] bytes = login.getBytes(StandardCharsets.UTF_8);
|
||||||
|
if (bytes.length == 0 || bytes.length > 255) throw new IllegalArgumentException("toLogin utf8 len must be 1..255");
|
||||||
|
return bytes;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void validateForkNumber(int forkNumber, String ctx) {
|
||||||
|
if (forkNumber < 1 || forkNumber > 999) {
|
||||||
|
throw new IllegalArgumentException(ctx + " toForkNumber must be 1..999");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void requireNonZeroHash32(byte[] hash32, String field) {
|
||||||
|
if (hash32 == null || hash32.length != 32) throw new IllegalArgumentException(field + " must be 32 bytes");
|
||||||
|
boolean any = false;
|
||||||
|
for (byte b : hash32) any |= b != 0;
|
||||||
|
if (!any) throw new IllegalArgumentException(field + " must not be zero hash");
|
||||||
|
}
|
||||||
|
|
||||||
|
static byte[] copyHash(byte[] hash32) {
|
||||||
|
return hash32 == null ? null : Arrays.copyOf(hash32, 32);
|
||||||
|
}
|
||||||
|
|
||||||
|
static String decodeStrictUtf8(byte[] bytes, String field) {
|
||||||
|
var decoder = StandardCharsets.UTF_8.newDecoder()
|
||||||
|
.onMalformedInput(CodingErrorAction.REPORT)
|
||||||
|
.onUnmappableCharacter(CodingErrorAction.REPORT);
|
||||||
|
try {
|
||||||
|
return decoder.decode(ByteBuffer.wrap(bytes)).toString();
|
||||||
|
} catch (CharacterCodingException e) {
|
||||||
|
throw new IllegalArgumentException(field + " is not valid UTF-8", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void ensureMin(ByteBuffer bb, int need, String msg) {
|
||||||
|
if (bb.remaining() < need) throw new IllegalArgumentException(msg + " (need=" + need + ", remaining=" + bb.remaining() + ")");
|
||||||
|
}
|
||||||
|
}
|
||||||
+65
-247
@@ -1,286 +1,104 @@
|
|||||||
package blockchain.body;
|
package blockchain.body;
|
||||||
|
|
||||||
import blockchain.MsgSubType;
|
import blockchain.MsgSubType;
|
||||||
import utils.blockchain.BlockchainNameUtil;
|
|
||||||
|
|
||||||
import java.nio.ByteBuffer;
|
import java.nio.ByteBuffer;
|
||||||
import java.nio.ByteOrder;
|
import java.nio.ByteOrder;
|
||||||
import java.nio.charset.StandardCharsets;
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ConnectionBody — type=3, ver=1 (в заголовке блока).
|
* CONNECTION with one fixed connection-history line and canonical external target.
|
||||||
*
|
* lineCode is not stored in body: the logical connection line always has code 0.
|
||||||
* subType (в заголовке блока) как MsgSubType:
|
|
||||||
* FRIEND=10, UNFRIEND=11
|
|
||||||
* CONTACT=20, UNCONTACT=21
|
|
||||||
* FOLLOW=30, UNFOLLOW=31
|
|
||||||
* SPOUSE=40, UNSPOUSE=41
|
|
||||||
* PARENT=50, UNPARENT=51
|
|
||||||
* CHILD=52, UNCHILD=53
|
|
||||||
* SIBLING=54, UNSIBLING=55
|
|
||||||
* FRIEND=14, UNFRIEND=15
|
|
||||||
* KNOWN_PERSON=60, UNKNOWN_PERSON=61 (legacy; accepted but not used by current UI)
|
|
||||||
* SHINE_CONFIRMED=70, SHINE_UNCONFIRMED=71
|
|
||||||
* SHINE_SEEN=74, SHINE_UNSEEN=75 (currently not used by UI)
|
|
||||||
* OFFICIAL_ACCOUNT_CONFIRMED=80, OFFICIAL_ACCOUNT_UNCONFIRMED=81
|
|
||||||
*
|
|
||||||
* bodyBytes (BigEndian), новый формат (toLogin НЕ ХРАНИМ):
|
|
||||||
* [4] lineCode
|
|
||||||
* [4] prevLineNumber
|
|
||||||
* [32] prevLineHash32
|
|
||||||
* [4] thisLineNumber
|
|
||||||
*
|
|
||||||
* [1] toBlockchainNameLen (uint8)
|
|
||||||
* [N] toBlockchainName UTF-8
|
|
||||||
* [4] toBlockGlobalNumber (int32)
|
|
||||||
* [32] toBlockHash32 (raw 32 bytes)
|
|
||||||
*
|
|
||||||
* toLogin вычисляется автоматически из toBlockchainName:
|
|
||||||
* toLogin = BlockchainNameUtil.loginFromBlockchainName(toBlockchainName)
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
|
||||||
* =========================================================================
|
|
||||||
* ПРАВИЛО TARGET/ROOT ДЛЯ КАНАЛОВ И СВЯЗЕЙ (важно для подписок/друзей/контактов)
|
|
||||||
* =========================================================================
|
|
||||||
*
|
|
||||||
* Термины:
|
|
||||||
* - ROOT линии/канала = блок, который "начинает" линию:
|
|
||||||
* * для канала "0" root = HEADER (blockNumber=0)
|
|
||||||
* * для канала "X" root = CREATE_CHANNEL (blockNumber этого блока)
|
|
||||||
*
|
|
||||||
* 1) СВЯЗИ МЕЖДУ ПОЛЬЗОВАТЕЛЯМИ (CONNECTION_*):
|
|
||||||
* FRIEND / CONTACT -> цель ВСЕГДА HEADER пользователя:
|
|
||||||
* toBlockNumber = 0
|
|
||||||
* toBlockHash32 = hash32(HEADER цели)
|
|
||||||
*
|
|
||||||
* 2) ПОДПИСКИ НА КОНТЕНТ (FOLLOW/SUBSCRIBE):
|
|
||||||
* FOLLOW пользователя (в целом) -> цель = ROOT дефолтного канала "0" (то есть HEADER):
|
|
||||||
* toBlockNumber = 0
|
|
||||||
* toBlockHash32 = hash32(HEADER цели)
|
|
||||||
*
|
|
||||||
* FOLLOW/подписка на конкретный канал пользователя ->
|
|
||||||
* цель = ROOT этого канала:
|
|
||||||
* - канал "0": toBlockNumber=0, toBlockHash32=hash32(HEADER)
|
|
||||||
* - канал "X": toBlockNumber=blockNumber(CREATE_CHANNEL),
|
|
||||||
* toBlockHash32=hash32(CREATE_CHANNEL)
|
|
||||||
*
|
|
||||||
* 3) ЗАПРЕТЫ ВАЛИДАЦИИ (желательно на сервере/в БД):
|
|
||||||
* - CONNECTION_CLOSE_FRIEND/CONTACT не могут ссылаться на не-HEADER (toBlockNumber != 0 запрещено).
|
|
||||||
* - FOLLOW на канал "X" не может ссылаться на произвольный пост внутри канала:
|
|
||||||
* разрешено ТОЛЬКО на ROOT (HEADER или CREATE_CHANNEL).
|
|
||||||
*
|
|
||||||
* Зачем так:
|
|
||||||
* - связи и подписки всегда стабильны и не ломаются при новых постах,
|
|
||||||
* - один понятный инвариант: "подписка всегда указывает на root линии".
|
|
||||||
* =========================================================================
|
|
||||||
*/
|
|
||||||
|
|
||||||
public final class ConnectionBody implements BodyRecord, BodyHasTarget, BodyHasLine {
|
public final class ConnectionBody implements BodyRecord, BodyHasTarget, BodyHasLine {
|
||||||
|
|
||||||
public static final short TYPE = 3;
|
public static final short TYPE = 3;
|
||||||
public static final short VER = 1;
|
public static final short VER = 1;
|
||||||
|
|
||||||
public static final int KEY = ((TYPE & 0xFFFF) << 16) | (VER & 0xFFFF);
|
public static final int KEY = ((TYPE & 0xFFFF) << 16) | (VER & 0xFFFF);
|
||||||
|
|
||||||
public final short subType; // из header
|
public final short subType;
|
||||||
public final short version; // из header
|
public final short version;
|
||||||
|
public final int prevConnectionBlockNumber;
|
||||||
// line
|
public final byte[] prevConnectionBlockHash32;
|
||||||
public final int lineCode;
|
public final int connectionSequence;
|
||||||
public final int prevLineNumber;
|
public final String toLogin;
|
||||||
public final byte[] prevLineHash32;
|
public final int toForkNumber;
|
||||||
public final int thisLineNumber;
|
|
||||||
|
|
||||||
// payload
|
|
||||||
public final String toBlockchainName;
|
|
||||||
public final int toBlockGlobalNumber;
|
public final int toBlockGlobalNumber;
|
||||||
public final byte[] toBlockHash32;
|
public final byte[] toBlockHash32;
|
||||||
|
|
||||||
public ConnectionBody(short subType, short version, byte[] bodyBytes) {
|
public ConnectionBody(short subType, short version, byte[] bodyBytes) {
|
||||||
Objects.requireNonNull(bodyBytes, "bodyBytes == null");
|
Objects.requireNonNull(bodyBytes, "bodyBytes == null");
|
||||||
|
|
||||||
this.subType = subType;
|
this.subType = subType;
|
||||||
this.version = version;
|
this.version = version;
|
||||||
|
if ((version & 0xFFFF) != 1 || !isValidSubType(subType)) throw new IllegalArgumentException("Bad Connection header");
|
||||||
if ((this.version & 0xFFFF) != (VER & 0xFFFF)) {
|
|
||||||
throw new IllegalArgumentException("ConnectionBody version must be 1, got=" + (this.version & 0xFFFF));
|
|
||||||
}
|
|
||||||
if (!isValidSubType(this.subType)) {
|
|
||||||
throw new IllegalArgumentException("Bad connection subType: " + (this.subType & 0xFFFF));
|
|
||||||
}
|
|
||||||
|
|
||||||
// минимум:
|
|
||||||
// lineCode(4) + line(4+32+4) + toBchLen[1]+toBch[1] + global[4] + hash[32]
|
|
||||||
if (bodyBytes.length < 4 + (4 + 32 + 4) + 1 + 1 + 4 + 32) {
|
|
||||||
throw new IllegalArgumentException("ConnectionBody too short");
|
|
||||||
}
|
|
||||||
|
|
||||||
ByteBuffer bb = ByteBuffer.wrap(bodyBytes).order(ByteOrder.BIG_ENDIAN);
|
ByteBuffer bb = ByteBuffer.wrap(bodyBytes).order(ByteOrder.BIG_ENDIAN);
|
||||||
|
BodyTargetSupport.ensureMin(bb, 4 + 32 + 4 + 1 + 1 + 2 + 4 + 32, "ConnectionBody too short");
|
||||||
this.lineCode = bb.getInt();
|
this.prevConnectionBlockNumber = bb.getInt();
|
||||||
|
this.prevConnectionBlockHash32 = new byte[32];
|
||||||
this.prevLineNumber = bb.getInt();
|
bb.get(this.prevConnectionBlockHash32);
|
||||||
|
this.connectionSequence = bb.getInt();
|
||||||
this.prevLineHash32 = new byte[32];
|
BodyTargetSupport.ExternalTarget t = BodyTargetSupport.readExternal(bb, "CONNECTION", 0);
|
||||||
bb.get(this.prevLineHash32);
|
this.toLogin = t.login();
|
||||||
|
this.toForkNumber = t.forkNumber();
|
||||||
this.thisLineNumber = bb.getInt();
|
this.toBlockGlobalNumber = t.blockNumber();
|
||||||
|
this.toBlockHash32 = t.blockHash32();
|
||||||
int bchLen = Byte.toUnsignedInt(bb.get());
|
if (bb.hasRemaining()) throw new IllegalArgumentException("Unexpected ConnectionBody tail");
|
||||||
if (bchLen <= 0) throw new IllegalArgumentException("toBlockchainNameLen is 0");
|
|
||||||
if (bb.remaining() < bchLen + 4 + 32) throw new IllegalArgumentException("Connection payload too short");
|
|
||||||
|
|
||||||
byte[] bchBytes = new byte[bchLen];
|
|
||||||
bb.get(bchBytes);
|
|
||||||
this.toBlockchainName = new String(bchBytes, StandardCharsets.UTF_8);
|
|
||||||
|
|
||||||
this.toBlockGlobalNumber = bb.getInt();
|
|
||||||
|
|
||||||
this.toBlockHash32 = new byte[32];
|
|
||||||
bb.get(this.toBlockHash32);
|
|
||||||
|
|
||||||
if (bb.remaining() != 0) throw new IllegalArgumentException("Unexpected tail bytes, remaining=" + bb.remaining());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public ConnectionBody(int lineCode,
|
public ConnectionBody(int prevConnectionBlockNumber, byte[] prevConnectionBlockHash32, int connectionSequence, short subType,
|
||||||
int prevLineNumber,
|
String toLogin, int toForkNumber, int toBlockGlobalNumber, byte[] toBlockHash32) {
|
||||||
byte[] prevLineHash32,
|
if (!isValidSubType(subType)) throw new IllegalArgumentException("Bad connection fields");
|
||||||
int thisLineNumber,
|
BodyTargetSupport.validateExternal(toLogin, toForkNumber, toBlockGlobalNumber, toBlockHash32, "CONNECTION");
|
||||||
short subType,
|
this.prevConnectionBlockNumber = prevConnectionBlockNumber;
|
||||||
String toBlockchainName,
|
this.prevConnectionBlockHash32 = prevConnectionBlockHash32 == null ? new byte[32] : Arrays.copyOf(prevConnectionBlockHash32, 32);
|
||||||
int toBlockGlobalNumber,
|
this.connectionSequence = connectionSequence;
|
||||||
byte[] toBlockHash32) {
|
|
||||||
|
|
||||||
Objects.requireNonNull(toBlockchainName, "toBlockchainName == null");
|
|
||||||
Objects.requireNonNull(toBlockHash32, "toBlockHash32 == null");
|
|
||||||
|
|
||||||
if (lineCode < 0) throw new IllegalArgumentException("lineCode < 0");
|
|
||||||
if (!isValidSubType(subType)) throw new IllegalArgumentException("Bad connection subType: " + (subType & 0xFFFF));
|
|
||||||
|
|
||||||
if (toBlockchainName.isBlank()) throw new IllegalArgumentException("toBlockchainName is blank");
|
|
||||||
// Железное правило формата: bchName -> login + "-NNN"
|
|
||||||
if (BlockchainNameUtil.loginFromBlockchainName(toBlockchainName) == null) {
|
|
||||||
throw new IllegalArgumentException("toBlockchainName must match login+\"-NNN\": " + toBlockchainName);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (toBlockGlobalNumber < 0) throw new IllegalArgumentException("toBlockGlobalNumber < 0");
|
|
||||||
if (toBlockHash32.length != 32) throw new IllegalArgumentException("toBlockHash32 != 32");
|
|
||||||
|
|
||||||
this.lineCode = lineCode;
|
|
||||||
|
|
||||||
this.prevLineNumber = prevLineNumber;
|
|
||||||
this.prevLineHash32 = (prevLineHash32 == null ? new byte[32] : Arrays.copyOf(prevLineHash32, 32));
|
|
||||||
this.thisLineNumber = thisLineNumber;
|
|
||||||
|
|
||||||
this.subType = subType;
|
this.subType = subType;
|
||||||
this.version = VER;
|
this.version = VER;
|
||||||
|
this.toLogin = toLogin;
|
||||||
this.toBlockchainName = toBlockchainName;
|
this.toForkNumber = toForkNumber;
|
||||||
this.toBlockGlobalNumber = toBlockGlobalNumber;
|
this.toBlockGlobalNumber = toBlockGlobalNumber;
|
||||||
this.toBlockHash32 = Arrays.copyOf(toBlockHash32, 32);
|
this.toBlockHash32 = Arrays.copyOf(toBlockHash32, 32);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean isValidSubType(short st) {
|
@Override public ConnectionBody check() {
|
||||||
int v = st & 0xFFFF;
|
if (!isValidSubType(subType)) throw new IllegalArgumentException("Bad connection fields");
|
||||||
return v == (MsgSubType.CONNECTION_CLOSE_FRIEND & 0xFFFF)
|
if (prevConnectionBlockNumber < 0) throw new IllegalArgumentException("prevConnectionBlockNumber must be >=0");
|
||||||
|| v == (MsgSubType.CONNECTION_UNCLOSE_FRIEND & 0xFFFF)
|
if (prevConnectionBlockHash32 == null || prevConnectionBlockHash32.length != 32) throw new IllegalArgumentException("prevConnectionBlockHash32 invalid");
|
||||||
|| v == (MsgSubType.CONNECTION_FRIEND & 0xFFFF)
|
if (connectionSequence <= 0) throw new IllegalArgumentException("connectionSequence must be >=1");
|
||||||
|| v == (MsgSubType.CONNECTION_UNFRIEND & 0xFFFF)
|
BodyTargetSupport.validateExternal(toLogin, toForkNumber, toBlockGlobalNumber, toBlockHash32, "CONNECTION");
|
||||||
|| v == (MsgSubType.CONNECTION_CONTACT & 0xFFFF)
|
|
||||||
|| v == (MsgSubType.CONNECTION_UNCONTACT & 0xFFFF)
|
|
||||||
|| v == (MsgSubType.CONNECTION_FOLLOW & 0xFFFF)
|
|
||||||
|| v == (MsgSubType.CONNECTION_UNFOLLOW & 0xFFFF)
|
|
||||||
|| v == (MsgSubType.CONNECTION_SPOUSE & 0xFFFF)
|
|
||||||
|| v == (MsgSubType.CONNECTION_UNSPOUSE & 0xFFFF)
|
|
||||||
|| v == (MsgSubType.CONNECTION_PARENT & 0xFFFF)
|
|
||||||
|| v == (MsgSubType.CONNECTION_UNPARENT & 0xFFFF)
|
|
||||||
|| v == (MsgSubType.CONNECTION_CHILD & 0xFFFF)
|
|
||||||
|| v == (MsgSubType.CONNECTION_UNCHILD & 0xFFFF)
|
|
||||||
|| v == (MsgSubType.CONNECTION_SIBLING & 0xFFFF)
|
|
||||||
|| v == (MsgSubType.CONNECTION_UNSIBLING & 0xFFFF)
|
|
||||||
|| v == (MsgSubType.CONNECTION_KNOWN_PERSON & 0xFFFF)
|
|
||||||
|| v == (MsgSubType.CONNECTION_UNKNOWN_PERSON & 0xFFFF)
|
|
||||||
|| v == (MsgSubType.CONNECTION_SHINE_CONFIRMED & 0xFFFF)
|
|
||||||
|| v == (MsgSubType.CONNECTION_SHINE_UNCONFIRMED & 0xFFFF)
|
|
||||||
|| v == (MsgSubType.CONNECTION_SHINE_SEEN & 0xFFFF)
|
|
||||||
|| v == (MsgSubType.CONNECTION_SHINE_UNSEEN & 0xFFFF)
|
|
||||||
|| v == (MsgSubType.CONNECTION_OFFICIAL_ACCOUNT_CONFIRMED & 0xFFFF)
|
|
||||||
|| v == (MsgSubType.CONNECTION_OFFICIAL_ACCOUNT_UNCONFIRMED & 0xFFFF);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ConnectionBody check() {
|
|
||||||
if (lineCode < 0) throw new IllegalArgumentException("lineCode < 0");
|
|
||||||
if (!isValidSubType(subType)) throw new IllegalArgumentException("Bad connection subType: " + (subType & 0xFFFF));
|
|
||||||
|
|
||||||
// line rule (как было)
|
|
||||||
if (prevLineNumber == -1) {
|
|
||||||
if (!isAllZero32(prevLineHash32)) throw new IllegalArgumentException("prevLineHash32 must be zero when prevLineNumber=-1");
|
|
||||||
if (thisLineNumber != -1) throw new IllegalArgumentException("thisLineNumber must be -1 when prevLineNumber=-1");
|
|
||||||
} else {
|
|
||||||
if (prevLineHash32 == null || prevLineHash32.length != 32) throw new IllegalArgumentException("prevLineHash32 invalid");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (toBlockchainName == null || toBlockchainName.isBlank())
|
|
||||||
throw new IllegalArgumentException("toBlockchainName is blank");
|
|
||||||
|
|
||||||
// гарантируем вычислимый toLogin (иначе target “битый” по стандарту)
|
|
||||||
if (BlockchainNameUtil.loginFromBlockchainName(toBlockchainName) == null)
|
|
||||||
throw new IllegalArgumentException("toBlockchainName must match login+\"-NNN\": " + toBlockchainName);
|
|
||||||
|
|
||||||
if (toBlockGlobalNumber < 0) throw new IllegalArgumentException("toBlockGlobalNumber < 0");
|
|
||||||
if (toBlockHash32 == null || toBlockHash32.length != 32) throw new IllegalArgumentException("toBlockHash32 invalid");
|
|
||||||
|
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override public byte[] toBytes() {
|
||||||
public byte[] toBytes() {
|
check();
|
||||||
byte[] bchBytes = toBlockchainName.getBytes(StandardCharsets.UTF_8);
|
ByteBuffer bb = ByteBuffer.allocate(4 + 32 + 4 + BodyTargetSupport.externalSize(toLogin)).order(ByteOrder.BIG_ENDIAN);
|
||||||
if (bchBytes.length == 0 || bchBytes.length > 255)
|
bb.putInt(prevConnectionBlockNumber).put(prevConnectionBlockHash32).putInt(connectionSequence);
|
||||||
throw new IllegalArgumentException("toBlockchainName utf8 len must be 1..255");
|
BodyTargetSupport.writeExternal(bb, toLogin, toForkNumber, toBlockGlobalNumber, toBlockHash32, "CONNECTION");
|
||||||
|
|
||||||
if (toBlockHash32 == null || toBlockHash32.length != 32)
|
|
||||||
throw new IllegalArgumentException("toBlockHash32 != 32");
|
|
||||||
|
|
||||||
int cap = 4 + (4 + 32 + 4)
|
|
||||||
+ 1 + bchBytes.length
|
|
||||||
+ 4 + 32;
|
|
||||||
|
|
||||||
ByteBuffer bb = ByteBuffer.allocate(cap).order(ByteOrder.BIG_ENDIAN);
|
|
||||||
|
|
||||||
bb.putInt(lineCode);
|
|
||||||
|
|
||||||
bb.putInt(prevLineNumber);
|
|
||||||
bb.put(prevLineHash32 == null ? new byte[32] : Arrays.copyOf(prevLineHash32, 32));
|
|
||||||
bb.putInt(thisLineNumber);
|
|
||||||
|
|
||||||
bb.put((byte) bchBytes.length);
|
|
||||||
bb.put(bchBytes);
|
|
||||||
|
|
||||||
bb.putInt(toBlockGlobalNumber);
|
|
||||||
bb.put(toBlockHash32);
|
|
||||||
|
|
||||||
return bb.array();
|
return bb.array();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean isAllZero32(byte[] b) {
|
@Override public int lineCode() { return 0; }
|
||||||
if (b == null || b.length != 32) return true;
|
@Override public int prevLineBlockGlobalNumber() { return prevConnectionBlockNumber; }
|
||||||
for (int i = 0; i < 32; i++) if (b[i] != 0) return false;
|
@Override public byte[] prevLineBlockHash32() { return Arrays.copyOf(prevConnectionBlockHash32, 32); }
|
||||||
return true;
|
@Override public int lineSeq() { return connectionSequence; }
|
||||||
}
|
@Override public String toLogin() { return toLogin; }
|
||||||
|
@Override public Integer toForkNumber() { return toForkNumber; }
|
||||||
/* ====================== BodyHasLine ====================== */
|
|
||||||
@Override public int lineCode() { return lineCode; }
|
|
||||||
@Override public int prevLineBlockGlobalNumber() { return prevLineNumber; }
|
|
||||||
@Override public byte[] prevLineBlockHash32() { return prevLineHash32 == null ? null : Arrays.copyOf(prevLineHash32, 32); }
|
|
||||||
@Override public int lineSeq() { return thisLineNumber; }
|
|
||||||
|
|
||||||
/* ====================== BodyHasTarget ===================== */
|
|
||||||
@Override public String toBchName() { return toBlockchainName; }
|
|
||||||
@Override public Integer toBlockGlobalNumber() { return toBlockGlobalNumber; }
|
@Override public Integer toBlockGlobalNumber() { return toBlockGlobalNumber; }
|
||||||
@Override public byte[] toBlockHashBytes() { return toBlockHash32; }
|
@Override public byte[] toBlockHashBytes() { return Arrays.copyOf(toBlockHash32, 32); }
|
||||||
|
|
||||||
|
private static boolean isValidSubType(short st) {
|
||||||
|
int v = st & 0xFFFF;
|
||||||
|
return v == (MsgSubType.CONNECTION_CLOSE_FRIEND & 0xFFFF) || v == (MsgSubType.CONNECTION_UNCLOSE_FRIEND & 0xFFFF)
|
||||||
|
|| v == (MsgSubType.CONNECTION_FRIEND & 0xFFFF) || v == (MsgSubType.CONNECTION_UNFRIEND & 0xFFFF)
|
||||||
|
|| v == (MsgSubType.CONNECTION_CONTACT & 0xFFFF) || v == (MsgSubType.CONNECTION_UNCONTACT & 0xFFFF)
|
||||||
|
|| v == (MsgSubType.CONNECTION_FOLLOW & 0xFFFF) || v == (MsgSubType.CONNECTION_UNFOLLOW & 0xFFFF)
|
||||||
|
|| v == (MsgSubType.CONNECTION_SPOUSE & 0xFFFF) || v == (MsgSubType.CONNECTION_UNSPOUSE & 0xFFFF)
|
||||||
|
|| v == (MsgSubType.CONNECTION_PARENT & 0xFFFF) || v == (MsgSubType.CONNECTION_UNPARENT & 0xFFFF)
|
||||||
|
|| v == (MsgSubType.CONNECTION_CHILD & 0xFFFF) || v == (MsgSubType.CONNECTION_UNCHILD & 0xFFFF)
|
||||||
|
|| v == (MsgSubType.CONNECTION_SIBLING & 0xFFFF) || v == (MsgSubType.CONNECTION_UNSIBLING & 0xFFFF)
|
||||||
|
|| v == (MsgSubType.CONNECTION_KNOWN_PERSON & 0xFFFF) || v == (MsgSubType.CONNECTION_UNKNOWN_PERSON & 0xFFFF)
|
||||||
|
|| v == (MsgSubType.CONNECTION_SHINE_CONFIRMED & 0xFFFF) || v == (MsgSubType.CONNECTION_SHINE_UNCONFIRMED & 0xFFFF)
|
||||||
|
|| v == (MsgSubType.CONNECTION_SHINE_SEEN & 0xFFFF) || v == (MsgSubType.CONNECTION_SHINE_UNSEEN & 0xFFFF)
|
||||||
|
|| v == (MsgSubType.CONNECTION_OFFICIAL_ACCOUNT_CONFIRMED & 0xFFFF) || v == (MsgSubType.CONNECTION_OFFICIAL_ACCOUNT_UNCONFIRMED & 0xFFFF);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+19
@@ -37,6 +37,8 @@ public final class CreateChannelBody implements BodyRecord, BodyHasLine {
|
|||||||
public static final short CHANNEL_TYPE_VERSION_DEFAULT = 1;
|
public static final short CHANNEL_TYPE_VERSION_DEFAULT = 1;
|
||||||
|
|
||||||
private static final byte[] ZERO32 = new byte[32];
|
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;
|
private static final int MAX_NAME_LENGTH = 32;
|
||||||
public static final int MAX_DESCRIPTION_UTF8_LEN = 2048;
|
public static final int MAX_DESCRIPTION_UTF8_LEN = 2048;
|
||||||
|
|
||||||
@@ -159,6 +161,20 @@ public final class CreateChannelBody implements BodyRecord, BodyHasLine {
|
|||||||
return this;
|
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) {
|
private static String normalizeDisplayName(String value) {
|
||||||
if (value == null) return "";
|
if (value == null) return "";
|
||||||
return value.trim().replaceAll("\\s+", " ");
|
return value.trim().replaceAll("\\s+", " ");
|
||||||
@@ -171,6 +187,9 @@ public final class CreateChannelBody implements BodyRecord, BodyHasLine {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public byte[] toBytes() {
|
public byte[] toBytes() {
|
||||||
|
// Новые блоки кодируются только с именем от 4 символов.
|
||||||
|
// Исторические блоки при чтении разбираются без повторного кодирования.
|
||||||
|
checkForCreate();
|
||||||
byte[] nameUtf8 = normalizeDisplayName(channelName).getBytes(StandardCharsets.UTF_8);
|
byte[] nameUtf8 = normalizeDisplayName(channelName).getBytes(StandardCharsets.UTF_8);
|
||||||
if (nameUtf8.length == 0 || nameUtf8.length > 255) {
|
if (nameUtf8.length == 0 || nameUtf8.length > 255) {
|
||||||
throw new IllegalArgumentException("channelName utf8 len must be 1..255");
|
throw new IllegalArgumentException("channelName utf8 len must be 1..255");
|
||||||
|
|||||||
@@ -0,0 +1,235 @@
|
|||||||
|
package blockchain.body;
|
||||||
|
|
||||||
|
import blockchain.MsgSubType;
|
||||||
|
|
||||||
|
import java.nio.ByteBuffer;
|
||||||
|
import java.nio.ByteOrder;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* TECH_FORK body (type=0, subType=2, version=1).
|
||||||
|
*
|
||||||
|
* TECH_FORK является обычным шагом общей TECH-линии. Поэтому body начинается
|
||||||
|
* тем же line-prefix, что и TECH_CREATE_CHANNEL.
|
||||||
|
*
|
||||||
|
* body bytes (BigEndian):
|
||||||
|
* [4] lineCode (=0 для TECH-линии)
|
||||||
|
* [4] prevLineNumber
|
||||||
|
* [32] prevLineHash32
|
||||||
|
* [4] thisLineNumber
|
||||||
|
*
|
||||||
|
* [32] parentBlockchainKey
|
||||||
|
* [4] forkPointBlockNumber
|
||||||
|
* [32] forkPointBlockHash32
|
||||||
|
* [8] forkPointTimestampMs
|
||||||
|
* [4] parentTipBlockNumber
|
||||||
|
* [32] parentTipBlockHash32
|
||||||
|
* [8] parentTipTimestampMs
|
||||||
|
* [4] discardedBlocksCount
|
||||||
|
* [1] reasonCode
|
||||||
|
* [2] commentUtf8Length
|
||||||
|
* [N] comment UTF-8 (0..1024 bytes)
|
||||||
|
*/
|
||||||
|
public final class ForkBody implements BodyRecord, BodyHasLine {
|
||||||
|
|
||||||
|
public static final short TYPE = 0;
|
||||||
|
public static final short VER = 1;
|
||||||
|
public static final short SUBTYPE = MsgSubType.TECH_FORK;
|
||||||
|
public static final int KEY = ((TYPE & 0xFFFF) << 16) | (VER & 0xFFFF);
|
||||||
|
|
||||||
|
public static final int REASON_ROUTINE_ROTATION = 1;
|
||||||
|
public static final int REASON_POSSIBLE_COMPROMISE = 2;
|
||||||
|
public static final int REASON_CONFIRMED_COMPROMISE_ROLLBACK = 3;
|
||||||
|
public static final int REASON_RECOVERY = 4;
|
||||||
|
|
||||||
|
public static final int MAX_COMMENT_UTF8_LEN = 1024;
|
||||||
|
private static final int LINE_PREFIX_LEN = 4 + 4 + 32 + 4;
|
||||||
|
private static final int FIXED_PAYLOAD_LEN = 32 + 4 + 32 + 8 + 4 + 32 + 8 + 4 + 1 + 2;
|
||||||
|
private static final int FIXED_LEN = LINE_PREFIX_LEN + FIXED_PAYLOAD_LEN;
|
||||||
|
|
||||||
|
public final short subType;
|
||||||
|
public final short version;
|
||||||
|
|
||||||
|
public final int lineCode;
|
||||||
|
public final int prevLineNumber;
|
||||||
|
public final byte[] prevLineHash32;
|
||||||
|
public final int thisLineNumber;
|
||||||
|
|
||||||
|
public final byte[] parentBlockchainKey32;
|
||||||
|
public final int forkPointBlockNumber;
|
||||||
|
public final byte[] forkPointBlockHash32;
|
||||||
|
public final long forkPointTimestampMs;
|
||||||
|
public final int parentTipBlockNumber;
|
||||||
|
public final byte[] parentTipBlockHash32;
|
||||||
|
public final long parentTipTimestampMs;
|
||||||
|
public final int discardedBlocksCount;
|
||||||
|
public final int reasonCode;
|
||||||
|
public final String comment;
|
||||||
|
|
||||||
|
public ForkBody(short subType, short version, byte[] bodyBytes) {
|
||||||
|
Objects.requireNonNull(bodyBytes, "bodyBytes == null");
|
||||||
|
this.subType = subType;
|
||||||
|
this.version = version;
|
||||||
|
|
||||||
|
if ((subType & 0xFFFF) != (SUBTYPE & 0xFFFF)) {
|
||||||
|
throw new IllegalArgumentException("ForkBody subType must be TECH_FORK(2)");
|
||||||
|
}
|
||||||
|
if ((version & 0xFFFF) != (VER & 0xFFFF)) {
|
||||||
|
throw new IllegalArgumentException("ForkBody version must be 1");
|
||||||
|
}
|
||||||
|
if (bodyBytes.length < FIXED_LEN) {
|
||||||
|
throw new IllegalArgumentException("ForkBody too short");
|
||||||
|
}
|
||||||
|
|
||||||
|
ByteBuffer bb = ByteBuffer.wrap(bodyBytes).order(ByteOrder.BIG_ENDIAN);
|
||||||
|
this.lineCode = bb.getInt();
|
||||||
|
this.prevLineNumber = bb.getInt();
|
||||||
|
this.prevLineHash32 = new byte[32];
|
||||||
|
bb.get(this.prevLineHash32);
|
||||||
|
this.thisLineNumber = bb.getInt();
|
||||||
|
|
||||||
|
this.parentBlockchainKey32 = new byte[32];
|
||||||
|
bb.get(this.parentBlockchainKey32);
|
||||||
|
this.forkPointBlockNumber = bb.getInt();
|
||||||
|
this.forkPointBlockHash32 = new byte[32];
|
||||||
|
bb.get(this.forkPointBlockHash32);
|
||||||
|
this.forkPointTimestampMs = bb.getLong();
|
||||||
|
this.parentTipBlockNumber = bb.getInt();
|
||||||
|
this.parentTipBlockHash32 = new byte[32];
|
||||||
|
bb.get(this.parentTipBlockHash32);
|
||||||
|
this.parentTipTimestampMs = bb.getLong();
|
||||||
|
this.discardedBlocksCount = bb.getInt();
|
||||||
|
this.reasonCode = Byte.toUnsignedInt(bb.get());
|
||||||
|
int commentLen = Short.toUnsignedInt(bb.getShort());
|
||||||
|
if (commentLen > MAX_COMMENT_UTF8_LEN) {
|
||||||
|
throw new IllegalArgumentException("ForkBody comment utf8 len must be <=1024");
|
||||||
|
}
|
||||||
|
if (bb.remaining() != commentLen) {
|
||||||
|
throw new IllegalArgumentException("ForkBody tail mismatch: remaining=" + bb.remaining() + " commentLen=" + commentLen);
|
||||||
|
}
|
||||||
|
byte[] commentBytes = new byte[commentLen];
|
||||||
|
bb.get(commentBytes);
|
||||||
|
this.comment = new String(commentBytes, StandardCharsets.UTF_8);
|
||||||
|
}
|
||||||
|
|
||||||
|
public ForkBody(int lineCode,
|
||||||
|
int prevLineNumber,
|
||||||
|
byte[] prevLineHash32,
|
||||||
|
int thisLineNumber,
|
||||||
|
byte[] parentBlockchainKey32,
|
||||||
|
int forkPointBlockNumber,
|
||||||
|
byte[] forkPointBlockHash32,
|
||||||
|
long forkPointTimestampMs,
|
||||||
|
int parentTipBlockNumber,
|
||||||
|
byte[] parentTipBlockHash32,
|
||||||
|
long parentTipTimestampMs,
|
||||||
|
int discardedBlocksCount,
|
||||||
|
int reasonCode,
|
||||||
|
String comment) {
|
||||||
|
this.subType = SUBTYPE;
|
||||||
|
this.version = VER;
|
||||||
|
this.lineCode = lineCode;
|
||||||
|
this.prevLineNumber = prevLineNumber;
|
||||||
|
this.prevLineHash32 = copy32(prevLineHash32, "prevLineHash32");
|
||||||
|
this.thisLineNumber = thisLineNumber;
|
||||||
|
this.parentBlockchainKey32 = copy32(parentBlockchainKey32, "parentBlockchainKey32");
|
||||||
|
this.forkPointBlockNumber = forkPointBlockNumber;
|
||||||
|
this.forkPointBlockHash32 = copy32(forkPointBlockHash32, "forkPointBlockHash32");
|
||||||
|
this.forkPointTimestampMs = forkPointTimestampMs;
|
||||||
|
this.parentTipBlockNumber = parentTipBlockNumber;
|
||||||
|
this.parentTipBlockHash32 = copy32(parentTipBlockHash32, "parentTipBlockHash32");
|
||||||
|
this.parentTipTimestampMs = parentTipTimestampMs;
|
||||||
|
this.discardedBlocksCount = discardedBlocksCount;
|
||||||
|
this.reasonCode = reasonCode;
|
||||||
|
this.comment = normalizeComment(comment);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ForkBody check() {
|
||||||
|
if ((subType & 0xFFFF) != (SUBTYPE & 0xFFFF)) {
|
||||||
|
throw new IllegalArgumentException("ForkBody subType must be TECH_FORK(2)");
|
||||||
|
}
|
||||||
|
if ((version & 0xFFFF) != (VER & 0xFFFF)) {
|
||||||
|
throw new IllegalArgumentException("ForkBody version must be 1");
|
||||||
|
}
|
||||||
|
if (lineCode != 0) throw new IllegalArgumentException("ForkBody lineCode must be 0");
|
||||||
|
if (prevLineNumber < 0) throw new IllegalArgumentException("prevLineNumber must be >=0");
|
||||||
|
require32(prevLineHash32, "prevLineHash32");
|
||||||
|
if (thisLineNumber <= 0) throw new IllegalArgumentException("thisLineNumber must be >=1");
|
||||||
|
|
||||||
|
require32(parentBlockchainKey32, "parentBlockchainKey32");
|
||||||
|
require32(forkPointBlockHash32, "forkPointBlockHash32");
|
||||||
|
require32(parentTipBlockHash32, "parentTipBlockHash32");
|
||||||
|
if (forkPointBlockNumber < 0) throw new IllegalArgumentException("forkPointBlockNumber < 0");
|
||||||
|
if (parentTipBlockNumber < forkPointBlockNumber) {
|
||||||
|
throw new IllegalArgumentException("parentTipBlockNumber < forkPointBlockNumber");
|
||||||
|
}
|
||||||
|
if (forkPointTimestampMs < 0) throw new IllegalArgumentException("forkPointTimestampMs < 0");
|
||||||
|
if (parentTipTimestampMs < 0) throw new IllegalArgumentException("parentTipTimestampMs < 0");
|
||||||
|
int expectedDiscarded = parentTipBlockNumber - forkPointBlockNumber;
|
||||||
|
if (discardedBlocksCount != expectedDiscarded) {
|
||||||
|
throw new IllegalArgumentException("discardedBlocksCount must equal parentTipBlockNumber - forkPointBlockNumber");
|
||||||
|
}
|
||||||
|
if (!isReasonSupported(reasonCode)) {
|
||||||
|
throw new IllegalArgumentException("Unsupported fork reasonCode=" + reasonCode);
|
||||||
|
}
|
||||||
|
byte[] commentUtf8 = normalizeComment(comment).getBytes(StandardCharsets.UTF_8);
|
||||||
|
if (commentUtf8.length > MAX_COMMENT_UTF8_LEN) {
|
||||||
|
throw new IllegalArgumentException("ForkBody comment utf8 len must be <=1024");
|
||||||
|
}
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public byte[] toBytes() {
|
||||||
|
check();
|
||||||
|
byte[] commentUtf8 = normalizeComment(comment).getBytes(StandardCharsets.UTF_8);
|
||||||
|
ByteBuffer bb = ByteBuffer.allocate(FIXED_LEN + commentUtf8.length).order(ByteOrder.BIG_ENDIAN);
|
||||||
|
bb.putInt(lineCode);
|
||||||
|
bb.putInt(prevLineNumber);
|
||||||
|
bb.put(prevLineHash32);
|
||||||
|
bb.putInt(thisLineNumber);
|
||||||
|
bb.put(parentBlockchainKey32);
|
||||||
|
bb.putInt(forkPointBlockNumber);
|
||||||
|
bb.put(forkPointBlockHash32);
|
||||||
|
bb.putLong(forkPointTimestampMs);
|
||||||
|
bb.putInt(parentTipBlockNumber);
|
||||||
|
bb.put(parentTipBlockHash32);
|
||||||
|
bb.putLong(parentTipTimestampMs);
|
||||||
|
bb.putInt(discardedBlocksCount);
|
||||||
|
bb.put((byte) reasonCode);
|
||||||
|
bb.putShort((short) commentUtf8.length);
|
||||||
|
bb.put(commentUtf8);
|
||||||
|
return bb.array();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override public int lineCode() { return lineCode; }
|
||||||
|
@Override public int prevLineBlockGlobalNumber() { return prevLineNumber; }
|
||||||
|
@Override public byte[] prevLineBlockHash32() { return Arrays.copyOf(prevLineHash32, 32); }
|
||||||
|
@Override public int lineSeq() { return thisLineNumber; }
|
||||||
|
|
||||||
|
public static boolean isReasonSupported(int code) {
|
||||||
|
return code == REASON_ROUTINE_ROTATION
|
||||||
|
|| code == REASON_POSSIBLE_COMPROMISE
|
||||||
|
|| code == REASON_CONFIRMED_COMPROMISE_ROLLBACK
|
||||||
|
|| code == REASON_RECOVERY;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static byte[] copy32(byte[] value, String name) {
|
||||||
|
require32(value, name);
|
||||||
|
return Arrays.copyOf(value, 32);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void require32(byte[] value, String name) {
|
||||||
|
if (value == null || value.length != 32) {
|
||||||
|
throw new IllegalArgumentException(name + " must be 32 bytes");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String normalizeComment(String value) {
|
||||||
|
if (value == null) return "";
|
||||||
|
return value.trim().replace("\r\n", "\n").replace('\r', '\n');
|
||||||
|
}
|
||||||
|
}
|
||||||
+86
-66
@@ -5,123 +5,143 @@ import utils.config.ShineSignatureConstants;
|
|||||||
import java.nio.ByteBuffer;
|
import java.nio.ByteBuffer;
|
||||||
import java.nio.ByteOrder;
|
import java.nio.ByteOrder;
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.util.Arrays;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* HeaderBody — type=0, version=1.
|
* HeaderBody — TECH type=0, subType=0; version=1 legacy / version=2 CC0.
|
||||||
*
|
|
||||||
* В новом формате type/subType/version живут в HEADER блока,
|
|
||||||
* поэтому bodyBytes для HeaderBody содержат только payload:
|
|
||||||
*
|
*
|
||||||
* bodyBytes (BigEndian):
|
* bodyBytes (BigEndian):
|
||||||
* [TAG_LEN] tag ASCII "SHiNE"
|
* [TAG_LEN] tag ASCII
|
||||||
* [1] loginLength=N (uint8)
|
* [1] loginLength (uint8)
|
||||||
* [N] login UTF-8
|
* [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.
|
||||||
|
* It is historical identity metadata and MUST remain byte-for-byte unchanged when a
|
||||||
|
* preserved prefix (including block #0) is republished into later forks.
|
||||||
*/
|
*/
|
||||||
public final class HeaderBody implements BodyRecord {
|
public final class HeaderBody implements BodyRecord {
|
||||||
|
|
||||||
public static final short TYPE = 0;
|
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 int KEY = ((TYPE & 0xFFFF) << 16) | (VER & 0xFFFF);
|
||||||
|
|
||||||
/** Для header subType всегда 0 (служебная совместимость). */
|
|
||||||
public static final short SUBTYPE_COMPAT = 0;
|
public static final short SUBTYPE_COMPAT = 0;
|
||||||
|
|
||||||
/** TAG формата (ASCII). */
|
|
||||||
public static final String TAG = ShineSignatureConstants.BLOCKCHAIN_HEADER_TAG;
|
public static final String TAG = ShineSignatureConstants.BLOCKCHAIN_HEADER_TAG;
|
||||||
|
|
||||||
private static final byte[] TAG_ASCII = TAG.getBytes(StandardCharsets.US_ASCII);
|
private static final byte[] TAG_ASCII = TAG.getBytes(StandardCharsets.US_ASCII);
|
||||||
private static final int TAG_LEN = TAG_ASCII.length;
|
private static final int TAG_LEN = TAG_ASCII.length;
|
||||||
|
|
||||||
public final short subType; // всегда 0 (из заголовка блока)
|
public final short subType;
|
||||||
public final short version; // из заголовка блока
|
public final short version;
|
||||||
public final String tag; // "SHiNE"
|
public final String tag;
|
||||||
public final String login;
|
public final String login;
|
||||||
|
public final byte[] initialBlockchainKey32;
|
||||||
|
public final String license; // null for legacy HEADER v1
|
||||||
|
|
||||||
/** Десериализация из payload bodyBytes (без type/subType/version). */
|
|
||||||
public HeaderBody(short subType, short version, byte[] bodyBytes) {
|
public HeaderBody(short subType, short version, byte[] bodyBytes) {
|
||||||
Objects.requireNonNull(bodyBytes, "bodyBytes == null");
|
Objects.requireNonNull(bodyBytes, "bodyBytes == null");
|
||||||
|
|
||||||
this.subType = subType;
|
this.subType = subType;
|
||||||
this.version = version;
|
this.version = version;
|
||||||
|
if ((subType & 0xFFFF) != 0) throw new IllegalArgumentException("HeaderBody subType must be 0");
|
||||||
if ((this.subType & 0xFFFF) != (SUBTYPE_COMPAT & 0xFFFF)) {
|
if (version != VER && version != VER_CC0) throw new IllegalArgumentException("HeaderBody version must be 1 or 2");
|
||||||
throw new IllegalArgumentException("HeaderBody subType must be 0, got=" + (this.subType & 0xFFFF));
|
if (bodyBytes.length < TAG_LEN + 1 + 1 + 32 + (version == VER_CC0 ? LICENSE_BYTES.length : 0))
|
||||||
}
|
throw new IllegalArgumentException("HeaderBody too short");
|
||||||
if ((this.version & 0xFFFF) != (VER & 0xFFFF)) {
|
|
||||||
throw new IllegalArgumentException("HeaderBody version must be 1, got=" + (this.version & 0xFFFF));
|
|
||||||
}
|
|
||||||
|
|
||||||
// минимум: tag[TAG_LEN] + loginLen[1]
|
|
||||||
if (bodyBytes.length < TAG_LEN + 1) throw new IllegalArgumentException("HeaderBody too short");
|
|
||||||
|
|
||||||
ByteBuffer bb = ByteBuffer.wrap(bodyBytes).order(ByteOrder.BIG_ENDIAN);
|
ByteBuffer bb = ByteBuffer.wrap(bodyBytes).order(ByteOrder.BIG_ENDIAN);
|
||||||
|
|
||||||
byte[] tagBytes = new byte[TAG_LEN];
|
byte[] tagBytes = new byte[TAG_LEN];
|
||||||
bb.get(tagBytes);
|
bb.get(tagBytes);
|
||||||
String t = new String(tagBytes, StandardCharsets.US_ASCII);
|
String parsedTag = new String(tagBytes, StandardCharsets.US_ASCII);
|
||||||
if (!TAG.equals(t)) throw new IllegalArgumentException("Bad tag: " + t);
|
if (!TAG.equals(parsedTag)) throw new IllegalArgumentException("Bad tag: " + parsedTag);
|
||||||
this.tag = t;
|
this.tag = parsedTag;
|
||||||
|
|
||||||
int loginLen = Byte.toUnsignedInt(bb.get());
|
int loginLen = Byte.toUnsignedInt(bb.get());
|
||||||
if (loginLen <= 0 || bb.remaining() < loginLen)
|
if (loginLen <= 0 || bb.remaining() != loginLen + 32 + (version == VER_CC0 ? LICENSE_BYTES.length : 0))
|
||||||
throw new IllegalArgumentException("Bad login length");
|
throw new IllegalArgumentException("Bad HeaderBody login/key/license length");
|
||||||
|
|
||||||
byte[] loginBytes = new byte[loginLen];
|
byte[] loginBytes = new byte[loginLen];
|
||||||
bb.get(loginBytes);
|
bb.get(loginBytes);
|
||||||
this.login = new String(loginBytes, StandardCharsets.UTF_8);
|
this.login = BodyTargetSupport.decodeStrictUtf8(loginBytes, "HeaderBody login");
|
||||||
|
if (version == VER_CC0) {
|
||||||
if (bb.remaining() != 0) throw new IllegalArgumentException("Unexpected tail bytes, remaining=" + bb.remaining());
|
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) {
|
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(login, "login == null");
|
||||||
|
Objects.requireNonNull(initialBlockchainKey32, "initialBlockchainKey32 == null");
|
||||||
this.subType = SUBTYPE_COMPAT;
|
this.subType = SUBTYPE_COMPAT;
|
||||||
this.version = VER;
|
this.version = version;
|
||||||
this.tag = TAG;
|
this.tag = TAG;
|
||||||
this.login = login;
|
this.login = login;
|
||||||
|
this.initialBlockchainKey32 = Arrays.copyOf(initialBlockchainKey32, initialBlockchainKey32.length);
|
||||||
|
this.license = version == VER_CC0 ? LICENSE_CC0 : null;
|
||||||
|
check();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public HeaderBody check() {
|
public HeaderBody check() {
|
||||||
if ((subType & 0xFFFF) != (SUBTYPE_COMPAT & 0xFFFF))
|
if ((subType & 0xFFFF) != 0) throw new IllegalArgumentException("HeaderBody subType must be 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 (login == null || login.isBlank())
|
if (version == VER && license != null) throw new IllegalArgumentException("Legacy HEADER must not contain a license");
|
||||||
throw new IllegalArgumentException("Login is blank");
|
if (login == null || login.isBlank()) throw new IllegalArgumentException("Login is blank");
|
||||||
if (!login.matches("^[A-Za-z0-9_]+$"))
|
byte[] loginUtf8 = login.getBytes(StandardCharsets.UTF_8);
|
||||||
throw new IllegalArgumentException("Login must match ^[A-Za-z0-9_]+$");
|
// В HEADER хранится неизменяемое написание зарегистрированного login@namespace.
|
||||||
|
// Namespace остаётся lowercase, регистр локальной части сохраняется байт-в-байт.
|
||||||
|
boolean legacyLogin = login.matches("^[A-Za-z0-9_]+$");
|
||||||
|
boolean namespacedLogin = loginUtf8.length <= 30 && login.matches("^[A-Za-z0-9_]+@[a-z0-9_]+$");
|
||||||
|
if (!legacyLogin && !namespacedLogin) {
|
||||||
|
throw new IllegalArgumentException("Login must be legacy [A-Za-z0-9_]+ or registered-case login@namespace (max 30 bytes)");
|
||||||
|
}
|
||||||
|
if (loginUtf8.length == 0 || loginUtf8.length > 255) throw new IllegalArgumentException("Login utf8 len must be 1..255");
|
||||||
|
requireNonZeroKey(initialBlockchainKey32);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public byte[] toBytes() {
|
public byte[] toBytes() {
|
||||||
|
check();
|
||||||
byte[] loginUtf8 = login.getBytes(StandardCharsets.UTF_8);
|
byte[] loginUtf8 = login.getBytes(StandardCharsets.UTF_8);
|
||||||
if (loginUtf8.length == 0 || loginUtf8.length > 255)
|
ByteBuffer bb = ByteBuffer.allocate(TAG_LEN + 1 + loginUtf8.length + 32 + (version == VER_CC0 ? LICENSE_BYTES.length : 0)).order(ByteOrder.BIG_ENDIAN);
|
||||||
throw new IllegalArgumentException("Login utf8 len must be 1..255");
|
|
||||||
|
|
||||||
int cap = TAG_LEN + 1 + loginUtf8.length;
|
|
||||||
|
|
||||||
ByteBuffer bb = ByteBuffer.allocate(cap).order(ByteOrder.BIG_ENDIAN);
|
|
||||||
bb.put(TAG_ASCII);
|
bb.put(TAG_ASCII);
|
||||||
bb.put((byte) loginUtf8.length);
|
bb.put((byte) loginUtf8.length);
|
||||||
bb.put(loginUtf8);
|
bb.put(loginUtf8);
|
||||||
|
if (version == VER_CC0) bb.put(LICENSE_BYTES);
|
||||||
|
bb.put(initialBlockchainKey32);
|
||||||
return bb.array();
|
return bb.array();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static void requireNonZeroKey(byte[] key) {
|
||||||
|
if (key == null || key.length != 32) throw new IllegalArgumentException("initialBlockchainKey32 must be 32 bytes");
|
||||||
|
boolean any = false;
|
||||||
|
for (byte b : key) any |= b != 0;
|
||||||
|
if (!any) throw new IllegalArgumentException("initialBlockchainKey32 must not be zero");
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return """
|
return "HeaderBody{version=" + version + ", login='" + login + "', license=" + license + ", initialBlockchainKey32=<32 bytes>}";
|
||||||
HeaderBody {
|
|
||||||
тип записи : HEADER (type=0, ver=1) [в заголовке блока]
|
|
||||||
subType : 0 (compat)
|
|
||||||
тег формата : "%s"
|
|
||||||
login владельца : "%s"
|
|
||||||
}
|
|
||||||
""".formatted(tag, login);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+31
-93
@@ -4,130 +4,68 @@ import blockchain.MsgSubType;
|
|||||||
|
|
||||||
import java.nio.ByteBuffer;
|
import java.nio.ByteBuffer;
|
||||||
import java.nio.ByteOrder;
|
import java.nio.ByteOrder;
|
||||||
import java.nio.charset.StandardCharsets;
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
/**
|
/** REACTION LIKE/UNLIKE. External target = login + forkNumber + blockNumber + hash32. */
|
||||||
* ReactionBody — type=2, version=1 (в заголовке блока).
|
|
||||||
*
|
|
||||||
* subType (в заголовке блока):
|
|
||||||
* 1 = LIKE
|
|
||||||
* 2 = UNLIKE
|
|
||||||
*
|
|
||||||
* bodyBytes (BigEndian), новый формат:
|
|
||||||
* [1] toBlockchainNameLen (uint8)
|
|
||||||
* [N] toBlockchainName UTF-8
|
|
||||||
* [4] toBlockGlobalNumber (int32)
|
|
||||||
* [32] toBlockHash32 (raw 32 bytes)
|
|
||||||
*
|
|
||||||
* ЛИНИИ НЕТ.
|
|
||||||
*/
|
|
||||||
public final class ReactionBody implements BodyRecord, BodyHasTarget {
|
public final class ReactionBody implements BodyRecord, BodyHasTarget {
|
||||||
|
|
||||||
public static final short TYPE = 2;
|
public static final short TYPE = 2;
|
||||||
public static final short VER = 1;
|
public static final short VER = 1;
|
||||||
|
|
||||||
public static final int KEY = ((TYPE & 0xFFFF) << 16) | (VER & 0xFFFF);
|
public static final int KEY = ((TYPE & 0xFFFF) << 16) | (VER & 0xFFFF);
|
||||||
|
|
||||||
public final short subType; // из header
|
public final short subType;
|
||||||
public final short version; // из header
|
public final short version;
|
||||||
|
public final String toLogin;
|
||||||
public final String toBlockchainName;
|
public final int toForkNumber;
|
||||||
public final int toBlockGlobalNumber;
|
public final int toBlockGlobalNumber;
|
||||||
public final byte[] toBlockHash32;
|
public final byte[] toBlockHash32;
|
||||||
|
|
||||||
public ReactionBody(short subType, short version, byte[] bodyBytes) {
|
public ReactionBody(short subType, short version, byte[] bodyBytes) {
|
||||||
Objects.requireNonNull(bodyBytes, "bodyBytes == null");
|
Objects.requireNonNull(bodyBytes, "bodyBytes == null");
|
||||||
|
|
||||||
this.subType = subType;
|
this.subType = subType;
|
||||||
this.version = version;
|
this.version = version;
|
||||||
|
if ((version & 0xFFFF) != (VER & 0xFFFF)) throw new IllegalArgumentException("ReactionBody version must be 1");
|
||||||
if ((this.version & 0xFFFF) != (VER & 0xFFFF)) {
|
if (!isSupportedSubType(subType)) throw new IllegalArgumentException("Bad reaction subType: " + (subType & 0xFFFF));
|
||||||
throw new IllegalArgumentException("ReactionBody version must be 1, got=" + (this.version & 0xFFFF));
|
|
||||||
}
|
|
||||||
if (!isSupportedSubType(this.subType)) {
|
|
||||||
throw new IllegalArgumentException("Bad reaction subType: " + (this.subType & 0xFFFF));
|
|
||||||
}
|
|
||||||
|
|
||||||
// минимум: nameLen[1]+name[1]+global[4]+hash[32]
|
|
||||||
if (bodyBytes.length < 1 + 1 + 4 + 32) throw new IllegalArgumentException("ReactionBody too short");
|
|
||||||
|
|
||||||
ByteBuffer bb = ByteBuffer.wrap(bodyBytes).order(ByteOrder.BIG_ENDIAN);
|
ByteBuffer bb = ByteBuffer.wrap(bodyBytes).order(ByteOrder.BIG_ENDIAN);
|
||||||
|
BodyTargetSupport.ExternalTarget t = BodyTargetSupport.readExternal(bb, "REACTION", 0);
|
||||||
int nameLen = Byte.toUnsignedInt(bb.get());
|
this.toLogin = t.login();
|
||||||
if (nameLen <= 0) throw new IllegalArgumentException("toBlockchainNameLen is 0");
|
this.toForkNumber = t.forkNumber();
|
||||||
if (bb.remaining() < nameLen + 4 + 32) throw new IllegalArgumentException("ReactionBody payload too short");
|
this.toBlockGlobalNumber = t.blockNumber();
|
||||||
|
this.toBlockHash32 = t.blockHash32();
|
||||||
byte[] nameBytes = new byte[nameLen];
|
if (bb.hasRemaining()) throw new IllegalArgumentException("Unexpected REACTION tail");
|
||||||
bb.get(nameBytes);
|
|
||||||
this.toBlockchainName = new String(nameBytes, StandardCharsets.UTF_8);
|
|
||||||
|
|
||||||
this.toBlockGlobalNumber = bb.getInt();
|
|
||||||
|
|
||||||
this.toBlockHash32 = new byte[32];
|
|
||||||
bb.get(this.toBlockHash32);
|
|
||||||
|
|
||||||
if (bb.remaining() != 0) throw new IllegalArgumentException("Unexpected tail bytes, remaining=" + bb.remaining());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public ReactionBody(String toBlockchainName, int toBlockGlobalNumber, byte[] toBlockHash32) {
|
public ReactionBody(short subType, String toLogin, int toForkNumber, int toBlockGlobalNumber, byte[] toBlockHash32) {
|
||||||
Objects.requireNonNull(toBlockchainName, "toBlockchainName == null");
|
if (!isSupportedSubType(subType)) throw new IllegalArgumentException("Bad reaction subType");
|
||||||
Objects.requireNonNull(toBlockHash32, "toBlockHash32 == null");
|
BodyTargetSupport.validateExternal(toLogin, toForkNumber, toBlockGlobalNumber, toBlockHash32, "REACTION");
|
||||||
|
this.subType = subType;
|
||||||
this.subType = MsgSubType.REACTION_LIKE;
|
|
||||||
this.version = VER;
|
this.version = VER;
|
||||||
|
this.toLogin = toLogin;
|
||||||
if (toBlockchainName.isBlank()) throw new IllegalArgumentException("toBlockchainName is blank");
|
this.toForkNumber = toForkNumber;
|
||||||
if (toBlockGlobalNumber < 0) throw new IllegalArgumentException("toBlockGlobalNumber < 0");
|
|
||||||
if (toBlockHash32.length != 32) throw new IllegalArgumentException("toBlockHash32 != 32");
|
|
||||||
|
|
||||||
this.toBlockchainName = toBlockchainName;
|
|
||||||
this.toBlockGlobalNumber = toBlockGlobalNumber;
|
this.toBlockGlobalNumber = toBlockGlobalNumber;
|
||||||
this.toBlockHash32 = Arrays.copyOf(toBlockHash32, 32);
|
this.toBlockHash32 = Arrays.copyOf(toBlockHash32, 32);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override public ReactionBody check() {
|
||||||
public ReactionBody check() {
|
if (!isSupportedSubType(subType)) throw new IllegalArgumentException("Bad reaction subType");
|
||||||
if (!isSupportedSubType(subType))
|
BodyTargetSupport.validateExternal(toLogin, toForkNumber, toBlockGlobalNumber, toBlockHash32, "REACTION");
|
||||||
throw new IllegalArgumentException("Bad reaction subType: " + (subType & 0xFFFF));
|
|
||||||
|
|
||||||
if (toBlockchainName == null || toBlockchainName.isBlank())
|
|
||||||
throw new IllegalArgumentException("toBlockchainName is blank");
|
|
||||||
if (toBlockGlobalNumber < 0)
|
|
||||||
throw new IllegalArgumentException("toBlockGlobalNumber < 0");
|
|
||||||
if (toBlockHash32 == null || toBlockHash32.length != 32)
|
|
||||||
throw new IllegalArgumentException("toBlockHash32 invalid");
|
|
||||||
|
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override public byte[] toBytes() {
|
||||||
public byte[] toBytes() {
|
check();
|
||||||
byte[] nameBytes = toBlockchainName.getBytes(StandardCharsets.UTF_8);
|
ByteBuffer bb = ByteBuffer.allocate(BodyTargetSupport.externalSize(toLogin)).order(ByteOrder.BIG_ENDIAN);
|
||||||
if (nameBytes.length == 0 || nameBytes.length > 255)
|
BodyTargetSupport.writeExternal(bb, toLogin, toForkNumber, toBlockGlobalNumber, toBlockHash32, "REACTION");
|
||||||
throw new IllegalArgumentException("toBlockchainName utf8 len must be 1..255");
|
|
||||||
|
|
||||||
int cap = 1 + nameBytes.length + 4 + 32;
|
|
||||||
|
|
||||||
ByteBuffer bb = ByteBuffer.allocate(cap).order(ByteOrder.BIG_ENDIAN);
|
|
||||||
bb.put((byte) nameBytes.length);
|
|
||||||
bb.put(nameBytes);
|
|
||||||
bb.putInt(toBlockGlobalNumber);
|
|
||||||
bb.put(toBlockHash32);
|
|
||||||
|
|
||||||
return bb.array();
|
return bb.array();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ====================== BodyHasTarget ====================== */
|
@Override public String toLogin() { return toLogin; }
|
||||||
|
@Override public Integer toForkNumber() { return toForkNumber; }
|
||||||
@Override public String toBchName() { return toBlockchainName; }
|
|
||||||
@Override public Integer toBlockGlobalNumber() { return toBlockGlobalNumber; }
|
@Override public Integer toBlockGlobalNumber() { return toBlockGlobalNumber; }
|
||||||
@Override public byte[] toBlockHashBytes() { return toBlockHash32; }
|
@Override public byte[] toBlockHashBytes() { return Arrays.copyOf(toBlockHash32, 32); }
|
||||||
|
|
||||||
private static boolean isSupportedSubType(short subType) {
|
private static boolean isSupportedSubType(short subType) {
|
||||||
int st = subType & 0xFFFF;
|
int st = subType & 0xFFFF;
|
||||||
return st == (MsgSubType.REACTION_LIKE & 0xFFFF)
|
return st == (MsgSubType.REACTION_LIKE & 0xFFFF) || st == (MsgSubType.REACTION_UNLIKE & 0xFFFF);
|
||||||
|| st == (MsgSubType.REACTION_UNLIKE & 0xFFFF);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+37
-116
@@ -10,157 +10,78 @@ import java.nio.charset.StandardCharsets;
|
|||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
/**
|
/** STATUS_ACTION. External target = login + forkNumber + blockNumber + hash32. */
|
||||||
* StatusActionBody — type=5, ver=1.
|
|
||||||
*
|
|
||||||
* Все STATUS_ACTION имеют target на конкретный блок и опциональный текст-пояснение.
|
|
||||||
*
|
|
||||||
* Формат bodyBytes (BigEndian):
|
|
||||||
* [1] toBlockchainNameLen (uint8)
|
|
||||||
* [N] toBlockchainName UTF-8
|
|
||||||
* [4] toBlockGlobalNumber
|
|
||||||
* [32] toBlockHash32
|
|
||||||
* [2] textLenBytes (uint16)
|
|
||||||
* [M] text UTF-8
|
|
||||||
*/
|
|
||||||
public final class StatusActionBody implements BodyRecord, BodyHasTarget {
|
public final class StatusActionBody implements BodyRecord, BodyHasTarget {
|
||||||
|
|
||||||
public static final short TYPE = 5;
|
public static final short TYPE = 5;
|
||||||
public static final short VER = 1;
|
public static final short VER = 1;
|
||||||
public static final int KEY = ((TYPE & 0xFFFF) << 16) | (VER & 0xFFFF);
|
public static final int KEY = ((TYPE & 0xFFFF) << 16) | (VER & 0xFFFF);
|
||||||
|
|
||||||
public final short subType;
|
public final short subType;
|
||||||
public final short version;
|
public final short version;
|
||||||
public final String toBlockchainName;
|
public final String toLogin;
|
||||||
|
public final int toForkNumber;
|
||||||
public final int toBlockGlobalNumber;
|
public final int toBlockGlobalNumber;
|
||||||
public final byte[] toBlockHash32;
|
public final byte[] toBlockHash32;
|
||||||
public final String message;
|
public final String message;
|
||||||
|
|
||||||
public StatusActionBody(short subType, short version, byte[] bodyBytes) {
|
public StatusActionBody(short subType, short version, byte[] bodyBytes) {
|
||||||
Objects.requireNonNull(bodyBytes, "bodyBytes == null");
|
Objects.requireNonNull(bodyBytes, "bodyBytes == null");
|
||||||
this.subType = subType;
|
this.subType = subType; this.version = version;
|
||||||
this.version = version;
|
if ((version & 0xFFFF) != 1 || !isSupportedSubType(subType)) throw new IllegalArgumentException("Bad STATUS_ACTION header");
|
||||||
|
|
||||||
if ((version & 0xFFFF) != (VER & 0xFFFF)) {
|
|
||||||
throw new IllegalArgumentException("StatusActionBody version must be 1, got=" + (version & 0xFFFF));
|
|
||||||
}
|
|
||||||
if (!isSupportedSubType(subType)) {
|
|
||||||
throw new IllegalArgumentException("Unsupported STATUS_ACTION subType: " + (subType & 0xFFFF));
|
|
||||||
}
|
|
||||||
|
|
||||||
ByteBuffer bb = ByteBuffer.wrap(bodyBytes).order(ByteOrder.BIG_ENDIAN);
|
ByteBuffer bb = ByteBuffer.wrap(bodyBytes).order(ByteOrder.BIG_ENDIAN);
|
||||||
ensureMin(bb, 1 + 1 + 4 + 32 + 2, "STATUS_ACTION too short");
|
BodyTargetSupport.ExternalTarget t = BodyTargetSupport.readExternal(bb, "STATUS_ACTION", 2);
|
||||||
|
this.toLogin = t.login(); this.toForkNumber = t.forkNumber(); this.toBlockGlobalNumber = t.blockNumber(); this.toBlockHash32 = t.blockHash32();
|
||||||
int nameLen = Byte.toUnsignedInt(bb.get());
|
this.message = readText(bb);
|
||||||
if (nameLen <= 0) throw new IllegalArgumentException("STATUS_ACTION toBlockchainNameLen is 0");
|
if (bb.hasRemaining()) throw new IllegalArgumentException("Unexpected STATUS_ACTION tail");
|
||||||
ensureMin(bb, nameLen + 4 + 32 + 2, "STATUS_ACTION payload too short");
|
|
||||||
|
|
||||||
byte[] nameBytes = new byte[nameLen];
|
|
||||||
bb.get(nameBytes);
|
|
||||||
this.toBlockchainName = new String(nameBytes, StandardCharsets.UTF_8);
|
|
||||||
this.toBlockGlobalNumber = bb.getInt();
|
|
||||||
this.toBlockHash32 = new byte[32];
|
|
||||||
bb.get(this.toBlockHash32);
|
|
||||||
this.message = readStrictUtf8Len16AllowEmpty(bb, "StatusActionBody text");
|
|
||||||
|
|
||||||
ensureNoTail(bb, "StatusActionBody");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public StatusActionBody(short subType, String toBlockchainName, int toBlockGlobalNumber, byte[] toBlockHash32, String message) {
|
public StatusActionBody(short subType, String toLogin, int toForkNumber, int toBlockGlobalNumber, byte[] toBlockHash32, String message) {
|
||||||
Objects.requireNonNull(toBlockchainName, "toBlockchainName == null");
|
|
||||||
Objects.requireNonNull(toBlockHash32, "toBlockHash32 == null");
|
|
||||||
Objects.requireNonNull(message, "message == null");
|
Objects.requireNonNull(message, "message == null");
|
||||||
if (!isSupportedSubType(subType)) throw new IllegalArgumentException("Unsupported STATUS_ACTION subType");
|
if (!isSupportedSubType(subType)) throw new IllegalArgumentException("Unsupported STATUS_ACTION subType");
|
||||||
if (toBlockchainName.isBlank()) throw new IllegalArgumentException("toBlockchainName is blank");
|
BodyTargetSupport.validateExternal(toLogin, toForkNumber, toBlockGlobalNumber, toBlockHash32, "STATUS_ACTION");
|
||||||
if (toBlockGlobalNumber < 0) throw new IllegalArgumentException("toBlockGlobalNumber < 0");
|
this.subType = subType; this.version = VER; this.toLogin = toLogin; this.toForkNumber = toForkNumber;
|
||||||
if (toBlockHash32.length != 32) throw new IllegalArgumentException("toBlockHash32 != 32");
|
this.toBlockGlobalNumber = toBlockGlobalNumber; this.toBlockHash32 = Arrays.copyOf(toBlockHash32, 32); this.message = message;
|
||||||
|
|
||||||
this.subType = subType;
|
|
||||||
this.version = VER;
|
|
||||||
this.toBlockchainName = toBlockchainName;
|
|
||||||
this.toBlockGlobalNumber = toBlockGlobalNumber;
|
|
||||||
this.toBlockHash32 = Arrays.copyOf(toBlockHash32, 32);
|
|
||||||
this.message = message;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override public StatusActionBody check() {
|
||||||
public StatusActionBody check() {
|
if (!isSupportedSubType(subType)) throw new IllegalArgumentException("Bad STATUS_ACTION subType");
|
||||||
if (!isSupportedSubType(subType)) {
|
BodyTargetSupport.validateExternal(toLogin, toForkNumber, toBlockGlobalNumber, toBlockHash32, "STATUS_ACTION");
|
||||||
throw new IllegalArgumentException("Bad STATUS_ACTION subType: " + (subType & 0xFFFF));
|
|
||||||
}
|
|
||||||
if (toBlockchainName == null || toBlockchainName.isBlank()) {
|
|
||||||
throw new IllegalArgumentException("STATUS_ACTION toBlockchainName is blank");
|
|
||||||
}
|
|
||||||
if (toBlockGlobalNumber < 0) throw new IllegalArgumentException("toBlockGlobalNumber < 0");
|
|
||||||
if (toBlockHash32 == null || toBlockHash32.length != 32) {
|
|
||||||
throw new IllegalArgumentException("toBlockHash32 invalid");
|
|
||||||
}
|
|
||||||
if (message == null) throw new IllegalArgumentException("message is null");
|
if (message == null) throw new IllegalArgumentException("message is null");
|
||||||
|
if (message.getBytes(StandardCharsets.UTF_8).length > 65535) throw new IllegalArgumentException("Text too long");
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override public byte[] toBytes() {
|
||||||
public byte[] toBytes() {
|
check();
|
||||||
byte[] msgUtf8 = message.getBytes(StandardCharsets.UTF_8);
|
byte[] text = message.getBytes(StandardCharsets.UTF_8);
|
||||||
if (msgUtf8.length > 65535) throw new IllegalArgumentException("Text too long (>65535 bytes)");
|
ByteBuffer bb = ByteBuffer.allocate(BodyTargetSupport.externalSize(toLogin) + 2 + text.length).order(ByteOrder.BIG_ENDIAN);
|
||||||
|
BodyTargetSupport.writeExternal(bb, toLogin, toForkNumber, toBlockGlobalNumber, toBlockHash32, "STATUS_ACTION");
|
||||||
byte[] nameUtf8 = toBlockchainName.getBytes(StandardCharsets.UTF_8);
|
bb.putShort((short) text.length).put(text);
|
||||||
if (nameUtf8.length == 0 || nameUtf8.length > 255) {
|
|
||||||
throw new IllegalArgumentException("STATUS_ACTION toBlockchainName utf8 len must be 1..255");
|
|
||||||
}
|
|
||||||
|
|
||||||
ByteBuffer bb = ByteBuffer.allocate(1 + nameUtf8.length + 4 + 32 + 2 + msgUtf8.length)
|
|
||||||
.order(ByteOrder.BIG_ENDIAN);
|
|
||||||
bb.put((byte) nameUtf8.length);
|
|
||||||
bb.put(nameUtf8);
|
|
||||||
bb.putInt(toBlockGlobalNumber);
|
|
||||||
bb.put(toBlockHash32);
|
|
||||||
bb.putShort((short) msgUtf8.length);
|
|
||||||
bb.put(msgUtf8);
|
|
||||||
return bb.array();
|
return bb.array();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override public String toBchName() { return toBlockchainName; }
|
@Override public String toLogin() { return toLogin; }
|
||||||
|
@Override public Integer toForkNumber() { return toForkNumber; }
|
||||||
@Override public Integer toBlockGlobalNumber() { return toBlockGlobalNumber; }
|
@Override public Integer toBlockGlobalNumber() { return toBlockGlobalNumber; }
|
||||||
@Override public byte[] toBlockHashBytes() { return toBlockHash32; }
|
@Override public byte[] toBlockHashBytes() { return Arrays.copyOf(toBlockHash32, 32); }
|
||||||
|
|
||||||
private static boolean isSupportedSubType(short subType) {
|
private static boolean isSupportedSubType(short subType) {
|
||||||
int st = subType & 0xFFFF;
|
int st = subType & 0xFFFF;
|
||||||
return st == (MsgSubType.STATUS_DONE_ONCE & 0xFFFF)
|
return st == (MsgSubType.STATUS_DONE_ONCE & 0xFFFF) || st == (MsgSubType.STATUS_LEARNED & 0xFFFF)
|
||||||
|| st == (MsgSubType.STATUS_LEARNED & 0xFFFF)
|
|| st == (MsgSubType.STATUS_SERVICE_PASSED & 0xFFFF) || st == (MsgSubType.STATUS_CONFIRMED & 0xFFFF)
|
||||||
|| st == (MsgSubType.STATUS_SERVICE_PASSED & 0xFFFF)
|
|| st == (MsgSubType.STATUS_INTERESTED & 0xFFFF) || st == (MsgSubType.STATUS_STARTED & 0xFFFF)
|
||||||
|| st == (MsgSubType.STATUS_CONFIRMED & 0xFFFF)
|
|| st == (MsgSubType.STATUS_IN_STUDY & 0xFFFF) || st == (MsgSubType.STATUS_ABANDONED & 0xFFFF)
|
||||||
|| st == (MsgSubType.STATUS_INTERESTED & 0xFFFF)
|
|
||||||
|| st == (MsgSubType.STATUS_STARTED & 0xFFFF)
|
|
||||||
|| st == (MsgSubType.STATUS_IN_STUDY & 0xFFFF)
|
|
||||||
|| st == (MsgSubType.STATUS_ABANDONED & 0xFFFF)
|
|
||||||
|| st == (MsgSubType.STATUS_COMPLETED & 0xFFFF);
|
|| st == (MsgSubType.STATUS_COMPLETED & 0xFFFF);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String readStrictUtf8Len16AllowEmpty(ByteBuffer bb, String fieldName) {
|
private static String readText(ByteBuffer bb) {
|
||||||
|
if (bb.remaining() < 2) throw new IllegalArgumentException("STATUS_ACTION text length missing");
|
||||||
int len = Short.toUnsignedInt(bb.getShort());
|
int len = Short.toUnsignedInt(bb.getShort());
|
||||||
|
if (bb.remaining() < len) throw new IllegalArgumentException("STATUS_ACTION text payload too short");
|
||||||
if (len == 0) return "";
|
if (len == 0) return "";
|
||||||
if (bb.remaining() < len) throw new IllegalArgumentException(fieldName + " payload too short (len=" + len + ")");
|
byte[] bytes = new byte[len]; bb.get(bytes);
|
||||||
|
var dec = StandardCharsets.UTF_8.newDecoder().onMalformedInput(CodingErrorAction.REPORT).onUnmappableCharacter(CodingErrorAction.REPORT);
|
||||||
byte[] bytes = new byte[len];
|
try { return dec.decode(ByteBuffer.wrap(bytes)).toString(); }
|
||||||
bb.get(bytes);
|
catch (CharacterCodingException e) { throw new IllegalArgumentException("STATUS_ACTION text invalid UTF-8", e); }
|
||||||
|
|
||||||
var decoder = StandardCharsets.UTF_8.newDecoder()
|
|
||||||
.onMalformedInput(CodingErrorAction.REPORT)
|
|
||||||
.onUnmappableCharacter(CodingErrorAction.REPORT);
|
|
||||||
|
|
||||||
try {
|
|
||||||
return decoder.decode(ByteBuffer.wrap(bytes)).toString();
|
|
||||||
} catch (CharacterCodingException e) {
|
|
||||||
throw new IllegalArgumentException(fieldName + " is not valid UTF-8", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void ensureMin(ByteBuffer bb, int need, String msg) {
|
|
||||||
if (bb.remaining() < need) throw new IllegalArgumentException(msg + " (need=" + need + ", remaining=" + bb.remaining() + ")");
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void ensureNoTail(ByteBuffer bb, String ctx) {
|
|
||||||
if (bb.remaining() != 0) throw new IllegalArgumentException("Unexpected tail bytes for " + ctx + ", remaining=" + bb.remaining());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,544 +0,0 @@
|
|||||||
package blockchain.body;
|
|
||||||
|
|
||||||
import blockchain.MsgSubType;
|
|
||||||
|
|
||||||
import java.nio.ByteBuffer;
|
|
||||||
import java.nio.ByteOrder;
|
|
||||||
import java.nio.charset.CharacterCodingException;
|
|
||||||
import java.nio.charset.CodingErrorAction;
|
|
||||||
import java.nio.charset.StandardCharsets;
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* TextBody — type=1, ver=1 (в заголовке блока).
|
|
||||||
*
|
|
||||||
* subType (в заголовке блока):
|
|
||||||
* 10 = POST
|
|
||||||
* 11 = EDIT_POST
|
|
||||||
* 20 = REPLY
|
|
||||||
* 21 = EDIT_REPLY
|
|
||||||
*
|
|
||||||
* =========================================================================
|
|
||||||
* КОНЦЕПЦИЯ ЛИНИЙ ДЛЯ ТЕКСТОВЫХ СООБЩЕНИЙ:
|
|
||||||
*
|
|
||||||
* POST и EDIT_POST принадлежат ЛИНИИ КАНАЛА и имеют hasLine.
|
|
||||||
* В новом формате добавлен lineCode:
|
|
||||||
* lineCode = 0 для канала "0"
|
|
||||||
* lineCode = blockNumber "заглавия линии/канала" (например CREATE_CHANNEL)
|
|
||||||
*
|
|
||||||
* REPLY и EDIT_REPLY НЕ имеют линии (нет hasLine в байтах).
|
|
||||||
*
|
|
||||||
* =========================================================================
|
|
||||||
* ФОРМАТЫ bodyBytes (BigEndian):
|
|
||||||
*
|
|
||||||
* 1) POST (subType=10):
|
|
||||||
* [4] lineCode
|
|
||||||
* [4] prevLineNumber
|
|
||||||
* [32] prevLineHash32
|
|
||||||
* [4] thisLineNumber
|
|
||||||
* [2] textLenBytes (uint16)
|
|
||||||
* [N] text UTF-8
|
|
||||||
*
|
|
||||||
* 2) EDIT_POST (subType=11):
|
|
||||||
* [4] lineCode
|
|
||||||
* [4] prevLineNumber
|
|
||||||
* [32] prevLineHash32
|
|
||||||
* [4] thisLineNumber
|
|
||||||
*
|
|
||||||
* hasTarget (на ОРИГИНАЛЬНЫЙ POST, toBchName НЕ хранить):
|
|
||||||
* [4] toBlockGlobalNumber
|
|
||||||
* [32] toBlockHash32
|
|
||||||
*
|
|
||||||
* [2] textLenBytes (uint16)
|
|
||||||
* [N] text UTF-8
|
|
||||||
*
|
|
||||||
* 3) REPLY (subType=20) — НЕ в линии:
|
|
||||||
* hasTarget:
|
|
||||||
* [1] toBlockchainNameLen (uint8)
|
|
||||||
* [N] toBlockchainName UTF-8
|
|
||||||
* [4] toBlockGlobalNumber
|
|
||||||
* [32] toBlockHash32
|
|
||||||
*
|
|
||||||
* [2] textLenBytes (uint16)
|
|
||||||
* [M] text UTF-8
|
|
||||||
*
|
|
||||||
* 4) EDIT_REPLY (subType=21) — НЕ в линии:
|
|
||||||
* hasTarget (на ОРИГИНАЛЬНЫЙ REPLY, toBchName НЕ хранить):
|
|
||||||
* [4] toBlockGlobalNumber
|
|
||||||
* [32] toBlockHash32
|
|
||||||
*
|
|
||||||
* [2] textLenBytes (uint16)
|
|
||||||
* [N] text UTF-8
|
|
||||||
*/
|
|
||||||
public final class TextBody implements BodyRecord, BodyHasTarget, BodyHasLine {
|
|
||||||
|
|
||||||
public static final short TYPE = 1;
|
|
||||||
public static final short VER = 1;
|
|
||||||
|
|
||||||
public static final int KEY = ((TYPE & 0xFFFF) << 16) | (VER & 0xFFFF);
|
|
||||||
|
|
||||||
public final short subType; // из header
|
|
||||||
public final short version; // из header
|
|
||||||
|
|
||||||
// ===== line fields (только для POST/EDIT_POST) =====
|
|
||||||
// Для REPLY/EDIT_REPLY эти поля НЕ сериализуются; значения держим как "пустые".
|
|
||||||
public final int lineCode; // только для line-message; иначе -1
|
|
||||||
public final int prevLineNumber;
|
|
||||||
public final byte[] prevLineHash32; // 32 or null
|
|
||||||
public final int thisLineNumber;
|
|
||||||
|
|
||||||
// ===== message text =====
|
|
||||||
public final String message;
|
|
||||||
|
|
||||||
// ===== target fields =====
|
|
||||||
// REPLY: toBlockchainName + globalNumber + hash32
|
|
||||||
// EDIT_POST / EDIT_REPLY: только globalNumber + hash32 (без toBlockchainName)
|
|
||||||
public final String toBlockchainName; // nullable
|
|
||||||
public final Integer toBlockGlobalNumber; // nullable
|
|
||||||
public final byte[] toBlockHash32; // nullable (но если target есть -> 32)
|
|
||||||
|
|
||||||
/* ===================================================================== */
|
|
||||||
/* ====================== Конструктор из байт ========================== */
|
|
||||||
/* ===================================================================== */
|
|
||||||
|
|
||||||
public TextBody(short subType, short version, byte[] bodyBytes) {
|
|
||||||
Objects.requireNonNull(bodyBytes, "bodyBytes == null");
|
|
||||||
|
|
||||||
this.subType = subType;
|
|
||||||
this.version = version;
|
|
||||||
|
|
||||||
if ((this.version & 0xFFFF) != (VER & 0xFFFF)) {
|
|
||||||
throw new IllegalArgumentException("TextBody version must be 1, got=" + (this.version & 0xFFFF));
|
|
||||||
}
|
|
||||||
if (!isValidSubType(this.subType)) {
|
|
||||||
throw new IllegalArgumentException("Bad Text subType: " + (this.subType & 0xFFFF));
|
|
||||||
}
|
|
||||||
|
|
||||||
ByteBuffer bb = ByteBuffer.wrap(bodyBytes).order(ByteOrder.BIG_ENDIAN);
|
|
||||||
|
|
||||||
int st = this.subType & 0xFFFF;
|
|
||||||
|
|
||||||
if (st == (MsgSubType.TEXT_POST & 0xFFFF)) {
|
|
||||||
// POST: hasLine(lineCode+line) + text
|
|
||||||
ensureMin(bb, (4 + 4 + 32 + 4) + 2, "POST too short");
|
|
||||||
|
|
||||||
this.lineCode = bb.getInt();
|
|
||||||
this.prevLineNumber = bb.getInt();
|
|
||||||
this.prevLineHash32 = new byte[32];
|
|
||||||
bb.get(this.prevLineHash32);
|
|
||||||
this.thisLineNumber = bb.getInt();
|
|
||||||
|
|
||||||
this.message = readStrictUtf8Len16(bb, "POST text");
|
|
||||||
|
|
||||||
this.toBlockchainName = null;
|
|
||||||
this.toBlockGlobalNumber = null;
|
|
||||||
this.toBlockHash32 = null;
|
|
||||||
|
|
||||||
ensureNoTail(bb, "POST");
|
|
||||||
|
|
||||||
} else if (st == (MsgSubType.TEXT_EDIT_POST & 0xFFFF)) {
|
|
||||||
// EDIT_POST: hasLine(lineCode+line) + target(no bch) + text
|
|
||||||
ensureMin(bb, (4 + 4 + 32 + 4) + (4 + 32) + 2, "EDIT_POST too short");
|
|
||||||
|
|
||||||
this.lineCode = bb.getInt();
|
|
||||||
this.prevLineNumber = bb.getInt();
|
|
||||||
this.prevLineHash32 = new byte[32];
|
|
||||||
bb.get(this.prevLineHash32);
|
|
||||||
this.thisLineNumber = bb.getInt();
|
|
||||||
|
|
||||||
int tgtNum = bb.getInt();
|
|
||||||
byte[] tgtHash = new byte[32];
|
|
||||||
bb.get(tgtHash);
|
|
||||||
|
|
||||||
this.toBlockchainName = null;
|
|
||||||
this.toBlockGlobalNumber = tgtNum;
|
|
||||||
this.toBlockHash32 = tgtHash;
|
|
||||||
|
|
||||||
this.message = readStrictUtf8Len16(bb, "EDIT_POST text");
|
|
||||||
|
|
||||||
ensureNoTail(bb, "EDIT_POST");
|
|
||||||
|
|
||||||
} else if (st == (MsgSubType.TEXT_REPLY & 0xFFFF)) {
|
|
||||||
// REPLY: target(with bch) + text (без line)
|
|
||||||
ensureMin(bb, 1 + 1 + 4 + 32 + 2, "REPLY too short");
|
|
||||||
|
|
||||||
int nameLen = Byte.toUnsignedInt(bb.get());
|
|
||||||
if (nameLen <= 0) throw new IllegalArgumentException("REPLY toBlockchainNameLen is 0");
|
|
||||||
ensureMin(bb, nameLen + 4 + 32 + 2, "REPLY payload too short");
|
|
||||||
|
|
||||||
byte[] nameBytes = new byte[nameLen];
|
|
||||||
bb.get(nameBytes);
|
|
||||||
this.toBlockchainName = new String(nameBytes, StandardCharsets.UTF_8);
|
|
||||||
|
|
||||||
this.toBlockGlobalNumber = bb.getInt();
|
|
||||||
|
|
||||||
this.toBlockHash32 = new byte[32];
|
|
||||||
bb.get(this.toBlockHash32);
|
|
||||||
|
|
||||||
this.message = readStrictUtf8Len16(bb, "REPLY text");
|
|
||||||
|
|
||||||
// line fields отсутствуют в байтах
|
|
||||||
this.lineCode = -1;
|
|
||||||
this.prevLineNumber = -1;
|
|
||||||
this.prevLineHash32 = null;
|
|
||||||
this.thisLineNumber = -1;
|
|
||||||
|
|
||||||
ensureNoTail(bb, "REPLY");
|
|
||||||
|
|
||||||
} else if (st == (MsgSubType.TEXT_EDIT_REPLY & 0xFFFF)) {
|
|
||||||
// EDIT_REPLY: target(no bch) + text (без line)
|
|
||||||
ensureMin(bb, (4 + 32) + 2, "EDIT_REPLY too short");
|
|
||||||
|
|
||||||
int tgtNum = bb.getInt();
|
|
||||||
byte[] tgtHash = new byte[32];
|
|
||||||
bb.get(tgtHash);
|
|
||||||
|
|
||||||
this.toBlockchainName = null;
|
|
||||||
this.toBlockGlobalNumber = tgtNum;
|
|
||||||
this.toBlockHash32 = tgtHash;
|
|
||||||
|
|
||||||
this.message = readStrictUtf8Len16(bb, "EDIT_REPLY text");
|
|
||||||
|
|
||||||
// line fields отсутствуют в байтах
|
|
||||||
this.lineCode = -1;
|
|
||||||
this.prevLineNumber = -1;
|
|
||||||
this.prevLineHash32 = null;
|
|
||||||
this.thisLineNumber = -1;
|
|
||||||
|
|
||||||
ensureNoTail(bb, "EDIT_REPLY");
|
|
||||||
|
|
||||||
} else {
|
|
||||||
throw new IllegalArgumentException("Unsupported Text subType: " + st);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===================================================================== */
|
|
||||||
/* ====================== Фабрики (удобно) ============================= */
|
|
||||||
/* ===================================================================== */
|
|
||||||
|
|
||||||
public static TextBody newPost(int lineCode, int prevLineNumber, byte[] prevLineHash32, int thisLineNumber, String message) {
|
|
||||||
return new TextBody(MsgSubType.TEXT_POST, lineCode, prevLineNumber, prevLineHash32, thisLineNumber,
|
|
||||||
message, null, null, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static TextBody newEditPost(int lineCode, int prevLineNumber, byte[] prevLineHash32, int thisLineNumber,
|
|
||||||
int targetBlockNumber, byte[] targetHash32,
|
|
||||||
String message) {
|
|
||||||
return new TextBody(MsgSubType.TEXT_EDIT_POST, lineCode, prevLineNumber, prevLineHash32, thisLineNumber,
|
|
||||||
message, null, targetBlockNumber, targetHash32);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static TextBody newReply(String toBlockchainName, int targetBlockNumber, byte[] targetHash32, String message) {
|
|
||||||
return new TextBody(MsgSubType.TEXT_REPLY, -1, -1, null, -1,
|
|
||||||
message, toBlockchainName, targetBlockNumber, targetHash32);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static TextBody newEditReply(int targetBlockNumber, byte[] targetHash32, String message) {
|
|
||||||
return new TextBody(MsgSubType.TEXT_EDIT_REPLY, -1, -1, null, -1,
|
|
||||||
message, null, targetBlockNumber, targetHash32);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Универсальный конструктор “вручную”.
|
|
||||||
* Для REPLY/EDIT_REPLY line поля игнорируются при сериализации (их в формате нет).
|
|
||||||
*/
|
|
||||||
public TextBody(short subType,
|
|
||||||
int lineCode,
|
|
||||||
int prevLineNumber,
|
|
||||||
byte[] prevLineHash32,
|
|
||||||
int thisLineNumber,
|
|
||||||
String message,
|
|
||||||
String toBlockchainName,
|
|
||||||
Integer toBlockGlobalNumber,
|
|
||||||
byte[] toBlockHash32) {
|
|
||||||
|
|
||||||
Objects.requireNonNull(message, "message == null");
|
|
||||||
|
|
||||||
if (!isValidSubType(subType)) throw new IllegalArgumentException("Bad Text subType: " + (subType & 0xFFFF));
|
|
||||||
if (message.isBlank()) throw new IllegalArgumentException("message is blank");
|
|
||||||
|
|
||||||
this.subType = subType;
|
|
||||||
this.version = VER;
|
|
||||||
|
|
||||||
int st = subType & 0xFFFF;
|
|
||||||
|
|
||||||
// line применима только к POST/EDIT_POST
|
|
||||||
if (st == (MsgSubType.TEXT_POST & 0xFFFF) || st == (MsgSubType.TEXT_EDIT_POST & 0xFFFF)) {
|
|
||||||
if (lineCode < 0) throw new IllegalArgumentException("lineCode < 0 for line message");
|
|
||||||
this.lineCode = lineCode;
|
|
||||||
this.prevLineNumber = prevLineNumber;
|
|
||||||
this.prevLineHash32 = (prevLineHash32 == null ? new byte[32] : Arrays.copyOf(prevLineHash32, 32));
|
|
||||||
this.thisLineNumber = thisLineNumber;
|
|
||||||
} else {
|
|
||||||
this.lineCode = -1;
|
|
||||||
this.prevLineNumber = -1;
|
|
||||||
this.prevLineHash32 = null;
|
|
||||||
this.thisLineNumber = -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.message = message;
|
|
||||||
|
|
||||||
// target правила
|
|
||||||
if (st == (MsgSubType.TEXT_POST & 0xFFFF)) {
|
|
||||||
this.toBlockchainName = null;
|
|
||||||
this.toBlockGlobalNumber = null;
|
|
||||||
this.toBlockHash32 = null;
|
|
||||||
|
|
||||||
} else if (st == (MsgSubType.TEXT_EDIT_POST & 0xFFFF)) {
|
|
||||||
Objects.requireNonNull(toBlockGlobalNumber, "toBlockGlobalNumber == null");
|
|
||||||
Objects.requireNonNull(toBlockHash32, "toBlockHash32 == null");
|
|
||||||
if (toBlockGlobalNumber < 0) throw new IllegalArgumentException("toBlockGlobalNumber < 0");
|
|
||||||
if (toBlockHash32.length != 32) throw new IllegalArgumentException("toBlockHash32 != 32");
|
|
||||||
|
|
||||||
this.toBlockchainName = null; // по ТЗ: не хранить
|
|
||||||
this.toBlockGlobalNumber = toBlockGlobalNumber;
|
|
||||||
this.toBlockHash32 = Arrays.copyOf(toBlockHash32, 32);
|
|
||||||
|
|
||||||
} else if (st == (MsgSubType.TEXT_REPLY & 0xFFFF)) {
|
|
||||||
Objects.requireNonNull(toBlockchainName, "toBlockchainName == null");
|
|
||||||
Objects.requireNonNull(toBlockGlobalNumber, "toBlockGlobalNumber == null");
|
|
||||||
Objects.requireNonNull(toBlockHash32, "toBlockHash32 == null");
|
|
||||||
if (toBlockchainName.isBlank()) throw new IllegalArgumentException("toBlockchainName is blank");
|
|
||||||
if (toBlockGlobalNumber < 0) throw new IllegalArgumentException("toBlockGlobalNumber < 0");
|
|
||||||
if (toBlockHash32.length != 32) throw new IllegalArgumentException("toBlockHash32 != 32");
|
|
||||||
|
|
||||||
this.toBlockchainName = toBlockchainName;
|
|
||||||
this.toBlockGlobalNumber = toBlockGlobalNumber;
|
|
||||||
this.toBlockHash32 = Arrays.copyOf(toBlockHash32, 32);
|
|
||||||
|
|
||||||
} else if (st == (MsgSubType.TEXT_EDIT_REPLY & 0xFFFF)) {
|
|
||||||
Objects.requireNonNull(toBlockGlobalNumber, "toBlockGlobalNumber == null");
|
|
||||||
Objects.requireNonNull(toBlockHash32, "toBlockHash32 == null");
|
|
||||||
if (toBlockGlobalNumber < 0) throw new IllegalArgumentException("toBlockGlobalNumber < 0");
|
|
||||||
if (toBlockHash32.length != 32) throw new IllegalArgumentException("toBlockHash32 != 32");
|
|
||||||
|
|
||||||
this.toBlockchainName = null; // по ТЗ: не хранить
|
|
||||||
this.toBlockGlobalNumber = toBlockGlobalNumber;
|
|
||||||
this.toBlockHash32 = Arrays.copyOf(toBlockHash32, 32);
|
|
||||||
|
|
||||||
} else {
|
|
||||||
this.toBlockchainName = null;
|
|
||||||
this.toBlockGlobalNumber = null;
|
|
||||||
this.toBlockHash32 = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static boolean isValidSubType(short st) {
|
|
||||||
int v = st & 0xFFFF;
|
|
||||||
return v == (MsgSubType.TEXT_POST & 0xFFFF)
|
|
||||||
|| v == (MsgSubType.TEXT_EDIT_POST & 0xFFFF)
|
|
||||||
|| v == (MsgSubType.TEXT_REPLY & 0xFFFF)
|
|
||||||
|| v == (MsgSubType.TEXT_EDIT_REPLY & 0xFFFF);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public TextBody check() {
|
|
||||||
if (!isValidSubType(subType))
|
|
||||||
throw new IllegalArgumentException("Bad Text subType: " + (subType & 0xFFFF));
|
|
||||||
|
|
||||||
if (message == null || message.isBlank())
|
|
||||||
throw new IllegalArgumentException("Text message is blank");
|
|
||||||
|
|
||||||
int st = subType & 0xFFFF;
|
|
||||||
|
|
||||||
// локальные проверки line (БД не трогаем)
|
|
||||||
if (st == (MsgSubType.TEXT_POST & 0xFFFF) || st == (MsgSubType.TEXT_EDIT_POST & 0xFFFF)) {
|
|
||||||
if (lineCode < 0) throw new IllegalArgumentException("lineCode < 0 for line message");
|
|
||||||
if (prevLineHash32 == null || prevLineHash32.length != 32)
|
|
||||||
throw new IllegalArgumentException("prevLineHash32 invalid");
|
|
||||||
} else {
|
|
||||||
// reply/edit_reply: line отсутствует
|
|
||||||
if (prevLineHash32 != null)
|
|
||||||
throw new IllegalArgumentException("REPLY/EDIT_REPLY must not contain line hash");
|
|
||||||
}
|
|
||||||
|
|
||||||
// target rules
|
|
||||||
if (st == (MsgSubType.TEXT_POST & 0xFFFF)) {
|
|
||||||
if (toBlockchainName != null || toBlockGlobalNumber != null || toBlockHash32 != null)
|
|
||||||
throw new IllegalArgumentException("POST must not contain target fields");
|
|
||||||
|
|
||||||
} else if (st == (MsgSubType.TEXT_EDIT_POST & 0xFFFF)) {
|
|
||||||
if (toBlockchainName != null)
|
|
||||||
throw new IllegalArgumentException("EDIT_POST must not contain toBlockchainName in target");
|
|
||||||
if (toBlockGlobalNumber == null || toBlockGlobalNumber < 0)
|
|
||||||
throw new IllegalArgumentException("EDIT_POST toBlockGlobalNumber invalid");
|
|
||||||
if (toBlockHash32 == null || toBlockHash32.length != 32)
|
|
||||||
throw new IllegalArgumentException("EDIT_POST toBlockHash32 invalid");
|
|
||||||
|
|
||||||
} else if (st == (MsgSubType.TEXT_REPLY & 0xFFFF)) {
|
|
||||||
if (toBlockchainName == null || toBlockchainName.isBlank())
|
|
||||||
throw new IllegalArgumentException("REPLY toBlockchainName is blank");
|
|
||||||
if (toBlockGlobalNumber == null || toBlockGlobalNumber < 0)
|
|
||||||
throw new IllegalArgumentException("REPLY toBlockGlobalNumber invalid");
|
|
||||||
if (toBlockHash32 == null || toBlockHash32.length != 32)
|
|
||||||
throw new IllegalArgumentException("REPLY toBlockHash32 invalid");
|
|
||||||
|
|
||||||
} else if (st == (MsgSubType.TEXT_EDIT_REPLY & 0xFFFF)) {
|
|
||||||
if (toBlockchainName != null)
|
|
||||||
throw new IllegalArgumentException("EDIT_REPLY must not contain toBlockchainName in target");
|
|
||||||
if (toBlockGlobalNumber == null || toBlockGlobalNumber < 0)
|
|
||||||
throw new IllegalArgumentException("EDIT_REPLY toBlockGlobalNumber invalid");
|
|
||||||
if (toBlockHash32 == null || toBlockHash32.length != 32)
|
|
||||||
throw new IllegalArgumentException("EDIT_REPLY toBlockHash32 invalid");
|
|
||||||
}
|
|
||||||
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public byte[] toBytes() {
|
|
||||||
byte[] msgUtf8 = message.getBytes(StandardCharsets.UTF_8);
|
|
||||||
if (msgUtf8.length == 0) throw new IllegalArgumentException("Text payload is empty");
|
|
||||||
if (msgUtf8.length > 65535) throw new IllegalArgumentException("Text too long (>65535 bytes)");
|
|
||||||
|
|
||||||
int st = subType & 0xFFFF;
|
|
||||||
|
|
||||||
if (st == (MsgSubType.TEXT_POST & 0xFFFF)) {
|
|
||||||
// hasLine(lineCode+line) + text
|
|
||||||
int cap = (4 + 4 + 32 + 4) + 2 + msgUtf8.length;
|
|
||||||
|
|
||||||
ByteBuffer bb = ByteBuffer.allocate(cap).order(ByteOrder.BIG_ENDIAN);
|
|
||||||
bb.putInt(lineCode);
|
|
||||||
bb.putInt(prevLineNumber);
|
|
||||||
bb.put(prevLineHash32 == null ? new byte[32] : Arrays.copyOf(prevLineHash32, 32));
|
|
||||||
bb.putInt(thisLineNumber);
|
|
||||||
bb.putShort((short) msgUtf8.length);
|
|
||||||
bb.put(msgUtf8);
|
|
||||||
return bb.array();
|
|
||||||
|
|
||||||
} else if (st == (MsgSubType.TEXT_EDIT_POST & 0xFFFF)) {
|
|
||||||
// hasLine(lineCode+line) + target(no bch) + text
|
|
||||||
if (toBlockGlobalNumber == null) throw new IllegalArgumentException("EDIT_POST missing toBlockGlobalNumber");
|
|
||||||
if (toBlockHash32 == null || toBlockHash32.length != 32) throw new IllegalArgumentException("EDIT_POST toBlockHash32 != 32");
|
|
||||||
|
|
||||||
int cap = (4 + 4 + 32 + 4) + (4 + 32) + 2 + msgUtf8.length;
|
|
||||||
|
|
||||||
ByteBuffer bb = ByteBuffer.allocate(cap).order(ByteOrder.BIG_ENDIAN);
|
|
||||||
bb.putInt(lineCode);
|
|
||||||
bb.putInt(prevLineNumber);
|
|
||||||
bb.put(prevLineHash32 == null ? new byte[32] : Arrays.copyOf(prevLineHash32, 32));
|
|
||||||
bb.putInt(thisLineNumber);
|
|
||||||
|
|
||||||
bb.putInt(toBlockGlobalNumber);
|
|
||||||
bb.put(toBlockHash32);
|
|
||||||
|
|
||||||
bb.putShort((short) msgUtf8.length);
|
|
||||||
bb.put(msgUtf8);
|
|
||||||
return bb.array();
|
|
||||||
|
|
||||||
} else if (st == (MsgSubType.TEXT_REPLY & 0xFFFF)) {
|
|
||||||
// target(with bch) + text
|
|
||||||
if (toBlockchainName == null) throw new IllegalArgumentException("REPLY missing toBlockchainName");
|
|
||||||
if (toBlockGlobalNumber == null) throw new IllegalArgumentException("REPLY missing toBlockGlobalNumber");
|
|
||||||
if (toBlockHash32 == null || toBlockHash32.length != 32) throw new IllegalArgumentException("REPLY toBlockHash32 != 32");
|
|
||||||
|
|
||||||
byte[] nameUtf8 = toBlockchainName.getBytes(StandardCharsets.UTF_8);
|
|
||||||
if (nameUtf8.length == 0 || nameUtf8.length > 255)
|
|
||||||
throw new IllegalArgumentException("REPLY toBlockchainName utf8 len must be 1..255");
|
|
||||||
|
|
||||||
int cap = 1 + nameUtf8.length + 4 + 32
|
|
||||||
+ 2 + msgUtf8.length;
|
|
||||||
|
|
||||||
ByteBuffer bb = ByteBuffer.allocate(cap).order(ByteOrder.BIG_ENDIAN);
|
|
||||||
bb.put((byte) nameUtf8.length);
|
|
||||||
bb.put(nameUtf8);
|
|
||||||
bb.putInt(toBlockGlobalNumber);
|
|
||||||
bb.put(toBlockHash32);
|
|
||||||
|
|
||||||
bb.putShort((short) msgUtf8.length);
|
|
||||||
bb.put(msgUtf8);
|
|
||||||
return bb.array();
|
|
||||||
|
|
||||||
} else if (st == (MsgSubType.TEXT_EDIT_REPLY & 0xFFFF)) {
|
|
||||||
// target(no bch) + text
|
|
||||||
if (toBlockGlobalNumber == null) throw new IllegalArgumentException("EDIT_REPLY missing toBlockGlobalNumber");
|
|
||||||
if (toBlockHash32 == null || toBlockHash32.length != 32) throw new IllegalArgumentException("EDIT_REPLY toBlockHash32 != 32");
|
|
||||||
|
|
||||||
int cap = (4 + 32) + 2 + msgUtf8.length;
|
|
||||||
|
|
||||||
ByteBuffer bb = ByteBuffer.allocate(cap).order(ByteOrder.BIG_ENDIAN);
|
|
||||||
bb.putInt(toBlockGlobalNumber);
|
|
||||||
bb.put(toBlockHash32);
|
|
||||||
|
|
||||||
bb.putShort((short) msgUtf8.length);
|
|
||||||
bb.put(msgUtf8);
|
|
||||||
return bb.array();
|
|
||||||
|
|
||||||
} else {
|
|
||||||
throw new IllegalStateException("Unsupported Text subType: " + st);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ===================================================================== */
|
|
||||||
/* ========================== Helpers ================================== */
|
|
||||||
/* ===================================================================== */
|
|
||||||
|
|
||||||
private static String readStrictUtf8Len16(ByteBuffer bb, String fieldName) {
|
|
||||||
int len = Short.toUnsignedInt(bb.getShort());
|
|
||||||
if (len <= 0) throw new IllegalArgumentException(fieldName + " is empty");
|
|
||||||
if (bb.remaining() < len) throw new IllegalArgumentException(fieldName + " payload too short (len=" + len + ")");
|
|
||||||
|
|
||||||
byte[] bytes = new byte[len];
|
|
||||||
bb.get(bytes);
|
|
||||||
|
|
||||||
var decoder = StandardCharsets.UTF_8.newDecoder()
|
|
||||||
.onMalformedInput(CodingErrorAction.REPORT)
|
|
||||||
.onUnmappableCharacter(CodingErrorAction.REPORT);
|
|
||||||
|
|
||||||
try {
|
|
||||||
String s = decoder.decode(ByteBuffer.wrap(bytes)).toString();
|
|
||||||
if (s.isBlank()) throw new IllegalArgumentException(fieldName + " is blank");
|
|
||||||
return s;
|
|
||||||
} catch (CharacterCodingException e) {
|
|
||||||
throw new IllegalArgumentException(fieldName + " is not valid UTF-8", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void ensureMin(ByteBuffer bb, int need, String msg) {
|
|
||||||
if (bb.remaining() < need) throw new IllegalArgumentException(msg + " (need=" + need + ", remaining=" + bb.remaining() + ")");
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void ensureNoTail(ByteBuffer bb, String ctx) {
|
|
||||||
if (bb.remaining() != 0) throw new IllegalArgumentException("Unexpected tail bytes for " + ctx + ", remaining=" + bb.remaining());
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ====================== BodyHasLine ====================== */
|
|
||||||
@Override public int lineCode() { return lineCode; }
|
|
||||||
@Override public int prevLineBlockGlobalNumber() { return prevLineNumber; }
|
|
||||||
@Override public byte[] prevLineBlockHash32() {
|
|
||||||
if (prevLineHash32 == null) return null;
|
|
||||||
return Arrays.copyOf(prevLineHash32, 32);
|
|
||||||
}
|
|
||||||
@Override public int lineSeq() { return thisLineNumber; }
|
|
||||||
|
|
||||||
/* ====================== BodyHasTarget ===================== */
|
|
||||||
@Override public String toBchName() { return toBlockchainName; }
|
|
||||||
@Override public Integer toBlockGlobalNumber() { return toBlockGlobalNumber; }
|
|
||||||
@Override public byte[] toBlockHashBytes() { return toBlockHash32; }
|
|
||||||
|
|
||||||
/* ===================================================================== */
|
|
||||||
/* ===================== Удобные хелперы (для ChainState) =============== */
|
|
||||||
/* ===================================================================== */
|
|
||||||
|
|
||||||
/** true только для POST / EDIT_POST (т.е. это сообщение в линии канала). */
|
|
||||||
public boolean isLineMessage() {
|
|
||||||
int st = subType & 0xFFFF;
|
|
||||||
return st == (MsgSubType.TEXT_POST & 0xFFFF)
|
|
||||||
|| st == (MsgSubType.TEXT_EDIT_POST & 0xFFFF);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** true только для EDIT_POST / EDIT_REPLY. */
|
|
||||||
public boolean isEditMessage() {
|
|
||||||
int st = subType & 0xFFFF;
|
|
||||||
return st == (MsgSubType.TEXT_EDIT_POST & 0xFFFF)
|
|
||||||
|| st == (MsgSubType.TEXT_EDIT_REPLY & 0xFFFF);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** true только для REPLY / EDIT_REPLY (т.е. “не в линии”). */
|
|
||||||
public boolean isReplyFamily() {
|
|
||||||
int st = subType & 0xFFFF;
|
|
||||||
return st == (MsgSubType.TEXT_REPLY & 0xFFFF)
|
|
||||||
|| st == (MsgSubType.TEXT_EDIT_REPLY & 0xFFFF);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+88
-285
@@ -11,374 +11,177 @@ import java.util.Arrays;
|
|||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* TextLineBody — type=1, ver=1.
|
* Line-based TEXT body.
|
||||||
*
|
|
||||||
* subType:
|
|
||||||
* - POST (10)
|
|
||||||
* - EDIT_POST (11)
|
|
||||||
* - REPOST (50)
|
|
||||||
* - CHANNEL_META (90)
|
|
||||||
* - ENTRYPOINT (100)
|
|
||||||
* - EXERCISE (110)
|
|
||||||
* - SERVICE (120)
|
|
||||||
* - COURSE (130)
|
|
||||||
*
|
|
||||||
* Формат bodyBytes (BigEndian):
|
|
||||||
*
|
*
|
||||||
* POST / CHANNEL_META / ENTRYPOINT / EXERCISE / SERVICE / COURSE:
|
* POST / CHANNEL_META / ENTRYPOINT / EXERCISE / SERVICE / COURSE:
|
||||||
* [4] lineCode
|
* line fields + text
|
||||||
* [4] prevLineNumber
|
|
||||||
* [32] prevLineHash32
|
|
||||||
* [4] thisLineNumber
|
|
||||||
* [2] textLenBytes (uint16)
|
|
||||||
* [N] text UTF-8
|
|
||||||
*
|
*
|
||||||
* EDIT_POST:
|
* EDIT_POST (own-chain compact target):
|
||||||
* [4] lineCode
|
* line fields + [4] targetBlockNumber + [32] targetHash + text
|
||||||
* [4] prevLineNumber
|
|
||||||
* [32] prevLineHash32
|
|
||||||
* [4] thisLineNumber
|
|
||||||
* [4] toBlockGlobalNumber (int32)
|
|
||||||
* [32] toBlockHash32
|
|
||||||
* [2] textLenBytes (uint16)
|
|
||||||
* [N] text UTF-8
|
|
||||||
*
|
*
|
||||||
* REPOST:
|
* REPOST (external target):
|
||||||
* [4] lineCode
|
* line fields + [1]loginLen + login + [2]forkNumber + [4]blockNumber + [32]hash + text
|
||||||
* [4] prevLineNumber
|
|
||||||
* [32] prevLineHash32
|
|
||||||
* [4] thisLineNumber
|
|
||||||
* [1] toBlockchainNameLen (uint8)
|
|
||||||
* [N] toBlockchainName UTF-8
|
|
||||||
* [4] toBlockGlobalNumber (int32)
|
|
||||||
* [32] toBlockHash32
|
|
||||||
* [2] textLenBytes (uint16)
|
|
||||||
* [N] text UTF-8
|
|
||||||
*/
|
*/
|
||||||
public final class TextLineBody implements BodyRecord, BodyHasLine, BodyHasTarget {
|
public final class TextLineBody implements BodyRecord, BodyHasLine, BodyHasTarget {
|
||||||
|
|
||||||
public static final short TYPE = 1;
|
public static final short TYPE = 1;
|
||||||
public static final short VER = 1;
|
public static final short VER = 1;
|
||||||
|
|
||||||
public static final int KEY = ((TYPE & 0xFFFF) << 16) | (VER & 0xFFFF);
|
public static final int KEY = ((TYPE & 0xFFFF) << 16) | (VER & 0xFFFF);
|
||||||
|
|
||||||
public final short subType; // из header
|
public final short subType;
|
||||||
public final short version; // из header (=1)
|
public final short version;
|
||||||
|
|
||||||
// line
|
|
||||||
public final int lineCode;
|
public final int lineCode;
|
||||||
public final int prevLineNumber;
|
public final int prevLineNumber;
|
||||||
public final byte[] prevLineHash32; // 32 (может быть нули)
|
public final byte[] prevLineHash32;
|
||||||
public final int thisLineNumber;
|
public final int thisLineNumber;
|
||||||
|
public final String toLogin;
|
||||||
// target (для EDIT_POST / REPOST)
|
public final Integer toForkNumber;
|
||||||
public final String toBlockchainName; // nullable для POST/EDIT_POST
|
public final Integer toBlockGlobalNumber;
|
||||||
public final Integer toBlockGlobalNumber; // nullable для POST
|
public final byte[] toBlockHash32;
|
||||||
public final byte[] toBlockHash32; // nullable для POST
|
|
||||||
|
|
||||||
// text
|
|
||||||
public final String message;
|
public final String message;
|
||||||
|
|
||||||
/* ====================== parse from bytes ====================== */
|
|
||||||
|
|
||||||
public TextLineBody(short subType, short version, byte[] bodyBytes) {
|
public TextLineBody(short subType, short version, byte[] bodyBytes) {
|
||||||
Objects.requireNonNull(bodyBytes, "bodyBytes == null");
|
Objects.requireNonNull(bodyBytes, "bodyBytes == null");
|
||||||
|
|
||||||
this.subType = subType;
|
this.subType = subType;
|
||||||
this.version = version;
|
this.version = version;
|
||||||
|
if ((version & 0xFFFF) != 1 || !isSupportedSubType(subType)) throw new IllegalArgumentException("Bad TextLineBody header");
|
||||||
if ((this.version & 0xFFFF) != (VER & 0xFFFF)) {
|
|
||||||
throw new IllegalArgumentException("TextLineBody version must be 1, got=" + (this.version & 0xFFFF));
|
|
||||||
}
|
|
||||||
|
|
||||||
int st = this.subType & 0xFFFF;
|
|
||||||
if (st != (MsgSubType.TEXT_POST & 0xFFFF)
|
|
||||||
&& st != (MsgSubType.TEXT_EDIT_POST & 0xFFFF)
|
|
||||||
&& st != (MsgSubType.TEXT_REPOST & 0xFFFF)
|
|
||||||
&& st != (MsgSubType.TEXT_CHANNEL_META & 0xFFFF)
|
|
||||||
&& st != (MsgSubType.TEXT_ENTRYPOINT & 0xFFFF)
|
|
||||||
&& st != (MsgSubType.TEXT_EXERCISE & 0xFFFF)
|
|
||||||
&& st != (MsgSubType.TEXT_SERVICE & 0xFFFF)
|
|
||||||
&& st != (MsgSubType.TEXT_COURSE & 0xFFFF)) {
|
|
||||||
throw new IllegalArgumentException("TextLineBody supports only POST/EDIT_POST/REPOST/CHANNEL_META, got subType=" + st);
|
|
||||||
}
|
|
||||||
|
|
||||||
ByteBuffer bb = ByteBuffer.wrap(bodyBytes).order(ByteOrder.BIG_ENDIAN);
|
ByteBuffer bb = ByteBuffer.wrap(bodyBytes).order(ByteOrder.BIG_ENDIAN);
|
||||||
|
BodyTargetSupport.ensureMin(bb, 4 + 4 + 32 + 4 + 2, "TextLineBody too short");
|
||||||
// минимум line + textLen(2)
|
|
||||||
ensureMin(bb, (4 + 4 + 32 + 4) + 2, "TextLineBody too short");
|
|
||||||
|
|
||||||
this.lineCode = bb.getInt();
|
this.lineCode = bb.getInt();
|
||||||
this.prevLineNumber = bb.getInt();
|
this.prevLineNumber = bb.getInt();
|
||||||
|
this.prevLineHash32 = new byte[32]; bb.get(this.prevLineHash32);
|
||||||
this.prevLineHash32 = new byte[32];
|
|
||||||
bb.get(this.prevLineHash32);
|
|
||||||
|
|
||||||
this.thisLineNumber = bb.getInt();
|
this.thisLineNumber = bb.getInt();
|
||||||
|
|
||||||
|
int st = subType & 0xFFFF;
|
||||||
if (st == (MsgSubType.TEXT_EDIT_POST & 0xFFFF)) {
|
if (st == (MsgSubType.TEXT_EDIT_POST & 0xFFFF)) {
|
||||||
// нужен target
|
BodyTargetSupport.ensureMin(bb, 4 + 32 + 2, "EDIT_POST target missing");
|
||||||
ensureMin(bb, (4 + 32) + 2, "EDIT_POST missing target");
|
this.toLogin = null;
|
||||||
int tgtNum = bb.getInt();
|
this.toForkNumber = null;
|
||||||
byte[] tgtHash = new byte[32];
|
|
||||||
bb.get(tgtHash);
|
|
||||||
|
|
||||||
this.toBlockchainName = null;
|
|
||||||
this.toBlockGlobalNumber = tgtNum;
|
|
||||||
this.toBlockHash32 = tgtHash;
|
|
||||||
} else if (st == (MsgSubType.TEXT_REPOST & 0xFFFF)) {
|
|
||||||
ensureMin(bb, 1 + 1 + 4 + 32 + 2, "REPOST missing target");
|
|
||||||
int nameLen = Byte.toUnsignedInt(bb.get());
|
|
||||||
if (nameLen <= 0) throw new IllegalArgumentException("REPOST toBlockchainNameLen is 0");
|
|
||||||
ensureMin(bb, nameLen + 4 + 32 + 2, "REPOST payload too short");
|
|
||||||
byte[] nameBytes = new byte[nameLen];
|
|
||||||
bb.get(nameBytes);
|
|
||||||
this.toBlockchainName = new String(nameBytes, StandardCharsets.UTF_8);
|
|
||||||
this.toBlockGlobalNumber = bb.getInt();
|
this.toBlockGlobalNumber = bb.getInt();
|
||||||
this.toBlockHash32 = new byte[32];
|
this.toBlockHash32 = new byte[32]; bb.get(this.toBlockHash32);
|
||||||
bb.get(this.toBlockHash32);
|
BodyTargetSupport.validateCompact(this.toBlockGlobalNumber, this.toBlockHash32, "EDIT_POST");
|
||||||
|
} else if (st == (MsgSubType.TEXT_REPOST & 0xFFFF)) {
|
||||||
|
BodyTargetSupport.ExternalTarget t = BodyTargetSupport.readExternal(bb, "REPOST", 2);
|
||||||
|
this.toLogin = t.login();
|
||||||
|
this.toForkNumber = t.forkNumber();
|
||||||
|
this.toBlockGlobalNumber = t.blockNumber();
|
||||||
|
this.toBlockHash32 = t.blockHash32();
|
||||||
} else {
|
} else {
|
||||||
this.toBlockchainName = null;
|
this.toLogin = null;
|
||||||
|
this.toForkNumber = null;
|
||||||
this.toBlockGlobalNumber = null;
|
this.toBlockGlobalNumber = null;
|
||||||
this.toBlockHash32 = null;
|
this.toBlockHash32 = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.message = readStrictUtf8Len16(bb, "TextLineBody text",
|
boolean allowEmpty = st == (MsgSubType.TEXT_EDIT_POST & 0xFFFF) || st == (MsgSubType.TEXT_CHANNEL_META & 0xFFFF) || st == (MsgSubType.TEXT_CHANNEL_DELETE & 0xFFFF);
|
||||||
st == (MsgSubType.TEXT_EDIT_POST & 0xFFFF) || st == (MsgSubType.TEXT_CHANNEL_META & 0xFFFF));
|
this.message = readText(bb, allowEmpty);
|
||||||
|
if (bb.hasRemaining()) throw new IllegalArgumentException("Unexpected TextLineBody tail");
|
||||||
ensureNoTail(bb, "TextLineBody");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ====================== manual ctor ====================== */
|
|
||||||
|
|
||||||
public TextLineBody(int lineCode,
|
public TextLineBody(int lineCode,
|
||||||
int prevLineNumber,
|
int prevLineNumber,
|
||||||
byte[] prevLineHash32,
|
byte[] prevLineHash32,
|
||||||
int thisLineNumber,
|
int thisLineNumber,
|
||||||
short subType,
|
short subType,
|
||||||
|
String toLogin,
|
||||||
|
Integer toForkNumber,
|
||||||
Integer toBlockGlobalNumber,
|
Integer toBlockGlobalNumber,
|
||||||
byte[] toBlockHash32,
|
byte[] toBlockHash32,
|
||||||
String toBlockchainName,
|
|
||||||
String message) {
|
String message) {
|
||||||
|
|
||||||
Objects.requireNonNull(message, "message == null");
|
Objects.requireNonNull(message, "message == null");
|
||||||
|
if (!isSupportedSubType(subType)) throw new IllegalArgumentException("Bad TextLineBody subtype");
|
||||||
int st = subType & 0xFFFF;
|
|
||||||
if (st != (MsgSubType.TEXT_POST & 0xFFFF)
|
|
||||||
&& st != (MsgSubType.TEXT_EDIT_POST & 0xFFFF)
|
|
||||||
&& st != (MsgSubType.TEXT_REPOST & 0xFFFF)
|
|
||||||
&& st != (MsgSubType.TEXT_CHANNEL_META & 0xFFFF)
|
|
||||||
&& st != (MsgSubType.TEXT_ENTRYPOINT & 0xFFFF)
|
|
||||||
&& st != (MsgSubType.TEXT_EXERCISE & 0xFFFF)
|
|
||||||
&& st != (MsgSubType.TEXT_SERVICE & 0xFFFF)
|
|
||||||
&& st != (MsgSubType.TEXT_COURSE & 0xFFFF)) {
|
|
||||||
throw new IllegalArgumentException("TextLineBody supports only POST/EDIT_POST/REPOST/CHANNEL_META");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (lineCode < 0) throw new IllegalArgumentException("lineCode < 0");
|
if (lineCode < 0) throw new IllegalArgumentException("lineCode < 0");
|
||||||
if (requiresNonBlankMessage(st) && message.isBlank()) {
|
|
||||||
throw new IllegalArgumentException("message is blank");
|
|
||||||
}
|
|
||||||
|
|
||||||
this.subType = subType;
|
this.subType = subType;
|
||||||
this.version = VER;
|
this.version = VER;
|
||||||
|
|
||||||
this.lineCode = lineCode;
|
this.lineCode = lineCode;
|
||||||
this.prevLineNumber = prevLineNumber;
|
this.prevLineNumber = prevLineNumber;
|
||||||
this.prevLineHash32 = (prevLineHash32 == null ? new byte[32] : Arrays.copyOf(prevLineHash32, 32));
|
this.prevLineHash32 = prevLineHash32 == null ? new byte[32] : Arrays.copyOf(prevLineHash32, 32);
|
||||||
this.thisLineNumber = thisLineNumber;
|
this.thisLineNumber = thisLineNumber;
|
||||||
|
this.toLogin = toLogin;
|
||||||
if (st == (MsgSubType.TEXT_EDIT_POST & 0xFFFF)) {
|
this.toForkNumber = toForkNumber;
|
||||||
Objects.requireNonNull(toBlockGlobalNumber, "toBlockGlobalNumber == null");
|
this.toBlockGlobalNumber = toBlockGlobalNumber;
|
||||||
Objects.requireNonNull(toBlockHash32, "toBlockHash32 == null");
|
this.toBlockHash32 = toBlockHash32 == null ? null : Arrays.copyOf(toBlockHash32, 32);
|
||||||
if (toBlockGlobalNumber < 0) throw new IllegalArgumentException("toBlockGlobalNumber < 0");
|
|
||||||
if (toBlockHash32.length != 32) throw new IllegalArgumentException("toBlockHash32 != 32");
|
|
||||||
|
|
||||||
this.toBlockchainName = null;
|
|
||||||
this.toBlockGlobalNumber = toBlockGlobalNumber;
|
|
||||||
this.toBlockHash32 = Arrays.copyOf(toBlockHash32, 32);
|
|
||||||
} else if (st == (MsgSubType.TEXT_REPOST & 0xFFFF)) {
|
|
||||||
Objects.requireNonNull(toBlockchainName, "toBlockchainName == null");
|
|
||||||
if (toBlockchainName.isBlank()) throw new IllegalArgumentException("toBlockchainName is blank");
|
|
||||||
Objects.requireNonNull(toBlockGlobalNumber, "toBlockGlobalNumber == null");
|
|
||||||
Objects.requireNonNull(toBlockHash32, "toBlockHash32 == null");
|
|
||||||
if (toBlockGlobalNumber < 0) throw new IllegalArgumentException("toBlockGlobalNumber < 0");
|
|
||||||
if (toBlockHash32.length != 32) throw new IllegalArgumentException("toBlockHash32 != 32");
|
|
||||||
|
|
||||||
this.toBlockchainName = toBlockchainName;
|
|
||||||
this.toBlockGlobalNumber = toBlockGlobalNumber;
|
|
||||||
this.toBlockHash32 = Arrays.copyOf(toBlockHash32, 32);
|
|
||||||
} else {
|
|
||||||
this.toBlockchainName = null;
|
|
||||||
this.toBlockGlobalNumber = null;
|
|
||||||
this.toBlockHash32 = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.message = message;
|
this.message = message;
|
||||||
|
check();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override public TextLineBody check() {
|
||||||
public TextLineBody check() {
|
if (!isSupportedSubType(subType)) throw new IllegalArgumentException("Bad TextLineBody subtype");
|
||||||
int st = subType & 0xFFFF;
|
|
||||||
if (st != (MsgSubType.TEXT_POST & 0xFFFF)
|
|
||||||
&& st != (MsgSubType.TEXT_EDIT_POST & 0xFFFF)
|
|
||||||
&& st != (MsgSubType.TEXT_REPOST & 0xFFFF)
|
|
||||||
&& st != (MsgSubType.TEXT_CHANNEL_META & 0xFFFF)
|
|
||||||
&& st != (MsgSubType.TEXT_ENTRYPOINT & 0xFFFF)
|
|
||||||
&& st != (MsgSubType.TEXT_EXERCISE & 0xFFFF)
|
|
||||||
&& st != (MsgSubType.TEXT_SERVICE & 0xFFFF)
|
|
||||||
&& st != (MsgSubType.TEXT_COURSE & 0xFFFF))
|
|
||||||
throw new IllegalArgumentException("Bad TextLineBody subType: " + st);
|
|
||||||
|
|
||||||
if (lineCode < 0) throw new IllegalArgumentException("lineCode < 0");
|
if (lineCode < 0) throw new IllegalArgumentException("lineCode < 0");
|
||||||
if (prevLineHash32 == null || prevLineHash32.length != 32)
|
if (prevLineHash32 == null || prevLineHash32.length != 32) throw new IllegalArgumentException("prevLineHash32 invalid");
|
||||||
throw new IllegalArgumentException("prevLineHash32 invalid");
|
|
||||||
|
|
||||||
|
int st = subType & 0xFFFF;
|
||||||
if (st == (MsgSubType.TEXT_EDIT_POST & 0xFFFF)) {
|
if (st == (MsgSubType.TEXT_EDIT_POST & 0xFFFF)) {
|
||||||
|
if (toLogin != null || toForkNumber != null) throw new IllegalArgumentException("EDIT_POST must not contain login/fork target");
|
||||||
|
BodyTargetSupport.validateCompact(toBlockGlobalNumber, toBlockHash32, "EDIT_POST");
|
||||||
if (message == null) throw new IllegalArgumentException("EDIT_POST message is null");
|
if (message == null) throw new IllegalArgumentException("EDIT_POST message is null");
|
||||||
if (toBlockGlobalNumber == null || toBlockGlobalNumber < 0)
|
|
||||||
throw new IllegalArgumentException("EDIT_POST toBlockGlobalNumber invalid");
|
|
||||||
if (toBlockHash32 == null || toBlockHash32.length != 32)
|
|
||||||
throw new IllegalArgumentException("EDIT_POST toBlockHash32 invalid");
|
|
||||||
if (toBlockchainName != null)
|
|
||||||
throw new IllegalArgumentException("EDIT_POST must not contain toBlockchainName");
|
|
||||||
} else if (st == (MsgSubType.TEXT_REPOST & 0xFFFF)) {
|
} else if (st == (MsgSubType.TEXT_REPOST & 0xFFFF)) {
|
||||||
if (message == null || message.isBlank())
|
BodyTargetSupport.validateExternal(toLogin, toForkNumber, toBlockGlobalNumber, toBlockHash32, "REPOST");
|
||||||
throw new IllegalArgumentException("REPOST message is blank");
|
if (message == null || message.isBlank()) throw new IllegalArgumentException("REPOST message is blank");
|
||||||
if (toBlockchainName == null || toBlockchainName.isBlank())
|
|
||||||
throw new IllegalArgumentException("REPOST toBlockchainName is blank");
|
|
||||||
if (toBlockGlobalNumber == null || toBlockGlobalNumber < 0)
|
|
||||||
throw new IllegalArgumentException("REPOST toBlockGlobalNumber invalid");
|
|
||||||
if (toBlockHash32 == null || toBlockHash32.length != 32)
|
|
||||||
throw new IllegalArgumentException("REPOST toBlockHash32 invalid");
|
|
||||||
} else {
|
} else {
|
||||||
|
if (toLogin != null || toForkNumber != null || toBlockGlobalNumber != null || toBlockHash32 != null) {
|
||||||
|
throw new IllegalArgumentException("Non-target text body must not contain target fields");
|
||||||
|
}
|
||||||
if (st == (MsgSubType.TEXT_CHANNEL_META & 0xFFFF)) {
|
if (st == (MsgSubType.TEXT_CHANNEL_META & 0xFFFF)) {
|
||||||
if (message == null) throw new IllegalArgumentException("CHANNEL_META message is null");
|
if (message == null) throw new IllegalArgumentException("CHANNEL_META message is null");
|
||||||
} else if (requiresNonBlankMessage(st) && (message == null || message.isBlank())) {
|
} else if (st == (MsgSubType.TEXT_CHANNEL_DELETE & 0xFFFF)) {
|
||||||
|
if (message == null || !message.isEmpty()) throw new IllegalArgumentException("CHANNEL_DELETE message must be empty");
|
||||||
|
} else if (message == null || message.isBlank()) {
|
||||||
throw new IllegalArgumentException("Text message is blank");
|
throw new IllegalArgumentException("Text message is blank");
|
||||||
} else if (message == null) {
|
|
||||||
throw new IllegalArgumentException("Text message is null");
|
|
||||||
}
|
}
|
||||||
if (toBlockchainName != null || toBlockGlobalNumber != null || toBlockHash32 != null)
|
|
||||||
throw new IllegalArgumentException("POST/CHANNEL_META must not contain target fields");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (message.getBytes(StandardCharsets.UTF_8).length > 65535) throw new IllegalArgumentException("Text too long");
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override public byte[] toBytes() {
|
||||||
public byte[] toBytes() {
|
check();
|
||||||
byte[] msgUtf8 = message.getBytes(StandardCharsets.UTF_8);
|
byte[] text = message.getBytes(StandardCharsets.UTF_8);
|
||||||
if (msgUtf8.length > 65535) throw new IllegalArgumentException("Text too long (>65535 bytes)");
|
|
||||||
|
|
||||||
int st = subType & 0xFFFF;
|
int st = subType & 0xFFFF;
|
||||||
if (requiresNonBlankMessage(st) && msgUtf8.length == 0) {
|
int targetSize = 0;
|
||||||
throw new IllegalArgumentException("Text payload is empty");
|
if (st == (MsgSubType.TEXT_EDIT_POST & 0xFFFF)) targetSize = 4 + 32;
|
||||||
}
|
else if (st == (MsgSubType.TEXT_REPOST & 0xFFFF)) targetSize = BodyTargetSupport.externalSize(toLogin);
|
||||||
|
|
||||||
int cap;
|
|
||||||
if (st == (MsgSubType.TEXT_POST & 0xFFFF)
|
|
||||||
|| st == (MsgSubType.TEXT_CHANNEL_META & 0xFFFF)
|
|
||||||
|| st == (MsgSubType.TEXT_ENTRYPOINT & 0xFFFF)
|
|
||||||
|| st == (MsgSubType.TEXT_EXERCISE & 0xFFFF)
|
|
||||||
|| st == (MsgSubType.TEXT_SERVICE & 0xFFFF)
|
|
||||||
|| st == (MsgSubType.TEXT_COURSE & 0xFFFF)) {
|
|
||||||
cap = (4 + 4 + 32 + 4) + 2 + msgUtf8.length;
|
|
||||||
} else if (st == (MsgSubType.TEXT_EDIT_POST & 0xFFFF)) {
|
|
||||||
// EDIT_POST
|
|
||||||
if (toBlockGlobalNumber == null) throw new IllegalArgumentException("EDIT_POST missing toBlockGlobalNumber");
|
|
||||||
if (toBlockHash32 == null || toBlockHash32.length != 32) throw new IllegalArgumentException("EDIT_POST toBlockHash32 != 32");
|
|
||||||
cap = (4 + 4 + 32 + 4) + (4 + 32) + 2 + msgUtf8.length;
|
|
||||||
} else {
|
|
||||||
if (toBlockchainName == null) throw new IllegalArgumentException("REPOST missing toBlockchainName");
|
|
||||||
byte[] nameUtf8 = toBlockchainName.getBytes(StandardCharsets.UTF_8);
|
|
||||||
if (nameUtf8.length == 0 || nameUtf8.length > 255) {
|
|
||||||
throw new IllegalArgumentException("REPOST toBlockchainName utf8 len must be 1..255");
|
|
||||||
}
|
|
||||||
if (toBlockGlobalNumber == null) throw new IllegalArgumentException("REPOST missing toBlockGlobalNumber");
|
|
||||||
if (toBlockHash32 == null || toBlockHash32.length != 32) throw new IllegalArgumentException("REPOST toBlockHash32 != 32");
|
|
||||||
cap = (4 + 4 + 32 + 4) + (1 + nameUtf8.length + 4 + 32) + 2 + msgUtf8.length;
|
|
||||||
}
|
|
||||||
|
|
||||||
ByteBuffer bb = ByteBuffer.allocate(cap).order(ByteOrder.BIG_ENDIAN);
|
|
||||||
|
|
||||||
bb.putInt(lineCode);
|
|
||||||
bb.putInt(prevLineNumber);
|
|
||||||
bb.put(prevLineHash32 == null ? new byte[32] : Arrays.copyOf(prevLineHash32, 32));
|
|
||||||
bb.putInt(thisLineNumber);
|
|
||||||
|
|
||||||
|
ByteBuffer bb = ByteBuffer.allocate(4 + 4 + 32 + 4 + targetSize + 2 + text.length).order(ByteOrder.BIG_ENDIAN);
|
||||||
|
bb.putInt(lineCode).putInt(prevLineNumber).put(prevLineHash32).putInt(thisLineNumber);
|
||||||
if (st == (MsgSubType.TEXT_EDIT_POST & 0xFFFF)) {
|
if (st == (MsgSubType.TEXT_EDIT_POST & 0xFFFF)) {
|
||||||
bb.putInt(toBlockGlobalNumber);
|
bb.putInt(toBlockGlobalNumber).put(toBlockHash32);
|
||||||
bb.put(toBlockHash32);
|
|
||||||
} else if (st == (MsgSubType.TEXT_REPOST & 0xFFFF)) {
|
} else if (st == (MsgSubType.TEXT_REPOST & 0xFFFF)) {
|
||||||
byte[] nameUtf8 = toBlockchainName.getBytes(StandardCharsets.UTF_8);
|
BodyTargetSupport.writeExternal(bb, toLogin, toForkNumber, toBlockGlobalNumber, toBlockHash32, "REPOST");
|
||||||
bb.put((byte) nameUtf8.length);
|
|
||||||
bb.put(nameUtf8);
|
|
||||||
bb.putInt(toBlockGlobalNumber);
|
|
||||||
bb.put(toBlockHash32);
|
|
||||||
}
|
}
|
||||||
|
bb.putShort((short) text.length).put(text);
|
||||||
bb.putShort((short) msgUtf8.length);
|
|
||||||
bb.put(msgUtf8);
|
|
||||||
|
|
||||||
return bb.array();
|
return bb.array();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ====================== BodyHasLine ====================== */
|
|
||||||
@Override public int lineCode() { return lineCode; }
|
@Override public int lineCode() { return lineCode; }
|
||||||
@Override public int prevLineBlockGlobalNumber() { return prevLineNumber; }
|
@Override public int prevLineBlockGlobalNumber() { return prevLineNumber; }
|
||||||
@Override public byte[] prevLineBlockHash32() { return Arrays.copyOf(prevLineHash32, 32); }
|
@Override public byte[] prevLineBlockHash32() { return Arrays.copyOf(prevLineHash32, 32); }
|
||||||
@Override public int lineSeq() { return thisLineNumber; }
|
@Override public int lineSeq() { return thisLineNumber; }
|
||||||
|
@Override public String toLogin() { return toLogin; }
|
||||||
/* ====================== BodyHasTarget ===================== */
|
@Override public Integer toForkNumber() { return toForkNumber; }
|
||||||
@Override public String toBchName() { return toBlockchainName; }
|
|
||||||
@Override public Integer toBlockGlobalNumber() { return toBlockGlobalNumber; }
|
@Override public Integer toBlockGlobalNumber() { return toBlockGlobalNumber; }
|
||||||
@Override public byte[] toBlockHashBytes() { return toBlockHash32; }
|
@Override public byte[] toBlockHashBytes() { return toBlockHash32 == null ? null : Arrays.copyOf(toBlockHash32, 32); }
|
||||||
|
public boolean isEditPost() { return (subType & 0xFFFF) == (MsgSubType.TEXT_EDIT_POST & 0xFFFF); }
|
||||||
|
|
||||||
/* ====================== helpers ====================== */
|
private static boolean isSupportedSubType(short subType) {
|
||||||
|
int st = subType & 0xFFFF;
|
||||||
public boolean isEditPost() {
|
return st == (MsgSubType.TEXT_POST & 0xFFFF) || st == (MsgSubType.TEXT_EDIT_POST & 0xFFFF)
|
||||||
return (subType & 0xFFFF) == (MsgSubType.TEXT_EDIT_POST & 0xFFFF);
|
|| st == (MsgSubType.TEXT_REPOST & 0xFFFF) || st == (MsgSubType.TEXT_CHANNEL_META & 0xFFFF)
|
||||||
|
|| st == (MsgSubType.TEXT_CHANNEL_DELETE & 0xFFFF)
|
||||||
|
|| st == (MsgSubType.TEXT_ENTRYPOINT & 0xFFFF) || st == (MsgSubType.TEXT_EXERCISE & 0xFFFF)
|
||||||
|
|| st == (MsgSubType.TEXT_SERVICE & 0xFFFF) || st == (MsgSubType.TEXT_COURSE & 0xFFFF);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean requiresNonBlankMessage(int st) {
|
private static String readText(ByteBuffer bb, boolean allowEmpty) {
|
||||||
return st == (MsgSubType.TEXT_POST & 0xFFFF)
|
if (bb.remaining() < 2) throw new IllegalArgumentException("Text length missing");
|
||||||
|| st == (MsgSubType.TEXT_REPOST & 0xFFFF)
|
|
||||||
|| st == (MsgSubType.TEXT_ENTRYPOINT & 0xFFFF)
|
|
||||||
|| st == (MsgSubType.TEXT_EXERCISE & 0xFFFF)
|
|
||||||
|| st == (MsgSubType.TEXT_SERVICE & 0xFFFF)
|
|
||||||
|| st == (MsgSubType.TEXT_COURSE & 0xFFFF);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static String readStrictUtf8Len16(ByteBuffer bb, String fieldName, boolean allowEmpty) {
|
|
||||||
int len = Short.toUnsignedInt(bb.getShort());
|
int len = Short.toUnsignedInt(bb.getShort());
|
||||||
if (len == 0) {
|
if (len == 0) { if (allowEmpty) return ""; throw new IllegalArgumentException("Text is empty"); }
|
||||||
if (allowEmpty) return "";
|
if (bb.remaining() < len) throw new IllegalArgumentException("Text payload too short");
|
||||||
throw new IllegalArgumentException(fieldName + " is empty");
|
byte[] bytes = new byte[len]; bb.get(bytes);
|
||||||
}
|
var dec = StandardCharsets.UTF_8.newDecoder().onMalformedInput(CodingErrorAction.REPORT).onUnmappableCharacter(CodingErrorAction.REPORT);
|
||||||
if (bb.remaining() < len) throw new IllegalArgumentException(fieldName + " payload too short (len=" + len + ")");
|
try { String s = dec.decode(ByteBuffer.wrap(bytes)).toString(); if (!allowEmpty && s.isBlank()) throw new IllegalArgumentException("Text blank"); return s; }
|
||||||
|
catch (CharacterCodingException e) { throw new IllegalArgumentException("Text invalid UTF-8", e); }
|
||||||
byte[] bytes = new byte[len];
|
|
||||||
bb.get(bytes);
|
|
||||||
|
|
||||||
var decoder = StandardCharsets.UTF_8.newDecoder()
|
|
||||||
.onMalformedInput(CodingErrorAction.REPORT)
|
|
||||||
.onUnmappableCharacter(CodingErrorAction.REPORT);
|
|
||||||
|
|
||||||
try {
|
|
||||||
String s = decoder.decode(ByteBuffer.wrap(bytes)).toString();
|
|
||||||
if (!allowEmpty && s.isBlank()) throw new IllegalArgumentException(fieldName + " is blank");
|
|
||||||
return s;
|
|
||||||
} catch (CharacterCodingException e) {
|
|
||||||
throw new IllegalArgumentException(fieldName + " is not valid UTF-8", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void ensureMin(ByteBuffer bb, int need, String msg) {
|
|
||||||
if (bb.remaining() < need) throw new IllegalArgumentException(msg + " (need=" + need + ", remaining=" + bb.remaining() + ")");
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void ensureNoTail(ByteBuffer bb, String ctx) {
|
|
||||||
if (bb.remaining() != 0) throw new IllegalArgumentException("Unexpected tail bytes for " + ctx + ", remaining=" + bb.remaining());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+36
-106
@@ -10,29 +10,16 @@ import java.nio.charset.StandardCharsets;
|
|||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
/**
|
/** TEXT_RATING. External target = login + forkNumber + blockNumber + hash32. */
|
||||||
* TextRatingBody — type=1, ver=1.
|
|
||||||
*
|
|
||||||
* subType:
|
|
||||||
* - RATING (30)
|
|
||||||
*
|
|
||||||
* Формат bodyBytes (BigEndian):
|
|
||||||
* [1] toBlockchainNameLen (uint8)
|
|
||||||
* [N] toBlockchainName UTF-8
|
|
||||||
* [4] toBlockGlobalNumber
|
|
||||||
* [32] toBlockHash32
|
|
||||||
* [2] textLenBytes (uint16)
|
|
||||||
* [M] text UTF-8
|
|
||||||
*/
|
|
||||||
public final class TextRatingBody implements BodyRecord, BodyHasTarget {
|
public final class TextRatingBody implements BodyRecord, BodyHasTarget {
|
||||||
|
|
||||||
public static final short TYPE = 1;
|
public static final short TYPE = 1;
|
||||||
public static final short VER = 1;
|
public static final short VER = 1;
|
||||||
public static final int KEY = ((TYPE & 0xFFFF) << 16) | (VER & 0xFFFF);
|
public static final int KEY = ((TYPE & 0xFFFF) << 16) | (VER & 0xFFFF);
|
||||||
|
|
||||||
public final short subType;
|
public final short subType;
|
||||||
public final short version;
|
public final short version;
|
||||||
public final String toBlockchainName;
|
public final String toLogin;
|
||||||
|
public final int toForkNumber;
|
||||||
public final int toBlockGlobalNumber;
|
public final int toBlockGlobalNumber;
|
||||||
public final byte[] toBlockHash32;
|
public final byte[] toBlockHash32;
|
||||||
public final String message;
|
public final String message;
|
||||||
@@ -41,117 +28,60 @@ public final class TextRatingBody implements BodyRecord, BodyHasTarget {
|
|||||||
Objects.requireNonNull(bodyBytes, "bodyBytes == null");
|
Objects.requireNonNull(bodyBytes, "bodyBytes == null");
|
||||||
this.subType = subType;
|
this.subType = subType;
|
||||||
this.version = version;
|
this.version = version;
|
||||||
|
if ((version & 0xFFFF) != (VER & 0xFFFF)) throw new IllegalArgumentException("TextRatingBody version must be 1");
|
||||||
if ((version & 0xFFFF) != (VER & 0xFFFF)) {
|
if ((subType & 0xFFFF) != (MsgSubType.TEXT_RATING & 0xFFFF)) throw new IllegalArgumentException("TextRatingBody supports only TEXT_RATING");
|
||||||
throw new IllegalArgumentException("TextRatingBody version must be 1, got=" + (version & 0xFFFF));
|
|
||||||
}
|
|
||||||
if ((subType & 0xFFFF) != (MsgSubType.TEXT_RATING & 0xFFFF)) {
|
|
||||||
throw new IllegalArgumentException("TextRatingBody supports only TEXT_RATING");
|
|
||||||
}
|
|
||||||
|
|
||||||
ByteBuffer bb = ByteBuffer.wrap(bodyBytes).order(ByteOrder.BIG_ENDIAN);
|
ByteBuffer bb = ByteBuffer.wrap(bodyBytes).order(ByteOrder.BIG_ENDIAN);
|
||||||
ensureMin(bb, 1 + 1 + 4 + 32 + 2, "RATING too short");
|
BodyTargetSupport.ExternalTarget t = BodyTargetSupport.readExternal(bb, "RATING", 2);
|
||||||
|
this.toLogin = t.login();
|
||||||
int nameLen = Byte.toUnsignedInt(bb.get());
|
this.toForkNumber = t.forkNumber();
|
||||||
if (nameLen <= 0) throw new IllegalArgumentException("RATING toBlockchainNameLen is 0");
|
this.toBlockGlobalNumber = t.blockNumber();
|
||||||
ensureMin(bb, nameLen + 4 + 32 + 2, "RATING payload too short");
|
this.toBlockHash32 = t.blockHash32();
|
||||||
|
this.message = readText(bb);
|
||||||
byte[] nameBytes = new byte[nameLen];
|
if (bb.hasRemaining()) throw new IllegalArgumentException("Unexpected RATING tail");
|
||||||
bb.get(nameBytes);
|
|
||||||
this.toBlockchainName = new String(nameBytes, StandardCharsets.UTF_8);
|
|
||||||
this.toBlockGlobalNumber = bb.getInt();
|
|
||||||
this.toBlockHash32 = new byte[32];
|
|
||||||
bb.get(this.toBlockHash32);
|
|
||||||
this.message = readStrictUtf8Len16(bb, "TextRatingBody text");
|
|
||||||
|
|
||||||
ensureNoTail(bb, "TextRatingBody");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public TextRatingBody(String toBlockchainName, int toBlockGlobalNumber, byte[] toBlockHash32, String message) {
|
public TextRatingBody(String toLogin, int toForkNumber, int toBlockGlobalNumber, byte[] toBlockHash32, String message) {
|
||||||
Objects.requireNonNull(toBlockchainName, "toBlockchainName == null");
|
|
||||||
Objects.requireNonNull(toBlockHash32, "toBlockHash32 == null");
|
|
||||||
Objects.requireNonNull(message, "message == null");
|
Objects.requireNonNull(message, "message == null");
|
||||||
if (toBlockchainName.isBlank()) throw new IllegalArgumentException("toBlockchainName is blank");
|
|
||||||
if (toBlockGlobalNumber < 0) throw new IllegalArgumentException("toBlockGlobalNumber < 0");
|
|
||||||
if (toBlockHash32.length != 32) throw new IllegalArgumentException("toBlockHash32 != 32");
|
|
||||||
if (message.isBlank()) throw new IllegalArgumentException("message is blank");
|
if (message.isBlank()) throw new IllegalArgumentException("message is blank");
|
||||||
|
BodyTargetSupport.validateExternal(toLogin, toForkNumber, toBlockGlobalNumber, toBlockHash32, "RATING");
|
||||||
this.subType = MsgSubType.TEXT_RATING;
|
this.subType = MsgSubType.TEXT_RATING;
|
||||||
this.version = VER;
|
this.version = VER;
|
||||||
this.toBlockchainName = toBlockchainName;
|
this.toLogin = toLogin;
|
||||||
|
this.toForkNumber = toForkNumber;
|
||||||
this.toBlockGlobalNumber = toBlockGlobalNumber;
|
this.toBlockGlobalNumber = toBlockGlobalNumber;
|
||||||
this.toBlockHash32 = Arrays.copyOf(toBlockHash32, 32);
|
this.toBlockHash32 = Arrays.copyOf(toBlockHash32, 32);
|
||||||
this.message = message;
|
this.message = message;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override public TextRatingBody check() {
|
||||||
public TextRatingBody check() {
|
if ((subType & 0xFFFF) != (MsgSubType.TEXT_RATING & 0xFFFF)) throw new IllegalArgumentException("Bad RATING subType");
|
||||||
if ((subType & 0xFFFF) != (MsgSubType.TEXT_RATING & 0xFFFF)) {
|
BodyTargetSupport.validateExternal(toLogin, toForkNumber, toBlockGlobalNumber, toBlockHash32, "RATING");
|
||||||
throw new IllegalArgumentException("Bad TextRatingBody subType: " + (subType & 0xFFFF));
|
|
||||||
}
|
|
||||||
if (toBlockchainName == null || toBlockchainName.isBlank()) {
|
|
||||||
throw new IllegalArgumentException("RATING toBlockchainName is blank");
|
|
||||||
}
|
|
||||||
if (toBlockGlobalNumber < 0) throw new IllegalArgumentException("toBlockGlobalNumber < 0");
|
|
||||||
if (toBlockHash32 == null || toBlockHash32.length != 32) {
|
|
||||||
throw new IllegalArgumentException("toBlockHash32 invalid");
|
|
||||||
}
|
|
||||||
if (message == null || message.isBlank()) throw new IllegalArgumentException("message is blank");
|
if (message == null || message.isBlank()) throw new IllegalArgumentException("message is blank");
|
||||||
|
if (message.getBytes(StandardCharsets.UTF_8).length > 65535) throw new IllegalArgumentException("Text too long");
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override public byte[] toBytes() {
|
||||||
public byte[] toBytes() {
|
check();
|
||||||
byte[] msgUtf8 = message.getBytes(StandardCharsets.UTF_8);
|
byte[] text = message.getBytes(StandardCharsets.UTF_8);
|
||||||
if (msgUtf8.length == 0) throw new IllegalArgumentException("Text payload is empty");
|
ByteBuffer bb = ByteBuffer.allocate(BodyTargetSupport.externalSize(toLogin) + 2 + text.length).order(ByteOrder.BIG_ENDIAN);
|
||||||
if (msgUtf8.length > 65535) throw new IllegalArgumentException("Text too long (>65535 bytes)");
|
BodyTargetSupport.writeExternal(bb, toLogin, toForkNumber, toBlockGlobalNumber, toBlockHash32, "RATING");
|
||||||
|
bb.putShort((short) text.length).put(text);
|
||||||
byte[] nameUtf8 = toBlockchainName.getBytes(StandardCharsets.UTF_8);
|
|
||||||
if (nameUtf8.length == 0 || nameUtf8.length > 255) {
|
|
||||||
throw new IllegalArgumentException("RATING toBlockchainName utf8 len must be 1..255");
|
|
||||||
}
|
|
||||||
|
|
||||||
ByteBuffer bb = ByteBuffer.allocate(1 + nameUtf8.length + 4 + 32 + 2 + msgUtf8.length)
|
|
||||||
.order(ByteOrder.BIG_ENDIAN);
|
|
||||||
bb.put((byte) nameUtf8.length);
|
|
||||||
bb.put(nameUtf8);
|
|
||||||
bb.putInt(toBlockGlobalNumber);
|
|
||||||
bb.put(toBlockHash32);
|
|
||||||
bb.putShort((short) msgUtf8.length);
|
|
||||||
bb.put(msgUtf8);
|
|
||||||
return bb.array();
|
return bb.array();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override public String toBchName() { return toBlockchainName; }
|
@Override public String toLogin() { return toLogin; }
|
||||||
|
@Override public Integer toForkNumber() { return toForkNumber; }
|
||||||
@Override public Integer toBlockGlobalNumber() { return toBlockGlobalNumber; }
|
@Override public Integer toBlockGlobalNumber() { return toBlockGlobalNumber; }
|
||||||
@Override public byte[] toBlockHashBytes() { return toBlockHash32; }
|
@Override public byte[] toBlockHashBytes() { return Arrays.copyOf(toBlockHash32, 32); }
|
||||||
|
|
||||||
private static String readStrictUtf8Len16(ByteBuffer bb, String fieldName) {
|
private static String readText(ByteBuffer bb) {
|
||||||
|
if (bb.remaining() < 2) throw new IllegalArgumentException("RATING text length missing");
|
||||||
int len = Short.toUnsignedInt(bb.getShort());
|
int len = Short.toUnsignedInt(bb.getShort());
|
||||||
if (len == 0) throw new IllegalArgumentException(fieldName + " is empty");
|
if (len <= 0 || bb.remaining() < len) throw new IllegalArgumentException("RATING text invalid");
|
||||||
if (bb.remaining() < len) throw new IllegalArgumentException(fieldName + " payload too short (len=" + len + ")");
|
byte[] bytes = new byte[len]; bb.get(bytes);
|
||||||
|
var dec = StandardCharsets.UTF_8.newDecoder().onMalformedInput(CodingErrorAction.REPORT).onUnmappableCharacter(CodingErrorAction.REPORT);
|
||||||
byte[] bytes = new byte[len];
|
try { String s = dec.decode(ByteBuffer.wrap(bytes)).toString(); if (s.isBlank()) throw new IllegalArgumentException("RATING text blank"); return s; }
|
||||||
bb.get(bytes);
|
catch (CharacterCodingException e) { throw new IllegalArgumentException("RATING text invalid UTF-8", e); }
|
||||||
|
|
||||||
var decoder = StandardCharsets.UTF_8.newDecoder()
|
|
||||||
.onMalformedInput(CodingErrorAction.REPORT)
|
|
||||||
.onUnmappableCharacter(CodingErrorAction.REPORT);
|
|
||||||
|
|
||||||
try {
|
|
||||||
String s = decoder.decode(ByteBuffer.wrap(bytes)).toString();
|
|
||||||
if (s.isBlank()) throw new IllegalArgumentException(fieldName + " is blank");
|
|
||||||
return s;
|
|
||||||
} catch (CharacterCodingException e) {
|
|
||||||
throw new IllegalArgumentException(fieldName + " is not valid UTF-8", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void ensureMin(ByteBuffer bb, int need, String msg) {
|
|
||||||
if (bb.remaining() < need) throw new IllegalArgumentException(msg + " (need=" + need + ", remaining=" + bb.remaining() + ")");
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void ensureNoTail(ByteBuffer bb, String ctx) {
|
|
||||||
if (bb.remaining() != 0) throw new IllegalArgumentException("Unexpected tail bytes for " + ctx + ", remaining=" + bb.remaining());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+60
-190
@@ -11,241 +11,111 @@ import java.util.Arrays;
|
|||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* TextReplyBody — type=1, ver=1.
|
* TEXT_REPLY / TEXT_EDIT_REPLY.
|
||||||
*
|
* REPLY external target: login + forkNumber + blockNumber + hash32.
|
||||||
* subType:
|
* EDIT_REPLY compact own-chain target: blockNumber + hash32.
|
||||||
* - REPLY (20)
|
|
||||||
* - EDIT_REPLY (21)
|
|
||||||
*
|
|
||||||
* Форматы bodyBytes (BigEndian):
|
|
||||||
*
|
|
||||||
* REPLY:
|
|
||||||
* [1] toBlockchainNameLen (uint8)
|
|
||||||
* [N] toBlockchainName UTF-8
|
|
||||||
* [4] toBlockGlobalNumber
|
|
||||||
* [32] toBlockHash32
|
|
||||||
* [2] textLenBytes (uint16)
|
|
||||||
* [M] text UTF-8
|
|
||||||
*
|
|
||||||
* EDIT_REPLY:
|
|
||||||
* [4] toBlockGlobalNumber
|
|
||||||
* [32] toBlockHash32
|
|
||||||
* [2] textLenBytes (uint16)
|
|
||||||
* [N] text UTF-8
|
|
||||||
*/
|
*/
|
||||||
public final class TextReplyBody implements BodyRecord, BodyHasTarget {
|
public final class TextReplyBody implements BodyRecord, BodyHasTarget {
|
||||||
|
|
||||||
public static final short TYPE = 1;
|
public static final short TYPE = 1;
|
||||||
public static final short VER = 1;
|
public static final short VER = 1;
|
||||||
|
|
||||||
public static final int KEY = ((TYPE & 0xFFFF) << 16) | (VER & 0xFFFF);
|
public static final int KEY = ((TYPE & 0xFFFF) << 16) | (VER & 0xFFFF);
|
||||||
|
|
||||||
public final short subType; // из header
|
public final short subType;
|
||||||
public final short version; // (=1)
|
public final short version;
|
||||||
|
public final String toLogin;
|
||||||
// target
|
public final Integer toForkNumber;
|
||||||
public final String toBlockchainName; // nullable для EDIT_REPLY
|
|
||||||
public final int toBlockGlobalNumber;
|
public final int toBlockGlobalNumber;
|
||||||
public final byte[] toBlockHash32; // 32
|
public final byte[] toBlockHash32;
|
||||||
|
|
||||||
// text
|
|
||||||
public final String message;
|
public final String message;
|
||||||
|
|
||||||
public TextReplyBody(short subType, short version, byte[] bodyBytes) {
|
public TextReplyBody(short subType, short version, byte[] bodyBytes) {
|
||||||
Objects.requireNonNull(bodyBytes, "bodyBytes == null");
|
Objects.requireNonNull(bodyBytes, "bodyBytes == null");
|
||||||
|
|
||||||
this.subType = subType;
|
this.subType = subType;
|
||||||
this.version = version;
|
this.version = version;
|
||||||
|
if ((version & 0xFFFF) != (VER & 0xFFFF)) throw new IllegalArgumentException("TextReplyBody version must be 1");
|
||||||
if ((this.version & 0xFFFF) != (VER & 0xFFFF)) {
|
int st = subType & 0xFFFF;
|
||||||
throw new IllegalArgumentException("TextReplyBody version must be 1, got=" + (this.version & 0xFFFF));
|
if (st != (MsgSubType.TEXT_REPLY & 0xFFFF) && st != (MsgSubType.TEXT_EDIT_REPLY & 0xFFFF)) throw new IllegalArgumentException("Bad reply subtype");
|
||||||
}
|
|
||||||
|
|
||||||
int st = this.subType & 0xFFFF;
|
|
||||||
if (st != (MsgSubType.TEXT_REPLY & 0xFFFF) && st != (MsgSubType.TEXT_EDIT_REPLY & 0xFFFF)) {
|
|
||||||
throw new IllegalArgumentException("TextReplyBody supports only REPLY/EDIT_REPLY, got subType=" + st);
|
|
||||||
}
|
|
||||||
|
|
||||||
ByteBuffer bb = ByteBuffer.wrap(bodyBytes).order(ByteOrder.BIG_ENDIAN);
|
ByteBuffer bb = ByteBuffer.wrap(bodyBytes).order(ByteOrder.BIG_ENDIAN);
|
||||||
|
|
||||||
if (st == (MsgSubType.TEXT_REPLY & 0xFFFF)) {
|
if (st == (MsgSubType.TEXT_REPLY & 0xFFFF)) {
|
||||||
// минимум: nameLen[1]+name[1]+global[4]+hash[32]+textLen[2]
|
BodyTargetSupport.ExternalTarget t = BodyTargetSupport.readExternal(bb, "REPLY", 2);
|
||||||
ensureMin(bb, 1 + 1 + 4 + 32 + 2, "REPLY too short");
|
this.toLogin = t.login();
|
||||||
|
this.toForkNumber = t.forkNumber();
|
||||||
int nameLen = Byte.toUnsignedInt(bb.get());
|
this.toBlockGlobalNumber = t.blockNumber();
|
||||||
if (nameLen <= 0) throw new IllegalArgumentException("REPLY toBlockchainNameLen is 0");
|
this.toBlockHash32 = t.blockHash32();
|
||||||
ensureMin(bb, nameLen + 4 + 32 + 2, "REPLY payload too short");
|
|
||||||
|
|
||||||
byte[] nameBytes = new byte[nameLen];
|
|
||||||
bb.get(nameBytes);
|
|
||||||
this.toBlockchainName = new String(nameBytes, StandardCharsets.UTF_8);
|
|
||||||
|
|
||||||
this.toBlockGlobalNumber = bb.getInt();
|
|
||||||
|
|
||||||
this.toBlockHash32 = new byte[32];
|
|
||||||
bb.get(this.toBlockHash32);
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// EDIT_REPLY: target без имени
|
BodyTargetSupport.ensureMin(bb, 4 + 32 + 2, "EDIT_REPLY too short");
|
||||||
ensureMin(bb, (4 + 32) + 2, "EDIT_REPLY too short");
|
this.toLogin = null;
|
||||||
|
this.toForkNumber = null;
|
||||||
this.toBlockchainName = null;
|
|
||||||
this.toBlockGlobalNumber = bb.getInt();
|
this.toBlockGlobalNumber = bb.getInt();
|
||||||
|
|
||||||
this.toBlockHash32 = new byte[32];
|
this.toBlockHash32 = new byte[32];
|
||||||
bb.get(this.toBlockHash32);
|
bb.get(this.toBlockHash32);
|
||||||
|
BodyTargetSupport.validateCompact(this.toBlockGlobalNumber, this.toBlockHash32, "EDIT_REPLY");
|
||||||
}
|
}
|
||||||
|
this.message = readText(bb, st == (MsgSubType.TEXT_EDIT_REPLY & 0xFFFF));
|
||||||
this.message = readStrictUtf8Len16(bb, "TextReplyBody text", st == (MsgSubType.TEXT_EDIT_REPLY & 0xFFFF));
|
if (bb.hasRemaining()) throw new IllegalArgumentException("Unexpected TextReplyBody tail");
|
||||||
ensureNoTail(bb, "TextReplyBody");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public TextReplyBody(short subType,
|
public TextReplyBody(short subType, String toLogin, Integer toForkNumber, int toBlockGlobalNumber, byte[] toBlockHash32, String message) {
|
||||||
int toBlockGlobalNumber,
|
|
||||||
byte[] toBlockHash32,
|
|
||||||
String toBlockchainName,
|
|
||||||
String message) {
|
|
||||||
|
|
||||||
Objects.requireNonNull(message, "message == null");
|
Objects.requireNonNull(message, "message == null");
|
||||||
Objects.requireNonNull(toBlockHash32, "toBlockHash32 == null");
|
|
||||||
|
|
||||||
int st = subType & 0xFFFF;
|
int st = subType & 0xFFFF;
|
||||||
if (st != (MsgSubType.TEXT_REPLY & 0xFFFF) && st != (MsgSubType.TEXT_EDIT_REPLY & 0xFFFF)) {
|
if (st != (MsgSubType.TEXT_REPLY & 0xFFFF) && st != (MsgSubType.TEXT_EDIT_REPLY & 0xFFFF)) throw new IllegalArgumentException("Bad reply subtype");
|
||||||
throw new IllegalArgumentException("TextReplyBody supports only REPLY/EDIT_REPLY");
|
|
||||||
}
|
|
||||||
if (st == (MsgSubType.TEXT_REPLY & 0xFFFF) && message.isBlank()) {
|
|
||||||
throw new IllegalArgumentException("message is blank");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (toBlockGlobalNumber < 0) throw new IllegalArgumentException("toBlockGlobalNumber < 0");
|
|
||||||
if (toBlockHash32.length != 32) throw new IllegalArgumentException("toBlockHash32 != 32");
|
|
||||||
|
|
||||||
if (st == (MsgSubType.TEXT_REPLY & 0xFFFF)) {
|
if (st == (MsgSubType.TEXT_REPLY & 0xFFFF)) {
|
||||||
Objects.requireNonNull(toBlockchainName, "toBlockchainName == null");
|
if (message.isBlank()) throw new IllegalArgumentException("REPLY message is blank");
|
||||||
if (toBlockchainName.isBlank()) throw new IllegalArgumentException("toBlockchainName is blank");
|
BodyTargetSupport.validateExternal(toLogin, toForkNumber, toBlockGlobalNumber, toBlockHash32, "REPLY");
|
||||||
this.toBlockchainName = toBlockchainName;
|
|
||||||
} else {
|
} else {
|
||||||
// EDIT_REPLY: имя не хранить
|
if (toLogin != null || toForkNumber != null) throw new IllegalArgumentException("EDIT_REPLY must not contain login/fork target");
|
||||||
this.toBlockchainName = null;
|
BodyTargetSupport.validateCompact(toBlockGlobalNumber, toBlockHash32, "EDIT_REPLY");
|
||||||
}
|
}
|
||||||
|
|
||||||
this.subType = subType;
|
this.subType = subType;
|
||||||
this.version = VER;
|
this.version = VER;
|
||||||
|
this.toLogin = toLogin;
|
||||||
|
this.toForkNumber = toForkNumber;
|
||||||
this.toBlockGlobalNumber = toBlockGlobalNumber;
|
this.toBlockGlobalNumber = toBlockGlobalNumber;
|
||||||
this.toBlockHash32 = Arrays.copyOf(toBlockHash32, 32);
|
this.toBlockHash32 = Arrays.copyOf(toBlockHash32, 32);
|
||||||
|
|
||||||
this.message = message;
|
this.message = message;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override public TextReplyBody check() {
|
||||||
public TextReplyBody check() {
|
|
||||||
int st = subType & 0xFFFF;
|
int st = subType & 0xFFFF;
|
||||||
if (st != (MsgSubType.TEXT_REPLY & 0xFFFF) && st != (MsgSubType.TEXT_EDIT_REPLY & 0xFFFF))
|
|
||||||
throw new IllegalArgumentException("Bad TextReplyBody subType: " + st);
|
|
||||||
|
|
||||||
if (toBlockGlobalNumber < 0)
|
|
||||||
throw new IllegalArgumentException("toBlockGlobalNumber < 0");
|
|
||||||
if (toBlockHash32 == null || toBlockHash32.length != 32)
|
|
||||||
throw new IllegalArgumentException("toBlockHash32 invalid");
|
|
||||||
|
|
||||||
if (st == (MsgSubType.TEXT_REPLY & 0xFFFF)) {
|
if (st == (MsgSubType.TEXT_REPLY & 0xFFFF)) {
|
||||||
if (message == null || message.isBlank())
|
BodyTargetSupport.validateExternal(toLogin, toForkNumber, toBlockGlobalNumber, toBlockHash32, "REPLY");
|
||||||
throw new IllegalArgumentException("Text message is blank");
|
if (message == null || message.isBlank()) throw new IllegalArgumentException("REPLY message is blank");
|
||||||
if (toBlockchainName == null || toBlockchainName.isBlank())
|
} else if (st == (MsgSubType.TEXT_EDIT_REPLY & 0xFFFF)) {
|
||||||
throw new IllegalArgumentException("REPLY toBlockchainName is blank");
|
if (toLogin != null || toForkNumber != null) throw new IllegalArgumentException("EDIT_REPLY must not contain login/fork target");
|
||||||
} else {
|
BodyTargetSupport.validateCompact(toBlockGlobalNumber, toBlockHash32, "EDIT_REPLY");
|
||||||
if (message == null) throw new IllegalArgumentException("EDIT_REPLY message is null");
|
if (message == null) throw new IllegalArgumentException("EDIT_REPLY message is null");
|
||||||
if (toBlockchainName != null)
|
} else throw new IllegalArgumentException("Bad reply subtype");
|
||||||
throw new IllegalArgumentException("EDIT_REPLY must not contain toBlockchainName");
|
if (message.getBytes(StandardCharsets.UTF_8).length > 65535) throw new IllegalArgumentException("Text too long");
|
||||||
}
|
|
||||||
|
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override public byte[] toBytes() {
|
||||||
public byte[] toBytes() {
|
check();
|
||||||
byte[] msgUtf8 = message.getBytes(StandardCharsets.UTF_8);
|
byte[] text = message.getBytes(StandardCharsets.UTF_8);
|
||||||
if (msgUtf8.length > 65535) throw new IllegalArgumentException("Text too long (>65535 bytes)");
|
boolean reply = (subType & 0xFFFF) == (MsgSubType.TEXT_REPLY & 0xFFFF);
|
||||||
|
int targetSize = reply ? BodyTargetSupport.externalSize(toLogin) : 4 + 32;
|
||||||
int st = subType & 0xFFFF;
|
ByteBuffer bb = ByteBuffer.allocate(targetSize + 2 + text.length).order(ByteOrder.BIG_ENDIAN);
|
||||||
if (st == (MsgSubType.TEXT_REPLY & 0xFFFF) && msgUtf8.length == 0) {
|
if (reply) BodyTargetSupport.writeExternal(bb, toLogin, toForkNumber, toBlockGlobalNumber, toBlockHash32, "REPLY");
|
||||||
throw new IllegalArgumentException("Text payload is empty");
|
else bb.putInt(toBlockGlobalNumber).put(toBlockHash32);
|
||||||
}
|
bb.putShort((short) text.length).put(text);
|
||||||
|
|
||||||
if (st == (MsgSubType.TEXT_REPLY & 0xFFFF)) {
|
|
||||||
if (toBlockchainName == null) throw new IllegalArgumentException("REPLY missing toBlockchainName");
|
|
||||||
|
|
||||||
byte[] nameUtf8 = toBlockchainName.getBytes(StandardCharsets.UTF_8);
|
|
||||||
if (nameUtf8.length == 0 || nameUtf8.length > 255)
|
|
||||||
throw new IllegalArgumentException("REPLY toBlockchainName utf8 len must be 1..255");
|
|
||||||
|
|
||||||
int cap = 1 + nameUtf8.length + 4 + 32 + 2 + msgUtf8.length;
|
|
||||||
|
|
||||||
ByteBuffer bb = ByteBuffer.allocate(cap).order(ByteOrder.BIG_ENDIAN);
|
|
||||||
bb.put((byte) nameUtf8.length);
|
|
||||||
bb.put(nameUtf8);
|
|
||||||
bb.putInt(toBlockGlobalNumber);
|
|
||||||
bb.put(toBlockHash32);
|
|
||||||
bb.putShort((short) msgUtf8.length);
|
|
||||||
bb.put(msgUtf8);
|
|
||||||
|
|
||||||
return bb.array();
|
|
||||||
}
|
|
||||||
|
|
||||||
// EDIT_REPLY
|
|
||||||
int cap = (4 + 32) + 2 + msgUtf8.length;
|
|
||||||
|
|
||||||
ByteBuffer bb = ByteBuffer.allocate(cap).order(ByteOrder.BIG_ENDIAN);
|
|
||||||
bb.putInt(toBlockGlobalNumber);
|
|
||||||
bb.put(toBlockHash32);
|
|
||||||
bb.putShort((short) msgUtf8.length);
|
|
||||||
bb.put(msgUtf8);
|
|
||||||
|
|
||||||
return bb.array();
|
return bb.array();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ====================== BodyHasTarget ====================== */
|
@Override public String toLogin() { return toLogin; }
|
||||||
|
@Override public Integer toForkNumber() { return toForkNumber; }
|
||||||
@Override public String toBchName() { return toBlockchainName; }
|
|
||||||
@Override public Integer toBlockGlobalNumber() { return toBlockGlobalNumber; }
|
@Override public Integer toBlockGlobalNumber() { return toBlockGlobalNumber; }
|
||||||
@Override public byte[] toBlockHashBytes() { return toBlockHash32; }
|
@Override public byte[] toBlockHashBytes() { return Arrays.copyOf(toBlockHash32, 32); }
|
||||||
|
public boolean isEditReply() { return (subType & 0xFFFF) == (MsgSubType.TEXT_EDIT_REPLY & 0xFFFF); }
|
||||||
|
|
||||||
public boolean isEditReply() {
|
private static String readText(ByteBuffer bb, boolean allowEmpty) {
|
||||||
return (subType & 0xFFFF) == (MsgSubType.TEXT_EDIT_REPLY & 0xFFFF);
|
if (bb.remaining() < 2) throw new IllegalArgumentException("Text length missing");
|
||||||
}
|
|
||||||
|
|
||||||
/* ====================== helpers ====================== */
|
|
||||||
|
|
||||||
private static String readStrictUtf8Len16(ByteBuffer bb, String fieldName, boolean allowEmpty) {
|
|
||||||
int len = Short.toUnsignedInt(bb.getShort());
|
int len = Short.toUnsignedInt(bb.getShort());
|
||||||
if (len == 0) {
|
if (len == 0) { if (allowEmpty) return ""; throw new IllegalArgumentException("Text is empty"); }
|
||||||
if (allowEmpty) return "";
|
if (bb.remaining() < len) throw new IllegalArgumentException("Text payload too short");
|
||||||
throw new IllegalArgumentException(fieldName + " is empty");
|
byte[] bytes = new byte[len]; bb.get(bytes);
|
||||||
}
|
var dec = StandardCharsets.UTF_8.newDecoder().onMalformedInput(CodingErrorAction.REPORT).onUnmappableCharacter(CodingErrorAction.REPORT);
|
||||||
if (bb.remaining() < len) throw new IllegalArgumentException(fieldName + " payload too short (len=" + len + ")");
|
try { String s = dec.decode(ByteBuffer.wrap(bytes)).toString(); if (!allowEmpty && s.isBlank()) throw new IllegalArgumentException("Text is blank"); return s; }
|
||||||
|
catch (CharacterCodingException e) { throw new IllegalArgumentException("Text invalid UTF-8", e); }
|
||||||
byte[] bytes = new byte[len];
|
|
||||||
bb.get(bytes);
|
|
||||||
|
|
||||||
var decoder = StandardCharsets.UTF_8.newDecoder()
|
|
||||||
.onMalformedInput(CodingErrorAction.REPORT)
|
|
||||||
.onUnmappableCharacter(CodingErrorAction.REPORT);
|
|
||||||
|
|
||||||
try {
|
|
||||||
String s = decoder.decode(ByteBuffer.wrap(bytes)).toString();
|
|
||||||
if (!allowEmpty && s.isBlank()) throw new IllegalArgumentException(fieldName + " is blank");
|
|
||||||
return s;
|
|
||||||
} catch (CharacterCodingException e) {
|
|
||||||
throw new IllegalArgumentException(fieldName + " is not valid UTF-8", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void ensureMin(ByteBuffer bb, int need, String msg) {
|
|
||||||
if (bb.remaining() < need) throw new IllegalArgumentException(msg + " (need=" + need + ", remaining=" + bb.remaining() + ")");
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void ensureNoTail(ByteBuffer bb, String ctx) {
|
|
||||||
if (bb.remaining() != 0) throw new IllegalArgumentException("Unexpected tail bytes for " + ctx + ", remaining=" + bb.remaining());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+38
-64
@@ -11,16 +11,16 @@ import java.util.Arrays;
|
|||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* UserParamBody — type=4, ver=1 (в заголовке блока).
|
* UserParamBody — type=4, ver=1 (в документации: USER_PROFILE).
|
||||||
*
|
*
|
||||||
* subType (в заголовке блока):
|
* subType (в заголовке блока):
|
||||||
* 1 = TEXT_TEXT
|
* 1 = TEXT_TEXT
|
||||||
*
|
*
|
||||||
* bodyBytes (BigEndian), новый формат:
|
* USER_PROFILE имеет единственную фиксированную линию, поэтому lineCode в body не хранится.
|
||||||
* [4] lineCode
|
* bodyBytes (BigEndian):
|
||||||
* [4] prevLineNumber
|
* [4] prevProfileBlockNumber — GLOBAL blockNumber предыдущего USER_PROFILE-блока
|
||||||
* [32] prevLineHash32
|
* [32] prevProfileBlockHash32 — hash32 предыдущего USER_PROFILE-блока
|
||||||
* [4] thisLineNumber
|
* [4] profileSequence — порядковый номер изменения профиля (1..N)
|
||||||
*
|
*
|
||||||
* [2] keyLenBytes (uint16)
|
* [2] keyLenBytes (uint16)
|
||||||
* [N] keyUtf8
|
* [N] keyUtf8
|
||||||
@@ -35,14 +35,12 @@ public final class UserParamBody implements BodyRecord, BodyHasLine {
|
|||||||
|
|
||||||
public static final int KEY = ((TYPE & 0xFFFF) << 16) | (VER & 0xFFFF);
|
public static final int KEY = ((TYPE & 0xFFFF) << 16) | (VER & 0xFFFF);
|
||||||
|
|
||||||
public final short subType; // из header
|
public final short subType;
|
||||||
public final short version; // из header
|
public final short version;
|
||||||
|
|
||||||
// line
|
public final int prevProfileBlockNumber;
|
||||||
public final int lineCode;
|
public final byte[] prevProfileBlockHash32;
|
||||||
public final int prevLineNumber;
|
public final int profileSequence;
|
||||||
public final byte[] prevLineHash32;
|
|
||||||
public final int thisLineNumber;
|
|
||||||
|
|
||||||
public final String paramKey;
|
public final String paramKey;
|
||||||
public final String paramValue;
|
public final String paramValue;
|
||||||
@@ -60,21 +58,17 @@ public final class UserParamBody implements BodyRecord, BodyHasLine {
|
|||||||
throw new IllegalArgumentException("Bad UserParam subType: " + (this.subType & 0xFFFF));
|
throw new IllegalArgumentException("Bad UserParam subType: " + (this.subType & 0xFFFF));
|
||||||
}
|
}
|
||||||
|
|
||||||
// минимум: lineCode(4)+line(4+32+4) + keyLen(2)+key(1) + valLen(2)+val(1)
|
// prevGlobal(4)+prevHash(32)+seq(4) + keyLen(2)+key(1) + valLen(2)+val(1)
|
||||||
if (bodyBytes.length < 4 + (4 + 32 + 4) + 2 + 1 + 2 + 1) {
|
if (bodyBytes.length < 4 + 32 + 4 + 2 + 1 + 2 + 1) {
|
||||||
throw new IllegalArgumentException("UserParamBody too short");
|
throw new IllegalArgumentException("UserParamBody too short");
|
||||||
}
|
}
|
||||||
|
|
||||||
ByteBuffer bb = ByteBuffer.wrap(bodyBytes).order(ByteOrder.BIG_ENDIAN);
|
ByteBuffer bb = ByteBuffer.wrap(bodyBytes).order(ByteOrder.BIG_ENDIAN);
|
||||||
|
|
||||||
this.lineCode = bb.getInt();
|
this.prevProfileBlockNumber = bb.getInt();
|
||||||
|
this.prevProfileBlockHash32 = new byte[32];
|
||||||
this.prevLineNumber = bb.getInt();
|
bb.get(this.prevProfileBlockHash32);
|
||||||
|
this.profileSequence = bb.getInt();
|
||||||
this.prevLineHash32 = new byte[32];
|
|
||||||
bb.get(this.prevLineHash32);
|
|
||||||
|
|
||||||
this.thisLineNumber = bb.getInt();
|
|
||||||
|
|
||||||
int keyLen = Short.toUnsignedInt(bb.getShort());
|
int keyLen = Short.toUnsignedInt(bb.getShort());
|
||||||
if (keyLen <= 0) throw new IllegalArgumentException("paramKeyLen is 0");
|
if (keyLen <= 0) throw new IllegalArgumentException("paramKeyLen is 0");
|
||||||
@@ -99,25 +93,21 @@ public final class UserParamBody implements BodyRecord, BodyHasLine {
|
|||||||
if (this.paramValue.isBlank()) throw new IllegalArgumentException("paramValue is blank");
|
if (this.paramValue.isBlank()) throw new IllegalArgumentException("paramValue is blank");
|
||||||
}
|
}
|
||||||
|
|
||||||
public UserParamBody(int lineCode,
|
public UserParamBody(int prevProfileBlockNumber,
|
||||||
int prevLineNumber,
|
byte[] prevProfileBlockHash32,
|
||||||
byte[] prevLineHash32,
|
int profileSequence,
|
||||||
int thisLineNumber,
|
|
||||||
String paramKey,
|
String paramKey,
|
||||||
String paramValue) {
|
String paramValue) {
|
||||||
|
|
||||||
Objects.requireNonNull(paramKey, "paramKey == null");
|
Objects.requireNonNull(paramKey, "paramKey == null");
|
||||||
Objects.requireNonNull(paramValue, "paramValue == null");
|
Objects.requireNonNull(paramValue, "paramValue == null");
|
||||||
|
|
||||||
if (lineCode < 0) throw new IllegalArgumentException("lineCode < 0");
|
|
||||||
|
|
||||||
this.subType = MsgSubType.USER_PARAM_TEXT_TEXT;
|
this.subType = MsgSubType.USER_PARAM_TEXT_TEXT;
|
||||||
this.version = VER;
|
this.version = VER;
|
||||||
|
|
||||||
this.lineCode = lineCode;
|
this.prevProfileBlockNumber = prevProfileBlockNumber;
|
||||||
this.prevLineNumber = prevLineNumber;
|
this.prevProfileBlockHash32 = (prevProfileBlockHash32 == null ? new byte[32] : Arrays.copyOf(prevProfileBlockHash32, 32));
|
||||||
this.prevLineHash32 = (prevLineHash32 == null ? new byte[32] : Arrays.copyOf(prevLineHash32, 32));
|
this.profileSequence = profileSequence;
|
||||||
this.thisLineNumber = thisLineNumber;
|
|
||||||
|
|
||||||
if (paramKey.isBlank()) throw new IllegalArgumentException("paramKey is blank");
|
if (paramKey.isBlank()) throw new IllegalArgumentException("paramKey is blank");
|
||||||
if (paramValue.isBlank()) throw new IllegalArgumentException("paramValue is blank");
|
if (paramValue.isBlank()) throw new IllegalArgumentException("paramValue is blank");
|
||||||
@@ -128,17 +118,12 @@ public final class UserParamBody implements BodyRecord, BodyHasLine {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public UserParamBody check() {
|
public UserParamBody check() {
|
||||||
if (lineCode < 0) throw new IllegalArgumentException("lineCode < 0");
|
if ((subType & 0xFFFF) != (MsgSubType.USER_PARAM_TEXT_TEXT & 0xFFFF)) {
|
||||||
|
|
||||||
if ((subType & 0xFFFF) != (MsgSubType.USER_PARAM_TEXT_TEXT & 0xFFFF))
|
|
||||||
throw new IllegalArgumentException("Bad UserParam subType: " + (subType & 0xFFFF));
|
throw new IllegalArgumentException("Bad UserParam subType: " + (subType & 0xFFFF));
|
||||||
|
|
||||||
if (prevLineNumber == -1) {
|
|
||||||
if (!isAllZero32(prevLineHash32)) throw new IllegalArgumentException("prevLineHash32 must be zero when prevLineNumber=-1");
|
|
||||||
if (thisLineNumber != -1) throw new IllegalArgumentException("thisLineNumber must be -1 when prevLineNumber=-1");
|
|
||||||
} else {
|
|
||||||
if (prevLineHash32 == null || prevLineHash32.length != 32) throw new IllegalArgumentException("prevLineHash32 invalid");
|
|
||||||
}
|
}
|
||||||
|
if (prevProfileBlockNumber < 0) throw new IllegalArgumentException("prevProfileBlockNumber must be >=0");
|
||||||
|
if (prevProfileBlockHash32 == null || prevProfileBlockHash32.length != 32) throw new IllegalArgumentException("prevProfileBlockHash32 invalid");
|
||||||
|
if (profileSequence <= 0) throw new IllegalArgumentException("profileSequence must be >=1");
|
||||||
|
|
||||||
if (paramKey == null || paramKey.isBlank()) throw new IllegalArgumentException("paramKey is blank");
|
if (paramKey == null || paramKey.isBlank()) throw new IllegalArgumentException("paramKey is blank");
|
||||||
if (paramValue == null || paramValue.isBlank()) throw new IllegalArgumentException("paramValue is blank");
|
if (paramValue == null || paramValue.isBlank()) throw new IllegalArgumentException("paramValue is blank");
|
||||||
@@ -148,30 +133,25 @@ public final class UserParamBody implements BodyRecord, BodyHasLine {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public byte[] toBytes() {
|
public byte[] toBytes() {
|
||||||
|
check();
|
||||||
byte[] keyUtf8 = paramKey.getBytes(StandardCharsets.UTF_8);
|
byte[] keyUtf8 = paramKey.getBytes(StandardCharsets.UTF_8);
|
||||||
byte[] valUtf8 = paramValue.getBytes(StandardCharsets.UTF_8);
|
byte[] valUtf8 = paramValue.getBytes(StandardCharsets.UTF_8);
|
||||||
|
|
||||||
if (keyUtf8.length == 0 || keyUtf8.length > 65535) throw new IllegalArgumentException("paramKey utf8 len must be 1..65535");
|
if (keyUtf8.length == 0 || keyUtf8.length > 65535) throw new IllegalArgumentException("paramKey utf8 len must be 1..65535");
|
||||||
if (valUtf8.length == 0 || valUtf8.length > 65535) throw new IllegalArgumentException("paramValue utf8 len must be 1..65535");
|
if (valUtf8.length == 0 || valUtf8.length > 65535) throw new IllegalArgumentException("paramValue utf8 len must be 1..65535");
|
||||||
|
|
||||||
int cap = 4 + (4 + 32 + 4)
|
int cap = 4 + 32 + 4
|
||||||
+ 2 + keyUtf8.length
|
+ 2 + keyUtf8.length
|
||||||
+ 2 + valUtf8.length;
|
+ 2 + valUtf8.length;
|
||||||
|
|
||||||
ByteBuffer bb = ByteBuffer.allocate(cap).order(ByteOrder.BIG_ENDIAN);
|
ByteBuffer bb = ByteBuffer.allocate(cap).order(ByteOrder.BIG_ENDIAN);
|
||||||
|
bb.putInt(prevProfileBlockNumber);
|
||||||
bb.putInt(lineCode);
|
bb.put(prevProfileBlockHash32);
|
||||||
|
bb.putInt(profileSequence);
|
||||||
bb.putInt(prevLineNumber);
|
|
||||||
bb.put(prevLineHash32 == null ? new byte[32] : Arrays.copyOf(prevLineHash32, 32));
|
|
||||||
bb.putInt(thisLineNumber);
|
|
||||||
|
|
||||||
bb.putShort((short) keyUtf8.length);
|
bb.putShort((short) keyUtf8.length);
|
||||||
bb.put(keyUtf8);
|
bb.put(keyUtf8);
|
||||||
|
|
||||||
bb.putShort((short) valUtf8.length);
|
bb.putShort((short) valUtf8.length);
|
||||||
bb.put(valUtf8);
|
bb.put(valUtf8);
|
||||||
|
|
||||||
return bb.array();
|
return bb.array();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -187,15 +167,9 @@ public final class UserParamBody implements BodyRecord, BodyHasLine {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean isAllZero32(byte[] b) {
|
/* USER_PROFILE имеет единственную линию, логический lineCode всегда 0. */
|
||||||
if (b == null || b.length != 32) return true;
|
@Override public int lineCode() { return 0; }
|
||||||
for (int i = 0; i < 32; i++) if (b[i] != 0) return false;
|
@Override public int prevLineBlockGlobalNumber() { return prevProfileBlockNumber; }
|
||||||
return true;
|
@Override public byte[] prevLineBlockHash32() { return Arrays.copyOf(prevProfileBlockHash32, 32); }
|
||||||
}
|
@Override public int lineSeq() { return profileSequence; }
|
||||||
|
}
|
||||||
/* ====================== BodyHasLine ====================== */
|
|
||||||
@Override public int lineCode() { return lineCode; }
|
|
||||||
@Override public int prevLineBlockGlobalNumber() { return prevLineNumber; }
|
|
||||||
@Override public byte[] prevLineBlockHash32() { return prevLineHash32 == null ? null : Arrays.copyOf(prevLineHash32, 32); }
|
|
||||||
@Override public int lineSeq() { return thisLineNumber; }
|
|
||||||
}
|
|
||||||
|
|||||||
+36
-53
@@ -1,71 +1,54 @@
|
|||||||
package utils.blockchain;
|
package utils.blockchain;
|
||||||
|
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
import java.util.regex.Matcher;
|
||||||
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
|
/** Canonical physical fork name helper: login-NNN, forks are limited to 001..999. */
|
||||||
public final class BlockchainNameUtil {
|
public final class BlockchainNameUtil {
|
||||||
|
private static final Pattern SUFFIX = Pattern.compile("^(.*)-(\\d{3})$");
|
||||||
/**
|
public static final int MIN_FORK_NUMBER = 1;
|
||||||
* Теперь новое правило:
|
public static final int MAX_FORK_NUMBER = 999;
|
||||||
* blockchainName = login + "-"+ 3 цифры
|
|
||||||
* Пример: "Dima-001" -> "Dima"
|
|
||||||
*
|
|
||||||
* Сколько символов отрезаем с конца blockchainName, чтобы получить login: "-001" = 4
|
|
||||||
*/
|
|
||||||
public static final int BLOCKCHAIN_NAME_LOGIN_SUFFIX_LEN = 4;
|
|
||||||
|
|
||||||
private BlockchainNameUtil() {}
|
private BlockchainNameUtil() {}
|
||||||
|
|
||||||
/**
|
|
||||||
* Извлечь login из blockchainName: отрезаем последние 4 символа ("-NNN").
|
|
||||||
* Пример: "Dima-001" -> "Dima"
|
|
||||||
*/
|
|
||||||
public static String loginFromBlockchainName(String blockchainName) {
|
public static String loginFromBlockchainName(String blockchainName) {
|
||||||
if (blockchainName == null) return null;
|
Matcher m = matcher(blockchainName);
|
||||||
|
return m == null ? null : m.group(1);
|
||||||
|
}
|
||||||
|
|
||||||
String s = blockchainName.trim();
|
public static Integer forkNumberFromBlockchainName(String blockchainName) {
|
||||||
if (!hasDashAnd3DigitsSuffix(s)) return null;
|
Matcher m = matcher(blockchainName);
|
||||||
|
if (m == null) return null;
|
||||||
return s.substring(0, s.length() - BLOCKCHAIN_NAME_LOGIN_SUFFIX_LEN);
|
int fork = Integer.parseInt(m.group(2));
|
||||||
|
return fork >= MIN_FORK_NUMBER && fork <= MAX_FORK_NUMBER ? fork : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Проверка правила:
|
|
||||||
* - blockchainName должен оканчиваться на "-"+3 цифры
|
|
||||||
* - blockchainName без суффикса "-NNN" должен равняться login
|
|
||||||
*
|
|
||||||
* ВАЖНО:
|
|
||||||
* - сравнение строгое (case-sensitive)
|
|
||||||
* - null/blank считаем невалидным
|
|
||||||
*/
|
|
||||||
public static boolean isBlockchainNameMatchesLogin(String blockchainName, String login) {
|
public static boolean isBlockchainNameMatchesLogin(String blockchainName, String login) {
|
||||||
if (blockchainName == null || login == null) return false;
|
if (login == null || login.isBlank()) return false;
|
||||||
|
String extracted = loginFromBlockchainName(blockchainName);
|
||||||
String bn = blockchainName.trim();
|
return extracted != null && Objects.equals(extracted, login.trim());
|
||||||
String lg = login.trim();
|
|
||||||
|
|
||||||
if (bn.isEmpty() || lg.isEmpty()) return false;
|
|
||||||
if (!hasDashAnd3DigitsSuffix(bn)) return false;
|
|
||||||
|
|
||||||
String extracted = bn.substring(0, bn.length() - BLOCKCHAIN_NAME_LOGIN_SUFFIX_LEN);
|
|
||||||
return Objects.equals(extracted, lg);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean hasDashAnd3DigitsSuffix(String s) {
|
public static String blockchainName(String login, int forkNumber) {
|
||||||
if (s == null) return false;
|
if (login == null || login.isBlank()) throw new IllegalArgumentException("login is blank");
|
||||||
int len = s.length();
|
if (forkNumber < MIN_FORK_NUMBER || forkNumber > MAX_FORK_NUMBER) {
|
||||||
if (len <= BLOCKCHAIN_NAME_LOGIN_SUFFIX_LEN) return false;
|
throw new IllegalArgumentException("forkNumber must be 1..999");
|
||||||
|
}
|
||||||
int dashPos = len - 4;
|
return login.trim() + "-" + String.format("%03d", forkNumber);
|
||||||
if (s.charAt(dashPos) != '-') return false;
|
|
||||||
|
|
||||||
char c1 = s.charAt(len - 3);
|
|
||||||
char c2 = s.charAt(len - 2);
|
|
||||||
char c3 = s.charAt(len - 1);
|
|
||||||
|
|
||||||
return isDigit(c1) && isDigit(c2) && isDigit(c3);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean isDigit(char c) {
|
private static Matcher matcher(String blockchainName) {
|
||||||
return c >= '0' && c <= '9';
|
if (blockchainName == null) return null;
|
||||||
|
String s = blockchainName.trim();
|
||||||
|
if (s.isEmpty()) return null;
|
||||||
|
Matcher m = SUFFIX.matcher(s);
|
||||||
|
if (!m.matches() || m.group(1).isBlank()) return null;
|
||||||
|
try {
|
||||||
|
int fork = Integer.parseInt(m.group(2));
|
||||||
|
return fork >= MIN_FORK_NUMBER && fork <= MAX_FORK_NUMBER ? m : null;
|
||||||
|
} catch (NumberFormatException e) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+8
-8
@@ -15,8 +15,8 @@ final class Ans104DataItemTest {
|
|||||||
byte[] owner = Ed25519Util.derivePublicKey(privateKey);
|
byte[] owner = Ed25519Util.derivePublicKey(privateKey);
|
||||||
byte[] data = "frame-v1-test".getBytes(StandardCharsets.UTF_8);
|
byte[] data = "frame-v1-test".getBytes(StandardCharsets.UTF_8);
|
||||||
List<Ans104DataItem.Tag> tags = List.of(
|
List<Ans104DataItem.Tag> tags = List.of(
|
||||||
new Ans104DataItem.Tag("App", "test5590"),
|
new Ans104DataItem.Tag(ShineProtocolTags.APP_TAG_NAME, ShineProtocolTags.APP_TAG_VALUE),
|
||||||
new Ans104DataItem.Tag("c", "books")
|
new Ans104DataItem.Tag(ShineProtocolTags.CHANNEL_TAG_NAME, "books")
|
||||||
);
|
);
|
||||||
|
|
||||||
byte[] message = Ans104DataItem.buildSigningMessage(owner, tags, data);
|
byte[] message = Ans104DataItem.buildSigningMessage(owner, tags, data);
|
||||||
@@ -27,8 +27,8 @@ final class Ans104DataItemTest {
|
|||||||
assertEquals(2, parsed.signatureType());
|
assertEquals(2, parsed.signatureType());
|
||||||
assertArrayEquals(owner, parsed.owner32());
|
assertArrayEquals(owner, parsed.owner32());
|
||||||
assertArrayEquals(data, parsed.data());
|
assertArrayEquals(data, parsed.data());
|
||||||
assertTrue(parsed.hasTag("App", "test5590"));
|
assertTrue(parsed.hasTag(ShineProtocolTags.APP_TAG_NAME, ShineProtocolTags.APP_TAG_VALUE));
|
||||||
assertEquals("books", parsed.tagValue("c"));
|
assertEquals("books", parsed.tagValue(ShineProtocolTags.CHANNEL_TAG_NAME));
|
||||||
assertTrue(parsed.verifySignature());
|
assertTrue(parsed.verifySignature());
|
||||||
assertEquals(32, parsed.id32().length);
|
assertEquals(32, parsed.id32().length);
|
||||||
}
|
}
|
||||||
@@ -38,7 +38,7 @@ final class Ans104DataItemTest {
|
|||||||
byte[] privateKey = Ed25519Util.generatePrivateKeyFromString("shine-ans104-mutation-key");
|
byte[] privateKey = Ed25519Util.generatePrivateKeyFromString("shine-ans104-mutation-key");
|
||||||
byte[] owner = Ed25519Util.derivePublicKey(privateKey);
|
byte[] owner = Ed25519Util.derivePublicKey(privateKey);
|
||||||
byte[] data = "original".getBytes(StandardCharsets.UTF_8);
|
byte[] data = "original".getBytes(StandardCharsets.UTF_8);
|
||||||
List<Ans104DataItem.Tag> tags = List.of(new Ans104DataItem.Tag("App", "test5590"));
|
List<Ans104DataItem.Tag> tags = List.of(new Ans104DataItem.Tag(ShineProtocolTags.APP_TAG_NAME, ShineProtocolTags.APP_TAG_VALUE));
|
||||||
byte[] signature = Ed25519Util.sign(Ans104DataItem.buildSigningMessage(owner, tags, data), privateKey);
|
byte[] signature = Ed25519Util.sign(Ans104DataItem.buildSigningMessage(owner, tags, data), privateKey);
|
||||||
byte[] raw = Ans104DataItem.serializeEd25519(signature, owner, tags, data);
|
byte[] raw = Ans104DataItem.serializeEd25519(signature, owner, tags, data);
|
||||||
raw[raw.length - 1] ^= 1;
|
raw[raw.length - 1] ^= 1;
|
||||||
@@ -50,12 +50,12 @@ final class Ans104DataItemTest {
|
|||||||
for (int i = 0; i < owner.length; i++) owner[i] = (byte) i;
|
for (int i = 0; i < owner.length; i++) owner[i] = (byte) i;
|
||||||
byte[] data = "frame-v1-test".getBytes(StandardCharsets.UTF_8);
|
byte[] data = "frame-v1-test".getBytes(StandardCharsets.UTF_8);
|
||||||
List<Ans104DataItem.Tag> tags = List.of(
|
List<Ans104DataItem.Tag> tags = List.of(
|
||||||
new Ans104DataItem.Tag("App", "test5590"),
|
new Ans104DataItem.Tag(ShineProtocolTags.APP_TAG_NAME, ShineProtocolTags.APP_TAG_VALUE),
|
||||||
new Ans104DataItem.Tag("c", "books")
|
new Ans104DataItem.Tag(ShineProtocolTags.CHANNEL_TAG_NAME, "books")
|
||||||
);
|
);
|
||||||
|
|
||||||
byte[] actual = Ans104DataItem.buildSigningMessage(owner, tags, data);
|
byte[] actual = Ans104DataItem.buildSigningMessage(owner, tags, data);
|
||||||
byte[] expected = hex("7e67d0debce103606d697a1e3785130ca20cb89cd8a06f9a65b98b2d2427eaf411fcf7d482da268e44f3ac25c57c3cb9");
|
byte[] expected = hex("1abe0371d12268b34be32ca5ebf3d3d2189f9d311d9004c142538ca8a4312faa329d1a4873df72dd01b632a2ecce6b87");
|
||||||
assertArrayEquals(expected, actual);
|
assertArrayEquals(expected, actual);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+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);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,100 @@
|
|||||||
|
package blockchain;
|
||||||
|
|
||||||
|
import blockchain.body.ForkBody;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.*;
|
||||||
|
|
||||||
|
final class ForkBodyTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void roundTripThroughBodyRecordParser() {
|
||||||
|
byte[] parentKey = filled(32, 0x11);
|
||||||
|
byte[] forkHash = filled(32, 0x22);
|
||||||
|
byte[] tipHash = filled(32, 0x33);
|
||||||
|
|
||||||
|
ForkBody source = new ForkBody(
|
||||||
|
0,
|
||||||
|
77,
|
||||||
|
filled(32, 0x44),
|
||||||
|
5,
|
||||||
|
parentKey,
|
||||||
|
120,
|
||||||
|
forkHash,
|
||||||
|
1_700_000_000_000L,
|
||||||
|
137,
|
||||||
|
tipHash,
|
||||||
|
1_700_100_000_000L,
|
||||||
|
17,
|
||||||
|
ForkBody.REASON_CONFIRMED_COMPROMISE_ROLLBACK,
|
||||||
|
"Удаляю неизвестные записи"
|
||||||
|
).check();
|
||||||
|
|
||||||
|
ForkBody parsed = assertInstanceOf(
|
||||||
|
ForkBody.class,
|
||||||
|
BodyRecordParser.parse(ForkBody.TYPE, ForkBody.SUBTYPE, ForkBody.VER, source.toBytes())
|
||||||
|
);
|
||||||
|
|
||||||
|
assertEquals(0, parsed.lineCode);
|
||||||
|
assertEquals(77, parsed.prevLineNumber);
|
||||||
|
assertEquals(5, parsed.thisLineNumber);
|
||||||
|
assertArrayEquals(parentKey, parsed.parentBlockchainKey32);
|
||||||
|
assertEquals(120, parsed.forkPointBlockNumber);
|
||||||
|
assertArrayEquals(forkHash, parsed.forkPointBlockHash32);
|
||||||
|
assertEquals(137, parsed.parentTipBlockNumber);
|
||||||
|
assertArrayEquals(tipHash, parsed.parentTipBlockHash32);
|
||||||
|
assertEquals(17, parsed.discardedBlocksCount);
|
||||||
|
assertEquals(ForkBody.REASON_CONFIRMED_COMPROMISE_ROLLBACK, parsed.reasonCode);
|
||||||
|
assertEquals("Удаляю неизвестные записи", parsed.comment);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void routineRotationMayDiscardNothing() {
|
||||||
|
ForkBody body = new ForkBody(
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
filled(32, 9),
|
||||||
|
1,
|
||||||
|
filled(32, 1),
|
||||||
|
10,
|
||||||
|
filled(32, 2),
|
||||||
|
1000,
|
||||||
|
10,
|
||||||
|
filled(32, 2),
|
||||||
|
1000,
|
||||||
|
0,
|
||||||
|
ForkBody.REASON_ROUTINE_ROTATION,
|
||||||
|
""
|
||||||
|
);
|
||||||
|
assertDoesNotThrow(body::check);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void rejectedWhenDiscardCountDoesNotMatchForkPointAndTip() {
|
||||||
|
ForkBody body = new ForkBody(
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
filled(32, 9),
|
||||||
|
1,
|
||||||
|
filled(32, 1),
|
||||||
|
10,
|
||||||
|
filled(32, 2),
|
||||||
|
1000,
|
||||||
|
12,
|
||||||
|
filled(32, 3),
|
||||||
|
2000,
|
||||||
|
99,
|
||||||
|
ForkBody.REASON_POSSIBLE_COMPROMISE,
|
||||||
|
""
|
||||||
|
);
|
||||||
|
assertThrows(IllegalArgumentException.class, body::check);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static byte[] filled(int size, int value) {
|
||||||
|
byte[] out = new byte[size];
|
||||||
|
Arrays.fill(out, (byte) value);
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
}
|
||||||
+173
@@ -0,0 +1,173 @@
|
|||||||
|
package blockchain;
|
||||||
|
|
||||||
|
import blockchain.body.ConnectionBody;
|
||||||
|
import blockchain.body.HeaderBody;
|
||||||
|
import blockchain.body.ReactionBody;
|
||||||
|
import blockchain.body.StatusActionBody;
|
||||||
|
import blockchain.body.TextLineBody;
|
||||||
|
import blockchain.body.TextRatingBody;
|
||||||
|
import blockchain.body.TextReplyBody;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.*;
|
||||||
|
|
||||||
|
final class TargetLoginFormatTest {
|
||||||
|
|
||||||
|
private static final byte[] HASH = hash(7);
|
||||||
|
private static final byte[] INITIAL_KEY = hash(11);
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void externalTargetRoundTripKeepsHistoricalForkMetadata() {
|
||||||
|
ReactionBody source = new ReactionBody(MsgSubType.REACTION_LIKE, "alice", 7, 42, HASH);
|
||||||
|
ReactionBody parsed = new ReactionBody(MsgSubType.REACTION_LIKE, ReactionBody.VER, source.toBytes()).check();
|
||||||
|
|
||||||
|
assertEquals("alice", parsed.toLogin());
|
||||||
|
assertEquals(7, parsed.toForkNumber());
|
||||||
|
assertEquals(42, parsed.toBlockGlobalNumber());
|
||||||
|
assertArrayEquals(HASH, parsed.toBlockHashBytes());
|
||||||
|
assertFalse(new String(source.toBytes()).contains("alice-007"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void replyIsExternalButEditReplyIsCompactOwnChainTarget() {
|
||||||
|
TextReplyBody reply = new TextReplyBody(MsgSubType.TEXT_REPLY, "alice", 12, 11, HASH, "reply");
|
||||||
|
TextReplyBody parsedReply = new TextReplyBody(MsgSubType.TEXT_REPLY, TextReplyBody.VER, reply.toBytes()).check();
|
||||||
|
assertEquals("alice", parsedReply.toLogin());
|
||||||
|
assertEquals(12, parsedReply.toForkNumber());
|
||||||
|
|
||||||
|
TextReplyBody edit = new TextReplyBody(MsgSubType.TEXT_EDIT_REPLY, null, null, 11, HASH, "");
|
||||||
|
TextReplyBody parsedEdit = new TextReplyBody(MsgSubType.TEXT_EDIT_REPLY, TextReplyBody.VER, edit.toBytes()).check();
|
||||||
|
assertNull(parsedEdit.toLogin());
|
||||||
|
assertNull(parsedEdit.toForkNumber());
|
||||||
|
assertEquals(11, parsedEdit.toBlockGlobalNumber());
|
||||||
|
assertArrayEquals(HASH, parsedEdit.toBlockHashBytes());
|
||||||
|
assertTrue(edit.toBytes().length < reply.toBytes().length);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void editPostIsCompactAndConnectionUsesRealExternalTarget() {
|
||||||
|
TextLineBody editPost = new TextLineBody(
|
||||||
|
0, -1, new byte[32], -1,
|
||||||
|
MsgSubType.TEXT_EDIT_POST,
|
||||||
|
null, null, 5, HASH, "edited"
|
||||||
|
);
|
||||||
|
TextLineBody parsedEditPost = new TextLineBody(MsgSubType.TEXT_EDIT_POST, TextLineBody.VER, editPost.toBytes()).check();
|
||||||
|
assertNull(parsedEditPost.toLogin());
|
||||||
|
assertNull(parsedEditPost.toForkNumber());
|
||||||
|
assertEquals(5, parsedEditPost.toBlockGlobalNumber());
|
||||||
|
|
||||||
|
ConnectionBody connection = new ConnectionBody(
|
||||||
|
0, HASH, 1,
|
||||||
|
MsgSubType.CONNECTION_FOLLOW,
|
||||||
|
"alice", 3, 0, HASH
|
||||||
|
);
|
||||||
|
ConnectionBody parsedConnection = new ConnectionBody(MsgSubType.CONNECTION_FOLLOW, ConnectionBody.VER, connection.toBytes()).check();
|
||||||
|
assertEquals("alice", parsedConnection.toLogin());
|
||||||
|
assertEquals(3, parsedConnection.toForkNumber());
|
||||||
|
assertEquals(0, parsedConnection.toBlockGlobalNumber());
|
||||||
|
assertArrayEquals(HASH, parsedConnection.toBlockHashBytes());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void ratingAndStatusCarryHistoricalForkNumber() {
|
||||||
|
TextRatingBody rating = new TextRatingBody("alice", 9, 70, HASH, "5");
|
||||||
|
TextRatingBody parsedRating = new TextRatingBody(MsgSubType.TEXT_RATING, TextRatingBody.VER, rating.toBytes()).check();
|
||||||
|
assertEquals(9, parsedRating.toForkNumber());
|
||||||
|
|
||||||
|
StatusActionBody status = new StatusActionBody(MsgSubType.STATUS_STARTED, "alice", 9, 77, HASH, "");
|
||||||
|
StatusActionBody parsedStatus = new StatusActionBody(MsgSubType.STATUS_STARTED, StatusActionBody.VER, status.toBytes()).check();
|
||||||
|
assertEquals("alice", parsedStatus.toLogin());
|
||||||
|
assertEquals(9, parsedStatus.toForkNumber());
|
||||||
|
assertEquals(77, parsedStatus.toBlockGlobalNumber());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void forkZeroIsReservedButStillDecodableAsHistoricalUnknown() {
|
||||||
|
ReactionBody source = new ReactionBody(MsgSubType.REACTION_LIKE, "alice", 0, 42, HASH);
|
||||||
|
ReactionBody parsed = new ReactionBody(MsgSubType.REACTION_LIKE, ReactionBody.VER, source.toBytes()).check();
|
||||||
|
assertEquals(0, parsed.toForkNumber());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void headerCarriesInitialBlockchainKey() {
|
||||||
|
HeaderBody source = new HeaderBody("alice", INITIAL_KEY);
|
||||||
|
HeaderBody parsed = new HeaderBody(HeaderBody.SUBTYPE_COMPAT, HeaderBody.VER, source.toBytes()).check();
|
||||||
|
assertEquals("alice", parsed.login);
|
||||||
|
assertArrayEquals(INITIAL_KEY, parsed.initialBlockchainKey32);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void namespacedHeaderRoundTripAcceptsPaidAndFreeUsers() {
|
||||||
|
for (String login : new String[]{"alice@free", "AlexSmith@shine", "a_B@free", "abcdefghijklmnopqrstuvwxy@free"}) {
|
||||||
|
HeaderBody source = new HeaderBody(login, INITIAL_KEY);
|
||||||
|
HeaderBody parsed = new HeaderBody(HeaderBody.SUBTYPE_COMPAT, HeaderBody.VER, source.toBytes()).check();
|
||||||
|
assertEquals(login, parsed.login);
|
||||||
|
assertArrayEquals(INITIAL_KEY, parsed.initialBlockchainKey32);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@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"}) {
|
||||||
|
assertThrows(IllegalArgumentException.class, () -> new HeaderBody(login, INITIAL_KEY), login);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void signedReferencesPreserveArbitraryLoginCaseWithoutServerSideCaseEnforcement() {
|
||||||
|
// Адресация не зависит от регистра, но блок сохраняет выбранные автором байты.
|
||||||
|
for (String login : new String[]{"AlexSmith@shine", "alexsmith@shine"}) {
|
||||||
|
TextReplyBody reply = new TextReplyBody(MsgSubType.TEXT_REPLY, login, 1, 42, HASH, "тест");
|
||||||
|
assertEquals(login, new TextReplyBody(MsgSubType.TEXT_REPLY, TextReplyBody.VER, reply.toBytes()).check().toLogin());
|
||||||
|
|
||||||
|
ReactionBody like = new ReactionBody(MsgSubType.REACTION_LIKE, login, 1, 42, HASH);
|
||||||
|
assertEquals(login, new ReactionBody(MsgSubType.REACTION_LIKE, ReactionBody.VER, like.toBytes()).check().toLogin());
|
||||||
|
|
||||||
|
ConnectionBody follow = new ConnectionBody(0, HASH, 1, MsgSubType.CONNECTION_FOLLOW, login, 1, 0, HASH);
|
||||||
|
assertEquals(login, new ConnectionBody(MsgSubType.CONNECTION_FOLLOW, ConnectionBody.VER, follow.toBytes()).check().toLogin());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static byte[] hash(int seed) {
|
||||||
|
byte[] out = new byte[32];
|
||||||
|
Arrays.fill(out, (byte) seed);
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
}
|
||||||
+2
-2
@@ -20,8 +20,8 @@ public final class ShineSignatureConstants {
|
|||||||
/** Подписанный watermark чтения канала: prefix + login + owner_bch_name + channel_name + time_ms + read_count */
|
/** Подписанный watermark чтения канала: prefix + login + owner_bch_name + channel_name + time_ms + read_count */
|
||||||
public static final String CHANNEL_READ_STATE_PREFIX = "SHiNe/ChannelReadState:";
|
public static final String CHANNEL_READ_STATE_PREFIX = "SHiNe/ChannelReadState:";
|
||||||
|
|
||||||
/** TAG в HeaderBody (genesis). ASCII "SHiNe". */
|
/** TAG в HeaderBody (genesis). ASCII "SHiNE". */
|
||||||
public static final String BLOCKCHAIN_HEADER_TAG = "SHiNe";
|
public static final String BLOCKCHAIN_HEADER_TAG = "SHiNE";
|
||||||
|
|
||||||
/** DOMAIN для preimage при расчёте hash32 блока. ASCII "SHiNe". */
|
/** DOMAIN для preimage при расчёте hash32 блока. ASCII "SHiNe". */
|
||||||
public static final String BLOCK_HASH_DOMAIN = "SHiNe";
|
public static final String BLOCK_HASH_DOMAIN = "SHiNe";
|
||||||
|
|||||||
@@ -17,54 +17,35 @@ import java.util.List;
|
|||||||
public final class DatabaseInitializer {
|
public final class DatabaseInitializer {
|
||||||
|
|
||||||
public static final String DB_SCHEMA_VERSION_TABLE = "db_schema_version";
|
public static final String DB_SCHEMA_VERSION_TABLE = "db_schema_version";
|
||||||
|
public static final String DB_FORMAT_MARKER_TABLE = "shine_database_metadata";
|
||||||
|
public static final String DB_FORMAT_MARKER = "SHiNE_DB_V2";
|
||||||
|
public static final int DB_FORMAT_VERSION = 2;
|
||||||
public static final int SCHEMA_VERSION_1 = 1;
|
public static final int SCHEMA_VERSION_1 = 1;
|
||||||
public static final int SCHEMA_VERSION_2 = 2;
|
public static final int SCHEMA_VERSION_31 = 31;
|
||||||
public static final int SCHEMA_VERSION_3 = 3;
|
public static final int SCHEMA_VERSION_32 = 32;
|
||||||
public static final int SCHEMA_VERSION_4 = 4;
|
public static final int SCHEMA_VERSION_33 = 33;
|
||||||
public static final int SCHEMA_VERSION_5 = 5;
|
public static final int SCHEMA_VERSION_34 = 34;
|
||||||
public static final int SCHEMA_VERSION_6 = 6;
|
public static final int SCHEMA_VERSION_35 = 35;
|
||||||
public static final int SCHEMA_VERSION_7 = 7;
|
public static final int SCHEMA_VERSION_36 = 36;
|
||||||
public static final int SCHEMA_VERSION_8 = 8;
|
public static final int SCHEMA_VERSION_37 = 37;
|
||||||
public static final int SCHEMA_VERSION_9 = 9;
|
public static final int SCHEMA_VERSION_38 = 38;
|
||||||
public static final int SCHEMA_VERSION_10 = 10;
|
public static final int SCHEMA_VERSION_39 = 39;
|
||||||
public static final int SCHEMA_VERSION_11 = 11;
|
public static final int SCHEMA_VERSION_40 = 40;
|
||||||
public static final int SCHEMA_VERSION_12 = 12;
|
public static final int SCHEMA_VERSION_41 = 41;
|
||||||
public static final int SCHEMA_VERSION_13 = 13;
|
public static final int SCHEMA_VERSION_42 = 42;
|
||||||
public static final int SCHEMA_VERSION_14 = 14;
|
|
||||||
public static final int SCHEMA_VERSION_15 = 15;
|
|
||||||
public static final int SCHEMA_VERSION_16 = 16;
|
|
||||||
public static final int SCHEMA_VERSION_17 = 17;
|
|
||||||
public static final int SCHEMA_VERSION_18 = 18;
|
|
||||||
public static final int SCHEMA_VERSION_19 = 19;
|
|
||||||
public static final int SCHEMA_VERSION_20 = 20;
|
|
||||||
public static final int SCHEMA_VERSION_21 = 21;
|
|
||||||
public static final int SCHEMA_VERSION_22 = 22;
|
|
||||||
public static final int SCHEMA_VERSION_23 = 23;
|
|
||||||
public static final int SCHEMA_VERSION_24 = 24;
|
|
||||||
public static final String POSTGRES_SCHEMA_RESOURCE = "postgres/schema_v1.sql";
|
public static final String POSTGRES_SCHEMA_RESOURCE = "postgres/schema_v1.sql";
|
||||||
public static final String POSTGRES_MIGRATION_V2_RESOURCE = "postgres/migration_v2.sql";
|
public static final String POSTGRES_MIGRATION_V31_RESOURCE = "postgres/migration_v31.sql";
|
||||||
public static final String POSTGRES_MIGRATION_V3_RESOURCE = "postgres/migration_v3.sql";
|
public static final String POSTGRES_MIGRATION_V32_RESOURCE = "postgres/migration_v32.sql";
|
||||||
public static final String POSTGRES_MIGRATION_V4_RESOURCE = "postgres/migration_v4.sql";
|
public static final String POSTGRES_MIGRATION_V33_RESOURCE = "postgres/migration_v33.sql";
|
||||||
public static final String POSTGRES_MIGRATION_V5_RESOURCE = "postgres/migration_v5.sql";
|
public static final String POSTGRES_MIGRATION_V34_RESOURCE = "postgres/migration_v34.sql";
|
||||||
public static final String POSTGRES_MIGRATION_V6_RESOURCE = "postgres/migration_v6.sql";
|
public static final String POSTGRES_MIGRATION_V35_RESOURCE = "postgres/migration_v35.sql";
|
||||||
public static final String POSTGRES_MIGRATION_V7_RESOURCE = "postgres/migration_v7.sql";
|
public static final String POSTGRES_MIGRATION_V36_RESOURCE = "postgres/migration_v36.sql";
|
||||||
public static final String POSTGRES_MIGRATION_V8_RESOURCE = "postgres/migration_v8.sql";
|
public static final String POSTGRES_MIGRATION_V37_RESOURCE = "postgres/migration_v37.sql";
|
||||||
public static final String POSTGRES_MIGRATION_V9_RESOURCE = "postgres/migration_v9.sql";
|
public static final String POSTGRES_MIGRATION_V38_RESOURCE = "postgres/migration_v38.sql";
|
||||||
public static final String POSTGRES_MIGRATION_V10_RESOURCE = "postgres/migration_v10.sql";
|
public static final String POSTGRES_MIGRATION_V39_RESOURCE = "postgres/migration_v39.sql";
|
||||||
public static final String POSTGRES_MIGRATION_V11_RESOURCE = "postgres/migration_v11.sql";
|
public static final String POSTGRES_MIGRATION_V40_RESOURCE = "postgres/migration_v40.sql";
|
||||||
public static final String POSTGRES_MIGRATION_V12_RESOURCE = "postgres/migration_v12.sql";
|
public static final String POSTGRES_MIGRATION_V41_RESOURCE = "postgres/migration_v41.sql";
|
||||||
public static final String POSTGRES_MIGRATION_V13_RESOURCE = "postgres/migration_v13.sql";
|
public static final String POSTGRES_MIGRATION_V42_RESOURCE = "postgres/migration_v42.sql";
|
||||||
public static final String POSTGRES_MIGRATION_V14_RESOURCE = "postgres/migration_v14.sql";
|
|
||||||
public static final String POSTGRES_MIGRATION_V15_RESOURCE = "postgres/migration_v15.sql";
|
|
||||||
public static final String POSTGRES_MIGRATION_V16_RESOURCE = "postgres/migration_v16.sql";
|
|
||||||
public static final String POSTGRES_MIGRATION_V17_RESOURCE = "postgres/migration_v17.sql";
|
|
||||||
public static final String POSTGRES_MIGRATION_V18_RESOURCE = "postgres/migration_v18.sql";
|
|
||||||
public static final String POSTGRES_MIGRATION_V19_RESOURCE = "postgres/migration_v19.sql";
|
|
||||||
public static final String POSTGRES_MIGRATION_V20_RESOURCE = "postgres/migration_v20.sql";
|
|
||||||
public static final String POSTGRES_MIGRATION_V21_RESOURCE = "postgres/migration_v21.sql";
|
|
||||||
public static final String POSTGRES_MIGRATION_V22_RESOURCE = "postgres/migration_v22.sql";
|
|
||||||
public static final String POSTGRES_MIGRATION_V23_RESOURCE = "postgres/migration_v23.sql";
|
|
||||||
public static final String POSTGRES_MIGRATION_V24_RESOURCE = "postgres/migration_v24.sql";
|
|
||||||
|
|
||||||
private DatabaseInitializer() {}
|
private DatabaseInitializer() {}
|
||||||
|
|
||||||
@@ -75,6 +56,7 @@ public final class DatabaseInitializer {
|
|||||||
public static final short TEXT_RATING = 30;
|
public static final short TEXT_RATING = 30;
|
||||||
public static final short TEXT_REPOST = 50;
|
public static final short TEXT_REPOST = 50;
|
||||||
public static final short TEXT_CHANNEL_META = 90;
|
public static final short TEXT_CHANNEL_META = 90;
|
||||||
|
public static final short TEXT_CHANNEL_DELETE = 92;
|
||||||
public static final short TEXT_ENTRYPOINT = 100;
|
public static final short TEXT_ENTRYPOINT = 100;
|
||||||
public static final short TEXT_EXERCISE = 110;
|
public static final short TEXT_EXERCISE = 110;
|
||||||
public static final short TEXT_SERVICE = 120;
|
public static final short TEXT_SERVICE = 120;
|
||||||
@@ -133,103 +115,81 @@ public final class DatabaseInitializer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
try (Connection conn = openConnection(jdbcUrl, user, password)) {
|
try (Connection conn = openConnection(jdbcUrl, user, password)) {
|
||||||
if (!postgresSchemaVersionTableExists(conn)) {
|
boolean markerTableExists = postgresTableExists(conn, DB_FORMAT_MARKER_TABLE);
|
||||||
|
boolean schemaVersionTableExists = postgresTableExists(conn, DB_SCHEMA_VERSION_TABLE);
|
||||||
|
|
||||||
|
if (!markerTableExists) {
|
||||||
|
if (schemaVersionTableExists || currentSchemaHasBaseTables(conn)) {
|
||||||
|
throw new SQLException(
|
||||||
|
"Legacy/non-v2 SHiNE PostgreSQL database detected. "
|
||||||
|
+ "Stage 2 requires an empty database initialized as " + DB_FORMAT_MARKER
|
||||||
|
+ "; automatic migration from the old database is intentionally disabled.");
|
||||||
|
}
|
||||||
runSqlScript(conn, POSTGRES_SCHEMA_RESOURCE);
|
runSqlScript(conn, POSTGRES_SCHEMA_RESOURCE);
|
||||||
return;
|
markerTableExists = postgresTableExists(conn, DB_FORMAT_MARKER_TABLE);
|
||||||
|
schemaVersionTableExists = postgresTableExists(conn, DB_SCHEMA_VERSION_TABLE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!markerTableExists || !schemaVersionTableExists) {
|
||||||
|
throw new SQLException(
|
||||||
|
"Invalid SHiNE PostgreSQL database: required v2 metadata/schema tables are missing.");
|
||||||
|
}
|
||||||
|
|
||||||
|
validateDatabaseFormatV2(conn);
|
||||||
int currentVersion = readCurrentSchemaVersion(conn);
|
int currentVersion = readCurrentSchemaVersion(conn);
|
||||||
if (currentVersion < SCHEMA_VERSION_2) {
|
if (currentVersion == 30) {
|
||||||
runSqlScript(conn, POSTGRES_MIGRATION_V2_RESOURCE);
|
runSqlScript(conn, POSTGRES_MIGRATION_V31_RESOURCE);
|
||||||
currentVersion = SCHEMA_VERSION_2;
|
currentVersion = readCurrentSchemaVersion(conn);
|
||||||
}
|
}
|
||||||
if (currentVersion < SCHEMA_VERSION_3) {
|
if (currentVersion == SCHEMA_VERSION_31) {
|
||||||
runSqlScript(conn, POSTGRES_MIGRATION_V3_RESOURCE);
|
runSqlScript(conn, POSTGRES_MIGRATION_V32_RESOURCE);
|
||||||
currentVersion = SCHEMA_VERSION_3;
|
currentVersion = readCurrentSchemaVersion(conn);
|
||||||
}
|
}
|
||||||
if (currentVersion < SCHEMA_VERSION_4) {
|
if (currentVersion == SCHEMA_VERSION_32) {
|
||||||
runSqlScript(conn, POSTGRES_MIGRATION_V4_RESOURCE);
|
runSqlScript(conn, POSTGRES_MIGRATION_V33_RESOURCE);
|
||||||
currentVersion = SCHEMA_VERSION_4;
|
currentVersion = readCurrentSchemaVersion(conn);
|
||||||
}
|
}
|
||||||
if (currentVersion < SCHEMA_VERSION_5) {
|
if (currentVersion == SCHEMA_VERSION_33) {
|
||||||
runSqlScript(conn, POSTGRES_MIGRATION_V5_RESOURCE);
|
runSqlScript(conn, POSTGRES_MIGRATION_V34_RESOURCE);
|
||||||
currentVersion = SCHEMA_VERSION_5;
|
currentVersion = readCurrentSchemaVersion(conn);
|
||||||
}
|
}
|
||||||
if (currentVersion < SCHEMA_VERSION_6) {
|
if (currentVersion == SCHEMA_VERSION_34) {
|
||||||
runSqlScript(conn, POSTGRES_MIGRATION_V6_RESOURCE);
|
runSqlScript(conn, POSTGRES_MIGRATION_V35_RESOURCE);
|
||||||
currentVersion = SCHEMA_VERSION_6;
|
currentVersion = readCurrentSchemaVersion(conn);
|
||||||
}
|
}
|
||||||
if (currentVersion < SCHEMA_VERSION_7) {
|
if (currentVersion == SCHEMA_VERSION_35) {
|
||||||
runSqlScript(conn, POSTGRES_MIGRATION_V7_RESOURCE);
|
runSqlScript(conn, POSTGRES_MIGRATION_V36_RESOURCE);
|
||||||
currentVersion = SCHEMA_VERSION_7;
|
currentVersion = readCurrentSchemaVersion(conn);
|
||||||
}
|
}
|
||||||
if (currentVersion < SCHEMA_VERSION_8) {
|
if (currentVersion == SCHEMA_VERSION_36) {
|
||||||
runSqlScript(conn, POSTGRES_MIGRATION_V8_RESOURCE);
|
runSqlScript(conn, POSTGRES_MIGRATION_V37_RESOURCE);
|
||||||
currentVersion = SCHEMA_VERSION_8;
|
currentVersion = readCurrentSchemaVersion(conn);
|
||||||
}
|
}
|
||||||
if (currentVersion < SCHEMA_VERSION_9) {
|
if (currentVersion == SCHEMA_VERSION_37) {
|
||||||
runSqlScript(conn, POSTGRES_MIGRATION_V9_RESOURCE);
|
runSqlScript(conn, POSTGRES_MIGRATION_V38_RESOURCE);
|
||||||
currentVersion = SCHEMA_VERSION_9;
|
currentVersion = readCurrentSchemaVersion(conn);
|
||||||
}
|
}
|
||||||
if (currentVersion < SCHEMA_VERSION_10) {
|
if (currentVersion == SCHEMA_VERSION_38) {
|
||||||
runSqlScript(conn, POSTGRES_MIGRATION_V10_RESOURCE);
|
runSqlScript(conn, POSTGRES_MIGRATION_V39_RESOURCE);
|
||||||
currentVersion = SCHEMA_VERSION_10;
|
currentVersion = readCurrentSchemaVersion(conn);
|
||||||
}
|
}
|
||||||
if (currentVersion < SCHEMA_VERSION_11) {
|
if (currentVersion == SCHEMA_VERSION_39) {
|
||||||
runSqlScript(conn, POSTGRES_MIGRATION_V11_RESOURCE);
|
runSqlScript(conn, POSTGRES_MIGRATION_V40_RESOURCE);
|
||||||
currentVersion = SCHEMA_VERSION_11;
|
currentVersion = readCurrentSchemaVersion(conn);
|
||||||
}
|
}
|
||||||
if (currentVersion < SCHEMA_VERSION_12) {
|
if (currentVersion == SCHEMA_VERSION_40) {
|
||||||
runSqlScript(conn, POSTGRES_MIGRATION_V12_RESOURCE);
|
runSqlScript(conn, POSTGRES_MIGRATION_V41_RESOURCE);
|
||||||
currentVersion = SCHEMA_VERSION_12;
|
currentVersion = readCurrentSchemaVersion(conn);
|
||||||
}
|
}
|
||||||
if (currentVersion < SCHEMA_VERSION_13) {
|
if (currentVersion == SCHEMA_VERSION_41) {
|
||||||
runSqlScript(conn, POSTGRES_MIGRATION_V13_RESOURCE);
|
runSqlScript(conn, POSTGRES_MIGRATION_V42_RESOURCE);
|
||||||
currentVersion = SCHEMA_VERSION_13;
|
currentVersion = readCurrentSchemaVersion(conn);
|
||||||
}
|
}
|
||||||
if (currentVersion < SCHEMA_VERSION_14) {
|
if (currentVersion != SCHEMA_VERSION_42) {
|
||||||
runSqlScript(conn, POSTGRES_MIGRATION_V14_RESOURCE);
|
throw new SQLException(
|
||||||
currentVersion = SCHEMA_VERSION_14;
|
"Unsupported SHiNE DB v2 schema version: expected 42, found " + currentVersion);
|
||||||
}
|
|
||||||
if (currentVersion < SCHEMA_VERSION_15) {
|
|
||||||
runSqlScript(conn, POSTGRES_MIGRATION_V15_RESOURCE);
|
|
||||||
currentVersion = SCHEMA_VERSION_15;
|
|
||||||
}
|
|
||||||
if (currentVersion < SCHEMA_VERSION_16) {
|
|
||||||
runSqlScript(conn, POSTGRES_MIGRATION_V16_RESOURCE);
|
|
||||||
currentVersion = SCHEMA_VERSION_16;
|
|
||||||
}
|
|
||||||
if (currentVersion < SCHEMA_VERSION_17) {
|
|
||||||
runSqlScript(conn, POSTGRES_MIGRATION_V17_RESOURCE);
|
|
||||||
currentVersion = SCHEMA_VERSION_17;
|
|
||||||
}
|
|
||||||
if (currentVersion < SCHEMA_VERSION_18) {
|
|
||||||
runSqlScript(conn, POSTGRES_MIGRATION_V18_RESOURCE);
|
|
||||||
currentVersion = SCHEMA_VERSION_18;
|
|
||||||
}
|
|
||||||
if (currentVersion < SCHEMA_VERSION_19) {
|
|
||||||
runSqlScript(conn, POSTGRES_MIGRATION_V19_RESOURCE);
|
|
||||||
currentVersion = SCHEMA_VERSION_19;
|
|
||||||
}
|
|
||||||
if (currentVersion < SCHEMA_VERSION_20) {
|
|
||||||
runSqlScript(conn, POSTGRES_MIGRATION_V20_RESOURCE);
|
|
||||||
currentVersion = SCHEMA_VERSION_20;
|
|
||||||
}
|
|
||||||
if (currentVersion < SCHEMA_VERSION_21) {
|
|
||||||
runSqlScript(conn, POSTGRES_MIGRATION_V21_RESOURCE);
|
|
||||||
currentVersion = SCHEMA_VERSION_21;
|
|
||||||
}
|
|
||||||
if (currentVersion < SCHEMA_VERSION_22) {
|
|
||||||
runSqlScript(conn, POSTGRES_MIGRATION_V22_RESOURCE);
|
|
||||||
currentVersion = SCHEMA_VERSION_22;
|
|
||||||
}
|
|
||||||
if (currentVersion < SCHEMA_VERSION_23) {
|
|
||||||
runSqlScript(conn, POSTGRES_MIGRATION_V23_RESOURCE);
|
|
||||||
currentVersion = SCHEMA_VERSION_23;
|
|
||||||
}
|
|
||||||
if (currentVersion < SCHEMA_VERSION_24) {
|
|
||||||
runSqlScript(conn, POSTGRES_MIGRATION_V24_RESOURCE);
|
|
||||||
currentVersion = SCHEMA_VERSION_24;
|
|
||||||
}
|
}
|
||||||
|
normalizeBlockchainStateKeysToBase64(conn);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -240,23 +200,60 @@ public final class DatabaseInitializer {
|
|||||||
return DriverManager.getConnection(jdbcUrl, user, password == null ? "" : password);
|
return DriverManager.getConnection(jdbcUrl, user, password == null ? "" : password);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean postgresSchemaVersionTableExists(Connection conn) throws SQLException {
|
private static boolean postgresTableExists(Connection conn, String tableName) throws SQLException {
|
||||||
String sql = """
|
String sql = """
|
||||||
SELECT EXISTS (
|
SELECT EXISTS (
|
||||||
SELECT 1
|
SELECT 1
|
||||||
FROM information_schema.tables
|
FROM information_schema.tables
|
||||||
WHERE table_schema = current_schema()
|
WHERE table_schema = current_schema()
|
||||||
AND table_name = ?
|
AND table_name = ?
|
||||||
|
AND table_type = 'BASE TABLE'
|
||||||
)
|
)
|
||||||
""";
|
""";
|
||||||
try (var ps = conn.prepareStatement(sql)) {
|
try (var ps = conn.prepareStatement(sql)) {
|
||||||
ps.setString(1, DB_SCHEMA_VERSION_TABLE);
|
ps.setString(1, tableName);
|
||||||
try (ResultSet rs = ps.executeQuery()) {
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
return rs.next() && rs.getBoolean(1);
|
return rs.next() && rs.getBoolean(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static boolean currentSchemaHasBaseTables(Connection conn) throws SQLException {
|
||||||
|
String sql = """
|
||||||
|
SELECT EXISTS (
|
||||||
|
SELECT 1
|
||||||
|
FROM information_schema.tables
|
||||||
|
WHERE table_schema = current_schema()
|
||||||
|
AND table_type = 'BASE TABLE'
|
||||||
|
)
|
||||||
|
""";
|
||||||
|
try (Statement st = conn.createStatement(); ResultSet rs = st.executeQuery(sql)) {
|
||||||
|
return rs.next() && rs.getBoolean(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void validateDatabaseFormatV2(Connection conn) throws SQLException {
|
||||||
|
String sql = """
|
||||||
|
SELECT database_format, database_generation
|
||||||
|
FROM shine_database_metadata
|
||||||
|
WHERE id = 1
|
||||||
|
""";
|
||||||
|
try (Statement st = conn.createStatement(); ResultSet rs = st.executeQuery(sql)) {
|
||||||
|
if (!rs.next()) {
|
||||||
|
throw new SQLException(
|
||||||
|
"Invalid SHiNE PostgreSQL database: SHiNE_DB_V2 metadata row is missing.");
|
||||||
|
}
|
||||||
|
String format = rs.getString("database_format");
|
||||||
|
int generation = rs.getInt("database_generation");
|
||||||
|
if (!DB_FORMAT_MARKER.equals(format) || generation != DB_FORMAT_VERSION) {
|
||||||
|
throw new SQLException(
|
||||||
|
"Unsupported SHiNE PostgreSQL database format: expected " + DB_FORMAT_MARKER
|
||||||
|
+ " generation " + DB_FORMAT_VERSION
|
||||||
|
+ ", found format=" + format + ", generation=" + generation);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private static int readCurrentSchemaVersion(Connection conn) throws SQLException {
|
private static int readCurrentSchemaVersion(Connection conn) throws SQLException {
|
||||||
String sql = """
|
String sql = """
|
||||||
SELECT schema_version
|
SELECT schema_version
|
||||||
@@ -272,6 +269,38 @@ public final class DatabaseInitializer {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* blockchain_state — runtime-проекция: публичный blockchain key хранится
|
||||||
|
* строго как Base64(32). Ранний импорт free-регистраций ошибочно сохранял
|
||||||
|
* Base58, поэтому нормализация выполняется идемпотентно при старте.
|
||||||
|
*/
|
||||||
|
private static void normalizeBlockchainStateKeysToBase64(Connection conn) throws SQLException {
|
||||||
|
record StateKey(String login, int forkNumber, String key) {}
|
||||||
|
List<StateKey> entries = new ArrayList<>();
|
||||||
|
try (Statement st = conn.createStatement();
|
||||||
|
ResultSet rs = st.executeQuery("SELECT login, fork_number, blockchain_key FROM blockchain_state_store")) {
|
||||||
|
while (rs.next()) {
|
||||||
|
entries.add(new StateKey(rs.getString("login"), rs.getInt("fork_number"), rs.getString("blockchain_key")));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
try (var update = conn.prepareStatement("""
|
||||||
|
UPDATE blockchain_state_store
|
||||||
|
SET blockchain_key = ?
|
||||||
|
WHERE login = ? AND fork_number = ?
|
||||||
|
""")) {
|
||||||
|
for (StateKey entry : entries) {
|
||||||
|
String normalized = KeyEncodingUtil.normalizeKeyToBase64_32(entry.key());
|
||||||
|
if (normalized == null || normalized.equals(entry.key())) continue;
|
||||||
|
update.setString(1, normalized);
|
||||||
|
update.setString(2, entry.login());
|
||||||
|
update.setInt(3, entry.forkNumber());
|
||||||
|
update.addBatch();
|
||||||
|
}
|
||||||
|
update.executeBatch();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private static void runSqlScript(Connection conn, String resourcePath) throws SQLException {
|
private static void runSqlScript(Connection conn, String resourcePath) throws SQLException {
|
||||||
String sqlScript = loadClasspathResource(resourcePath);
|
String sqlScript = loadClasspathResource(resourcePath);
|
||||||
List<String> statements = splitSqlStatements(sqlScript);
|
List<String> statements = splitSqlStatements(sqlScript);
|
||||||
|
|||||||
@@ -23,6 +23,46 @@ public final class KeyEncodingUtil {
|
|||||||
|
|
||||||
private KeyEncodingUtil() {}
|
private KeyEncodingUtil() {}
|
||||||
|
|
||||||
|
public static String encodeBase58(byte[] input) {
|
||||||
|
if (input == null || input.length == 0) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
byte[] copy = java.util.Arrays.copyOf(input, input.length);
|
||||||
|
int zeros = 0;
|
||||||
|
while (zeros < copy.length && copy[zeros] == 0) {
|
||||||
|
zeros++;
|
||||||
|
}
|
||||||
|
byte[] encoded = new byte[copy.length * 2];
|
||||||
|
int outputStart = encoded.length;
|
||||||
|
int inputStart = zeros;
|
||||||
|
while (inputStart < copy.length) {
|
||||||
|
int remainder = divmod58(copy, inputStart);
|
||||||
|
if (copy[inputStart] == 0) {
|
||||||
|
inputStart++;
|
||||||
|
}
|
||||||
|
encoded[--outputStart] = (byte) BASE58_ALPHABET.charAt(remainder);
|
||||||
|
}
|
||||||
|
while (outputStart < encoded.length && encoded[outputStart] == (byte) BASE58_ALPHABET.charAt(0)) {
|
||||||
|
outputStart++;
|
||||||
|
}
|
||||||
|
while (--zeros >= 0) {
|
||||||
|
encoded[--outputStart] = (byte) BASE58_ALPHABET.charAt(0);
|
||||||
|
}
|
||||||
|
return new String(encoded, outputStart, encoded.length - outputStart, java.nio.charset.StandardCharsets.US_ASCII);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String base58KeyToBase64_32(String rawKey) {
|
||||||
|
if (rawKey == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
String value = rawKey.trim();
|
||||||
|
if (value.isEmpty()) {
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
byte[] decoded = tryDecodeBase58_32(value);
|
||||||
|
return decoded == null ? value : Base64.getEncoder().encodeToString(decoded);
|
||||||
|
}
|
||||||
|
|
||||||
public static String normalizeKeyToBase64_32(String rawKey) {
|
public static String normalizeKeyToBase64_32(String rawKey) {
|
||||||
if (rawKey == null) {
|
if (rawKey == null) {
|
||||||
return null;
|
return null;
|
||||||
@@ -102,6 +142,17 @@ public final class KeyEncodingUtil {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static int divmod58(byte[] number, int startAt) {
|
||||||
|
int remainder = 0;
|
||||||
|
for (int i = startAt; i < number.length; i++) {
|
||||||
|
int digit256 = number[i] & 0xFF;
|
||||||
|
int temp = remainder * 256 + digit256;
|
||||||
|
number[i] = (byte) (temp / 58);
|
||||||
|
remainder = temp % 58;
|
||||||
|
}
|
||||||
|
return remainder;
|
||||||
|
}
|
||||||
|
|
||||||
private static int divmod256(byte[] number58, int startAt) {
|
private static int divmod256(byte[] number58, int startAt) {
|
||||||
int remainder = 0;
|
int remainder = 0;
|
||||||
for (int i = startAt; i < number58.length; i++) {
|
for (int i = startAt; i < number58.length; i++) {
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ package shine.db;
|
|||||||
* MsgSubType — единое место для ВСЕХ subType сообщений (msg_sub_type).
|
* MsgSubType — единое место для ВСЕХ subType сообщений (msg_sub_type).
|
||||||
*
|
*
|
||||||
* ВАЖНО:
|
* ВАЖНО:
|
||||||
* - Значения должны совпадать с body-классами (TextBody/ReactionBody/ConnectionBody/UserParamBody/HeaderBody).
|
* - Значения должны совпадать с body-классами (TextLineBody/TextReplyBody/TextRatingBody/ReactionBody/ConnectionBody/UserParamBody/HeaderBody).
|
||||||
* - После релиза менять числа нельзя (иначе ломается совместимость данных).
|
* - После релиза менять числа нельзя (иначе ломается совместимость данных).
|
||||||
*/
|
*/
|
||||||
public final class MsgSubType {
|
public final class MsgSubType {
|
||||||
@@ -38,6 +38,7 @@ public final class MsgSubType {
|
|||||||
|
|
||||||
/** CHANNEL_META — скрытый технический снимок профиля канала. */
|
/** CHANNEL_META — скрытый технический снимок профиля канала. */
|
||||||
public static final short TEXT_CHANNEL_META = 90;
|
public static final short TEXT_CHANNEL_META = 90;
|
||||||
|
public static final short TEXT_CHANNEL_DELETE = 92;
|
||||||
|
|
||||||
/** ENTRYPOINT — входная страница канала (line-based). */
|
/** ENTRYPOINT — входная страница канала (line-based). */
|
||||||
public static final short TEXT_ENTRYPOINT = 100;
|
public static final short TEXT_ENTRYPOINT = 100;
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ public final class PostgresDbController {
|
|||||||
try {
|
try {
|
||||||
DatabaseInitializer.ensurePostgresSchemaInitialized(jdbcUrl, dbUser, dbPassword);
|
DatabaseInitializer.ensurePostgresSchemaInitialized(jdbcUrl, dbUser, dbPassword);
|
||||||
} catch (SQLException e) {
|
} catch (SQLException e) {
|
||||||
throw new RuntimeException("PostgreSQL schema auto-init failed", e);
|
throw new RuntimeException("PostgreSQL database compatibility/init failed: " + e.getMessage(), e);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.delegate = new DriverManagerDbProvider(jdbcUrl, dbUser, dbPassword, connection -> {
|
this.delegate = new DriverManagerDbProvider(jdbcUrl, dbUser, dbPassword, connection -> {
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import java.util.Locale;
|
|||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
public final class ChannelNameRules {
|
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 int MAX_DISPLAY_NAME_LENGTH = 32;
|
||||||
private static final Pattern DISPLAY_ALLOWED_PATTERN =
|
private static final Pattern DISPLAY_ALLOWED_PATTERN =
|
||||||
Pattern.compile("^[A-Za-z0-9_-]+$");
|
Pattern.compile("^[A-Za-z0-9_-]+$");
|
||||||
@@ -26,7 +26,7 @@ public final class ChannelNameRules {
|
|||||||
|
|
||||||
int length = normalized.codePointCount(0, normalized.length());
|
int length = normalized.codePointCount(0, normalized.length());
|
||||||
if (length < MIN_DISPLAY_NAME_LENGTH || length > MAX_DISPLAY_NAME_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()) {
|
if (!DISPLAY_ALLOWED_PATTERN.matcher(normalized).matches()) {
|
||||||
|
|||||||
@@ -269,6 +269,57 @@ public final class ActiveSessionsDAO {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Удаляет все сессии пользователя, кроме указанной текущей, и возвращает их sessionId.
|
||||||
|
* Вариант с Connection используется внутри транзакции запуска key rotation.
|
||||||
|
*/
|
||||||
|
public List<String> deleteOtherSessions(Connection c, String login, String keepSessionId) throws SQLException {
|
||||||
|
List<String> sessionIds = new ArrayList<>();
|
||||||
|
String selectSql = """
|
||||||
|
SELECT session_id
|
||||||
|
FROM active_sessions
|
||||||
|
WHERE LOWER(login) = LOWER(?)
|
||||||
|
AND session_id <> ?
|
||||||
|
""";
|
||||||
|
try (PreparedStatement ps = c.prepareStatement(selectSql)) {
|
||||||
|
ps.setString(1, login);
|
||||||
|
ps.setString(2, keepSessionId == null ? "" : keepSessionId);
|
||||||
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
|
while (rs.next()) sessionIds.add(rs.getString(1));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (sessionIds.isEmpty()) return sessionIds;
|
||||||
|
|
||||||
|
String deleteSql = """
|
||||||
|
DELETE FROM active_sessions
|
||||||
|
WHERE LOWER(login) = LOWER(?)
|
||||||
|
AND session_id <> ?
|
||||||
|
""";
|
||||||
|
try (PreparedStatement ps = c.prepareStatement(deleteSql)) {
|
||||||
|
ps.setString(1, login);
|
||||||
|
ps.setString(2, keepSessionId == null ? "" : keepSessionId);
|
||||||
|
ps.executeUpdate();
|
||||||
|
}
|
||||||
|
return sessionIds;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<String> deleteOtherSessions(String login, String keepSessionId) throws SQLException {
|
||||||
|
try (Connection c = db.getConnection()) {
|
||||||
|
boolean oldAutoCommit = c.getAutoCommit();
|
||||||
|
c.setAutoCommit(false);
|
||||||
|
try {
|
||||||
|
List<String> ids = deleteOtherSessions(c, login, keepSessionId);
|
||||||
|
c.commit();
|
||||||
|
return ids;
|
||||||
|
} catch (SQLException e) {
|
||||||
|
c.rollback();
|
||||||
|
throw e;
|
||||||
|
} finally {
|
||||||
|
c.setAutoCommit(oldAutoCommit);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// -------------------- MAPPER --------------------
|
// -------------------- MAPPER --------------------
|
||||||
|
|
||||||
private ActiveSessionEntry mapRow(ResultSet rs) throws SQLException {
|
private ActiveSessionEntry mapRow(ResultSet rs) throws SQLException {
|
||||||
|
|||||||
@@ -6,14 +6,16 @@ import java.sql.*;
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/** Persistent discovery/import queue for ANS-104 SHiNE blocks found through Arweave. */
|
/** Persistent discovery/import queue for individual ANS-104 SHiNE DataItems found through Arweave. */
|
||||||
public final class ArweaveBlockImportDAO {
|
public final class ArweaveBlockImportDAO {
|
||||||
public static final String STATUS_PENDING = "PENDING";
|
public static final String STATUS_PENDING = "PENDING";
|
||||||
public static final String STATUS_REJECTED = "REJECTED";
|
public static final String STATUS_REJECTED = "REJECTED";
|
||||||
|
|
||||||
public record QueueItem(byte[] dataItemId, String rootTxId, long blockHeight,
|
public record QueueItem(byte[] dataItemId, long blockHeight,
|
||||||
byte[] rawDataItem, String status, String lastError,
|
byte[] rawDataItem, String status, String lastError,
|
||||||
long firstSeenAtMs, long updatedAtMs) {}
|
long firstSeenAtMs, long updatedAtMs,
|
||||||
|
String parsedLogin, Integer parsedForkNumber, Integer parsedBlockNumber, byte[] parsedBlockHash,
|
||||||
|
boolean metadataValidated) {}
|
||||||
|
|
||||||
private static volatile ArweaveBlockImportDAO instance;
|
private static volatile ArweaveBlockImportDAO instance;
|
||||||
private final DbController db = DbController.getInstance();
|
private final DbController db = DbController.getInstance();
|
||||||
@@ -56,12 +58,12 @@ public final class ArweaveBlockImportDAO {
|
|||||||
String sql = """
|
String sql = """
|
||||||
INSERT INTO arweave_block_import_queue(
|
INSERT INTO arweave_block_import_queue(
|
||||||
data_item_id,root_tx_id,block_height,raw_data_item,status,last_error,first_seen_at_ms,updated_at_ms
|
data_item_id,root_tx_id,block_height,raw_data_item,status,last_error,first_seen_at_ms,updated_at_ms
|
||||||
) VALUES(?,?,?,?,?,'',?,?)
|
) VALUES(?,?,?,?,?, '',?,?)
|
||||||
ON CONFLICT(data_item_id) DO NOTHING
|
ON CONFLICT(data_item_id) DO NOTHING
|
||||||
""";
|
""";
|
||||||
try (Connection c = db.getConnection(); PreparedStatement ps = c.prepareStatement(sql)) {
|
try (Connection c = db.getConnection(); PreparedStatement ps = c.prepareStatement(sql)) {
|
||||||
ps.setBytes(1, dataItemId);
|
ps.setBytes(1, dataItemId);
|
||||||
ps.setString(2, rootTxId);
|
ps.setString(2, rootTxId == null ? "" : rootTxId.trim());
|
||||||
ps.setLong(3, blockHeight);
|
ps.setLong(3, blockHeight);
|
||||||
ps.setBytes(4, rawDataItem);
|
ps.setBytes(4, rawDataItem);
|
||||||
ps.setString(5, STATUS_PENDING);
|
ps.setString(5, STATUS_PENDING);
|
||||||
@@ -82,7 +84,8 @@ public final class ArweaveBlockImportDAO {
|
|||||||
public List<QueueItem> listPending(int limit) throws SQLException {
|
public List<QueueItem> listPending(int limit) throws SQLException {
|
||||||
int safeLimit = Math.max(1, Math.min(limit, 100_000));
|
int safeLimit = Math.max(1, Math.min(limit, 100_000));
|
||||||
String sql = """
|
String sql = """
|
||||||
SELECT data_item_id,root_tx_id,block_height,raw_data_item,status,last_error,first_seen_at_ms,updated_at_ms
|
SELECT data_item_id,block_height,raw_data_item,status,last_error,first_seen_at_ms,updated_at_ms,
|
||||||
|
parsed_login,parsed_fork_number,parsed_block_number,parsed_block_hash,metadata_validated
|
||||||
FROM arweave_block_import_queue
|
FROM arweave_block_import_queue
|
||||||
WHERE status=?
|
WHERE status=?
|
||||||
ORDER BY block_height ASC, first_seen_at_ms ASC
|
ORDER BY block_height ASC, first_seen_at_ms ASC
|
||||||
@@ -95,15 +98,57 @@ public final class ArweaveBlockImportDAO {
|
|||||||
try (ResultSet rs = ps.executeQuery()) {
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
while (rs.next()) {
|
while (rs.next()) {
|
||||||
out.add(new QueueItem(
|
out.add(new QueueItem(
|
||||||
rs.getBytes("data_item_id"), rs.getString("root_tx_id"), rs.getLong("block_height"),
|
rs.getBytes("data_item_id"), rs.getLong("block_height"),
|
||||||
rs.getBytes("raw_data_item"), rs.getString("status"), rs.getString("last_error"),
|
rs.getBytes("raw_data_item"), rs.getString("status"), rs.getString("last_error"),
|
||||||
rs.getLong("first_seen_at_ms"), rs.getLong("updated_at_ms")));
|
rs.getLong("first_seen_at_ms"), rs.getLong("updated_at_ms"),
|
||||||
|
rs.getString("parsed_login"), (Integer) rs.getObject("parsed_fork_number"),
|
||||||
|
(Integer) rs.getObject("parsed_block_number"), rs.getBytes("parsed_block_hash"),
|
||||||
|
rs.getBoolean("metadata_validated")));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Persist cryptographically validated parse metadata used to order canonical replay. */
|
||||||
|
public void markMetadataValidated(byte[] id, String login, int forkNumber, int blockNumber, byte[] blockHash, long nowMs)
|
||||||
|
throws SQLException {
|
||||||
|
String sql = """
|
||||||
|
UPDATE arweave_block_import_queue
|
||||||
|
SET parsed_login=?,parsed_fork_number=?,parsed_block_number=?,parsed_block_hash=?,metadata_validated=TRUE,
|
||||||
|
last_error='',updated_at_ms=?
|
||||||
|
WHERE data_item_id=? AND status=?
|
||||||
|
""";
|
||||||
|
try (Connection c=db.getConnection(); PreparedStatement ps=c.prepareStatement(sql)) {
|
||||||
|
ps.setString(1, login); ps.setInt(2, forkNumber); ps.setInt(3, blockNumber); ps.setBytes(4, blockHash);
|
||||||
|
ps.setLong(5, nowMs); ps.setBytes(6, id); ps.setString(7, STATUS_PENDING); ps.executeUpdate();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Pending items with verified signatures/owner metadata, in deterministic logical replay order. */
|
||||||
|
public List<QueueItem> listPendingValidated(int limit) throws SQLException {
|
||||||
|
int safeLimit=Math.max(1,Math.min(limit,100_000));
|
||||||
|
String sql="""
|
||||||
|
SELECT data_item_id,block_height,raw_data_item,status,last_error,first_seen_at_ms,updated_at_ms,
|
||||||
|
parsed_login,parsed_fork_number,parsed_block_number,parsed_block_hash,metadata_validated
|
||||||
|
FROM arweave_block_import_queue
|
||||||
|
WHERE status=? AND metadata_validated=TRUE
|
||||||
|
ORDER BY LOWER(parsed_login) ASC, parsed_block_number ASC, parsed_fork_number ASC, first_seen_at_ms ASC
|
||||||
|
LIMIT ?
|
||||||
|
""";
|
||||||
|
List<QueueItem> out=new ArrayList<>();
|
||||||
|
try(Connection c=db.getConnection();PreparedStatement ps=c.prepareStatement(sql)){
|
||||||
|
ps.setString(1,STATUS_PENDING);ps.setInt(2,safeLimit);
|
||||||
|
try(ResultSet rs=ps.executeQuery()){while(rs.next())out.add(new QueueItem(
|
||||||
|
rs.getBytes("data_item_id"),rs.getLong("block_height"),rs.getBytes("raw_data_item"),
|
||||||
|
rs.getString("status"),rs.getString("last_error"),rs.getLong("first_seen_at_ms"),rs.getLong("updated_at_ms"),
|
||||||
|
rs.getString("parsed_login"),(Integer)rs.getObject("parsed_fork_number"),(Integer)rs.getObject("parsed_block_number"),
|
||||||
|
rs.getBytes("parsed_block_hash"),rs.getBoolean("metadata_validated")));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
public void setPendingError(byte[] id, String error, long nowMs) throws SQLException {
|
public void setPendingError(byte[] id, String error, long nowMs) throws SQLException {
|
||||||
updateStatus(id, STATUS_PENDING, error, nowMs);
|
updateStatus(id, STATUS_PENDING, error, nowMs);
|
||||||
}
|
}
|
||||||
|
|||||||
+27
@@ -0,0 +1,27 @@
|
|||||||
|
package shine.db.dao;
|
||||||
|
|
||||||
|
import shine.db.DbController;
|
||||||
|
import java.sql.*;
|
||||||
|
|
||||||
|
/** Persistent ancestry/cache for segmented logical blockchains. */
|
||||||
|
public final class BlockchainForkSegmentsDAO {
|
||||||
|
private static volatile BlockchainForkSegmentsDAO instance;
|
||||||
|
private final DbController db=DbController.getInstance();
|
||||||
|
private BlockchainForkSegmentsDAO(){}
|
||||||
|
public static BlockchainForkSegmentsDAO getInstance(){ if(instance==null) synchronized(BlockchainForkSegmentsDAO.class){ if(instance==null) instance=new BlockchainForkSegmentsDAO(); } return instance; }
|
||||||
|
|
||||||
|
public record Segment(String login,int forkNumber,Integer parentForkNumber,int forkPointBlockNumber,byte[] forkPointBlockHash,int firstPhysicalBlockNumber,long createdAtMs){}
|
||||||
|
|
||||||
|
public Segment get(Connection c,String login,int fork)throws SQLException{
|
||||||
|
try(PreparedStatement ps=c.prepareStatement("SELECT login,fork_number,parent_fork_number,fork_point_block_number,fork_point_block_hash,first_physical_block_number,created_at_ms FROM blockchain_fork_segments WHERE LOWER(login)=LOWER(?) AND fork_number=?")){
|
||||||
|
ps.setString(1,login);ps.setInt(2,fork);try(ResultSet rs=ps.executeQuery()){if(!rs.next())return null; Object parent=rs.getObject(3); return new Segment(rs.getString(1),rs.getInt(2),parent==null?null:rs.getInt(3),rs.getInt(4),rs.getBytes(5),rs.getInt(6),rs.getLong(7));}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public Segment get(String login,int fork)throws SQLException{try(Connection c=db.getConnection()){return get(c,login,fork);}}
|
||||||
|
public void upsert(Connection c,Segment s)throws SQLException{
|
||||||
|
try(PreparedStatement ps=c.prepareStatement("""
|
||||||
|
INSERT INTO blockchain_fork_segments(login,fork_number,parent_fork_number,fork_point_block_number,fork_point_block_hash,first_physical_block_number,created_at_ms)
|
||||||
|
VALUES(?,?,?,?,?,?,?) ON CONFLICT(login,fork_number) DO UPDATE SET parent_fork_number=EXCLUDED.parent_fork_number,fork_point_block_number=EXCLUDED.fork_point_block_number,fork_point_block_hash=EXCLUDED.fork_point_block_hash,first_physical_block_number=EXCLUDED.first_physical_block_number
|
||||||
|
""")){ps.setString(1,s.login());ps.setInt(2,s.forkNumber());if(s.parentForkNumber()==null)ps.setNull(3,Types.INTEGER);else ps.setInt(3,s.parentForkNumber());ps.setInt(4,s.forkPointBlockNumber());if(s.forkPointBlockHash()==null)ps.setNull(5,Types.BINARY);else ps.setBytes(5,s.forkPointBlockHash());ps.setInt(6,s.firstPhysicalBlockNumber());ps.setLong(7,s.createdAtMs());ps.executeUpdate();}
|
||||||
|
}
|
||||||
|
}
|
||||||
+270
-481
@@ -1,509 +1,298 @@
|
|||||||
package shine.db.dao;
|
package shine.db.dao;
|
||||||
|
|
||||||
import shine.db.DatabaseInitializer;
|
|
||||||
import shine.db.DbController;
|
import shine.db.DbController;
|
||||||
|
import java.sql.*;
|
||||||
import java.sql.Connection;
|
|
||||||
import java.sql.PreparedStatement;
|
|
||||||
import java.sql.ResultSet;
|
|
||||||
import java.sql.SQLException;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* BlockchainResyncCleanupDAO — подготовительный "жёсткий reset" одной blockchain-цепочки
|
* Atomic cleanup of one physical fork before deterministic replay.
|
||||||
* перед её полной повторной загрузкой от сервера-партнёра.
|
* Physical fork identity is (login,fork_number). Incoming logical state is never rebound/deleted.
|
||||||
*
|
|
||||||
* Что делает этот DAO:
|
|
||||||
* 1) в ОДНОЙ SQL-транзакции сначала аккуратно уменьшает чужие агрегаты,
|
|
||||||
* которые были увеличены блоками удаляемой цепочки:
|
|
||||||
* - likes_count
|
|
||||||
* - replies_count
|
|
||||||
* 2) затем удаляет все локальные записи самой цепочки и её производные состояния.
|
|
||||||
*
|
|
||||||
* Почему это вынесено в отдельный DAO-метод, а не в триггеры DELETE:
|
|
||||||
* - нам нужен один понятный "блок операции", который можно вызвать из resync-flow;
|
|
||||||
* - эта схема проще и прозрачнее, чем много обратных триггеров по разным таблицам;
|
|
||||||
* - если любой шаг не удался, делаем rollback и БД остаётся в исходном состоянии;
|
|
||||||
* - пользовательские blockchain-файлы больше не существуют; cleanup полностью DB-only.
|
|
||||||
* SQL-транзакция и файловая система не коммитятся атомарно вместе;
|
|
||||||
* поэтому БД-чистка делается здесь, а файловая чистка будет следующим шагом
|
|
||||||
* отдельным recovery/resync-слоем после успешного commit.
|
|
||||||
*
|
|
||||||
* Важный смысл текущей реализации:
|
|
||||||
* - мы НЕ трогаем current users слой (`solana_user_pda_current`) и НЕ трогаем DM-таблицы;
|
|
||||||
* - мы очищаем только блокчейн пользователя и derived-state, который строится из неё;
|
|
||||||
* - висячие cross-chain ссылки в чужих blocks допускаются как нормальное поведение системы.
|
|
||||||
*/
|
*/
|
||||||
public final class BlockchainResyncCleanupDAO {
|
public final class BlockchainResyncCleanupDAO {
|
||||||
|
|
||||||
private static final int BLOCKCHAIN_LOGIN_SUFFIX_LEN = 4; // "-001"
|
|
||||||
|
|
||||||
private static volatile BlockchainResyncCleanupDAO instance;
|
private static volatile BlockchainResyncCleanupDAO instance;
|
||||||
|
private final DbController db=DbController.getInstance();
|
||||||
|
private BlockchainResyncCleanupDAO(){}
|
||||||
|
public static BlockchainResyncCleanupDAO getInstance(){ if(instance==null) synchronized(BlockchainResyncCleanupDAO.class){if(instance==null)instance=new BlockchainResyncCleanupDAO();} return instance; }
|
||||||
|
|
||||||
private final DbController db = DbController.getInstance();
|
|
||||||
|
|
||||||
private BlockchainResyncCleanupDAO() {}
|
|
||||||
|
|
||||||
public static BlockchainResyncCleanupDAO getInstance() {
|
|
||||||
if (instance == null) {
|
|
||||||
synchronized (BlockchainResyncCleanupDAO.class) {
|
|
||||||
if (instance == null) instance = new BlockchainResyncCleanupDAO();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return instance;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Полностью очищает одну blockchain-цепочку и локальные derived-state, собранные из неё.
|
|
||||||
*
|
|
||||||
* Порядок внутри транзакции намеренно такой:
|
|
||||||
* 1. Сначала уменьшаем чужие likes_count для тех целей, где финальное состояние
|
|
||||||
* реакции этой цепочки было LIKE.
|
|
||||||
* 2. Сначала уменьшаем чужие replies_count для reply-блоков этой цепочки.
|
|
||||||
* 3. После этого удаляем локальные derived-state самой цепочки.
|
|
||||||
* 4. В конце удаляем blocks и blockchain_state.
|
|
||||||
*
|
|
||||||
* Это правильно потому, что агрегаты (`message_stats`) должны видеть исходные blocks
|
|
||||||
* и reactions_state на момент пересчёта. Если удалить blocks раньше, мы потеряем
|
|
||||||
* источник правды для корректного уменьшения счётчиков.
|
|
||||||
*
|
|
||||||
* Метод идемпотентен по смыслу:
|
|
||||||
* - если часть данных уже удалена раньше, повторный вызов просто удалит "0 строк";
|
|
||||||
* - если blockchain_state уже отсутствует, login берём из blockchainName.
|
|
||||||
*
|
|
||||||
* Отдельно важно:
|
|
||||||
* - filesystem blockchain storage отсутствует;
|
|
||||||
* - здесь НЕТ повторной загрузки цепочки;
|
|
||||||
* - это только атомарная SQL-очистка БД, на которую потом будет опираться resync-flow.
|
|
||||||
*/
|
|
||||||
public CleanupResult cleanupBlockchainForFullResync(String blockchainName) throws SQLException {
|
public CleanupResult cleanupBlockchainForFullResync(String blockchainName) throws SQLException {
|
||||||
if (blockchainName == null || blockchainName.isBlank()) {
|
ChainRef ref=chainRef(blockchainName);
|
||||||
throw new IllegalArgumentException("blockchainName is blank");
|
try(Connection c=db.getConnection()){
|
||||||
}
|
boolean ac=c.getAutoCommit(); c.setAutoCommit(false);
|
||||||
|
try{
|
||||||
try (Connection c = db.getConnection()) {
|
// Targets liked by this actor must survive long enough to recount after actor rows are removed.
|
||||||
boolean oldAutoCommit = c.getAutoCommit();
|
try(Statement st=c.createStatement()){
|
||||||
c.setAutoCommit(false);
|
st.execute("CREATE TEMP TABLE IF NOT EXISTS shine_cleanup_targets(to_login TEXT,to_block_number INTEGER,to_block_hash BYTEA,PRIMARY KEY(to_login,to_block_number,to_block_hash)) ON COMMIT DROP");
|
||||||
try {
|
st.execute("TRUNCATE shine_cleanup_targets");
|
||||||
String login = resolveLoginForCleanup(c, blockchainName);
|
st.execute("CREATE TEMP TABLE IF NOT EXISTS shine_cleanup_channels(owner_bch_name TEXT,root_number INTEGER,root_hash BYTEA,PRIMARY KEY(owner_bch_name,root_number,root_hash)) ON COMMIT DROP");
|
||||||
|
st.execute("TRUNCATE shine_cleanup_channels");
|
||||||
int likesAdjusted = decreaseForeignLikesCount(c, blockchainName);
|
st.execute("CREATE TEMP TABLE IF NOT EXISTS shine_cleanup_users(login TEXT PRIMARY KEY) ON COMMIT DROP");
|
||||||
int repliesAdjusted = decreaseForeignRepliesCount(c, blockchainName);
|
st.execute("TRUNCATE shine_cleanup_users");
|
||||||
|
|
||||||
int deletedMessageStats = deleteMessageStatsForOwnTargets(c, blockchainName);
|
|
||||||
int deletedReactionsState = deleteReactionsStateForActorChain(c, blockchainName);
|
|
||||||
int deletedConnectionsState = deleteConnectionsStateForLogin(c, login);
|
|
||||||
int deletedUsersParams = deleteUsersParamsForLogin(c, login);
|
|
||||||
int deletedChannelNames = deleteChannelNamesForOwnerChain(c, blockchainName);
|
|
||||||
int deletedChat200State = deleteChat200StateForOwnerChain(c, blockchainName);
|
|
||||||
int deletedChat200Members = deleteChat200MembersForOwnerChain(c, blockchainName);
|
|
||||||
int deletedBlocks = deleteBlocksForChain(c, blockchainName);
|
|
||||||
int deletedBlockchainState = deleteBlockchainStateForChain(c, blockchainName);
|
|
||||||
|
|
||||||
rebuildStatsState(c);
|
|
||||||
|
|
||||||
c.commit();
|
|
||||||
|
|
||||||
return new CleanupResult(
|
|
||||||
login,
|
|
||||||
likesAdjusted,
|
|
||||||
repliesAdjusted,
|
|
||||||
deletedMessageStats,
|
|
||||||
deletedReactionsState,
|
|
||||||
deletedConnectionsState,
|
|
||||||
deletedUsersParams,
|
|
||||||
deletedChannelNames,
|
|
||||||
deletedChat200State,
|
|
||||||
deletedChat200Members,
|
|
||||||
deletedBlocks,
|
|
||||||
deletedBlockchainState
|
|
||||||
);
|
|
||||||
} catch (Exception e) {
|
|
||||||
try { c.rollback(); } catch (Exception ignored) {}
|
|
||||||
if (e instanceof SQLException sqlEx) throw sqlEx;
|
|
||||||
throw new SQLException("Не удалось очистить blockchain для полного resync: " + blockchainName, e);
|
|
||||||
} finally {
|
|
||||||
try { c.setAutoCommit(oldAutoCommit); } catch (Exception ignored) {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private String resolveLoginForCleanup(Connection c, String blockchainName) throws SQLException {
|
|
||||||
String sql = """
|
|
||||||
SELECT login
|
|
||||||
FROM blockchain_state
|
|
||||||
WHERE blockchain_name = ?
|
|
||||||
LIMIT 1
|
|
||||||
""";
|
|
||||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
|
||||||
ps.setString(1, blockchainName);
|
|
||||||
try (ResultSet rs = ps.executeQuery()) {
|
|
||||||
if (rs.next()) {
|
|
||||||
String login = rs.getString("login");
|
|
||||||
if (login != null && !login.isBlank()) {
|
|
||||||
return login;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
try(PreparedStatement ps=c.prepareStatement("""
|
||||||
|
INSERT INTO shine_cleanup_targets(to_login,to_block_number,to_block_hash)
|
||||||
|
SELECT DISTINCT to_login,to_block_number,to_block_hash FROM reactions_state
|
||||||
|
WHERE LOWER(from_login)=LOWER(?) AND reaction_type=1 AND last_sub_type=1
|
||||||
|
ON CONFLICT DO NOTHING
|
||||||
|
""")){ ps.setString(1,ref.login()); ps.executeUpdate(); }
|
||||||
|
|
||||||
|
try(PreparedStatement ps=c.prepareStatement("""
|
||||||
|
INSERT INTO shine_cleanup_users(login)
|
||||||
|
SELECT DISTINCT to_login FROM connections_state
|
||||||
|
WHERE LOWER(login)=LOWER(?) AND to_login IS NOT NULL AND btrim(to_login)<>''
|
||||||
|
ON CONFLICT DO NOTHING
|
||||||
|
""")){ps.setString(1,ref.login());ps.executeUpdate();}
|
||||||
|
|
||||||
|
try(PreparedStatement ps=c.prepareStatement("""
|
||||||
|
INSERT INTO shine_cleanup_channels(owner_bch_name,root_number,root_hash)
|
||||||
|
SELECT DISTINCT cn.owner_bch_name,cn.channel_root_block_number,cn.channel_root_block_hash
|
||||||
|
FROM connections_state cs 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 LOWER(cs.login)=LOWER(?) AND cs.rel_type=30
|
||||||
|
ON CONFLICT DO NOTHING
|
||||||
|
""")){ps.setString(1,ref.login());ps.executeUpdate();}
|
||||||
|
|
||||||
|
// Followers of channels owned by this login must be refreshed after those channel projections are removed.
|
||||||
|
try(PreparedStatement ps=c.prepareStatement("""
|
||||||
|
INSERT INTO shine_cleanup_users(login)
|
||||||
|
SELECT DISTINCT cs.login
|
||||||
|
FROM connections_state cs
|
||||||
|
JOIN channel_names_state cn
|
||||||
|
ON LOWER(cn.owner_login)=LOWER(?)
|
||||||
|
AND LOWER(cs.to_login)=LOWER(cn.owner_login)
|
||||||
|
AND cs.to_block_number=cn.channel_root_block_number
|
||||||
|
AND cs.to_block_hash=cn.channel_root_block_hash
|
||||||
|
WHERE cs.rel_type=30
|
||||||
|
ON CONFLICT DO NOTHING
|
||||||
|
""")){ps.setString(1,ref.login());ps.executeUpdate();}
|
||||||
|
|
||||||
|
int deletedReactions=delete(c,"DELETE FROM reactions_state WHERE LOWER(from_login)=LOWER(?)",ref.login());
|
||||||
|
recountAffectedLikes(c);
|
||||||
|
int deletedConnections=delete(c,"DELETE FROM connections_state WHERE LOWER(login)=LOWER(?)",ref.login());
|
||||||
|
refreshAffectedChannelStats(c);
|
||||||
|
int deletedUsersParams=delete(c,"DELETE FROM users_params WHERE LOWER(login)=LOWER(?)",ref.login());
|
||||||
|
try(PreparedStatement ps=c.prepareStatement("SELECT shine_refresh_user_profile(?)")){ps.setString(1,ref.login());ps.execute();}
|
||||||
|
try(PreparedStatement ps=c.prepareStatement("SELECT shine_refresh_related_user_stats(?)")){ps.setString(1,ref.login());ps.execute();}
|
||||||
|
// Channel/chat projections are owned by login; replay recreates them. Incoming social stats are intentionally untouched.
|
||||||
|
delete(c,"DELETE FROM channel_stats_state WHERE LOWER(owner_login)=LOWER(?)",ref.login());
|
||||||
|
int deletedChannelNames=delete(c,"DELETE FROM channel_names_state WHERE LOWER(owner_login)=LOWER(?)",ref.login());
|
||||||
|
refreshAffectedUserStats(c);
|
||||||
|
int deletedChat200=delete(c,"DELETE FROM chat200_state WHERE LOWER(owner_login)=LOWER(?)",ref.login());
|
||||||
|
int deletedChatMembers=delete(c,"DELETE FROM chat200_members_state WHERE owner_bch_name LIKE ?",ref.login()+"-%");
|
||||||
|
try(PreparedStatement ps=c.prepareStatement("SELECT shine_refresh_user_stats(?)")){ps.setString(1,ref.login());ps.execute();}
|
||||||
|
|
||||||
|
int deletedBlocks;
|
||||||
|
try(PreparedStatement ps=c.prepareStatement("DELETE FROM blocks_store WHERE LOWER(login)=LOWER(?) AND fork_number=?")){
|
||||||
|
ps.setString(1,ref.login()); ps.setInt(2,ref.fork()); deletedBlocks=ps.executeUpdate();
|
||||||
|
}
|
||||||
|
int deletedState;
|
||||||
|
try(PreparedStatement ps=c.prepareStatement("DELETE FROM blockchain_state_store WHERE LOWER(login)=LOWER(?) AND fork_number=?")){
|
||||||
|
ps.setString(1,ref.login()); ps.setInt(2,ref.fork()); deletedState=ps.executeUpdate();
|
||||||
|
}
|
||||||
|
c.commit();
|
||||||
|
return new CleanupResult(ref.login(),deletedReactions,deletedConnections,deletedUsersParams,deletedChannelNames,deletedChat200,deletedChatMembers,deletedBlocks,deletedState);
|
||||||
|
}catch(Exception e){ try{c.rollback();}catch(Exception ignored){} if(e instanceof SQLException x)throw x; throw new SQLException("Stage2 fork cleanup failed: "+blockchainName,e); }
|
||||||
|
finally{try{c.setAutoCommit(ac);}catch(Exception ignored){}}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Clears all materialized state and raw local forks for one login before canonical replay.
|
||||||
|
* Raw canonical bytes must already be persisted in rebuild staging.
|
||||||
|
*
|
||||||
|
* This operation is deliberately idempotent. Before deleting the actor's projections we
|
||||||
|
* remember every foreign user/channel/message aggregate touched by them, then repair those
|
||||||
|
* aggregates after the rows/blocks have been removed. Canonical replay can therefore start
|
||||||
|
* from a clean baseline without double-counting replies, likes or subscriptions.
|
||||||
|
*/
|
||||||
|
public void cleanupLoginForCanonicalReplay(String login) throws SQLException {
|
||||||
|
if(login==null||login.isBlank())throw new IllegalArgumentException("login is blank");
|
||||||
|
try(Connection c=db.getConnection()){boolean ac=c.getAutoCommit();c.setAutoCommit(false);try{
|
||||||
|
try(Statement st=c.createStatement()){
|
||||||
|
st.execute("CREATE TEMP TABLE IF NOT EXISTS shine_cleanup_targets(to_login TEXT,to_block_number INTEGER,to_block_hash BYTEA,PRIMARY KEY(to_login,to_block_number,to_block_hash)) ON COMMIT DROP");
|
||||||
|
st.execute("TRUNCATE shine_cleanup_targets");
|
||||||
|
st.execute("CREATE TEMP TABLE IF NOT EXISTS shine_cleanup_reply_targets(to_login TEXT,to_block_number INTEGER,to_block_hash BYTEA,PRIMARY KEY(to_login,to_block_number,to_block_hash)) ON COMMIT DROP");
|
||||||
|
st.execute("TRUNCATE shine_cleanup_reply_targets");
|
||||||
|
st.execute("CREATE TEMP TABLE IF NOT EXISTS shine_cleanup_channels(owner_bch_name TEXT,root_number INTEGER,root_hash BYTEA,PRIMARY KEY(owner_bch_name,root_number,root_hash)) ON COMMIT DROP");
|
||||||
|
st.execute("TRUNCATE shine_cleanup_channels");
|
||||||
|
st.execute("CREATE TEMP TABLE IF NOT EXISTS shine_cleanup_users(login TEXT PRIMARY KEY) ON COMMIT DROP");
|
||||||
|
st.execute("TRUNCATE shine_cleanup_users");
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
String loginFromName = loginFromBlockchainName(blockchainName);
|
// Existing LIKE state produced by this actor.
|
||||||
if (loginFromName == null || loginFromName.isBlank()) {
|
try(PreparedStatement ps=c.prepareStatement("INSERT INTO shine_cleanup_targets SELECT DISTINCT to_login,to_block_number,to_block_hash FROM reactions_state WHERE LOWER(from_login)=LOWER(?) AND reaction_type=1 AND last_sub_type=1 ON CONFLICT DO NOTHING")){ps.setString(1,login);ps.executeUpdate();}
|
||||||
throw new IllegalArgumentException("Cannot derive login from blockchainName: " + blockchainName);
|
|
||||||
}
|
|
||||||
return loginFromName;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
// Existing REPLY blocks produced by this actor. Their counters must be recomputed
|
||||||
* DAO остаётся в модуле БД и не тянет зависимость на blockchain-utils модуль.
|
// after deleting the old canonical blocks and before replay inserts the new canonical set.
|
||||||
* Поэтому здесь локально повторяем минимальное правило имени chain:
|
try(PreparedStatement ps=c.prepareStatement("""
|
||||||
* login + "-NNN".
|
INSERT INTO shine_cleanup_reply_targets(to_login,to_block_number,to_block_hash)
|
||||||
*/
|
SELECT DISTINCT to_login,to_block_number,to_block_hash
|
||||||
private String loginFromBlockchainName(String blockchainName) {
|
FROM blocks_store
|
||||||
if (blockchainName == null) return null;
|
WHERE LOWER(login)=LOWER(?) AND msg_type=1 AND msg_sub_type=20
|
||||||
|
AND to_login IS NOT NULL AND to_block_number IS NOT NULL AND to_block_hash IS NOT NULL
|
||||||
|
ON CONFLICT DO NOTHING
|
||||||
|
""")){ps.setString(1,login);ps.executeUpdate();}
|
||||||
|
|
||||||
String s = blockchainName.trim();
|
// Users whose social counters may change when this actor's connection projection disappears.
|
||||||
if (s.length() <= BLOCKCHAIN_LOGIN_SUFFIX_LEN) return null;
|
try(PreparedStatement ps=c.prepareStatement("""
|
||||||
|
INSERT INTO shine_cleanup_users(login)
|
||||||
|
SELECT DISTINCT to_login FROM connections_state
|
||||||
|
WHERE LOWER(login)=LOWER(?) AND to_login IS NOT NULL AND btrim(to_login)<>''
|
||||||
|
ON CONFLICT DO NOTHING
|
||||||
|
""")){ps.setString(1,login);ps.executeUpdate();}
|
||||||
|
try(PreparedStatement ps=c.prepareStatement("INSERT INTO shine_cleanup_users(login) VALUES(?) ON CONFLICT DO NOTHING")){ps.setString(1,login);ps.executeUpdate();}
|
||||||
|
|
||||||
int dashPos = s.length() - BLOCKCHAIN_LOGIN_SUFFIX_LEN;
|
// Foreign channels followed/unfollowed by this actor.
|
||||||
if (s.charAt(dashPos) != '-') return null;
|
try(PreparedStatement ps=c.prepareStatement("""
|
||||||
|
INSERT INTO shine_cleanup_channels(owner_bch_name,root_number,root_hash)
|
||||||
|
SELECT DISTINCT cn.owner_bch_name,cn.channel_root_block_number,cn.channel_root_block_hash
|
||||||
|
FROM connections_state cs 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 LOWER(cs.login)=LOWER(?) AND cs.rel_type=30
|
||||||
|
ON CONFLICT DO NOTHING
|
||||||
|
""")){ps.setString(1,login);ps.executeUpdate();}
|
||||||
|
|
||||||
for (int i = dashPos + 1; i < s.length(); i++) {
|
// Followers of channels owned by this login are also affected while channel projections
|
||||||
char ch = s.charAt(i);
|
// disappear and are recreated by replay.
|
||||||
if (ch < '0' || ch > '9') return null;
|
try(PreparedStatement ps=c.prepareStatement("""
|
||||||
}
|
INSERT INTO shine_cleanup_users(login)
|
||||||
return s.substring(0, dashPos);
|
SELECT DISTINCT cs.login
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Уменьшаем likes_count только для ЧУЖИХ целей.
|
|
||||||
*
|
|
||||||
* Логика:
|
|
||||||
* - если у удаляемой цепочки финальное состояние реакции на цель = LIKE,
|
|
||||||
* значит при полном удалении цепочки этот активный лайк исчезает;
|
|
||||||
* - значит у message_stats этой чужой цели нужно сделать -1;
|
|
||||||
* - для целей внутри этой же chain этого делать не нужно, потому что сами цели
|
|
||||||
* тоже будут удалены вместе с цепочкой.
|
|
||||||
*/
|
|
||||||
private int decreaseForeignLikesCount(Connection c, String blockchainName) throws SQLException {
|
|
||||||
String sql = """
|
|
||||||
UPDATE message_stats
|
|
||||||
SET likes_count = GREATEST(
|
|
||||||
0,
|
|
||||||
likes_count - COALESCE((
|
|
||||||
SELECT COUNT(*)::int
|
|
||||||
FROM reactions_state rs
|
|
||||||
WHERE rs.from_bch_name = ?
|
|
||||||
AND rs.reaction_type = ?
|
|
||||||
AND rs.last_sub_type = ?
|
|
||||||
AND rs.to_login = message_stats.to_login
|
|
||||||
AND rs.to_bch_name = message_stats.to_bch_name
|
|
||||||
AND rs.to_block_number = message_stats.to_block_number
|
|
||||||
AND rs.to_block_hash = message_stats.to_block_hash
|
|
||||||
AND rs.to_bch_name <> ?
|
|
||||||
), 0)
|
|
||||||
)
|
|
||||||
WHERE EXISTS (
|
|
||||||
SELECT 1
|
|
||||||
FROM reactions_state rs
|
|
||||||
WHERE rs.from_bch_name = ?
|
|
||||||
AND rs.reaction_type = ?
|
|
||||||
AND rs.last_sub_type = ?
|
|
||||||
AND rs.to_login = message_stats.to_login
|
|
||||||
AND rs.to_bch_name = message_stats.to_bch_name
|
|
||||||
AND rs.to_block_number = message_stats.to_block_number
|
|
||||||
AND rs.to_block_hash = message_stats.to_block_hash
|
|
||||||
AND rs.to_bch_name <> ?
|
|
||||||
)
|
|
||||||
""";
|
|
||||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
|
||||||
int i = 1;
|
|
||||||
ps.setString(i++, blockchainName);
|
|
||||||
ps.setInt(i++, DatabaseInitializer.REACTION_LIKE);
|
|
||||||
ps.setInt(i++, DatabaseInitializer.REACTION_LIKE);
|
|
||||||
ps.setString(i++, blockchainName);
|
|
||||||
ps.setString(i++, blockchainName);
|
|
||||||
ps.setInt(i++, DatabaseInitializer.REACTION_LIKE);
|
|
||||||
ps.setInt(i++, DatabaseInitializer.REACTION_LIKE);
|
|
||||||
ps.setString(i++, blockchainName);
|
|
||||||
return ps.executeUpdate();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Уменьшаем replies_count только для ЧУЖИХ целей.
|
|
||||||
*
|
|
||||||
* Если reply этой цепочки ссылался на сообщение из другой цепочки,
|
|
||||||
* значит после удаления blocks этой цепочки чужой replies_count должен уменьшиться.
|
|
||||||
* Reply на собственные сообщения здесь игнорируем: целевая цепочка тоже будет удалена.
|
|
||||||
*/
|
|
||||||
private int decreaseForeignRepliesCount(Connection c, String blockchainName) throws SQLException {
|
|
||||||
String sql = """
|
|
||||||
UPDATE message_stats
|
|
||||||
SET replies_count = GREATEST(
|
|
||||||
0,
|
|
||||||
replies_count - COALESCE((
|
|
||||||
SELECT COUNT(*)::int
|
|
||||||
FROM blocks b
|
|
||||||
WHERE b.bch_name = ?
|
|
||||||
AND b.msg_type = 1
|
|
||||||
AND b.msg_sub_type = ?
|
|
||||||
AND b.to_login = message_stats.to_login
|
|
||||||
AND b.to_bch_name = message_stats.to_bch_name
|
|
||||||
AND b.to_block_number = message_stats.to_block_number
|
|
||||||
AND b.to_block_hash = message_stats.to_block_hash
|
|
||||||
AND b.to_bch_name <> ?
|
|
||||||
), 0)
|
|
||||||
)
|
|
||||||
WHERE EXISTS (
|
|
||||||
SELECT 1
|
|
||||||
FROM blocks b
|
|
||||||
WHERE b.bch_name = ?
|
|
||||||
AND b.msg_type = 1
|
|
||||||
AND b.msg_sub_type = ?
|
|
||||||
AND b.to_login = message_stats.to_login
|
|
||||||
AND b.to_bch_name = message_stats.to_bch_name
|
|
||||||
AND b.to_block_number = message_stats.to_block_number
|
|
||||||
AND b.to_block_hash = message_stats.to_block_hash
|
|
||||||
AND b.to_bch_name <> ?
|
|
||||||
)
|
|
||||||
""";
|
|
||||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
|
||||||
int i = 1;
|
|
||||||
ps.setString(i++, blockchainName);
|
|
||||||
ps.setInt(i++, DatabaseInitializer.TEXT_REPLY);
|
|
||||||
ps.setString(i++, blockchainName);
|
|
||||||
ps.setString(i++, blockchainName);
|
|
||||||
ps.setInt(i++, DatabaseInitializer.TEXT_REPLY);
|
|
||||||
ps.setString(i++, blockchainName);
|
|
||||||
return ps.executeUpdate();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Статистика сообщений самой удаляемой цепочки после reset не нужна,
|
|
||||||
* потому что её цели исчезают вместе с chain source data.
|
|
||||||
*/
|
|
||||||
private int deleteMessageStatsForOwnTargets(Connection c, String blockchainName) throws SQLException {
|
|
||||||
return executeDelete(c, """
|
|
||||||
DELETE FROM message_stats
|
|
||||||
WHERE to_bch_name = ?
|
|
||||||
""", blockchainName);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* reactions_state хранит финальное состояние реакций АКТОРА.
|
|
||||||
* После удаления всей цепочки актор этой цепочки исчезает, поэтому
|
|
||||||
* достаточно удалить все строки по from_bch_name.
|
|
||||||
*/
|
|
||||||
private int deleteReactionsStateForActorChain(Connection c, String blockchainName) throws SQLException {
|
|
||||||
return executeDelete(c, """
|
|
||||||
DELETE FROM reactions_state
|
|
||||||
WHERE from_bch_name = ?
|
|
||||||
""", blockchainName);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* connections_state — текущее состояние связей, выставленных этим login.
|
|
||||||
* Чистим по владельцу состояния.
|
|
||||||
*/
|
|
||||||
private int deleteConnectionsStateForLogin(Connection c, String login) throws SQLException {
|
|
||||||
return executeDelete(c, """
|
|
||||||
DELETE FROM connections_state
|
|
||||||
WHERE LOWER(login) = LOWER(?)
|
|
||||||
""", login);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* users_params — актуальные параметры, собранные из блоков пользователя.
|
|
||||||
*/
|
|
||||||
private int deleteUsersParamsForLogin(Connection c, String login) throws SQLException {
|
|
||||||
return executeDelete(c, """
|
|
||||||
DELETE FROM users_params
|
|
||||||
WHERE LOWER(login) = LOWER(?)
|
|
||||||
""", login);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Каналы принадлежат owner_bch_name.
|
|
||||||
*/
|
|
||||||
private int deleteChannelNamesForOwnerChain(Connection c, String blockchainName) throws SQLException {
|
|
||||||
return executeDelete(c, """
|
|
||||||
DELETE FROM channel_names_state
|
|
||||||
WHERE owner_bch_name = ?
|
|
||||||
""", blockchainName);
|
|
||||||
}
|
|
||||||
|
|
||||||
private int deleteChat200StateForOwnerChain(Connection c, String blockchainName) throws SQLException {
|
|
||||||
return executeDelete(c, """
|
|
||||||
DELETE FROM chat200_state
|
|
||||||
WHERE owner_bch_name = ?
|
|
||||||
""", blockchainName);
|
|
||||||
}
|
|
||||||
|
|
||||||
private int deleteChat200MembersForOwnerChain(Connection c, String blockchainName) throws SQLException {
|
|
||||||
return executeDelete(c, """
|
|
||||||
DELETE FROM chat200_members_state
|
|
||||||
WHERE owner_bch_name = ?
|
|
||||||
""", blockchainName);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* blocks удаляем в конце, потому что до этого шага они нужны как источник правды
|
|
||||||
* для уменьшения replies_count.
|
|
||||||
*/
|
|
||||||
private int deleteBlocksForChain(Connection c, String blockchainName) throws SQLException {
|
|
||||||
return executeDelete(c, """
|
|
||||||
DELETE FROM blocks
|
|
||||||
WHERE bch_name = ?
|
|
||||||
""", blockchainName);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* blockchain_state удаляем после blocks, чтобы не нарушать FK-связь blocks -> blockchain_state.
|
|
||||||
*/
|
|
||||||
private int deleteBlockchainStateForChain(Connection c, String blockchainName) throws SQLException {
|
|
||||||
return executeDelete(c, """
|
|
||||||
DELETE FROM blockchain_state
|
|
||||||
WHERE blockchain_name = ?
|
|
||||||
""", blockchainName);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void rebuildStatsState(Connection c) throws SQLException {
|
|
||||||
try (PreparedStatement truncate = c.prepareStatement("""
|
|
||||||
TRUNCATE TABLE user_stats_state, channel_stats_state
|
|
||||||
""")) {
|
|
||||||
truncate.executeUpdate();
|
|
||||||
}
|
|
||||||
|
|
||||||
try (PreparedStatement ps = c.prepareStatement("""
|
|
||||||
INSERT INTO user_stats_state (
|
|
||||||
login,
|
|
||||||
owned_public_channels_count,
|
|
||||||
following_users_count,
|
|
||||||
following_channels_count,
|
|
||||||
close_friends_count,
|
|
||||||
updated_at_ms
|
|
||||||
)
|
|
||||||
SELECT
|
|
||||||
u.login,
|
|
||||||
COALESCE(own.owned_public_channels_count, 0),
|
|
||||||
COALESCE(fu.following_users_count, 0),
|
|
||||||
COALESCE(fc.following_channels_count, 0),
|
|
||||||
COALESCE(cf.close_friends_count, 0),
|
|
||||||
CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
|
|
||||||
FROM solana_user_pda_current u
|
|
||||||
LEFT JOIN (
|
|
||||||
SELECT owner_login, COUNT(*)::INTEGER AS owned_public_channels_count
|
|
||||||
FROM channel_names_state
|
|
||||||
WHERE channel_type_code = 1
|
|
||||||
GROUP BY owner_login
|
|
||||||
) own ON LOWER(own.owner_login) = LOWER(u.login)
|
|
||||||
LEFT JOIN (
|
|
||||||
SELECT login, COUNT(*)::INTEGER AS following_users_count
|
|
||||||
FROM connections_state
|
|
||||||
WHERE rel_type = 30
|
|
||||||
AND to_block_number = 0
|
|
||||||
GROUP BY login
|
|
||||||
) fu ON LOWER(fu.login) = LOWER(u.login)
|
|
||||||
LEFT JOIN (
|
|
||||||
SELECT cs.login, COUNT(*)::INTEGER AS following_channels_count
|
|
||||||
FROM connections_state cs
|
FROM connections_state cs
|
||||||
JOIN channel_names_state cn
|
JOIN channel_names_state cn
|
||||||
ON cn.owner_bch_name = cs.to_bch_name
|
ON LOWER(cn.owner_login)=LOWER(?)
|
||||||
AND cn.channel_root_block_number = cs.to_block_number
|
AND LOWER(cs.to_login)=LOWER(cn.owner_login)
|
||||||
AND cn.channel_root_block_hash = cs.to_block_hash
|
AND cs.to_block_number=cn.channel_root_block_number
|
||||||
WHERE cs.rel_type = 30
|
AND cs.to_block_hash=cn.channel_root_block_hash
|
||||||
AND cn.channel_type_code = 1
|
WHERE cs.rel_type=30
|
||||||
GROUP BY cs.login
|
ON CONFLICT DO NOTHING
|
||||||
) fc ON LOWER(fc.login) = LOWER(u.login)
|
""")){ps.setString(1,login);ps.executeUpdate();}
|
||||||
LEFT JOIN (
|
|
||||||
SELECT login, COUNT(*)::INTEGER AS close_friends_count
|
|
||||||
FROM connections_state
|
|
||||||
WHERE rel_type = 10
|
|
||||||
GROUP BY login
|
|
||||||
) cf ON LOWER(cf.login) = LOWER(u.login)
|
|
||||||
""")) {
|
|
||||||
ps.executeUpdate();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
delete(c,"DELETE FROM reactions_state WHERE LOWER(from_login)=LOWER(?)",login);
|
||||||
|
recountAffectedLikes(c);
|
||||||
|
delete(c,"DELETE FROM connections_state WHERE LOWER(login)=LOWER(?)",login);
|
||||||
|
refreshAffectedChannelStats(c);
|
||||||
|
delete(c,"DELETE FROM users_params WHERE LOWER(login)=LOWER(?)",login);
|
||||||
|
delete(c,"DELETE FROM channel_stats_state WHERE LOWER(owner_login)=LOWER(?)",login);
|
||||||
|
delete(c,"DELETE FROM channel_names_state WHERE LOWER(owner_login)=LOWER(?)",login);
|
||||||
|
|
||||||
try (PreparedStatement ps = c.prepareStatement("SELECT shine_refresh_user_profile(login) FROM solana_user_pda_current")) {
|
// Notifications are projections of source blockchain blocks. Canonical replay recreates
|
||||||
ps.execute();
|
// only the notifications that still exist on the selected branch.
|
||||||
}
|
delete(c,"DELETE FROM user_notifications_state WHERE LOWER(source_login)=LOWER(?)",login);
|
||||||
try (PreparedStatement ps = c.prepareStatement("SELECT shine_refresh_user_stats(login) FROM solana_user_pda_current")) {
|
|
||||||
ps.execute();
|
|
||||||
}
|
|
||||||
try (PreparedStatement ps = c.prepareStatement("""
|
|
||||||
UPDATE message_stats ms SET
|
|
||||||
primary_likes_count=(SELECT COUNT(*)::INTEGER FROM reactions_state rs WHERE rs.reaction_type=1 AND rs.last_sub_type=1
|
|
||||||
AND rs.to_login=ms.to_login AND rs.to_bch_name=ms.to_bch_name AND rs.to_block_number=ms.to_block_number AND rs.to_block_hash=ms.to_block_hash
|
|
||||||
AND shine_is_primary(rs.from_login)),
|
|
||||||
shining_likes_count=(SELECT COUNT(*)::INTEGER FROM reactions_state rs WHERE rs.reaction_type=1 AND rs.last_sub_type=1
|
|
||||||
AND rs.to_login=ms.to_login AND rs.to_bch_name=ms.to_bch_name AND rs.to_block_number=ms.to_block_number AND rs.to_block_hash=ms.to_block_hash
|
|
||||||
AND shine_is_primary(rs.from_login) AND shine_is_shining(rs.from_login))
|
|
||||||
""")) {
|
|
||||||
ps.executeUpdate();
|
|
||||||
}
|
|
||||||
|
|
||||||
try (PreparedStatement ps = c.prepareStatement("""
|
// Chat200 is legacy/unused and is intentionally not maintained by segmented-fork replay.
|
||||||
INSERT INTO channel_stats_state (
|
delete(c,"DELETE FROM chat200_state WHERE LOWER(owner_login)=LOWER(?)",login);
|
||||||
owner_bch_name,
|
delete(c,"DELETE FROM chat200_members_state WHERE owner_bch_name LIKE ?",login+"-%");
|
||||||
channel_root_block_number,
|
|
||||||
channel_root_block_hash,
|
|
||||||
owner_login,
|
|
||||||
channel_type_code,
|
|
||||||
subscribers_count,
|
|
||||||
updated_at_ms
|
|
||||||
)
|
|
||||||
SELECT
|
|
||||||
cn.owner_bch_name,
|
|
||||||
cn.channel_root_block_number,
|
|
||||||
cn.channel_root_block_hash,
|
|
||||||
cn.owner_login,
|
|
||||||
cn.channel_type_code,
|
|
||||||
COUNT(DISTINCT cs.login)::INTEGER AS subscribers_count,
|
|
||||||
CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
|
|
||||||
FROM channel_names_state cn
|
|
||||||
LEFT JOIN connections_state cs
|
|
||||||
ON cs.rel_type = 30
|
|
||||||
AND cs.to_bch_name = cn.owner_bch_name
|
|
||||||
AND cs.to_block_number = cn.channel_root_block_number
|
|
||||||
AND cs.to_block_hash = cn.channel_root_block_hash
|
|
||||||
WHERE cn.channel_type_code = 1
|
|
||||||
GROUP BY
|
|
||||||
cn.owner_bch_name,
|
|
||||||
cn.channel_root_block_number,
|
|
||||||
cn.channel_root_block_hash,
|
|
||||||
cn.owner_login,
|
|
||||||
cn.channel_type_code
|
|
||||||
""")) {
|
|
||||||
ps.executeUpdate();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private int executeDelete(Connection c, String sql, String value) throws SQLException {
|
delete(c,"DELETE FROM blocks_store WHERE LOWER(login)=LOWER(?)",login);
|
||||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
delete(c,"DELETE FROM blockchain_state_store WHERE LOWER(login)=LOWER(?)",login);
|
||||||
ps.setString(1, value);
|
|
||||||
return ps.executeUpdate();
|
// With the old reply blocks gone, establish the exact baseline produced by all other
|
||||||
}
|
// actors. Replay will then add this actor's canonical replies exactly once.
|
||||||
|
recountAffectedReplies(c);
|
||||||
|
|
||||||
|
try(PreparedStatement ps=c.prepareStatement("SELECT shine_refresh_user_profile(?)")){ps.setString(1,login);ps.execute();}
|
||||||
|
try(PreparedStatement ps=c.prepareStatement("SELECT shine_refresh_related_user_stats(?)")){ps.setString(1,login);ps.execute();}
|
||||||
|
refreshAffectedUserStats(c);
|
||||||
|
c.commit();
|
||||||
|
}catch(Exception e){c.rollback();if(e instanceof SQLException x)throw x;throw new SQLException("canonical replay cleanup failed",e);}finally{c.setAutoCommit(ac);}}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Технический результат cleanup-операции.
|
* Repairs server-owned projections after canonical replay. It is safe to call repeatedly.
|
||||||
* Нужен для будущего логирования и ручной диагностики resync-flow.
|
* Signed channel read watermarks are preserved; only server-owned unread values are recomputed.
|
||||||
*/
|
*/
|
||||||
public record CleanupResult(
|
public void finalizeCanonicalReplay(String login) throws SQLException {
|
||||||
String login,
|
if(login==null||login.isBlank())throw new IllegalArgumentException("login is blank");
|
||||||
int likesAdjustedRows,
|
try(Connection c=db.getConnection()){boolean ac=c.getAutoCommit();c.setAutoCommit(false);try{
|
||||||
int repliesAdjustedRows,
|
// Remove view references to discarded messages of this user. Valid canonical targets survive.
|
||||||
int deletedMessageStatsRows,
|
try(PreparedStatement ps=c.prepareStatement("""
|
||||||
int deletedReactionsStateRows,
|
DELETE FROM message_views_state mv
|
||||||
int deletedConnectionsStateRows,
|
WHERE LOWER(mv.to_login)=LOWER(?)
|
||||||
int deletedUsersParamsRows,
|
AND NOT EXISTS (
|
||||||
int deletedChannelNamesRows,
|
SELECT 1 FROM blocks_store b
|
||||||
int deletedChat200StateRows,
|
WHERE LOWER(b.login)=LOWER(mv.to_login)
|
||||||
int deletedChat200MembersRows,
|
AND b.block_number=mv.to_block_number AND b.block_hash=mv.to_block_hash
|
||||||
int deletedBlocksRows,
|
)
|
||||||
int deletedBlockchainStateRows
|
""")){ps.setString(1,login);ps.executeUpdate();}
|
||||||
) {}
|
|
||||||
|
// Recompute all message aggregates whose target belongs to this user. This also fixes
|
||||||
|
// external reactions/replies that intentionally survive this user's rebuild.
|
||||||
|
try(PreparedStatement ps=c.prepareStatement("""
|
||||||
|
INSERT INTO message_stats(to_login,to_block_number,to_block_hash,likes_count,primary_likes_count,shining_likes_count,replies_count)
|
||||||
|
SELECT t.login,t.block_number,t.block_hash,
|
||||||
|
(SELECT COUNT(*)::INTEGER FROM reactions_state r WHERE r.reaction_type=1 AND r.last_sub_type=1 AND LOWER(r.to_login)=LOWER(t.login) AND r.to_block_number=t.block_number AND r.to_block_hash=t.block_hash),
|
||||||
|
(SELECT COUNT(*)::INTEGER FROM reactions_state r WHERE r.reaction_type=1 AND r.last_sub_type=1 AND LOWER(r.to_login)=LOWER(t.login) AND r.to_block_number=t.block_number AND r.to_block_hash=t.block_hash AND shine_is_primary(r.from_login)),
|
||||||
|
(SELECT COUNT(*)::INTEGER FROM reactions_state r WHERE r.reaction_type=1 AND r.last_sub_type=1 AND LOWER(r.to_login)=LOWER(t.login) AND r.to_block_number=t.block_number AND r.to_block_hash=t.block_hash AND shine_is_primary(r.from_login) AND shine_is_shining(r.from_login)),
|
||||||
|
(SELECT COUNT(*)::INTEGER FROM blocks_store rb WHERE rb.msg_type=1 AND rb.msg_sub_type=20 AND LOWER(rb.to_login)=LOWER(t.login) AND rb.to_block_number=t.block_number AND rb.to_block_hash=t.block_hash)
|
||||||
|
FROM blocks_store t
|
||||||
|
WHERE LOWER(t.login)=LOWER(?)
|
||||||
|
AND (
|
||||||
|
EXISTS(SELECT 1 FROM message_stats oldms WHERE LOWER(oldms.to_login)=LOWER(t.login) AND oldms.to_block_number=t.block_number AND oldms.to_block_hash=t.block_hash)
|
||||||
|
OR EXISTS(SELECT 1 FROM reactions_state r WHERE LOWER(r.to_login)=LOWER(t.login) AND r.to_block_number=t.block_number AND r.to_block_hash=t.block_hash)
|
||||||
|
OR EXISTS(SELECT 1 FROM blocks_store rb WHERE rb.msg_type=1 AND rb.msg_sub_type=20 AND LOWER(rb.to_login)=LOWER(t.login) AND rb.to_block_number=t.block_number AND rb.to_block_hash=t.block_hash)
|
||||||
|
)
|
||||||
|
ON CONFLICT(to_login,to_block_number,to_block_hash) DO UPDATE SET
|
||||||
|
likes_count=EXCLUDED.likes_count,
|
||||||
|
primary_likes_count=EXCLUDED.primary_likes_count,
|
||||||
|
shining_likes_count=EXCLUDED.shining_likes_count,
|
||||||
|
replies_count=EXCLUDED.replies_count
|
||||||
|
""")){ps.setString(1,login);ps.executeUpdate();}
|
||||||
|
try(PreparedStatement ps=c.prepareStatement("""
|
||||||
|
DELETE FROM message_stats ms
|
||||||
|
WHERE LOWER(ms.to_login)=LOWER(?)
|
||||||
|
AND NOT EXISTS (SELECT 1 FROM blocks_store b WHERE LOWER(b.login)=LOWER(ms.to_login) AND b.block_number=ms.to_block_number AND b.block_hash=ms.to_block_hash)
|
||||||
|
""")){ps.setString(1,login);ps.executeUpdate();}
|
||||||
|
|
||||||
|
// Recalculate social/channel aggregates from the final canonical projections.
|
||||||
|
try(PreparedStatement ps=c.prepareStatement("SELECT shine_refresh_user_stats(?)")){ps.setString(1,login);ps.execute();}
|
||||||
|
try(PreparedStatement ps=c.prepareStatement("SELECT shine_refresh_related_user_stats(?)")){ps.setString(1,login);ps.execute();}
|
||||||
|
try(PreparedStatement ps=c.prepareStatement("""
|
||||||
|
SELECT shine_refresh_channel_follow_stats(owner_bch_name,channel_root_block_number,channel_root_block_hash)
|
||||||
|
FROM channel_names_state WHERE LOWER(owner_login)=LOWER(?) AND channel_type_code=1
|
||||||
|
""")){ps.setString(1,login);ps.execute();}
|
||||||
|
|
||||||
|
ChannelReadStateDAO.getInstance().recalculateUnreadForOwnedChannels(c,login,System.currentTimeMillis());
|
||||||
|
c.commit();
|
||||||
|
}catch(Exception e){c.rollback();if(e instanceof SQLException x)throw x;throw new SQLException("canonical replay finalize failed",e);}finally{c.setAutoCommit(ac);}}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void recountAffectedLikes(Connection c)throws SQLException{
|
||||||
|
try(PreparedStatement ps=c.prepareStatement("""
|
||||||
|
UPDATE message_stats ms SET
|
||||||
|
likes_count=(SELECT COUNT(*)::INTEGER FROM reactions_state rs WHERE rs.reaction_type=1 AND rs.last_sub_type=1 AND rs.to_login=ms.to_login AND rs.to_block_number=ms.to_block_number AND rs.to_block_hash=ms.to_block_hash),
|
||||||
|
primary_likes_count=(SELECT COUNT(*)::INTEGER FROM reactions_state rs WHERE rs.reaction_type=1 AND rs.last_sub_type=1 AND rs.to_login=ms.to_login AND rs.to_block_number=ms.to_block_number AND rs.to_block_hash=ms.to_block_hash AND shine_is_primary(rs.from_login)),
|
||||||
|
shining_likes_count=(SELECT COUNT(*)::INTEGER FROM reactions_state rs WHERE rs.reaction_type=1 AND rs.last_sub_type=1 AND rs.to_login=ms.to_login AND rs.to_block_number=ms.to_block_number AND rs.to_block_hash=ms.to_block_hash AND shine_is_primary(rs.from_login) AND shine_is_shining(rs.from_login))
|
||||||
|
WHERE EXISTS(SELECT 1 FROM shine_cleanup_targets t WHERE t.to_login=ms.to_login AND t.to_block_number=ms.to_block_number AND t.to_block_hash=ms.to_block_hash)
|
||||||
|
""")){ps.executeUpdate();}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void recountAffectedReplies(Connection c)throws SQLException{
|
||||||
|
try(PreparedStatement ps=c.prepareStatement("""
|
||||||
|
UPDATE message_stats ms SET replies_count=(
|
||||||
|
SELECT COUNT(*)::INTEGER FROM blocks_store b
|
||||||
|
WHERE b.msg_type=1 AND b.msg_sub_type=20
|
||||||
|
AND LOWER(b.to_login)=LOWER(ms.to_login)
|
||||||
|
AND b.to_block_number=ms.to_block_number AND b.to_block_hash=ms.to_block_hash
|
||||||
|
)
|
||||||
|
WHERE EXISTS(SELECT 1 FROM shine_cleanup_reply_targets t
|
||||||
|
WHERE LOWER(t.to_login)=LOWER(ms.to_login) AND t.to_block_number=ms.to_block_number AND t.to_block_hash=ms.to_block_hash)
|
||||||
|
""")){ps.executeUpdate();}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void refreshAffectedChannelStats(Connection c)throws SQLException{
|
||||||
|
try(PreparedStatement q=c.prepareStatement("SELECT owner_bch_name,root_number,root_hash FROM shine_cleanup_channels"); ResultSet rs=q.executeQuery(); PreparedStatement p=c.prepareStatement("SELECT shine_refresh_channel_follow_stats(?,?,?)")){
|
||||||
|
while(rs.next()){p.setString(1,rs.getString(1));p.setInt(2,rs.getInt(2));p.setBytes(3,rs.getBytes(3));p.execute();}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void refreshAffectedUserStats(Connection c)throws SQLException{
|
||||||
|
try(PreparedStatement q=c.prepareStatement("SELECT login FROM shine_cleanup_users"); ResultSet rs=q.executeQuery(); PreparedStatement p=c.prepareStatement("SELECT shine_refresh_user_stats(?)")){
|
||||||
|
while(rs.next()){p.setString(1,rs.getString(1));p.execute();}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private int delete(Connection c,String sql,String v)throws SQLException{try(PreparedStatement ps=c.prepareStatement(sql)){ps.setString(1,v);return ps.executeUpdate();}}
|
||||||
|
private record ChainRef(String login,int fork){}
|
||||||
|
private static ChainRef chainRef(String n){ if(n==null)throw new IllegalArgumentException("blockchainName is null"); String s=n.trim();int d=s.lastIndexOf('-');if(d<=0||s.length()-d-1!=3)throw new IllegalArgumentException("Bad blockchainName: "+n);try{int f=Integer.parseInt(s.substring(d+1));if(f<1||f>999)throw new IllegalArgumentException("fork out of range");return new ChainRef(s.substring(0,d),f);}catch(NumberFormatException e){throw new IllegalArgumentException("Bad blockchainName: "+n,e);} }
|
||||||
|
|
||||||
|
public record CleanupResult(String login,int deletedReactionsStateRows,int deletedConnectionsStateRows,int deletedUsersParamsRows,int deletedChannelNamesRows,int deletedChat200StateRows,int deletedChat200MembersRows,int deletedBlocksRows,int deletedBlockchainStateRows){}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -34,8 +34,8 @@ public final class BlockchainStateDAO {
|
|||||||
public BlockchainStateEntry getByBlockchainName(Connection c, String blockchainName) throws SQLException {
|
public BlockchainStateEntry getByBlockchainName(Connection c, String blockchainName) throws SQLException {
|
||||||
String sql = """
|
String sql = """
|
||||||
SELECT
|
SELECT
|
||||||
blockchain_name,
|
|
||||||
login,
|
login,
|
||||||
|
fork_number,
|
||||||
blockchain_key,
|
blockchain_key,
|
||||||
size_limit,
|
size_limit,
|
||||||
file_size_bytes,
|
file_size_bytes,
|
||||||
@@ -43,11 +43,13 @@ public final class BlockchainStateDAO {
|
|||||||
last_block_hash,
|
last_block_hash,
|
||||||
updated_at_ms
|
updated_at_ms
|
||||||
FROM blockchain_state
|
FROM blockchain_state
|
||||||
WHERE blockchain_name = ?
|
WHERE LOWER(login) = LOWER(?) AND fork_number = ?
|
||||||
""";
|
""";
|
||||||
|
|
||||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||||
ps.setString(1, blockchainName);
|
ChainRef r=chainRef(blockchainName);
|
||||||
|
ps.setString(1, r.login());
|
||||||
|
ps.setInt(2, r.fork());
|
||||||
try (ResultSet rs = ps.executeQuery()) {
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
if (!rs.next()) return null;
|
if (!rs.next()) return null;
|
||||||
return mapRow(rs);
|
return mapRow(rs);
|
||||||
@@ -66,8 +68,8 @@ public final class BlockchainStateDAO {
|
|||||||
public List<BlockchainStateEntry> listAll(Connection c) throws SQLException {
|
public List<BlockchainStateEntry> listAll(Connection c) throws SQLException {
|
||||||
String sql = """
|
String sql = """
|
||||||
SELECT
|
SELECT
|
||||||
blockchain_name,
|
|
||||||
login,
|
login,
|
||||||
|
fork_number,
|
||||||
blockchain_key,
|
blockchain_key,
|
||||||
size_limit,
|
size_limit,
|
||||||
file_size_bytes,
|
file_size_bytes,
|
||||||
@@ -75,7 +77,7 @@ public final class BlockchainStateDAO {
|
|||||||
last_block_hash,
|
last_block_hash,
|
||||||
updated_at_ms
|
updated_at_ms
|
||||||
FROM blockchain_state
|
FROM blockchain_state
|
||||||
ORDER BY LOWER(blockchain_name)
|
ORDER BY LOWER(login), fork_number
|
||||||
""";
|
""";
|
||||||
|
|
||||||
List<BlockchainStateEntry> result = new ArrayList<>();
|
List<BlockchainStateEntry> result = new ArrayList<>();
|
||||||
@@ -98,9 +100,9 @@ public final class BlockchainStateDAO {
|
|||||||
/** UPSERT с внешним соединением. Соединение НЕ закрывает. */
|
/** UPSERT с внешним соединением. Соединение НЕ закрывает. */
|
||||||
public void upsert(Connection c, BlockchainStateEntry e) throws SQLException {
|
public void upsert(Connection c, BlockchainStateEntry e) throws SQLException {
|
||||||
String sql = """
|
String sql = """
|
||||||
INSERT INTO blockchain_state (
|
INSERT INTO blockchain_state_store (
|
||||||
blockchain_name,
|
|
||||||
login,
|
login,
|
||||||
|
fork_number,
|
||||||
blockchain_key,
|
blockchain_key,
|
||||||
size_limit,
|
size_limit,
|
||||||
file_size_bytes,
|
file_size_bytes,
|
||||||
@@ -108,9 +110,8 @@ public final class BlockchainStateDAO {
|
|||||||
last_block_hash,
|
last_block_hash,
|
||||||
updated_at_ms
|
updated_at_ms
|
||||||
) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
|
) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
|
||||||
ON CONFLICT(blockchain_name)
|
ON CONFLICT(login, fork_number)
|
||||||
DO UPDATE SET
|
DO UPDATE SET
|
||||||
login = excluded.login,
|
|
||||||
blockchain_key = excluded.blockchain_key,
|
blockchain_key = excluded.blockchain_key,
|
||||||
size_limit = excluded.size_limit,
|
size_limit = excluded.size_limit,
|
||||||
file_size_bytes = excluded.file_size_bytes,
|
file_size_bytes = excluded.file_size_bytes,
|
||||||
@@ -122,8 +123,8 @@ public final class BlockchainStateDAO {
|
|||||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||||
int i = 1;
|
int i = 1;
|
||||||
|
|
||||||
ps.setString(i++, e.getBlockchainName());
|
|
||||||
ps.setString(i++, nn(e.getLogin()));
|
ps.setString(i++, nn(e.getLogin()));
|
||||||
|
ps.setInt(i++, e.getForkNumber());
|
||||||
ps.setString(i++, nn(e.getBlockchainKey()));
|
ps.setString(i++, nn(e.getBlockchainKey()));
|
||||||
|
|
||||||
ps.setLong(i++, e.getSizeLimit());
|
ps.setLong(i++, e.getSizeLimit());
|
||||||
@@ -148,9 +149,9 @@ public final class BlockchainStateDAO {
|
|||||||
*/
|
*/
|
||||||
public boolean insertIfMissing(Connection c, BlockchainStateEntry e) throws SQLException {
|
public boolean insertIfMissing(Connection c, BlockchainStateEntry e) throws SQLException {
|
||||||
String sql = """
|
String sql = """
|
||||||
INSERT INTO blockchain_state (
|
INSERT INTO blockchain_state_store (
|
||||||
blockchain_name,
|
|
||||||
login,
|
login,
|
||||||
|
fork_number,
|
||||||
blockchain_key,
|
blockchain_key,
|
||||||
size_limit,
|
size_limit,
|
||||||
file_size_bytes,
|
file_size_bytes,
|
||||||
@@ -158,14 +159,14 @@ public final class BlockchainStateDAO {
|
|||||||
last_block_hash,
|
last_block_hash,
|
||||||
updated_at_ms
|
updated_at_ms
|
||||||
) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
|
) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
|
||||||
ON CONFLICT(blockchain_name) DO NOTHING
|
ON CONFLICT(login, fork_number) DO NOTHING
|
||||||
""";
|
""";
|
||||||
|
|
||||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||||
int i = 1;
|
int i = 1;
|
||||||
|
|
||||||
ps.setString(i++, e.getBlockchainName());
|
|
||||||
ps.setString(i++, nn(e.getLogin()));
|
ps.setString(i++, nn(e.getLogin()));
|
||||||
|
ps.setInt(i++, e.getForkNumber());
|
||||||
ps.setString(i++, nn(e.getBlockchainKey()));
|
ps.setString(i++, nn(e.getBlockchainKey()));
|
||||||
|
|
||||||
ps.setLong(i++, e.getSizeLimit());
|
ps.setLong(i++, e.getSizeLimit());
|
||||||
@@ -191,20 +192,22 @@ public final class BlockchainStateDAO {
|
|||||||
*/
|
*/
|
||||||
public boolean tryIncreaseFileSizeWithinLimit(Connection c, String blockchainName, long deltaBytes, long nowMs) throws SQLException {
|
public boolean tryIncreaseFileSizeWithinLimit(Connection c, String blockchainName, long deltaBytes, long nowMs) throws SQLException {
|
||||||
String sql = """
|
String sql = """
|
||||||
UPDATE blockchain_state
|
UPDATE blockchain_state_store
|
||||||
SET
|
SET
|
||||||
file_size_bytes = file_size_bytes + ?,
|
file_size_bytes = file_size_bytes + ?,
|
||||||
updated_at_ms = ?
|
updated_at_ms = ?
|
||||||
WHERE
|
WHERE
|
||||||
blockchain_name = ?
|
LOWER(login) = LOWER(?) AND fork_number = ?
|
||||||
AND (file_size_bytes + ?) <= size_limit
|
AND (file_size_bytes + ?) <= size_limit
|
||||||
""";
|
""";
|
||||||
|
|
||||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||||
ps.setLong(1, deltaBytes);
|
ps.setLong(1, deltaBytes);
|
||||||
ps.setLong(2, nowMs);
|
ps.setLong(2, nowMs);
|
||||||
ps.setString(3, blockchainName);
|
ChainRef r=chainRef(blockchainName);
|
||||||
ps.setLong(4, deltaBytes);
|
ps.setString(3, r.login());
|
||||||
|
ps.setInt(4, r.fork());
|
||||||
|
ps.setLong(5, deltaBytes);
|
||||||
return ps.executeUpdate() > 0;
|
return ps.executeUpdate() > 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -212,8 +215,8 @@ public final class BlockchainStateDAO {
|
|||||||
private BlockchainStateEntry mapRow(ResultSet rs) throws SQLException {
|
private BlockchainStateEntry mapRow(ResultSet rs) throws SQLException {
|
||||||
BlockchainStateEntry e = new BlockchainStateEntry();
|
BlockchainStateEntry e = new BlockchainStateEntry();
|
||||||
|
|
||||||
e.setBlockchainName(rs.getString("blockchain_name"));
|
|
||||||
e.setLogin(rs.getString("login"));
|
e.setLogin(rs.getString("login"));
|
||||||
|
e.setForkNumber(rs.getInt("fork_number"));
|
||||||
e.setBlockchainKey(rs.getString("blockchain_key"));
|
e.setBlockchainKey(rs.getString("blockchain_key"));
|
||||||
|
|
||||||
e.setSizeLimit(rs.getLong("size_limit"));
|
e.setSizeLimit(rs.getLong("size_limit"));
|
||||||
@@ -227,6 +230,15 @@ public final class BlockchainStateDAO {
|
|||||||
return e;
|
return e;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private record ChainRef(String login,int fork) {}
|
||||||
|
private static ChainRef chainRef(String name) {
|
||||||
|
if(name==null) throw new IllegalArgumentException("blockchainName is null");
|
||||||
|
String s=name.trim(); int d=s.lastIndexOf('-');
|
||||||
|
if(d<=0 || s.length()-d-1 != 3) throw new IllegalArgumentException("Bad blockchainName: "+name);
|
||||||
|
try { int f=Integer.parseInt(s.substring(d+1)); if(f<1||f>999) throw new IllegalArgumentException("fork out of range"); return new ChainRef(s.substring(0,d),f); }
|
||||||
|
catch(NumberFormatException e){ throw new IllegalArgumentException("Bad blockchainName: "+name,e); }
|
||||||
|
}
|
||||||
|
|
||||||
private static void setBytesNullable(PreparedStatement ps, int index, byte[] b) throws SQLException {
|
private static void setBytesNullable(PreparedStatement ps, int index, byte[] b) throws SQLException {
|
||||||
if (b != null) ps.setBytes(index, b);
|
if (b != null) ps.setBytes(index, b);
|
||||||
else ps.setNull(index, Types.BINARY);
|
else ps.setNull(index, Types.BINARY);
|
||||||
|
|||||||
@@ -23,24 +23,24 @@ public final class BlocksDAO {
|
|||||||
|
|
||||||
public void insert(Connection c, BlockEntry e) throws SQLException {
|
public void insert(Connection c, BlockEntry e) throws SQLException {
|
||||||
String sql = """
|
String sql = """
|
||||||
INSERT INTO blocks (
|
INSERT INTO blocks_store (
|
||||||
login,bch_name,block_number,msg_type,msg_sub_type,block_bytes,
|
login,fork_number,block_number,msg_type,msg_sub_type,block_bytes,
|
||||||
to_login,to_bch_name,to_block_number,to_block_hash,
|
to_login,to_fork_number,to_block_number,to_block_hash,
|
||||||
block_hash,block_signature,data_item_id,
|
block_hash,block_signature,data_item_id,
|
||||||
arweave_publish_pending,arweave_published_at_ms,arweave_root_tx_id,
|
arweave_publish_pending,arweave_published_at_ms,
|
||||||
edited_by_block_number,line_code,prev_line_number,prev_line_hash,this_line_number
|
edited_by_block_number,line_code,prev_line_number,prev_line_hash,this_line_number
|
||||||
) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
|
) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
|
||||||
""";
|
""";
|
||||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||||
int i = 1;
|
int i = 1;
|
||||||
ps.setString(i++, e.getLogin());
|
ps.setString(i++, e.getLogin());
|
||||||
ps.setString(i++, e.getBchName());
|
ps.setInt(i++, e.getForkNumber());
|
||||||
ps.setInt(i++, e.getBlockNumber());
|
ps.setInt(i++, e.getBlockNumber());
|
||||||
ps.setInt(i++, e.getMsgType());
|
ps.setInt(i++, e.getMsgType());
|
||||||
ps.setInt(i++, e.getMsgSubType());
|
ps.setInt(i++, e.getMsgSubType());
|
||||||
ps.setBytes(i++, e.getBlockBytes());
|
ps.setBytes(i++, e.getBlockBytes());
|
||||||
setNullableString(ps, i++, e.getToLogin());
|
setNullableString(ps, i++, e.getToLogin());
|
||||||
setNullableString(ps, i++, e.getToBchName());
|
setNullableInt(ps, i++, e.getToForkNumber());
|
||||||
setNullableInt(ps, i++, e.getToBlockNumber());
|
setNullableInt(ps, i++, e.getToBlockNumber());
|
||||||
setNullableBytes(ps, i++, e.getToBlockHash());
|
setNullableBytes(ps, i++, e.getToBlockHash());
|
||||||
ps.setBytes(i++, e.getBlockHash());
|
ps.setBytes(i++, e.getBlockHash());
|
||||||
@@ -48,7 +48,6 @@ public final class BlocksDAO {
|
|||||||
ps.setBytes(i++, e.getDataItemId());
|
ps.setBytes(i++, e.getDataItemId());
|
||||||
ps.setBoolean(i++, e.isArweavePublishPending());
|
ps.setBoolean(i++, e.isArweavePublishPending());
|
||||||
if (e.getArweavePublishedAtMs() == null) ps.setNull(i++, Types.BIGINT); else ps.setLong(i++, e.getArweavePublishedAtMs());
|
if (e.getArweavePublishedAtMs() == null) ps.setNull(i++, Types.BIGINT); else ps.setLong(i++, e.getArweavePublishedAtMs());
|
||||||
setNullableString(ps, i++, e.getArweaveRootTxId());
|
|
||||||
setNullableInt(ps, i++, e.getEditedByBlockNumber());
|
setNullableInt(ps, i++, e.getEditedByBlockNumber());
|
||||||
setNullableInt(ps, i++, e.getLineCode());
|
setNullableInt(ps, i++, e.getLineCode());
|
||||||
setNullableInt(ps, i++, e.getPrevLineNumber());
|
setNullableInt(ps, i++, e.getPrevLineNumber());
|
||||||
@@ -69,16 +68,26 @@ public final class BlocksDAO {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Возвращает ещё не опубликованный пользовательский DataItem для быстрой Turbo-попытки. */
|
||||||
|
public BlockEntry getPendingArweaveByDataItemId(byte[] dataItemId) throws SQLException {
|
||||||
|
if (dataItemId == null || dataItemId.length != 32) return null;
|
||||||
|
String sql = baseSelect() + " WHERE data_item_id=? AND arweave_publish_pending=TRUE LIMIT 1";
|
||||||
|
try (Connection c = db.getConnection(); PreparedStatement ps = c.prepareStatement(sql)) {
|
||||||
|
ps.setBytes(1, dataItemId);
|
||||||
|
try (ResultSet rs = ps.executeQuery()) { return rs.next() ? mapRow(rs) : null; }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public List<BlockEntry> listPendingArweave(int limit) throws SQLException {
|
public List<BlockEntry> listPendingArweave(int limit) throws SQLException {
|
||||||
int safeLimit = Math.max(1, Math.min(limit, 100_000));
|
int safeLimit = Math.max(1, Math.min(limit, 100_000));
|
||||||
String sql = """
|
String sql = """
|
||||||
SELECT login,bch_name,block_number,msg_type,msg_sub_type,block_bytes,
|
SELECT login,fork_number,block_number,msg_type,msg_sub_type,block_bytes,
|
||||||
to_login,to_bch_name,to_block_number,to_block_hash,block_hash,block_signature,data_item_id,
|
to_login,to_fork_number,to_block_number,to_block_hash,block_hash,block_signature,data_item_id,
|
||||||
arweave_publish_pending,arweave_published_at_ms,arweave_root_tx_id,
|
arweave_publish_pending,arweave_published_at_ms,
|
||||||
edited_by_block_number,line_code,prev_line_number,prev_line_hash,this_line_number
|
edited_by_block_number,line_code,prev_line_number,prev_line_hash,this_line_number
|
||||||
FROM blocks
|
FROM blocks
|
||||||
WHERE arweave_publish_pending = TRUE
|
WHERE arweave_publish_pending = TRUE
|
||||||
ORDER BY bch_name ASC, block_number ASC
|
ORDER BY login ASC, fork_number ASC, block_number ASC
|
||||||
LIMIT ?
|
LIMIT ?
|
||||||
""";
|
""";
|
||||||
List<BlockEntry> out = new ArrayList<>();
|
List<BlockEntry> out = new ArrayList<>();
|
||||||
@@ -89,18 +98,18 @@ public final class BlocksDAO {
|
|||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void markArweavePublished(List<byte[]> dataItemIds, String rootTxId, long publishedAtMs) throws SQLException {
|
public void markArweavePublished(List<byte[]> dataItemIds, long publishedAtMs) throws SQLException {
|
||||||
if (dataItemIds == null || dataItemIds.isEmpty()) return;
|
if (dataItemIds == null || dataItemIds.isEmpty()) return;
|
||||||
String sql = """
|
String sql = """
|
||||||
UPDATE blocks
|
UPDATE blocks_store
|
||||||
SET arweave_publish_pending=FALSE, arweave_published_at_ms=?, arweave_root_tx_id=?
|
SET arweave_publish_pending=FALSE, arweave_published_at_ms=?
|
||||||
WHERE data_item_id=?
|
WHERE data_item_id=?
|
||||||
""";
|
""";
|
||||||
try (Connection c = db.getConnection()) {
|
try (Connection c = db.getConnection()) {
|
||||||
c.setAutoCommit(false);
|
c.setAutoCommit(false);
|
||||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||||
for (byte[] id : dataItemIds) {
|
for (byte[] id : dataItemIds) {
|
||||||
ps.setLong(1, publishedAtMs); ps.setString(2, rootTxId); ps.setBytes(3, id); ps.addBatch();
|
ps.setLong(1, publishedAtMs); ps.setBytes(2, id); ps.addBatch();
|
||||||
}
|
}
|
||||||
ps.executeBatch(); c.commit();
|
ps.executeBatch(); c.commit();
|
||||||
} catch (Exception e) { c.rollback(); throw e; }
|
} catch (Exception e) { c.rollback(); throw e; }
|
||||||
@@ -109,46 +118,73 @@ public final class BlocksDAO {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public byte[] getHashByNumber(Connection c, String bchName, int blockNumber) throws SQLException {
|
public byte[] getHashByNumber(Connection c, String bchName, int blockNumber) throws SQLException {
|
||||||
try (PreparedStatement ps = c.prepareStatement("SELECT block_hash FROM blocks WHERE bch_name=? AND block_number=? LIMIT 1")) {
|
try (PreparedStatement ps = c.prepareStatement("SELECT block_hash FROM blocks WHERE login=? AND fork_number=? AND block_number=? LIMIT 1")) {
|
||||||
ps.setString(1,bchName); ps.setInt(2,blockNumber);
|
ChainRef r=chainRef(bchName); ps.setString(1,r.login()); ps.setInt(2,r.fork()); ps.setInt(3,blockNumber);
|
||||||
try (ResultSet rs=ps.executeQuery()) { return rs.next()?rs.getBytes(1):null; }
|
try (ResultSet rs=ps.executeQuery()) { return rs.next()?rs.getBytes(1):null; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public byte[] getHashByNumber(String bchName, int blockNumber) throws SQLException { try(Connection c=db.getConnection()){return getHashByNumber(c,bchName,blockNumber);} }
|
public byte[] getHashByNumber(String bchName, int blockNumber) throws SQLException { try(Connection c=db.getConnection()){return getHashByNumber(c,bchName,blockNumber);} }
|
||||||
|
|
||||||
public BlockEntry getByNumber(Connection c, String bchName, int blockNumber) throws SQLException {
|
public BlockEntry getByNumber(Connection c, String bchName, int blockNumber) throws SQLException {
|
||||||
String sql = baseSelect()+" WHERE bch_name=? AND block_number=? LIMIT 1";
|
String sql = baseSelect()+" WHERE login=? AND fork_number=? AND block_number=? LIMIT 1";
|
||||||
try(PreparedStatement ps=c.prepareStatement(sql)){ ps.setString(1,bchName); ps.setInt(2,blockNumber); try(ResultSet rs=ps.executeQuery()){return rs.next()?mapRow(rs):null;} }
|
ChainRef r=chainRef(bchName);
|
||||||
|
try(PreparedStatement ps=c.prepareStatement(sql)){ ps.setString(1,r.login()); ps.setInt(2,r.fork()); ps.setInt(3,blockNumber); try(ResultSet rs=ps.executeQuery()){return rs.next()?mapRow(rs):null;} }
|
||||||
}
|
}
|
||||||
public BlockEntry getByNumber(String bchName,int blockNumber)throws SQLException{try(Connection c=db.getConnection()){return getByNumber(c,bchName,blockNumber);} }
|
public BlockEntry getByNumber(String bchName,int blockNumber)throws SQLException{try(Connection c=db.getConnection()){return getByNumber(c,bchName,blockNumber);} }
|
||||||
|
|
||||||
|
/** Последний принятый блок конкретной логической линии в текущем physical fork. */
|
||||||
|
public BlockEntry getLastLineBlock(Connection c, String bchName, int msgType, int lineCode) throws SQLException {
|
||||||
|
String sql = baseSelect()+" WHERE login=? AND fork_number=? AND msg_type=? AND line_code=? ORDER BY block_number DESC LIMIT 1";
|
||||||
|
ChainRef r=chainRef(bchName);
|
||||||
|
try(PreparedStatement ps=c.prepareStatement(sql)){
|
||||||
|
ps.setString(1,r.login()); ps.setInt(2,r.fork()); ps.setInt(3,msgType); ps.setInt(4,lineCode);
|
||||||
|
try(ResultSet rs=ps.executeQuery()){ return rs.next()?mapRow(rs):null; }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public BlockEntry getLastLineBlock(String bchName, int msgType, int lineCode) throws SQLException {
|
||||||
|
try(Connection c=db.getConnection()){ return getLastLineBlock(c,bchName,msgType,lineCode); }
|
||||||
|
}
|
||||||
|
|
||||||
public List<BlockEntry> listRangeByNumber(String bchName,int from,int to)throws SQLException{try(Connection c=db.getConnection()){return listRangeByNumber(c,bchName,from,to);} }
|
public List<BlockEntry> listRangeByNumber(String bchName,int from,int to)throws SQLException{try(Connection c=db.getConnection()){return listRangeByNumber(c,bchName,from,to);} }
|
||||||
public List<BlockEntry> listRangeByNumber(Connection c,String bchName,int from,int to)throws SQLException{
|
public List<BlockEntry> listRangeByNumber(Connection c,String bchName,int from,int to)throws SQLException{
|
||||||
String sql=baseSelect()+" WHERE bch_name=? AND block_number>=? AND block_number<=? ORDER BY block_number ASC";
|
String sql=baseSelect()+" WHERE login=? AND fork_number=? AND block_number>=? AND block_number<=? ORDER BY block_number ASC";
|
||||||
List<BlockEntry> out=new ArrayList<>();
|
List<BlockEntry> out=new ArrayList<>();
|
||||||
try(PreparedStatement ps=c.prepareStatement(sql)){ps.setString(1,bchName);ps.setInt(2,from);ps.setInt(3,to);try(ResultSet rs=ps.executeQuery()){while(rs.next())out.add(mapRow(rs));}}
|
ChainRef r=chainRef(bchName);
|
||||||
|
try(PreparedStatement ps=c.prepareStatement(sql)){ps.setString(1,r.login());ps.setInt(2,r.fork());ps.setInt(3,from);ps.setInt(4,to);try(ResultSet rs=ps.executeQuery()){while(rs.next())out.add(mapRow(rs));}}
|
||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String baseSelect(){return """
|
private static String baseSelect(){return """
|
||||||
SELECT login,bch_name,block_number,msg_type,msg_sub_type,block_bytes,
|
SELECT login,fork_number,block_number,msg_type,msg_sub_type,block_bytes,
|
||||||
to_login,to_bch_name,to_block_number,to_block_hash,block_hash,block_signature,data_item_id,
|
to_login,to_fork_number,to_block_number,to_block_hash,block_hash,block_signature,data_item_id,
|
||||||
arweave_publish_pending,arweave_published_at_ms,arweave_root_tx_id,
|
arweave_publish_pending,arweave_published_at_ms,
|
||||||
edited_by_block_number,line_code,prev_line_number,prev_line_hash,this_line_number
|
edited_by_block_number,line_code,prev_line_number,prev_line_hash,this_line_number
|
||||||
FROM blocks
|
FROM blocks
|
||||||
""";}
|
""";}
|
||||||
|
|
||||||
private BlockEntry mapRow(ResultSet rs)throws SQLException{
|
private BlockEntry mapRow(ResultSet rs)throws SQLException{
|
||||||
BlockEntry e=new BlockEntry();
|
BlockEntry e=new BlockEntry();
|
||||||
e.setLogin(rs.getString("login")); e.setBchName(rs.getString("bch_name")); e.setBlockNumber(rs.getInt("block_number"));
|
e.setLogin(rs.getString("login")); e.setForkNumber(rs.getInt("fork_number")); e.setBlockNumber(rs.getInt("block_number"));
|
||||||
e.setMsgType(rs.getInt("msg_type")); e.setMsgSubType(rs.getInt("msg_sub_type")); e.setBlockBytes(rs.getBytes("block_bytes"));
|
e.setMsgType(rs.getInt("msg_type")); e.setMsgSubType(rs.getInt("msg_sub_type")); e.setBlockBytes(rs.getBytes("block_bytes"));
|
||||||
e.setToLogin(rs.getString("to_login")); e.setToBchName(rs.getString("to_bch_name")); e.setToBlockNumber((Integer)rs.getObject("to_block_number")); e.setToBlockHash(rs.getBytes("to_block_hash"));
|
e.setToLogin(rs.getString("to_login")); e.setToForkNumber((Integer)rs.getObject("to_fork_number")); e.setToBlockNumber((Integer)rs.getObject("to_block_number")); e.setToBlockHash(rs.getBytes("to_block_hash"));
|
||||||
e.setBlockHash(rs.getBytes("block_hash")); e.setBlockSignature(rs.getBytes("block_signature")); e.setDataItemId(rs.getBytes("data_item_id"));
|
e.setBlockHash(rs.getBytes("block_hash")); e.setBlockSignature(rs.getBytes("block_signature")); e.setDataItemId(rs.getBytes("data_item_id"));
|
||||||
e.setArweavePublishPending(rs.getBoolean("arweave_publish_pending")); e.setArweavePublishedAtMs((Long)rs.getObject("arweave_published_at_ms")); e.setArweaveRootTxId(rs.getString("arweave_root_tx_id"));
|
e.setArweavePublishPending(rs.getBoolean("arweave_publish_pending")); e.setArweavePublishedAtMs((Long)rs.getObject("arweave_published_at_ms"));
|
||||||
e.setEditedByBlockNumber((Integer)rs.getObject("edited_by_block_number")); e.setLineCode((Integer)rs.getObject("line_code")); e.setPrevLineNumber((Integer)rs.getObject("prev_line_number")); e.setPrevLineHash(rs.getBytes("prev_line_hash")); e.setThisLineNumber((Integer)rs.getObject("this_line_number"));
|
e.setEditedByBlockNumber((Integer)rs.getObject("edited_by_block_number")); e.setLineCode((Integer)rs.getObject("line_code")); e.setPrevLineNumber((Integer)rs.getObject("prev_line_number")); e.setPrevLineHash(rs.getBytes("prev_line_hash")); e.setThisLineNumber((Integer)rs.getObject("this_line_number"));
|
||||||
return e;
|
return e;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private record ChainRef(String login, int fork) {}
|
||||||
|
private static ChainRef chainRef(String name) {
|
||||||
|
if (name == null) throw new IllegalArgumentException("blockchainName is null");
|
||||||
|
String s=name.trim(); int dash=s.lastIndexOf('-');
|
||||||
|
if (dash <= 0 || s.length()-dash-1 != 3) throw new IllegalArgumentException("Bad blockchainName: "+name);
|
||||||
|
try {
|
||||||
|
int fork=Integer.parseInt(s.substring(dash+1));
|
||||||
|
if (fork < 1 || fork > 999) throw new IllegalArgumentException("fork out of range: "+name);
|
||||||
|
return new ChainRef(s.substring(0,dash),fork);
|
||||||
|
} catch(NumberFormatException ex){ throw new IllegalArgumentException("Bad blockchainName: "+name,ex); }
|
||||||
|
}
|
||||||
|
|
||||||
private static void setNullableString(PreparedStatement ps,int i,String v)throws SQLException{if(v==null)ps.setNull(i,Types.VARCHAR);else ps.setString(i,v);}
|
private static void setNullableString(PreparedStatement ps,int i,String v)throws SQLException{if(v==null)ps.setNull(i,Types.VARCHAR);else ps.setString(i,v);}
|
||||||
private static void setNullableInt(PreparedStatement ps,int i,Integer v)throws SQLException{if(v==null)ps.setNull(i,Types.INTEGER);else ps.setInt(i,v);}
|
private static void setNullableInt(PreparedStatement ps,int i,Integer v)throws SQLException{if(v==null)ps.setNull(i,Types.INTEGER);else ps.setInt(i,v);}
|
||||||
private static void setNullableBytes(PreparedStatement ps,int i,byte[] v)throws SQLException{if(v==null)ps.setNull(i,Types.BINARY);else ps.setBytes(i,v);}
|
private static void setNullableBytes(PreparedStatement ps,int i,byte[] v)throws SQLException{if(v==null)ps.setNull(i,Types.BINARY);else ps.setBytes(i,v);}
|
||||||
|
|||||||
@@ -0,0 +1,36 @@
|
|||||||
|
package shine.db.dao;
|
||||||
|
|
||||||
|
import shine.db.DbController;
|
||||||
|
import shine.db.entities.BlockEntry;
|
||||||
|
import java.sql.*;
|
||||||
|
|
||||||
|
/** Resolves a logical block number to the physical fork that owns it in a selected canonical history. */
|
||||||
|
public final class CanonicalChainResolver {
|
||||||
|
private static volatile CanonicalChainResolver instance;
|
||||||
|
private final DbController db=DbController.getInstance();
|
||||||
|
private final BlocksDAO blocks=BlocksDAO.getInstance();
|
||||||
|
private final BlockchainForkSegmentsDAO segments=BlockchainForkSegmentsDAO.getInstance();
|
||||||
|
private CanonicalChainResolver(){}
|
||||||
|
public static CanonicalChainResolver getInstance(){if(instance==null)synchronized(CanonicalChainResolver.class){if(instance==null)instance=new CanonicalChainResolver();}return instance;}
|
||||||
|
public BlockEntry getBlock(String blockchainName,int blockNumber)throws SQLException{try(Connection c=db.getConnection()){return getBlock(c,blockchainName,blockNumber);}}
|
||||||
|
public BlockEntry getBlock(Connection c,String blockchainName,int blockNumber)throws SQLException{
|
||||||
|
ChainRef r=ref(blockchainName); int physical=resolveFork(c,r.login,r.fork,blockNumber); return blocks.getByNumber(c,r.login+"-"+String.format("%03d",physical),blockNumber);
|
||||||
|
}
|
||||||
|
public byte[] getHash(String blockchainName,int blockNumber)throws SQLException{BlockEntry b=getBlock(blockchainName,blockNumber);return b==null?null:b.getBlockHash();}
|
||||||
|
public byte[] getHash(Connection c,String blockchainName,int blockNumber)throws SQLException{BlockEntry b=getBlock(c,blockchainName,blockNumber);return b==null?null:b.getBlockHash();}
|
||||||
|
public int resolveFork(Connection c,String login,int activeFork,int blockNumber)throws SQLException{
|
||||||
|
if(blockNumber<0)throw new IllegalArgumentException("blockNumber < 0"); int f=activeFork; int guard=0;
|
||||||
|
while(true){ if(++guard>1000)throw new SQLException("fork ancestry cycle for "+login); BlockchainForkSegmentsDAO.Segment s=segments.get(c,login,f);
|
||||||
|
if(s==null){ // legacy self-contained fork
|
||||||
|
return f;
|
||||||
|
}
|
||||||
|
if(s.parentForkNumber()==null || blockNumber>=s.firstPhysicalBlockNumber()) return f;
|
||||||
|
f=s.parentForkNumber();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public BlockEntry getLastLineBlock(Connection c,String blockchainName,int msgType,int lineCode,int beforeBlockExclusive)throws SQLException{
|
||||||
|
ChainRef r=ref(blockchainName); for(int n=beforeBlockExclusive-1;n>=0;n--){ BlockEntry b=getBlock(c,blockchainName,n); if(b!=null && b.getMsgType()==msgType && b.getLineCode()!=null && b.getLineCode()==lineCode)return b; } return null;
|
||||||
|
}
|
||||||
|
private record ChainRef(String login,int fork){}
|
||||||
|
private static ChainRef ref(String n){int d=n==null?-1:n.lastIndexOf('-');if(d<=0||n.length()-d-1!=3)throw new IllegalArgumentException("Bad blockchainName: "+n);return new ChainRef(n.substring(0,d),Integer.parseInt(n.substring(d+1)));}
|
||||||
|
}
|
||||||
@@ -28,11 +28,11 @@ public final class ChannelNameStateDAO {
|
|||||||
String sql = """
|
String sql = """
|
||||||
SELECT 1
|
SELECT 1
|
||||||
FROM channel_names_state
|
FROM channel_names_state
|
||||||
WHERE owner_bch_name = ? AND channel_type_code = ? AND slug = ?
|
WHERE LOWER(owner_login) = LOWER(?) AND channel_type_code = ? AND slug = ?
|
||||||
LIMIT 1
|
LIMIT 1
|
||||||
""";
|
""";
|
||||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||||
ps.setString(1, ownerBchName);
|
ps.setString(1, loginOf(ownerBchName));
|
||||||
ps.setInt(2, channelTypeCode);
|
ps.setInt(2, channelTypeCode);
|
||||||
ps.setString(3, slug);
|
ps.setString(3, slug);
|
||||||
try (ResultSet rs = ps.executeQuery()) {
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
@@ -67,7 +67,7 @@ public final class ChannelNameStateDAO {
|
|||||||
channel_root_block_hash,
|
channel_root_block_hash,
|
||||||
created_at_ms,
|
created_at_ms,
|
||||||
ava_ar,
|
ava_ar,
|
||||||
ava_sha256,
|
ava_pr,
|
||||||
ava_size,
|
ava_size,
|
||||||
meta_updated_at_ms
|
meta_updated_at_ms
|
||||||
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||||
@@ -84,7 +84,7 @@ public final class ChannelNameStateDAO {
|
|||||||
ps.setBytes(9, entry.getChannelRootBlockHash());
|
ps.setBytes(9, entry.getChannelRootBlockHash());
|
||||||
ps.setLong(10, entry.getCreatedAtMs());
|
ps.setLong(10, entry.getCreatedAtMs());
|
||||||
ps.setString(11, entry.getAvaAr() == null ? "" : entry.getAvaAr());
|
ps.setString(11, entry.getAvaAr() == null ? "" : entry.getAvaAr());
|
||||||
ps.setString(12, entry.getAvaSha256() == null ? "" : entry.getAvaSha256());
|
ps.setString(12, entry.getAvaPr() == null ? "" : entry.getAvaPr());
|
||||||
ps.setLong(13, Math.max(0L, entry.getAvaSize()));
|
ps.setLong(13, Math.max(0L, entry.getAvaSize()));
|
||||||
ps.setLong(14, Math.max(0L, entry.getMetaUpdatedAtMs()));
|
ps.setLong(14, Math.max(0L, entry.getMetaUpdatedAtMs()));
|
||||||
ps.executeUpdate();
|
ps.executeUpdate();
|
||||||
@@ -97,19 +97,19 @@ public final class ChannelNameStateDAO {
|
|||||||
SET display_name = ?,
|
SET display_name = ?,
|
||||||
channel_description = ?,
|
channel_description = ?,
|
||||||
ava_ar = ?,
|
ava_ar = ?,
|
||||||
ava_sha256 = ?,
|
ava_pr = ?,
|
||||||
ava_size = ?,
|
ava_size = ?,
|
||||||
meta_updated_at_ms = ?
|
meta_updated_at_ms = ?
|
||||||
WHERE owner_bch_name = ? AND channel_root_block_number = ?
|
WHERE LOWER(owner_login)=LOWER(?) AND channel_root_block_number = ?
|
||||||
""";
|
""";
|
||||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||||
ps.setString(1, entry.getDisplayName() == null ? "" : entry.getDisplayName());
|
ps.setString(1, entry.getDisplayName() == null ? "" : entry.getDisplayName());
|
||||||
ps.setString(2, entry.getChannelDescription() == null ? "" : entry.getChannelDescription());
|
ps.setString(2, entry.getChannelDescription() == null ? "" : entry.getChannelDescription());
|
||||||
ps.setString(3, entry.getAvaAr() == null ? "" : entry.getAvaAr());
|
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(5, Math.max(0L, entry.getAvaSize()));
|
||||||
ps.setLong(6, Math.max(0L, entry.getMetaUpdatedAtMs()));
|
ps.setLong(6, Math.max(0L, entry.getMetaUpdatedAtMs()));
|
||||||
ps.setString(7, entry.getOwnerBlockchainName());
|
ps.setString(7, entry.getOwnerLogin());
|
||||||
ps.setInt(8, entry.getChannelRootBlockNumber());
|
ps.setInt(8, entry.getChannelRootBlockNumber());
|
||||||
ps.executeUpdate();
|
ps.executeUpdate();
|
||||||
}
|
}
|
||||||
@@ -120,10 +120,31 @@ public final class ChannelNameStateDAO {
|
|||||||
insert(c, entry);
|
insert(c, entry);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean updateDeletedState(Connection c, String ownerBchName, int rootBlockNumber, boolean deleted, long deletedAtMs, Integer deletedBlockNumber) throws SQLException {
|
||||||
|
String sql = """
|
||||||
|
UPDATE channel_names_state
|
||||||
|
SET is_deleted = ?,
|
||||||
|
deleted_at_ms = ?,
|
||||||
|
deleted_block_number = ?
|
||||||
|
WHERE LOWER(owner_login) = LOWER(?)
|
||||||
|
AND channel_root_block_number = ?
|
||||||
|
AND is_deleted IS DISTINCT FROM ?
|
||||||
|
""";
|
||||||
|
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||||
|
ps.setBoolean(1, deleted);
|
||||||
|
ps.setLong(2, deleted ? Math.max(0L, deletedAtMs) : 0L);
|
||||||
|
if (deleted && deletedBlockNumber != null) ps.setInt(3, deletedBlockNumber); else ps.setNull(3, java.sql.Types.INTEGER);
|
||||||
|
ps.setString(4, loginOf(ownerBchName));
|
||||||
|
ps.setInt(5, rootBlockNumber);
|
||||||
|
ps.setBoolean(6, deleted);
|
||||||
|
return ps.executeUpdate() > 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
public String getSlugByOwnerAndRoot(String ownerBchName, int rootBlockNumber) throws SQLException {
|
public String getSlugByOwnerAndRoot(String ownerBchName, int rootBlockNumber) throws SQLException {
|
||||||
String sql = "SELECT slug FROM channel_names_state WHERE owner_bch_name=? AND channel_root_block_number=? LIMIT 1";
|
String sql = "SELECT slug FROM channel_names_state WHERE LOWER(owner_login)=LOWER(?) AND channel_root_block_number=? LIMIT 1";
|
||||||
try (Connection c = db.getConnection(); PreparedStatement ps = c.prepareStatement(sql)) {
|
try (Connection c = db.getConnection(); PreparedStatement ps = c.prepareStatement(sql)) {
|
||||||
ps.setString(1, ownerBchName);
|
ps.setString(1, loginOf(ownerBchName));
|
||||||
ps.setInt(2, rootBlockNumber);
|
ps.setInt(2, rootBlockNumber);
|
||||||
try (ResultSet rs = ps.executeQuery()) {
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
return rs.next() ? rs.getString(1) : null;
|
return rs.next() ? rs.getString(1) : null;
|
||||||
@@ -131,4 +152,5 @@ public final class ChannelNameStateDAO {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static String loginOf(String bch){ if(bch==null)return ""; int d=bch.lastIndexOf('-'); return d>0?bch.substring(0,d):bch; }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -39,12 +39,12 @@ public final class ChannelReadStateDAO {
|
|||||||
String sql = """
|
String sql = """
|
||||||
SELECT read_count, unread_count, read_updated_at_ms, client_key, read_signature
|
SELECT read_count, unread_count, read_updated_at_ms, client_key, read_signature
|
||||||
FROM channel_read_state
|
FROM channel_read_state
|
||||||
WHERE LOWER(viewer_login)=LOWER(?) AND owner_bch_name=? AND channel_name=?
|
WHERE LOWER(viewer_login)=LOWER(?) AND LOWER(owner_login)=LOWER(?) AND channel_name=?
|
||||||
LIMIT 1
|
LIMIT 1
|
||||||
""";
|
""";
|
||||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||||
ps.setString(1, viewerLogin);
|
ps.setString(1, viewerLogin);
|
||||||
ps.setString(2, ownerBchName);
|
ps.setString(2, loginFromChainName(ownerBchName));
|
||||||
ps.setString(3, channelName);
|
ps.setString(3, channelName);
|
||||||
try (ResultSet rs = ps.executeQuery()) {
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
if (!rs.next()) return null;
|
if (!rs.next()) return null;
|
||||||
@@ -74,12 +74,13 @@ public final class ChannelReadStateDAO {
|
|||||||
JOIN connections_state cs
|
JOIN connections_state cs
|
||||||
ON LOWER(cs.login)=LOWER(crs.viewer_login)
|
ON LOWER(cs.login)=LOWER(crs.viewer_login)
|
||||||
AND cs.rel_type=30
|
AND cs.rel_type=30
|
||||||
AND cs.to_bch_name=cns.owner_bch_name
|
AND LOWER(cs.to_login)=LOWER(cns.owner_login)
|
||||||
AND COALESCE(cs.to_block_number,0)=cns.channel_root_block_number
|
AND COALESCE(cs.to_block_number,0)=cns.channel_root_block_number
|
||||||
AND cs.to_block_hash=cns.channel_root_block_hash
|
AND cs.to_block_hash=cns.channel_root_block_hash
|
||||||
WHERE cns.owner_bch_name=crs.owner_bch_name
|
WHERE LOWER(cns.owner_login)=LOWER(crs.owner_login)
|
||||||
AND cns.slug=crs.channel_name
|
AND cns.slug=crs.channel_name
|
||||||
AND cns.channel_type_code=1
|
AND cns.channel_type_code=1
|
||||||
|
AND NOT cns.is_deleted
|
||||||
)
|
)
|
||||||
""";
|
""";
|
||||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||||
@@ -101,10 +102,10 @@ public final class ChannelReadStateDAO {
|
|||||||
JOIN connections_state cs
|
JOIN connections_state cs
|
||||||
ON LOWER(cs.login)=LOWER(?)
|
ON LOWER(cs.login)=LOWER(?)
|
||||||
AND cs.rel_type=?
|
AND cs.rel_type=?
|
||||||
AND cs.to_bch_name=cns.owner_bch_name
|
AND LOWER(cs.to_login)=LOWER(cns.owner_login)
|
||||||
AND COALESCE(cs.to_block_number,0)=cns.channel_root_block_number
|
AND COALESCE(cs.to_block_number,0)=cns.channel_root_block_number
|
||||||
AND cs.to_block_hash=cns.channel_root_block_hash
|
AND cs.to_block_hash=cns.channel_root_block_hash
|
||||||
WHERE cns.owner_bch_name=?
|
WHERE LOWER(cns.owner_login)=LOWER(?)
|
||||||
AND cns.slug=?
|
AND cns.slug=?
|
||||||
AND cns.channel_type_code=1
|
AND cns.channel_type_code=1
|
||||||
LIMIT 1
|
LIMIT 1
|
||||||
@@ -112,7 +113,7 @@ public final class ChannelReadStateDAO {
|
|||||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||||
ps.setString(1, viewerLogin);
|
ps.setString(1, viewerLogin);
|
||||||
ps.setInt(2, followRelType);
|
ps.setInt(2, followRelType);
|
||||||
ps.setString(3, ownerBchName);
|
ps.setString(3, loginFromChainName(ownerBchName));
|
||||||
ps.setString(4, channelName);
|
ps.setString(4, channelName);
|
||||||
try (ResultSet rs = ps.executeQuery()) {
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
return rs.next();
|
return rs.next();
|
||||||
@@ -124,11 +125,11 @@ public final class ChannelReadStateDAO {
|
|||||||
String sql = """
|
String sql = """
|
||||||
SELECT slug
|
SELECT slug
|
||||||
FROM channel_names_state
|
FROM channel_names_state
|
||||||
WHERE owner_bch_name=? AND channel_root_block_number=? AND channel_type_code=1
|
WHERE LOWER(owner_login)=LOWER(?) AND channel_root_block_number=? AND channel_type_code=1
|
||||||
LIMIT 1
|
LIMIT 1
|
||||||
""";
|
""";
|
||||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||||
ps.setString(1, ownerBchName);
|
ps.setString(1, loginFromChainName(ownerBchName));
|
||||||
ps.setInt(2, rootBlockNumber);
|
ps.setInt(2, rootBlockNumber);
|
||||||
try (ResultSet rs = ps.executeQuery()) {
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
return rs.next() ? rs.getString("slug") : null;
|
return rs.next() ? rs.getString("slug") : null;
|
||||||
@@ -141,11 +142,11 @@ public final class ChannelReadStateDAO {
|
|||||||
String sql = """
|
String sql = """
|
||||||
SELECT channel_root_block_number
|
SELECT channel_root_block_number
|
||||||
FROM channel_names_state
|
FROM channel_names_state
|
||||||
WHERE owner_bch_name=? AND slug=? AND channel_type_code=1
|
WHERE LOWER(owner_login)=LOWER(?) AND slug=? AND channel_type_code=1
|
||||||
LIMIT 1
|
LIMIT 1
|
||||||
""";
|
""";
|
||||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||||
ps.setString(1, ownerBchName);
|
ps.setString(1, loginFromChainName(ownerBchName));
|
||||||
ps.setString(2, channelName);
|
ps.setString(2, channelName);
|
||||||
try (ResultSet rs = ps.executeQuery()) {
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
return rs.next() ? rs.getInt("channel_root_block_number") : null;
|
return rs.next() ? rs.getInt("channel_root_block_number") : null;
|
||||||
@@ -157,11 +158,11 @@ public final class ChannelReadStateDAO {
|
|||||||
String sql = """
|
String sql = """
|
||||||
SELECT owner_login
|
SELECT owner_login
|
||||||
FROM channel_names_state
|
FROM channel_names_state
|
||||||
WHERE owner_bch_name=? AND slug=? AND channel_type_code=1
|
WHERE LOWER(owner_login)=LOWER(?) AND slug=? AND channel_type_code=1
|
||||||
LIMIT 1
|
LIMIT 1
|
||||||
""";
|
""";
|
||||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||||
ps.setString(1, ownerBchName);
|
ps.setString(1, loginFromChainName(ownerBchName));
|
||||||
ps.setString(2, channelName);
|
ps.setString(2, channelName);
|
||||||
try (ResultSet rs = ps.executeQuery()) {
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
return rs.next() ? rs.getString("owner_login") : null;
|
return rs.next() ? rs.getString("owner_login") : null;
|
||||||
@@ -189,9 +190,10 @@ public final class ChannelReadStateDAO {
|
|||||||
read_count, unread_count,
|
read_count, unread_count,
|
||||||
read_updated_at_ms, client_key, read_signature, updated_at_ms
|
read_updated_at_ms, client_key, read_signature, updated_at_ms
|
||||||
) VALUES (?, ?, ?, ?, ?, 0, ?, ?, ?, ?)
|
) VALUES (?, ?, ?, ?, ?, 0, ?, ?, ?, ?)
|
||||||
ON CONFLICT (viewer_login, owner_bch_name, channel_name)
|
ON CONFLICT (viewer_login, owner_login, channel_name)
|
||||||
DO UPDATE SET
|
DO UPDATE SET
|
||||||
owner_login = EXCLUDED.owner_login,
|
owner_login = EXCLUDED.owner_login,
|
||||||
|
owner_bch_name = EXCLUDED.owner_bch_name,
|
||||||
unread_count = GREATEST(
|
unread_count = GREATEST(
|
||||||
0,
|
0,
|
||||||
channel_read_state.unread_count -
|
channel_read_state.unread_count -
|
||||||
@@ -209,7 +211,7 @@ public final class ChannelReadStateDAO {
|
|||||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||||
ps.setString(1, viewerLogin);
|
ps.setString(1, viewerLogin);
|
||||||
ps.setString(2, ownerLogin);
|
ps.setString(2, ownerLogin);
|
||||||
ps.setString(3, ownerBchName);
|
ps.setString(3, loginFromChainName(ownerBchName));
|
||||||
ps.setString(4, channelName);
|
ps.setString(4, channelName);
|
||||||
ps.setLong(5, Math.max(0L, readCount));
|
ps.setLong(5, Math.max(0L, readCount));
|
||||||
ps.setLong(6, readUpdatedAtMs);
|
ps.setLong(6, readUpdatedAtMs);
|
||||||
@@ -244,7 +246,7 @@ public final class ChannelReadStateDAO {
|
|||||||
UPDATE channel_read_state crs
|
UPDATE channel_read_state crs
|
||||||
SET unread_count = crs.unread_count + 1,
|
SET unread_count = crs.unread_count + 1,
|
||||||
updated_at_ms = ?
|
updated_at_ms = ?
|
||||||
WHERE crs.owner_bch_name = ?
|
WHERE LOWER(crs.owner_login)=LOWER(?)
|
||||||
AND crs.channel_name = ?
|
AND crs.channel_name = ?
|
||||||
AND LOWER(crs.viewer_login) <> LOWER(crs.owner_login)
|
AND LOWER(crs.viewer_login) <> LOWER(crs.owner_login)
|
||||||
AND EXISTS (
|
AND EXISTS (
|
||||||
@@ -253,10 +255,10 @@ public final class ChannelReadStateDAO {
|
|||||||
JOIN connections_state cs
|
JOIN connections_state cs
|
||||||
ON LOWER(cs.login)=LOWER(crs.viewer_login)
|
ON LOWER(cs.login)=LOWER(crs.viewer_login)
|
||||||
AND cs.rel_type=?
|
AND cs.rel_type=?
|
||||||
AND cs.to_bch_name=cns.owner_bch_name
|
AND LOWER(cs.to_login)=LOWER(cns.owner_login)
|
||||||
AND COALESCE(cs.to_block_number,0)=cns.channel_root_block_number
|
AND COALESCE(cs.to_block_number,0)=cns.channel_root_block_number
|
||||||
AND cs.to_block_hash=cns.channel_root_block_hash
|
AND cs.to_block_hash=cns.channel_root_block_hash
|
||||||
WHERE cns.owner_bch_name=crs.owner_bch_name
|
WHERE LOWER(cns.owner_login)=LOWER(crs.owner_login)
|
||||||
AND cns.slug=crs.channel_name
|
AND cns.slug=crs.channel_name
|
||||||
AND cns.channel_type_code=1
|
AND cns.channel_type_code=1
|
||||||
)
|
)
|
||||||
@@ -265,7 +267,7 @@ public final class ChannelReadStateDAO {
|
|||||||
List<String> affected = new ArrayList<>();
|
List<String> affected = new ArrayList<>();
|
||||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||||
ps.setLong(1, nowMs);
|
ps.setLong(1, nowMs);
|
||||||
ps.setString(2, ownerBchName);
|
ps.setString(2, loginFromChainName(ownerBchName));
|
||||||
ps.setString(3, channelName);
|
ps.setString(3, channelName);
|
||||||
ps.setInt(4, followRelType);
|
ps.setInt(4, followRelType);
|
||||||
try (ResultSet rs = ps.executeQuery()) {
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
@@ -282,17 +284,51 @@ public final class ChannelReadStateDAO {
|
|||||||
DELETE FROM channel_read_state crs
|
DELETE FROM channel_read_state crs
|
||||||
USING channel_names_state cns
|
USING channel_names_state cns
|
||||||
WHERE LOWER(crs.viewer_login)=LOWER(?)
|
WHERE LOWER(crs.viewer_login)=LOWER(?)
|
||||||
AND crs.owner_bch_name=?
|
AND LOWER(crs.owner_login)=LOWER(?)
|
||||||
AND cns.owner_bch_name=crs.owner_bch_name
|
AND LOWER(cns.owner_login)=LOWER(crs.owner_login)
|
||||||
AND cns.slug=crs.channel_name
|
AND cns.slug=crs.channel_name
|
||||||
AND cns.channel_root_block_number=?
|
AND cns.channel_root_block_number=?
|
||||||
AND cns.channel_type_code=1
|
AND cns.channel_type_code=1
|
||||||
""";
|
""";
|
||||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||||
ps.setString(1, viewerLogin);
|
ps.setString(1, viewerLogin);
|
||||||
ps.setString(2, ownerBchName);
|
ps.setString(2, loginFromChainName(ownerBchName));
|
||||||
ps.setInt(3, rootBlockNumber);
|
ps.setInt(3, rootBlockNumber);
|
||||||
return ps.executeUpdate() > 0;
|
return ps.executeUpdate() > 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* Recomputes server-owned unread counters for all public channels owned by one logical login.
|
||||||
|
* Signed read_count/read signature fields are preserved exactly. Safe to call repeatedly after replay.
|
||||||
|
*/
|
||||||
|
public int recalculateUnreadForOwnedChannels(Connection c, String ownerLogin, long nowMs) throws SQLException {
|
||||||
|
String sql = """
|
||||||
|
WITH counts AS (
|
||||||
|
SELECT cns.owner_login, cns.slug, COUNT(b.block_number)::BIGINT AS message_count
|
||||||
|
FROM channel_names_state cns
|
||||||
|
LEFT JOIN blocks_store b
|
||||||
|
ON LOWER(b.login)=LOWER(cns.owner_login)
|
||||||
|
AND b.line_code=cns.channel_root_block_number
|
||||||
|
AND b.msg_type=1
|
||||||
|
AND b.msg_sub_type IN (10,50,100,110,120,130)
|
||||||
|
WHERE LOWER(cns.owner_login)=LOWER(?)
|
||||||
|
AND cns.channel_type_code=1
|
||||||
|
GROUP BY cns.owner_login,cns.slug
|
||||||
|
)
|
||||||
|
UPDATE channel_read_state crs
|
||||||
|
SET unread_count=GREATEST(0, counts.message_count-crs.read_count),
|
||||||
|
updated_at_ms=?
|
||||||
|
FROM counts
|
||||||
|
WHERE LOWER(crs.owner_login)=LOWER(counts.owner_login)
|
||||||
|
AND crs.channel_name=counts.slug
|
||||||
|
""";
|
||||||
|
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||||
|
ps.setString(1, ownerLogin);
|
||||||
|
ps.setLong(2, nowMs);
|
||||||
|
return ps.executeUpdate();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String loginFromChainName(String bch){ if(bch==null)return null; int d=bch.lastIndexOf('-'); return d>0?bch.substring(0,d):bch; }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,120 @@
|
|||||||
|
package shine.db.dao;
|
||||||
|
|
||||||
|
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;
|
||||||
|
|
||||||
|
/** Read-only поиск по серверному индексу актуальных публичных каналов. */
|
||||||
|
public final class ChannelSearchDAO {
|
||||||
|
private ChannelSearchDAO() {}
|
||||||
|
|
||||||
|
public record Match(String ownerLogin, String slug, String displayName, String description,
|
||||||
|
String avatarAr, String avatarPr, String ownerBlockchainName,
|
||||||
|
int rootBlockNumber, String rootBlockHashHex, int subscribersCount) {}
|
||||||
|
|
||||||
|
// LIKE ESCAPE '!' — введённые пользователем %, _ и ! трактуются буквально.
|
||||||
|
private static String escapedPattern(String text) {
|
||||||
|
return text.replace("!", "!!").replace("%", "!%").replace("_", "!_");
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String normalized(String text) {
|
||||||
|
return (text == null ? "" : text.trim()).toLowerCase(Locale.ROOT).replace('ё', 'е');
|
||||||
|
}
|
||||||
|
|
||||||
|
public static List<Match> search(Connection c, String query, String ownerLogin, int limit) throws SQLException {
|
||||||
|
String needle = normalized(query).replaceFirst("^@", "");
|
||||||
|
String ownerFilter = normalized(ownerLogin).replaceFirst("^@", "");
|
||||||
|
boolean ownerOnly = query != null && query.trim().startsWith("@") && !needle.contains("/");
|
||||||
|
String channelNeedle = needle;
|
||||||
|
if (needle.contains("/")) {
|
||||||
|
String[] parts = needle.split("/", 2);
|
||||||
|
if (ownerFilter.isBlank()) ownerFilter = parts[0];
|
||||||
|
channelNeedle = parts[1];
|
||||||
|
}
|
||||||
|
// Если указан owner/название, техническое и публичное название ищем только у владельца.
|
||||||
|
boolean hasOwner = !ownerFilter.isBlank();
|
||||||
|
String exact = channelNeedle;
|
||||||
|
String anywhere = "%" + escapedPattern(exact) + "%";
|
||||||
|
String prefix = escapedPattern(exact) + "%";
|
||||||
|
String ownerExact = ownerFilter;
|
||||||
|
String ownerPrefix = escapedPattern(ownerExact) + "%";
|
||||||
|
String ownerAnywhere = "%" + escapedPattern(ownerExact) + "%";
|
||||||
|
String sql = """
|
||||||
|
SELECT cn.owner_login, cn.slug, cn.display_name, cn.channel_description,
|
||||||
|
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
|
||||||
|
LEFT JOIN channel_stats_state cs
|
||||||
|
ON cs.owner_bch_name = cn.owner_bch_name
|
||||||
|
AND cs.channel_root_block_number = cn.channel_root_block_number
|
||||||
|
AND cs.channel_root_block_hash = cn.channel_root_block_hash
|
||||||
|
WHERE cn.channel_type_code = 1 AND NOT cn.is_deleted
|
||||||
|
AND (? = '' OR replace(lower(cn.owner_login), 'ё','е') LIKE ? ESCAPE '!')
|
||||||
|
AND (
|
||||||
|
(? = true AND replace(lower(cn.owner_login), 'ё','е') LIKE ? ESCAPE '!')
|
||||||
|
OR (? = false AND (
|
||||||
|
replace(lower(cn.display_name), 'ё','е') LIKE ? ESCAPE '!'
|
||||||
|
OR replace(lower(cn.slug), 'ё','е') LIKE ? ESCAPE '!'
|
||||||
|
OR (? = false AND replace(lower(cn.owner_login), 'ё','е') LIKE ? ESCAPE '!')
|
||||||
|
OR (? = true AND ? = '' AND replace(lower(cn.owner_login), 'ё','е') LIKE ? ESCAPE '!')
|
||||||
|
))
|
||||||
|
)
|
||||||
|
ORDER BY
|
||||||
|
CASE
|
||||||
|
WHEN replace(lower(cn.display_name), 'ё','е') = ? THEN 0
|
||||||
|
WHEN replace(lower(cn.slug), 'ё','е') = ? THEN 1
|
||||||
|
WHEN replace(lower(cn.display_name), 'ё','е') LIKE ? ESCAPE '!' THEN 2
|
||||||
|
WHEN replace(lower(cn.slug), 'ё','е') LIKE ? ESCAPE '!' THEN 3
|
||||||
|
WHEN replace(lower(cn.owner_login), 'ё','е') = ? THEN 4
|
||||||
|
WHEN replace(lower(cn.display_name), 'ё','е') LIKE ? ESCAPE '!' THEN 5
|
||||||
|
WHEN replace(lower(cn.slug), 'ё','е') LIKE ? ESCAPE '!' THEN 6
|
||||||
|
ELSE 7
|
||||||
|
END,
|
||||||
|
COALESCE(cs.subscribers_count, 0) DESC,
|
||||||
|
lower(cn.owner_login), lower(cn.slug), cn.owner_bch_name
|
||||||
|
LIMIT ?
|
||||||
|
""";
|
||||||
|
// ownerOnly = поиск @login. Когда указан владелец — ограничиваем выборку,
|
||||||
|
// а пустой сегмент / означает «все каналы этого пользователя».
|
||||||
|
String term = exact;
|
||||||
|
boolean filterByOwner = hasOwner && !ownerOnly;
|
||||||
|
List<Match> matches = new ArrayList<>();
|
||||||
|
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||||
|
int i = 1;
|
||||||
|
ps.setString(i++, filterByOwner ? ownerFilter : "");
|
||||||
|
ps.setString(i++, ownerPrefix);
|
||||||
|
ps.setBoolean(i++, ownerOnly);
|
||||||
|
ps.setString(i++, "%" + escapedPattern(term) + "%");
|
||||||
|
ps.setBoolean(i++, ownerOnly);
|
||||||
|
ps.setString(i++, anywhere);
|
||||||
|
ps.setString(i++, anywhere);
|
||||||
|
ps.setBoolean(i++, filterByOwner);
|
||||||
|
ps.setString(i++, anywhere);
|
||||||
|
ps.setBoolean(i++, filterByOwner);
|
||||||
|
ps.setString(i++, exact);
|
||||||
|
ps.setString(i++, ownerAnywhere);
|
||||||
|
ps.setString(i++, term);
|
||||||
|
ps.setString(i++, term);
|
||||||
|
ps.setString(i++, prefix);
|
||||||
|
ps.setString(i++, prefix);
|
||||||
|
ps.setString(i++, term);
|
||||||
|
ps.setString(i++, anywhere);
|
||||||
|
ps.setString(i++, anywhere);
|
||||||
|
ps.setInt(i, Math.min(50, Math.max(1, limit)));
|
||||||
|
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_pr"),
|
||||||
|
rs.getString("owner_bch_name"), rs.getInt("channel_root_block_number"),
|
||||||
|
rs.getString("root_hash"), rs.getInt("subscribers_count")
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return matches;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -39,19 +39,14 @@ public final class ConnectionsStateDAO {
|
|||||||
*/
|
*/
|
||||||
public List<String> listOutgoingByRelTypeCanonical(Connection c, String loginAnyCase, int relType) throws SQLException {
|
public List<String> listOutgoingByRelTypeCanonical(Connection c, String loginAnyCase, int relType) throws SQLException {
|
||||||
String sql = """
|
String sql = """
|
||||||
SELECT COALESCE(u_login.login, u_bch.login, cs.to_login) AS friend_login
|
SELECT COALESCE(u_login.login, cs.to_login) AS friend_login
|
||||||
FROM connections_state cs
|
FROM connections_state cs
|
||||||
LEFT JOIN %s
|
LEFT JOIN %s
|
||||||
ON LOWER(u_login.login) = LOWER(cs.to_login)
|
ON LOWER(u_login.login) = LOWER(cs.to_login)
|
||||||
LEFT JOIN %s
|
|
||||||
ON LOWER(u_bch.blockchain_name) = LOWER(cs.to_bch_name)
|
|
||||||
WHERE LOWER(cs.login) = LOWER(?)
|
WHERE LOWER(cs.login) = LOWER(?)
|
||||||
AND cs.rel_type = ?
|
AND cs.rel_type = ?
|
||||||
ORDER BY friend_login
|
ORDER BY friend_login
|
||||||
""".formatted(
|
""".formatted(CurrentUsersSql.usersSubquery("u_login"));
|
||||||
CurrentUsersSql.usersSubquery("u_login"),
|
|
||||||
CurrentUsersSql.usersSubquery("u_bch")
|
|
||||||
);
|
|
||||||
|
|
||||||
List<String> out = new ArrayList<>();
|
List<String> out = new ArrayList<>();
|
||||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||||
@@ -73,19 +68,14 @@ public final class ConnectionsStateDAO {
|
|||||||
FROM connections_state cs
|
FROM connections_state cs
|
||||||
LEFT JOIN %s
|
LEFT JOIN %s
|
||||||
ON LOWER(u_login.login) = LOWER(cs.to_login)
|
ON LOWER(u_login.login) = LOWER(cs.to_login)
|
||||||
LEFT JOIN %s
|
|
||||||
ON LOWER(u_bch.blockchain_name) = LOWER(cs.to_bch_name)
|
|
||||||
WHERE LOWER(cs.login) = LOWER(?)
|
WHERE LOWER(cs.login) = LOWER(?)
|
||||||
AND cs.rel_type = ?
|
AND cs.rel_type = ?
|
||||||
AND (
|
AND (
|
||||||
LOWER(cs.to_login) = LOWER(?)
|
LOWER(cs.to_login) = LOWER(?)
|
||||||
OR LOWER(COALESCE(u_login.login, u_bch.login, cs.to_login)) = LOWER(?)
|
OR LOWER(COALESCE(u_login.login, cs.to_login)) = LOWER(?)
|
||||||
)
|
)
|
||||||
LIMIT 1
|
LIMIT 1
|
||||||
""".formatted(
|
""".formatted(CurrentUsersSql.usersSubquery("u_login"));
|
||||||
CurrentUsersSql.usersSubquery("u_login"),
|
|
||||||
CurrentUsersSql.usersSubquery("u_bch")
|
|
||||||
);
|
|
||||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||||
ps.setString(1, loginAnyCase);
|
ps.setString(1, loginAnyCase);
|
||||||
ps.setInt(2, relType);
|
ps.setInt(2, relType);
|
||||||
@@ -104,33 +94,12 @@ public final class ConnectionsStateDAO {
|
|||||||
String sql = """
|
String sql = """
|
||||||
SELECT COALESCE(u_actor.login, cs.login) AS friend_login
|
SELECT COALESCE(u_actor.login, cs.login) AS friend_login
|
||||||
FROM connections_state cs
|
FROM connections_state cs
|
||||||
LEFT JOIN %s
|
LEFT JOIN %s ON LOWER(u_actor.login)=LOWER(cs.login)
|
||||||
ON LOWER(u_actor.login) = LOWER(cs.login)
|
WHERE LOWER(cs.to_login)=LOWER(?) AND cs.rel_type=?
|
||||||
LEFT JOIN %s
|
|
||||||
ON LOWER(u_target.login) = LOWER(?)
|
|
||||||
WHERE (
|
|
||||||
LOWER(cs.to_login) = LOWER(?)
|
|
||||||
OR (u_target.blockchain_name IS NOT NULL AND LOWER(cs.to_bch_name) = LOWER(u_target.blockchain_name))
|
|
||||||
)
|
|
||||||
AND cs.rel_type = ?
|
|
||||||
ORDER BY friend_login
|
ORDER BY friend_login
|
||||||
""".formatted(
|
""".formatted(CurrentUsersSql.usersSubquery("u_actor"));
|
||||||
CurrentUsersSql.usersSubquery("u_actor"),
|
List<String> out=new ArrayList<>();
|
||||||
CurrentUsersSql.usersSubquery("u_target")
|
try(PreparedStatement ps=c.prepareStatement(sql)){ ps.setString(1,loginAnyCase); ps.setInt(2,relType); try(ResultSet rs=ps.executeQuery()){while(rs.next()){String v=rs.getString("friend_login");if(v!=null)out.add(v);}}}
|
||||||
);
|
|
||||||
|
|
||||||
List<String> out = new ArrayList<>();
|
|
||||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
|
||||||
ps.setString(1, loginAnyCase);
|
|
||||||
ps.setString(2, loginAnyCase);
|
|
||||||
ps.setInt(3, relType);
|
|
||||||
try (ResultSet rs = ps.executeQuery()) {
|
|
||||||
while (rs.next()) {
|
|
||||||
String v = rs.getString("friend_login");
|
|
||||||
if (v != null) out.add(v);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -189,21 +158,17 @@ public final class ConnectionsStateDAO {
|
|||||||
}
|
}
|
||||||
|
|
||||||
String sql = """
|
String sql = """
|
||||||
INSERT INTO connections_state (login, rel_type, to_login, to_bch_name, to_block_number, to_block_hash)
|
INSERT INTO connections_state (login, rel_type, to_login, to_block_number, to_block_hash)
|
||||||
VALUES (?, ?, ?, ?, ?, ?)
|
VALUES (?, ?, ?, ?, ?)
|
||||||
ON CONFLICT(login, rel_type, to_login, to_bch_name, to_block_number, to_block_hash) DO UPDATE SET
|
ON CONFLICT(login, rel_type, to_login, to_block_number, to_block_hash) DO NOTHING
|
||||||
to_bch_name=excluded.to_bch_name,
|
|
||||||
to_block_number=excluded.to_block_number,
|
|
||||||
to_block_hash=excluded.to_block_hash
|
|
||||||
""";
|
""";
|
||||||
|
|
||||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||||
ps.setString(1, login);
|
ps.setString(1, login.trim().toLowerCase(java.util.Locale.ROOT));
|
||||||
ps.setInt(2, relType);
|
ps.setInt(2, relType);
|
||||||
ps.setString(3, toLogin);
|
ps.setString(3, toLogin.trim().toLowerCase(java.util.Locale.ROOT));
|
||||||
ps.setString(4, toBchName);
|
if (toBlockNumber == null) ps.setNull(4, java.sql.Types.INTEGER); else ps.setInt(4, toBlockNumber);
|
||||||
if (toBlockNumber == null) ps.setNull(5, java.sql.Types.INTEGER); else ps.setInt(5, toBlockNumber);
|
ps.setBytes(5, toBlockHash);
|
||||||
ps.setBytes(6, toBlockHash);
|
|
||||||
ps.executeUpdate();
|
ps.executeUpdate();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -204,6 +204,53 @@ public final class CurrentUsersDAO {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Поиск логинов и публичных имён; результат не раскрывает приватные ключи PDA. */
|
||||||
|
public record SearchUserCard(String login, String displayName, String avatarAr) {}
|
||||||
|
|
||||||
|
public List<SearchUserCard> searchDirectory(String query, Boolean isServer, int limit) throws SQLException {
|
||||||
|
String term = query.trim().toLowerCase(java.util.Locale.ROOT).replace('ё', 'е');
|
||||||
|
String escaped = term.replace("!", "!!").replace("%", "!%").replace("_", "!_");
|
||||||
|
String sql = """
|
||||||
|
SELECT su.login, coalesce(up.first_name, '') AS first_name,
|
||||||
|
coalesce(up.last_name, '') AS last_name, coalesce(up.ava_ar, '') AS ava_ar
|
||||||
|
FROM user_identity_current su
|
||||||
|
LEFT JOIN user_profile_state up ON lower(up.login) = lower(su.login)
|
||||||
|
WHERE (? IS NULL OR su.is_server = ?)
|
||||||
|
AND (
|
||||||
|
replace(lower(su.login), 'ё', 'е') LIKE ? ESCAPE '!'
|
||||||
|
OR replace(lower(coalesce(up.first_name, '') || ' ' || coalesce(up.last_name, '')), 'ё', 'е') LIKE ? ESCAPE '!'
|
||||||
|
OR replace(lower(coalesce(up.last_name, '') || ' ' || coalesce(up.first_name, '')), 'ё', 'е') LIKE ? ESCAPE '!'
|
||||||
|
)
|
||||||
|
ORDER BY
|
||||||
|
CASE WHEN replace(lower(su.login), 'ё','е') = ? THEN 0
|
||||||
|
WHEN replace(lower(su.login), 'ё','е') LIKE ? ESCAPE '!' THEN 1
|
||||||
|
WHEN replace(lower(coalesce(up.first_name, '') || ' ' || coalesce(up.last_name, '')), 'ё', 'е') LIKE ? ESCAPE '!' THEN 2
|
||||||
|
ELSE 3 END,
|
||||||
|
lower(su.login)
|
||||||
|
LIMIT ?
|
||||||
|
""";
|
||||||
|
List<SearchUserCard> users = new ArrayList<>();
|
||||||
|
try (Connection c = db.getConnection(); PreparedStatement ps = c.prepareStatement(sql)) {
|
||||||
|
int i = 1;
|
||||||
|
if (isServer == null) { ps.setNull(i++, Types.BOOLEAN); ps.setNull(i++, Types.BOOLEAN); }
|
||||||
|
else { ps.setBoolean(i++, isServer); ps.setBoolean(i++, isServer); }
|
||||||
|
ps.setString(i++, escaped + "%");
|
||||||
|
ps.setString(i++, "%" + escaped + "%");
|
||||||
|
ps.setString(i++, "%" + escaped + "%");
|
||||||
|
ps.setString(i++, term);
|
||||||
|
ps.setString(i++, escaped + "%");
|
||||||
|
ps.setString(i++, escaped + "%");
|
||||||
|
ps.setInt(i, Math.min(50, Math.max(1, limit)));
|
||||||
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
|
while (rs.next()) {
|
||||||
|
String publicName = (rs.getString("first_name") + " " + rs.getString("last_name")).trim();
|
||||||
|
users.add(new SearchUserCard(rs.getString("login"), publicName, rs.getString("ava_ar")));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return users;
|
||||||
|
}
|
||||||
|
|
||||||
// -------------------- MAPPER --------------------
|
// -------------------- MAPPER --------------------
|
||||||
|
|
||||||
private CurrentUserEntry mapRow(ResultSet rs) throws SQLException {
|
private CurrentUserEntry mapRow(ResultSet rs) throws SQLException {
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package shine.db.dao;
|
package shine.db.dao;
|
||||||
|
|
||||||
|
import shine.db.DbController;
|
||||||
import shine.db.MsgSubType;
|
import shine.db.MsgSubType;
|
||||||
import shine.db.entities.SignedMessageEntry;
|
import shine.db.entities.SignedMessageEntry;
|
||||||
|
|
||||||
@@ -17,6 +18,7 @@ import java.util.Map;
|
|||||||
|
|
||||||
public final class DmDialogStateDAO {
|
public final class DmDialogStateDAO {
|
||||||
private static volatile DmDialogStateDAO instance;
|
private static volatile DmDialogStateDAO instance;
|
||||||
|
private final DbController db = DbController.getInstance();
|
||||||
|
|
||||||
private DmDialogStateDAO() {}
|
private DmDialogStateDAO() {}
|
||||||
|
|
||||||
@@ -129,6 +131,26 @@ public final class DmDialogStateDAO {
|
|||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Снимок счётчика после записи DM. Используется только сервером для push/WS, не отдаёт текст сообщения. */
|
||||||
|
public NotificationState getNotificationState(String ownerLogin, String peerLogin) throws SQLException {
|
||||||
|
try (Connection c = db.getConnection();
|
||||||
|
PreparedStatement ps = c.prepareStatement("""
|
||||||
|
SELECT unread_count, updated_at_ms
|
||||||
|
FROM dm_dialog_state
|
||||||
|
WHERE LOWER(owner_login) = LOWER(?) AND LOWER(peer_login) = LOWER(?)
|
||||||
|
LIMIT 1
|
||||||
|
""")) {
|
||||||
|
ps.setString(1, normalize(ownerLogin));
|
||||||
|
ps.setString(2, normalize(peerLogin));
|
||||||
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
|
if (!rs.next()) return null;
|
||||||
|
return new NotificationState(Math.max(0, rs.getInt("unread_count")), rs.getLong("updated_at_ms"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public record NotificationState(int unreadCount, long versionMs) {}
|
||||||
|
|
||||||
public void refreshFromEntry(Connection c, SignedMessageEntry entry) throws SQLException {
|
public void refreshFromEntry(Connection c, SignedMessageEntry entry) throws SQLException {
|
||||||
if (entry == null) return;
|
if (entry == null) return;
|
||||||
refreshConversationPair(c, entry.getFromLogin(), entry.getToLogin());
|
refreshConversationPair(c, entry.getFromLogin(), entry.getToLogin());
|
||||||
@@ -274,7 +296,7 @@ public final class DmDialogStateDAO {
|
|||||||
last_message_time_ms = EXCLUDED.last_message_time_ms,
|
last_message_time_ms = EXCLUDED.last_message_time_ms,
|
||||||
unread_count = EXCLUDED.unread_count,
|
unread_count = EXCLUDED.unread_count,
|
||||||
last_read_receipt_time_ms = EXCLUDED.last_read_receipt_time_ms,
|
last_read_receipt_time_ms = EXCLUDED.last_read_receipt_time_ms,
|
||||||
updated_at_ms = EXCLUDED.updated_at_ms
|
updated_at_ms = GREATEST(dm_dialog_state.updated_at_ms + 1, EXCLUDED.updated_at_ms)
|
||||||
""")) {
|
""")) {
|
||||||
ps.setString(1, summary.ownerLogin());
|
ps.setString(1, summary.ownerLogin());
|
||||||
ps.setString(2, summary.peerLogin());
|
ps.setString(2, summary.peerLogin());
|
||||||
|
|||||||
+250
@@ -0,0 +1,250 @@
|
|||||||
|
package shine.db.dao;
|
||||||
|
|
||||||
|
import shine.db.DbController;
|
||||||
|
import shine.db.entities.KeyRotationCandidateBlockEntry;
|
||||||
|
|
||||||
|
import java.sql.Connection;
|
||||||
|
import java.sql.PreparedStatement;
|
||||||
|
import java.sql.ResultSet;
|
||||||
|
import java.sql.SQLException;
|
||||||
|
import java.sql.Statement;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/** Хранилище candidate-блоков будущего fork во время ротации ключей. */
|
||||||
|
public final class KeyRotationCandidateBlocksDAO {
|
||||||
|
private static volatile KeyRotationCandidateBlocksDAO instance;
|
||||||
|
private final DbController db = DbController.getInstance();
|
||||||
|
|
||||||
|
private KeyRotationCandidateBlocksDAO() { }
|
||||||
|
|
||||||
|
public static KeyRotationCandidateBlocksDAO getInstance() {
|
||||||
|
if (instance == null) {
|
||||||
|
synchronized (KeyRotationCandidateBlocksDAO.class) {
|
||||||
|
if (instance == null) instance = new KeyRotationCandidateBlocksDAO();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return instance;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Идемпотентно сохраняет один candidate-блок.
|
||||||
|
* Повтор того же blockNumber допустим только при полном совпадении hash и DataItem id.
|
||||||
|
*/
|
||||||
|
public KeyRotationCandidateBlockEntry insertOrGet(Connection c, KeyRotationCandidateBlockEntry entry) throws SQLException {
|
||||||
|
KeyRotationCandidateBlockEntry existing = getByNumber(c, entry.getRotationSessionId(), entry.getBlockNumber());
|
||||||
|
if (existing != null) {
|
||||||
|
if (Arrays.equals(existing.getBlockHash(), entry.getBlockHash())
|
||||||
|
&& Arrays.equals(existing.getDataItemId(), entry.getDataItemId())) {
|
||||||
|
return existing;
|
||||||
|
}
|
||||||
|
throw new SQLException("Candidate block conflict at number=" + entry.getBlockNumber());
|
||||||
|
}
|
||||||
|
|
||||||
|
String sql = """
|
||||||
|
INSERT INTO key_rotation_candidate_blocks (
|
||||||
|
rotation_session_id, login, candidate_blockchain_name,
|
||||||
|
block_number, block_hash, data_item_id, block_bytes,
|
||||||
|
arweave_publish_pending, arweave_published_at_ms, created_at_ms
|
||||||
|
) VALUES (?, ?, ?, ?, ?, ?, ?, TRUE, NULL, ?)
|
||||||
|
""";
|
||||||
|
try (PreparedStatement ps = c.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) {
|
||||||
|
int i = 1;
|
||||||
|
ps.setLong(i++, entry.getRotationSessionId());
|
||||||
|
ps.setString(i++, entry.getLogin());
|
||||||
|
ps.setString(i++, entry.getCandidateBlockchainName());
|
||||||
|
ps.setInt(i++, entry.getBlockNumber());
|
||||||
|
ps.setBytes(i++, entry.getBlockHash());
|
||||||
|
ps.setBytes(i++, entry.getDataItemId());
|
||||||
|
ps.setBytes(i++, entry.getBlockBytes());
|
||||||
|
ps.setLong(i++, entry.getCreatedAtMs());
|
||||||
|
ps.executeUpdate();
|
||||||
|
try (ResultSet keys = ps.getGeneratedKeys()) {
|
||||||
|
if (!keys.next()) throw new SQLException("candidate block insert returned no id");
|
||||||
|
entry.setId(keys.getLong(1));
|
||||||
|
}
|
||||||
|
} catch (SQLException insertFailure) {
|
||||||
|
// Конкурирующий повтор из другой сессии мог успеть вставиться между SELECT и INSERT.
|
||||||
|
KeyRotationCandidateBlockEntry raced = getByNumber(c, entry.getRotationSessionId(), entry.getBlockNumber());
|
||||||
|
if (raced != null
|
||||||
|
&& Arrays.equals(raced.getBlockHash(), entry.getBlockHash())
|
||||||
|
&& Arrays.equals(raced.getDataItemId(), entry.getDataItemId())) {
|
||||||
|
return raced;
|
||||||
|
}
|
||||||
|
throw insertFailure;
|
||||||
|
}
|
||||||
|
entry.setArweavePublishPending(true);
|
||||||
|
return entry;
|
||||||
|
}
|
||||||
|
|
||||||
|
public KeyRotationCandidateBlockEntry getByNumber(Connection c, long sessionId, int blockNumber) throws SQLException {
|
||||||
|
try (PreparedStatement ps = c.prepareStatement("""
|
||||||
|
SELECT * FROM key_rotation_candidate_blocks
|
||||||
|
WHERE rotation_session_id = ? AND block_number = ?
|
||||||
|
""")) {
|
||||||
|
ps.setLong(1, sessionId);
|
||||||
|
ps.setInt(2, blockNumber);
|
||||||
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
|
return rs.next() ? map(rs) : null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public int countStored(Connection c, long sessionId) throws SQLException {
|
||||||
|
try (PreparedStatement ps = c.prepareStatement("""
|
||||||
|
SELECT COUNT(*) FROM key_rotation_candidate_blocks WHERE rotation_session_id = ?
|
||||||
|
""")) {
|
||||||
|
ps.setLong(1, sessionId);
|
||||||
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
|
rs.next();
|
||||||
|
return rs.getInt(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public int countPublished(Connection c, long sessionId) throws SQLException {
|
||||||
|
try (PreparedStatement ps = c.prepareStatement("""
|
||||||
|
SELECT COUNT(*) FROM key_rotation_candidate_blocks
|
||||||
|
WHERE rotation_session_id = ? AND arweave_publish_pending = FALSE
|
||||||
|
""")) {
|
||||||
|
ps.setLong(1, sessionId);
|
||||||
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
|
rs.next();
|
||||||
|
return rs.getInt(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Все candidate-блоки одной ротации в строгом порядке block_number. */
|
||||||
|
public List<KeyRotationCandidateBlockEntry> listBySession(Connection c, long sessionId) throws SQLException {
|
||||||
|
try (PreparedStatement ps = c.prepareStatement("""
|
||||||
|
SELECT * FROM key_rotation_candidate_blocks
|
||||||
|
WHERE rotation_session_id = ?
|
||||||
|
ORDER BY block_number
|
||||||
|
""")) {
|
||||||
|
ps.setLong(1, sessionId);
|
||||||
|
List<KeyRotationCandidateBlockEntry> out = new ArrayList<>();
|
||||||
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
|
while (rs.next()) out.add(map(rs));
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Возвращает ещё не опубликованный candidate DataItem для быстрой Turbo-попытки. */
|
||||||
|
public KeyRotationCandidateBlockEntry getPendingArweaveByDataItemId(byte[] dataItemId) throws SQLException {
|
||||||
|
if (dataItemId == null || dataItemId.length != 32) return null;
|
||||||
|
try (Connection c = db.getConnection();
|
||||||
|
PreparedStatement ps = c.prepareStatement("""
|
||||||
|
SELECT * FROM key_rotation_candidate_blocks
|
||||||
|
WHERE data_item_id = ? AND arweave_publish_pending = TRUE
|
||||||
|
LIMIT 1
|
||||||
|
""")) {
|
||||||
|
ps.setBytes(1, dataItemId);
|
||||||
|
try (ResultSet rs = ps.executeQuery()) { return rs.next() ? map(rs) : null; }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Candidate-блоки имеют приоритет перед обычной очередью publisher-а. */
|
||||||
|
public List<KeyRotationCandidateBlockEntry> listPendingArweave(int limit) throws SQLException {
|
||||||
|
if (limit <= 0) return List.of();
|
||||||
|
try (Connection c = db.getConnection();
|
||||||
|
PreparedStatement ps = c.prepareStatement("""
|
||||||
|
SELECT * FROM key_rotation_candidate_blocks
|
||||||
|
WHERE arweave_publish_pending = TRUE
|
||||||
|
ORDER BY id
|
||||||
|
LIMIT ?
|
||||||
|
""")) {
|
||||||
|
ps.setInt(1, limit);
|
||||||
|
List<KeyRotationCandidateBlockEntry> out = new ArrayList<>();
|
||||||
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
|
while (rs.next()) out.add(map(rs));
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Помечает DataItem опубликованными и синхронизирует progress_current ротации
|
||||||
|
* с реальным количеством DataItem, подтверждённых publisher-ом.
|
||||||
|
*/
|
||||||
|
public void markArweavePublished(List<byte[]> dataItemIds, long publishedAtMs) throws SQLException {
|
||||||
|
if (dataItemIds == null || dataItemIds.isEmpty()) return;
|
||||||
|
try (Connection c = db.getConnection()) {
|
||||||
|
boolean oldAutoCommit = c.getAutoCommit();
|
||||||
|
c.setAutoCommit(false);
|
||||||
|
try {
|
||||||
|
java.util.Set<Long> sessions = new java.util.HashSet<>();
|
||||||
|
try (PreparedStatement find = c.prepareStatement("""
|
||||||
|
SELECT rotation_session_id
|
||||||
|
FROM key_rotation_candidate_blocks
|
||||||
|
WHERE data_item_id = ?
|
||||||
|
""")) {
|
||||||
|
for (byte[] id : dataItemIds) {
|
||||||
|
find.setBytes(1, id);
|
||||||
|
try (ResultSet rs = find.executeQuery()) {
|
||||||
|
if (rs.next()) sessions.add(rs.getLong(1));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
try (PreparedStatement ps = c.prepareStatement("""
|
||||||
|
UPDATE key_rotation_candidate_blocks
|
||||||
|
SET arweave_publish_pending = FALSE,
|
||||||
|
arweave_published_at_ms = COALESCE(arweave_published_at_ms, ?)
|
||||||
|
WHERE data_item_id = ?
|
||||||
|
""")) {
|
||||||
|
for (byte[] id : dataItemIds) {
|
||||||
|
ps.setLong(1, publishedAtMs);
|
||||||
|
ps.setBytes(2, id);
|
||||||
|
ps.addBatch();
|
||||||
|
}
|
||||||
|
ps.executeBatch();
|
||||||
|
}
|
||||||
|
|
||||||
|
try (PreparedStatement progress = c.prepareStatement("""
|
||||||
|
UPDATE key_rotation_sessions s
|
||||||
|
SET progress_current = LEAST(s.progress_total, (
|
||||||
|
SELECT COUNT(*)::INTEGER
|
||||||
|
FROM key_rotation_candidate_blocks b
|
||||||
|
WHERE b.rotation_session_id = s.id
|
||||||
|
AND b.arweave_publish_pending = FALSE
|
||||||
|
)),
|
||||||
|
updated_at_ms = ?
|
||||||
|
WHERE s.id = ? AND s.status = 'COPYING_CHAIN'
|
||||||
|
""")) {
|
||||||
|
for (Long sessionId : sessions) {
|
||||||
|
progress.setLong(1, publishedAtMs);
|
||||||
|
progress.setLong(2, sessionId);
|
||||||
|
progress.addBatch();
|
||||||
|
}
|
||||||
|
progress.executeBatch();
|
||||||
|
}
|
||||||
|
c.commit();
|
||||||
|
} catch (Exception e) {
|
||||||
|
c.rollback();
|
||||||
|
if (e instanceof SQLException sql) throw sql;
|
||||||
|
throw new SQLException("Failed to mark candidate DataItems published", e);
|
||||||
|
} finally {
|
||||||
|
c.setAutoCommit(oldAutoCommit);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static KeyRotationCandidateBlockEntry map(ResultSet rs) throws SQLException {
|
||||||
|
KeyRotationCandidateBlockEntry e = new KeyRotationCandidateBlockEntry();
|
||||||
|
e.setId(rs.getLong("id"));
|
||||||
|
e.setRotationSessionId(rs.getLong("rotation_session_id"));
|
||||||
|
e.setLogin(rs.getString("login"));
|
||||||
|
e.setCandidateBlockchainName(rs.getString("candidate_blockchain_name"));
|
||||||
|
e.setBlockNumber(rs.getInt("block_number"));
|
||||||
|
e.setBlockHash(rs.getBytes("block_hash"));
|
||||||
|
e.setDataItemId(rs.getBytes("data_item_id"));
|
||||||
|
e.setBlockBytes(rs.getBytes("block_bytes"));
|
||||||
|
e.setArweavePublishPending(rs.getBoolean("arweave_publish_pending"));
|
||||||
|
e.setArweavePublishedAtMs((Long) rs.getObject("arweave_published_at_ms"));
|
||||||
|
e.setCreatedAtMs(rs.getLong("created_at_ms"));
|
||||||
|
return e;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,612 @@
|
|||||||
|
package shine.db.dao;
|
||||||
|
|
||||||
|
import shine.db.DbController;
|
||||||
|
import shine.db.entities.KeyRotationSessionEntry;
|
||||||
|
import shine.db.entities.KeyRotationStatus;
|
||||||
|
|
||||||
|
import java.sql.Connection;
|
||||||
|
import java.sql.PreparedStatement;
|
||||||
|
import java.sql.ResultSet;
|
||||||
|
import java.sql.SQLException;
|
||||||
|
import java.sql.Statement;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* DAO для серверной машины смены ключей.
|
||||||
|
*
|
||||||
|
* Все методы изменения статуса синхронно обновляют и key_rotation_sessions,
|
||||||
|
* и solana_user_pda_current.rotation_status / rotation_session_id.
|
||||||
|
*/
|
||||||
|
public final class KeyRotationSessionsDAO {
|
||||||
|
|
||||||
|
private static volatile KeyRotationSessionsDAO instance;
|
||||||
|
private final DbController db = DbController.getInstance();
|
||||||
|
|
||||||
|
private KeyRotationSessionsDAO() { }
|
||||||
|
|
||||||
|
public static KeyRotationSessionsDAO getInstance() {
|
||||||
|
if (instance == null) {
|
||||||
|
synchronized (KeyRotationSessionsDAO.class) {
|
||||||
|
if (instance == null) instance = new KeyRotationSessionsDAO();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return instance;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Атомарно создаёт первую серверную запись ротации сразу в COPYING_CHAIN.
|
||||||
|
* PREPARING в БД отсутствует: до этого момента всё является локальным UI-состоянием.
|
||||||
|
*/
|
||||||
|
public KeyRotationSessionEntry createCopyingSession(KeyRotationSessionEntry entry) throws SQLException {
|
||||||
|
validateNewSession(entry);
|
||||||
|
try (Connection c = db.getConnection()) {
|
||||||
|
boolean oldAutoCommit = c.getAutoCommit();
|
||||||
|
c.setAutoCommit(false);
|
||||||
|
try {
|
||||||
|
KeyRotationSessionEntry created = createCopyingSession(c, entry);
|
||||||
|
c.commit();
|
||||||
|
return created;
|
||||||
|
} catch (Exception e) {
|
||||||
|
c.rollback();
|
||||||
|
if (e instanceof SQLException sql) throw sql;
|
||||||
|
throw new SQLException("Failed to create key rotation session", e);
|
||||||
|
} finally {
|
||||||
|
c.setAutoCommit(oldAutoCommit);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public KeyRotationSessionEntry createCopyingSession(Connection c, KeyRotationSessionEntry entry) throws SQLException {
|
||||||
|
validateNewSession(entry);
|
||||||
|
|
||||||
|
String currentStatus;
|
||||||
|
try (PreparedStatement ps = c.prepareStatement("""
|
||||||
|
SELECT rotation_status
|
||||||
|
FROM solana_user_pda_current
|
||||||
|
WHERE login = ?
|
||||||
|
FOR UPDATE
|
||||||
|
""")) {
|
||||||
|
ps.setString(1, entry.getLogin());
|
||||||
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
|
if (!rs.next()) throw new SQLException("Unknown login for key rotation: " + entry.getLogin());
|
||||||
|
currentStatus = rs.getString(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!KeyRotationStatus.NONE.name().equals(currentStatus)) {
|
||||||
|
throw new SQLException("Key rotation already active for login=" + entry.getLogin() + ", status=" + currentStatus);
|
||||||
|
}
|
||||||
|
|
||||||
|
long now = entry.getCreatedAtMs() > 0 ? entry.getCreatedAtMs() : System.currentTimeMillis();
|
||||||
|
entry.setCreatedAtMs(now);
|
||||||
|
entry.setUpdatedAtMs(now);
|
||||||
|
entry.setStatus(KeyRotationStatus.COPYING_CHAIN);
|
||||||
|
if (entry.getComment() == null) entry.setComment("");
|
||||||
|
if (entry.getWalletMigrationStatus() == null) entry.setWalletMigrationStatus("PENDING");
|
||||||
|
if (entry.getMessageMigrationStatus() == null) entry.setMessageMigrationStatus("PENDING");
|
||||||
|
|
||||||
|
String sql = """
|
||||||
|
INSERT INTO key_rotation_sessions (
|
||||||
|
login, status,
|
||||||
|
source_blockchain_name, candidate_blockchain_name,
|
||||||
|
old_root_key, old_blockchain_key, old_client_key,
|
||||||
|
new_root_key, new_blockchain_key, new_client_key,
|
||||||
|
fork_from_block, fork_from_hash,
|
||||||
|
source_tip_block, source_tip_hash,
|
||||||
|
reason_code, comment,
|
||||||
|
progress_current, progress_total,
|
||||||
|
pda_rotation_signature,
|
||||||
|
wallet_migration_status, message_migration_status,
|
||||||
|
last_error, last_error_at_ms, retry_count,
|
||||||
|
created_at_ms, updated_at_ms, completed_at_ms, aborted_at_ms
|
||||||
|
) VALUES (
|
||||||
|
?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?
|
||||||
|
)
|
||||||
|
""";
|
||||||
|
|
||||||
|
long id;
|
||||||
|
try (PreparedStatement ps = c.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) {
|
||||||
|
int i = 1;
|
||||||
|
ps.setString(i++, entry.getLogin());
|
||||||
|
ps.setString(i++, entry.getStatus().name());
|
||||||
|
ps.setString(i++, entry.getSourceBlockchainName());
|
||||||
|
ps.setString(i++, entry.getCandidateBlockchainName());
|
||||||
|
ps.setString(i++, entry.getOldRootKey());
|
||||||
|
ps.setString(i++, entry.getOldBlockchainKey());
|
||||||
|
ps.setString(i++, entry.getOldClientKey());
|
||||||
|
ps.setString(i++, entry.getNewRootKey());
|
||||||
|
ps.setString(i++, entry.getNewBlockchainKey());
|
||||||
|
ps.setString(i++, entry.getNewClientKey());
|
||||||
|
ps.setInt(i++, entry.getForkFromBlock());
|
||||||
|
ps.setBytes(i++, entry.getForkFromHash());
|
||||||
|
ps.setInt(i++, entry.getSourceTipBlock());
|
||||||
|
ps.setBytes(i++, entry.getSourceTipHash());
|
||||||
|
ps.setShort(i++, entry.getReasonCode());
|
||||||
|
ps.setString(i++, entry.getComment());
|
||||||
|
ps.setInt(i++, entry.getProgressCurrent());
|
||||||
|
ps.setInt(i++, entry.getProgressTotal());
|
||||||
|
ps.setString(i++, entry.getPdaRotationSignature());
|
||||||
|
ps.setString(i++, entry.getWalletMigrationStatus());
|
||||||
|
ps.setString(i++, entry.getMessageMigrationStatus());
|
||||||
|
ps.setString(i++, entry.getLastError());
|
||||||
|
if (entry.getLastErrorAtMs() == null) ps.setNull(i++, java.sql.Types.BIGINT); else ps.setLong(i++, entry.getLastErrorAtMs());
|
||||||
|
ps.setInt(i++, entry.getRetryCount());
|
||||||
|
ps.setLong(i++, entry.getCreatedAtMs());
|
||||||
|
ps.setLong(i++, entry.getUpdatedAtMs());
|
||||||
|
if (entry.getCompletedAtMs() == null) ps.setNull(i++, java.sql.Types.BIGINT); else ps.setLong(i++, entry.getCompletedAtMs());
|
||||||
|
if (entry.getAbortedAtMs() == null) ps.setNull(i++, java.sql.Types.BIGINT); else ps.setLong(i++, entry.getAbortedAtMs());
|
||||||
|
ps.executeUpdate();
|
||||||
|
try (ResultSet keys = ps.getGeneratedKeys()) {
|
||||||
|
if (!keys.next()) throw new SQLException("key_rotation_sessions insert returned no id");
|
||||||
|
id = keys.getLong(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
try (PreparedStatement ps = c.prepareStatement("""
|
||||||
|
UPDATE solana_user_pda_current
|
||||||
|
SET rotation_status = ?, rotation_session_id = ?
|
||||||
|
WHERE login = ? AND rotation_status = 'NONE'
|
||||||
|
""")) {
|
||||||
|
ps.setString(1, KeyRotationStatus.COPYING_CHAIN.name());
|
||||||
|
ps.setLong(2, id);
|
||||||
|
ps.setString(3, entry.getLogin());
|
||||||
|
if (ps.executeUpdate() != 1) {
|
||||||
|
throw new SQLException("Failed to attach key rotation session to login=" + entry.getLogin());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
entry.setId(id);
|
||||||
|
return entry;
|
||||||
|
}
|
||||||
|
|
||||||
|
public KeyRotationSessionEntry getById(long id) throws SQLException {
|
||||||
|
try (Connection c = db.getConnection()) {
|
||||||
|
return getById(c, id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public KeyRotationSessionEntry getById(Connection c, long id) throws SQLException {
|
||||||
|
try (PreparedStatement ps = c.prepareStatement(selectBase() + " WHERE id = ?")) {
|
||||||
|
ps.setLong(1, id);
|
||||||
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
|
return rs.next() ? mapRow(rs) : null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public KeyRotationSessionEntry getActiveByLogin(String login) throws SQLException {
|
||||||
|
try (Connection c = db.getConnection()) {
|
||||||
|
return getActiveByLogin(c, login);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public KeyRotationSessionEntry getActiveByLogin(Connection c, String login) throws SQLException {
|
||||||
|
try (PreparedStatement ps = c.prepareStatement(selectBase() + """
|
||||||
|
WHERE login = ?
|
||||||
|
AND status NOT IN ('COMPLETE', 'ABORTED')
|
||||||
|
ORDER BY id DESC
|
||||||
|
LIMIT 1
|
||||||
|
""")) {
|
||||||
|
ps.setString(1, login);
|
||||||
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
|
return rs.next() ? mapRow(rs) : null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Возвращает несколько сессий одного состояния для фоновых workers. */
|
||||||
|
public java.util.List<KeyRotationSessionEntry> listByStatus(KeyRotationStatus status, int limit) throws SQLException {
|
||||||
|
if (status == null || status == KeyRotationStatus.NONE) return java.util.List.of();
|
||||||
|
int safeLimit = Math.max(1, Math.min(limit, 100));
|
||||||
|
try (Connection c = db.getConnection();
|
||||||
|
PreparedStatement ps = c.prepareStatement(selectBase() + """
|
||||||
|
WHERE status = ?
|
||||||
|
ORDER BY updated_at_ms, id
|
||||||
|
LIMIT ?
|
||||||
|
""")) {
|
||||||
|
ps.setString(1, status.name());
|
||||||
|
ps.setInt(2, safeLimit);
|
||||||
|
java.util.List<KeyRotationSessionEntry> out = new java.util.ArrayList<>();
|
||||||
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
|
while (rs.next()) out.add(mapRow(rs));
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Атомарный переход state machine. Смена статуса выполняется только из expected.
|
||||||
|
*/
|
||||||
|
public KeyRotationSessionEntry transition(long id,
|
||||||
|
KeyRotationStatus expected,
|
||||||
|
KeyRotationStatus next) throws SQLException {
|
||||||
|
if (expected == null || next == null || !expected.canTransitionTo(next)) {
|
||||||
|
throw new IllegalArgumentException("Forbidden key rotation transition: " + expected + " -> " + next);
|
||||||
|
}
|
||||||
|
|
||||||
|
try (Connection c = db.getConnection()) {
|
||||||
|
boolean oldAutoCommit = c.getAutoCommit();
|
||||||
|
c.setAutoCommit(false);
|
||||||
|
try {
|
||||||
|
KeyRotationSessionEntry current = getByIdForUpdate(c, id);
|
||||||
|
if (current == null) throw new SQLException("Unknown key rotation session id=" + id);
|
||||||
|
if (current.getStatus() != expected) {
|
||||||
|
throw new SQLException("Key rotation status mismatch: expected=" + expected + ", actual=" + current.getStatus());
|
||||||
|
}
|
||||||
|
|
||||||
|
long now = System.currentTimeMillis();
|
||||||
|
Long completed = current.getCompletedAtMs();
|
||||||
|
if (next == KeyRotationStatus.COMPLETE) completed = now;
|
||||||
|
Long aborted = current.getAbortedAtMs();
|
||||||
|
if (next == KeyRotationStatus.ABORTED) aborted = now;
|
||||||
|
|
||||||
|
try (PreparedStatement ps = c.prepareStatement("""
|
||||||
|
UPDATE key_rotation_sessions
|
||||||
|
SET status = ?, updated_at_ms = ?, completed_at_ms = ?, aborted_at_ms = ?
|
||||||
|
WHERE id = ? AND status = ?
|
||||||
|
""")) {
|
||||||
|
ps.setString(1, next.name());
|
||||||
|
ps.setLong(2, now);
|
||||||
|
if (completed == null) ps.setNull(3, java.sql.Types.BIGINT); else ps.setLong(3, completed);
|
||||||
|
if (aborted == null) ps.setNull(4, java.sql.Types.BIGINT); else ps.setLong(4, aborted);
|
||||||
|
ps.setLong(5, id);
|
||||||
|
ps.setString(6, expected.name());
|
||||||
|
if (ps.executeUpdate() != 1) throw new SQLException("Concurrent key rotation transition for id=" + id);
|
||||||
|
}
|
||||||
|
|
||||||
|
KeyRotationStatus userStatus = next.userStatus();
|
||||||
|
try (PreparedStatement ps = c.prepareStatement("""
|
||||||
|
UPDATE solana_user_pda_current
|
||||||
|
SET rotation_status = ?, rotation_session_id = ?
|
||||||
|
WHERE login = ? AND rotation_session_id = ?
|
||||||
|
""")) {
|
||||||
|
ps.setString(1, userStatus.name());
|
||||||
|
if (userStatus == KeyRotationStatus.NONE) ps.setNull(2, java.sql.Types.BIGINT); else ps.setLong(2, id);
|
||||||
|
ps.setString(3, current.getLogin());
|
||||||
|
ps.setLong(4, id);
|
||||||
|
if (ps.executeUpdate() != 1) throw new SQLException("Rotation session is not attached to login=" + current.getLogin());
|
||||||
|
}
|
||||||
|
|
||||||
|
// Candidate-копии нужны только пока ротация активна. В Arweave они уже опубликованы,
|
||||||
|
// а в PostgreSQL после COMPLETE/ABORTED временные строки больше не нужны.
|
||||||
|
if (next.isTerminalSessionStatus()) {
|
||||||
|
try (PreparedStatement ps = c.prepareStatement(
|
||||||
|
"DELETE FROM key_rotation_candidate_blocks WHERE rotation_session_id = ?")) {
|
||||||
|
ps.setLong(1, id);
|
||||||
|
ps.executeUpdate();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
c.commit();
|
||||||
|
current.setStatus(next);
|
||||||
|
current.setUpdatedAtMs(now);
|
||||||
|
current.setCompletedAtMs(completed);
|
||||||
|
current.setAbortedAtMs(aborted);
|
||||||
|
return current;
|
||||||
|
} catch (Exception e) {
|
||||||
|
c.rollback();
|
||||||
|
if (e instanceof SQLException sql) throw sql;
|
||||||
|
throw new SQLException("Failed key rotation transition", e);
|
||||||
|
} finally {
|
||||||
|
c.setAutoCommit(oldAutoCommit);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateProgress(long id, int current, int total) throws SQLException {
|
||||||
|
if (current < 0 || total < 0 || current > total) {
|
||||||
|
throw new IllegalArgumentException("Invalid rotation progress: " + current + "/" + total);
|
||||||
|
}
|
||||||
|
try (Connection c = db.getConnection();
|
||||||
|
PreparedStatement ps = c.prepareStatement("""
|
||||||
|
UPDATE key_rotation_sessions
|
||||||
|
SET progress_current = ?, progress_total = ?, updated_at_ms = ?
|
||||||
|
WHERE id = ? AND status = 'COPYING_CHAIN'
|
||||||
|
""")) {
|
||||||
|
ps.setInt(1, current);
|
||||||
|
ps.setInt(2, total);
|
||||||
|
ps.setLong(3, System.currentTimeMillis());
|
||||||
|
ps.setLong(4, id);
|
||||||
|
if (ps.executeUpdate() != 1) throw new SQLException("Rotation progress can only be updated in COPYING_CHAIN, id=" + id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Атомарно фиксирует tx signature и переводит CHAIN_READY -> ROTATING_PDA.
|
||||||
|
* Это точка, после которой Abort запрещён: отправленная Solana-транзакция может подтвердиться позже.
|
||||||
|
*/
|
||||||
|
public KeyRotationSessionEntry beginPdaRotation(long id, String signature) throws SQLException {
|
||||||
|
if (signature == null || signature.isBlank()) throw new IllegalArgumentException("signature is empty");
|
||||||
|
try (Connection c = db.getConnection()) {
|
||||||
|
boolean oldAutoCommit = c.getAutoCommit();
|
||||||
|
c.setAutoCommit(false);
|
||||||
|
try {
|
||||||
|
KeyRotationSessionEntry current = getByIdForUpdate(c, id);
|
||||||
|
if (current == null) throw new SQLException("Unknown key rotation session id=" + id);
|
||||||
|
if (current.getStatus() != KeyRotationStatus.CHAIN_READY) {
|
||||||
|
throw new SQLException("PDA rotation requires CHAIN_READY, actual=" + current.getStatus());
|
||||||
|
}
|
||||||
|
long now = System.currentTimeMillis();
|
||||||
|
try (PreparedStatement ps = c.prepareStatement("""
|
||||||
|
UPDATE key_rotation_sessions
|
||||||
|
SET status = 'ROTATING_PDA', pda_rotation_signature = ?, updated_at_ms = ?,
|
||||||
|
last_error = NULL, last_error_at_ms = NULL
|
||||||
|
WHERE id = ? AND status = 'CHAIN_READY'
|
||||||
|
""")) {
|
||||||
|
ps.setString(1, signature);
|
||||||
|
ps.setLong(2, now);
|
||||||
|
ps.setLong(3, id);
|
||||||
|
if (ps.executeUpdate() != 1) throw new SQLException("Concurrent PDA rotation start for id=" + id);
|
||||||
|
}
|
||||||
|
try (PreparedStatement ps = c.prepareStatement("""
|
||||||
|
UPDATE solana_user_pda_current
|
||||||
|
SET rotation_status = 'ROTATING_PDA', rotation_session_id = ?
|
||||||
|
WHERE login = ? AND rotation_session_id = ? AND rotation_status = 'CHAIN_READY'
|
||||||
|
""")) {
|
||||||
|
ps.setLong(1, id);
|
||||||
|
ps.setString(2, current.getLogin());
|
||||||
|
ps.setLong(3, id);
|
||||||
|
if (ps.executeUpdate() != 1) throw new SQLException("Rotation session is not attached to login=" + current.getLogin());
|
||||||
|
}
|
||||||
|
c.commit();
|
||||||
|
current.setStatus(KeyRotationStatus.ROTATING_PDA);
|
||||||
|
current.setPdaRotationSignature(signature);
|
||||||
|
current.setUpdatedAtMs(now);
|
||||||
|
current.setLastError(null);
|
||||||
|
current.setLastErrorAtMs(null);
|
||||||
|
return current;
|
||||||
|
} catch (Exception e) {
|
||||||
|
c.rollback();
|
||||||
|
if (e instanceof SQLException sql) throw sql;
|
||||||
|
throw new SQLException("Failed to begin PDA rotation", e);
|
||||||
|
} finally {
|
||||||
|
c.setAutoCommit(oldAutoCommit);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Если Solana sync уже записал в current-PDA весь ожидаемый новый набор ключей,
|
||||||
|
* атомарно переводит ROTATING_PDA -> PDA_ROTATED. Иначе возвращает null.
|
||||||
|
*/
|
||||||
|
public KeyRotationSessionEntry tryMarkPdaRotatedFromCurrentState(long id) throws SQLException {
|
||||||
|
try (Connection c = db.getConnection()) {
|
||||||
|
boolean oldAutoCommit = c.getAutoCommit();
|
||||||
|
c.setAutoCommit(false);
|
||||||
|
try {
|
||||||
|
KeyRotationSessionEntry current = getByIdForUpdate(c, id);
|
||||||
|
if (current == null || current.getStatus() != KeyRotationStatus.ROTATING_PDA) {
|
||||||
|
c.rollback();
|
||||||
|
return current != null && current.getStatus() == KeyRotationStatus.PDA_ROTATED ? current : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
String root;
|
||||||
|
String blockchain;
|
||||||
|
String client;
|
||||||
|
String blockchainName;
|
||||||
|
try (PreparedStatement ps = c.prepareStatement("""
|
||||||
|
SELECT root_key, blockchain_key, client_key, blockchain_name
|
||||||
|
FROM solana_user_pda_current
|
||||||
|
WHERE login = ?
|
||||||
|
FOR UPDATE
|
||||||
|
""")) {
|
||||||
|
ps.setString(1, current.getLogin());
|
||||||
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
|
if (!rs.next()) { c.rollback(); return null; }
|
||||||
|
root = shine.db.KeyEncodingUtil.normalizeKeyToBase64_32(rs.getString("root_key"));
|
||||||
|
blockchain = shine.db.KeyEncodingUtil.normalizeKeyToBase64_32(rs.getString("blockchain_key"));
|
||||||
|
client = shine.db.KeyEncodingUtil.normalizeKeyToBase64_32(rs.getString("client_key"));
|
||||||
|
blockchainName = rs.getString("blockchain_name");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!current.getNewRootKey().equals(root)
|
||||||
|
|| !current.getNewBlockchainKey().equals(blockchain)
|
||||||
|
|| !current.getNewClientKey().equals(client)
|
||||||
|
|| !current.getCandidateBlockchainName().equals(blockchainName)) {
|
||||||
|
c.rollback();
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
long now = System.currentTimeMillis();
|
||||||
|
try (PreparedStatement ps = c.prepareStatement("""
|
||||||
|
UPDATE key_rotation_sessions
|
||||||
|
SET status = 'PDA_ROTATED', updated_at_ms = ?, last_error = NULL, last_error_at_ms = NULL
|
||||||
|
WHERE id = ? AND status = 'ROTATING_PDA'
|
||||||
|
""")) {
|
||||||
|
ps.setLong(1, now);
|
||||||
|
ps.setLong(2, id);
|
||||||
|
if (ps.executeUpdate() != 1) throw new SQLException("Concurrent PDA rotation confirm for id=" + id);
|
||||||
|
}
|
||||||
|
try (PreparedStatement ps = c.prepareStatement("""
|
||||||
|
UPDATE solana_user_pda_current
|
||||||
|
SET rotation_status = 'PDA_ROTATED', rotation_session_id = ?
|
||||||
|
WHERE login = ? AND rotation_session_id = ? AND rotation_status = 'ROTATING_PDA'
|
||||||
|
""")) {
|
||||||
|
ps.setLong(1, id);
|
||||||
|
ps.setString(2, current.getLogin());
|
||||||
|
ps.setLong(3, id);
|
||||||
|
if (ps.executeUpdate() != 1) throw new SQLException("Rotation session is not attached to current PDA login=" + current.getLogin());
|
||||||
|
}
|
||||||
|
c.commit();
|
||||||
|
current.setStatus(KeyRotationStatus.PDA_ROTATED);
|
||||||
|
current.setUpdatedAtMs(now);
|
||||||
|
current.setLastError(null);
|
||||||
|
current.setLastErrorAtMs(null);
|
||||||
|
return current;
|
||||||
|
} catch (Exception e) {
|
||||||
|
c.rollback();
|
||||||
|
if (e instanceof SQLException sql) throw sql;
|
||||||
|
throw new SQLException("Failed to confirm rotated PDA", e);
|
||||||
|
} finally {
|
||||||
|
c.setAutoCommit(oldAutoCommit);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPdaRotationSignature(long id, String signature) throws SQLException {
|
||||||
|
try (Connection c = db.getConnection();
|
||||||
|
PreparedStatement ps = c.prepareStatement("""
|
||||||
|
UPDATE key_rotation_sessions
|
||||||
|
SET pda_rotation_signature = ?, updated_at_ms = ?
|
||||||
|
WHERE id = ? AND status = 'ROTATING_PDA'
|
||||||
|
""")) {
|
||||||
|
ps.setString(1, signature);
|
||||||
|
ps.setLong(2, System.currentTimeMillis());
|
||||||
|
ps.setLong(3, id);
|
||||||
|
if (ps.executeUpdate() != 1) throw new SQLException("PDA signature requires ROTATING_PDA, id=" + id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Фиксирует результат необязательного этапа wallet/DM.
|
||||||
|
* Имя колонки выбирается только из закрытого списка — внешние значения в SQL не подставляются.
|
||||||
|
*/
|
||||||
|
public void setMigrationSubStatus(long id, String column, String value) throws SQLException {
|
||||||
|
String safeColumn = switch (String.valueOf(column)) {
|
||||||
|
case "wallet_migration_status" -> "wallet_migration_status";
|
||||||
|
case "message_migration_status" -> "message_migration_status";
|
||||||
|
default -> throw new IllegalArgumentException("Unsupported migration status column: " + column);
|
||||||
|
};
|
||||||
|
String safeValue = switch (String.valueOf(value)) {
|
||||||
|
case "PENDING", "COMPLETE", "SKIPPED", "NOT_IMPLEMENTED" -> String.valueOf(value);
|
||||||
|
default -> throw new IllegalArgumentException("Unsupported migration status value: " + value);
|
||||||
|
};
|
||||||
|
try (Connection c = db.getConnection();
|
||||||
|
PreparedStatement ps = c.prepareStatement(
|
||||||
|
"UPDATE key_rotation_sessions SET " + safeColumn + " = ?, updated_at_ms = ? WHERE id = ?")) {
|
||||||
|
ps.setString(1, safeValue);
|
||||||
|
ps.setLong(2, System.currentTimeMillis());
|
||||||
|
ps.setLong(3, id);
|
||||||
|
if (ps.executeUpdate() != 1) throw new SQLException("Unknown key rotation session id=" + id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void recordError(long id, String error) throws SQLException {
|
||||||
|
long now = System.currentTimeMillis();
|
||||||
|
try (Connection c = db.getConnection();
|
||||||
|
PreparedStatement ps = c.prepareStatement("""
|
||||||
|
UPDATE key_rotation_sessions
|
||||||
|
SET last_error = ?, last_error_at_ms = ?, retry_count = retry_count + 1, updated_at_ms = ?
|
||||||
|
WHERE id = ? AND status NOT IN ('COMPLETE', 'ABORTED')
|
||||||
|
""")) {
|
||||||
|
ps.setString(1, error);
|
||||||
|
ps.setLong(2, now);
|
||||||
|
ps.setLong(3, now);
|
||||||
|
ps.setLong(4, id);
|
||||||
|
if (ps.executeUpdate() != 1) throw new SQLException("Cannot record error for inactive rotation id=" + id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void clearError(long id) throws SQLException {
|
||||||
|
try (Connection c = db.getConnection();
|
||||||
|
PreparedStatement ps = c.prepareStatement("""
|
||||||
|
UPDATE key_rotation_sessions
|
||||||
|
SET last_error = NULL, last_error_at_ms = NULL, updated_at_ms = ?
|
||||||
|
WHERE id = ?
|
||||||
|
""")) {
|
||||||
|
ps.setLong(1, System.currentTimeMillis());
|
||||||
|
ps.setLong(2, id);
|
||||||
|
ps.executeUpdate();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private KeyRotationSessionEntry getByIdForUpdate(Connection c, long id) throws SQLException {
|
||||||
|
try (PreparedStatement ps = c.prepareStatement(selectBase() + " WHERE id = ? FOR UPDATE")) {
|
||||||
|
ps.setLong(1, id);
|
||||||
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
|
return rs.next() ? mapRow(rs) : null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String selectBase() {
|
||||||
|
return """
|
||||||
|
SELECT
|
||||||
|
id, login, status,
|
||||||
|
source_blockchain_name, candidate_blockchain_name,
|
||||||
|
old_root_key, old_blockchain_key, old_client_key,
|
||||||
|
new_root_key, new_blockchain_key, new_client_key,
|
||||||
|
fork_from_block, fork_from_hash,
|
||||||
|
source_tip_block, source_tip_hash,
|
||||||
|
reason_code, comment,
|
||||||
|
progress_current, progress_total,
|
||||||
|
pda_rotation_signature,
|
||||||
|
wallet_migration_status, message_migration_status,
|
||||||
|
last_error, last_error_at_ms, retry_count,
|
||||||
|
created_at_ms, updated_at_ms, completed_at_ms, aborted_at_ms
|
||||||
|
FROM key_rotation_sessions
|
||||||
|
""";
|
||||||
|
}
|
||||||
|
|
||||||
|
private static KeyRotationSessionEntry mapRow(ResultSet rs) throws SQLException {
|
||||||
|
KeyRotationSessionEntry e = new KeyRotationSessionEntry();
|
||||||
|
e.setId(rs.getLong("id"));
|
||||||
|
e.setLogin(rs.getString("login"));
|
||||||
|
e.setStatus(KeyRotationStatus.valueOf(rs.getString("status")));
|
||||||
|
e.setSourceBlockchainName(rs.getString("source_blockchain_name"));
|
||||||
|
e.setCandidateBlockchainName(rs.getString("candidate_blockchain_name"));
|
||||||
|
e.setOldRootKey(rs.getString("old_root_key"));
|
||||||
|
e.setOldBlockchainKey(rs.getString("old_blockchain_key"));
|
||||||
|
e.setOldClientKey(rs.getString("old_client_key"));
|
||||||
|
e.setNewRootKey(rs.getString("new_root_key"));
|
||||||
|
e.setNewBlockchainKey(rs.getString("new_blockchain_key"));
|
||||||
|
e.setNewClientKey(rs.getString("new_client_key"));
|
||||||
|
e.setForkFromBlock(rs.getInt("fork_from_block"));
|
||||||
|
e.setForkFromHash(rs.getBytes("fork_from_hash"));
|
||||||
|
e.setSourceTipBlock(rs.getInt("source_tip_block"));
|
||||||
|
e.setSourceTipHash(rs.getBytes("source_tip_hash"));
|
||||||
|
e.setReasonCode(rs.getShort("reason_code"));
|
||||||
|
e.setComment(rs.getString("comment"));
|
||||||
|
e.setProgressCurrent(rs.getInt("progress_current"));
|
||||||
|
e.setProgressTotal(rs.getInt("progress_total"));
|
||||||
|
e.setPdaRotationSignature(rs.getString("pda_rotation_signature"));
|
||||||
|
e.setWalletMigrationStatus(rs.getString("wallet_migration_status"));
|
||||||
|
e.setMessageMigrationStatus(rs.getString("message_migration_status"));
|
||||||
|
e.setLastError(rs.getString("last_error"));
|
||||||
|
long lastErrorAt = rs.getLong("last_error_at_ms");
|
||||||
|
e.setLastErrorAtMs(rs.wasNull() ? null : lastErrorAt);
|
||||||
|
e.setRetryCount(rs.getInt("retry_count"));
|
||||||
|
e.setCreatedAtMs(rs.getLong("created_at_ms"));
|
||||||
|
e.setUpdatedAtMs(rs.getLong("updated_at_ms"));
|
||||||
|
long completed = rs.getLong("completed_at_ms");
|
||||||
|
e.setCompletedAtMs(rs.wasNull() ? null : completed);
|
||||||
|
long aborted = rs.getLong("aborted_at_ms");
|
||||||
|
e.setAbortedAtMs(rs.wasNull() ? null : aborted);
|
||||||
|
return e;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void validateNewSession(KeyRotationSessionEntry e) {
|
||||||
|
if (e == null) throw new IllegalArgumentException("entry is null");
|
||||||
|
if (blank(e.getLogin())) throw new IllegalArgumentException("login is required");
|
||||||
|
if (blank(e.getSourceBlockchainName()) || blank(e.getCandidateBlockchainName())) {
|
||||||
|
throw new IllegalArgumentException("source/candidate blockchain names are required");
|
||||||
|
}
|
||||||
|
if (blank(e.getOldRootKey()) || blank(e.getOldBlockchainKey()) || blank(e.getOldClientKey())
|
||||||
|
|| blank(e.getNewRootKey()) || blank(e.getNewBlockchainKey()) || blank(e.getNewClientKey())) {
|
||||||
|
throw new IllegalArgumentException("all old/new public keys are required");
|
||||||
|
}
|
||||||
|
if (e.getForkFromHash() == null || e.getForkFromHash().length != 32) {
|
||||||
|
throw new IllegalArgumentException("forkFromHash must be 32 bytes");
|
||||||
|
}
|
||||||
|
if (e.getSourceTipHash() == null || e.getSourceTipHash().length != 32) {
|
||||||
|
throw new IllegalArgumentException("sourceTipHash must be 32 bytes");
|
||||||
|
}
|
||||||
|
if (e.getForkFromBlock() < 0 || e.getSourceTipBlock() < e.getForkFromBlock()) {
|
||||||
|
throw new IllegalArgumentException("invalid fork/source tip block numbers");
|
||||||
|
}
|
||||||
|
if (e.getReasonCode() < 1 || e.getReasonCode() > 4) {
|
||||||
|
throw new IllegalArgumentException("reasonCode must be 1..4");
|
||||||
|
}
|
||||||
|
String comment = e.getComment() == null ? "" : e.getComment();
|
||||||
|
if (comment.getBytes(java.nio.charset.StandardCharsets.UTF_8).length > 1024) {
|
||||||
|
throw new IllegalArgumentException("comment must be <= 1024 UTF-8 bytes");
|
||||||
|
}
|
||||||
|
if (e.getProgressCurrent() < 0 || e.getProgressTotal() < e.getProgressCurrent()) {
|
||||||
|
throw new IllegalArgumentException("invalid initial progress");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean blank(String value) {
|
||||||
|
return value == null || value.isBlank();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
package shine.db.dao;
|
||||||
|
|
||||||
|
import shine.db.DbController;
|
||||||
|
import java.sql.Connection;
|
||||||
|
import java.sql.PreparedStatement;
|
||||||
|
import java.sql.ResultSet;
|
||||||
|
import java.sql.SQLException;
|
||||||
|
|
||||||
|
/** Единая авторитетная проекция: FREE_CERT не притворяется Solana PDA. */
|
||||||
|
public final class RegistrationIdentityDAO {
|
||||||
|
public record ResolvedIdentity(String fullLogin, String rootKey, String blockchainKey,
|
||||||
|
String clientKey, String registrationSource, String registrationStatus,
|
||||||
|
String namespace, String accessServerLogin, boolean hasSolanaPda) {
|
||||||
|
public boolean isFree() { return "FREE_CERT".equals(registrationStatus); }
|
||||||
|
}
|
||||||
|
private static final RegistrationIdentityDAO INSTANCE = new RegistrationIdentityDAO();
|
||||||
|
public static RegistrationIdentityDAO getInstance() { return INSTANCE; }
|
||||||
|
private RegistrationIdentityDAO() {}
|
||||||
|
|
||||||
|
public ResolvedIdentity get(String login) throws SQLException {
|
||||||
|
try (Connection c = DbController.getInstance().getConnection()) { return get(c, login); }
|
||||||
|
}
|
||||||
|
public ResolvedIdentity get(Connection c, String login) throws SQLException {
|
||||||
|
if (login == null || login.isBlank()) return null;
|
||||||
|
try (PreparedStatement ps = c.prepareStatement("""
|
||||||
|
SELECT i.login, i.root_key, i.blockchain_key, i.client_key,
|
||||||
|
i.registration_source, i.registration_status, i.namespace,
|
||||||
|
i.solana_pda_address, n.default_server_login,
|
||||||
|
s.server_login AS actual_access_server
|
||||||
|
FROM user_identity_current i
|
||||||
|
LEFT JOIN shine_namespace_current n ON n.namespace=i.namespace
|
||||||
|
LEFT JOIN user_access_servers_current s ON s.user_login=i.login
|
||||||
|
WHERE i.normalized_login=LOWER(BTRIM(?))
|
||||||
|
ORDER BY s.server_login ASC
|
||||||
|
LIMIT 1
|
||||||
|
""")) {
|
||||||
|
ps.setString(1, login);
|
||||||
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
|
if (!rs.next()) return null;
|
||||||
|
boolean hasPda = rs.getString("solana_pda_address") != null;
|
||||||
|
String status = rs.getString("registration_status");
|
||||||
|
String server = "FREE_CERT".equals(status) ? rs.getString("default_server_login")
|
||||||
|
: rs.getString("actual_access_server");
|
||||||
|
if ("FREE_CERT".equals(status) && hasPda)
|
||||||
|
throw new SQLException("Inconsistent free user: Solana PDA must be absent");
|
||||||
|
if (!"FREE_CERT".equals(status) && !hasPda)
|
||||||
|
throw new SQLException("Inconsistent paid user: Solana PDA is missing");
|
||||||
|
return new ResolvedIdentity(rs.getString("login"), rs.getString("root_key"),
|
||||||
|
rs.getString("blockchain_key"), rs.getString("client_key"),
|
||||||
|
rs.getString("registration_source"), status, rs.getString("namespace"), server, hasPda);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public boolean isFreeCertificate(String login) throws SQLException {
|
||||||
|
ResolvedIdentity identity = get(login);
|
||||||
|
return identity != null && identity.isFree();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -377,6 +377,7 @@ public final class SignedMessagesDAO {
|
|||||||
String peerLogin,
|
String peerLogin,
|
||||||
long beforeTimeMs,
|
long beforeTimeMs,
|
||||||
String beforeMessageKey,
|
String beforeMessageKey,
|
||||||
|
long reencryptedBeforeMs,
|
||||||
int limit
|
int limit
|
||||||
) throws Exception {
|
) throws Exception {
|
||||||
try (Connection c = db.getConnection()) {
|
try (Connection c = db.getConnection()) {
|
||||||
@@ -398,6 +399,7 @@ public final class SignedMessagesDAO {
|
|||||||
OR time_ms < ?
|
OR time_ms < ?
|
||||||
OR (time_ms = ? AND (? = '' OR message_key < ?))
|
OR (time_ms = ? AND (? = '' OR message_key < ?))
|
||||||
)
|
)
|
||||||
|
AND (? <= 0 OR (created_at_ms <= ? AND reencrypted_at_ms < ?))
|
||||||
ORDER BY time_ms DESC, message_key DESC
|
ORDER BY time_ms DESC, message_key DESC
|
||||||
LIMIT ?
|
LIMIT ?
|
||||||
""".formatted(messagesTable());
|
""".formatted(messagesTable());
|
||||||
@@ -413,7 +415,10 @@ public final class SignedMessagesDAO {
|
|||||||
ps.setLong(8, beforeTimeMs);
|
ps.setLong(8, beforeTimeMs);
|
||||||
ps.setString(9, beforeMessageKey == null ? "" : beforeMessageKey);
|
ps.setString(9, beforeMessageKey == null ? "" : beforeMessageKey);
|
||||||
ps.setString(10, beforeMessageKey == null ? "" : beforeMessageKey);
|
ps.setString(10, beforeMessageKey == null ? "" : beforeMessageKey);
|
||||||
ps.setInt(11, limit);
|
ps.setLong(11, reencryptedBeforeMs);
|
||||||
|
ps.setLong(12, reencryptedBeforeMs);
|
||||||
|
ps.setLong(13, reencryptedBeforeMs);
|
||||||
|
ps.setInt(14, limit);
|
||||||
try (ResultSet rs = ps.executeQuery()) {
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
while (rs.next()) out.add(mapRow(rs));
|
while (rs.next()) out.add(mapRow(rs));
|
||||||
}
|
}
|
||||||
@@ -422,6 +427,102 @@ public final class SignedMessagesDAO {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public long countMessagesNeedingReencryption(String login, long reencryptedBeforeMs) throws SQLException {
|
||||||
|
if (reencryptedBeforeMs <= 0) return 0;
|
||||||
|
try (Connection c = db.getConnection();
|
||||||
|
PreparedStatement ps = c.prepareStatement("""
|
||||||
|
SELECT COUNT(*)
|
||||||
|
FROM %s
|
||||||
|
WHERE LOWER(target_login) = LOWER(?)
|
||||||
|
AND message_type IN (1, 2)
|
||||||
|
AND created_at_ms <= ?
|
||||||
|
AND reencrypted_at_ms < ?
|
||||||
|
""".formatted(messagesTable()))) {
|
||||||
|
ps.setString(1, login);
|
||||||
|
ps.setLong(2, reencryptedBeforeMs);
|
||||||
|
ps.setLong(3, reencryptedBeforeMs);
|
||||||
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
|
return rs.next() ? rs.getLong(1) : 0L;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Обновляет только уже существующую локальную type=1/2 копию при key rotation. */
|
||||||
|
public ApplyStatus upsertReencryptedLocalCopy(SignedMessageEntry next) throws Exception {
|
||||||
|
return withBusyRetry(() -> {
|
||||||
|
try (Connection c = db.getConnection()) {
|
||||||
|
boolean oldAutoCommit = c.getAutoCommit();
|
||||||
|
c.setAutoCommit(false);
|
||||||
|
try {
|
||||||
|
SignedMessageEntry current = getByMessageKey(c, next.getMessageKey());
|
||||||
|
if (current == null) { c.rollback(); return ApplyStatus.DUPLICATE_OR_OLDER; }
|
||||||
|
if (current.getMessageType() != next.getMessageType()
|
||||||
|
|| current.getTimeMs() != next.getTimeMs()
|
||||||
|
|| current.getNonce() != next.getNonce()
|
||||||
|
|| current.getRevisionTimeMs() != next.getRevisionTimeMs()
|
||||||
|
|| !current.getFromLogin().equalsIgnoreCase(next.getFromLogin())
|
||||||
|
|| !current.getToLogin().equalsIgnoreCase(next.getToLogin())
|
||||||
|
|| !current.getBaseKey().equals(next.getBaseKey())
|
||||||
|
|| next.getReencryptedAtMs() <= current.getReencryptedAtMs()) {
|
||||||
|
c.rollback();
|
||||||
|
return ApplyStatus.DUPLICATE_OR_OLDER;
|
||||||
|
}
|
||||||
|
updateReencryptedLocalCopy(c, next);
|
||||||
|
DmDialogStateDAO.getInstance().refreshConversationPair(c, next.getFromLogin(), next.getToLogin());
|
||||||
|
c.commit();
|
||||||
|
return ApplyStatus.APPLIED;
|
||||||
|
} catch (Exception e) {
|
||||||
|
try { c.rollback(); } catch (Exception ignored) {}
|
||||||
|
throw e;
|
||||||
|
} finally {
|
||||||
|
c.setAutoCommit(oldAutoCommit);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Перезаписывает только криптографическую локальную копию сообщения при key rotation.
|
||||||
|
* Исторические metadata (created_at_ms/source_api/origin_session_id/read_at_ms) сохраняются.
|
||||||
|
*/
|
||||||
|
private void updateReencryptedLocalCopy(Connection c, SignedMessageEntry next) throws SQLException {
|
||||||
|
String sql = """
|
||||||
|
UPDATE %s
|
||||||
|
SET reencrypted_at_ms = ?,
|
||||||
|
raw_block = ?
|
||||||
|
WHERE message_key = ?
|
||||||
|
AND reencrypted_at_ms < ?
|
||||||
|
""".formatted(messagesTable());
|
||||||
|
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||||
|
ps.setLong(1, next.getReencryptedAtMs());
|
||||||
|
ps.setBytes(2, next.getRawBlock());
|
||||||
|
ps.setString(3, next.getMessageKey());
|
||||||
|
ps.setLong(4, next.getReencryptedAtMs());
|
||||||
|
int changed = ps.executeUpdate();
|
||||||
|
if (changed != 1) {
|
||||||
|
throw new SQLException("Reencrypted local copy was not updated: " + next.getMessageKey());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private SignedMessageEntry getByMessageKey(Connection c, String messageKey) throws Exception {
|
||||||
|
String sql = """
|
||||||
|
SELECT
|
||||||
|
message_key, base_key, target_login, from_login, to_login,
|
||||||
|
time_ms, nonce, message_type, revision_time_ms, reencrypted_at_ms,
|
||||||
|
raw_block, created_at_ms, source_api, origin_session_id,
|
||||||
|
receipt_ref_base_key, receipt_ref_type, read_at_ms
|
||||||
|
FROM %s
|
||||||
|
WHERE message_key = ?
|
||||||
|
""".formatted(messagesTable());
|
||||||
|
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||||
|
ps.setString(1, messageKey);
|
||||||
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
|
return rs.next() ? mapRow(rs) : null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public SyncBatch listSyncBatch(
|
public SyncBatch listSyncBatch(
|
||||||
String ownerLogin,
|
String ownerLogin,
|
||||||
long afterStoredAtMs,
|
long afterStoredAtMs,
|
||||||
|
|||||||
+39
-11
@@ -8,7 +8,6 @@ import java.sql.Connection;
|
|||||||
import java.sql.PreparedStatement;
|
import java.sql.PreparedStatement;
|
||||||
import java.sql.ResultSet;
|
import java.sql.ResultSet;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
import java.util.Base64;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Доступ к актуальной PostgreSQL-таблице пользователей, поддерживаемой sync-модулем.
|
* Доступ к актуальной PostgreSQL-таблице пользователей, поддерживаемой sync-модулем.
|
||||||
@@ -38,6 +37,27 @@ public final class SolanaUserPdaCurrentDAO {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public SolanaUserPdaCurrentEntry getByLogin(String login) throws SQLException {
|
||||||
|
String sql = """
|
||||||
|
SELECT
|
||||||
|
login,
|
||||||
|
blockchain_name,
|
||||||
|
blockchain_key,
|
||||||
|
paid_limit_bytes
|
||||||
|
FROM solana_user_pda_current
|
||||||
|
WHERE LOWER(login) = LOWER(?)
|
||||||
|
LIMIT 1
|
||||||
|
""";
|
||||||
|
try (Connection c = db.getConnection(); PreparedStatement ps = c.prepareStatement(sql)) {
|
||||||
|
ps.setString(1, login);
|
||||||
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
|
if (!rs.next()) return null;
|
||||||
|
return mapRow(rs);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public SolanaUserPdaCurrentEntry getByBlockchainName(Connection c, String blockchainName) throws SQLException {
|
public SolanaUserPdaCurrentEntry getByBlockchainName(Connection c, String blockchainName) throws SQLException {
|
||||||
String sql = """
|
String sql = """
|
||||||
SELECT
|
SELECT
|
||||||
@@ -61,28 +81,36 @@ public final class SolanaUserPdaCurrentDAO {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Resolve a current user by the 32-byte Ed25519 blockchain key used as ANS-104 owner. */
|
/** Resolve a user/fork by the 32-byte Ed25519 blockchain key used as ANS-104 owner. */
|
||||||
public SolanaUserPdaCurrentEntry getByBlockchainKey(byte[] owner32) throws SQLException {
|
public SolanaUserPdaCurrentEntry getByBlockchainKey(byte[] owner32) throws SQLException {
|
||||||
if (owner32 == null || owner32.length != 32) return null;
|
if (owner32 == null || owner32.length != 32) return null;
|
||||||
String wanted = Base64.getEncoder().encodeToString(owner32);
|
String wanted = KeyEncodingUtil.encodeBase58(owner32);
|
||||||
String sql = """
|
String sql = """
|
||||||
SELECT login, blockchain_name, blockchain_key, paid_limit_bytes
|
SELECT
|
||||||
FROM solana_user_pda_current
|
u.login,
|
||||||
|
u.login || '-' || LPAD(((fork_item.value ->> 'forkIndex')::integer + 1)::text, 3, '0') AS blockchain_name,
|
||||||
|
fork_item.value ->> 'blockchainKey' AS blockchain_key,
|
||||||
|
(fork_item.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 fork_item(value)
|
||||||
|
WHERE fork_item.value ->> 'blockchainKey' = ?
|
||||||
|
AND ((fork_item.value ->> 'forkIndex')::integer + 1) BETWEEN 1 AND 999
|
||||||
|
LIMIT 1
|
||||||
""";
|
""";
|
||||||
try (Connection c = db.getConnection(); PreparedStatement ps = c.prepareStatement(sql); ResultSet rs = ps.executeQuery()) {
|
try (Connection c = db.getConnection(); PreparedStatement ps = c.prepareStatement(sql)) {
|
||||||
while (rs.next()) {
|
ps.setString(1, wanted);
|
||||||
SolanaUserPdaCurrentEntry e = mapRow(rs);
|
try (ResultSet rs = ps.executeQuery()) {
|
||||||
if (wanted.equals(e.getBlockchainKey())) return e;
|
if (!rs.next()) return null;
|
||||||
|
return mapRow(rs);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private SolanaUserPdaCurrentEntry mapRow(ResultSet rs) throws SQLException {
|
private SolanaUserPdaCurrentEntry mapRow(ResultSet rs) throws SQLException {
|
||||||
SolanaUserPdaCurrentEntry entry = new SolanaUserPdaCurrentEntry();
|
SolanaUserPdaCurrentEntry entry = new SolanaUserPdaCurrentEntry();
|
||||||
entry.setLogin(rs.getString("login"));
|
entry.setLogin(rs.getString("login"));
|
||||||
entry.setBlockchainName(rs.getString("blockchain_name"));
|
entry.setBlockchainName(rs.getString("blockchain_name"));
|
||||||
entry.setBlockchainKey(KeyEncodingUtil.normalizeKeyToBase64_32(rs.getString("blockchain_key")));
|
entry.setBlockchainKey(KeyEncodingUtil.base58KeyToBase64_32(rs.getString("blockchain_key")));
|
||||||
entry.setPaidLimitBytes(rs.getLong("paid_limit_bytes"));
|
entry.setPaidLimitBytes(rs.getLong("paid_limit_bytes"));
|
||||||
return entry;
|
return entry;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -106,11 +106,12 @@ public final class SubscriptionsDAO {
|
|||||||
WITH subs AS (
|
WITH subs AS (
|
||||||
-- 1) FOLLOW-каналы
|
-- 1) FOLLOW-каналы
|
||||||
SELECT
|
SELECT
|
||||||
cs.to_login AS channel_login,
|
cs.to_login AS channel_login,
|
||||||
cs.to_bch_name AS channel_bch_name
|
cn.owner_bch_name AS channel_bch_name
|
||||||
FROM connections_state cs
|
FROM connections_state cs
|
||||||
WHERE cs.login = ?
|
JOIN channel_names_state cn ON LOWER(cn.owner_login)=LOWER(cs.to_login)
|
||||||
AND cs.rel_type = ?
|
AND cn.channel_root_block_number=cs.to_block_number AND cn.channel_root_block_hash=cs.to_block_hash
|
||||||
|
WHERE LOWER(cs.login) = LOWER(?) AND cs.rel_type = ?
|
||||||
|
|
||||||
UNION
|
UNION
|
||||||
|
|
||||||
|
|||||||
@@ -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")
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user