diff --git a/.gitignore b/.gitignore index b92b1a5d..7904ff3c 100644 --- a/.gitignore +++ b/.gitignore @@ -79,6 +79,7 @@ shine-solana/shine/scripts/**/TEMP_*.md # Локальные артефакты и внешние материалы ESP32-подпроекта 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/**/.idea/ ESP32-wallet/.idea/ diff --git a/ESP32/esp32/ESP32-S3-Touch-AMOLED-2.16/main-device/burn.sh b/ESP32/esp32/ESP32-S3-Touch-AMOLED-2.16/main-device/burn.sh index 805a5eaf..cc480658 100755 --- a/ESP32/esp32/ESP32-S3-Touch-AMOLED-2.16/main-device/burn.sh +++ b/ESP32/esp32/ESP32-S3-Touch-AMOLED-2.16/main-device/burn.sh @@ -47,6 +47,7 @@ case "${MODE}" in 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-russian-font-test) SKETCH_DIR="${ROOT_DIR}/test_sketches/lvgl_russian_font_test" ;; + breath-dual-mode-monitor) SKETCH_DIR="${ROOT_DIR}/test_sketches/breath_dual_mode_monitor" ;; 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" ;; @@ -54,7 +55,7 @@ case "${MODE}" in lvgl-nav-minimal-test) SKETCH_DIR="${ROOT_DIR}/shine_homeserver_main" ;; *) 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, usb-contact-test, usb-contact-debug-test, usb-contact-resistance-test, usb-contact-screen-start-stub" >&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, breath-dual-mode-monitor, usb-contact-test, usb-contact-debug-test, usb-contact-resistance-test, usb-contact-screen-start-stub" >&2 exit 2 ;; esac diff --git a/ESP32/esp32/ESP32-S3-Touch-AMOLED-2.16/main-device/test_sketches/README.md b/ESP32/esp32/ESP32-S3-Touch-AMOLED-2.16/main-device/test_sketches/README.md index 3fcbc9fe..4362168d 100644 --- a/ESP32/esp32/ESP32-S3-Touch-AMOLED-2.16/main-device/test_sketches/README.md +++ b/ESP32/esp32/ESP32-S3-Touch-AMOLED-2.16/main-device/test_sketches/README.md @@ -15,6 +15,7 @@ - `lvgl_official_based_test/` - минимальный наш экран поверх максимально близкой к официальному `05_LVGL_Widgets` инициализации - `lvgl_subserver_touch_test/` - старый гибридный тест: `LVGL`-экран с инициализацией дисплея и чтением touch из старого `shine_homeserver_ui`; подтверждён на реальном устройстве - `lvgl_russian_font_test/` - тест кастомного кириллического `LVGL`-шрифта с русскими кнопками, длинными строками и рабочим touch +- `breath_dual_mode_monitor/` - dual-mode breath monitor в стиле GFX-скетча: старт USB-датчика или внешних кнопок `KEY3/BOOT`, настройки лимита и громкости, повторяющиеся звуковые предупреждения - `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 @@ -32,6 +33,7 @@ - `./burn.sh lvgl-official-based-test` - `./burn.sh lvgl-subserver-touch-test` - `./burn.sh lvgl-russian-font-test` +- `./burn.sh breath-dual-mode-monitor` - `./burn.sh usb-contact-test` - `./burn.sh usb-contact-debug-test` - `./burn.sh usb-contact-resistance-test` diff --git a/ESP32/esp32/ESP32-S3-Touch-AMOLED-2.16/reference/usb_contact_sensor_test_spec.md b/ESP32/esp32/ESP32-S3-Touch-AMOLED-2.16/reference/usb_contact_sensor_test_spec.md index 7b5c32c5..d880ddf8 100644 --- a/ESP32/esp32/ESP32-S3-Touch-AMOLED-2.16/reference/usb_contact_sensor_test_spec.md +++ b/ESP32/esp32/ESP32-S3-Touch-AMOLED-2.16/reference/usb_contact_sensor_test_spec.md @@ -4,6 +4,7 @@ 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` @@ -114,3 +115,45 @@ After tapping `START`: - 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 BUTTONS` + +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 BUTTONS`: + +- `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 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 + +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 +- settings keep the same sliders: limit `5/7/10/15/20` seconds, quiet cycle tick volume `0..10`, and alert volume `0..10` diff --git a/SHiNE-server/shine-server-db/src/main/java/shine/db/DatabaseInitializer.java b/SHiNE-server/shine-server-db/src/main/java/shine/db/DatabaseInitializer.java index 5ac9710d..a4ba68b7 100644 --- a/SHiNE-server/shine-server-db/src/main/java/shine/db/DatabaseInitializer.java +++ b/SHiNE-server/shine-server-db/src/main/java/shine/db/DatabaseInitializer.java @@ -22,8 +22,10 @@ public final class DatabaseInitializer { public static final int DB_FORMAT_VERSION = 2; public static final int SCHEMA_VERSION_1 = 1; public static final int SCHEMA_VERSION_31 = 31; + public static final int SCHEMA_VERSION_32 = 32; public static final String POSTGRES_SCHEMA_RESOURCE = "postgres/schema_v1.sql"; public static final String POSTGRES_MIGRATION_V31_RESOURCE = "postgres/migration_v31.sql"; + public static final String POSTGRES_MIGRATION_V32_RESOURCE = "postgres/migration_v32.sql"; private DatabaseInitializer() {} @@ -119,9 +121,13 @@ public final class DatabaseInitializer { runSqlScript(conn, POSTGRES_MIGRATION_V31_RESOURCE); currentVersion = readCurrentSchemaVersion(conn); } - if (currentVersion != SCHEMA_VERSION_31) { + if (currentVersion == SCHEMA_VERSION_31) { + runSqlScript(conn, POSTGRES_MIGRATION_V32_RESOURCE); + currentVersion = readCurrentSchemaVersion(conn); + } + if (currentVersion != SCHEMA_VERSION_32) { throw new SQLException( - "Unsupported SHiNE DB v2 schema version: expected 31, found " + currentVersion); + "Unsupported SHiNE DB v2 schema version: expected 32, found " + currentVersion); } } } diff --git a/SHiNE-server/shine-server-db/src/main/java/shine/db/dao/ChannelSearchDAO.java b/SHiNE-server/shine-server-db/src/main/java/shine/db/dao/ChannelSearchDAO.java new file mode 100644 index 00000000..960707e9 --- /dev/null +++ b/SHiNE-server/shine-server-db/src/main/java/shine/db/dao/ChannelSearchDAO.java @@ -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 avatarSha256, 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 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_sha256, 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 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_sha256"), + rs.getString("owner_bch_name"), rs.getInt("channel_root_block_number"), + rs.getString("root_hash"), rs.getInt("subscribers_count") + )); + } + } + return matches; + } +} diff --git a/SHiNE-server/shine-server-db/src/main/java/shine/db/dao/CurrentUsersDAO.java b/SHiNE-server/shine-server-db/src/main/java/shine/db/dao/CurrentUsersDAO.java index 33d47ff7..bc670f19 100644 --- a/SHiNE-server/shine-server-db/src/main/java/shine/db/dao/CurrentUsersDAO.java +++ b/SHiNE-server/shine-server-db/src/main/java/shine/db/dao/CurrentUsersDAO.java @@ -204,6 +204,53 @@ public final class CurrentUsersDAO { } } + /** Поиск логинов и публичных имён; результат не раскрывает приватные ключи PDA. */ + public record SearchUserCard(String login, String displayName, String avatarAr) {} + + public List 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 solana_user_pda_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 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 -------------------- private CurrentUserEntry mapRow(ResultSet rs) throws SQLException { diff --git a/SHiNE-server/shine-server-db/src/main/resources/postgres/migration_v32.sql b/SHiNE-server/shine-server-db/src/main/resources/postgres/migration_v32.sql new file mode 100644 index 00000000..020e3a93 --- /dev/null +++ b/SHiNE-server/shine-server-db/src/main/resources/postgres/migration_v32.sql @@ -0,0 +1,19 @@ +-- Поиск публичных каналов и отображаемых имён (SHiNE DB v32). +BEGIN; +CREATE EXTENSION IF NOT EXISTS pg_trgm; +CREATE INDEX IF NOT EXISTS idx_channel_names_search_display + ON channel_names_state USING gin ((replace(lower(display_name), 'ё', 'е')) gin_trgm_ops) + WHERE channel_type_code = 1 AND NOT is_deleted; +CREATE INDEX IF NOT EXISTS idx_channel_names_search_slug + ON channel_names_state USING gin ((replace(lower(slug), 'ё', 'е')) gin_trgm_ops) + WHERE channel_type_code = 1 AND NOT is_deleted; +CREATE INDEX IF NOT EXISTS idx_channel_names_search_owner + ON channel_names_state USING gin ((replace(lower(owner_login), 'ё', 'е')) gin_trgm_ops) + WHERE channel_type_code = 1 AND NOT is_deleted; +CREATE INDEX IF NOT EXISTS idx_user_profile_search_name + ON user_profile_state USING gin ((replace(lower(coalesce(first_name, '') || ' ' || coalesce(last_name, '')), 'ё', 'е')) gin_trgm_ops); +CREATE INDEX IF NOT EXISTS idx_user_profile_search_name_reverse + ON user_profile_state USING gin ((replace(lower(coalesce(last_name, '') || ' ' || coalesce(first_name, '')), 'ё', 'е')) gin_trgm_ops); +UPDATE db_schema_version SET schema_version = 32, + updated_at_ms = CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT) WHERE id = 1; +COMMIT; diff --git a/SHiNE-server/shine-server-db/src/main/resources/postgres/schema_v1.sql b/SHiNE-server/shine-server-db/src/main/resources/postgres/schema_v1.sql index fffbf864..babd8b39 100644 --- a/SHiNE-server/shine-server-db/src/main/resources/postgres/schema_v1.sql +++ b/SHiNE-server/shine-server-db/src/main/resources/postgres/schema_v1.sql @@ -2658,6 +2658,15 @@ CREATE TABLE IF NOT EXISTS canonical_rebuild_staging ( ); CREATE INDEX IF NOT EXISTS idx_canonical_rebuild_staging_login ON canonical_rebuild_staging(login,logical_block_number); -INSERT INTO db_schema_version(id,schema_version,updated_at_ms) VALUES(1,31,CAST(EXTRACT(EPOCH FROM clock_timestamp())*1000 AS BIGINT)) ON CONFLICT(id) DO UPDATE SET schema_version=EXCLUDED.schema_version,updated_at_ms=EXCLUDED.updated_at_ms; + +-- v32: триграммные индексы публичного поиска. +CREATE EXTENSION IF NOT EXISTS pg_trgm; +CREATE INDEX IF NOT EXISTS idx_channel_names_search_display ON channel_names_state USING gin ((replace(lower(display_name), 'ё', 'е')) gin_trgm_ops) WHERE channel_type_code = 1 AND NOT is_deleted; +CREATE INDEX IF NOT EXISTS idx_channel_names_search_slug ON channel_names_state USING gin ((replace(lower(slug), 'ё', 'е')) gin_trgm_ops) WHERE channel_type_code = 1 AND NOT is_deleted; +CREATE INDEX IF NOT EXISTS idx_channel_names_search_owner ON channel_names_state USING gin ((replace(lower(owner_login), 'ё', 'е')) gin_trgm_ops) WHERE channel_type_code = 1 AND NOT is_deleted; +CREATE INDEX IF NOT EXISTS idx_user_profile_search_name ON user_profile_state USING gin ((replace(lower(coalesce(first_name, '') || ' ' || coalesce(last_name, '')), 'ё', 'е')) gin_trgm_ops); +CREATE INDEX IF NOT EXISTS idx_user_profile_search_name_reverse ON user_profile_state USING gin ((replace(lower(coalesce(last_name, '') || ' ' || coalesce(first_name, '')), 'ё', 'е')) gin_trgm_ops); + +INSERT INTO db_schema_version(id,schema_version,updated_at_ms) VALUES(1,32,CAST(EXTRACT(EPOCH FROM clock_timestamp())*1000 AS BIGINT)) ON CONFLICT(id) DO UPDATE SET schema_version=EXCLUDED.schema_version,updated_at_ms=EXCLUDED.updated_at_ms; COMMIT; diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/JsonHandlerRegistry.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/JsonHandlerRegistry.java index d399fe06..9a361510 100644 --- a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/JsonHandlerRegistry.java +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/JsonHandlerRegistry.java @@ -96,6 +96,7 @@ import server.logic.ws_protocol.JSON.handlers.channels.Net_GetGroupDialog_Handle import server.logic.ws_protocol.JSON.handlers.channels.Net_GetChannelsCounters_Handler; import server.logic.ws_protocol.JSON.handlers.channels.Net_ListGroupChats200_Handler; import server.logic.ws_protocol.JSON.handlers.channels.Net_ListSubscriptionsFeed_Handler; +import server.logic.ws_protocol.JSON.handlers.channels.Net_SearchChannels_Handler; import server.logic.ws_protocol.JSON.handlers.channels.Net_GetUserCounters_Handler; import server.logic.ws_protocol.JSON.handlers.channels.Net_SetChannelReadState_Handler; import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetChannelsCounters_Request; @@ -106,6 +107,7 @@ import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetMessageLi import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetPersonalDiary_Request; import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_ListGroupChats200_Request; import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_ListSubscriptionsFeed_Request; +import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_SearchChannels_Request; import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetUserCounters_Request; import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_SetChannelReadState_Request; import server.logic.ws_protocol.JSON.handlers.connections.Net_GetUserConnectionsGraph_Handler; @@ -182,6 +184,7 @@ public final class JsonHandlerRegistry { private static final Map HANDLERS = Map.ofEntries( Map.entry("GetUser", new Net_GetUser_Handler()), Map.entry("SearchUsers", new Net_SearchUsers_Handler()), + Map.entry("SearchChannels", new Net_SearchChannels_Handler()), // --- auth --- Map.entry("ResolveLoginForAuth", new Net_ResolveLoginForAuth_Handler()), @@ -286,6 +289,7 @@ public final class JsonHandlerRegistry { private static final Map> REQUEST_TYPES = Map.ofEntries( Map.entry("GetUser", Net_GetUser_Request.class), Map.entry("SearchUsers", Net_SearchUsers_Request.class), + Map.entry("SearchChannels", Net_SearchChannels_Request.class), // --- auth --- Map.entry("ResolveLoginForAuth", Net_ResolveLoginForAuth_Request.class), diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/RemoteUserOperationPolicy.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/RemoteUserOperationPolicy.java index a4715a48..025edcf7 100644 --- a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/RemoteUserOperationPolicy.java +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/RemoteUserOperationPolicy.java @@ -20,7 +20,10 @@ public final class RemoteUserOperationPolicy { "ClientErrorLog", "ClientDebugLog", "CloseActiveSession", - "ResolveLoginForAuth" + "ResolveLoginForAuth", + // Публичный read-only поиск доступен и REMOTE-сессии. + "SearchChannels", + "SearchUsers" ); private RemoteUserOperationPolicy() {} diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/Net_SearchChannels_Handler.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/Net_SearchChannels_Handler.java new file mode 100644 index 00000000..e2d35df6 --- /dev/null +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/Net_SearchChannels_Handler.java @@ -0,0 +1,52 @@ +package server.logic.ws_protocol.JSON.handlers.channels; + +import server.logic.ws_protocol.JSON.ConnectionContext; +import server.logic.ws_protocol.JSON.entyties.Net_Request; +import server.logic.ws_protocol.JSON.entyties.Net_Response; +import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler; +import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_SearchChannels_Request; +import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_SearchChannels_Response; +import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory; +import server.logic.ws_protocol.WireCodes; +import shine.db.DbController; +import shine.db.dao.ChannelSearchDAO; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; + +public class Net_SearchChannels_Handler implements JsonMessageHandler { + @Override + public Net_Response handle(Net_Request base, ConnectionContext ctx) { + Net_SearchChannels_Request req = (Net_SearchChannels_Request) base; + String query = req.getQuery() == null ? "" : req.getQuery().trim(); + String owner = req.getOwnerLogin() == null ? "" : req.getOwnerLogin().trim(); + if ((query.isEmpty() && owner.isEmpty()) || query.equals("@") || query.startsWith("/") + || query.startsWith("@/") || query.length() > 120 || owner.length() > 80 + || (req.getLimit() != null && (req.getLimit() < 1 || req.getLimit() > 50))) { + return NetExceptionResponseFactory.error(req, WireCodes.Status.BAD_REQUEST, + "BAD_FIELDS", "Нужен query или ownerLogin; limit от 1 до 50; длина query до 120 символов."); + } + int limit = req.getLimit() == null ? 10 : req.getLimit(); + try (Connection c = DbController.getInstance().getConnection()) { + List channels = new ArrayList<>(); + for (var match : ChannelSearchDAO.search(c, query, owner, limit)) { + var item = new Net_SearchChannels_Response.ChannelItem(); + item.setOwnerLogin(match.ownerLogin()); item.setSlug(match.slug()); + item.setDisplayName(match.displayName()); item.setDescription(match.description()); + item.setAvatarAr(match.avatarAr()); item.setAvatarSha256(match.avatarSha256()); + item.setOwnerBlockchainName(match.ownerBlockchainName()); + item.setRootBlockNumber(match.rootBlockNumber()); item.setRootBlockHashHex(match.rootBlockHashHex()); + item.setSubscribersCount(match.subscribersCount()); + channels.add(item); + } + var resp = new Net_SearchChannels_Response(); + resp.setOp(req.getOp()); resp.setRequestId(req.getRequestId()); + resp.setStatus(WireCodes.Status.OK); resp.setChannels(channels); + return resp; + } catch (SQLException e) { + return NetExceptionResponseFactory.error(req, WireCodes.Status.SERVER_DATA_ERROR, + "DB_ERROR", "Ошибка БД при поиске каналов"); + } + } +} diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/entyties/Net_SearchChannels_Request.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/entyties/Net_SearchChannels_Request.java new file mode 100644 index 00000000..09e0ead1 --- /dev/null +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/entyties/Net_SearchChannels_Request.java @@ -0,0 +1,17 @@ +package server.logic.ws_protocol.JSON.handlers.channels.entyties; + +import server.logic.ws_protocol.JSON.entyties.Net_Request; + +/** Поиск публичных каналов по названию, slug и логину владельца. */ +public class Net_SearchChannels_Request extends Net_Request { + private String query; + private String ownerLogin; + private Integer limit; + + public String getQuery() { return query; } + public void setQuery(String query) { this.query = query; } + public String getOwnerLogin() { return ownerLogin; } + public void setOwnerLogin(String ownerLogin) { this.ownerLogin = ownerLogin; } + public Integer getLimit() { return limit; } + public void setLimit(Integer limit) { this.limit = limit; } +} diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/entyties/Net_SearchChannels_Response.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/entyties/Net_SearchChannels_Response.java new file mode 100644 index 00000000..d83a2d70 --- /dev/null +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/entyties/Net_SearchChannels_Response.java @@ -0,0 +1,37 @@ +package server.logic.ws_protocol.JSON.handlers.channels.entyties; + +import server.logic.ws_protocol.JSON.entyties.Net_Response; +import java.util.ArrayList; +import java.util.List; + +public class Net_SearchChannels_Response extends Net_Response { + private List channels = new ArrayList<>(); + public List getChannels() { return channels; } + public void setChannels(List channels) { this.channels = channels; } + + public static class ChannelItem { + private String ownerLogin, slug, displayName, description, avatarAr, avatarSha256, + ownerBlockchainName, rootBlockHashHex; + private int rootBlockNumber, subscribersCount; + public String getOwnerLogin() { return ownerLogin; } + public void setOwnerLogin(String v) { ownerLogin = v; } + public String getSlug() { return slug; } + public void setSlug(String v) { slug = v; } + public String getDisplayName() { return displayName; } + public void setDisplayName(String v) { displayName = v; } + public String getDescription() { return description; } + public void setDescription(String v) { description = v; } + public String getAvatarAr() { return avatarAr; } + public void setAvatarAr(String v) { avatarAr = v; } + public String getAvatarSha256() { return avatarSha256; } + public void setAvatarSha256(String v) { avatarSha256 = v; } + public String getOwnerBlockchainName() { return ownerBlockchainName; } + public void setOwnerBlockchainName(String v) { ownerBlockchainName = v; } + public int getRootBlockNumber() { return rootBlockNumber; } + public void setRootBlockNumber(int v) { rootBlockNumber = v; } + public String getRootBlockHashHex() { return rootBlockHashHex; } + public void setRootBlockHashHex(String v) { rootBlockHashHex = v; } + public int getSubscribersCount() { return subscribersCount; } + public void setSubscribersCount(int v) { subscribersCount = v; } + } +} diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/tempToTest/Net_SearchUsers_Handler.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/tempToTest/Net_SearchUsers_Handler.java index afe7356c..b495daff 100644 --- a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/tempToTest/Net_SearchUsers_Handler.java +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/tempToTest/Net_SearchUsers_Handler.java @@ -25,7 +25,8 @@ public class Net_SearchUsers_Handler implements JsonMessageHandler { public Net_Response handle(Net_Request baseRequest, ConnectionContext ctx) { Net_SearchUsers_Request req = (Net_SearchUsers_Request) baseRequest; - if (req.getPrefix() == null || req.getPrefix().isBlank()) { + if (req.getPrefix() == null || req.getPrefix().isBlank() || req.getPrefix().length() > 120 + || (req.getLimit() != null && (req.getLimit() < 1 || req.getLimit() > 50))) { return NetExceptionResponseFactory.error( req, WireCodes.Status.BAD_REQUEST, @@ -39,13 +40,18 @@ public class Net_SearchUsers_Handler implements JsonMessageHandler { try { CurrentUsersDAO dao = CurrentUsersDAO.getInstance(); - List users = dao.searchByLoginPrefix(prefix, isServer); // case-insensitive + LIMIT 5 - + // Старые клиенты по-прежнему получают массив строк logins. + // Новый поиск дополнительно учитывает человекочитаемое имя. + var cards = dao.searchDirectory(prefix, isServer, req.getLimit() == null ? 5 : req.getLimit()); List logins = new ArrayList<>(); - for (CurrentUserEntry u : users) { - if (u != null && u.getLogin() != null) { - logins.add(u.getLogin()); // регистр как в БД - } + List users = new ArrayList<>(); + for (var card : cards) { + logins.add(card.login()); + var item = new Net_SearchUsers_Response.UserItem(); + item.setLogin(card.login()); + item.setDisplayName(card.displayName()); + item.setAvatarAr(card.avatarAr()); + users.add(item); } Net_SearchUsers_Response resp = new Net_SearchUsers_Response(); @@ -53,6 +59,7 @@ public class Net_SearchUsers_Handler implements JsonMessageHandler { resp.setRequestId(req.getRequestId()); resp.setStatus(WireCodes.Status.OK); resp.setLogins(logins); + resp.setUsers(users); log.info("✅ SearchUsers ok: prefix='{}', isServer={} -> {}", prefix, isServer, logins.size()); return resp; diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/tempToTest/entyties/Net_SearchUsers_Request.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/tempToTest/entyties/Net_SearchUsers_Request.java index 3f2e9990..0a6508cf 100644 --- a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/tempToTest/entyties/Net_SearchUsers_Request.java +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/tempToTest/entyties/Net_SearchUsers_Request.java @@ -19,7 +19,10 @@ public class Net_SearchUsers_Request extends Net_Request { private String prefix; private Boolean isServer; + private Integer limit; + public Integer getLimit() { return limit; } + public void setLimit(Integer value) { limit = value; } public String getPrefix() { return prefix; } public void setPrefix(String prefix) { this.prefix = prefix; } public Boolean getIsServer() { return isServer; } diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/tempToTest/entyties/Net_SearchUsers_Response.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/tempToTest/entyties/Net_SearchUsers_Response.java index ede19b50..845d54c9 100644 --- a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/tempToTest/entyties/Net_SearchUsers_Response.java +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/tempToTest/entyties/Net_SearchUsers_Response.java @@ -23,6 +23,20 @@ import java.util.List; public class Net_SearchUsers_Response extends Net_Response { private List logins = new ArrayList<>(); + private List users = new ArrayList<>(); + public List getUsers() { return users; } + public void setUsers(List users) { this.users = users; } + + public static class UserItem { + private String login, displayName, avatarAr; + public String getLogin() { return login; } + public void setLogin(String value) { login = value; } + public String getDisplayName() { return displayName; } + public void setDisplayName(String value) { displayName = value; } + public String getAvatarAr() { return avatarAr; } + public void setAvatarAr(String value) { avatarAr = value; } + } + public List getLogins() { return logins; } public void setLogins(List logins) { this.logins = logins; } diff --git a/VERSION.properties b/VERSION.properties index 61b2129a..458a65c1 100644 --- a/VERSION.properties +++ b/VERSION.properties @@ -1,2 +1,2 @@ -client.version=1.18.0 -server.version=1.14.0 +client.version=1.18.1 +server.version=1.14.1 diff --git a/docs/API/01_User_Registration_API.md b/docs/API/01_User_Registration_API.md index 25ccd9ce..c582a5f5 100644 --- a/docs/API/01_User_Registration_API.md +++ b/docs/API/01_User_Registration_API.md @@ -118,7 +118,7 @@ ### Назначение -Поиск пользователей по префиксу логина. Операция зарегистрирована в серверном API и используется как вспомогательная dev/test операция. +Поиск пользователей по префиксу логина и фрагменту публичного имени (`first_name`, `last_name`) без учёта регистра и с нормализацией `ё/е`. Совместимый ответ — массив строк `logins`. При необходимости можно включить фильтр только по server PDA. ### Запрос @@ -129,12 +129,14 @@ "requestId": "search-001", "payload": { "prefix": "an", - "isServer": true + "isServer": true, + "limit": 10 } } ``` -- `prefix` — обязательный префикс логина. +- `prefix` — обязательный поисковый фрагмент (до 120 символов); логины ищутся по началу, публичные имена — по подстроке. +- `limit` — необязательное число результатов 1–50, по умолчанию **5** (совместимость с клиентами). - `isServer` — необязательный boolean-флаг; если `true`, сервер вернёт только логины, у которых в `solana_user_pda_current` стоит `is_server = true`. @@ -147,7 +149,11 @@ "status": 200, "ok": true, "payload": { - "logins": ["anya", "andrey"] + "logins": ["anya", "andrey"], + "users": [ + { "login": "anya", "displayName": "Анна", "avatarAr": "" }, + { "login": "andrey", "displayName": "Андрей", "avatarAr": "" } + ] } } ``` diff --git a/docs/API/06_Channels_Read_API.md b/docs/API/06_Channels_Read_API.md index 9ffb53ca..c293b520 100644 --- a/docs/API/06_Channels_Read_API.md +++ b/docs/API/06_Channels_Read_API.md @@ -587,3 +587,58 @@ Channel/message responses expose three counters: - `shiningLikesCount` — likes from users who are currently both `primary` and `shining`. Changing `account_role` or `shine` does not alter the raw reaction. The two qualified counters are recalculated from `reactions_state`; therefore old likes automatically enter or leave qualified counters when the actor's current status changes. + + +## `SearchChannels` — публичный поиск каналов (v32) + +Операция **без авторизации**, на текущем сервере (не федеративный поиск). +Результаты берутся из актуального состояния `channel_names_state`; публичные каналы — `channel_type_code = 1`, не удалённые (`is_deleted = false`). + +Запрос: + +```json +{ + "op": "SearchChannels", + "requestId": "search-ch-1", + "payload": { "query": "гриб", "limit": 10 } +} +``` + +- `query` — текст от 1 до 120 символов. Не обязателен, если указан `ownerLogin`. +- `ownerLogin` — дополнительное ограничение по началу логина владельца, до 80 символов. +- `limit` — число результатов, по умолчанию 10, допустимо 1–50. Курсора и пагинации нет. +- `@anna` — каналы владельцев, чьи логины содержат `anna`. +- `anna/art` — каналы владельца `anna`, у которых публичное либо техническое название содержит `art`. +- `anna/` — все доступные каналы владельца `anna`. +- В обычном запросе ищутся **подстроки** в публичном имени `display_name`, техническом `slug` и логине `owner_login`. Регистр не важен, `ё` приравнивается к `е`. Вводимые `%`, `_` и `!` не работают как SQL-маски. +- Сначала идут точные совпадения с названием или slug, затем префиксные, затем частичные, далее учитывается количество подписчиков. + +Ответ: + +```json +{ + "op": "SearchChannels", + "requestId": "search-ch-1", + "status": 200, + "ok": true, + "payload": { + "channels": [{ + "ownerLogin": "anna", + "slug": "fungal-art", + "displayName": "Грибной мир", + "description": "Картины и грибы", + "avatarAr": "", + "avatarSha256": "", + "ownerBlockchainName": "anna-001", + "rootBlockNumber": 12, + "rootBlockHashHex": "", + "subscribersCount": 128 + }] + } +} +``` + +Массив `channels` пустой при отсутствии совпадений; URL не возвращается. +`ownerBlockchainName` и корневой блок позволяют клиенту открыть канонический канал через существующую маршрутизацию. +Неверные поля: HTTP-подобный статус `400`, код `BAD_FIELDS`; ошибки чтения БД: `SERVER_DATA_ERROR`, `DB_ERROR`. +Структура блокчейна не меняется. Индексы поиска добавлены миграцией БД v32 (`pg_trgm`). diff --git a/docs/API/09_Operations_Index.md b/docs/API/09_Operations_Index.md index 71d5539f..7ab51448 100644 --- a/docs/API/09_Operations_Index.md +++ b/docs/API/09_Operations_Index.md @@ -13,7 +13,8 @@ | Операция | Раздел документации | Кратко | | --- | --- | --- | | `GetUser` | `01_User_Registration_API.md` | чтение/проверка пользователя + server-состояние его блокчейна | -| `SearchUsers` | `01_User_Registration_API.md` | поиск логинов по префиксу | +| `SearchUsers` | `01_User_Registration_API.md` | поиск логинов и публичных имён пользователей | +| `SearchChannels` | `06_Channels_Read_API.md` | поиск публичных каналов по названию, slug и логину владельца | | `ResolveLoginForAuth` | `02_Authentication_API.md` | проверка login перед входом: LOCAL / REMOTE / NOT_FOUND / NO_ACCESS_SERVER + URL правильного access server | | `AuthChallenge` | `02_Authentication_API.md` | challenge для создания новой сессии | | `CreateAuthSession` | `02_Authentication_API.md` | создание новой авторизованной сессии | diff --git a/shine-UI/index.html b/shine-UI/index.html index a4d3bc7e..1edb3323 100644 --- a/shine-UI/index.html +++ b/shine-UI/index.html @@ -39,7 +39,7 @@ }());