Обновить обработку аватаров и вложений

This commit is contained in:
AidarKC
2026-10-07 14:05:01 +03:00
parent 7b8e178723
commit d8f42c769c
35 changed files with 628 additions and 222 deletions
@@ -1,6 +1,7 @@
#include <Arduino.h> #include <Arduino.h>
#include <Wire.h> #include <Wire.h>
#include <math.h> #include <math.h>
#include <Preferences.h>
#include <Arduino_GFX_Library.h> #include <Arduino_GFX_Library.h>
#include <TouchDrvCSTXXX.hpp> #include <TouchDrvCSTXXX.hpp>
#include "ESP_I2S.h" #include "ESP_I2S.h"
@@ -54,6 +55,7 @@ Arduino_CO5300 *gfx = new Arduino_CO5300(
TouchDrvCST92xx gTouch; TouchDrvCST92xx gTouch;
I2SClass gI2s; I2SClass gI2s;
Preferences gPrefs;
struct Rect { struct Rect {
int16_t x; 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 kTickSlider = {42, 246, 396, 44};
static const Rect kAlertSlider = {42, 360, 396, 44}; static const Rect kAlertSlider = {42, 360, 396, 44};
static const uint16_t kLimitsSec[] = {5, 7, 10, 15, 20}; 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 gStarted = false;
static bool gSettingsOpen = false; static bool gSettingsOpen = false;
@@ -96,6 +100,8 @@ static uint8_t gLimitIndex = 2;
static uint8_t gTickVolume = 3; static uint8_t gTickVolume = 3;
static uint8_t gAlertVolume = 10; static uint8_t gAlertVolume = 10;
static uint8_t gShortStreak = 0; 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) { static void drawPanel(int x, int y, int w, int h, uint16_t fill, uint16_t border, int radius = 10) {
gfx->fillRoundRect(x, y, w, h, radius, fill); gfx->fillRoundRect(x, y, w, h, radius, fill);
@@ -152,6 +158,33 @@ static uint32_t averageCycleMs() {
return sum / gCycleCount; 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() { static bool isAutoPaused() {
return gStarted && gLastCycleStartMs != 0 && (millis() - gLastCycleStartMs) > kPauseAfterMs; 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() { static void playCycleTick() {
playBeep(880, 480, (int16_t)(gTickVolume * 800)); playBeep(880, 480, kTickAmpByVolume[gTickVolume]);
} }
static void playAlertBeep() { static void playAlertBeep() {
playBeep(1200, 1600, (int16_t)(gAlertVolume * 1200)); playBeep(1200, 1600, kAlertAmpByVolume[gAlertVolume]);
} }
static void alertIfNeeded() { static void alertIfNeeded() {
@@ -299,6 +332,7 @@ static void drawMonitorStatic() {
gStaticDrawn = true; gStaticDrawn = true;
gLastDrawnClosed = !gStableClosed; gLastDrawnClosed = !gStableClosed;
gLastDrawnPaused = !isAutoPaused(); gLastDrawnPaused = !isAutoPaused();
resetCachedUiText();
} }
static void updateMonitorValues(bool force) { static void updateMonitorValues(bool force) {
@@ -327,9 +361,13 @@ static void updateMonitorValues(bool force) {
gLastDrawnPaused = paused; gLastDrawnPaused = paused;
} }
clearArea(28, 58, 424, 28, C_PANEL);
snprintf(line, sizeof(line), "Limit: %us top button: settings", kLimitsSec[gLimitIndex]); snprintf(line, sizeof(line), "Limit: %us top button: settings", kLimitsSec[gLimitIndex]);
if (strcmp(line, gLastTopLine) != 0) {
clearArea(28, 58, 424, 28, C_PANEL);
drawText(28, 60, line, C_MUTE, 2); 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); clearArea(42, 254, 160, 28, C_CARD);
formatSec(value, sizeof(value), currentMs); formatSec(value, sizeof(value), currentMs);
@@ -351,9 +389,13 @@ static void updateMonitorValues(bool force) {
snprintf(value, sizeof(value), "%us", kLimitsSec[gLimitIndex]); snprintf(value, sizeof(value), "%us", kLimitsSec[gLimitIndex]);
drawText(266, 342, value, C_TEXT, 2); drawText(266, 342, value, C_TEXT, 2);
clearArea(28, 398, 280, 28, C_PANEL);
snprintf(line, sizeof(line), "Short avg streak: %u", gShortStreak); snprintf(line, sizeof(line), "Short avg streak: %u", gShortStreak);
if (strcmp(line, gLastStreakLine) != 0) {
clearArea(28, 398, 280, 28, C_PANEL);
drawText(32, 402, line, gShortStreak > 0 ? C_BAD : C_MUTE, 2); 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() { static void redrawScreen() {
@@ -398,6 +440,7 @@ static void toggleSettings() {
gSettingsOpen = !gSettingsOpen; gSettingsOpen = !gSettingsOpen;
gNeedStaticRedraw = true; gNeedStaticRedraw = true;
gNeedRedraw = true; gNeedRedraw = true;
resetCachedUiText();
} }
static void handleStableContact(bool closed) { 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) { static void handleSettingsTouch(int16_t x, int16_t y) {
if (contains(kLimitSlider, x, 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)) { } 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(); playCycleTick();
} else if (contains(kAlertSlider, x, y)) { } 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(); playAlertBeep();
} else { } else {
return; return;
} }
saveSettings();
gNeedRedraw = true; gNeedRedraw = true;
} }
@@ -510,6 +566,7 @@ void setup() {
Serial.begin(115200); Serial.begin(115200);
Wire.begin(PIN_I2C_SDA, PIN_I2C_SCL); Wire.begin(PIN_I2C_SDA, PIN_I2C_SCL);
pinMode(PIN_USER_BTN, INPUT_PULLUP); pinMode(PIN_USER_BTN, INPUT_PULLUP);
loadSettings();
initAudio(); initAudio();
gfx->begin(); gfx->begin();
@@ -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 - 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 - 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 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 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 - 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 - 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 - 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
@@ -116,7 +116,7 @@ public final class UserProfileStateDAO {
String sql; String sql;
if ("owned".equals(mode)) { if ("owned".equals(mode)) {
sql=""" 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.channel_root_block_number, encode(cn.channel_root_block_hash,'hex') root_hash,
cn.is_deleted, cn.deleted_at_ms, cn.deleted_block_number cn.is_deleted, cn.deleted_at_ms, cn.deleted_block_number
FROM channel_names_state cn FROM channel_names_state cn
@@ -125,7 +125,7 @@ public final class UserProfileStateDAO {
"""; """;
} else if ("following".equals(mode)) { } else if ("following".equals(mode)) {
sql=""" 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.channel_root_block_number, encode(cn.channel_root_block_hash,'hex') root_hash,
cn.is_deleted, cn.deleted_at_ms, cn.deleted_block_number cn.is_deleted, cn.deleted_at_ms, cn.deleted_block_number
FROM connections_state cs 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); ps.setString(1,login); ps.setBoolean(2,includeDeleted); ps.setInt(3,safeLimit); ps.setInt(4,safeOffset);
try(ResultSet rs=ps.executeQuery()){ try(ResultSet rs=ps.executeQuery()){
while(rs.next()) out.add(new ChannelCard( 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.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") 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"));} 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 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 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){}
} }
@@ -72,7 +72,7 @@ public final class ChannelMetaTextParser {
String ar = String.valueOf(fields.getOrDefault("ar", "")).trim(); String ar = String.valueOf(fields.getOrDefault("ar", "")).trim();
String sha256 = String.valueOf(fields.getOrDefault("sha256", "")).trim().toLowerCase(); String sha256 = String.valueOf(fields.getOrDefault("sha256", "")).trim().toLowerCase();
String sizeRaw = String.valueOf(fields.containsKey("sz") ? fields.get("sz") : fields.getOrDefault("size", "")).trim(); 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"); if (!sha256.matches("^[0-9a-f]{64}$")) throw new IllegalArgumentException("bad_channel_meta_avatar_sha256");
long size; long size;
try { try {
@@ -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.JsonMessageHandler;
import server.logic.ws_protocol.JSON.handlers.connections.entyties.Net_GetUserConnectionsGraph_Request; 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.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.JSON.utils.NetExceptionResponseFactory;
import server.logic.ws_protocol.WireCodes; import server.logic.ws_protocol.WireCodes;
import shine.db.MsgSubType; 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.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.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.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; return out;
@@ -291,11 +292,12 @@ public class Net_GetUserConnectionsGraph_Handler implements JsonMessageHandler {
return txId; return txId;
} }
private Net_GetUserConnectionsGraph_Response.AvatarItem makeAvatarItem(String avatarAr) { private Net_GetUserConnectionsGraph_Response.AvatarItem makeAvatarItem(String avatarValue) {
String txId = String.valueOf(avatarAr == null ? "" : avatarAr).trim(); AvatarValueParser.Parsed parsed = AvatarValueParser.parse(avatarValue);
if (txId.isEmpty()) return null; if (!parsed.ok()) return null;
Net_GetUserConnectionsGraph_Response.AvatarItem avatar = new Net_GetUserConnectionsGraph_Response.AvatarItem(); Net_GetUserConnectionsGraph_Response.AvatarItem avatar = new Net_GetUserConnectionsGraph_Response.AvatarItem();
avatar.setAr(txId); avatar.setAr(parsed.ar());
avatar.setSha256Hex(parsed.sha256Hex());
return avatar; return avatar;
} }
@@ -315,7 +317,7 @@ public class Net_GetUserConnectionsGraph_Handler implements JsonMessageHandler {
it.setLogin(clean); it.setLogin(clean);
it.setGender(gender); it.setGender(gender);
it.setGenderLabel(genderLabel(gender)); it.setGenderLabel(genderLabel(gender));
it.setAvatar(makeAvatarItem(meta == null ? null : meta.avatarAr)); it.setAvatar(makeAvatarItem(meta == null ? null : meta.avatarValue));
items.add(it); items.add(it);
} }
return items; return items;
@@ -354,7 +356,7 @@ public class Net_GetUserConnectionsGraph_Handler implements JsonMessageHandler {
it.setShine(shine); it.setShine(shine);
it.setOfficialLabel(official ? "официальный" : "неофициальный"); it.setOfficialLabel(official ? "официальный" : "неофициальный");
it.setShineLabel(shine ? "сияющий" : "несияющий"); it.setShineLabel(shine ? "сияющий" : "несияющий");
it.setAvatar(makeAvatarItem(meta == null ? null : meta.avatarAr)); it.setAvatar(makeAvatarItem(meta == null ? null : meta.avatarValue));
items.add(it); items.add(it);
} }
return items; return items;
@@ -370,6 +372,6 @@ public class Net_GetUserConnectionsGraph_Handler implements JsonMessageHandler {
private int shineConfirmationsCount = 0; private int shineConfirmationsCount = 0;
private boolean official = false; private boolean official = false;
private boolean shine = false; private boolean shine = false;
private String avatarAr = null; private String avatarValue = "";
} }
} }
@@ -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.JsonMessageHandler;
import server.logic.ws_protocol.JSON.handlers.connections.entyties.Net_ListContacts_Request; 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.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.JSON.utils.NetExceptionResponseFactory;
import server.logic.ws_protocol.WireCodes; import server.logic.ws_protocol.WireCodes;
import shine.db.dao.DmDialogStateDAO; 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) { private static Net_ListContacts_Response.Avatar parseAvatar(String value) {
Net_ListContacts_Response.Avatar out = new Net_ListContacts_Response.Avatar(); Net_ListContacts_Response.Avatar out = new Net_ListContacts_Response.Avatar();
String raw = value == null ? "" : value.trim(); AvatarValueParser.Parsed parsed = AvatarValueParser.parse(value);
java.util.regex.Matcher ar = java.util.regex.Pattern.compile("AR:([A-Za-z0-9_-]{43})").matcher(raw); if (!parsed.ok()) return out;
if (ar.find()) out.setAr(ar.group(1)); out.setAr(parsed.ar());
java.util.regex.Matcher sha = java.util.regex.Pattern.compile("SHA256:([A-Fa-f0-9]{64})").matcher(raw); out.setSha256Hex(parsed.sha256Hex());
if (sha.find()) out.setSha256Hex(sha.group(1).toLowerCase());
return out; return out;
} }
} }
@@ -39,9 +39,12 @@ public class Net_GetUserConnectionsGraph_Response extends Net_Response {
public static class AvatarItem { public static class AvatarItem {
private String ar; private String ar;
private String sha256Hex;
public String getAr() { return ar; } public String getAr() { return ar; }
public void setAr(String ar) { this.ar = 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 { public static class RelativeItem {
@@ -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<String, String> fields = fields(tag.group(1));
if (!"1".equals(fields.get("v"))) return new Parsed("", "", 0L, false);
String ar = String.valueOf(fields.getOrDefault("ar", "")).trim();
String sha = String.valueOf(fields.getOrDefault("sha256", "")).trim().toLowerCase();
String sizeRaw = String.valueOf(fields.containsKey("sz") ? fields.get("sz") : fields.getOrDefault("size", "")).trim();
if (!ar.isEmpty() && !AR.matcher(ar).matches()) return new Parsed("", "", 0L, false);
if (!SHA.matcher(sha).matches()) return new Parsed("", "", 0L, false);
long size;
try { size = Long.parseLong(sizeRaw); } catch (Exception e) { return new Parsed("", "", 0L, false); }
if (size <= 0L) return new Parsed("", "", 0L, false);
return new Parsed(ar, sha, size, true);
}
Matcher arMatcher = LEGACY_AR.matcher(raw);
Matcher shaMatcher = LEGACY_SHA.matcher(raw);
String ar = arMatcher.find() ? arMatcher.group(1) : "";
String sha = shaMatcher.find() ? shaMatcher.group(1).toLowerCase() : "";
if (!AR.matcher(ar).matches()) return new Parsed("", "", 0L, false);
return new Parsed(ar, SHA.matcher(sha).matches() ? sha : "", 0L, true);
}
private static Map<String, String> fields(String raw) {
Map<String, String> 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) {}
}
@@ -1,3 +1,3 @@
package server.logic.ws_protocol.JSON.handlers.profile; 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.*; import server.logic.ws_protocol.JSON.*;import server.logic.ws_protocol.JSON.entyties.*;import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler;import server.logic.ws_protocol.JSON.handlers.profile.entyties.*;import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory;import server.logic.ws_protocol.WireCodes;import shine.db.dao.UserProfileStateDAO;import java.sql.*;import java.util.*;
public class Net_ListUserProfileChannels_Handler implements JsonMessageHandler {public Net_Response handle(Net_Request base,ConnectionContext ctx)throws Exception{var req=(Net_ListUserProfileChannels_Request)base;if(req.getLogin()==null||req.getLogin().isBlank())return NetExceptionResponseFactory.error(req,400,"BAD_FIELDS","login required");try(Connection c=shine.db.DbController.getInstance().getConnection()){var rows=UserProfileStateDAO.getInstance().listPublicChannels(c,req.getLogin(),req.getMode(),Boolean.TRUE.equals(req.getIncludeDeleted()),req.getLimit()==null?100:req.getLimit(),req.getOffset()==null?0:req.getOffset());var resp=new Net_ListUserProfileChannels_Response();resp.setOp(req.getOp());resp.setRequestId(req.getRequestId());resp.setStatus(WireCodes.Status.OK);resp.setLogin(req.getLogin());resp.setMode(req.getMode());List<Net_ListUserProfileChannels_Response.ChannelItem> items=new ArrayList<>();for(var r:rows){var i=new Net_ListUserProfileChannels_Response.ChannelItem();i.setOwnerLogin(r.ownerLogin());i.setSlug(r.slug());i.setDisplayName(r.displayName());i.setAvatarAr(r.avatarAr());i.setOwnerBlockchainName(r.ownerBlockchainName());i.setRootBlockNumber(r.rootBlockNumber());i.setRootBlockHashHex(r.rootBlockHashHex());i.setDeleted(r.deleted());i.setDeletedAtMs(r.deletedAtMs());i.setDeletedBlockNumber(r.deletedBlockNumber());items.add(i);}resp.setChannels(items);return resp;}}} public class Net_ListUserProfileChannels_Handler implements JsonMessageHandler {public Net_Response handle(Net_Request base,ConnectionContext ctx)throws Exception{var req=(Net_ListUserProfileChannels_Request)base;if(req.getLogin()==null||req.getLogin().isBlank())return NetExceptionResponseFactory.error(req,400,"BAD_FIELDS","login required");try(Connection c=shine.db.DbController.getInstance().getConnection()){var rows=UserProfileStateDAO.getInstance().listPublicChannels(c,req.getLogin(),req.getMode(),Boolean.TRUE.equals(req.getIncludeDeleted()),req.getLimit()==null?100:req.getLimit(),req.getOffset()==null?0:req.getOffset());var resp=new Net_ListUserProfileChannels_Response();resp.setOp(req.getOp());resp.setRequestId(req.getRequestId());resp.setStatus(WireCodes.Status.OK);resp.setLogin(req.getLogin());resp.setMode(req.getMode());List<Net_ListUserProfileChannels_Response.ChannelItem> items=new ArrayList<>();for(var r:rows){var i=new Net_ListUserProfileChannels_Response.ChannelItem();i.setOwnerLogin(r.ownerLogin());i.setSlug(r.slug());i.setDisplayName(r.displayName());i.setAvatarAr(r.avatarAr());i.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;}}}
@@ -1,3 +1,3 @@
package server.logic.ws_protocol.JSON.handlers.profile.entyties; package server.logic.ws_protocol.JSON.handlers.profile.entyties;
import server.logic.ws_protocol.JSON.entyties.Net_Response;import java.util.*; import server.logic.ws_protocol.JSON.entyties.Net_Response;import java.util.*;
public class Net_ListUserProfileChannels_Response extends Net_Response {private String login,mode;private List<ChannelItem> channels=new ArrayList<>();public String getLogin(){return login;}public void setLogin(String v){login=v;}public String getMode(){return mode;}public void setMode(String v){mode=v;}public List<ChannelItem> getChannels(){return channels;}public void setChannels(List<ChannelItem> v){channels=v;}public static class ChannelItem{private String ownerLogin,slug,displayName,avatarAr,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<ChannelItem> channels=new ArrayList<>();public String getLogin(){return login;}public void setLogin(String v){login=v;}public String getMode(){return mode;}public void setMode(String v){mode=v;}public List<ChannelItem> getChannels(){return channels;}public void setChannels(List<ChannelItem> v){channels=v;}public static class ChannelItem{private String ownerLogin,slug,displayName,avatarAr,avatarSha256,ownerBlockchainName,rootBlockHashHex;private int rootBlockNumber;private boolean deleted;private long deletedAtMs;private Integer deletedBlockNumber;public String getOwnerLogin(){return ownerLogin;}public void setOwnerLogin(String v){ownerLogin=v;}public String getSlug(){return slug;}public void setSlug(String v){slug=v;}public String getDisplayName(){return displayName;}public void setDisplayName(String v){displayName=v;}public String getAvatarAr(){return avatarAr;}public void setAvatarAr(String v){avatarAr=v;}public String getAvatarSha256(){return avatarSha256;}public void setAvatarSha256(String v){avatarSha256=v;}public String getOwnerBlockchainName(){return ownerBlockchainName;}public void setOwnerBlockchainName(String v){ownerBlockchainName=v;}public int getRootBlockNumber(){return rootBlockNumber;}public void setRootBlockNumber(int v){rootBlockNumber=v;}public String getRootBlockHashHex(){return rootBlockHashHex;}public void setRootBlockHashHex(String v){rootBlockHashHex=v;}public boolean isDeleted(){return deleted;}public void setDeleted(boolean v){deleted=v;}public long getDeletedAtMs(){return deletedAtMs;}public void setDeletedAtMs(long v){deletedAtMs=v;}public Integer getDeletedBlockNumber(){return deletedBlockNumber;}public void setDeletedBlockNumber(Integer v){deletedBlockNumber=v;}}}
@@ -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_Request;
import server.logic.ws_protocol.JSON.entyties.Net_Response; import server.logic.ws_protocol.JSON.entyties.Net_Response;
import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler; 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_Request;
import server.logic.ws_protocol.JSON.messages.entyties.Net_GetDirectMessages_Response; import server.logic.ws_protocol.JSON.messages.entyties.Net_GetDirectMessages_Response;
import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory; 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) { private static Net_GetDirectMessages_Response.Avatar parseAvatar(String value) {
Net_GetDirectMessages_Response.Avatar out = new Net_GetDirectMessages_Response.Avatar(); Net_GetDirectMessages_Response.Avatar out = new Net_GetDirectMessages_Response.Avatar();
String raw = value == null ? "" : value.trim(); AvatarValueParser.Parsed parsed = AvatarValueParser.parse(value);
if (!parsed.ok()) return out;
// Do not call Matcher.find() twice on the same matcher: the first successful out.setAr(parsed.ar());
// call advances it and the second one can make a perfectly valid avatar vanish. out.setSha256Hex(parsed.sha256Hex());
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());
}
return out; return out;
} }
} }
+2 -2
View File
@@ -1,2 +1,2 @@
client.version=1.14.13 client.version=1.14.14
server.version=1.12.12 server.version=1.12.13
@@ -168,7 +168,7 @@ function writeLastWalletId(login, walletId) {
} }
} }
async function resizeImageFileToAvatar(file) { export async function prepareAvatarImageFile(file) {
const source = file instanceof File ? file : null; const source = file instanceof File ? file : null;
if (!source) throw new Error('Выберите изображение.'); if (!source) throw new Error('Выберите изображение.');
const dataUrl = await new Promise((resolve, reject) => { const dataUrl = await new Promise((resolve, reject) => {
@@ -218,19 +218,27 @@ export function openArweaveAttachmentManager({
initialSha256 = '', initialSha256 = '',
initialName = '', initialName = '',
fixedFile = false, fixedFile = false,
autoOpenFileDialog = true, autoOpenFileDialog = false,
shineType = '', shineType = '',
extraUploadTags = [], extraUploadTags = [],
signal = null, signal = null,
hostElement = null,
embedded = false,
} = {}) { } = {}) {
const cleanLogin = String(login || '').trim(); const cleanLogin = String(login || '').trim();
const cleanStoragePwd = String(storagePwd || '').trim(); const cleanStoragePwd = String(storagePwd || '').trim();
const cleanGateway = String(gateway || 'https://arweave.net').trim(); const cleanGateway = String(gateway || 'https://arweave.net').trim();
if (!cleanLogin || !cleanStoragePwd) return Promise.reject(new Error('Нет активной сессии.')); if (!cleanLogin || !cleanStoragePwd) return Promise.reject(new Error('Нет активной сессии.'));
const root = document.createElement('div'); 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'; root.className = 'ar-attachment-manager-root';
document.body.append(root); document.body.append(root);
} else {
root.classList.add('ar-attachment-manager-embedded-root');
}
let closed = false; let closed = false;
let wallets = []; let wallets = [];
@@ -272,7 +280,8 @@ export function openArweaveAttachmentManager({
function close(resolve, result = null) { function close(resolve, result = null) {
if (closed) return; if (closed) return;
closed = true; closed = true;
root.remove(); if (embeddedHost) root.replaceChildren();
else root.remove();
resolve(result); resolve(result);
} }
@@ -295,7 +304,12 @@ export function openArweaveAttachmentManager({
const onAbort = () => close(resolve, null); const onAbort = () => close(resolve, null);
if (signal?.aborted) { onAbort(); return; } if (signal?.aborted) { onAbort(); return; }
signal?.addEventListener('abort', onAbort, { once: true }); signal?.addEventListener('abort', onAbort, { once: true });
const shellOpen = (extraClass = '') => isEmbedded
? `<div class="stack ar-attachment-manager-card ar-attachment-manager-card--embedded ${extraClass}">`
: `<div class="modal" data-ar-attach-modal="true"><div class="modal-card stack ar-attachment-manager-card ${extraClass}">`;
const shellClose = () => isEmbedded ? '</div>' : '</div></div>';
const bindBackdrop = () => { const bindBackdrop = () => {
if (isEmbedded) return;
const modal = root.querySelector('[data-ar-attach-modal="true"]'); const modal = root.querySelector('[data-ar-attach-modal="true"]');
modal?.addEventListener('click', (event) => { modal?.addEventListener('click', (event) => {
if (event.target === modal) close(resolve, null); if (event.target === modal) close(resolve, null);
@@ -303,7 +317,7 @@ export function openArweaveAttachmentManager({
}; };
const renderWalletOptions = () => wallets.map((wallet) => ( const renderWalletOptions = () => wallets.map((wallet) => (
`<option value="${escapeHtml(wallet.id)}">${escapeHtml(wallet.label)} · ${escapeHtml(shortAddress(wallet.address))}</option>` `<option value="${escapeHtml(wallet.id)}">${escapeHtml(wallet.isDefault ? 'Кошелёк из вашего логина и пароля' : wallet.label)} · ${escapeHtml(shortAddress(wallet.address))}</option>`
)).join(''); )).join('');
const loadWallets = async (errorEl = null) => { const loadWallets = async (errorEl = null) => {
@@ -376,21 +390,95 @@ export function openArweaveAttachmentManager({
}; };
const promptTurboTopUp = async (mainMetaEl, errorEl) => { const promptTurboTopUp = async (mainMetaEl, errorEl) => {
const value = window.prompt('Сколько SOL перевести в Turbo?', '0.01'); await refreshTurboBalance(mainMetaEl, errorEl);
if (value == null) return; const previous = document.getElementById('turbo-topup-modal');
setText(errorEl, 'Пополняем Turbo...'); 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 = `
<div class="modal-card stack ar-balance-modal__card" role="dialog" aria-modal="true">
<h3 class="modal-title">Пополнить Turbo</h3>
<p class="ar-attachment-note">Переведите SOL с вашего кошелька SHiNE на баланс Turbo.</p>
<div class="ar-balance-grid">
<div><span>Кошелёк Solana</span><strong>${escapeHtml(shortAddress(address || '–'))}</strong></div>
<div><span>Баланс Solana</span><strong>${escapeHtml(sol)} SOL</strong></div>
<div><span>Баланс Turbo</span><strong>${escapeHtml(credits)}</strong></div>
</div>
<label class="form-field"><span>Сумма перевода, SOL</span><input class="input" data-role="amount" inputmode="decimal" value="0.01" /></label>
<p class="inline-error" data-role="topup-error"></p>
<div class="form-actions-grid">
<button class="secondary-btn" type="button" data-action="cancel">Отмена</button>
<button class="primary-btn" type="button" data-action="confirm">Перевести в Turbo</button>
</div>
</div>`;
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 { try {
const result = await topUpTurboWithSolana({ const result = await topUpTurboWithSolana({
login: cleanLogin, login: cleanLogin,
storagePwd: cleanStoragePwd, storagePwd: cleanStoragePwd,
keySource: selectedTurboKeySource, keySource: selectedTurboKeySource,
amountSol: value, amountSol: amount,
}); });
await refreshTurboBalance(mainMetaEl, errorEl); await refreshTurboBalance(mainMetaEl, errorEl);
setText(errorEl, `Turbo пополнен. Tx: ${result.txId || 'отправлено'}`); setText(errorEl, `Turbo пополнен. Tx: ${result.txId || 'отправлено'}`);
finish();
} catch (error) { } catch (error) {
setText(errorEl, error?.message || 'Не удалось пополнить Turbo.'); setText(localError, error?.message || 'Не удалось пополнить Turbo.');
if (btn) btn.disabled = false;
} }
});
});
};
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 = `
<div class="modal-card stack ar-balance-modal__card" role="dialog" aria-modal="true">
<h3 class="modal-title">Пополнить Arweave</h3>
<p class="ar-attachment-note">Переведите AR на этот адрес из другого Arweave-кошелька или сервиса.</p>
<div class="ar-wallet-address" data-role="address">${escapeHtml(wallet.address)}</div>
<div class="ar-balance-grid"><div><span>Текущий баланс</span><strong>${escapeHtml(Number(balanceInfo?.ar || 0).toLocaleString('ru-RU', { maximumFractionDigits: 6 }))} AR</strong></div></div>
<div class="form-actions-grid">
<button class="secondary-btn" type="button" data-action="copy">Скопировать адрес</button>
<button class="primary-btn" type="button" data-action="close">Готово</button>
</div>
</div>`;
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) => { const renderArweaveMeta = (mainMetaEl) => {
@@ -478,31 +566,26 @@ export function openArweaveAttachmentManager({
const uploadText = effectiveUploadButtonLabel || (historyOnly ? 'Загрузить в журнал' : 'Загрузить'); const uploadText = effectiveUploadButtonLabel || (historyOnly ? 'Загрузить в журнал' : 'Загрузить');
const canShowHistory = allowHistorySelection; const canShowHistory = allowHistorySelection;
const canShowExisting = allowExistingTxInput; const canShowExisting = allowExistingTxInput;
root.innerHTML = ` root.innerHTML = `${shellOpen()}
<div class="modal" data-ar-attach-modal="true"> ${isEmbedded ? '' : `<div class="ar-attachment-manager-head">
<div class="modal-card stack ar-attachment-manager-card">
<div class="ar-attachment-manager-head">
<h3 class="modal-title">${escapeHtml(titleText)}</h3> <h3 class="modal-title">${escapeHtml(titleText)}</h3>
<button class="icon-btn ar-attachment-manager-close" type="button" data-action="cancel" aria-label="Закрыть">${iconHtml('close')}</button> <button class="icon-btn ar-attachment-manager-close" type="button" data-action="cancel" aria-label="Закрыть">${iconHtml('close')}</button>
</div> </div>`}
<div class="tabs tabs--auto" role="radiogroup" aria-label="Способ загрузки"> <div class="tabs tabs--auto" role="radiogroup" aria-label="Способ загрузки">
<button class="tab-btn" role="radio" aria-checked="${turboMode}" type="button" data-action="switch-turbo">Turbo</button> <button class="tab-btn" role="radio" aria-checked="${turboMode}" type="button" data-action="switch-turbo">Turbo</button>
<button class="tab-btn" role="radio" aria-checked="${!turboMode}" type="button" data-action="switch-arweave">Свой кошелёк</button> <button class="tab-btn" role="radio" aria-checked="${!turboMode}" type="button" data-action="switch-arweave">Напрямую в Arweave</button>
</div> </div>
${turboMode ${turboMode
? ` ? `
<p class="ar-attachment-note">Маленькие файлы и аватары через Turbo пока загружаются бесплатно. Для больших файлов пополните Turbo со своего SOL-кошелька.</p> <p class="ar-attachment-note"><strong>Turbo</strong> — более удобный способ загрузки файлов в Arweave через сторонний сервис. Обычно дешевле прямой загрузки. Файлы до 100 КБ загружаются бесплатно.</p>
<div class="form-field">
<span class="meta-muted">Подпись и пополнение: ключ блокчейна пользователя.</span>
</div>
` `
: ` : `
<div class="form-field"> <div class="form-field">
<label for="ar-attach-wallet">Кошелёк оплаты Arweave</label> <label for="ar-attach-wallet">Ваш кошелёк Arweave</label>
<select class="select ar-attachment-wallet-select" id="ar-attach-wallet"></select> <select class="select ar-attachment-wallet-select" id="ar-attach-wallet"></select>
<button class="text-btn ar-attachment-link" type="button" data-action="add-wallet">+ Добавить кошелёк</button> <button class="text-btn ar-attachment-link" type="button" data-action="add-wallet">+ Добавить кошелёк</button>
</div> </div>
${isAvatarMode ? '<p class="ar-attachment-note">Выберите изображение. Перед загрузкой оно будет сжато до 512×512 и сохранено в истории как аватар.</p>' : (historyOnly ? '' : '<p class="ar-attachment-note">Для надёжности лучше сначала загрузить файл в Arweave, дождаться доступности в журнале, а потом добавить его из истории загрузок.</p>')} <p class="ar-attachment-note">Загрузка напрямую в сеть Arweave без Turbo. Это более прямой, но обычно более сложный и дорогой способ.</p>${isAvatarMode ? '<p class="ar-attachment-note">Выберите изображение. Перед загрузкой оно будет сжато до 512×512.</p>' : ''}
`} `}
${canShowHistory || canShowExisting ? ` ${canShowHistory || canShowExisting ? `
<div class="ar-attachment-alt-sources"> <div class="ar-attachment-alt-sources">
@@ -517,11 +600,10 @@ export function openArweaveAttachmentManager({
<div class="ar-attachment-meta" data-meta-main="true"></div> <div class="ar-attachment-meta" data-meta-main="true"></div>
<p class="meta-muted inline-error" data-error="true"></p> <p class="meta-muted inline-error" data-error="true"></p>
<div class="form-actions-grid"> <div class="form-actions-grid">
${turboMode ? '<button class="secondary-btn" type="button" data-action="topup">Пополнить Turbo</button>' : '<button class="secondary-btn" type="button" data-action="cancel">Отмена</button>'} ${turboMode ? '<button class="secondary-btn" type="button" data-action="check-balance">Проверить баланс</button><button class="secondary-btn" type="button" data-action="topup">Пополнить Turbo</button>' : '<button class="secondary-btn" type="button" data-action="check-balance">Проверить баланс</button><button class="secondary-btn" type="button" data-action="arweave-topup">Пополнить кошелёк</button>'}
<button class="primary-btn" type="button" data-action="upload" disabled>${escapeHtml(uploadText)}</button> <button class="primary-btn" type="button" data-action="upload" disabled>${escapeHtml(uploadText)}</button>
</div> </div>
</div> ${shellClose()}
</div>
`; `;
bindBackdrop(); bindBackdrop();
const walletEl = root.querySelector('#ar-attach-wallet'); const walletEl = root.querySelector('#ar-attach-wallet');
@@ -580,6 +662,25 @@ export function openArweaveAttachmentManager({
await refreshTurboStateForCurrentFile(mainMetaEl, errorEl, uploadBtn); await refreshTurboStateForCurrentFile(mainMetaEl, errorEl, uploadBtn);
} }
}); });
root.querySelector('[data-action="check-balance"]')?.addEventListener('click', async () => {
if (turboMode) {
await refreshTurboBalance(mainMetaEl, errorEl);
if (selectedFile && selectedSha256) await refreshTurboStateForCurrentFile(mainMetaEl, errorEl, uploadBtn);
} else {
const wallet = selectedWallet();
if (!wallet?.address) { setText(errorEl, 'Выберите Arweave-кошелёк.'); return; }
try {
balanceInfo = await getArweaveBalance({ gateway: cleanGateway, address: wallet.address });
renderArweaveMeta(mainMetaEl);
setText(errorEl, '');
} catch (error) {
setText(errorEl, error?.message || 'Не удалось проверить баланс Arweave.');
}
}
});
root.querySelector('[data-action="arweave-topup"]')?.addEventListener('click', async () => {
await showArweaveTopUp(mainMetaEl, errorEl);
});
if (!turboMode) { if (!turboMode) {
root.querySelector('[data-action="add-wallet"]')?.addEventListener('click', showAddWallet); root.querySelector('[data-action="add-wallet"]')?.addEventListener('click', showAddWallet);
} }
@@ -603,7 +704,7 @@ export function openArweaveAttachmentManager({
throw new Error('Для аватара можно выбрать только изображение.'); throw new Error('Для аватара можно выбрать только изображение.');
} }
if (isAvatarMode) { if (isAvatarMode) {
selectedFile = await resizeImageFileToAvatar(selectedFile); selectedFile = await prepareAvatarImageFile(selectedFile);
} }
const buffer = await selectedFile.arrayBuffer(); const buffer = await selectedFile.arrayBuffer();
selectedSha256 = await sha256HexFromArrayBuffer(buffer); selectedSha256 = await sha256HexFromArrayBuffer(buffer);
@@ -687,9 +788,7 @@ export function openArweaveAttachmentManager({
}; };
const showExisting = () => { const showExisting = () => {
root.innerHTML = ` root.innerHTML = `${shellOpen()}
<div class="modal" data-ar-attach-modal="true">
<div class="modal-card stack ar-attachment-manager-card">
<h3 class="modal-title">${isAvatarMode ? 'Существующий аватар Arweave' : 'Существующий файл Arweave'}</h3> <h3 class="modal-title">${isAvatarMode ? 'Существующий аватар Arweave' : 'Существующий файл Arweave'}</h3>
<label class="meta-muted" for="ar-existing-txid">Transaction ID</label> <label class="meta-muted" for="ar-existing-txid">Transaction ID</label>
<input class="input" id="ar-existing-txid" type="text" maxlength="64" placeholder="43 символа txId" /> <input class="input" id="ar-existing-txid" type="text" maxlength="64" placeholder="43 символа txId" />
@@ -703,8 +802,7 @@ export function openArweaveAttachmentManager({
<button class="secondary-btn" type="button" data-action="back">Назад</button> <button class="secondary-btn" type="button" data-action="back">Назад</button>
<button class="primary-btn" type="button" data-action="check">Скачать и проверить</button> <button class="primary-btn" type="button" data-action="check">Скачать и проверить</button>
</div> </div>
</div> ${shellClose()}
</div>
`; `;
bindBackdrop(); bindBackdrop();
const txEl = root.querySelector('#ar-existing-txid'); const txEl = root.querySelector('#ar-existing-txid');
@@ -757,9 +855,7 @@ export function openArweaveAttachmentManager({
.filter((item) => purposeFilter === 'avatar' ? item.purpose === 'avatar' : item.purpose !== 'avatar') .filter((item) => purposeFilter === 'avatar' ? item.purpose === 'avatar' : item.purpose !== 'avatar')
.slice() .slice()
.reverse(); .reverse();
root.innerHTML = ` root.innerHTML = `${shellOpen('ar-attachment-manager-card--wide')}
<div class="modal" data-ar-attach-modal="true">
<div class="modal-card stack ar-attachment-manager-card ar-attachment-manager-card--wide">
<h3 class="modal-title">Журнал загруженных файлов</h3> <h3 class="modal-title">Журнал загруженных файлов</h3>
<p class="meta-muted">Журнал хранится только в этой браузерной сессии.</p> <p class="meta-muted">Журнал хранится только в этой браузерной сессии.</p>
<div class="ar-attachment-history-tiles" data-history-scroll="true"> <div class="ar-attachment-history-tiles" data-history-scroll="true">
@@ -783,8 +879,7 @@ export function openArweaveAttachmentManager({
<div class="form-actions-grid"> <div class="form-actions-grid">
<button class="secondary-btn" type="button" data-action="back">Назад</button> <button class="secondary-btn" type="button" data-action="back">Назад</button>
</div> </div>
</div> ${shellClose()}
</div>
`; `;
bindBackdrop(); bindBackdrop();
const scrollEl = root.querySelector('[data-history-scroll="true"]'); const scrollEl = root.querySelector('[data-history-scroll="true"]');
@@ -816,9 +911,7 @@ export function openArweaveAttachmentManager({
}; };
const showAddWallet = () => { const showAddWallet = () => {
root.innerHTML = ` root.innerHTML = `${shellOpen()}
<div class="modal" data-ar-attach-modal="true">
<div class="modal-card stack ar-attachment-manager-card">
<h3 class="modal-title">Добавить Arweave-кошелёк</h3> <h3 class="modal-title">Добавить Arweave-кошелёк</h3>
<p class="meta-muted">Вставьте JSON JWK или короткую строку base64url(JSON JWK). Ключ будет сохранён в зашифрованном контейнере ключей этого пользователя на устройстве.</p> <p class="meta-muted">Вставьте JSON JWK или короткую строку base64url(JSON JWK). Ключ будет сохранён в зашифрованном контейнере ключей этого пользователя на устройстве.</p>
<label class="meta-muted" for="ar-wallet-label">Название</label> <label class="meta-muted" for="ar-wallet-label">Название</label>
@@ -830,8 +923,7 @@ export function openArweaveAttachmentManager({
<button class="secondary-btn" type="button" data-action="back">Назад</button> <button class="secondary-btn" type="button" data-action="back">Назад</button>
<button class="primary-btn" type="button" data-action="save">Добавить</button> <button class="primary-btn" type="button" data-action="save">Добавить</button>
</div> </div>
</div> ${shellClose()}
</div>
`; `;
bindBackdrop(); bindBackdrop();
const labelEl = root.querySelector('#ar-wallet-label'); const labelEl = root.querySelector('#ar-wallet-label');
+24 -3
View File
@@ -1,6 +1,7 @@
import { state } from '../state.js'; import { state } from '../state.js';
import { buildArweaveDataUrl, validateArweaveTxId, validateSha256Hex } from '../services/arweave-file-service.js'; import { buildArweaveDataUrl, validateArweaveTxId, validateSha256Hex } from '../services/arweave-file-service.js';
import { getCachedAvatarObjectUrl } from '../services/arweave-avatar-cache-service.js'; import { getCachedAvatarObjectUrl } from '../services/arweave-avatar-cache-service.js';
import { resolvePublicFileUrl } from '../services/public-file-service.js';
function normalizeLogin(value) { function normalizeLogin(value) {
return String(value || '').trim(); return String(value || '').trim();
@@ -37,6 +38,7 @@ export function renderAvatar({
alt = 'Аватар', alt = 'Аватар',
glow = false, glow = false,
official = false, official = false,
authorLogin = '',
} = {}) { } = {}) {
const wrap = document.createElement('div'); const wrap = document.createElement('div');
const classes = new Set(['avatar', 'avatar-image', 'avatar-framed']); const classes = new Set(['avatar', 'avatar-image', 'avatar-framed']);
@@ -63,11 +65,11 @@ export function renderAvatar({
} }
const txId = String(avatar?.ar || '').trim(); const txId = String(avatar?.ar || '').trim();
if (!validateArweaveTxId(txId)) {
return wrap;
}
const sha256Hex = String(avatar?.sha256Hex || avatar?.sha256 || '').trim().toLowerCase(); const sha256Hex = String(avatar?.sha256Hex || avatar?.sha256 || '').trim().toLowerCase();
const expectedSha256Hex = validateSha256Hex(sha256Hex) ? sha256Hex : ''; 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'); const img = document.createElement('img');
img.className = 'avatar-photo'; img.className = 'avatar-photo';
@@ -81,6 +83,23 @@ export function renderAvatar({
}; };
setLoadedState(false); 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; const gateway = state?.entrySettings?.arweaveServer;
void getCachedAvatarObjectUrl({ gateway, txId, expectedSha256Hex }) void getCachedAvatarObjectUrl({ gateway, txId, expectedSha256Hex })
.then((objectUrl) => { .then((objectUrl) => {
@@ -157,6 +176,7 @@ export function renderUserAvatar({
title = '', title = '',
glow = false, glow = false,
official = false, official = false,
authorLogin = '',
} = {}) { } = {}) {
return renderAvatar({ return renderAvatar({
initials: buildAvatarInitials({ login, firstName, lastName }), initials: buildAvatarInitials({ login, firstName, lastName }),
@@ -167,5 +187,6 @@ export function renderUserAvatar({
alt: 'Аватар', alt: 'Аватар',
glow, glow,
official, official,
authorLogin: login,
}); });
} }
+5 -7
View File
@@ -1,5 +1,5 @@
import { openArweaveAttachmentManager } from './arweave-attachment-manager.js'; import { openChannelAttachmentManager } from './channel-attachment-manager.js';
import { saveProfileAvatarArweave } from '../services/user-profile-params.js'; import { saveProfileAvatar } from '../services/user-profile-params.js';
export async function openAvatarWizard({ export async function openAvatarWizard({
login, login,
@@ -16,22 +16,20 @@ export async function openAvatarWizard({
throw new Error('Нет активной сессии.'); throw new Error('Нет активной сессии.');
} }
const item = await openArweaveAttachmentManager({ const item = await openChannelAttachmentManager({
login: cleanLogin, login: cleanLogin,
storagePwd: cleanStoragePwd, storagePwd: cleanStoragePwd,
gateway: cleanGateway, gateway: cleanGateway,
navigate,
mode: 'avatar', mode: 'avatar',
historyPurpose: 'avatar',
}); });
if (!item?.ar || !item?.sha256) return false; if (!item?.sha256 || !item?.size) return false;
if (typeof onStatus === 'function') { if (typeof onStatus === 'function') {
onStatus('Сохраняем аватар в профиль...'); onStatus('Сохраняем аватар в профиль...');
} }
await saveProfileAvatarArweave(cleanLogin, item.ar, item.sha256); await saveProfileAvatar(cleanLogin, item);
if (typeof onAvatarSaved === 'function') { if (typeof onAvatarSaved === 'function') {
await onAvatarSaved(item); await onAvatarSaved(item);
@@ -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 { formatBytes } from '../services/attachment-format.js';
import { uploadPublicFile } from '../services/public-file-service.js'; import { uploadPublicFile } from '../services/public-file-service.js';
import { state } from '../state.js'; import { state } from '../state.js';
@@ -10,8 +10,10 @@ export function openChannelAttachmentManager({
gateway = '', gateway = '',
selectedTxIds = [], selectedTxIds = [],
signal = null, signal = null,
mode = 'attachment',
} = {}) { } = {}) {
const cleanLogin = String(login || '').trim(); const cleanLogin = String(login || '').trim();
const isAvatarMode = String(mode || '').trim() === 'avatar';
const root = document.createElement('div'); const root = document.createElement('div');
root.className = 'public-attachment-manager-root'; root.className = 'public-attachment-manager-root';
document.body.append(root); document.body.append(root);
@@ -19,10 +21,14 @@ export function openChannelAttachmentManager({
let closed = false; let closed = false;
let selectedFile = null; let selectedFile = null;
let uploading = false; let uploading = false;
let arweaveStarted = false;
const arweaveAbortController = new AbortController();
if (signal) signal.addEventListener('abort', () => arweaveAbortController.abort(), { once: true });
const close = (resolve, value = null) => { const close = (resolve, value = null) => {
if (closed) return; if (closed) return;
closed = true; closed = true;
arweaveAbortController.abort();
root.remove(); root.remove();
resolve(value); resolve(value);
}; };
@@ -36,39 +42,35 @@ export function openChannelAttachmentManager({
<div class="modal public-attachment-manager" data-public-attachment-modal="true"> <div class="modal public-attachment-manager" data-public-attachment-modal="true">
<div class="modal-card stack public-attachment-manager__card" role="dialog" aria-modal="true" aria-labelledby="public-attachment-title"> <div class="modal-card stack public-attachment-manager__card" role="dialog" aria-modal="true" aria-labelledby="public-attachment-title">
<div class="public-attachment-manager__header"> <div class="public-attachment-manager__header">
<h3 class="modal-title" id="public-attachment-title">Добавить файл</h3> <h3 class="modal-title" id="public-attachment-title">${isAvatarMode ? 'Добавить аватар' : 'Добавить файл'}</h3>
<button class="icon-btn" type="button" data-action="close" aria-label="Закрыть">×</button> <button class="icon-btn" type="button" data-action="close" aria-label="Закрыть">×</button>
</div> </div>
<div class="public-attachment-manager__sources" role="radiogroup" aria-label="Место хранения файла"> <div class="public-attachment-manager__sources" role="radiogroup" aria-label="Место хранения файла">
<label class="public-attachment-manager__source is-selected"> <label class="public-attachment-manager__source is-selected">
<input type="radio" name="attachment-storage" value="server" checked /> <input type="radio" name="attachment-storage" value="server" checked />
<span><strong>Сервер доступа</strong><small>Бесплатно · пока доступно</small></span> <span><strong>НА СВОЙ СЕРВЕР ДОСТУПА</strong><small>Бесплатно</small></span>
</label> </label>
<label class="public-attachment-manager__source"> <label class="public-attachment-manager__source">
<input type="radio" name="attachment-storage" value="arweave" /> <input type="radio" name="attachment-storage" value="arweave" />
<span><strong>Arweave</strong><small>Постоянное децентрализованное хранение</small></span> <span><strong>ARWEAVE</strong><small>Постоянное децентрализованное хранение</small></span>
</label> </label>
</div> </div>
<div class="public-attachment-manager__server" data-panel="server"> <div class="public-attachment-manager__server" data-panel="server">
<div class="public-attachment-manager__notice"> <label class="ar-attachment-file-picker public-attachment-manager__file-picker">
<strong>САМ ФАЙЛ БУДЕТ ХРАНИТЬСЯ ТОЛЬКО НА ВАШЕМ СЕРВЕРЕ ДОСТУПА.</strong> <input class="ar-attachment-file-input" type="file" data-role="file" ${isAvatarMode ? 'accept="image/*"' : ''} />
<p>В блокчейн SHiNE записываются имя, размер и SHA-256-хеш файла, но не сам файл. Хранение на сервере доступа бесплатно.</p> <span class="ar-attachment-file-btn">Выбрать файл</span>
<p>Если сервер доступа перестанет работать, файл станет недоступен. При обычном переходе на другой сервер доступа в дальнейшем файлы смогут переноситься автоматически.</p> <span class="ar-attachment-file-name" data-role="selected">Файл не выбран</span>
<p>Храните собственные копии важных вложений. Если сервер внезапно исчезнет, тот же исходный файл можно будет загрузить на другой сервер доступа: совпадающий SHA-256 позволит старым сообщениям снова найти правильные байты.</p> </label>
<p>Сейчас у пользователя может быть только один сервер доступа. В расширенной версии SHiNE планируется поддержка нескольких серверов доступа, в том числе дополнительных оплачиваемых серверов.</p>
</div>
<input class="input" type="file" data-role="file" />
<div class="public-attachment-manager__selected meta-muted" data-role="selected">Файл не выбран.</div>
<div class="public-attachment-manager__status meta-muted" data-role="status"></div> <div class="public-attachment-manager__status meta-muted" data-role="status"></div>
<div class="public-attachment-manager__error inline-error" data-role="error"></div> <div class="public-attachment-manager__error inline-error" data-role="error"></div>
<button class="primary-btn" type="button" data-action="upload" disabled>Загрузить и добавить</button> <button class="primary-btn" type="button" data-action="upload" disabled>${isAvatarMode ? 'Загрузить аватар на сервер' : 'Загрузить на сервер и добавить'}</button>
</div> </div>
<div class="public-attachment-manager__arweave" data-panel="arweave" hidden> <div class="public-attachment-manager__arweave" data-panel="arweave" hidden>
<p class="meta-muted">Файл будет загружен через существующий механизм Arweave/Turbo.</p> <p class="meta-muted">Выберите Turbo — более удобный способ загрузки в Arweave через сторонний сервис — или прямую загрузку в сеть Arweave.</p>
<button class="primary-btn" type="button" data-action="arweave">Продолжить в Arweave</button> <div class="public-attachment-manager__arweave-loading meta-muted">Открываем настройки Arweave…</div>
</div> </div>
</div> </div>
</div> </div>
@@ -80,7 +82,6 @@ export function openChannelAttachmentManager({
const statusEl = root.querySelector('[data-role="status"]'); const statusEl = root.querySelector('[data-role="status"]');
const errorEl = root.querySelector('[data-role="error"]'); const errorEl = root.querySelector('[data-role="error"]');
const uploadButton = root.querySelector('[data-action="upload"]'); const uploadButton = root.querySelector('[data-action="upload"]');
const arweaveButton = root.querySelector('[data-action="arweave"]');
const radios = [...root.querySelectorAll('input[name="attachment-storage"]')]; const radios = [...root.querySelectorAll('input[name="attachment-storage"]')];
const setSource = (value) => { const setSource = (value) => {
@@ -91,7 +92,41 @@ export function openChannelAttachmentManager({
root.querySelector('[data-panel="arweave"]').hidden = value !== 'arweave'; 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)); root.querySelector('[data-action="close"]')?.addEventListener('click', () => close(resolve, null));
modal?.addEventListener('click', (event) => { modal?.addEventListener('click', (event) => {
if (event.target === modal && !uploading) close(resolve, null); if (event.target === modal && !uploading) close(resolve, null);
@@ -101,7 +136,7 @@ export function openChannelAttachmentManager({
selectedFile = fileInput.files?.[0] || null; selectedFile = fileInput.files?.[0] || null;
if (selectedEl) selectedEl.textContent = selectedFile if (selectedEl) selectedEl.textContent = selectedFile
? `${selectedFile.name} · ${formatBytes(selectedFile.size)}` ? `${selectedFile.name} · ${formatBytes(selectedFile.size)}`
: 'Файл не выбран.'; : 'Файл не выбран';
if (errorEl) errorEl.textContent = ''; if (errorEl) errorEl.textContent = '';
if (statusEl) statusEl.textContent = ''; if (statusEl) statusEl.textContent = '';
if (uploadButton) uploadButton.disabled = !selectedFile; if (uploadButton) uploadButton.disabled = !selectedFile;
@@ -114,14 +149,15 @@ export function openChannelAttachmentManager({
fileInput.disabled = true; fileInput.disabled = true;
if (errorEl) errorEl.textContent = ''; if (errorEl) errorEl.textContent = '';
try { try {
const uploadFile = isAvatarMode ? await prepareAvatarImageFile(selectedFile) : selectedFile;
const item = await uploadPublicFile({ const item = await uploadPublicFile({
file: selectedFile, file: uploadFile,
login: cleanLogin, login: cleanLogin,
sessionId: state.session.sessionId, sessionId: state.session.sessionId,
wsUrl: state.entrySettings.shineServer, wsUrl: state.entrySettings.shineServer,
onStatus: (message) => { if (statusEl) statusEl.textContent = message; }, onStatus: (message) => { if (statusEl) statusEl.textContent = message; },
}); });
close(resolve, item); close(resolve, { ...item, purpose: isAvatarMode ? 'avatar' : 'attachment' });
} catch (error) { } catch (error) {
if (errorEl) errorEl.textContent = toUserMessage(error, 'Не удалось загрузить файл.'); if (errorEl) errorEl.textContent = toUserMessage(error, 'Не удалось загрузить файл.');
if (statusEl) statusEl.textContent = ''; 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.');
}
});
}); });
} }
+13 -9
View File
@@ -7,9 +7,9 @@ import {
} from '../services/channel-name-rules.js'; } from '../services/channel-name-rules.js';
import { import {
getArweaveAttachmentAvailability, getArweaveAttachmentAvailability,
openArweaveAttachmentManager,
markArweaveAttachmentPlaced, markArweaveAttachmentPlaced,
} from '../components/arweave-attachment-manager.js'; } from '../components/arweave-attachment-manager.js';
import { openChannelAttachmentManager } from '../components/channel-attachment-manager.js';
import { renderAvatar } from '../components/avatar-image.js'; import { renderAvatar } from '../components/avatar-image.js';
import { makeShineChannelShortRoute } from '../services/shine-routes.js'; import { makeShineChannelShortRoute } from '../services/shine-routes.js';
@@ -44,6 +44,7 @@ function renderAvatarPreview(slot, avatar, title) {
const wrap = renderAvatar({ const wrap = renderAvatar({
initials: label.slice(0, 1).toUpperCase() || 'К', initials: label.slice(0, 1).toUpperCase() || 'К',
avatar, avatar,
authorLogin: state.session.login,
size: 'xl', size: 'xl',
className: 'channel-profile-avatar', className: 'channel-profile-avatar',
title: label, title: label,
@@ -170,17 +171,21 @@ export function render({navigate, chrome}) {
const renderAvatarStatus = (nameValue, titleValue) => { const renderAvatarStatus = (nameValue, titleValue) => {
renderAvatarPreview(avatarPreviewEl, selectedAvatar, titleValue || nameValue); renderAvatarPreview(avatarPreviewEl, selectedAvatar, titleValue || nameValue);
avatarRemoveBtn.hidden = !selectedAvatar?.ar; avatarRemoveBtn.hidden = !selectedAvatar?.sha256;
if (!selectedAvatar?.ar) { if (!selectedAvatar?.sha256) {
avatarStatusEl.innerHTML = '<p class="channel-avatar-status-text">Аватар канала не установлен.</p>'; avatarStatusEl.innerHTML = '<p class="channel-avatar-status-text">Аватар канала не установлен.</p>';
return; return;
} }
const txId = String(selectedAvatar.ar || '').trim(); const txId = String(selectedAvatar.ar || '').trim();
if (!txId) {
avatarStatusEl.innerHTML = '<p class="channel-avatar-status-text">Аватар канала · сервер доступа</p><p class="channel-avatar-status-line">Хранится бесплатно на вашем сервере доступа.</p>';
return;
}
const shortTxId = shortAvatarBlockchainAddress(txId); const shortTxId = shortAvatarBlockchainAddress(txId);
const isPending = avatarAvailabilityLabel === 'pending' || avatarAvailabilityTxId !== txId; const isPending = avatarAvailabilityLabel === 'pending' || avatarAvailabilityTxId !== txId;
avatarStatusEl.innerHTML = ` avatarStatusEl.innerHTML = `
<p class="channel-avatar-status-text">Аватар канала</p> <p class="channel-avatar-status-text">Аватар канала · Arweave</p>
<p class="channel-avatar-status-line">Адрес аватара в блокчейне Arweave <span class="channel-avatar-txid">${shortTxId}</span><span class="channel-avatar-status-pending">${isPending ? ', ещё не обновился в блокчейне.' : ''}</span></p> <p class="channel-avatar-status-line">Адрес в Arweave <span class="channel-avatar-txid">${shortTxId}</span><span class="channel-avatar-status-pending">${isPending ? ', ещё не обновился в сети.' : ''}</span></p>
`; `;
}; };
@@ -271,14 +276,13 @@ export function render({navigate, chrome}) {
descriptionEl.addEventListener('input', updateValidation); descriptionEl.addEventListener('input', updateValidation);
avatarBtn.addEventListener('click', async () => { avatarBtn.addEventListener('click', async () => {
try { try {
const nextAvatar = await openArweaveAttachmentManager({ const nextAvatar = await openChannelAttachmentManager({
login: state.session.login, login: state.session.login,
storagePwd: state.session.storagePwdInMemory, storagePwd: state.session.storagePwdInMemory,
gateway: state.entrySettings.arweaveServer, gateway: state.entrySettings.arweaveServer,
mode: 'avatar', mode: 'avatar',
historyPurpose: 'avatar',
}); });
if (nextAvatar?.ar) { if (nextAvatar?.sha256) {
selectedAvatar = nextAvatar; selectedAvatar = nextAvatar;
void refreshAvatarAvailability(); void refreshAvatarAvailability();
} }
@@ -289,7 +293,7 @@ export function render({navigate, chrome}) {
}); });
avatarRemoveBtn.addEventListener('click', () => { avatarRemoveBtn.addEventListener('click', () => {
if (!selectedAvatar?.ar) return; if (!selectedAvatar?.sha256) return;
const confirmed = window.confirm('Убрать аватар и сделать канал без аватара?'); const confirmed = window.confirm('Убрать аватар и сделать канал без аватара?');
if (!confirmed) return; if (!confirmed) return;
selectedAvatar = null; selectedAvatar = null;
+7 -5
View File
@@ -3,6 +3,7 @@ import { createTopBar } from '../components/topbar.js';
import { confirmDialog } from '../components/confirm-dialog.js'; import { confirmDialog } from '../components/confirm-dialog.js';
import { renderAvatar } from '../components/avatar-image.js'; import { renderAvatar } from '../components/avatar-image.js';
import { markArweaveAttachmentPlaced, openArweaveAttachmentManager } from '../components/arweave-attachment-manager.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 { authService, setChannelsFeed, state } from '../state.js';
import { navigateBack, getPreviousTrackedPath } from '../router.js'; import { navigateBack, getPreviousTrackedPath } from '../router.js';
import { import {
@@ -84,7 +85,7 @@ function formatChannelCreatedAt(value) {
function openChannelProfileEditor({ channel, selector, onSaved }) { function openChannelProfileEditor({ channel, selector, onSaved }) {
const root = document.getElementById('modal-root'); const root = document.getElementById('modal-root');
if (!root) return; if (!root) return;
let selectedAvatar = String(channel?.avaAr || '').trim() ? { let selectedAvatar = String(channel?.avaSha256 || '').trim() ? {
name: 'Аватар', name: 'Аватар',
ar: String(channel.avaAr || '').trim(), ar: String(channel.avaAr || '').trim(),
sha256: String(channel?.avaSha256 || '').trim(), sha256: String(channel?.avaSha256 || '').trim(),
@@ -121,7 +122,8 @@ function openChannelProfileEditor({ channel, selector, onSaved }) {
slot.innerHTML = ''; slot.innerHTML = '';
slot.append(renderAvatar({ slot.append(renderAvatar({
initials: (title || 'К').slice(0, 1).toUpperCase(), 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', size: 'xl',
className: 'channel-about-avatar channel-profile-avatar', className: 'channel-about-avatar channel-profile-avatar',
title: title || 'Канал', title: title || 'Канал',
@@ -135,12 +137,11 @@ function openChannelProfileEditor({ channel, selector, onSaved }) {
root.querySelector('#channel-profile-edit-avatar')?.addEventListener('click', async () => { root.querySelector('#channel-profile-edit-avatar')?.addEventListener('click', async () => {
const errorEl = root.querySelector('#channel-profile-edit-error'); const errorEl = root.querySelector('#channel-profile-edit-error');
try { try {
const item = await openArweaveAttachmentManager({ const item = await openChannelAttachmentManager({
login: state.session.login, login: state.session.login,
storagePwd: state.session.storagePwdInMemory, storagePwd: state.session.storagePwdInMemory,
gateway: state.entrySettings.arweaveServer, gateway: state.entrySettings.arweaveServer,
mode: 'avatar', mode: 'avatar',
historyPurpose: 'avatar',
}); });
if (!item) return; if (!item) return;
selectedAvatar = item; selectedAvatar = item;
@@ -636,7 +637,8 @@ export function render({ navigate, route, chrome }) {
const channelAvatar = renderAvatar({ const channelAvatar = renderAvatar({
initials: cleanName.slice(0, 1).toUpperCase() || 'К', 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', size: 'xl',
className: 'channel-about-avatar channel-profile-avatar', className: 'channel-about-avatar channel-profile-avatar',
title: cleanName, title: cleanName,
+2 -2
View File
@@ -79,9 +79,9 @@ function createThreadAvatar(login) {
if (!avatarEl.isConnected) return; if (!avatarEl.isConnected) return;
const upgraded = renderUserAvatar({ const upgraded = renderUserAvatar({
login: cleanLogin, 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(), sha256Hex: String(snapshot?.avatar?.sha256Hex || '').trim().toLowerCase(),
} }
: null, : null,
+14 -11
View File
@@ -25,8 +25,10 @@ import {
softHaptic, softHaptic,
} from '../services/channels-ux.js'; } from '../services/channels-ux.js';
import { renderAvatar, renderUserAvatar } from '../components/avatar-image.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 { openChannelEditor } from '../components/channel-editor.js';
import { markArweaveAttachmentPlaced, openArweaveAttachmentManager } from '../components/arweave-attachment-manager.js'; import { markArweaveAttachmentPlaced, openArweaveAttachmentManager } from '../components/arweave-attachment-manager.js';
import { openChannelAttachmentManager } from '../components/channel-attachment-manager.js';
import { import {
composeMessageWithAttachments, composeMessageWithAttachments,
createAttachmentCarouselElement, createAttachmentCarouselElement,
@@ -105,9 +107,9 @@ function createMessageAvatar(login) {
if (!avatarEl.isConnected) return; if (!avatarEl.isConnected) return;
const upgraded = renderUserAvatar({ const upgraded = renderUserAvatar({
login: cleanLogin, 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(), sha256Hex: String(snapshot?.avatar?.sha256Hex || '').trim().toLowerCase(),
} }
: null, : null,
@@ -619,10 +621,12 @@ function getStatusActionOptionsForTarget(targetMsgSubType) {
function createChannelAvatarElement(channel, size = 96) { function createChannelAvatarElement(channel, size = 96) {
const txId = String(channel?.avaAr || '').trim(); const txId = String(channel?.avaAr || '').trim();
const sha256 = String(channel?.avaSha256 || '').trim().toLowerCase();
const title = String(channel?.displayTitle || channel?.name || 'К').trim() || 'К'; const title = String(channel?.displayTitle || channel?.name || 'К').trim() || 'К';
const wrap = renderAvatar({ const wrap = renderAvatar({
initials: title.slice(0, 1).toUpperCase() || 'К', 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', size: 'xl',
className: 'channel-profile-avatar', className: 'channel-profile-avatar',
title, title,
@@ -639,9 +643,7 @@ function openChannelMetaDetailsModal({
onEdit = null, onEdit = null,
changedAtMs = 0, changedAtMs = 0,
} = {}) { } = {}) {
const avatarState = String(channel.avaAr || '').trim() const avatarState = String(channel.avaAr || channel.avaSha256 || '').trim() ? 'Установлен' : 'Не установлен';
? 'Установлен'
: 'Не установлен';
const changedAtLabel = changedAtMs const changedAtLabel = changedAtMs
? new Date(Number(changedAtMs)).toLocaleString('ru-RU') ? new Date(Number(changedAtMs)).toLocaleString('ru-RU')
: '–'; : '–';
@@ -689,9 +691,9 @@ function openAboutChannelModal(channel, options = {}) {
function openEditChannelModal({ channel, onSave }) { function openEditChannelModal({ channel, onSave }) {
const root = document.getElementById('modal-root'); const root = document.getElementById('modal-root');
let selectedAvatar = channel?.avaAr ? { let selectedAvatar = channel?.avaSha256 ? {
name: 'Аватар', name: 'Аватар',
ar: channel.avaAr, ar: String(channel.avaAr || ''),
sha256: channel.avaSha256, sha256: channel.avaSha256,
size: channel.avaSize, size: channel.avaSize,
purpose: 'avatar', purpose: 'avatar',
@@ -704,6 +706,8 @@ function openEditChannelModal({ channel, onSave }) {
slot.append(createChannelAvatarElement({ slot.append(createChannelAvatarElement({
...channel, ...channel,
avaAr: selectedAvatar?.ar || '', avaAr: selectedAvatar?.ar || '',
avaSha256: selectedAvatar?.sha256 || '',
avaSize: selectedAvatar?.size || 0,
displayTitle: root.querySelector('#edit-channel-title')?.value || channel.displayTitle, displayTitle: root.querySelector('#edit-channel-title')?.value || channel.displayTitle,
}, 86)); }, 86));
}; };
@@ -734,12 +738,11 @@ function openEditChannelModal({ channel, onSave }) {
root.querySelector('#edit-channel-title')?.addEventListener('input', renderAvatarPreview); root.querySelector('#edit-channel-title')?.addEventListener('input', renderAvatarPreview);
root.querySelector('#edit-channel-avatar')?.addEventListener('click', async () => { root.querySelector('#edit-channel-avatar')?.addEventListener('click', async () => {
try { try {
const item = await openArweaveAttachmentManager({ const item = await openChannelAttachmentManager({
login: state.session.login, login: state.session.login,
storagePwd: state.session.storagePwdInMemory, storagePwd: state.session.storagePwdInMemory,
gateway: state.entrySettings.arweaveServer, gateway: state.entrySettings.arweaveServer,
mode: 'avatar', mode: 'avatar',
historyPurpose: 'avatar',
}); });
if (!item) return; if (!item) return;
selectedAvatar = item; selectedAvatar = item;
@@ -1754,7 +1757,7 @@ function openMessageLikesListModal({ navigate, messageRef, initialTab = 'shining
login: String(row?.login || '').trim() || 'unknown', login: String(row?.login || '').trim() || 'unknown',
firstName: String(row?.firstName || ''), firstName: String(row?.firstName || ''),
lastName: String(row?.lastName || ''), lastName: String(row?.lastName || ''),
avatar: avatarRaw ? { ar: avatarRaw } : null, avatar: avatarReferenceToRenderModel(parseAvatarReference(avatarRaw)),
size: 'md', size: 'md',
})); }));
const firstName = String(row?.firstName || '').trim(); const firstName = String(row?.firstName || '').trim();
+4 -1
View File
@@ -123,7 +123,8 @@ function avatarLetterFromName(name = '') {
function createChannelAvatar(channel = {}) { function createChannelAvatar(channel = {}) {
return renderAvatar({ return renderAvatar({
initials: channel.avatar || channel.initials || avatarLetterFromName(channel.displayTitle || channel.title || channel.name), 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', size: 'lg',
className: 'avatar-plain', className: 'avatar-plain',
title: channel.displayTitle || channel.title || channel.name || 'Канал', title: channel.displayTitle || channel.title || channel.name || 'Канал',
@@ -751,6 +752,7 @@ function mapApiChannelRow(summary, bucketKey, idx, index, notificationsState) {
channelRootBlockHash: normalizeHash(summary?.channel?.channelRoot?.blockHash), channelRootBlockHash: normalizeHash(summary?.channel?.channelRoot?.blockHash),
avatar: avatarLetterFromName(displayTitle || channelName), avatar: avatarLetterFromName(displayTitle || channelName),
avaAr: String(summary?.channel?.avaAr || '').trim(), avaAr: String(summary?.channel?.avaAr || '').trim(),
avaSha256: String(summary?.channel?.avaSha256 || '').trim().toLowerCase(),
title, title,
technicalLabel, technicalLabel,
channelName, channelName,
@@ -789,6 +791,7 @@ function mapDeletedOwnedChannels(payload, notificationsState = {}) {
channelRootBlockHash: normalizeHash(item?.rootBlockHashHex), channelRootBlockHash: normalizeHash(item?.rootBlockHashHex),
avatar: avatarLetterFromName(displayTitle), avatar: avatarLetterFromName(displayTitle),
avaAr: String(item?.avatarAr || '').trim(), avaAr: String(item?.avatarAr || '').trim(),
avaSha256: String(item?.avatarSha256 || '').trim().toLowerCase(),
title: displayTitle, title: displayTitle,
technicalLabel: `@${ownerLogin}/${channelName}`, technicalLabel: `@${ownerLogin}/${channelName}`,
channelName, channelName,
+1 -1
View File
@@ -128,7 +128,7 @@ function createChatHeaderParts(login, navigate) {
login: cleanLogin, login: cleanLogin,
firstName, firstName,
lastName, lastName,
avatar: currentPeer?.avatar?.ar avatar: (currentPeer?.avatar?.ar || currentPeer?.avatar?.sha256Hex)
? { ? {
ar: String(currentPeer.avatar.ar || '').trim(), ar: String(currentPeer.avatar.ar || '').trim(),
sha256Hex: String(currentPeer.avatar.sha256Hex || '').trim().toLowerCase(), sha256Hex: String(currentPeer.avatar.sha256Hex || '').trim().toLowerCase(),
+2 -2
View File
@@ -44,9 +44,9 @@ function createSearchAvatar(login) {
if (!avatarEl.isConnected) return; if (!avatarEl.isConnected) return;
const upgraded = renderUserAvatar({ const upgraded = renderUserAvatar({
login: cleanLogin, 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(), sha256Hex: String(snapshot?.avatar?.sha256Hex || '').trim().toLowerCase(),
} }
: null, : null,
+4 -4
View File
@@ -55,19 +55,19 @@ function createDmAvatar(login, { className = '', avatar = null, firstName = '',
login: cleanLogin || 'unknown', login: cleanLogin || 'unknown',
firstName: String(firstName || '').trim(), firstName: String(firstName || '').trim(),
lastName: String(lastName || '').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', size: 'lg',
title, title,
className, className,
}); });
if (!cleanLogin || avatar?.ar) return avatarEl; if (!cleanLogin || avatar?.ar || avatar?.sha256Hex) return avatarEl;
void loadDmAvatarSnapshot(cleanLogin).then((snapshot) => { void loadDmAvatarSnapshot(cleanLogin).then((snapshot) => {
if (!avatarEl.isConnected) return; if (!avatarEl.isConnected) return;
const upgraded = renderUserAvatar({ const upgraded = renderUserAvatar({
login: cleanLogin, 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(), sha256Hex: String(snapshot?.avatar?.sha256Hex || '').trim().toLowerCase(),
} }
: null, : null,
+2 -1
View File
@@ -109,7 +109,8 @@ function getMarkByLogin(allUsers) {
function normalizeAvatar(row) { function normalizeAvatar(row) {
const txFromAvatar = String(row?.avatar?.ar || '').trim(); 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(); const txFallback = String(row?.avatarTxId || '').trim();
if (txFallback) return { ar: txFallback }; if (txFallback) return { ar: txFallback };
return null; return null;
+42 -1
View File
@@ -17,6 +17,7 @@
import { renderUserAvatar, buildAvatarInitials } from '../../components/avatar-image.js'; import { renderUserAvatar, buildAvatarInitials } from '../../components/avatar-image.js';
import { state } from '../../state.js'; import { state } from '../../state.js';
import { buildArweaveDataUrl } from '../../services/arweave-file-service.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'; 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-фильтр свечения «сияющих» узлов (мягкое гауссово размытие). // Однократно внедряем скрытый SVG-фильтр свечения «сияющих» узлов (мягкое гауссово размытие).
// Применяется к псевдо-ореолу ::before, а НЕ к самой аватарке — поэтому фото не размывается. // Применяется к псевдо-ореолу ::before, а НЕ к самой аватарке — поэтому фото не размывается.
function ensureShineFilter() { function ensureShineFilter() {
@@ -636,7 +656,28 @@ export function createForceGraph({ stage, model, onCenterTap, onNodeTap, onNodeL
const dot = document.createElement('div'); const dot = document.createElement('div');
dot.className = 'avatar node-dot fg-orb-host'; dot.className = 'avatar node-dot fg-orb-host';
// Единый PNG-оверлей на ВСЕХ полных орбах (фокус + спутники). tier-3 точки (dotOnly) сюда не идут. // Единый 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); el.append(dot);
syncOfficialBadge(el, Boolean(src.official)); syncOfficialBadge(el, Boolean(src.official));
+2 -2
View File
@@ -150,9 +150,9 @@ function renderEmpty(activeTab) {
function renderAvatar(item) { function renderAvatar(item) {
const profile = item.profile; 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(), sha256Hex: String(profile.avatar.sha256Hex || '').trim().toLowerCase(),
} }
: null; : null;
+2 -2
View File
@@ -237,8 +237,8 @@ export function render({ navigate, chrome }) {
login, login,
firstName, firstName,
lastName, lastName,
avatar: currentAvatar?.txId avatar: (currentAvatar?.txId || currentAvatar?.sha256Hex)
? { ar: currentAvatar.txId, sha256Hex: String(currentAvatar?.sha256Hex || '').trim().toLowerCase() } ? { ar: String(currentAvatar.txId || currentAvatar.ar || '').trim(), sha256Hex: String(currentAvatar?.sha256Hex || '').trim().toLowerCase() }
: null, : null,
size: 'xl', size: 'xl',
className: 'profile-avatar', className: 'profile-avatar',
+3 -4
View File
@@ -3,13 +3,12 @@ import { renderUserAvatar } from '../components/avatar-image.js';
import { authService } from '../state.js'; import { authService } from '../state.js';
import { navigateBack } from '../router.js'; import { navigateBack } from '../router.js';
import { userDisplayName } from '../services/user-display.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: 'Список' }; export const pageMeta = { id: 'user-profile-list-view', title: 'Список' };
function parseAvatar(raw) { function parseAvatar(raw) {
const value = String(raw || ''); return avatarReferenceToRenderModel(parseAvatarReference(raw));
const m = value.match(/(?:^|,)\s*AR:([A-Za-z0-9_-]{43})(?:,|$)/);
return m ? { ar: m[1] } : null;
} }
const TITLES = { const TITLES = {
@@ -105,7 +104,7 @@ export function render({ navigate, route, chrome }) {
const el = document.createElement('button'); const el = document.createElement('button');
el.type = 'button'; el.type = 'button';
el.className = 'ui-button card row profile-list-row'; 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'); const t = document.createElement('div');
t.className = 'profile-list-row-text'; t.className = 'profile-list-row-text';
t.innerHTML = `<b>${String(row.displayName || row.slug || '')}${row.deleted ? ' · Удалён' : ''}</b><small>${String(row.ownerLogin || '')} / ${String(row.slug || '')}</small>`; t.innerHTML = `<b>${String(row.displayName || row.slug || '')}${row.deleted ? ' · Удалён' : ''}</b><small>${String(row.ownerLogin || '')} / ${String(row.slug || '')}</small>`;
+4 -4
View File
@@ -726,14 +726,14 @@ function composeChannelMetaText({ title = '', description = '', avatar = null }
const cleanDescription = normalizeChannelMetaDescription(description); const cleanDescription = normalizeChannelMetaDescription(description);
const rows = []; const rows = [];
if (cleanTitle) rows.push(`<S:title;v=1;${cleanTitle}>`); if (cleanTitle) rows.push(`<S:title;v=1;${cleanTitle}>`);
if (avatar?.ar) { if (avatar?.sha256 || avatar?.sha256Hex) {
const size = Number(avatar.size || 0); 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(); const ar = String(avatar.ar || '').trim();
if (!Number.isInteger(size) || size <= 0) throw new Error('Некорректный размер аватара.'); if (!Number.isInteger(size) || size <= 0) throw new Error('Некорректный размер аватара.');
if (!/^[0-9a-f]{64}$/u.test(sha256)) throw new Error('Некорректный SHA-256 аватара.'); 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 аватара.'); if (ar && !/^[A-Za-z0-9_-]{43}$/u.test(ar)) throw new Error('Некорректный Arweave txId аватара.');
rows.push(`<S:ava;v=1;sz=${size};sha256=${sha256};ar=${ar}>`); rows.push(`<S:ava;v=1;sz=${size};sha256=${sha256}${ar ? `;ar=${ar}` : ''}>`);
} }
if (cleanDescription) rows.push(cleanDescription); if (cleanDescription) rows.push(cleanDescription);
return rows.join('\n'); return rows.join('\n');
+86
View File
@@ -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 `<S:ava;v=1;sz=${cleanSize};sha256=${cleanSha}${cleanAr ? `;ar=${cleanAr}` : ''}>`;
}
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:<hash>,AR:<txid> or AR:<txid>.
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 || ''),
};
}
+3 -3
View File
@@ -110,7 +110,7 @@ async function loadAvatarSnapshot(login) {
} }
function renderPeerAvatar(login, avatar = null) { 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({ const avatarEl = renderUserAvatar({
login: String(login || '').trim() || 'unknown', login: String(login || '').trim() || 'unknown',
avatar, avatar,
@@ -137,9 +137,9 @@ function updatePeerAvatar(login) {
if (!cleanLogin) return; if (!cleanLogin) return;
void loadAvatarSnapshot(cleanLogin).then((snapshot) => { void loadAvatarSnapshot(cleanLogin).then((snapshot) => {
if (!avatarSlotEl || loadToken !== activeAvatarLoadToken || activeAvatarLogin !== cleanLogin) return; 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(), sha256Hex: String(snapshot.avatar.sha256Hex || '').trim().toLowerCase(),
} }
: null; : null;
+2 -2
View File
@@ -272,9 +272,9 @@ export async function loadUserProfileCard(login) {
shineReceivedCount: Number(user.shineConfirmationsReceivedCount || 0), shineReceivedCount: Number(user.shineConfirmationsReceivedCount || 0),
shineGivenCount: Number(user.shineConfirmationsGivenCount || 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(), sha256Hex: String(snapshot?.avatar?.sha256Hex || '').trim().toLowerCase(),
} }
: null, : null,
+22 -20
View File
@@ -1,10 +1,6 @@
import { authService, state } from '../state.js'; import { authService, state } from '../state.js';
import { import { validateArweaveTxId, validateSha256Hex } from './arweave-file-service.js';
buildArweaveAvatarValue, import { buildAvatarReference, parseAvatarReference } from './avatar-reference.js';
parseArweaveAvatarValue,
validateArweaveTxId,
validateSha256Hex,
} from './arweave-file-service.js';
export const profileFieldDefs = [ export const profileFieldDefs = [
{ key: 'first_name', readKeys: ['first_name'], label: 'Имя', placeholder: 'Введите имя' }, { key: 'first_name', readKeys: ['first_name'], label: 'Имя', placeholder: 'Введите имя' },
@@ -138,20 +134,24 @@ export async function loadProfileSnapshot(login) {
const latestGender = loadLatestByAliasesFromItems(items, ['gender']); const latestGender = loadLatestByAliasesFromItems(items, ['gender']);
const gender = normalizeGenderValue(latestGender?.value || PROFILE_GENDER_UNKNOWN); const gender = normalizeGenderValue(latestGender?.value || PROFILE_GENDER_UNKNOWN);
const latestAvatar = loadLatestByAliasesFromItems(items, ['ava']); const latestAvatar = loadLatestByAliasesFromItems(items, ['ava']);
const parsedAvatar = parseArweaveAvatarValue(latestAvatar?.value || ''); const parsedAvatar = parseAvatarReference(latestAvatar?.value || '');
const avatar = parsedAvatar.ok const avatar = parsedAvatar.ok
? { ? {
value: buildArweaveAvatarValue(parsedAvatar.txId, parsedAvatar.sha256Hex), value: parsedAvatar.value,
source: 'arweave', source: parsedAvatar.source,
txId: parsedAvatar.txId, txId: parsedAvatar.txId || '',
ar: parsedAvatar.ar || '',
sha256Hex: parsedAvatar.sha256Hex || '', sha256Hex: parsedAvatar.sha256Hex || '',
size: Number(parsedAvatar.size || 0),
timeMs: latestAvatar?.timeMs || 0, timeMs: latestAvatar?.timeMs || 0,
} }
: { : {
value: '', value: '',
source: '', source: '',
txId: '', txId: '',
ar: '',
sha256Hex: '', sha256Hex: '',
size: 0,
timeMs: latestAvatar?.timeMs || 0, timeMs: latestAvatar?.timeMs || 0,
}; };
@@ -209,14 +209,16 @@ export async function saveProfileGender(login, gender) {
}); });
} }
export async function saveProfileAvatarArweave(login, txId, sha256Hex) { export async function saveProfileAvatar(login, avatar) {
const cleanTxId = String(txId || '').trim(); const cleanAr = String(avatar?.ar || '').trim();
const cleanSha = String(sha256Hex || '').trim().toLowerCase(); const cleanSha = String(avatar?.sha256 || avatar?.sha256Hex || '').trim().toLowerCase();
if (!validateArweaveTxId(cleanTxId)) { const size = Number(avatar?.size || 0);
throw new Error('Некорректный Transaction ID Arweave'); if (cleanAr && !validateArweaveTxId(cleanAr)) throw new Error('Некорректный Transaction ID Arweave');
} if (!validateSha256Hex(cleanSha)) throw new Error('Некорректный SHA256 хэш аватара');
if (!validateSha256Hex(cleanSha)) { await saveProfileParamBlock(login, 'ava', buildAvatarReference({ ar: cleanAr, sha256: cleanSha, size }));
throw new Error('Некорректный SHA256 хэш аватара'); }
}
await saveProfileParamBlock(login, 'ava', buildArweaveAvatarValue(cleanTxId, cleanSha)); // Legacy export for old callers. New UI writes only <S:ava;...>.
export async function saveProfileAvatarArweave(login, txId, sha256Hex, size = 1) {
return saveProfileAvatar(login, { ar: txId, sha256: sha256Hex, size });
} }
@@ -623,3 +623,26 @@
.public-attachment-manager__card { width: 100%; max-height: calc(100dvh - 20px); } .public-attachment-manager__card { width: 100%; max-height: calc(100dvh - 20px); }
.public-attachment-manager__sources { grid-template-columns: 1fr; } .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;
}