From d8f42c769cd85459aee609d52b6951de02b242973695ea39e0512b1667debf6a Mon Sep 17 00:00:00 2001 From: AidarKC Date: Wed, 7 Oct 2026 14:05:01 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D1=83?= =?UTF-8?q?=20=D0=B0=D0=B2=D0=B0=D1=82=D0=B0=D1=80=D0=BE=D0=B2=20=D0=B8=20?= =?UTF-8?q?=D0=B2=D0=BB=D0=BE=D0=B6=D0=B5=D0=BD=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../usb_contact_screen_start_stub.ino | 75 ++++++- .../reference/usb_contact_sensor_test_spec.md | 4 + .../shine/db/dao/UserProfileStateDAO.java | 8 +- .../channels/ChannelMetaTextParser.java | 2 +- .../Net_GetUserConnectionsGraph_Handler.java | 18 +- .../connections/Net_ListContacts_Handler.java | 11 +- .../Net_GetUserConnectionsGraph_Response.java | 3 + .../handlers/profile/AvatarValueParser.java | 57 +++++ .../Net_ListUserProfileChannels_Handler.java | 2 +- .../Net_ListUserProfileChannels_Response.java | 2 +- .../Net_GetDirectMessages_Handler.java | 18 +- VERSION.properties | 4 +- .../components/arweave-attachment-manager.js | 194 +++++++++++++----- shine-UI/js/components/avatar-image.js | 27 ++- shine-UI/js/components/avatar-wizard.js | 12 +- .../components/channel-attachment-manager.js | 101 +++++---- shine-UI/js/pages/add-channel-view.js | 22 +- shine-UI/js/pages/channel-about-view.js | 12 +- shine-UI/js/pages/channel-thread-view.js | 4 +- shine-UI/js/pages/channel-view.js | 25 ++- shine-UI/js/pages/channels-list.js | 5 +- shine-UI/js/pages/chat-view.js | 2 +- shine-UI/js/pages/contact-search-view.js | 4 +- shine-UI/js/pages/messages-list.js | 8 +- shine-UI/js/pages/network-view.js | 3 +- shine-UI/js/pages/network/force-graph.js | 43 +++- shine-UI/js/pages/notifications-view.js | 4 +- shine-UI/js/pages/profile-edit-view.js | 4 +- shine-UI/js/pages/user-profile-list-view.js | 7 +- shine-UI/js/services/auth-service.js | 8 +- shine-UI/js/services/avatar-reference.js | 86 ++++++++ shine-UI/js/services/call-ui-service.js | 6 +- shine-UI/js/services/user-connections.js | 4 +- shine-UI/js/services/user-profile-params.js | 42 ++-- shine-UI/styles/components/attachments.css | 23 +++ 35 files changed, 628 insertions(+), 222 deletions(-) create mode 100644 SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/profile/AvatarValueParser.java create mode 100644 shine-UI/js/services/avatar-reference.js diff --git a/ESP32/esp32/ESP32-S3-Touch-AMOLED-2.16/main-device/test_sketches/usb_contact_screen_start_stub/usb_contact_screen_start_stub.ino b/ESP32/esp32/ESP32-S3-Touch-AMOLED-2.16/main-device/test_sketches/usb_contact_screen_start_stub/usb_contact_screen_start_stub.ino index 07278d6f..59d74ac3 100644 --- a/ESP32/esp32/ESP32-S3-Touch-AMOLED-2.16/main-device/test_sketches/usb_contact_screen_start_stub/usb_contact_screen_start_stub.ino +++ b/ESP32/esp32/ESP32-S3-Touch-AMOLED-2.16/main-device/test_sketches/usb_contact_screen_start_stub/usb_contact_screen_start_stub.ino @@ -1,6 +1,7 @@ #include #include #include +#include #include #include #include "ESP_I2S.h" @@ -54,6 +55,7 @@ Arduino_CO5300 *gfx = new Arduino_CO5300( TouchDrvCST92xx gTouch; I2SClass gI2s; +Preferences gPrefs; struct Rect { int16_t x; @@ -67,6 +69,8 @@ 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; @@ -96,6 +100,8 @@ 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); @@ -152,6 +158,33 @@ static uint32_t averageCycleMs() { 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; } @@ -206,11 +239,11 @@ static void playBeep(uint16_t freq, uint16_t samples, int16_t amp) { } static void playCycleTick() { - playBeep(880, 480, (int16_t)(gTickVolume * 800)); + playBeep(880, 480, kTickAmpByVolume[gTickVolume]); } static void playAlertBeep() { - playBeep(1200, 1600, (int16_t)(gAlertVolume * 1200)); + playBeep(1200, 1600, kAlertAmpByVolume[gAlertVolume]); } static void alertIfNeeded() { @@ -299,6 +332,7 @@ static void drawMonitorStatic() { gStaticDrawn = true; gLastDrawnClosed = !gStableClosed; gLastDrawnPaused = !isAutoPaused(); + resetCachedUiText(); } static void updateMonitorValues(bool force) { @@ -327,9 +361,13 @@ static void updateMonitorValues(bool force) { gLastDrawnPaused = paused; } - clearArea(28, 58, 424, 28, C_PANEL); snprintf(line, sizeof(line), "Limit: %us top button: settings", kLimitsSec[gLimitIndex]); - drawText(28, 60, line, C_MUTE, 2); + 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); @@ -351,9 +389,13 @@ static void updateMonitorValues(bool force) { snprintf(value, sizeof(value), "%us", kLimitsSec[gLimitIndex]); drawText(266, 342, value, C_TEXT, 2); - clearArea(28, 398, 280, 28, C_PANEL); snprintf(line, sizeof(line), "Short avg streak: %u", gShortStreak); - drawText(32, 402, line, gShortStreak > 0 ? C_BAD : C_MUTE, 2); + 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() { @@ -398,6 +440,7 @@ static void toggleSettings() { gSettingsOpen = !gSettingsOpen; gNeedStaticRedraw = true; gNeedRedraw = true; + resetCachedUiText(); } static void handleStableContact(bool closed) { @@ -461,16 +504,29 @@ static uint8_t sliderValueFromX(const Rect &rect, int16_t x, uint8_t maxValue) { static void handleSettingsTouch(int16_t x, int16_t y) { if (contains(kLimitSlider, x, y)) { - gLimitIndex = sliderValueFromX(kLimitSlider, x, 4); + uint8_t next = sliderValueFromX(kLimitSlider, x, 4); + if (next == gLimitIndex) { + return; + } + gLimitIndex = next; } else if (contains(kTickSlider, x, y)) { - gTickVolume = sliderValueFromX(kTickSlider, x, 10); + uint8_t next = sliderValueFromX(kTickSlider, x, 10); + if (next == gTickVolume) { + return; + } + gTickVolume = next; playCycleTick(); } else if (contains(kAlertSlider, x, y)) { - gAlertVolume = sliderValueFromX(kAlertSlider, x, 10); + uint8_t next = sliderValueFromX(kAlertSlider, x, 10); + if (next == gAlertVolume) { + return; + } + gAlertVolume = next; playAlertBeep(); } else { return; } + saveSettings(); gNeedRedraw = true; } @@ -510,6 +566,7 @@ void setup() { Serial.begin(115200); Wire.begin(PIN_I2C_SDA, PIN_I2C_SCL); pinMode(PIN_USER_BTN, INPUT_PULLUP); + loadSettings(); initAudio(); gfx->begin(); 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 cdadd1f9..1bf50631 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 @@ -73,7 +73,11 @@ After tapping `START`: - 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 diff --git a/SHiNE-server/shine-server-db/src/main/java/shine/db/dao/UserProfileStateDAO.java b/SHiNE-server/shine-server-db/src/main/java/shine/db/dao/UserProfileStateDAO.java index bd63e416..b9ca0892 100644 --- a/SHiNE-server/shine-server-db/src/main/java/shine/db/dao/UserProfileStateDAO.java +++ b/SHiNE-server/shine-server-db/src/main/java/shine/db/dao/UserProfileStateDAO.java @@ -116,7 +116,7 @@ public final class UserProfileStateDAO { String sql; if ("owned".equals(mode)) { sql=""" - SELECT cn.owner_login, cn.slug, cn.display_name, cn.ava_ar, cn.owner_bch_name, + SELECT cn.owner_login, cn.slug, cn.display_name, cn.ava_ar, cn.ava_sha256, cn.owner_bch_name, cn.channel_root_block_number, encode(cn.channel_root_block_hash,'hex') root_hash, cn.is_deleted, cn.deleted_at_ms, cn.deleted_block_number FROM channel_names_state cn @@ -125,7 +125,7 @@ public final class UserProfileStateDAO { """; } else if ("following".equals(mode)) { sql=""" - SELECT DISTINCT cn.owner_login, cn.slug, cn.display_name, cn.ava_ar, cn.owner_bch_name, + SELECT DISTINCT cn.owner_login, cn.slug, cn.display_name, cn.ava_ar, cn.ava_sha256, cn.owner_bch_name, cn.channel_root_block_number, encode(cn.channel_root_block_hash,'hex') root_hash, cn.is_deleted, cn.deleted_at_ms, cn.deleted_block_number FROM connections_state cs @@ -142,7 +142,7 @@ public final class UserProfileStateDAO { ps.setString(1,login); ps.setBoolean(2,includeDeleted); ps.setInt(3,safeLimit); ps.setInt(4,safeOffset); try(ResultSet rs=ps.executeQuery()){ while(rs.next()) out.add(new ChannelCard( - rs.getString("owner_login"), rs.getString("slug"), rs.getString("display_name"), rs.getString("ava_ar"), + rs.getString("owner_login"), rs.getString("slug"), rs.getString("display_name"), rs.getString("ava_ar"), rs.getString("ava_sha256"), rs.getString("owner_bch_name"), rs.getInt("channel_root_block_number"), rs.getString("root_hash"), rs.getBoolean("is_deleted"), rs.getLong("deleted_at_ms"), (Integer) rs.getObject("deleted_block_number") )); @@ -154,5 +154,5 @@ public final class UserProfileStateDAO { private static ProfileCard map(ResultSet rs)throws SQLException{return new ProfileCard(rs.getString("login"),rs.getString("first_name"),rs.getString("last_name"),rs.getString("ava_ar"),rs.getString("account_role"),rs.getString("shine_status"));} public record ProfileCard(String login,String firstName,String lastName,String avatarAr,String accountRole,String shineStatus){} public record RelationCard(String login,String firstName,String lastName,String avatarAr,String accountRole,String shineStatus,boolean primaryConfirmed,boolean shineConfirmed,String relationType,int primaryConfirmationsCount,int shineConfirmationsCount){} - public record ChannelCard(String ownerLogin,String slug,String displayName,String avatarAr,String ownerBlockchainName,int rootBlockNumber,String rootBlockHashHex,boolean deleted,long deletedAtMs,Integer deletedBlockNumber){} + public record ChannelCard(String ownerLogin,String slug,String displayName,String avatarAr,String avatarSha256,String ownerBlockchainName,int rootBlockNumber,String rootBlockHashHex,boolean deleted,long deletedAtMs,Integer deletedBlockNumber){} } diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/ChannelMetaTextParser.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/ChannelMetaTextParser.java index 57bd4ebb..1c192c53 100644 --- a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/ChannelMetaTextParser.java +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/ChannelMetaTextParser.java @@ -72,7 +72,7 @@ public final class ChannelMetaTextParser { String ar = String.valueOf(fields.getOrDefault("ar", "")).trim(); String sha256 = String.valueOf(fields.getOrDefault("sha256", "")).trim().toLowerCase(); String sizeRaw = String.valueOf(fields.containsKey("sz") ? fields.get("sz") : fields.getOrDefault("size", "")).trim(); - if (!ar.matches("^[A-Za-z0-9_-]{43}$")) throw new IllegalArgumentException("bad_channel_meta_avatar_ar"); + if (!ar.isEmpty() && !ar.matches("^[A-Za-z0-9_-]{43}$")) throw new IllegalArgumentException("bad_channel_meta_avatar_ar"); if (!sha256.matches("^[0-9a-f]{64}$")) throw new IllegalArgumentException("bad_channel_meta_avatar_sha256"); long size; try { diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/connections/Net_GetUserConnectionsGraph_Handler.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/connections/Net_GetUserConnectionsGraph_Handler.java index 69e4c736..c08e99bc 100644 --- a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/connections/Net_GetUserConnectionsGraph_Handler.java +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/connections/Net_GetUserConnectionsGraph_Handler.java @@ -6,6 +6,7 @@ import server.logic.ws_protocol.JSON.entyties.Net_Response; import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler; import server.logic.ws_protocol.JSON.handlers.connections.entyties.Net_GetUserConnectionsGraph_Request; import server.logic.ws_protocol.JSON.handlers.connections.entyties.Net_GetUserConnectionsGraph_Response; +import server.logic.ws_protocol.JSON.handlers.profile.AvatarValueParser; import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory; import server.logic.ws_protocol.WireCodes; import shine.db.MsgSubType; @@ -234,7 +235,7 @@ public class Net_GetUserConnectionsGraph_Handler implements JsonMessageHandler { meta.accountRole=rs.getString("account_role"); meta.shineStatus=rs.getString("shine_status"); meta.gender=normalizeGender(rs.getString("gender_value")); meta.official="primary".equals(meta.accountRole); meta.shine="shining".equals(meta.shineStatus); meta.primaryConfirmationsCount=rs.getInt("primary_confirmations_count"); meta.shineConfirmationsCount=rs.getInt("shine_confirmations_count"); - meta.avatarAr=extractArAvatarTxId(rs.getString("avatar_value")); out.put(normKey(login),meta); + meta.avatarValue=String.valueOf(rs.getString("avatar_value") == null ? "" : rs.getString("avatar_value")); out.put(normKey(login),meta); }} } return out; @@ -291,11 +292,12 @@ public class Net_GetUserConnectionsGraph_Handler implements JsonMessageHandler { return txId; } - private Net_GetUserConnectionsGraph_Response.AvatarItem makeAvatarItem(String avatarAr) { - String txId = String.valueOf(avatarAr == null ? "" : avatarAr).trim(); - if (txId.isEmpty()) return null; + private Net_GetUserConnectionsGraph_Response.AvatarItem makeAvatarItem(String avatarValue) { + AvatarValueParser.Parsed parsed = AvatarValueParser.parse(avatarValue); + if (!parsed.ok()) return null; Net_GetUserConnectionsGraph_Response.AvatarItem avatar = new Net_GetUserConnectionsGraph_Response.AvatarItem(); - avatar.setAr(txId); + avatar.setAr(parsed.ar()); + avatar.setSha256Hex(parsed.sha256Hex()); return avatar; } @@ -315,7 +317,7 @@ public class Net_GetUserConnectionsGraph_Handler implements JsonMessageHandler { it.setLogin(clean); it.setGender(gender); it.setGenderLabel(genderLabel(gender)); - it.setAvatar(makeAvatarItem(meta == null ? null : meta.avatarAr)); + it.setAvatar(makeAvatarItem(meta == null ? null : meta.avatarValue)); items.add(it); } return items; @@ -354,7 +356,7 @@ public class Net_GetUserConnectionsGraph_Handler implements JsonMessageHandler { it.setShine(shine); it.setOfficialLabel(official ? "официальный" : "неофициальный"); it.setShineLabel(shine ? "сияющий" : "несияющий"); - it.setAvatar(makeAvatarItem(meta == null ? null : meta.avatarAr)); + it.setAvatar(makeAvatarItem(meta == null ? null : meta.avatarValue)); items.add(it); } return items; @@ -370,6 +372,6 @@ public class Net_GetUserConnectionsGraph_Handler implements JsonMessageHandler { private int shineConfirmationsCount = 0; private boolean official = false; private boolean shine = false; - private String avatarAr = null; + private String avatarValue = ""; } } diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/connections/Net_ListContacts_Handler.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/connections/Net_ListContacts_Handler.java index 827d7ab2..ca63c317 100644 --- a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/connections/Net_ListContacts_Handler.java +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/connections/Net_ListContacts_Handler.java @@ -6,6 +6,7 @@ import server.logic.ws_protocol.JSON.entyties.Net_Response; import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler; import server.logic.ws_protocol.JSON.handlers.connections.entyties.Net_ListContacts_Request; import server.logic.ws_protocol.JSON.handlers.connections.entyties.Net_ListContacts_Response; +import server.logic.ws_protocol.JSON.handlers.profile.AvatarValueParser; import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory; import server.logic.ws_protocol.WireCodes; import shine.db.dao.DmDialogStateDAO; @@ -59,12 +60,12 @@ public class Net_ListContacts_Handler implements JsonMessageHandler { } private static Net_ListContacts_Response.Avatar parseAvatar(String value) { Net_ListContacts_Response.Avatar out = new Net_ListContacts_Response.Avatar(); - String raw = value == null ? "" : value.trim(); - java.util.regex.Matcher ar = java.util.regex.Pattern.compile("AR:([A-Za-z0-9_-]{43})").matcher(raw); - if (ar.find()) out.setAr(ar.group(1)); - java.util.regex.Matcher sha = java.util.regex.Pattern.compile("SHA256:([A-Fa-f0-9]{64})").matcher(raw); - if (sha.find()) out.setSha256Hex(sha.group(1).toLowerCase()); + AvatarValueParser.Parsed parsed = AvatarValueParser.parse(value); + if (!parsed.ok()) return out; + out.setAr(parsed.ar()); + out.setSha256Hex(parsed.sha256Hex()); return out; } + } diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/connections/entyties/Net_GetUserConnectionsGraph_Response.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/connections/entyties/Net_GetUserConnectionsGraph_Response.java index 285d44dc..80f23283 100644 --- a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/connections/entyties/Net_GetUserConnectionsGraph_Response.java +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/connections/entyties/Net_GetUserConnectionsGraph_Response.java @@ -39,9 +39,12 @@ public class Net_GetUserConnectionsGraph_Response extends Net_Response { public static class AvatarItem { private String ar; + private String sha256Hex; public String getAr() { return ar; } public void setAr(String ar) { this.ar = ar; } + public String getSha256Hex() { return sha256Hex; } + public void setSha256Hex(String sha256Hex) { this.sha256Hex = sha256Hex; } } public static class RelativeItem { diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/profile/AvatarValueParser.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/profile/AvatarValueParser.java new file mode 100644 index 00000000..6277da4d --- /dev/null +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/profile/AvatarValueParser.java @@ -0,0 +1,57 @@ +package server.logic.ws_protocol.JSON.handlers.profile; + +import java.util.HashMap; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public final class AvatarValueParser { + private static final Pattern NEW_TAG = Pattern.compile("^<(?:SHiNE|S):(?:ava|avatar);([^>]*)>$"); + private static final Pattern LEGACY_AR = Pattern.compile("AR:([A-Za-z0-9_-]{43})"); + private static final Pattern LEGACY_SHA = Pattern.compile("SHA256:([A-Fa-f0-9]{64})"); + private static final Pattern AR = Pattern.compile("^[A-Za-z0-9_-]{43}$"); + private static final Pattern SHA = Pattern.compile("^[A-Fa-f0-9]{64}$"); + + private AvatarValueParser() {} + + public static Parsed parse(String rawValue) { + String raw = String.valueOf(rawValue == null ? "" : rawValue).trim(); + if (raw.isEmpty()) return new Parsed("", "", 0L, false); + + Matcher tag = NEW_TAG.matcher(raw); + if (tag.matches()) { + Map fields = fields(tag.group(1)); + if (!"1".equals(fields.get("v"))) return new Parsed("", "", 0L, false); + String ar = String.valueOf(fields.getOrDefault("ar", "")).trim(); + String sha = String.valueOf(fields.getOrDefault("sha256", "")).trim().toLowerCase(); + String sizeRaw = String.valueOf(fields.containsKey("sz") ? fields.get("sz") : fields.getOrDefault("size", "")).trim(); + if (!ar.isEmpty() && !AR.matcher(ar).matches()) return new Parsed("", "", 0L, false); + if (!SHA.matcher(sha).matches()) return new Parsed("", "", 0L, false); + long size; + try { size = Long.parseLong(sizeRaw); } catch (Exception e) { return new Parsed("", "", 0L, false); } + if (size <= 0L) return new Parsed("", "", 0L, false); + return new Parsed(ar, sha, size, true); + } + + Matcher arMatcher = LEGACY_AR.matcher(raw); + Matcher shaMatcher = LEGACY_SHA.matcher(raw); + String ar = arMatcher.find() ? arMatcher.group(1) : ""; + String sha = shaMatcher.find() ? shaMatcher.group(1).toLowerCase() : ""; + if (!AR.matcher(ar).matches()) return new Parsed("", "", 0L, false); + return new Parsed(ar, SHA.matcher(sha).matches() ? sha : "", 0L, true); + } + + private static Map fields(String raw) { + Map out = new HashMap<>(); + for (String part : String.valueOf(raw == null ? "" : raw).split(";")) { + int eq = part.indexOf('='); + if (eq <= 0) continue; + String key = part.substring(0, eq).trim(); + String value = part.substring(eq + 1).trim(); + if (!key.isEmpty()) out.put(key, value); + } + return out; + } + + public record Parsed(String ar, String sha256Hex, long size, boolean ok) {} +} diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/profile/Net_ListUserProfileChannels_Handler.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/profile/Net_ListUserProfileChannels_Handler.java index 5adc2705..506a8c8d 100644 --- a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/profile/Net_ListUserProfileChannels_Handler.java +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/profile/Net_ListUserProfileChannels_Handler.java @@ -1,3 +1,3 @@ package server.logic.ws_protocol.JSON.handlers.profile; import server.logic.ws_protocol.JSON.*;import server.logic.ws_protocol.JSON.entyties.*;import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler;import server.logic.ws_protocol.JSON.handlers.profile.entyties.*;import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory;import server.logic.ws_protocol.WireCodes;import shine.db.dao.UserProfileStateDAO;import java.sql.*;import java.util.*; -public class Net_ListUserProfileChannels_Handler implements JsonMessageHandler {public Net_Response handle(Net_Request base,ConnectionContext ctx)throws Exception{var req=(Net_ListUserProfileChannels_Request)base;if(req.getLogin()==null||req.getLogin().isBlank())return NetExceptionResponseFactory.error(req,400,"BAD_FIELDS","login required");try(Connection c=shine.db.DbController.getInstance().getConnection()){var rows=UserProfileStateDAO.getInstance().listPublicChannels(c,req.getLogin(),req.getMode(),Boolean.TRUE.equals(req.getIncludeDeleted()),req.getLimit()==null?100:req.getLimit(),req.getOffset()==null?0:req.getOffset());var resp=new Net_ListUserProfileChannels_Response();resp.setOp(req.getOp());resp.setRequestId(req.getRequestId());resp.setStatus(WireCodes.Status.OK);resp.setLogin(req.getLogin());resp.setMode(req.getMode());List items=new ArrayList<>();for(var r:rows){var i=new Net_ListUserProfileChannels_Response.ChannelItem();i.setOwnerLogin(r.ownerLogin());i.setSlug(r.slug());i.setDisplayName(r.displayName());i.setAvatarAr(r.avatarAr());i.setOwnerBlockchainName(r.ownerBlockchainName());i.setRootBlockNumber(r.rootBlockNumber());i.setRootBlockHashHex(r.rootBlockHashHex());i.setDeleted(r.deleted());i.setDeletedAtMs(r.deletedAtMs());i.setDeletedBlockNumber(r.deletedBlockNumber());items.add(i);}resp.setChannels(items);return resp;}}} +public class Net_ListUserProfileChannels_Handler implements JsonMessageHandler {public Net_Response handle(Net_Request base,ConnectionContext ctx)throws Exception{var req=(Net_ListUserProfileChannels_Request)base;if(req.getLogin()==null||req.getLogin().isBlank())return NetExceptionResponseFactory.error(req,400,"BAD_FIELDS","login required");try(Connection c=shine.db.DbController.getInstance().getConnection()){var rows=UserProfileStateDAO.getInstance().listPublicChannels(c,req.getLogin(),req.getMode(),Boolean.TRUE.equals(req.getIncludeDeleted()),req.getLimit()==null?100:req.getLimit(),req.getOffset()==null?0:req.getOffset());var resp=new Net_ListUserProfileChannels_Response();resp.setOp(req.getOp());resp.setRequestId(req.getRequestId());resp.setStatus(WireCodes.Status.OK);resp.setLogin(req.getLogin());resp.setMode(req.getMode());List items=new ArrayList<>();for(var r:rows){var i=new Net_ListUserProfileChannels_Response.ChannelItem();i.setOwnerLogin(r.ownerLogin());i.setSlug(r.slug());i.setDisplayName(r.displayName());i.setAvatarAr(r.avatarAr());i.setAvatarSha256(r.avatarSha256());i.setOwnerBlockchainName(r.ownerBlockchainName());i.setRootBlockNumber(r.rootBlockNumber());i.setRootBlockHashHex(r.rootBlockHashHex());i.setDeleted(r.deleted());i.setDeletedAtMs(r.deletedAtMs());i.setDeletedBlockNumber(r.deletedBlockNumber());items.add(i);}resp.setChannels(items);return resp;}}} diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/profile/entyties/Net_ListUserProfileChannels_Response.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/profile/entyties/Net_ListUserProfileChannels_Response.java index 57f2e44d..da0a0c41 100644 --- a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/profile/entyties/Net_ListUserProfileChannels_Response.java +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/profile/entyties/Net_ListUserProfileChannels_Response.java @@ -1,3 +1,3 @@ package server.logic.ws_protocol.JSON.handlers.profile.entyties; import server.logic.ws_protocol.JSON.entyties.Net_Response;import java.util.*; -public class Net_ListUserProfileChannels_Response extends Net_Response {private String login,mode;private List channels=new ArrayList<>();public String getLogin(){return login;}public void setLogin(String v){login=v;}public String getMode(){return mode;}public void setMode(String v){mode=v;}public List getChannels(){return channels;}public void setChannels(List v){channels=v;}public static class ChannelItem{private String ownerLogin,slug,displayName,avatarAr,ownerBlockchainName,rootBlockHashHex;private int rootBlockNumber;private boolean deleted;private long deletedAtMs;private Integer deletedBlockNumber;public String getOwnerLogin(){return ownerLogin;}public void setOwnerLogin(String v){ownerLogin=v;}public String getSlug(){return slug;}public void setSlug(String v){slug=v;}public String getDisplayName(){return displayName;}public void setDisplayName(String v){displayName=v;}public String getAvatarAr(){return avatarAr;}public void setAvatarAr(String v){avatarAr=v;}public String getOwnerBlockchainName(){return ownerBlockchainName;}public void setOwnerBlockchainName(String v){ownerBlockchainName=v;}public int getRootBlockNumber(){return rootBlockNumber;}public void setRootBlockNumber(int v){rootBlockNumber=v;}public String getRootBlockHashHex(){return rootBlockHashHex;}public void setRootBlockHashHex(String v){rootBlockHashHex=v;}public boolean isDeleted(){return deleted;}public void setDeleted(boolean v){deleted=v;}public long getDeletedAtMs(){return deletedAtMs;}public void setDeletedAtMs(long v){deletedAtMs=v;}public Integer getDeletedBlockNumber(){return deletedBlockNumber;}public void setDeletedBlockNumber(Integer v){deletedBlockNumber=v;}}} +public class Net_ListUserProfileChannels_Response extends Net_Response {private String login,mode;private List channels=new ArrayList<>();public String getLogin(){return login;}public void setLogin(String v){login=v;}public String getMode(){return mode;}public void setMode(String v){mode=v;}public List getChannels(){return channels;}public void setChannels(List v){channels=v;}public static class ChannelItem{private String ownerLogin,slug,displayName,avatarAr,avatarSha256,ownerBlockchainName,rootBlockHashHex;private int rootBlockNumber;private boolean deleted;private long deletedAtMs;private Integer deletedBlockNumber;public String getOwnerLogin(){return ownerLogin;}public void setOwnerLogin(String v){ownerLogin=v;}public String getSlug(){return slug;}public void setSlug(String v){slug=v;}public String getDisplayName(){return displayName;}public void setDisplayName(String v){displayName=v;}public String getAvatarAr(){return avatarAr;}public void setAvatarAr(String v){avatarAr=v;}public String getAvatarSha256(){return avatarSha256;}public void setAvatarSha256(String v){avatarSha256=v;}public String getOwnerBlockchainName(){return ownerBlockchainName;}public void setOwnerBlockchainName(String v){ownerBlockchainName=v;}public int getRootBlockNumber(){return rootBlockNumber;}public void setRootBlockNumber(int v){rootBlockNumber=v;}public String getRootBlockHashHex(){return rootBlockHashHex;}public void setRootBlockHashHex(String v){rootBlockHashHex=v;}public boolean isDeleted(){return deleted;}public void setDeleted(boolean v){deleted=v;}public long getDeletedAtMs(){return deletedAtMs;}public void setDeletedAtMs(long v){deletedAtMs=v;}public Integer getDeletedBlockNumber(){return deletedBlockNumber;}public void setDeletedBlockNumber(Integer v){deletedBlockNumber=v;}}} diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/messages/Net_GetDirectMessages_Handler.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/messages/Net_GetDirectMessages_Handler.java index 28d67260..970dce26 100644 --- a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/messages/Net_GetDirectMessages_Handler.java +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/messages/Net_GetDirectMessages_Handler.java @@ -6,6 +6,7 @@ import server.logic.ws_protocol.JSON.ConnectionContext; import server.logic.ws_protocol.JSON.entyties.Net_Request; import server.logic.ws_protocol.JSON.entyties.Net_Response; import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler; +import server.logic.ws_protocol.JSON.handlers.profile.AvatarValueParser; import server.logic.ws_protocol.JSON.messages.entyties.Net_GetDirectMessages_Request; import server.logic.ws_protocol.JSON.messages.entyties.Net_GetDirectMessages_Response; import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory; @@ -135,19 +136,12 @@ public class Net_GetDirectMessages_Handler implements JsonMessageHandler { } private static Net_GetDirectMessages_Response.Avatar parseAvatar(String value) { Net_GetDirectMessages_Response.Avatar out = new Net_GetDirectMessages_Response.Avatar(); - String raw = value == null ? "" : value.trim(); - - // Do not call Matcher.find() twice on the same matcher: the first successful - // call advances it and the second one can make a perfectly valid avatar vanish. - java.util.regex.Matcher ar = java.util.regex.Pattern.compile("AR:([A-Za-z0-9_-]{43})").matcher(raw); - if (ar.find()) { - out.setAr(ar.group(1)); - } - java.util.regex.Matcher sha = java.util.regex.Pattern.compile("SHA256:([A-Fa-f0-9]{64})").matcher(raw); - if (sha.find()) { - out.setSha256Hex(sha.group(1).toLowerCase()); - } + AvatarValueParser.Parsed parsed = AvatarValueParser.parse(value); + if (!parsed.ok()) return out; + out.setAr(parsed.ar()); + out.setSha256Hex(parsed.sha256Hex()); return out; } + } diff --git a/VERSION.properties b/VERSION.properties index 1c898d9a..cb17569e 100644 --- a/VERSION.properties +++ b/VERSION.properties @@ -1,2 +1,2 @@ -client.version=1.14.13 -server.version=1.12.12 +client.version=1.14.14 +server.version=1.12.13 diff --git a/shine-UI/js/components/arweave-attachment-manager.js b/shine-UI/js/components/arweave-attachment-manager.js index 58ccb356..f77b3c67 100644 --- a/shine-UI/js/components/arweave-attachment-manager.js +++ b/shine-UI/js/components/arweave-attachment-manager.js @@ -168,7 +168,7 @@ function writeLastWalletId(login, walletId) { } } -async function resizeImageFileToAvatar(file) { +export async function prepareAvatarImageFile(file) { const source = file instanceof File ? file : null; if (!source) throw new Error('Выберите изображение.'); const dataUrl = await new Promise((resolve, reject) => { @@ -218,19 +218,27 @@ export function openArweaveAttachmentManager({ initialSha256 = '', initialName = '', fixedFile = false, - autoOpenFileDialog = true, + autoOpenFileDialog = false, shineType = '', extraUploadTags = [], signal = null, + hostElement = null, + embedded = false, } = {}) { const cleanLogin = String(login || '').trim(); const cleanStoragePwd = String(storagePwd || '').trim(); const cleanGateway = String(gateway || 'https://arweave.net').trim(); if (!cleanLogin || !cleanStoragePwd) return Promise.reject(new Error('Нет активной сессии.')); - const root = document.createElement('div'); - root.className = 'ar-attachment-manager-root'; - document.body.append(root); + const embeddedHost = hostElement instanceof HTMLElement ? hostElement : null; + const isEmbedded = Boolean(embeddedHost || embedded); + const root = embeddedHost || document.createElement('div'); + if (!embeddedHost) { + root.className = 'ar-attachment-manager-root'; + document.body.append(root); + } else { + root.classList.add('ar-attachment-manager-embedded-root'); + } let closed = false; let wallets = []; @@ -272,7 +280,8 @@ export function openArweaveAttachmentManager({ function close(resolve, result = null) { if (closed) return; closed = true; - root.remove(); + if (embeddedHost) root.replaceChildren(); + else root.remove(); resolve(result); } @@ -295,7 +304,12 @@ export function openArweaveAttachmentManager({ const onAbort = () => close(resolve, null); if (signal?.aborted) { onAbort(); return; } signal?.addEventListener('abort', onAbort, { once: true }); + const shellOpen = (extraClass = '') => isEmbedded + ? `
` + : `
'; const bindBackdrop = () => { + if (isEmbedded) return; const modal = root.querySelector('[data-ar-attach-modal="true"]'); modal?.addEventListener('click', (event) => { if (event.target === modal) close(resolve, null); @@ -303,7 +317,7 @@ export function openArweaveAttachmentManager({ }; const renderWalletOptions = () => wallets.map((wallet) => ( - `` + `` )).join(''); const loadWallets = async (errorEl = null) => { @@ -376,21 +390,95 @@ export function openArweaveAttachmentManager({ }; const promptTurboTopUp = async (mainMetaEl, errorEl) => { - const value = window.prompt('Сколько SOL перевести в Turbo?', '0.01'); - if (value == null) return; - setText(errorEl, 'Пополняем Turbo...'); - try { - const result = await topUpTurboWithSolana({ - login: cleanLogin, - storagePwd: cleanStoragePwd, - keySource: selectedTurboKeySource, - amountSol: value, + await refreshTurboBalance(mainMetaEl, errorEl); + const previous = document.getElementById('turbo-topup-modal'); + previous?.remove(); + const overlay = document.createElement('div'); + overlay.id = 'turbo-topup-modal'; + overlay.className = 'modal ar-balance-modal'; + const sol = String(balanceInfo?.solBalance ?? '–'); + const credits = balanceInfo ? formatTurboCredits(balanceInfo.effectiveCredits, 6) : '–'; + const address = String(balanceInfo?.address || '').trim(); + overlay.innerHTML = ` + `; + document.body.append(overlay); + await new Promise((done) => { + const finish = () => { overlay.remove(); done(); }; + overlay.querySelector('[data-action="cancel"]')?.addEventListener('click', finish); + overlay.addEventListener('click', (event) => { if (event.target === overlay) finish(); }); + overlay.querySelector('[data-action="confirm"]')?.addEventListener('click', async () => { + const amount = String(overlay.querySelector('[data-role="amount"]')?.value || '').trim(); + const localError = overlay.querySelector('[data-role="topup-error"]'); + const btn = overlay.querySelector('[data-action="confirm"]'); + if (btn) btn.disabled = true; + setText(localError, 'Переводим SOL в Turbo...'); + try { + const result = await topUpTurboWithSolana({ + login: cleanLogin, + storagePwd: cleanStoragePwd, + keySource: selectedTurboKeySource, + amountSol: amount, + }); + await refreshTurboBalance(mainMetaEl, errorEl); + setText(errorEl, `Turbo пополнен. Tx: ${result.txId || 'отправлено'}`); + finish(); + } catch (error) { + setText(localError, error?.message || 'Не удалось пополнить Turbo.'); + if (btn) btn.disabled = false; + } }); - await refreshTurboBalance(mainMetaEl, errorEl); - setText(errorEl, `Turbo пополнен. Tx: ${result.txId || 'отправлено'}`); - } catch (error) { - setText(errorEl, error?.message || 'Не удалось пополнить Turbo.'); + }); + }; + + const showArweaveTopUp = async (mainMetaEl, errorEl) => { + const wallet = selectedWallet(); + if (!wallet?.address) { + setText(errorEl, 'Выберите Arweave-кошелёк.'); + return; } + try { + balanceInfo = await getArweaveBalance({ gateway: cleanGateway, address: wallet.address }); + renderArweaveMeta(mainMetaEl); + } catch { + // Адрес всё равно можно показать для пополнения. + } + const previous = document.getElementById('arweave-topup-modal'); + previous?.remove(); + const overlay = document.createElement('div'); + overlay.id = 'arweave-topup-modal'; + overlay.className = 'modal ar-balance-modal'; + overlay.innerHTML = ` + `; + document.body.append(overlay); + overlay.querySelector('[data-action="copy"]')?.addEventListener('click', async () => { + try { await navigator.clipboard.writeText(wallet.address); } catch { /* ignore */ } + }); + const closeOverlay = () => overlay.remove(); + overlay.querySelector('[data-action="close"]')?.addEventListener('click', closeOverlay); + overlay.addEventListener('click', (event) => { if (event.target === overlay) closeOverlay(); }); }; const renderArweaveMeta = (mainMetaEl) => { @@ -478,31 +566,26 @@ export function openArweaveAttachmentManager({ const uploadText = effectiveUploadButtonLabel || (historyOnly ? 'Загрузить в журнал' : 'Загрузить'); const canShowHistory = allowHistorySelection; const canShowExisting = allowExistingTxInput; - root.innerHTML = ` - + ${shellClose()} `; bindBackdrop(); const txEl = root.querySelector('#ar-existing-txid'); @@ -757,9 +855,7 @@ export function openArweaveAttachmentManager({ .filter((item) => purposeFilter === 'avatar' ? item.purpose === 'avatar' : item.purpose !== 'avatar') .slice() .reverse(); - root.innerHTML = ` - + ${shellClose()} `; bindBackdrop(); const labelEl = root.querySelector('#ar-wallet-label'); diff --git a/shine-UI/js/components/avatar-image.js b/shine-UI/js/components/avatar-image.js index 9857f066..f4bb31f7 100644 --- a/shine-UI/js/components/avatar-image.js +++ b/shine-UI/js/components/avatar-image.js @@ -1,6 +1,7 @@ import { state } from '../state.js'; import { buildArweaveDataUrl, validateArweaveTxId, validateSha256Hex } from '../services/arweave-file-service.js'; import { getCachedAvatarObjectUrl } from '../services/arweave-avatar-cache-service.js'; +import { resolvePublicFileUrl } from '../services/public-file-service.js'; function normalizeLogin(value) { return String(value || '').trim(); @@ -37,6 +38,7 @@ export function renderAvatar({ alt = 'Аватар', glow = false, official = false, + authorLogin = '', } = {}) { const wrap = document.createElement('div'); const classes = new Set(['avatar', 'avatar-image', 'avatar-framed']); @@ -63,11 +65,11 @@ export function renderAvatar({ } const txId = String(avatar?.ar || '').trim(); - if (!validateArweaveTxId(txId)) { - return wrap; - } const sha256Hex = String(avatar?.sha256Hex || avatar?.sha256 || '').trim().toLowerCase(); const expectedSha256Hex = validateSha256Hex(sha256Hex) ? sha256Hex : ''; + const hasArweave = validateArweaveTxId(txId); + const hasServerAvatar = !txId && expectedSha256Hex && normalizeLogin(authorLogin); + if (!hasArweave && !hasServerAvatar) return wrap; const img = document.createElement('img'); img.className = 'avatar-photo'; @@ -81,6 +83,23 @@ export function renderAvatar({ }; setLoadedState(false); + if (hasServerAvatar) { + void resolvePublicFileUrl({ + sha256: expectedSha256Hex, + authorLogin: normalizeLogin(authorLogin), + solanaEndpoint: state?.entrySettings?.solanaServer, + fallbackServerLogin: state?.entrySettings?.shineServerLogin, + }).then((url) => { + img.onload = () => setLoadedState(true); + img.onerror = () => { img.removeAttribute('src'); setLoadedState(false); }; + img.src = url; + }).catch(() => { + img.removeAttribute('src'); + setLoadedState(false); + }); + return wrap; + } + const gateway = state?.entrySettings?.arweaveServer; void getCachedAvatarObjectUrl({ gateway, txId, expectedSha256Hex }) .then((objectUrl) => { @@ -157,6 +176,7 @@ export function renderUserAvatar({ title = '', glow = false, official = false, + authorLogin = '', } = {}) { return renderAvatar({ initials: buildAvatarInitials({ login, firstName, lastName }), @@ -167,5 +187,6 @@ export function renderUserAvatar({ alt: 'Аватар', glow, official, + authorLogin: login, }); } diff --git a/shine-UI/js/components/avatar-wizard.js b/shine-UI/js/components/avatar-wizard.js index 335afd86..762a2285 100644 --- a/shine-UI/js/components/avatar-wizard.js +++ b/shine-UI/js/components/avatar-wizard.js @@ -1,5 +1,5 @@ -import { openArweaveAttachmentManager } from './arweave-attachment-manager.js'; -import { saveProfileAvatarArweave } from '../services/user-profile-params.js'; +import { openChannelAttachmentManager } from './channel-attachment-manager.js'; +import { saveProfileAvatar } from '../services/user-profile-params.js'; export async function openAvatarWizard({ login, @@ -16,22 +16,20 @@ export async function openAvatarWizard({ throw new Error('Нет активной сессии.'); } - const item = await openArweaveAttachmentManager({ + const item = await openChannelAttachmentManager({ login: cleanLogin, storagePwd: cleanStoragePwd, gateway: cleanGateway, - navigate, mode: 'avatar', - historyPurpose: 'avatar', }); - if (!item?.ar || !item?.sha256) return false; + if (!item?.sha256 || !item?.size) return false; if (typeof onStatus === 'function') { onStatus('Сохраняем аватар в профиль...'); } - await saveProfileAvatarArweave(cleanLogin, item.ar, item.sha256); + await saveProfileAvatar(cleanLogin, item); if (typeof onAvatarSaved === 'function') { await onAvatarSaved(item); diff --git a/shine-UI/js/components/channel-attachment-manager.js b/shine-UI/js/components/channel-attachment-manager.js index bc498a73..b3c0b2fe 100644 --- a/shine-UI/js/components/channel-attachment-manager.js +++ b/shine-UI/js/components/channel-attachment-manager.js @@ -1,4 +1,4 @@ -import { openArweaveAttachmentManager } from './arweave-attachment-manager.js'; +import { openArweaveAttachmentManager, prepareAvatarImageFile } from './arweave-attachment-manager.js'; import { formatBytes } from '../services/attachment-format.js'; import { uploadPublicFile } from '../services/public-file-service.js'; import { state } from '../state.js'; @@ -10,8 +10,10 @@ export function openChannelAttachmentManager({ gateway = '', selectedTxIds = [], signal = null, + mode = 'attachment', } = {}) { const cleanLogin = String(login || '').trim(); + const isAvatarMode = String(mode || '').trim() === 'avatar'; const root = document.createElement('div'); root.className = 'public-attachment-manager-root'; document.body.append(root); @@ -19,10 +21,14 @@ export function openChannelAttachmentManager({ let closed = false; let selectedFile = null; let uploading = false; + let arweaveStarted = false; + const arweaveAbortController = new AbortController(); + if (signal) signal.addEventListener('abort', () => arweaveAbortController.abort(), { once: true }); const close = (resolve, value = null) => { if (closed) return; closed = true; + arweaveAbortController.abort(); root.remove(); resolve(value); }; @@ -36,39 +42,35 @@ export function openChannelAttachmentManager({ @@ -80,7 +82,6 @@ export function openChannelAttachmentManager({ const statusEl = root.querySelector('[data-role="status"]'); const errorEl = root.querySelector('[data-role="error"]'); const uploadButton = root.querySelector('[data-action="upload"]'); - const arweaveButton = root.querySelector('[data-action="arweave"]'); const radios = [...root.querySelectorAll('input[name="attachment-storage"]')]; const setSource = (value) => { @@ -91,7 +92,41 @@ export function openChannelAttachmentManager({ root.querySelector('[data-panel="arweave"]').hidden = value !== 'arweave'; }; - radios.forEach((radio) => radio.addEventListener('change', () => setSource(radio.value))); + const openArweaveFlow = async () => { + if (arweaveStarted || closed) return; + arweaveStarted = true; + const hostElement = root.querySelector('[data-panel="arweave"]'); + if (!(hostElement instanceof HTMLElement)) { arweaveStarted = false; return; } + try { + const item = await openArweaveAttachmentManager({ + login: cleanLogin, + storagePwd, + gateway, + selectedTxIds, + signal: arweaveAbortController.signal, + mode: isAvatarMode ? 'avatar' : 'attachment', + historyPurpose: isAvatarMode ? 'avatar' : '', + autoOpenFileDialog: false, + hostElement, + embedded: true, + }); + if (item && !closed) close(resolve, item); + } catch (error) { + arweaveStarted = false; + if (!closed && hostElement) { + hostElement.replaceChildren(); + const message = document.createElement('p'); + message.className = 'inline-error'; + message.textContent = toUserMessage(error, 'Не удалось открыть Arweave.'); + hostElement.append(message); + } + } + }; + + radios.forEach((radio) => radio.addEventListener('change', () => { + setSource(radio.value); + if (radio.value === 'arweave' && radio.checked) void openArweaveFlow(); + })); root.querySelector('[data-action="close"]')?.addEventListener('click', () => close(resolve, null)); modal?.addEventListener('click', (event) => { if (event.target === modal && !uploading) close(resolve, null); @@ -101,7 +136,7 @@ export function openChannelAttachmentManager({ selectedFile = fileInput.files?.[0] || null; if (selectedEl) selectedEl.textContent = selectedFile ? `${selectedFile.name} · ${formatBytes(selectedFile.size)}` - : 'Файл не выбран.'; + : 'Файл не выбран'; if (errorEl) errorEl.textContent = ''; if (statusEl) statusEl.textContent = ''; if (uploadButton) uploadButton.disabled = !selectedFile; @@ -114,14 +149,15 @@ export function openChannelAttachmentManager({ fileInput.disabled = true; if (errorEl) errorEl.textContent = ''; try { + const uploadFile = isAvatarMode ? await prepareAvatarImageFile(selectedFile) : selectedFile; const item = await uploadPublicFile({ - file: selectedFile, + file: uploadFile, login: cleanLogin, sessionId: state.session.sessionId, wsUrl: state.entrySettings.shineServer, onStatus: (message) => { if (statusEl) statusEl.textContent = message; }, }); - close(resolve, item); + close(resolve, { ...item, purpose: isAvatarMode ? 'avatar' : 'attachment' }); } catch (error) { if (errorEl) errorEl.textContent = toUserMessage(error, 'Не удалось загрузить файл.'); if (statusEl) statusEl.textContent = ''; @@ -131,28 +167,5 @@ export function openChannelAttachmentManager({ } }); - arweaveButton?.addEventListener('click', async () => { - if (uploading) return; - uploading = true; - root.hidden = true; - try { - const item = await openArweaveAttachmentManager({ - login: cleanLogin, - storagePwd, - gateway, - selectedTxIds, - signal, - }); - if (item) close(resolve, item); - else { - uploading = false; - root.hidden = false; - } - } catch (error) { - uploading = false; - root.hidden = false; - if (errorEl) errorEl.textContent = toUserMessage(error, 'Не удалось открыть Arweave.'); - } - }); }); } diff --git a/shine-UI/js/pages/add-channel-view.js b/shine-UI/js/pages/add-channel-view.js index 4e64e55f..50c5a793 100644 --- a/shine-UI/js/pages/add-channel-view.js +++ b/shine-UI/js/pages/add-channel-view.js @@ -7,9 +7,9 @@ import { } from '../services/channel-name-rules.js'; import { getArweaveAttachmentAvailability, - openArweaveAttachmentManager, markArweaveAttachmentPlaced, } from '../components/arweave-attachment-manager.js'; +import { openChannelAttachmentManager } from '../components/channel-attachment-manager.js'; import { renderAvatar } from '../components/avatar-image.js'; import { makeShineChannelShortRoute } from '../services/shine-routes.js'; @@ -44,6 +44,7 @@ function renderAvatarPreview(slot, avatar, title) { const wrap = renderAvatar({ initials: label.slice(0, 1).toUpperCase() || 'К', avatar, + authorLogin: state.session.login, size: 'xl', className: 'channel-profile-avatar', title: label, @@ -170,17 +171,21 @@ export function render({navigate, chrome}) { const renderAvatarStatus = (nameValue, titleValue) => { renderAvatarPreview(avatarPreviewEl, selectedAvatar, titleValue || nameValue); - avatarRemoveBtn.hidden = !selectedAvatar?.ar; - if (!selectedAvatar?.ar) { + avatarRemoveBtn.hidden = !selectedAvatar?.sha256; + if (!selectedAvatar?.sha256) { avatarStatusEl.innerHTML = '

Аватар канала не установлен.

'; return; } const txId = String(selectedAvatar.ar || '').trim(); + if (!txId) { + avatarStatusEl.innerHTML = '

Аватар канала · сервер доступа

Хранится бесплатно на вашем сервере доступа.

'; + return; + } const shortTxId = shortAvatarBlockchainAddress(txId); const isPending = avatarAvailabilityLabel === 'pending' || avatarAvailabilityTxId !== txId; avatarStatusEl.innerHTML = ` -

Аватар канала

-

Адрес аватара в блокчейне Arweave ${shortTxId}${isPending ? ', ещё не обновился в блокчейне.' : ''}

+

Аватар канала · Arweave

+

Адрес в Arweave ${shortTxId}${isPending ? ', ещё не обновился в сети.' : ''}

`; }; @@ -271,14 +276,13 @@ export function render({navigate, chrome}) { descriptionEl.addEventListener('input', updateValidation); avatarBtn.addEventListener('click', async () => { try { - const nextAvatar = await openArweaveAttachmentManager({ + const nextAvatar = await openChannelAttachmentManager({ login: state.session.login, storagePwd: state.session.storagePwdInMemory, gateway: state.entrySettings.arweaveServer, mode: 'avatar', - historyPurpose: 'avatar', }); - if (nextAvatar?.ar) { + if (nextAvatar?.sha256) { selectedAvatar = nextAvatar; void refreshAvatarAvailability(); } @@ -289,7 +293,7 @@ export function render({navigate, chrome}) { }); avatarRemoveBtn.addEventListener('click', () => { - if (!selectedAvatar?.ar) return; + if (!selectedAvatar?.sha256) return; const confirmed = window.confirm('Убрать аватар и сделать канал без аватара?'); if (!confirmed) return; selectedAvatar = null; diff --git a/shine-UI/js/pages/channel-about-view.js b/shine-UI/js/pages/channel-about-view.js index d177c8cc..7cc74f95 100644 --- a/shine-UI/js/pages/channel-about-view.js +++ b/shine-UI/js/pages/channel-about-view.js @@ -3,6 +3,7 @@ import { createTopBar } from '../components/topbar.js'; import { confirmDialog } from '../components/confirm-dialog.js'; import { renderAvatar } from '../components/avatar-image.js'; import { markArweaveAttachmentPlaced, openArweaveAttachmentManager } from '../components/arweave-attachment-manager.js'; +import { openChannelAttachmentManager } from '../components/channel-attachment-manager.js'; import { authService, setChannelsFeed, state } from '../state.js'; import { navigateBack, getPreviousTrackedPath } from '../router.js'; import { @@ -84,7 +85,7 @@ function formatChannelCreatedAt(value) { function openChannelProfileEditor({ channel, selector, onSaved }) { const root = document.getElementById('modal-root'); if (!root) return; - let selectedAvatar = String(channel?.avaAr || '').trim() ? { + let selectedAvatar = String(channel?.avaSha256 || '').trim() ? { name: 'Аватар', ar: String(channel.avaAr || '').trim(), sha256: String(channel?.avaSha256 || '').trim(), @@ -121,7 +122,8 @@ function openChannelProfileEditor({ channel, selector, onSaved }) { slot.innerHTML = ''; slot.append(renderAvatar({ initials: (title || 'К').slice(0, 1).toUpperCase(), - avatar: selectedAvatar?.ar ? { ar: selectedAvatar.ar } : null, + avatar: selectedAvatar?.sha256 ? { ar: String(selectedAvatar.ar || ''), sha256Hex: selectedAvatar.sha256 } : null, + authorLogin: String(channel?.ownerLogin || state.session.login || '').trim(), size: 'xl', className: 'channel-about-avatar channel-profile-avatar', title: title || 'Канал', @@ -135,12 +137,11 @@ function openChannelProfileEditor({ channel, selector, onSaved }) { root.querySelector('#channel-profile-edit-avatar')?.addEventListener('click', async () => { const errorEl = root.querySelector('#channel-profile-edit-error'); try { - const item = await openArweaveAttachmentManager({ + const item = await openChannelAttachmentManager({ login: state.session.login, storagePwd: state.session.storagePwdInMemory, gateway: state.entrySettings.arweaveServer, mode: 'avatar', - historyPurpose: 'avatar', }); if (!item) return; selectedAvatar = item; @@ -636,7 +637,8 @@ export function render({ navigate, route, chrome }) { const channelAvatar = renderAvatar({ initials: cleanName.slice(0, 1).toUpperCase() || 'К', - avatar: String(channel?.avaAr || '').trim() ? { ar: String(channel.avaAr || '').trim() } : null, + avatar: String(channel?.avaAr || channel?.avaSha256 || '').trim() ? { ar: String(channel.avaAr || '').trim(), sha256Hex: String(channel?.avaSha256 || '').trim() } : null, + authorLogin: ownerLogin, size: 'xl', className: 'channel-about-avatar channel-profile-avatar', title: cleanName, diff --git a/shine-UI/js/pages/channel-thread-view.js b/shine-UI/js/pages/channel-thread-view.js index 5865a535..f18225a1 100644 --- a/shine-UI/js/pages/channel-thread-view.js +++ b/shine-UI/js/pages/channel-thread-view.js @@ -79,9 +79,9 @@ function createThreadAvatar(login) { if (!avatarEl.isConnected) return; const upgraded = renderUserAvatar({ login: cleanLogin, - avatar: snapshot?.avatar?.txId + avatar: snapshot?.avatar?.source ? { - ar: String(snapshot.avatar.txId || '').trim(), + ar: String(snapshot.avatar.txId || snapshot.avatar.ar || '').trim(), sha256Hex: String(snapshot?.avatar?.sha256Hex || '').trim().toLowerCase(), } : null, diff --git a/shine-UI/js/pages/channel-view.js b/shine-UI/js/pages/channel-view.js index 516b5e4a..2b2eb916 100644 --- a/shine-UI/js/pages/channel-view.js +++ b/shine-UI/js/pages/channel-view.js @@ -25,8 +25,10 @@ import { softHaptic, } from '../services/channels-ux.js'; import { renderAvatar, renderUserAvatar } from '../components/avatar-image.js'; +import { avatarReferenceToRenderModel, parseAvatarReference } from '../services/avatar-reference.js'; import { openChannelEditor } from '../components/channel-editor.js'; import { markArweaveAttachmentPlaced, openArweaveAttachmentManager } from '../components/arweave-attachment-manager.js'; +import { openChannelAttachmentManager } from '../components/channel-attachment-manager.js'; import { composeMessageWithAttachments, createAttachmentCarouselElement, @@ -105,9 +107,9 @@ function createMessageAvatar(login) { if (!avatarEl.isConnected) return; const upgraded = renderUserAvatar({ login: cleanLogin, - avatar: snapshot?.avatar?.txId + avatar: snapshot?.avatar?.source ? { - ar: String(snapshot.avatar.txId || '').trim(), + ar: String(snapshot.avatar.txId || snapshot.avatar.ar || '').trim(), sha256Hex: String(snapshot?.avatar?.sha256Hex || '').trim().toLowerCase(), } : null, @@ -619,10 +621,12 @@ function getStatusActionOptionsForTarget(targetMsgSubType) { function createChannelAvatarElement(channel, size = 96) { const txId = String(channel?.avaAr || '').trim(); + const sha256 = String(channel?.avaSha256 || '').trim().toLowerCase(); const title = String(channel?.displayTitle || channel?.name || 'К').trim() || 'К'; const wrap = renderAvatar({ initials: title.slice(0, 1).toUpperCase() || 'К', - avatar: txId ? { ar: txId } : null, + avatar: (txId || sha256) ? { ar: txId, sha256Hex: sha256 } : null, + authorLogin: String(channel?.ownerLogin || '').trim(), size: 'xl', className: 'channel-profile-avatar', title, @@ -639,9 +643,7 @@ function openChannelMetaDetailsModal({ onEdit = null, changedAtMs = 0, } = {}) { - const avatarState = String(channel.avaAr || '').trim() - ? 'Установлен' - : 'Не установлен'; + const avatarState = String(channel.avaAr || channel.avaSha256 || '').trim() ? 'Установлен' : 'Не установлен'; const changedAtLabel = changedAtMs ? new Date(Number(changedAtMs)).toLocaleString('ru-RU') : '–'; @@ -689,9 +691,9 @@ function openAboutChannelModal(channel, options = {}) { function openEditChannelModal({ channel, onSave }) { const root = document.getElementById('modal-root'); - let selectedAvatar = channel?.avaAr ? { + let selectedAvatar = channel?.avaSha256 ? { name: 'Аватар', - ar: channel.avaAr, + ar: String(channel.avaAr || ''), sha256: channel.avaSha256, size: channel.avaSize, purpose: 'avatar', @@ -704,6 +706,8 @@ function openEditChannelModal({ channel, onSave }) { slot.append(createChannelAvatarElement({ ...channel, avaAr: selectedAvatar?.ar || '', + avaSha256: selectedAvatar?.sha256 || '', + avaSize: selectedAvatar?.size || 0, displayTitle: root.querySelector('#edit-channel-title')?.value || channel.displayTitle, }, 86)); }; @@ -734,12 +738,11 @@ function openEditChannelModal({ channel, onSave }) { root.querySelector('#edit-channel-title')?.addEventListener('input', renderAvatarPreview); root.querySelector('#edit-channel-avatar')?.addEventListener('click', async () => { try { - const item = await openArweaveAttachmentManager({ + const item = await openChannelAttachmentManager({ login: state.session.login, storagePwd: state.session.storagePwdInMemory, gateway: state.entrySettings.arweaveServer, mode: 'avatar', - historyPurpose: 'avatar', }); if (!item) return; selectedAvatar = item; @@ -1754,7 +1757,7 @@ function openMessageLikesListModal({ navigate, messageRef, initialTab = 'shining login: String(row?.login || '').trim() || 'unknown', firstName: String(row?.firstName || ''), lastName: String(row?.lastName || ''), - avatar: avatarRaw ? { ar: avatarRaw } : null, + avatar: avatarReferenceToRenderModel(parseAvatarReference(avatarRaw)), size: 'md', })); const firstName = String(row?.firstName || '').trim(); diff --git a/shine-UI/js/pages/channels-list.js b/shine-UI/js/pages/channels-list.js index 7f55736d..5608dc81 100644 --- a/shine-UI/js/pages/channels-list.js +++ b/shine-UI/js/pages/channels-list.js @@ -123,7 +123,8 @@ function avatarLetterFromName(name = '') { function createChannelAvatar(channel = {}) { return renderAvatar({ initials: channel.avatar || channel.initials || avatarLetterFromName(channel.displayTitle || channel.title || channel.name), - avatar: channel.avaAr ? { ar: String(channel.avaAr || '').trim() } : null, + avatar: (channel.avaAr || channel.avaSha256) ? { ar: String(channel.avaAr || '').trim(), sha256Hex: String(channel.avaSha256 || '').trim().toLowerCase() } : null, + authorLogin: String(channel.ownerName || channel.ownerLogin || '').trim(), size: 'lg', className: 'avatar-plain', title: channel.displayTitle || channel.title || channel.name || 'Канал', @@ -751,6 +752,7 @@ function mapApiChannelRow(summary, bucketKey, idx, index, notificationsState) { channelRootBlockHash: normalizeHash(summary?.channel?.channelRoot?.blockHash), avatar: avatarLetterFromName(displayTitle || channelName), avaAr: String(summary?.channel?.avaAr || '').trim(), + avaSha256: String(summary?.channel?.avaSha256 || '').trim().toLowerCase(), title, technicalLabel, channelName, @@ -789,6 +791,7 @@ function mapDeletedOwnedChannels(payload, notificationsState = {}) { channelRootBlockHash: normalizeHash(item?.rootBlockHashHex), avatar: avatarLetterFromName(displayTitle), avaAr: String(item?.avatarAr || '').trim(), + avaSha256: String(item?.avatarSha256 || '').trim().toLowerCase(), title: displayTitle, technicalLabel: `@${ownerLogin}/${channelName}`, channelName, diff --git a/shine-UI/js/pages/chat-view.js b/shine-UI/js/pages/chat-view.js index d7986433..efcf5461 100644 --- a/shine-UI/js/pages/chat-view.js +++ b/shine-UI/js/pages/chat-view.js @@ -128,7 +128,7 @@ function createChatHeaderParts(login, navigate) { login: cleanLogin, firstName, lastName, - avatar: currentPeer?.avatar?.ar + avatar: (currentPeer?.avatar?.ar || currentPeer?.avatar?.sha256Hex) ? { ar: String(currentPeer.avatar.ar || '').trim(), sha256Hex: String(currentPeer.avatar.sha256Hex || '').trim().toLowerCase(), diff --git a/shine-UI/js/pages/contact-search-view.js b/shine-UI/js/pages/contact-search-view.js index f8f5b7a1..6dd129cf 100644 --- a/shine-UI/js/pages/contact-search-view.js +++ b/shine-UI/js/pages/contact-search-view.js @@ -44,9 +44,9 @@ function createSearchAvatar(login) { if (!avatarEl.isConnected) return; const upgraded = renderUserAvatar({ login: cleanLogin, - avatar: snapshot?.avatar?.txId + avatar: snapshot?.avatar?.source ? { - ar: String(snapshot.avatar.txId || '').trim(), + ar: String(snapshot.avatar.txId || snapshot.avatar.ar || '').trim(), sha256Hex: String(snapshot?.avatar?.sha256Hex || '').trim().toLowerCase(), } : null, diff --git a/shine-UI/js/pages/messages-list.js b/shine-UI/js/pages/messages-list.js index cec95d14..7dc4cd68 100644 --- a/shine-UI/js/pages/messages-list.js +++ b/shine-UI/js/pages/messages-list.js @@ -55,19 +55,19 @@ function createDmAvatar(login, { className = '', avatar = null, firstName = '', login: cleanLogin || 'unknown', firstName: String(firstName || '').trim(), lastName: String(lastName || '').trim(), - avatar: avatar?.ar ? { ar: String(avatar.ar || '').trim(), sha256Hex: String(avatar.sha256Hex || '').trim().toLowerCase() } : null, + avatar: (avatar?.ar || avatar?.sha256Hex) ? { ar: String(avatar?.ar || '').trim(), sha256Hex: String(avatar?.sha256Hex || '').trim().toLowerCase() } : null, size: 'lg', title, className, }); - if (!cleanLogin || avatar?.ar) return avatarEl; + if (!cleanLogin || avatar?.ar || avatar?.sha256Hex) return avatarEl; void loadDmAvatarSnapshot(cleanLogin).then((snapshot) => { if (!avatarEl.isConnected) return; const upgraded = renderUserAvatar({ login: cleanLogin, - avatar: snapshot?.avatar?.txId + avatar: snapshot?.avatar?.source ? { - ar: String(snapshot.avatar.txId || '').trim(), + ar: String(snapshot.avatar.txId || snapshot.avatar.ar || '').trim(), sha256Hex: String(snapshot?.avatar?.sha256Hex || '').trim().toLowerCase(), } : null, diff --git a/shine-UI/js/pages/network-view.js b/shine-UI/js/pages/network-view.js index 72c2c889..7f8df194 100644 --- a/shine-UI/js/pages/network-view.js +++ b/shine-UI/js/pages/network-view.js @@ -109,7 +109,8 @@ function getMarkByLogin(allUsers) { function normalizeAvatar(row) { const txFromAvatar = String(row?.avatar?.ar || '').trim(); - if (txFromAvatar) return { ar: txFromAvatar }; + const shaFromAvatar = String(row?.avatar?.sha256Hex || row?.avatar?.sha256 || '').trim().toLowerCase(); + if (txFromAvatar || shaFromAvatar) return { ar: txFromAvatar, sha256Hex: shaFromAvatar }; const txFallback = String(row?.avatarTxId || '').trim(); if (txFallback) return { ar: txFallback }; return null; diff --git a/shine-UI/js/pages/network/force-graph.js b/shine-UI/js/pages/network/force-graph.js index c0427f2b..ec198941 100644 --- a/shine-UI/js/pages/network/force-graph.js +++ b/shine-UI/js/pages/network/force-graph.js @@ -17,6 +17,7 @@ import { renderUserAvatar, buildAvatarInitials } from '../../components/avatar-image.js'; import { state } from '../../state.js'; import { buildArweaveDataUrl } from '../../services/arweave-file-service.js'; +import { resolvePublicFileUrl } from '../../services/public-file-service.js'; const SVGNS = 'http://www.w3.org/2000/svg'; @@ -149,6 +150,25 @@ function resolveAvatarPhotoSrc(src) { } } +async function resolveServerAvatarPhotoSrc(src) { + const rawAvatar = src?.avatar; + if (!rawAvatar || typeof rawAvatar === 'string') return ''; + const txId = String(rawAvatar?.ar || '').trim(); + const sha256 = String(rawAvatar?.sha256Hex || rawAvatar?.sha256 || '').trim().toLowerCase(); + const authorLogin = String(src?.login || src?.id || '').trim(); + if (txId || !sha256 || !authorLogin) return ''; + try { + return await resolvePublicFileUrl({ + sha256, + authorLogin, + solanaEndpoint: state?.entrySettings?.solanaServer, + fallbackServerLogin: state?.entrySettings?.shineServerLogin, + }); + } catch { + return ''; + } +} + // Однократно внедряем скрытый SVG-фильтр свечения «сияющих» узлов (мягкое гауссово размытие). // Применяется к псевдо-ореолу ::before, а НЕ к самой аватарке — поэтому фото не размывается. function ensureShineFilter() { @@ -636,7 +656,28 @@ export function createForceGraph({ stage, model, onCenterTap, onNodeTap, onNodeL const dot = document.createElement('div'); dot.className = 'avatar node-dot fg-orb-host'; // Единый PNG-оверлей на ВСЕХ полных орбах (фокус + спутники). tier-3 точки (dotOnly) сюда не идут. - dot.appendChild(buildPngOrb(photoSrc, { isFocus, initials })); + const orb = buildPngOrb(photoSrc, { isFocus, initials }); + dot.appendChild(orb); + if (!photoSrc && src?.avatar && typeof src.avatar === 'object' && !String(src.avatar.ar || '').trim() && String(src.avatar.sha256Hex || src.avatar.sha256 || '').trim()) { + void resolveServerAvatarPhotoSrc(src).then((url) => { + if (!url || !orb.isConnected) return; + const currentPhoto = orb.querySelector('.fg-pngorb-photo'); + if (!currentPhoto) return; + const img = document.createElement('img'); + img.className = 'fg-pngorb-photo'; + img.alt = ''; + img.loading = 'lazy'; + img.decoding = 'async'; + img.addEventListener('error', () => { + const fallback = document.createElement('div'); + fallback.className = 'fg-pngorb-photo fg-pngorb-init'; + fallback.textContent = String(initials || '').slice(0, 2); + try { img.replaceWith(fallback); } catch { /* node may already be gone */ } + }); + img.src = url; + try { currentPhoto.replaceWith(img); } catch { /* graph node was rebuilt */ } + }); + } el.append(dot); syncOfficialBadge(el, Boolean(src.official)); diff --git a/shine-UI/js/pages/notifications-view.js b/shine-UI/js/pages/notifications-view.js index 681c7e9c..53871a4d 100644 --- a/shine-UI/js/pages/notifications-view.js +++ b/shine-UI/js/pages/notifications-view.js @@ -150,9 +150,9 @@ function renderEmpty(activeTab) { function renderAvatar(item) { const profile = item.profile; - const avatar = profile?.avatar?.txId + const avatar = (profile?.avatar?.txId || profile?.avatar?.sha256Hex) ? { - ar: String(profile.avatar.txId || '').trim(), + ar: String(profile.avatar.txId || profile.avatar.ar || '').trim(), sha256Hex: String(profile.avatar.sha256Hex || '').trim().toLowerCase(), } : null; diff --git a/shine-UI/js/pages/profile-edit-view.js b/shine-UI/js/pages/profile-edit-view.js index 700e05b3..21a8ba2b 100644 --- a/shine-UI/js/pages/profile-edit-view.js +++ b/shine-UI/js/pages/profile-edit-view.js @@ -237,8 +237,8 @@ export function render({ navigate, chrome }) { login, firstName, lastName, - avatar: currentAvatar?.txId - ? { ar: currentAvatar.txId, sha256Hex: String(currentAvatar?.sha256Hex || '').trim().toLowerCase() } + avatar: (currentAvatar?.txId || currentAvatar?.sha256Hex) + ? { ar: String(currentAvatar.txId || currentAvatar.ar || '').trim(), sha256Hex: String(currentAvatar?.sha256Hex || '').trim().toLowerCase() } : null, size: 'xl', className: 'profile-avatar', diff --git a/shine-UI/js/pages/user-profile-list-view.js b/shine-UI/js/pages/user-profile-list-view.js index 88820ba1..6b3a894d 100644 --- a/shine-UI/js/pages/user-profile-list-view.js +++ b/shine-UI/js/pages/user-profile-list-view.js @@ -3,13 +3,12 @@ import { renderUserAvatar } from '../components/avatar-image.js'; import { authService } from '../state.js'; import { navigateBack } from '../router.js'; import { userDisplayName } from '../services/user-display.js'; +import { avatarReferenceToRenderModel, parseAvatarReference } from '../services/avatar-reference.js'; export const pageMeta = { id: 'user-profile-list-view', title: 'Список' }; function parseAvatar(raw) { - const value = String(raw || ''); - const m = value.match(/(?:^|,)\s*AR:([A-Za-z0-9_-]{43})(?:,|$)/); - return m ? { ar: m[1] } : null; + return avatarReferenceToRenderModel(parseAvatarReference(raw)); } const TITLES = { @@ -105,7 +104,7 @@ export function render({ navigate, route, chrome }) { const el = document.createElement('button'); el.type = 'button'; el.className = 'ui-button card row profile-list-row'; - el.append(renderUserAvatar({ login: row.ownerLogin, firstName: row.displayName, lastName: '', avatar: parseAvatar(row.avatarAr), size: 'md' })); + el.append(renderUserAvatar({ login: row.ownerLogin, firstName: row.displayName, lastName: '', avatar: (row.avatarAr || row.avatarSha256) ? { ar: String(row.avatarAr || ''), sha256Hex: String(row.avatarSha256 || '') } : null, size: 'md' })); const t = document.createElement('div'); t.className = 'profile-list-row-text'; t.innerHTML = `${String(row.displayName || row.slug || '')}${row.deleted ? ' · Удалён' : ''}${String(row.ownerLogin || '')} / ${String(row.slug || '')}`; diff --git a/shine-UI/js/services/auth-service.js b/shine-UI/js/services/auth-service.js index 62d39655..8277fe14 100644 --- a/shine-UI/js/services/auth-service.js +++ b/shine-UI/js/services/auth-service.js @@ -726,14 +726,14 @@ function composeChannelMetaText({ title = '', description = '', avatar = null } const cleanDescription = normalizeChannelMetaDescription(description); const rows = []; if (cleanTitle) rows.push(``); - if (avatar?.ar) { + if (avatar?.sha256 || avatar?.sha256Hex) { const size = Number(avatar.size || 0); - const sha256 = String(avatar.sha256 || '').trim().toLowerCase(); + const sha256 = String(avatar.sha256 || avatar.sha256Hex || '').trim().toLowerCase(); const ar = String(avatar.ar || '').trim(); if (!Number.isInteger(size) || size <= 0) throw new Error('Некорректный размер аватара.'); if (!/^[0-9a-f]{64}$/u.test(sha256)) throw new Error('Некорректный SHA-256 аватара.'); - if (!/^[A-Za-z0-9_-]{43}$/u.test(ar)) throw new Error('Некорректный Arweave txId аватара.'); - rows.push(``); + if (ar && !/^[A-Za-z0-9_-]{43}$/u.test(ar)) throw new Error('Некорректный Arweave txId аватара.'); + rows.push(``); } if (cleanDescription) rows.push(cleanDescription); return rows.join('\n'); diff --git a/shine-UI/js/services/avatar-reference.js b/shine-UI/js/services/avatar-reference.js new file mode 100644 index 00000000..f52b5a1f --- /dev/null +++ b/shine-UI/js/services/avatar-reference.js @@ -0,0 +1,86 @@ +import { validateArweaveTxId, validateSha256Hex } from './arweave-file-service.js'; + +const AVATAR_TAG_RE = /^<(?:SHiNE|S):(ava|avatar);([^>]*)>$/u; + +function parseFields(raw = '') { + const out = {}; + String(raw || '').split(';').forEach((part) => { + const eq = part.indexOf('='); + if (eq <= 0) return; + const key = part.slice(0, eq).trim(); + const value = part.slice(eq + 1).trim(); + if (key) out[key] = value; + }); + return out; +} + +export function buildAvatarReference({ size, sha256, sha256Hex, ar = '' } = {}) { + const cleanSha = String(sha256 || sha256Hex || '').trim().toLowerCase(); + const cleanAr = String(ar || '').trim(); + const cleanSize = Number(size || 0); + if (!Number.isInteger(cleanSize) || cleanSize <= 0) throw new Error('Некорректный размер аватара.'); + if (!validateSha256Hex(cleanSha)) throw new Error('Некорректный SHA-256 аватара.'); + if (cleanAr && !validateArweaveTxId(cleanAr)) throw new Error('Некорректный Arweave txId аватара.'); + return ``; +} + +export function parseAvatarReference(value) { + const raw = String(value || '').trim(); + if (!raw) return { ok: false, source: '', ar: '', txId: '', sha256Hex: '', size: 0, legacy: false, value: '' }; + + const tag = raw.match(AVATAR_TAG_RE); + if (tag) { + const fields = parseFields(tag[2]); + const version = String(fields.v || '').trim(); + const sha256Hex = String(fields.sha256 || '').trim().toLowerCase(); + const ar = String(fields.ar || '').trim(); + const size = Number(fields.sz || fields.size || 0); + if (version !== '1' || !validateSha256Hex(sha256Hex) || !Number.isInteger(size) || size <= 0) { + return { ok: false, source: '', ar: '', txId: '', sha256Hex: '', size: 0, legacy: false, value: raw }; + } + if (ar && !validateArweaveTxId(ar)) { + return { ok: false, source: '', ar: '', txId: '', sha256Hex: '', size: 0, legacy: false, value: raw }; + } + return { + ok: true, + source: ar ? 'arweave' : 'server', + ar, + txId: ar, + sha256Hex, + size, + legacy: false, + value: raw, + }; + } + + // Legacy USER_PROFILE ava: SHA256:,AR: or AR:. + const arMatch = raw.match(/AR:([A-Za-z0-9_-]{43})/u); + const shaMatch = raw.match(/SHA256:([A-Fa-f0-9]{64})/u); + const ar = String(arMatch?.[1] || '').trim(); + const sha256Hex = String(shaMatch?.[1] || '').trim().toLowerCase(); + if (validateArweaveTxId(ar)) { + return { + ok: true, + source: 'arweave', + ar, + txId: ar, + sha256Hex: validateSha256Hex(sha256Hex) ? sha256Hex : '', + size: 0, + legacy: true, + value: raw, + }; + } + + return { ok: false, source: '', ar: '', txId: '', sha256Hex: '', size: 0, legacy: false, value: raw }; +} + +export function avatarReferenceToRenderModel(value) { + const parsed = typeof value === 'string' ? parseAvatarReference(value) : value; + if (!parsed?.ok) return null; + return { + ar: String(parsed.ar || parsed.txId || '').trim(), + sha256Hex: String(parsed.sha256Hex || '').trim().toLowerCase(), + size: Number(parsed.size || 0), + source: String(parsed.source || ''), + }; +} diff --git a/shine-UI/js/services/call-ui-service.js b/shine-UI/js/services/call-ui-service.js index fcccc286..69aa94ed 100644 --- a/shine-UI/js/services/call-ui-service.js +++ b/shine-UI/js/services/call-ui-service.js @@ -110,7 +110,7 @@ async function loadAvatarSnapshot(login) { } function renderPeerAvatar(login, avatar = null) { - const hasAvatar = Boolean(String(avatar?.ar || '').trim()); + const hasAvatar = Boolean(String(avatar?.ar || '').trim() || String(avatar?.sha256Hex || '').trim()); const avatarEl = renderUserAvatar({ login: String(login || '').trim() || 'unknown', avatar, @@ -137,9 +137,9 @@ function updatePeerAvatar(login) { if (!cleanLogin) return; void loadAvatarSnapshot(cleanLogin).then((snapshot) => { if (!avatarSlotEl || loadToken !== activeAvatarLoadToken || activeAvatarLogin !== cleanLogin) return; - const avatar = snapshot?.avatar?.txId + const avatar = snapshot?.avatar?.source ? { - ar: String(snapshot.avatar.txId || '').trim(), + ar: String(snapshot.avatar.txId || snapshot.avatar.ar || '').trim(), sha256Hex: String(snapshot.avatar.sha256Hex || '').trim().toLowerCase(), } : null; diff --git a/shine-UI/js/services/user-connections.js b/shine-UI/js/services/user-connections.js index 948d7630..985202f1 100644 --- a/shine-UI/js/services/user-connections.js +++ b/shine-UI/js/services/user-connections.js @@ -272,9 +272,9 @@ export async function loadUserProfileCard(login) { shineReceivedCount: Number(user.shineConfirmationsReceivedCount || 0), shineGivenCount: Number(user.shineConfirmationsGivenCount || 0), }, - avatar: snapshot?.avatar?.txId + avatar: snapshot?.avatar?.source ? { - ar: String(snapshot.avatar.txId).trim(), + ar: String(snapshot.avatar.txId || snapshot.avatar.ar || '').trim(), sha256Hex: String(snapshot?.avatar?.sha256Hex || '').trim().toLowerCase(), } : null, diff --git a/shine-UI/js/services/user-profile-params.js b/shine-UI/js/services/user-profile-params.js index e467ae0b..b8882534 100644 --- a/shine-UI/js/services/user-profile-params.js +++ b/shine-UI/js/services/user-profile-params.js @@ -1,10 +1,6 @@ import { authService, state } from '../state.js'; -import { - buildArweaveAvatarValue, - parseArweaveAvatarValue, - validateArweaveTxId, - validateSha256Hex, -} from './arweave-file-service.js'; +import { validateArweaveTxId, validateSha256Hex } from './arweave-file-service.js'; +import { buildAvatarReference, parseAvatarReference } from './avatar-reference.js'; export const profileFieldDefs = [ { key: 'first_name', readKeys: ['first_name'], label: 'Имя', placeholder: 'Введите имя' }, @@ -138,20 +134,24 @@ export async function loadProfileSnapshot(login) { const latestGender = loadLatestByAliasesFromItems(items, ['gender']); const gender = normalizeGenderValue(latestGender?.value || PROFILE_GENDER_UNKNOWN); const latestAvatar = loadLatestByAliasesFromItems(items, ['ava']); - const parsedAvatar = parseArweaveAvatarValue(latestAvatar?.value || ''); + const parsedAvatar = parseAvatarReference(latestAvatar?.value || ''); const avatar = parsedAvatar.ok ? { - value: buildArweaveAvatarValue(parsedAvatar.txId, parsedAvatar.sha256Hex), - source: 'arweave', - txId: parsedAvatar.txId, + value: parsedAvatar.value, + source: parsedAvatar.source, + txId: parsedAvatar.txId || '', + ar: parsedAvatar.ar || '', sha256Hex: parsedAvatar.sha256Hex || '', + size: Number(parsedAvatar.size || 0), timeMs: latestAvatar?.timeMs || 0, } : { value: '', source: '', txId: '', + ar: '', sha256Hex: '', + size: 0, timeMs: latestAvatar?.timeMs || 0, }; @@ -209,14 +209,16 @@ export async function saveProfileGender(login, gender) { }); } -export async function saveProfileAvatarArweave(login, txId, sha256Hex) { - const cleanTxId = String(txId || '').trim(); - const cleanSha = String(sha256Hex || '').trim().toLowerCase(); - if (!validateArweaveTxId(cleanTxId)) { - throw new Error('Некорректный Transaction ID Arweave'); - } - if (!validateSha256Hex(cleanSha)) { - throw new Error('Некорректный SHA256 хэш аватара'); - } - await saveProfileParamBlock(login, 'ava', buildArweaveAvatarValue(cleanTxId, cleanSha)); +export async function saveProfileAvatar(login, avatar) { + const cleanAr = String(avatar?.ar || '').trim(); + const cleanSha = String(avatar?.sha256 || avatar?.sha256Hex || '').trim().toLowerCase(); + const size = Number(avatar?.size || 0); + if (cleanAr && !validateArweaveTxId(cleanAr)) throw new Error('Некорректный Transaction ID Arweave'); + if (!validateSha256Hex(cleanSha)) throw new Error('Некорректный SHA256 хэш аватара'); + await saveProfileParamBlock(login, 'ava', buildAvatarReference({ ar: cleanAr, sha256: cleanSha, size })); +} + +// Legacy export for old callers. New UI writes only . +export async function saveProfileAvatarArweave(login, txId, sha256Hex, size = 1) { + return saveProfileAvatar(login, { ar: txId, sha256: sha256Hex, size }); } diff --git a/shine-UI/styles/components/attachments.css b/shine-UI/styles/components/attachments.css index a9d4f63e..0554b71d 100644 --- a/shine-UI/styles/components/attachments.css +++ b/shine-UI/styles/components/attachments.css @@ -623,3 +623,26 @@ .public-attachment-manager__card { width: 100%; max-height: calc(100dvh - 20px); } .public-attachment-manager__sources { grid-template-columns: 1fr; } } + +/* Unified storage picker / balance dialogs */ +.public-attachment-manager__file-picker { width: 100%; box-sizing: border-box; } +.public-attachment-manager__file-picker .ar-attachment-file-name { flex: 1; text-align: center; } +.ar-balance-modal { z-index: 1400; } +.ar-balance-modal__card { width: min(92vw, 32rem); } +.ar-balance-grid { display: grid; gap: 8px; } +.ar-balance-grid > div { display: flex; justify-content: space-between; gap: 16px; padding: 10px 12px; border: 1px solid var(--border-subtle); border-radius: 10px; } +.ar-balance-grid span { color: var(--text-secondary); } +.ar-wallet-address { padding: 12px; border: 1px solid var(--border-control); border-radius: 10px; background: var(--quote-bg); overflow-wrap: anywhere; user-select: all; } +.ar-attachment-manager-card .form-actions-grid { grid-template-columns: repeat(2, minmax(0, 1fr)); } + +/* Arweave manager embedded inside the unified server / Arweave picker. */ +.ar-attachment-manager-embedded-root { min-width: 0; } +.ar-attachment-manager-card--embedded { + width: 100%; + max-width: none; + margin: 0; + padding: 0; + border: 0; + background: transparent; + box-shadow: none; +}