Compare commits

...
2 Commits
51 changed files with 1847 additions and 355 deletions
@@ -1,6 +1,7 @@
#include <Arduino.h>
#include <Wire.h>
#include <math.h>
#include <Preferences.h>
#include <Arduino_GFX_Library.h>
#include <TouchDrvCSTXXX.hpp>
#include "ESP_I2S.h"
@@ -54,6 +55,7 @@ Arduino_CO5300 *gfx = new Arduino_CO5300(
TouchDrvCST92xx gTouch;
I2SClass gI2s;
Preferences gPrefs;
struct Rect {
int16_t x;
@@ -67,6 +69,8 @@ static const Rect kLimitSlider = {42, 132, 396, 44};
static const Rect kTickSlider = {42, 246, 396, 44};
static const Rect kAlertSlider = {42, 360, 396, 44};
static const uint16_t kLimitsSec[] = {5, 7, 10, 15, 20};
static const int16_t kTickAmpByVolume[] = {0, 40, 80, 140, 220, 320, 440, 580, 720, 800, 1600};
static const int16_t kAlertAmpByVolume[] = {0, 150, 300, 500, 800, 12000, 12000, 12000, 12000, 12000, 12000};
static bool gStarted = false;
static bool gSettingsOpen = false;
@@ -96,6 +100,8 @@ static uint8_t gLimitIndex = 2;
static uint8_t gTickVolume = 3;
static uint8_t gAlertVolume = 10;
static uint8_t gShortStreak = 0;
static char gLastTopLine[48] = "";
static char gLastStreakLine[48] = "";
static void drawPanel(int x, int y, int w, int h, uint16_t fill, uint16_t border, int radius = 10) {
gfx->fillRoundRect(x, y, w, h, radius, fill);
@@ -152,6 +158,33 @@ static uint32_t averageCycleMs() {
return sum / gCycleCount;
}
static void resetCachedUiText() {
gLastTopLine[0] = '\0';
gLastStreakLine[0] = '\0';
}
static void loadSettings() {
gPrefs.begin("breath-mon", false);
gLimitIndex = gPrefs.getUChar("limit", gLimitIndex);
gTickVolume = gPrefs.getUChar("tick", gTickVolume);
gAlertVolume = gPrefs.getUChar("alert", gAlertVolume);
if (gLimitIndex > 4) {
gLimitIndex = 2;
}
if (gTickVolume > 10) {
gTickVolume = 3;
}
if (gAlertVolume > 10) {
gAlertVolume = 10;
}
}
static void saveSettings() {
gPrefs.putUChar("limit", gLimitIndex);
gPrefs.putUChar("tick", gTickVolume);
gPrefs.putUChar("alert", gAlertVolume);
}
static bool isAutoPaused() {
return gStarted && gLastCycleStartMs != 0 && (millis() - gLastCycleStartMs) > kPauseAfterMs;
}
@@ -206,11 +239,11 @@ static void playBeep(uint16_t freq, uint16_t samples, int16_t amp) {
}
static void playCycleTick() {
playBeep(880, 480, (int16_t)(gTickVolume * 800));
playBeep(880, 480, kTickAmpByVolume[gTickVolume]);
}
static void playAlertBeep() {
playBeep(1200, 1600, (int16_t)(gAlertVolume * 1200));
playBeep(1200, 1600, kAlertAmpByVolume[gAlertVolume]);
}
static void alertIfNeeded() {
@@ -299,6 +332,7 @@ static void drawMonitorStatic() {
gStaticDrawn = true;
gLastDrawnClosed = !gStableClosed;
gLastDrawnPaused = !isAutoPaused();
resetCachedUiText();
}
static void updateMonitorValues(bool force) {
@@ -327,9 +361,13 @@ static void updateMonitorValues(bool force) {
gLastDrawnPaused = paused;
}
clearArea(28, 58, 424, 28, C_PANEL);
snprintf(line, sizeof(line), "Limit: %us top button: settings", kLimitsSec[gLimitIndex]);
drawText(28, 60, line, C_MUTE, 2);
if (strcmp(line, gLastTopLine) != 0) {
clearArea(28, 58, 424, 28, C_PANEL);
drawText(28, 60, line, C_MUTE, 2);
strncpy(gLastTopLine, line, sizeof(gLastTopLine) - 1);
gLastTopLine[sizeof(gLastTopLine) - 1] = '\0';
}
clearArea(42, 254, 160, 28, C_CARD);
formatSec(value, sizeof(value), currentMs);
@@ -351,9 +389,13 @@ static void updateMonitorValues(bool force) {
snprintf(value, sizeof(value), "%us", kLimitsSec[gLimitIndex]);
drawText(266, 342, value, C_TEXT, 2);
clearArea(28, 398, 280, 28, C_PANEL);
snprintf(line, sizeof(line), "Short avg streak: %u", gShortStreak);
drawText(32, 402, line, gShortStreak > 0 ? C_BAD : C_MUTE, 2);
if (strcmp(line, gLastStreakLine) != 0) {
clearArea(28, 398, 280, 28, C_PANEL);
drawText(32, 402, line, gShortStreak > 0 ? C_BAD : C_MUTE, 2);
strncpy(gLastStreakLine, line, sizeof(gLastStreakLine) - 1);
gLastStreakLine[sizeof(gLastStreakLine) - 1] = '\0';
}
}
static void redrawScreen() {
@@ -398,6 +440,7 @@ static void toggleSettings() {
gSettingsOpen = !gSettingsOpen;
gNeedStaticRedraw = true;
gNeedRedraw = true;
resetCachedUiText();
}
static void handleStableContact(bool closed) {
@@ -461,16 +504,29 @@ static uint8_t sliderValueFromX(const Rect &rect, int16_t x, uint8_t maxValue) {
static void handleSettingsTouch(int16_t x, int16_t y) {
if (contains(kLimitSlider, x, y)) {
gLimitIndex = sliderValueFromX(kLimitSlider, x, 4);
uint8_t next = sliderValueFromX(kLimitSlider, x, 4);
if (next == gLimitIndex) {
return;
}
gLimitIndex = next;
} else if (contains(kTickSlider, x, y)) {
gTickVolume = sliderValueFromX(kTickSlider, x, 10);
uint8_t next = sliderValueFromX(kTickSlider, x, 10);
if (next == gTickVolume) {
return;
}
gTickVolume = next;
playCycleTick();
} else if (contains(kAlertSlider, x, y)) {
gAlertVolume = sliderValueFromX(kAlertSlider, x, 10);
uint8_t next = sliderValueFromX(kAlertSlider, x, 10);
if (next == gAlertVolume) {
return;
}
gAlertVolume = next;
playAlertBeep();
} else {
return;
}
saveSettings();
gNeedRedraw = true;
}
@@ -510,6 +566,7 @@ void setup() {
Serial.begin(115200);
Wire.begin(PIN_I2C_SDA, PIN_I2C_SCL);
pinMode(PIN_USER_BTN, INPUT_PULLUP);
loadSettings();
initAudio();
gfx->begin();
@@ -73,7 +73,11 @@ After tapping `START`:
- UI shows current cycle duration, arithmetic average duration over the last 5 completed cycles, and elapsed time from start
- the physical user/BOOT button opens and closes the settings screen
- settings screen has three touch sliders: limit `5/7/10/15/20` seconds, quiet cycle tick volume `0..10`, and alert volume `0..10`
- settings are persisted in NVS and restored after power off/on
- quiet cycle tick volume uses a compressed quiet scale: previous low audible levels are moved near `9..10`
- alert volume uses a gentler low range; level `5` equals the previous maximum alert level
- the working screen uses a static frame and only updates value regions to avoid display flicker
- the main screen header/status line and the bottom short-average streak line redraw only when their text changes
- the `START` button is a flat rounded rectangle with a border; there is no pause button in this version
- every new cycle start plays one quiet confirmation beep
- if the arithmetic average of the last up to 5 completed cycles is shorter than the selected limit, the device plays warning beeps: 1 beep for the first short average in a row, 2 beeps for the second, up to 5 beeps
@@ -116,7 +116,7 @@ public final class UserProfileStateDAO {
String sql;
if ("owned".equals(mode)) {
sql="""
SELECT cn.owner_login, cn.slug, cn.display_name, cn.ava_ar, cn.owner_bch_name,
SELECT cn.owner_login, cn.slug, cn.display_name, cn.ava_ar, cn.ava_sha256, cn.owner_bch_name,
cn.channel_root_block_number, encode(cn.channel_root_block_hash,'hex') root_hash,
cn.is_deleted, cn.deleted_at_ms, cn.deleted_block_number
FROM channel_names_state cn
@@ -125,7 +125,7 @@ public final class UserProfileStateDAO {
""";
} else if ("following".equals(mode)) {
sql="""
SELECT DISTINCT cn.owner_login, cn.slug, cn.display_name, cn.ava_ar, cn.owner_bch_name,
SELECT DISTINCT cn.owner_login, cn.slug, cn.display_name, cn.ava_ar, cn.ava_sha256, cn.owner_bch_name,
cn.channel_root_block_number, encode(cn.channel_root_block_hash,'hex') root_hash,
cn.is_deleted, cn.deleted_at_ms, cn.deleted_block_number
FROM connections_state cs
@@ -142,7 +142,7 @@ public final class UserProfileStateDAO {
ps.setString(1,login); ps.setBoolean(2,includeDeleted); ps.setInt(3,safeLimit); ps.setInt(4,safeOffset);
try(ResultSet rs=ps.executeQuery()){
while(rs.next()) out.add(new ChannelCard(
rs.getString("owner_login"), rs.getString("slug"), rs.getString("display_name"), rs.getString("ava_ar"),
rs.getString("owner_login"), rs.getString("slug"), rs.getString("display_name"), rs.getString("ava_ar"), rs.getString("ava_sha256"),
rs.getString("owner_bch_name"), rs.getInt("channel_root_block_number"), rs.getString("root_hash"),
rs.getBoolean("is_deleted"), rs.getLong("deleted_at_ms"), (Integer) rs.getObject("deleted_block_number")
));
@@ -154,5 +154,5 @@ public final class UserProfileStateDAO {
private static ProfileCard map(ResultSet rs)throws SQLException{return new ProfileCard(rs.getString("login"),rs.getString("first_name"),rs.getString("last_name"),rs.getString("ava_ar"),rs.getString("account_role"),rs.getString("shine_status"));}
public record ProfileCard(String login,String firstName,String lastName,String avatarAr,String accountRole,String shineStatus){}
public record RelationCard(String login,String firstName,String lastName,String avatarAr,String accountRole,String shineStatus,boolean primaryConfirmed,boolean shineConfirmed,String relationType,int primaryConfirmationsCount,int shineConfirmationsCount){}
public record ChannelCard(String ownerLogin,String slug,String displayName,String avatarAr,String ownerBlockchainName,int rootBlockNumber,String rootBlockHashHex,boolean deleted,long deletedAtMs,Integer deletedBlockNumber){}
public record ChannelCard(String ownerLogin,String slug,String displayName,String avatarAr,String avatarSha256,String ownerBlockchainName,int rootBlockNumber,String rootBlockHashHex,boolean deleted,long deletedAtMs,Integer deletedBlockNumber){}
}
@@ -72,7 +72,7 @@ public final class ChannelMetaTextParser {
String ar = String.valueOf(fields.getOrDefault("ar", "")).trim();
String sha256 = String.valueOf(fields.getOrDefault("sha256", "")).trim().toLowerCase();
String sizeRaw = String.valueOf(fields.containsKey("sz") ? fields.get("sz") : fields.getOrDefault("size", "")).trim();
if (!ar.matches("^[A-Za-z0-9_-]{43}$")) throw new IllegalArgumentException("bad_channel_meta_avatar_ar");
if (!ar.isEmpty() && !ar.matches("^[A-Za-z0-9_-]{43}$")) throw new IllegalArgumentException("bad_channel_meta_avatar_ar");
if (!sha256.matches("^[0-9a-f]{64}$")) throw new IllegalArgumentException("bad_channel_meta_avatar_sha256");
long size;
try {
@@ -6,6 +6,7 @@ import server.logic.ws_protocol.JSON.entyties.Net_Response;
import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler;
import server.logic.ws_protocol.JSON.handlers.connections.entyties.Net_GetUserConnectionsGraph_Request;
import server.logic.ws_protocol.JSON.handlers.connections.entyties.Net_GetUserConnectionsGraph_Response;
import server.logic.ws_protocol.JSON.handlers.profile.AvatarValueParser;
import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory;
import server.logic.ws_protocol.WireCodes;
import shine.db.MsgSubType;
@@ -234,7 +235,7 @@ public class Net_GetUserConnectionsGraph_Handler implements JsonMessageHandler {
meta.accountRole=rs.getString("account_role"); meta.shineStatus=rs.getString("shine_status");
meta.gender=normalizeGender(rs.getString("gender_value")); meta.official="primary".equals(meta.accountRole); meta.shine="shining".equals(meta.shineStatus);
meta.primaryConfirmationsCount=rs.getInt("primary_confirmations_count"); meta.shineConfirmationsCount=rs.getInt("shine_confirmations_count");
meta.avatarAr=extractArAvatarTxId(rs.getString("avatar_value")); out.put(normKey(login),meta);
meta.avatarValue=String.valueOf(rs.getString("avatar_value") == null ? "" : rs.getString("avatar_value")); out.put(normKey(login),meta);
}}
}
return out;
@@ -291,11 +292,12 @@ public class Net_GetUserConnectionsGraph_Handler implements JsonMessageHandler {
return txId;
}
private Net_GetUserConnectionsGraph_Response.AvatarItem makeAvatarItem(String avatarAr) {
String txId = String.valueOf(avatarAr == null ? "" : avatarAr).trim();
if (txId.isEmpty()) return null;
private Net_GetUserConnectionsGraph_Response.AvatarItem makeAvatarItem(String avatarValue) {
AvatarValueParser.Parsed parsed = AvatarValueParser.parse(avatarValue);
if (!parsed.ok()) return null;
Net_GetUserConnectionsGraph_Response.AvatarItem avatar = new Net_GetUserConnectionsGraph_Response.AvatarItem();
avatar.setAr(txId);
avatar.setAr(parsed.ar());
avatar.setSha256Hex(parsed.sha256Hex());
return avatar;
}
@@ -315,7 +317,7 @@ public class Net_GetUserConnectionsGraph_Handler implements JsonMessageHandler {
it.setLogin(clean);
it.setGender(gender);
it.setGenderLabel(genderLabel(gender));
it.setAvatar(makeAvatarItem(meta == null ? null : meta.avatarAr));
it.setAvatar(makeAvatarItem(meta == null ? null : meta.avatarValue));
items.add(it);
}
return items;
@@ -354,7 +356,7 @@ public class Net_GetUserConnectionsGraph_Handler implements JsonMessageHandler {
it.setShine(shine);
it.setOfficialLabel(official ? "официальный" : "неофициальный");
it.setShineLabel(shine ? "сияющий" : "несияющий");
it.setAvatar(makeAvatarItem(meta == null ? null : meta.avatarAr));
it.setAvatar(makeAvatarItem(meta == null ? null : meta.avatarValue));
items.add(it);
}
return items;
@@ -370,6 +372,6 @@ public class Net_GetUserConnectionsGraph_Handler implements JsonMessageHandler {
private int shineConfirmationsCount = 0;
private boolean official = false;
private boolean shine = false;
private String avatarAr = null;
private String avatarValue = "";
}
}
@@ -6,6 +6,7 @@ import server.logic.ws_protocol.JSON.entyties.Net_Response;
import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler;
import server.logic.ws_protocol.JSON.handlers.connections.entyties.Net_ListContacts_Request;
import server.logic.ws_protocol.JSON.handlers.connections.entyties.Net_ListContacts_Response;
import server.logic.ws_protocol.JSON.handlers.profile.AvatarValueParser;
import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory;
import server.logic.ws_protocol.WireCodes;
import shine.db.dao.DmDialogStateDAO;
@@ -59,12 +60,12 @@ public class Net_ListContacts_Handler implements JsonMessageHandler {
}
private static Net_ListContacts_Response.Avatar parseAvatar(String value) {
Net_ListContacts_Response.Avatar out = new Net_ListContacts_Response.Avatar();
String raw = value == null ? "" : value.trim();
java.util.regex.Matcher ar = java.util.regex.Pattern.compile("AR:([A-Za-z0-9_-]{43})").matcher(raw);
if (ar.find()) out.setAr(ar.group(1));
java.util.regex.Matcher sha = java.util.regex.Pattern.compile("SHA256:([A-Fa-f0-9]{64})").matcher(raw);
if (sha.find()) out.setSha256Hex(sha.group(1).toLowerCase());
AvatarValueParser.Parsed parsed = AvatarValueParser.parse(value);
if (!parsed.ok()) return out;
out.setAr(parsed.ar());
out.setSha256Hex(parsed.sha256Hex());
return out;
}
}
@@ -39,9 +39,12 @@ public class Net_GetUserConnectionsGraph_Response extends Net_Response {
public static class AvatarItem {
private String ar;
private String sha256Hex;
public String getAr() { return ar; }
public void setAr(String ar) { this.ar = ar; }
public String getSha256Hex() { return sha256Hex; }
public void setSha256Hex(String sha256Hex) { this.sha256Hex = sha256Hex; }
}
public static class RelativeItem {
@@ -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;
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;
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_Response;
import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler;
import server.logic.ws_protocol.JSON.handlers.profile.AvatarValueParser;
import server.logic.ws_protocol.JSON.messages.entyties.Net_GetDirectMessages_Request;
import server.logic.ws_protocol.JSON.messages.entyties.Net_GetDirectMessages_Response;
import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory;
@@ -135,19 +136,12 @@ public class Net_GetDirectMessages_Handler implements JsonMessageHandler {
}
private static Net_GetDirectMessages_Response.Avatar parseAvatar(String value) {
Net_GetDirectMessages_Response.Avatar out = new Net_GetDirectMessages_Response.Avatar();
String raw = value == null ? "" : value.trim();
// Do not call Matcher.find() twice on the same matcher: the first successful
// call advances it and the second one can make a perfectly valid avatar vanish.
java.util.regex.Matcher ar = java.util.regex.Pattern.compile("AR:([A-Za-z0-9_-]{43})").matcher(raw);
if (ar.find()) {
out.setAr(ar.group(1));
}
java.util.regex.Matcher sha = java.util.regex.Pattern.compile("SHA256:([A-Fa-f0-9]{64})").matcher(raw);
if (sha.find()) {
out.setSha256Hex(sha.group(1).toLowerCase());
}
AvatarValueParser.Parsed parsed = AvatarValueParser.parse(value);
if (!parsed.ok()) return out;
out.setAr(parsed.ar());
out.setSha256Hex(parsed.sha256Hex());
return out;
}
}
+2 -2
View File
@@ -1,2 +1,2 @@
client.version=1.14.13
server.version=1.12.12
client.version=1.14.15
server.version=1.12.13
+8
View File
@@ -310,3 +310,11 @@
- Старый custom `SHINE-ARCHIVE` pipeline удалён. Добавлены standard ANS-104 bundle publisher через существующий Arweave L1 uploader и GraphQL importer.
- Импортированные из Arweave blocks не публикуются повторно; дедупликация идёт по `data_item_id`.
- ESP32 и связанный device code этим изменением не затронуты.
## 2026-10-07 — браузерный инспектор «Мой блокчейн»
- Основание: patch archive, commit hash отсутствует.
- Формат блокчейна и серверный API не менялись.
- Экран «Мой блокчейн» теперь запрашивает уже существующее поле `blockBytesB64` и разбирает полный ANS-104 DataItem / SHiNE Frame v1 непосредственно в браузере.
- Для текущих TECH/TEXT/REACTION/CONNECTION/USER_PROFILE/STATUS_ACTION событий добавлены человекочитаемые подписи, компактный preview и раскрываемые детали.
- Arweave DataItem ID вычисляется локально как `SHA-256(signature64)` и используется для ссылки `https://arweave.net/<DataItemID>`.
+4 -1
View File
@@ -39,7 +39,7 @@
}());
</script>
<script>
window.__SHINE_BUILD_HASH__ = '20260901134200';
window.__SHINE_BUILD_HASH__ = '20261007230300';
window.__SHINE_CLIENT_VERSION__ = '1.2.10';
</script>
<script>
@@ -274,6 +274,9 @@ window.__SHINE_BUILD_HASH__ = '20260901134200';
const shell = document.createElement('div');
shell.id = menuId;
shell.className = 'modal-shell boot-error-menu-shell';
// Красная строка BOOT ERROR имеет z-index 999999. Меню ошибки должно
// всегда находиться поверх неё, не меняя слои остальных модальных окон.
shell.style.zIndex = '1000000';
shell.innerHTML = `
<div class="modal-backdrop" data-action="close"></div>
<div class="modal-dialog boot-error-menu-dialog" role="dialog" aria-modal="true" aria-labelledby="boot-error-menu-title" tabindex="-1">
+7 -7
View File
@@ -53,17 +53,17 @@ import {
setContacts,
} from './state.js';
import * as startView from './pages/start-view.js?v=202609260900';
import * as startView from './pages/start-view.js?v=202610072303';
import * as entrySettingsView from './pages/entry-settings-view.js?v=202609260900';
import * as registerView from './pages/register-view.js?v=202609260900';
import * as registrationFaqView from './pages/registration-faq-view.js?v=202609260900';
import * as registrationFaqView from './pages/registration-faq-view.js?v=202610072303';
import * as registrationPaymentView from './pages/registration-payment-view.js?v=202606180940';
import * as registrationDraftKeysView from './pages/registration-draft-keys-view.js';
import * as topupView from './pages/topup-view.js';
import * as devnetTopupView from './pages/devnet-topup-view.js';
import * as loginView from './pages/login-view.js?v=202609260900';
import * as loginCameraView from './pages/login-camera-view.js';
import * as loginOtherDeviceView from './pages/login-other-device-view.js?v=202606180940';
import * as loginOtherDeviceView from './pages/login-other-device-view.js?v=202610072303';
import * as loginPasswordView from './pages/login-password-view.js?v=202606201650';
import * as publicSupportQueueView from './pages/public-support-queue-view.js';
@@ -80,10 +80,10 @@ import * as advancedSettingsView from './pages/advanced-settings-view.js';
import * as serverSettingsView from './pages/server-settings-view.js?v=202609260900';
import * as arweaveUploadsView from './pages/arweave-uploads-view.js';
import * as remoteAddBlockSessionView from './pages/remote-addblock-session-view.js?v=202606281300';
import * as deviceView from './pages/device-view.js?v=202609260900';
import * as connectDeviceView from './pages/connect-device-view.js?v=202606142055';
import * as clientPairingView from './pages/device-pairing-view.js?v=202609260900';
import * as trustedDeviceLoginSettingsView from './pages/trusted-device-login-settings-view.js?v=202609260900';
import * as deviceView from './pages/device-view.js?v=202610072303';
import * as connectDeviceView from './pages/connect-device-view.js?v=202610072303';
import * as clientPairingView from './pages/device-pairing-view.js?v=202610072303';
import * as trustedDeviceLoginSettingsView from './pages/trusted-device-login-settings-view.js?v=202610072303';
import { applyThemeMode, watchSystemTheme } from './services/theme-service.js';
import * as deviceQrView from './pages/device-qr-view.js';
import * as deviceCameraView from './pages/device-camera-view.js';
@@ -168,7 +168,7 @@ function writeLastWalletId(login, walletId) {
}
}
async function resizeImageFileToAvatar(file) {
export async function prepareAvatarImageFile(file) {
const source = file instanceof File ? file : null;
if (!source) throw new Error('Выберите изображение.');
const dataUrl = await new Promise((resolve, reject) => {
@@ -218,19 +218,27 @@ export function openArweaveAttachmentManager({
initialSha256 = '',
initialName = '',
fixedFile = false,
autoOpenFileDialog = true,
autoOpenFileDialog = false,
shineType = '',
extraUploadTags = [],
signal = null,
hostElement = null,
embedded = false,
} = {}) {
const cleanLogin = String(login || '').trim();
const cleanStoragePwd = String(storagePwd || '').trim();
const cleanGateway = String(gateway || 'https://arweave.net').trim();
if (!cleanLogin || !cleanStoragePwd) return Promise.reject(new Error('Нет активной сессии.'));
const root = document.createElement('div');
root.className = 'ar-attachment-manager-root';
document.body.append(root);
const embeddedHost = hostElement instanceof HTMLElement ? hostElement : null;
const isEmbedded = Boolean(embeddedHost || embedded);
const root = embeddedHost || document.createElement('div');
if (!embeddedHost) {
root.className = 'ar-attachment-manager-root';
document.body.append(root);
} else {
root.classList.add('ar-attachment-manager-embedded-root');
}
let closed = false;
let wallets = [];
@@ -272,7 +280,8 @@ export function openArweaveAttachmentManager({
function close(resolve, result = null) {
if (closed) return;
closed = true;
root.remove();
if (embeddedHost) root.replaceChildren();
else root.remove();
resolve(result);
}
@@ -295,7 +304,12 @@ export function openArweaveAttachmentManager({
const onAbort = () => close(resolve, null);
if (signal?.aborted) { onAbort(); return; }
signal?.addEventListener('abort', onAbort, { once: true });
const shellOpen = (extraClass = '') => isEmbedded
? `<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 = () => {
if (isEmbedded) return;
const modal = root.querySelector('[data-ar-attach-modal="true"]');
modal?.addEventListener('click', (event) => {
if (event.target === modal) close(resolve, null);
@@ -303,7 +317,7 @@ export function openArweaveAttachmentManager({
};
const renderWalletOptions = () => wallets.map((wallet) => (
`<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('');
const loadWallets = async (errorEl = null) => {
@@ -332,28 +346,38 @@ export function openArweaveAttachmentManager({
}
};
const updateBalanceButton = () => {
const button = root.querySelector('[data-action="check-balance"]');
if (!button) return;
if (isTurboUpload()) {
button.textContent = balanceInfo
? `Баланс Turbo: ${formatTurboCredits(balanceInfo.effectiveCredits, 6)}`
: 'Проверить баланс Turbo';
return;
}
button.textContent = balanceInfo
? `Баланс Arweave: ${Number(balanceInfo.ar || 0).toLocaleString('ru-RU', { maximumFractionDigits: 6 })} AR`
: 'Проверить баланс Arweave';
};
const renderTurboMeta = (mainMetaEl) => {
updateBalanceButton();
if (!mainMetaEl) return;
const turboAddress = String(balanceInfo?.address || priceInfo?.address || '').trim();
const turboCredits = balanceInfo ? formatTurboCredits(balanceInfo.effectiveCredits, 6) : '–';
const solBalance = balanceInfo ? `${escapeHtml(String(balanceInfo.solBalance ?? 0))} SOL` : '–';
const uploadPrice = priceInfo ? `${formatTurboCredits(priceInfo.credits, 6)} credits` : '–';
const fileSize = selectedFile ? formatBytes(selectedFile.size) : '–';
const isFreeSize = selectedFile && Number(selectedFile.size || 0) <= getFreeTurboUploadBytesLimit();
const summary = selectedFile
? `Размер ${escapeHtml(fileSize)} · ${isFreeSize
? '<span class="ar-attachment-ok">бесплатно через Turbo</span>'
: `нужен баланс Turbo: ${escapeHtml(uploadPrice)}`}`
: '';
if (!selectedFile) {
mainMetaEl.innerHTML = '';
return;
}
const uploadPrice = priceInfo ? `${formatTurboCredits(priceInfo.credits, 6)} credits` : '';
const fileSize = formatBytes(selectedFile.size);
const isFreeSize = Number(selectedFile.size || 0) <= getFreeTurboUploadBytesLimit();
mainMetaEl.innerHTML = `
${summary ? `<div class="ar-attachment-summary">${summary}</div>` : ''}
<div class="ar-attachment-summary">Размер ${escapeHtml(fileSize)} · ${isFreeSize
? '<span class="ar-attachment-ok">бесплатно через Turbo</span>'
: (uploadPrice ? `цена Turbo: ${escapeHtml(uploadPrice)}` : 'проверяем цену…')}</div>
<details class="ar-attachment-details">
<summary>Подробнее</summary>
<div>Turbo-адрес: ${escapeHtml(shortAddress(turboAddress || '–'))}</div>
<div>Баланс Turbo: ${escapeHtml(turboCredits)}</div>
<div>SOL на этом ключе: ${solBalance}</div>
<div>SHA-256: ${escapeHtml(selectedSha256 || '–')}</div>
<div>Цена Turbo: ${escapeHtml(uploadPrice)}</div>
${uploadPrice ? `<div>Цена Turbo: ${escapeHtml(uploadPrice)}</div>` : ''}
<div>Бесплатно до ${escapeHtml(formatBytes(getFreeTurboUploadBytesLimit()))}</div>
</details>
`;
@@ -376,31 +400,109 @@ export function openArweaveAttachmentManager({
};
const promptTurboTopUp = async (mainMetaEl, errorEl) => {
const value = window.prompt('Сколько SOL перевести в Turbo?', '0.01');
if (value == null) return;
setText(errorEl, 'Пополняем Turbo...');
try {
const result = await topUpTurboWithSolana({
login: cleanLogin,
storagePwd: cleanStoragePwd,
keySource: selectedTurboKeySource,
amountSol: value,
await refreshTurboBalance(mainMetaEl, errorEl);
const previous = document.getElementById('turbo-topup-modal');
previous?.remove();
const overlay = document.createElement('div');
overlay.id = 'turbo-topup-modal';
overlay.className = 'modal ar-balance-modal';
const sol = String(balanceInfo?.solBalance ?? '–');
const credits = balanceInfo ? formatTurboCredits(balanceInfo.effectiveCredits, 6) : '–';
const address = String(balanceInfo?.address || '').trim();
overlay.innerHTML = `
<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 {
const result = await topUpTurboWithSolana({
login: cleanLogin,
storagePwd: cleanStoragePwd,
keySource: selectedTurboKeySource,
amountSol: amount,
});
await refreshTurboBalance(mainMetaEl, errorEl);
setText(errorEl, `Turbo пополнен. Tx: ${result.txId || 'отправлено'}`);
finish();
} catch (error) {
setText(localError, error?.message || 'Не удалось пополнить Turbo.');
if (btn) btn.disabled = false;
}
});
await refreshTurboBalance(mainMetaEl, errorEl);
setText(errorEl, `Turbo пополнен. Tx: ${result.txId || 'отправлено'}`);
} catch (error) {
setText(errorEl, error?.message || 'Не удалось пополнить Turbo.');
});
};
const showArweaveTopUp = async (mainMetaEl, errorEl) => {
const wallet = selectedWallet();
if (!wallet?.address) {
setText(errorEl, 'Выберите Arweave-кошелёк.');
return;
}
try {
balanceInfo = await getArweaveBalance({ gateway: cleanGateway, address: wallet.address });
renderArweaveMeta(mainMetaEl);
} catch {
// Адрес всё равно можно показать для пополнения.
}
const previous = document.getElementById('arweave-topup-modal');
previous?.remove();
const overlay = document.createElement('div');
overlay.id = 'arweave-topup-modal';
overlay.className = 'modal ar-balance-modal';
overlay.innerHTML = `
<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) => {
updateBalanceButton();
if (!mainMetaEl) return;
if (!selectedFile) {
mainMetaEl.innerHTML = '';
return;
}
mainMetaEl.innerHTML = `
${isAvatarMode ? '' : `<div>Имя: ${escapeHtml(selectedFile?.name || 'file')}</div>`}
<div>Размер: ${escapeHtml(formatBytes(selectedFile?.size || 0))}</div>
${isAvatarMode ? '' : `<div>Имя: ${escapeHtml(selectedFile.name || 'file')}</div>`}
<div>Размер: ${escapeHtml(formatBytes(selectedFile.size || 0))}</div>
<div>SHA-256: ${escapeHtml(selectedSha256 || '–')}</div>
<div>Цена: ${escapeHtml(Number(priceInfo?.ar || 0).toLocaleString('ru-RU', { maximumFractionDigits: 6 }))} AR</div>
<div>Баланс кошелька: ${escapeHtml(Number(balanceInfo?.ar || 0).toLocaleString('ru-RU', { maximumFractionDigits: 6 }))} AR</div>
${priceInfo ? `<div>Цена: ${escapeHtml(Number(priceInfo.ar || 0).toLocaleString('ru-RU', { maximumFractionDigits: 6 }))} AR</div>` : ''}
`;
};
@@ -478,31 +580,26 @@ export function openArweaveAttachmentManager({
const uploadText = effectiveUploadButtonLabel || (historyOnly ? 'Загрузить в журнал' : 'Загрузить');
const canShowHistory = allowHistorySelection;
const canShowExisting = allowExistingTxInput;
root.innerHTML = `
<div class="modal" data-ar-attach-modal="true">
<div class="modal-card stack ar-attachment-manager-card">
<div class="ar-attachment-manager-head">
root.innerHTML = `${shellOpen()}
${isEmbedded ? '' : `<div class="ar-attachment-manager-head">
<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>
</div>
</div>`}
<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-arweave">Свой кошелёк</button>
<button class="tab-btn" role="radio" aria-checked="${!turboMode}" type="button" data-action="switch-arweave">Напрямую в Arweave</button>
</div>
${turboMode
? `
<p class="ar-attachment-note">Маленькие файлы и аватары через Turbo пока загружаются бесплатно. Для больших файлов пополните Turbo со своего SOL-кошелька.</p>
<div class="form-field">
<span class="meta-muted">Подпись и пополнение: ключ блокчейна пользователя.</span>
</div>
<p class="ar-attachment-note"><strong>Turbo</strong> — более удобный способ загрузки файлов в Arweave через сторонний сервис. Обычно дешевле прямой загрузки. Файлы до 100 КБ загружаются бесплатно.</p>
`
: `
<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>
<button class="text-btn ar-attachment-link" type="button" data-action="add-wallet">+ Добавить кошелёк</button>
</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 ? `
<div class="ar-attachment-alt-sources">
@@ -517,11 +614,10 @@ export function openArweaveAttachmentManager({
<div class="ar-attachment-meta" data-meta-main="true"></div>
<p class="meta-muted inline-error" data-error="true"></p>
<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">Проверить баланс Turbo</button><button class="secondary-btn" type="button" data-action="topup">Пополнить Turbo</button>' : '<button class="secondary-btn" type="button" data-action="check-balance">Проверить баланс Arweave</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>
</div>
</div>
</div>
${shellClose()}
`;
bindBackdrop();
const walletEl = root.querySelector('#ar-attach-wallet');
@@ -580,6 +676,25 @@ export function openArweaveAttachmentManager({
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) {
root.querySelector('[data-action="add-wallet"]')?.addEventListener('click', showAddWallet);
}
@@ -603,7 +718,7 @@ export function openArweaveAttachmentManager({
throw new Error('Для аватара можно выбрать только изображение.');
}
if (isAvatarMode) {
selectedFile = await resizeImageFileToAvatar(selectedFile);
selectedFile = await prepareAvatarImageFile(selectedFile);
}
const buffer = await selectedFile.arrayBuffer();
selectedSha256 = await sha256HexFromArrayBuffer(buffer);
@@ -687,9 +802,7 @@ export function openArweaveAttachmentManager({
};
const showExisting = () => {
root.innerHTML = `
<div class="modal" data-ar-attach-modal="true">
<div class="modal-card stack ar-attachment-manager-card">
root.innerHTML = `${shellOpen()}
<h3 class="modal-title">${isAvatarMode ? 'Существующий аватар Arweave' : 'Существующий файл Arweave'}</h3>
<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" />
@@ -703,8 +816,7 @@ export function openArweaveAttachmentManager({
<button class="secondary-btn" type="button" data-action="back">Назад</button>
<button class="primary-btn" type="button" data-action="check">Скачать и проверить</button>
</div>
</div>
</div>
${shellClose()}
`;
bindBackdrop();
const txEl = root.querySelector('#ar-existing-txid');
@@ -757,9 +869,7 @@ export function openArweaveAttachmentManager({
.filter((item) => purposeFilter === 'avatar' ? item.purpose === 'avatar' : item.purpose !== 'avatar')
.slice()
.reverse();
root.innerHTML = `
<div class="modal" data-ar-attach-modal="true">
<div class="modal-card stack ar-attachment-manager-card ar-attachment-manager-card--wide">
root.innerHTML = `${shellOpen('ar-attachment-manager-card--wide')}
<h3 class="modal-title">Журнал загруженных файлов</h3>
<p class="meta-muted">Журнал хранится только в этой браузерной сессии.</p>
<div class="ar-attachment-history-tiles" data-history-scroll="true">
@@ -783,8 +893,7 @@ export function openArweaveAttachmentManager({
<div class="form-actions-grid">
<button class="secondary-btn" type="button" data-action="back">Назад</button>
</div>
</div>
</div>
${shellClose()}
`;
bindBackdrop();
const scrollEl = root.querySelector('[data-history-scroll="true"]');
@@ -816,9 +925,7 @@ export function openArweaveAttachmentManager({
};
const showAddWallet = () => {
root.innerHTML = `
<div class="modal" data-ar-attach-modal="true">
<div class="modal-card stack ar-attachment-manager-card">
root.innerHTML = `${shellOpen()}
<h3 class="modal-title">Добавить Arweave-кошелёк</h3>
<p class="meta-muted">Вставьте JSON JWK или короткую строку base64url(JSON JWK). Ключ будет сохранён в зашифрованном контейнере ключей этого пользователя на устройстве.</p>
<label class="meta-muted" for="ar-wallet-label">Название</label>
@@ -830,8 +937,7 @@ export function openArweaveAttachmentManager({
<button class="secondary-btn" type="button" data-action="back">Назад</button>
<button class="primary-btn" type="button" data-action="save">Добавить</button>
</div>
</div>
</div>
${shellClose()}
`;
bindBackdrop();
const labelEl = root.querySelector('#ar-wallet-label');
+24 -3
View File
@@ -1,6 +1,7 @@
import { state } from '../state.js';
import { buildArweaveDataUrl, validateArweaveTxId, validateSha256Hex } from '../services/arweave-file-service.js';
import { getCachedAvatarObjectUrl } from '../services/arweave-avatar-cache-service.js';
import { resolvePublicFileUrl } from '../services/public-file-service.js';
function normalizeLogin(value) {
return String(value || '').trim();
@@ -37,6 +38,7 @@ export function renderAvatar({
alt = 'Аватар',
glow = false,
official = false,
authorLogin = '',
} = {}) {
const wrap = document.createElement('div');
const classes = new Set(['avatar', 'avatar-image', 'avatar-framed']);
@@ -63,11 +65,11 @@ export function renderAvatar({
}
const txId = String(avatar?.ar || '').trim();
if (!validateArweaveTxId(txId)) {
return wrap;
}
const sha256Hex = String(avatar?.sha256Hex || avatar?.sha256 || '').trim().toLowerCase();
const expectedSha256Hex = validateSha256Hex(sha256Hex) ? sha256Hex : '';
const hasArweave = validateArweaveTxId(txId);
const hasServerAvatar = !txId && expectedSha256Hex && normalizeLogin(authorLogin);
if (!hasArweave && !hasServerAvatar) return wrap;
const img = document.createElement('img');
img.className = 'avatar-photo';
@@ -81,6 +83,23 @@ export function renderAvatar({
};
setLoadedState(false);
if (hasServerAvatar) {
void resolvePublicFileUrl({
sha256: expectedSha256Hex,
authorLogin: normalizeLogin(authorLogin),
solanaEndpoint: state?.entrySettings?.solanaServer,
fallbackServerLogin: state?.entrySettings?.shineServerLogin,
}).then((url) => {
img.onload = () => setLoadedState(true);
img.onerror = () => { img.removeAttribute('src'); setLoadedState(false); };
img.src = url;
}).catch(() => {
img.removeAttribute('src');
setLoadedState(false);
});
return wrap;
}
const gateway = state?.entrySettings?.arweaveServer;
void getCachedAvatarObjectUrl({ gateway, txId, expectedSha256Hex })
.then((objectUrl) => {
@@ -157,6 +176,7 @@ export function renderUserAvatar({
title = '',
glow = false,
official = false,
authorLogin = '',
} = {}) {
return renderAvatar({
initials: buildAvatarInitials({ login, firstName, lastName }),
@@ -167,5 +187,6 @@ export function renderUserAvatar({
alt: 'Аватар',
glow,
official,
authorLogin: login,
});
}
+5 -7
View File
@@ -1,5 +1,5 @@
import { openArweaveAttachmentManager } from './arweave-attachment-manager.js';
import { saveProfileAvatarArweave } from '../services/user-profile-params.js';
import { openChannelAttachmentManager } from './channel-attachment-manager.js';
import { saveProfileAvatar } from '../services/user-profile-params.js';
export async function openAvatarWizard({
login,
@@ -16,22 +16,20 @@ export async function openAvatarWizard({
throw new Error('Нет активной сессии.');
}
const item = await openArweaveAttachmentManager({
const item = await openChannelAttachmentManager({
login: cleanLogin,
storagePwd: cleanStoragePwd,
gateway: cleanGateway,
navigate,
mode: 'avatar',
historyPurpose: 'avatar',
});
if (!item?.ar || !item?.sha256) return false;
if (!item?.sha256 || !item?.size) return false;
if (typeof onStatus === 'function') {
onStatus('Сохраняем аватар в профиль...');
}
await saveProfileAvatarArweave(cleanLogin, item.ar, item.sha256);
await saveProfileAvatar(cleanLogin, item);
if (typeof onAvatarSaved === 'function') {
await onAvatarSaved(item);
@@ -1,4 +1,4 @@
import { openArweaveAttachmentManager } from './arweave-attachment-manager.js';
import { openArweaveAttachmentManager, prepareAvatarImageFile } from './arweave-attachment-manager.js';
import { formatBytes } from '../services/attachment-format.js';
import { uploadPublicFile } from '../services/public-file-service.js';
import { state } from '../state.js';
@@ -10,8 +10,10 @@ export function openChannelAttachmentManager({
gateway = '',
selectedTxIds = [],
signal = null,
mode = 'attachment',
} = {}) {
const cleanLogin = String(login || '').trim();
const isAvatarMode = String(mode || '').trim() === 'avatar';
const root = document.createElement('div');
root.className = 'public-attachment-manager-root';
document.body.append(root);
@@ -19,10 +21,14 @@ export function openChannelAttachmentManager({
let closed = false;
let selectedFile = null;
let uploading = false;
let arweaveStarted = false;
const arweaveAbortController = new AbortController();
if (signal) signal.addEventListener('abort', () => arweaveAbortController.abort(), { once: true });
const close = (resolve, value = null) => {
if (closed) return;
closed = true;
arweaveAbortController.abort();
root.remove();
resolve(value);
};
@@ -36,18 +42,18 @@ export function openChannelAttachmentManager({
<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="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>
</div>
<div class="public-attachment-manager__sources" role="radiogroup" aria-label="Место хранения файла">
<label class="public-attachment-manager__source is-selected">
<input type="radio" name="attachment-storage" value="server" checked />
<span><strong>Сервер доступа</strong><small>Бесплатно · пока доступно</small></span>
<span><strong>НА СВОЙ СЕРВЕР ДОСТУПА</strong><small>Бесплатно</small></span>
</label>
<label class="public-attachment-manager__source">
<input type="radio" name="attachment-storage" value="arweave" />
<span><strong>Arweave</strong><small>Постоянное децентрализованное хранение</small></span>
<span><strong>ARWEAVE</strong><small>Постоянное децентрализованное хранение</small></span>
</label>
</div>
@@ -59,16 +65,19 @@ export function openChannelAttachmentManager({
<p>Храните собственные копии важных вложений. Если сервер внезапно исчезнет, тот же исходный файл можно будет загрузить на другой сервер доступа: совпадающий SHA-256 позволит старым сообщениям снова найти правильные байты.</p>
<p>Сейчас у пользователя может быть только один сервер доступа. В расширенной версии SHiNE планируется поддержка нескольких серверов доступа, в том числе дополнительных оплачиваемых серверов.</p>
</div>
<input class="input" type="file" data-role="file" />
<div class="public-attachment-manager__selected meta-muted" data-role="selected">Файл не выбран.</div>
<label class="ar-attachment-file-picker public-attachment-manager__file-picker">
<input class="ar-attachment-file-input" type="file" data-role="file" ${isAvatarMode ? 'accept="image/*"' : ''} />
<span class="ar-attachment-file-btn">Выбрать файл</span>
<span class="ar-attachment-file-name" data-role="selected">Файл не выбран</span>
</label>
<div class="public-attachment-manager__status meta-muted" data-role="status"></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 class="public-attachment-manager__arweave" data-panel="arweave" hidden>
<p class="meta-muted">Файл будет загружен через существующий механизм Arweave/Turbo.</p>
<button class="primary-btn" type="button" data-action="arweave">Продолжить в Arweave</button>
<p class="meta-muted">Выберите Turbo — более удобный способ загрузки в Arweave через сторонний сервис — или прямую загрузку в сеть Arweave.</p>
<div class="public-attachment-manager__arweave-loading meta-muted">Открываем настройки Arweave…</div>
</div>
</div>
</div>
@@ -80,7 +89,6 @@ export function openChannelAttachmentManager({
const statusEl = root.querySelector('[data-role="status"]');
const errorEl = root.querySelector('[data-role="error"]');
const uploadButton = root.querySelector('[data-action="upload"]');
const arweaveButton = root.querySelector('[data-action="arweave"]');
const radios = [...root.querySelectorAll('input[name="attachment-storage"]')];
const setSource = (value) => {
@@ -91,7 +99,41 @@ export function openChannelAttachmentManager({
root.querySelector('[data-panel="arweave"]').hidden = value !== 'arweave';
};
radios.forEach((radio) => radio.addEventListener('change', () => setSource(radio.value)));
const openArweaveFlow = async () => {
if (arweaveStarted || closed) return;
arweaveStarted = true;
const hostElement = root.querySelector('[data-panel="arweave"]');
if (!(hostElement instanceof HTMLElement)) { arweaveStarted = false; return; }
try {
const item = await openArweaveAttachmentManager({
login: cleanLogin,
storagePwd,
gateway,
selectedTxIds,
signal: arweaveAbortController.signal,
mode: isAvatarMode ? 'avatar' : 'attachment',
historyPurpose: isAvatarMode ? 'avatar' : '',
autoOpenFileDialog: false,
hostElement,
embedded: true,
});
if (item && !closed) close(resolve, item);
} catch (error) {
arweaveStarted = false;
if (!closed && hostElement) {
hostElement.replaceChildren();
const message = document.createElement('p');
message.className = 'inline-error';
message.textContent = toUserMessage(error, 'Не удалось открыть Arweave.');
hostElement.append(message);
}
}
};
radios.forEach((radio) => radio.addEventListener('change', () => {
setSource(radio.value);
if (radio.value === 'arweave' && radio.checked) void openArweaveFlow();
}));
root.querySelector('[data-action="close"]')?.addEventListener('click', () => close(resolve, null));
modal?.addEventListener('click', (event) => {
if (event.target === modal && !uploading) close(resolve, null);
@@ -101,7 +143,7 @@ export function openChannelAttachmentManager({
selectedFile = fileInput.files?.[0] || null;
if (selectedEl) selectedEl.textContent = selectedFile
? `${selectedFile.name} · ${formatBytes(selectedFile.size)}`
: 'Файл не выбран.';
: 'Файл не выбран';
if (errorEl) errorEl.textContent = '';
if (statusEl) statusEl.textContent = '';
if (uploadButton) uploadButton.disabled = !selectedFile;
@@ -114,14 +156,15 @@ export function openChannelAttachmentManager({
fileInput.disabled = true;
if (errorEl) errorEl.textContent = '';
try {
const uploadFile = isAvatarMode ? await prepareAvatarImageFile(selectedFile) : selectedFile;
const item = await uploadPublicFile({
file: selectedFile,
file: uploadFile,
login: cleanLogin,
sessionId: state.session.sessionId,
wsUrl: state.entrySettings.shineServer,
onStatus: (message) => { if (statusEl) statusEl.textContent = message; },
});
close(resolve, item);
close(resolve, { ...item, purpose: isAvatarMode ? 'avatar' : 'attachment' });
} catch (error) {
if (errorEl) errorEl.textContent = toUserMessage(error, 'Не удалось загрузить файл.');
if (statusEl) statusEl.textContent = '';
@@ -131,28 +174,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';
import {
getArweaveAttachmentAvailability,
openArweaveAttachmentManager,
markArweaveAttachmentPlaced,
} from '../components/arweave-attachment-manager.js';
import { openChannelAttachmentManager } from '../components/channel-attachment-manager.js';
import { renderAvatar } from '../components/avatar-image.js';
import { makeShineChannelShortRoute } from '../services/shine-routes.js';
@@ -44,6 +44,7 @@ function renderAvatarPreview(slot, avatar, title) {
const wrap = renderAvatar({
initials: label.slice(0, 1).toUpperCase() || 'К',
avatar,
authorLogin: state.session.login,
size: 'xl',
className: 'channel-profile-avatar',
title: label,
@@ -170,17 +171,21 @@ export function render({navigate, chrome}) {
const renderAvatarStatus = (nameValue, titleValue) => {
renderAvatarPreview(avatarPreviewEl, selectedAvatar, titleValue || nameValue);
avatarRemoveBtn.hidden = !selectedAvatar?.ar;
if (!selectedAvatar?.ar) {
avatarRemoveBtn.hidden = !selectedAvatar?.sha256;
if (!selectedAvatar?.sha256) {
avatarStatusEl.innerHTML = '<p class="channel-avatar-status-text">Аватар канала не установлен.</p>';
return;
}
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 isPending = avatarAvailabilityLabel === 'pending' || avatarAvailabilityTxId !== txId;
avatarStatusEl.innerHTML = `
<p class="channel-avatar-status-text">Аватар канала</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-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>
`;
};
@@ -271,14 +276,13 @@ export function render({navigate, chrome}) {
descriptionEl.addEventListener('input', updateValidation);
avatarBtn.addEventListener('click', async () => {
try {
const nextAvatar = await openArweaveAttachmentManager({
const nextAvatar = await openChannelAttachmentManager({
login: state.session.login,
storagePwd: state.session.storagePwdInMemory,
gateway: state.entrySettings.arweaveServer,
mode: 'avatar',
historyPurpose: 'avatar',
});
if (nextAvatar?.ar) {
if (nextAvatar?.sha256) {
selectedAvatar = nextAvatar;
void refreshAvatarAvailability();
}
@@ -289,7 +293,7 @@ export function render({navigate, chrome}) {
});
avatarRemoveBtn.addEventListener('click', () => {
if (!selectedAvatar?.ar) return;
if (!selectedAvatar?.sha256) return;
const confirmed = window.confirm('Убрать аватар и сделать канал без аватара?');
if (!confirmed) return;
selectedAvatar = null;
+7 -5
View File
@@ -3,6 +3,7 @@ import { createTopBar } from '../components/topbar.js';
import { confirmDialog } from '../components/confirm-dialog.js';
import { renderAvatar } from '../components/avatar-image.js';
import { markArweaveAttachmentPlaced, openArweaveAttachmentManager } from '../components/arweave-attachment-manager.js';
import { openChannelAttachmentManager } from '../components/channel-attachment-manager.js';
import { authService, setChannelsFeed, state } from '../state.js';
import { navigateBack, getPreviousTrackedPath } from '../router.js';
import {
@@ -84,7 +85,7 @@ function formatChannelCreatedAt(value) {
function openChannelProfileEditor({ channel, selector, onSaved }) {
const root = document.getElementById('modal-root');
if (!root) return;
let selectedAvatar = String(channel?.avaAr || '').trim() ? {
let selectedAvatar = String(channel?.avaSha256 || '').trim() ? {
name: 'Аватар',
ar: String(channel.avaAr || '').trim(),
sha256: String(channel?.avaSha256 || '').trim(),
@@ -121,7 +122,8 @@ function openChannelProfileEditor({ channel, selector, onSaved }) {
slot.innerHTML = '';
slot.append(renderAvatar({
initials: (title || 'К').slice(0, 1).toUpperCase(),
avatar: selectedAvatar?.ar ? { ar: selectedAvatar.ar } : null,
avatar: selectedAvatar?.sha256 ? { ar: String(selectedAvatar.ar || ''), sha256Hex: selectedAvatar.sha256 } : null,
authorLogin: String(channel?.ownerLogin || state.session.login || '').trim(),
size: 'xl',
className: 'channel-about-avatar channel-profile-avatar',
title: title || 'Канал',
@@ -135,12 +137,11 @@ function openChannelProfileEditor({ channel, selector, onSaved }) {
root.querySelector('#channel-profile-edit-avatar')?.addEventListener('click', async () => {
const errorEl = root.querySelector('#channel-profile-edit-error');
try {
const item = await openArweaveAttachmentManager({
const item = await openChannelAttachmentManager({
login: state.session.login,
storagePwd: state.session.storagePwdInMemory,
gateway: state.entrySettings.arweaveServer,
mode: 'avatar',
historyPurpose: 'avatar',
});
if (!item) return;
selectedAvatar = item;
@@ -636,7 +637,8 @@ export function render({ navigate, route, chrome }) {
const channelAvatar = renderAvatar({
initials: cleanName.slice(0, 1).toUpperCase() || 'К',
avatar: String(channel?.avaAr || '').trim() ? { ar: String(channel.avaAr || '').trim() } : null,
avatar: String(channel?.avaAr || channel?.avaSha256 || '').trim() ? { ar: String(channel.avaAr || '').trim(), sha256Hex: String(channel?.avaSha256 || '').trim() } : null,
authorLogin: ownerLogin,
size: 'xl',
className: 'channel-about-avatar channel-profile-avatar',
title: cleanName,
+2 -2
View File
@@ -79,9 +79,9 @@ function createThreadAvatar(login) {
if (!avatarEl.isConnected) return;
const upgraded = renderUserAvatar({
login: cleanLogin,
avatar: snapshot?.avatar?.txId
avatar: snapshot?.avatar?.source
? {
ar: String(snapshot.avatar.txId || '').trim(),
ar: String(snapshot.avatar.txId || snapshot.avatar.ar || '').trim(),
sha256Hex: String(snapshot?.avatar?.sha256Hex || '').trim().toLowerCase(),
}
: null,
+14 -11
View File
@@ -25,8 +25,10 @@ import {
softHaptic,
} from '../services/channels-ux.js';
import { renderAvatar, renderUserAvatar } from '../components/avatar-image.js';
import { avatarReferenceToRenderModel, parseAvatarReference } from '../services/avatar-reference.js';
import { openChannelEditor } from '../components/channel-editor.js';
import { markArweaveAttachmentPlaced, openArweaveAttachmentManager } from '../components/arweave-attachment-manager.js';
import { openChannelAttachmentManager } from '../components/channel-attachment-manager.js';
import {
composeMessageWithAttachments,
createAttachmentCarouselElement,
@@ -105,9 +107,9 @@ function createMessageAvatar(login) {
if (!avatarEl.isConnected) return;
const upgraded = renderUserAvatar({
login: cleanLogin,
avatar: snapshot?.avatar?.txId
avatar: snapshot?.avatar?.source
? {
ar: String(snapshot.avatar.txId || '').trim(),
ar: String(snapshot.avatar.txId || snapshot.avatar.ar || '').trim(),
sha256Hex: String(snapshot?.avatar?.sha256Hex || '').trim().toLowerCase(),
}
: null,
@@ -619,10 +621,12 @@ function getStatusActionOptionsForTarget(targetMsgSubType) {
function createChannelAvatarElement(channel, size = 96) {
const txId = String(channel?.avaAr || '').trim();
const sha256 = String(channel?.avaSha256 || '').trim().toLowerCase();
const title = String(channel?.displayTitle || channel?.name || 'К').trim() || 'К';
const wrap = renderAvatar({
initials: title.slice(0, 1).toUpperCase() || 'К',
avatar: txId ? { ar: txId } : null,
avatar: (txId || sha256) ? { ar: txId, sha256Hex: sha256 } : null,
authorLogin: String(channel?.ownerLogin || '').trim(),
size: 'xl',
className: 'channel-profile-avatar',
title,
@@ -639,9 +643,7 @@ function openChannelMetaDetailsModal({
onEdit = null,
changedAtMs = 0,
} = {}) {
const avatarState = String(channel.avaAr || '').trim()
? 'Установлен'
: 'Не установлен';
const avatarState = String(channel.avaAr || channel.avaSha256 || '').trim() ? 'Установлен' : 'Не установлен';
const changedAtLabel = changedAtMs
? new Date(Number(changedAtMs)).toLocaleString('ru-RU')
: '–';
@@ -689,9 +691,9 @@ function openAboutChannelModal(channel, options = {}) {
function openEditChannelModal({ channel, onSave }) {
const root = document.getElementById('modal-root');
let selectedAvatar = channel?.avaAr ? {
let selectedAvatar = channel?.avaSha256 ? {
name: 'Аватар',
ar: channel.avaAr,
ar: String(channel.avaAr || ''),
sha256: channel.avaSha256,
size: channel.avaSize,
purpose: 'avatar',
@@ -704,6 +706,8 @@ function openEditChannelModal({ channel, onSave }) {
slot.append(createChannelAvatarElement({
...channel,
avaAr: selectedAvatar?.ar || '',
avaSha256: selectedAvatar?.sha256 || '',
avaSize: selectedAvatar?.size || 0,
displayTitle: root.querySelector('#edit-channel-title')?.value || channel.displayTitle,
}, 86));
};
@@ -734,12 +738,11 @@ function openEditChannelModal({ channel, onSave }) {
root.querySelector('#edit-channel-title')?.addEventListener('input', renderAvatarPreview);
root.querySelector('#edit-channel-avatar')?.addEventListener('click', async () => {
try {
const item = await openArweaveAttachmentManager({
const item = await openChannelAttachmentManager({
login: state.session.login,
storagePwd: state.session.storagePwdInMemory,
gateway: state.entrySettings.arweaveServer,
mode: 'avatar',
historyPurpose: 'avatar',
});
if (!item) return;
selectedAvatar = item;
@@ -1754,7 +1757,7 @@ function openMessageLikesListModal({ navigate, messageRef, initialTab = 'shining
login: String(row?.login || '').trim() || 'unknown',
firstName: String(row?.firstName || ''),
lastName: String(row?.lastName || ''),
avatar: avatarRaw ? { ar: avatarRaw } : null,
avatar: avatarReferenceToRenderModel(parseAvatarReference(avatarRaw)),
size: 'md',
}));
const firstName = String(row?.firstName || '').trim();
+4 -1
View File
@@ -123,7 +123,8 @@ function avatarLetterFromName(name = '') {
function createChannelAvatar(channel = {}) {
return renderAvatar({
initials: channel.avatar || channel.initials || avatarLetterFromName(channel.displayTitle || channel.title || channel.name),
avatar: channel.avaAr ? { ar: String(channel.avaAr || '').trim() } : null,
avatar: (channel.avaAr || channel.avaSha256) ? { ar: String(channel.avaAr || '').trim(), sha256Hex: String(channel.avaSha256 || '').trim().toLowerCase() } : null,
authorLogin: String(channel.ownerName || channel.ownerLogin || '').trim(),
size: 'lg',
className: 'avatar-plain',
title: channel.displayTitle || channel.title || channel.name || 'Канал',
@@ -751,6 +752,7 @@ function mapApiChannelRow(summary, bucketKey, idx, index, notificationsState) {
channelRootBlockHash: normalizeHash(summary?.channel?.channelRoot?.blockHash),
avatar: avatarLetterFromName(displayTitle || channelName),
avaAr: String(summary?.channel?.avaAr || '').trim(),
avaSha256: String(summary?.channel?.avaSha256 || '').trim().toLowerCase(),
title,
technicalLabel,
channelName,
@@ -789,6 +791,7 @@ function mapDeletedOwnedChannels(payload, notificationsState = {}) {
channelRootBlockHash: normalizeHash(item?.rootBlockHashHex),
avatar: avatarLetterFromName(displayTitle),
avaAr: String(item?.avatarAr || '').trim(),
avaSha256: String(item?.avatarSha256 || '').trim().toLowerCase(),
title: displayTitle,
technicalLabel: `@${ownerLogin}/${channelName}`,
channelName,
+1 -1
View File
@@ -128,7 +128,7 @@ function createChatHeaderParts(login, navigate) {
login: cleanLogin,
firstName,
lastName,
avatar: currentPeer?.avatar?.ar
avatar: (currentPeer?.avatar?.ar || currentPeer?.avatar?.sha256Hex)
? {
ar: String(currentPeer.avatar.ar || '').trim(),
sha256Hex: String(currentPeer.avatar.sha256Hex || '').trim().toLowerCase(),
+2
View File
@@ -1,3 +1,5 @@
// UNUSED FOR NOW: альтернативные способы подключения (QR/камера) скрыты из UI.
// Файл сохранён как заготовка; активный путь идёт напрямую в device-pairing-view.
import { createTopBar } from '../components/topbar.js';
import { state } from '../state.js';
import { loadEncryptedUserSecrets } from '../services/key-vault.js';
+2 -2
View File
@@ -44,9 +44,9 @@ function createSearchAvatar(login) {
if (!avatarEl.isConnected) return;
const upgraded = renderUserAvatar({
login: cleanLogin,
avatar: snapshot?.avatar?.txId
avatar: snapshot?.avatar?.source
? {
ar: String(snapshot.avatar.txId || '').trim(),
ar: String(snapshot.avatar.txId || snapshot.avatar.ar || '').trim(),
sha256Hex: String(snapshot?.avatar?.sha256Hex || '').trim().toLowerCase(),
}
: null,
+19 -6
View File
@@ -20,8 +20,10 @@ import {
import { loadEncryptedUserSecrets } from '../services/key-vault.js';
import { toUserMessage } from '../services/ui-error-texts.js';
export const pageMeta = { id: 'device-pairing-view', title: 'Подключить по коду' };
export const pageMeta = { id: 'device-pairing-view', title: 'Подключить другое устройство' };
// UNUSED FOR NOW: дополнительный пароль pairing сохранён в коде для возможного возврата,
// но активный UI работает только в режиме без дополнительного пароля.
const PAIRING_PASSWORD_STATE_PREFIX = 'shine_pairing_password_state_v1';
function setStatus(statusEl, message, kind = 'info') {
@@ -162,10 +164,19 @@ export function render({navigate, chrome}) {
let dialogMode = '';
chrome?.setTopbar(createTopBar({
title: 'Подключить по коду',
back: { label: '←', onClick: () => navigate('connect-device-view') },
title: 'Подключить другое устройство',
back: { label: '←', onClick: () => navigate('device-view') },
}));
const instructionCard = document.createElement('div');
instructionCard.className = 'card stack';
instructionCard.innerHTML = `
<p class="field-label">Как подключить другое устройство</p>
<p class="meta-muted">На другом устройстве введите логин и нажмите «Войти через другое устройство». Затем обновите здесь список и нажмите «Подключить» у нужной заявки. Дополнительный пароль вводить не нужно.</p>
`;
// UNUSED FOR NOW: UI настройки дополнительного пароля сохранён ниже в коде,
// но карточка больше не показывается пользователю.
const settingsCard = document.createElement('div');
settingsCard.className = 'card stack';
const passwordIcons = makePasswordToggleIcons();
@@ -183,7 +194,7 @@ export function render({navigate, chrome}) {
requestsCard.innerHTML = `
<div class="row" style="justify-content:space-between; align-items:center; gap:10px; flex-wrap:wrap;">
<span class="field-label">Активные заявки</span>
<button class="ghost-btn" type="button" id="refresh-pairing-requests">Обновить заявки</button>
<button class="ghost-btn" type="button" id="refresh-pairing-requests">Обновить список</button>
</div>
<p class="meta-muted">Показываются все активные заявки. Для wallet-заявки выпускается отдельная session-only сессия без передачи постоянных ключей.</p>
<div class="stack" id="pairing-requests-list"></div>
@@ -594,7 +605,9 @@ export function render({navigate, chrome}) {
void (async () => {
try {
renderSettingsCard();
// Активный UX временно поддерживает только вход без дополнительного пароля.
// Если пароль был задан старой версией UI, при открытии этого экрана он сбрасывается.
await enablePairingWithoutPassword();
await loadSavedKeys();
await reloadRequests({ silent: true });
cleanupEvent = authService.onEvent('IncomingTrustedDeviceLoginRequest', () => {
@@ -614,6 +627,6 @@ export function render({navigate, chrome}) {
cleanupEvent();
};
screen.append(settingsCard, keySummaryCard, requestsCard, status);
screen.append(instructionCard, requestsCard, status);
return screen;
}
+1 -3
View File
@@ -80,13 +80,11 @@ export function render({navigate, chrome}) {
const actions = document.createElement('div');
actions.className = 'nav-list';
actions.innerHTML = `
<button class="nav-row" type="button" id="pair-by-code-btn"><span class="nav-row__label">Подключить по коду</span><span class="nav-row__hint">Войти на другом устройстве по короткому коду</span></button>
<button class="nav-row" type="button" id="connect-device-btn"><span class="nav-row__label">Другие способы подключения</span></button>
<button class="nav-row" type="button" id="pair-by-code-btn"><span class="nav-row__label">Подключить другое устройство</span><span class="nav-row__hint">Подтвердить вход на новом устройстве</span></button>
<button class="nav-row" type="button" id="show-keys-btn"><span class="nav-row__label">Ключи этого устройства</span></button>
`;
actions.querySelector('#pair-by-code-btn').addEventListener('click', () => navigate('device-pairing-view'));
actions.querySelector('#connect-device-btn').addEventListener('click', () => navigate('connect-device-view'));
actions.querySelector('#show-keys-btn').addEventListener('click', () => navigate('show-keys-view'));
const sessionsBlock = document.createElement('div');
+25 -11
View File
@@ -71,11 +71,19 @@ export function render({navigate,chrome}){
const info=note('После смены blockchain key меняется и Solana-кошелёк. На этом шаге можно перевести весь доступный SOL со старого кошелька на новый за вычетом сетевой комиссии.');
const warning=note('Автоматически переносится только SOL. Другие активы и средства автоматически не переносятся; при необходимости переведите их со старых адресов вручную.');
const details=document.createElement('div');details.className='card stack';details.innerHTML='<span class="meta-muted">Проверьте старый и новый кошельки.</span>';
const prepare=document.createElement('button');prepare.className='secondary-btn';prepare.type='button';prepare.textContent='Проверить кошельки';
const transfer=document.createElement('button');transfer.className='primary-btn';transfer.type='button';transfer.textContent='Перевести SOL и продолжить';transfer.disabled=true;
const skip=document.createElement('button');skip.className='secondary-btn';skip.type='button';skip.textContent='Пропустить перенос';
const refreshBalance=document.createElement('button');refreshBalance.className='secondary-btn';refreshBalance.type='button';refreshBalance.textContent='Обновить баланс';
const transfer=document.createElement('button');transfer.className='primary-btn';transfer.type='button';transfer.textContent='Перевести';
const skip=document.createElement('button');skip.className='secondary-btn';skip.type='button';skip.textContent='Пропустить';
const continueButton=document.createElement('button');continueButton.className='primary-btn';continueButton.type='button';continueButton.textContent='Продолжить';continueButton.style.display='none';
const err=document.createElement('div');err.className='meta-muted';
let oldWallet=null,newWallet=null,oldBalance=null;
let transferFinished=false;
const updateActions=()=>{
transfer.style.display=transferFinished?'none':'';
skip.style.display=transferFinished?'none':'';
continueButton.style.display=transferFinished?'':'none';
};
const resolveBundles=async()=>{
if(!cachedOldBundle){if(!oldP?.el.value)throw new Error('Введите старый пароль');cachedOldBundle=await derive(oldP.el.value);}
@@ -94,28 +102,34 @@ export function render({navigate,chrome}){
]);
oldBalance=oldB;
details.innerHTML=`<strong>Старый кошелёк</strong><span class="meta-muted">${h(oldWallet.address)}</span><span>${h(formatSol(oldB.sol,9))} SOL</span><strong>Новый кошелёк</strong><span class="meta-muted">${h(newWallet.address)}</span><span>${h(formatSol(newB.sol,9))} SOL</span>`;
transfer.textContent=Number(oldB.lamports||0)>0?'Перевести SOL и продолжить':'Средств нет — продолжить';
transfer.disabled=false;
if(!transferFinished)transfer.disabled=false;
};
prepare.addEventListener('click',async()=>{prepare.disabled=true;transfer.disabled=true;err.textContent='';try{await prepareWallets();}catch(e){err.textContent=e?.message||String(e);}finally{prepare.disabled=false;}});
transfer.addEventListener('click',async()=>{transfer.disabled=true;prepare.disabled=true;skip.disabled=true;err.textContent='';try{
refreshBalance.addEventListener('click',async()=>{refreshBalance.disabled=true;if(!transferFinished)transfer.disabled=true;err.textContent='';try{await prepareWallets();}catch(e){err.textContent=e?.message||String(e);}finally{refreshBalance.disabled=false;}});
transfer.addEventListener('click',async()=>{transfer.disabled=true;refreshBalance.disabled=true;skip.disabled=true;err.textContent='';try{
if(!oldWallet||!newWallet||!oldBalance)await prepareWallets();
if(Number(oldBalance?.lamports||0)>0){
const result=await transferAllSol({endpoint:solanaEndpoint,fromKeypair:oldWallet.keypair,toAddress:newWallet.address});
details.insertAdjacentHTML('beforeend',`<span class="meta-muted">${result.skipped?'Перевод не потребовался.':`Переведено ${h(formatSol(Number(result.lamports)/1_000_000_000,9))} SOL. Tx: ${h(result.signature)}`}</span>`);
}else{
details.insertAdjacentHTML('beforeend','<span class="meta-muted">На старом кошельке нет SOL для переноса.</span>');
}
transferFinished=true;
updateActions();
}catch(e){err.textContent=e?.message||String(e);transfer.disabled=false;skip.disabled=false;}finally{refreshBalance.disabled=false;}});
continueButton.addEventListener('click',async()=>{continueButton.disabled=true;refreshBalance.disabled=true;err.textContent='';try{
const next=await client.continueRotation({walletMigrationStatus:'COMPLETE'});
if(String(next?.rotationStatus||'')==='COMPLETE'){navigate('my-blockchain-view');return;}
await refresh();
}catch(e){err.textContent=e?.message||String(e);transfer.disabled=false;prepare.disabled=false;skip.disabled=false;}});
skip.addEventListener('click',async()=>{skip.disabled=true;transfer.disabled=true;prepare.disabled=true;err.textContent='';try{
}catch(e){err.textContent=e?.message||String(e);continueButton.disabled=false;refreshBalance.disabled=false;}});
skip.addEventListener('click',async()=>{skip.disabled=true;transfer.disabled=true;refreshBalance.disabled=true;err.textContent='';try{
const next=await client.continueRotation({walletMigrationStatus:'SKIPPED'});
if(String(next?.rotationStatus||'')==='COMPLETE'){navigate('my-blockchain-view');return;}
await refresh();
}catch(e){err.textContent=e?.message||String(e);skip.disabled=false;transfer.disabled=!oldWallet;prepare.disabled=false;}});
}catch(e){err.textContent=e?.message||String(e);skip.disabled=false;transfer.disabled=!oldWallet;refreshBalance.disabled=false;}});
const nodes=[statusCard(s),info,warning];if(oldP)nodes.push(oldP.wrap);if(newP)nodes.push(newP.wrap);nodes.push(details,prepare,transfer,skip,err);setRoot(...nodes);
updateActions();
const nodes=[statusCard(s),info,warning];if(oldP)nodes.push(oldP.wrap);if(newP)nodes.push(newP.wrap);nodes.push(details,refreshBalance,transfer,skip,continueButton,err);setRoot(...nodes);
if(cachedOldBundle&&cachedNewBundle)void prepareWallets().catch(e=>{err.textContent=e?.message||String(e);});
}
+13 -38
View File
@@ -16,7 +16,6 @@ import {
import { showToast } from '../services/channels-ux.js';
import {
decryptPairingPayloadFromEnvelope,
deriveEspPairingPasswordHash,
createRequesterPairingMaterial,
formatPairingShortCode,
} from '../services/device-pairing-service.js';
@@ -62,7 +61,7 @@ export function render({ navigate }) {
<ol class="pairing-steps">
<li>Откройте Сияние, где вы уже вошли</li>
<li>Настройки → Устройства</li>
<li>«Подключить по коду» – введите код</li>
<li>Нажмите «Подключить другое устройство», обновите список и подтвердите нужную заявку</li>
</ol>
<p class="pairing-waiting"><span class="pairing-spinner" aria-hidden="true"></span>Ждём подтверждения…</p>
`;
@@ -77,12 +76,7 @@ export function render({ navigate }) {
const noticeText = document.createElement('p');
notice.append(noticeSpinner, noticeText);
const passwordWrap = document.createElement('label');
passwordWrap.className = 'stack pairing-password';
passwordWrap.innerHTML = `
<span class="field-label">Пароль подключения</span>
<input class="input" type="password" autocomplete="current-password" placeholder="Задан на другом устройстве" />
`;
// Дополнительный пароль pairing пока не используется в активном UI.
const startBtn = document.createElement('button');
startBtn.className = 'primary-btn';
@@ -90,8 +84,6 @@ export function render({ navigate }) {
startBtn.textContent = 'Получить код';
const loginInput = { value: String(state.loginDraft.login || '').trim() };
const usePasswordInput = { checked: false };
const passwordInput = passwordWrap.querySelector('input');
who.textContent = loginInput.value ? `Вход для @${loginInput.value}` : '';
const shortCodeEl = codeBlock.querySelector('#pairing-short-code');
const timerFillEl = codeBlock.querySelector('#pairing-timer-fill');
@@ -99,15 +91,14 @@ export function render({ navigate }) {
const onlineEl = codeBlock.querySelector('#pairing-online');
let activeStartedAtMs = 0;
// Этапы: creating → code → approving; отдельно password (нужен пароль) и retry (истекло, отклонено, ошибка).
// Этапы: creating → code → approving; retry используется для истечения, отклонения и ошибок.
const showStage = (stage, message = '', { error = false, action = '' } = {}) => {
codeBlock.hidden = stage !== 'code';
passwordWrap.hidden = stage !== 'password';
notice.hidden = stage === 'code' || (stage === 'password' && !message);
notice.hidden = stage === 'code';
noticeSpinner.hidden = !(stage === 'creating' || stage === 'approving');
noticeText.textContent = message;
notice.classList.toggle('is-error', error);
startBtn.hidden = !(stage === 'password' || stage === 'retry');
startBtn.hidden = stage !== 'retry';
if (action) startBtn.textContent = action;
};
@@ -276,18 +267,10 @@ export function render({ navigate }) {
startBtn.addEventListener('click', async () => {
const login = String(loginInput.value || '').trim();
const usePassword = !!usePasswordInput.checked;
const password = String(passwordInput.value || '');
if (!login) {
navigate('login-view');
return;
}
if (usePassword && !password) {
showStage('password', 'Введите пароль подключения', { error: true, action: 'Получить код' });
passwordInput.focus();
return;
}
startBtn.disabled = true;
setAuthBusy(true);
setAuthError('');
@@ -305,12 +288,10 @@ export function render({ navigate }) {
}
requesterMaterial = await createRequesterPairingMaterial();
const passwordHash = usePassword
? await deriveEspPairingPasswordHash(login, password)
: '';
const payload = await authService.startTrustedDeviceLogin({
login,
passwordHash,
// Активный сценарий временно всегда без дополнительного пароля.
passwordHash: '',
requesterSessionKey: requesterMaterial.sessionKey,
payloadType: 2,
});
@@ -331,13 +312,12 @@ export function render({ navigate }) {
schedulePoll();
} catch (error) {
startBtn.disabled = false;
if (String(error?.code || '').toUpperCase() === 'PAIRING_PASSWORD_INVALID' && !usePassword) {
usePasswordInput.checked = true;
showStage('password', 'Для входа по коду на другом устройстве задан пароль подключения.', { action: 'Получить код' });
window.setTimeout(() => passwordInput.focus(), 0);
} else if (String(error?.code || '').toUpperCase() === 'PAIRING_PASSWORD_INVALID') {
showStage('password', 'Неверный пароль подключения', { error: true, action: 'Получить код' });
window.setTimeout(() => passwordInput.focus(), 0);
if (String(error?.code || '').toUpperCase() === 'PAIRING_PASSWORD_INVALID') {
showStage(
'retry',
'На уже авторизованном устройстве откройте Настройки → Устройства → Подключить другое устройство, обновите список и затем повторите вход.',
{ error: true, action: 'Повторить' },
);
} else {
const message = toUserMessage(error, 'Не удалось начать вход через другое устройство.');
setAuthError(message);
@@ -373,10 +353,6 @@ export function render({ navigate }) {
}
};
passwordInput.addEventListener('keydown', (event) => {
if (event.key === 'Enter') startBtn.click();
});
screen.append(
createTopBar({
title: 'Вход с другого устройства',
@@ -385,7 +361,6 @@ export function render({ navigate }) {
who,
codeBlock,
notice,
passwordWrap,
startBtn,
);
+4 -4
View File
@@ -55,19 +55,19 @@ function createDmAvatar(login, { className = '', avatar = null, firstName = '',
login: cleanLogin || 'unknown',
firstName: String(firstName || '').trim(),
lastName: String(lastName || '').trim(),
avatar: avatar?.ar ? { ar: String(avatar.ar || '').trim(), sha256Hex: String(avatar.sha256Hex || '').trim().toLowerCase() } : null,
avatar: (avatar?.ar || avatar?.sha256Hex) ? { ar: String(avatar?.ar || '').trim(), sha256Hex: String(avatar?.sha256Hex || '').trim().toLowerCase() } : null,
size: 'lg',
title,
className,
});
if (!cleanLogin || avatar?.ar) return avatarEl;
if (!cleanLogin || avatar?.ar || avatar?.sha256Hex) return avatarEl;
void loadDmAvatarSnapshot(cleanLogin).then((snapshot) => {
if (!avatarEl.isConnected) return;
const upgraded = renderUserAvatar({
login: cleanLogin,
avatar: snapshot?.avatar?.txId
avatar: snapshot?.avatar?.source
? {
ar: String(snapshot.avatar.txId || '').trim(),
ar: String(snapshot.avatar.txId || snapshot.avatar.ar || '').trim(),
sha256Hex: String(snapshot?.avatar?.sha256Hex || '').trim().toLowerCase(),
}
: null,
+604 -35
View File
@@ -1,49 +1,618 @@
import { createTopBar } from '../components/topbar.js';
import { authService } from '../state.js';
import { KeyRotationClient } from '../services/key-rotation-service.js';
import { inspectBlockchainDataItem } from '../services/blockchain-entry-inspector.js';
import { makeProfileRoute, makeShineChannelRoute, makeShineMessageRoute } from '../services/shine-routes.js';
export const pageMeta = { id: 'my-blockchain-view', title: 'Мой блокчейн' };
const TYPE_LABELS = new Map([
['0:0','Начало блокчейна'], ['0:2','Смена ключей / fork'],
['1:1','Публикация'], ['1:2','Ответ'], ['1:3','Редактирование'],
['2:1','Реакция'], ['3:1','Связь'], ['4:1','Статус'],
const PROFILE_LABELS = new Map([
['first_name', 'Имя'],
['last_name', 'Фамилия'],
['address', 'Адрес'],
['web', 'Ссылки'],
['phone', 'Телефон'],
['about', 'О себе'],
['spiritual_path', 'Духовный путь'],
['account_role', 'Тип аккаунта'],
['shine', 'Сияние'],
['gender', 'Пол'],
['ava', 'Аватар'],
]);
function shortHash(v){const s=String(v||'');return s.length>18?`${s.slice(0,9)}…${s.slice(-7)}`:s;}
function eventLabel(item){return TYPE_LABELS.get(`${item.msgType}:${item.msgSubType}`)||`Событие ${item.msgType}/${item.msgSubType}`;}
function formatDate(ms){try{return new Date(Number(ms)||0).toLocaleString('ru-RU');}catch{return '';}}
const CONNECTION_LABELS = new Map([
[10, ['Добавлен близкий друг', 'Близкий друг']],
[11, ['Удалён из близких друзей', 'Близкий друг']],
[14, ['Добавлен друг', 'Друг']],
[15, ['Удалён из друзей', 'Друг']],
[20, ['Добавлен контакт', 'Контакт']],
[21, ['Удалён из контактов', 'Контакт']],
[30, ['Оформлена подписка', 'Подписка']],
[31, ['Подписка отменена', 'Подписка']],
[40, ['Добавлена связь «супруг/супруга»', 'Супруг/супруга']],
[41, ['Удалена связь «супруг/супруга»', 'Супруг/супруга']],
[50, ['Добавлена связь «родитель»', 'Родитель']],
[51, ['Удалена связь «родитель»', 'Родитель']],
[52, ['Добавлена связь «ребёнок»', 'Ребёнок']],
[53, ['Удалена связь «ребёнок»', 'Ребёнок']],
[54, ['Добавлена связь «брат/сестра»', 'Брат/сестра']],
[55, ['Удалена связь «брат/сестра»', 'Брат/сестра']],
[60, ['Устаревшая отметка знакомства', 'Legacy-связь']],
[61, ['Устаревшая отмена отметки знакомства', 'Legacy-связь']],
[70, ['Подтверждён сияющий пользователь', 'Подтверждение сияния']],
[71, ['Снято подтверждение сияния', 'Подтверждение сияния']],
[74, ['Отмечен как замеченный сияющим', 'Отметка сияния']],
[75, ['Снята отметка «видел сияющим»', 'Отметка сияния']],
[80, ['Подтверждён официальный аккаунт', 'Официальный аккаунт']],
[81, ['Снято подтверждение официального аккаунта', 'Официальный аккаунт']],
]);
const STATUS_LABELS = new Map([
[10, 'Упражнение выполнено один раз'],
[20, 'Упражнение изучено'],
[30, 'Услуга / процедура пройдена'],
[100, 'Статус подтверждён'],
[110, 'Отмечен интерес к курсу'],
[120, 'Курс начат'],
[130, 'Курс изучается'],
[140, 'Курс заброшен'],
[150, 'Курс завершён'],
]);
const FORK_REASON_LABELS = new Map([
[1, 'Обычная смена ключей'],
[2, 'Возможная компрометация'],
[3, 'Откат после подтверждённой компрометации'],
[4, 'Восстановление доступа'],
]);
function shortHash(value) {
const text = String(value || '');
return text.length > 18 ? `${text.slice(0, 9)}…${text.slice(-7)}` : text;
}
function formatDate(ms) {
try {
return new Date(Number(ms) || 0).toLocaleString('ru-RU');
} catch {
return '';
}
}
function previewText(value) {
const rows = String(value || '')
.replace(/\r\n/g, '\n')
.replace(/\r/g, '\n')
.split('\n')
.slice(0, 3)
.map((row) => row.trim())
.filter(Boolean);
return rows.join(' ');
}
function profileValueLabel(key, value) {
const clean = String(value || '').trim();
if (key === 'account_role') {
if (clean === 'primary') return 'Основной аккаунт';
if (clean === 'non_voting') return 'Не учитывать мой голос';
}
if (key === 'shine') {
if (clean === 'shining' || clean === 'yes') return 'Сияющий';
if (clean === 'not_interested') return 'Сияние неинтересно';
if (clean === 'unknown') return 'Неизвестно';
}
if (key === 'gender') {
if (clean === 'male') return 'Мужской';
if (clean === 'female') return 'Женский';
if (clean === 'unknown') return 'Не указан';
}
if (key === 'ava') return 'Изменена аватарка';
return clean;
}
function targetText(target) {
if (!target) return '';
const login = String(target.toLogin || '').trim();
const block = Number(target.toBlockNumber);
if (login && Number.isInteger(block) && block >= 0) return `@${login} · блок #${block}`;
if (Number.isInteger(block) && block >= 0) return `блок #${block}`;
return login ? `@${login}` : '';
}
function channelNameText(lineCode, channelNames) {
const code = Number(lineCode);
if (!Number.isInteger(code) || code < 0) return '';
const known = channelNames.get(code);
if (known) return `«${known}»`;
if (code === 0) return '«stories»';
return `#${code}`;
}
function channelLabel(lineCode, channelNames) {
const name = channelNameText(lineCode, channelNames);
return name ? `канале ${name}` : 'канале';
}
function lineTextKindLabel(subType) {
if (subType === 100) return 'Входная страница';
if (subType === 110) return 'Упражнение';
if (subType === 120) return 'Услуга';
if (subType === 130) return 'Курс';
return 'Сообщение';
}
function describeEntry(item, inspection, channelNames) {
if (!inspection?.frame) {
return {
title: `Событие ${item.msgType}/${item.msgSubType}`,
detailTitle: `Событие ${item.msgType}/${item.msgSubType}`,
text: '',
attachmentsCount: 0,
};
}
const { frame } = inspection;
const body = frame.body || {};
const type = Number(frame.type);
const subType = Number(frame.subType);
if (type === 0 && subType === 0) {
return { title: 'Начало блокчейна', detailTitle: 'Начало блокчейна', text: body.login ? `Владелец: @${body.login}` : '', attachmentsCount: 0 };
}
if (type === 0 && subType === 1) {
const displayName = String(body.channelMeta?.title || body.channelName || '').trim() || `#${frame.blockNumber}`;
return {
title: `Создан канал «${displayName}»`,
detailTitle: 'Создание канала',
text: String(body.channelMeta?.description || '').trim(),
attachmentsCount: 0,
};
}
if (type === 0 && subType === 2) {
const reason = FORK_REASON_LABELS.get(Number(body.reasonCode)) || `Причина ${body.reasonCode ?? '—'}`;
return {
title: `Создан новый fork · ${reason}`,
detailTitle: 'Смена ключей / fork',
text: String(body.comment || '').trim(),
attachmentsCount: 0,
};
}
if (type === 1 && [10, 100, 110, 120, 130].includes(subType)) {
const kind = lineTextKindLabel(subType);
const preview = previewText(body.text) || (body.attachmentsCount ? `Вложений: ${body.attachmentsCount}` : 'Без текста');
return {
title: `${kind} в ${channelLabel(body.line?.lineCode, channelNames)}: ${preview}`,
detailTitle: `${kind} в ${channelLabel(body.line?.lineCode, channelNames)}`,
text: String(body.text || ''),
attachmentsCount: Number(body.attachmentsCount || 0),
};
}
if (type === 1 && subType === 11) {
const preview = previewText(body.text) || (body.attachmentsCount ? `Вложений: ${body.attachmentsCount}` : 'Сообщение удалено');
return {
title: `Отредактировано сообщение: ${preview}`,
detailTitle: 'Редактирование сообщения',
text: String(body.text || ''),
attachmentsCount: Number(body.attachmentsCount || 0),
};
}
if (type === 1 && subType === 20) {
const preview = previewText(body.text) || (body.attachmentsCount ? `Вложений: ${body.attachmentsCount}` : 'Без текста');
return {
title: `Ответ ${targetText(body.target)}: ${preview}`,
detailTitle: `Ответ на ${targetText(body.target)}`,
text: String(body.text || ''),
attachmentsCount: Number(body.attachmentsCount || 0),
};
}
if (type === 1 && subType === 21) {
const preview = previewText(body.text) || (body.attachmentsCount ? `Вложений: ${body.attachmentsCount}` : 'Ответ удалён');
return {
title: `Отредактирован ответ: ${preview}`,
detailTitle: 'Редактирование ответа',
text: String(body.text || ''),
attachmentsCount: Number(body.attachmentsCount || 0),
};
}
if (type === 1 && subType === 30) {
const preview = previewText(body.text) || 'Без текста';
return {
title: `Добавлен отзыв ${targetText(body.target)}: ${preview}`,
detailTitle: `Отзыв на ${targetText(body.target)}`,
text: String(body.text || ''),
attachmentsCount: Number(body.attachmentsCount || 0),
};
}
if (type === 1 && subType === 50) {
const preview = previewText(body.text) || 'Без комментария';
return {
title: `Репост в ${channelLabel(body.line?.lineCode, channelNames)}: ${preview}`,
detailTitle: `Репост ${targetText(body.target)}`,
text: String(body.text || ''),
attachmentsCount: Number(body.attachmentsCount || 0),
};
}
if (type === 1 && subType === 90) {
const channelName = channelNameText(body.line?.lineCode, channelNames);
const title = String(body.channelMeta?.title || '').trim();
const description = previewText(body.channelMeta?.description || '');
const changed = [title ? `название «${title}»` : '', body.channelMeta?.avatarAr ? 'аватар' : '', description ? `описание: ${description}` : ''].filter(Boolean).join(' · ');
return {
title: `Изменён профиль канала${channelName ? ` ${channelName}` : ''}${changed ? ` · ${changed}` : ''}`,
detailTitle: `Профиль канала${channelName ? ` ${channelName}` : ''}`,
text: String(body.channelMeta?.description || ''),
attachmentsCount: 0,
};
}
if (type === 1 && subType === 92) {
return {
title: `Удалён канал${channelNameText(body.line?.lineCode, channelNames) ? ` ${channelNameText(body.line?.lineCode, channelNames)}` : ''}`,
detailTitle: 'Удаление канала',
text: '',
attachmentsCount: 0,
};
}
if (type === 2 && (subType === 1 || subType === 2)) {
const action = subType === 1 ? 'Поставлен лайк' : 'Лайк снят';
return { title: `${action} · ${targetText(body.target)}`, detailTitle: action, text: '', attachmentsCount: 0 };
}
if (type === 3) {
const connection = CONNECTION_LABELS.get(subType);
const action = connection?.[0] || `Изменена связь (${subType})`;
const target = targetText(body.target);
return { title: `${action}${target ? ` · ${target}` : ''}`, detailTitle: connection?.[1] || 'Связь', text: '', attachmentsCount: 0 };
}
if (type === 4 && subType === 1) {
const key = String(body.key || '').trim();
const label = PROFILE_LABELS.get(key) || key || 'Параметр';
const value = profileValueLabel(key, body.value);
return {
title: key === 'ava' ? 'Профиль · Изменена аватарка' : `Профиль · ${label}: ${previewText(value) || '—'}`,
detailTitle: `Изменение профиля · ${label}`,
text: key === 'ava' ? '' : String(value || ''),
attachmentsCount: 0,
};
}
if (type === 5) {
const action = STATUS_LABELS.get(subType) || `Статус ${subType}`;
const preview = previewText(body.text);
return {
title: `${action} · ${targetText(body.target)}${preview ? `: ${preview}` : ''}`,
detailTitle: action,
text: String(body.text || ''),
attachmentsCount: Number(body.attachmentsCount || 0),
};
}
return {
title: `Событие ${type}/${subType}`,
detailTitle: `Событие ${type}/${subType}`,
text: '',
attachmentsCount: 0,
};
}
function targetBlockchainName(target) {
const login = String(target?.toLogin || '').trim();
const fork = Number(target?.toForkNumber);
if (!login || !Number.isInteger(fork) || fork < 1 || fork > 999) return '';
return `${login}-${String(fork).padStart(3, '0')}`;
}
function buildInternalAction({ inspection, blockchainName, login }) {
const frame = inspection?.frame;
const body = frame?.body || {};
const type = Number(frame?.type);
const subType = Number(frame?.subType);
if (type === 0 && subType === 1 && body.channelName) {
const route = makeShineChannelRoute({ ownerBlockchainName: blockchainName, channelName: body.channelName });
return route ? { label: 'Открыть канал →', route } : null;
}
if (type === 1 && [10, 20, 50, 100, 110, 120, 130].includes(subType)) {
const route = makeShineMessageRoute({ messageBlockchainName: blockchainName, messageBlockNumber: frame.blockNumber });
return route ? { label: subType === 20 ? 'Открыть ответ →' : 'Открыть сообщение →', route } : null;
}
if (type === 1 && [11, 21].includes(subType) && Number.isInteger(Number(body.target?.toBlockNumber))) {
const route = makeShineMessageRoute({ messageBlockchainName: blockchainName, messageBlockNumber: Number(body.target.toBlockNumber) });
return route ? { label: subType === 11 ? 'Открыть исходное сообщение →' : 'Открыть исходный ответ →', route } : null;
}
if ((type === 1 && subType === 30) || type === 2 || type === 5) {
const targetBch = targetBlockchainName(body.target);
if (!targetBch) return null;
const route = makeShineMessageRoute({ messageBlockchainName: targetBch, messageBlockNumber: body.target.toBlockNumber });
return route ? { label: 'Открыть цель →', route } : null;
}
if (type === 4) {
const route = makeProfileRoute(login);
return route ? { label: 'Открыть профиль →', route } : null;
}
return null;
}
function addDetailRow(container, label, value, { code = false } = {}) {
const clean = String(value ?? '').trim();
if (!clean) return;
const row = document.createElement('div');
row.className = 'my-blockchain-entry__detail-row';
const name = document.createElement('span');
name.className = 'my-blockchain-entry__detail-key';
name.textContent = label;
const content = document.createElement(code ? 'code' : 'span');
content.className = 'my-blockchain-entry__detail-value';
content.textContent = clean;
row.append(name, content);
container.append(row);
}
function addTargetRows(container, target, fallbackLogin = '') {
if (!target) return;
const login = String(target.toLogin || fallbackLogin || '').trim();
if (login) addDetailRow(container, 'Цель', `@${login}`);
if (Number.isInteger(Number(target.toForkNumber))) addDetailRow(container, 'Fork цели', target.toForkNumber);
if (Number.isInteger(Number(target.toBlockNumber))) addDetailRow(container, 'Блок цели', `#${target.toBlockNumber}`);
if (target.toBlockHash) addDetailRow(container, 'Хэш цели', target.toBlockHash, { code: true });
}
function createEntryCard({ item, inspection, parseError, channelNames, blockchainName, login, navigate }) {
const frame = inspection?.frame;
const description = describeEntry(item, inspection, channelNames);
const card = document.createElement('article');
card.className = 'card my-blockchain-entry';
const head = document.createElement('div');
head.className = 'my-blockchain-entry__head';
const copy = document.createElement('div');
copy.className = 'my-blockchain-entry__copy';
const title = document.createElement('div');
title.className = 'my-blockchain-entry__title';
title.textContent = `#${item.blockNumber} · ${description.title}`;
title.title = title.textContent;
const meta = document.createElement('div');
meta.className = 'my-blockchain-entry__meta meta-muted';
meta.textContent = `${formatDate(item.timestampMs)} · hash ${shortHash(item.blockHash)}`;
copy.append(title, meta);
const toggle = document.createElement('button');
toggle.type = 'button';
toggle.className = 'ui-button my-blockchain-entry__toggle';
toggle.setAttribute('aria-expanded', 'false');
toggle.setAttribute('aria-label', `Подробнее о блоке #${item.blockNumber}`);
const triangle = document.createElement('span');
triangle.className = 'my-blockchain-entry__triangle';
triangle.setAttribute('aria-hidden', 'true');
toggle.append(triangle);
head.append(copy, toggle);
const details = document.createElement('div');
details.className = 'my-blockchain-entry__details';
details.hidden = true;
const detailTitle = document.createElement('strong');
detailTitle.className = 'my-blockchain-entry__detail-title';
detailTitle.textContent = description.detailTitle;
details.append(detailTitle);
if (description.text) {
const fullText = document.createElement('div');
fullText.className = 'my-blockchain-entry__full-text';
fullText.textContent = description.text;
details.append(fullText);
}
if (description.attachmentsCount > 0) {
const attachments = document.createElement('div');
attachments.className = 'my-blockchain-entry__attachments meta-muted';
attachments.textContent = description.attachmentsCount === 1 ? 'Вложение: 1' : `Вложения: ${description.attachmentsCount}`;
details.append(attachments);
}
const action = buildInternalAction({ inspection, blockchainName, login });
const actions = document.createElement('div');
actions.className = 'my-blockchain-entry__actions';
if (action) {
const open = document.createElement('button');
open.type = 'button';
open.className = 'text-btn my-blockchain-entry__action';
open.textContent = action.label;
open.addEventListener('click', () => navigate(action.route));
actions.append(open);
}
if (inspection?.arweaveUrl) {
const arweave = document.createElement('a');
arweave.className = 'my-blockchain-entry__action my-blockchain-entry__external';
arweave.href = inspection.arweaveUrl;
arweave.target = '_blank';
arweave.rel = 'noopener noreferrer';
arweave.textContent = 'Открыть запись в блокчейне ↗';
actions.append(arweave);
}
if (actions.childElementCount) details.append(actions);
const info = document.createElement('div');
info.className = 'my-blockchain-entry__detail-grid';
const effectiveType = frame ? `${frame.type}/${frame.subType} · v${frame.version}` : `${item.msgType}/${item.msgSubType} · v${item.msgVersion}`;
addDetailRow(info, 'Тип', effectiveType);
addDetailRow(info, 'Блок', `#${item.blockNumber}`);
addDetailRow(info, 'Дата', formatDate(item.timestampMs));
addDetailRow(info, 'Хэш блока', item.blockHash, { code: true });
if (inspection?.dataItemId) addDetailRow(info, 'DataItem ID', inspection.dataItemId, { code: true });
const body = frame?.body || {};
if (body.line) {
if (Number.isInteger(Number(body.line.lineCode))) addDetailRow(info, 'Линия', `#${body.line.lineCode}`);
if (Number.isInteger(Number(body.line.lineSequence))) addDetailRow(info, 'Шаг линии', body.line.lineSequence);
}
if (body.kind === 'profile') {
addDetailRow(info, 'Параметр', body.key);
addDetailRow(info, 'Значение', body.value, { code: body.key === 'ava' });
}
if (body.kind === 'create_channel') {
addDetailRow(info, 'Техническое имя', body.channelName);
addDetailRow(info, 'Тип канала', `${body.channelType} · v${body.channelTypeVersion}`);
}
if (body.kind === 'fork') {
addDetailRow(info, 'Fork point', `#${body.forkPointBlockNumber}`);
addDetailRow(info, 'Старый tip', `#${body.parentTipBlockNumber}`);
addDetailRow(info, 'Отброшено блоков', body.discardedBlocksCount);
}
if (body.target) addTargetRows(info, body.target, (frame?.type === 1 && [11, 21].includes(Number(frame?.subType))) ? login : '');
if (!body.target && item.toLogin) {
addTargetRows(info, {
toLogin: item.toLogin,
toForkNumber: item.toForkNumber,
toBlockNumber: item.toBlockNumber,
toBlockHash: item.toBlockHash,
});
}
if (parseError) addDetailRow(info, 'Разбор блока', parseError);
details.append(info);
toggle.addEventListener('click', () => {
const expanded = toggle.getAttribute('aria-expanded') !== 'true';
toggle.setAttribute('aria-expanded', String(expanded));
details.hidden = !expanded;
card.classList.toggle('is-expanded', expanded);
});
card.append(head, details);
return card;
}
export function render({ navigate, chrome }) {
const screen=document.createElement('section'); screen.className='stack';
chrome?.setTopbar(createTopBar({ title:'Мой блокчейн', back:{label:'←',onClick:()=>navigate('settings-view')} }));
const intro=document.createElement('div'); intro.className='card stack';
intro.innerHTML=`<strong>История ваших действий</strong><span class="meta-muted">Это текущая активная версия вашего блокчейна. Хэши записей сохраняют логическую идентичность при fork.</span>`;
const rotate=document.createElement('button'); rotate.type='button'; rotate.className='primary-btn'; rotate.textContent='Сменить пароль / ключи'; rotate.addEventListener('click',()=>navigate('key-rotation-view'));
intro.append(rotate); screen.append(intro);
const screen = document.createElement('section');
screen.className = 'stack my-blockchain-screen';
chrome?.setTopbar(createTopBar({ title: 'Мой блокчейн', back: { label: '←', onClick: () => navigate('settings-view') } }));
const list=document.createElement('div'); list.className='stack'; screen.append(list);
const more=document.createElement('button'); more.type='button'; more.className='secondary-btn'; more.textContent='Показать более ранние записи'; more.hidden=true; screen.append(more);
const client=new KeyRotationClient(authService); let before=null; let loading=false; let disposed=false;
const intro = document.createElement('div');
intro.className = 'card stack';
intro.innerHTML = '<strong>История ваших действий</strong><span class="meta-muted">Это текущая активная версия вашего блокчейна. Хэши записей сохраняют логическую идентичность при fork.</span>';
const rotate = document.createElement('button');
rotate.type = 'button';
rotate.className = 'primary-btn';
rotate.textContent = 'Сменить пароль / ключи';
rotate.addEventListener('click', () => navigate('key-rotation-view'));
intro.append(rotate);
screen.append(intro);
async function load(reset=false){
if(loading||disposed)return; loading=true; more.disabled=true;
if(reset){list.innerHTML='';before=null;}
try{
const data=await client.getMyBlockchain({beforeBlock:before,limit:50,includeBlockBytes:false});
if(reset){const head=document.createElement('div');head.className='card stack';head.innerHTML=`<strong>${data.blockchainName||'—'}</strong><span class="meta-muted">Последний блок: #${Number(data.tipBlockNumber??-1)} · ${shortHash(data.tipBlockHash)}</span>`;list.append(head);}
for(const item of data.blocks||[]){
const card=document.createElement('div');card.className='card stack';
const target=item.toLogin?`<span class="meta-muted">Цель: ${escapeHtml(item.toLogin)} #${item.toBlockNumber??'—'} · ${shortHash(item.toBlockHash)}</span>`:'';
card.innerHTML=`<div><strong>#${item.blockNumber} · ${escapeHtml(eventLabel(item))}</strong></div><span class="meta-muted">${formatDate(item.timestampMs)} · hash ${shortHash(item.blockHash)}</span>${target}`;
list.append(card);
const list = document.createElement('div');
list.className = 'stack my-blockchain-list';
screen.append(list);
const more = document.createElement('button');
more.type = 'button';
more.className = 'secondary-btn';
more.textContent = 'Показать более ранние записи';
more.hidden = true;
screen.append(more);
const client = new KeyRotationClient(authService);
const channelNames = new Map([[0, 'stories']]);
let channelsLoaded = false;
let before = null;
let loading = false;
let disposed = false;
let loadSeq = 0;
async function ensureChannelNames(login) {
if (channelsLoaded || !login) return;
channelsLoaded = true;
try {
const payload = await authService.listUserProfileChannels(login, 'owned', 500, 0, true);
if (disposed) return;
for (const row of Array.isArray(payload?.channels) ? payload.channels : []) {
const root = Number(row?.rootBlockNumber);
if (!Number.isInteger(root) || root < 0) continue;
const name = String(row?.displayName || row?.slug || '').trim();
if (name) channelNames.set(root, name);
}
before=data.nextBeforeBlock;
more.hidden=before==null;
if(!(data.blocks||[]).length && reset){const empty=document.createElement('div');empty.className='card';empty.textContent='Записей пока нет.';list.append(empty);}
}catch(e){const err=document.createElement('div');err.className='card';err.textContent=`Не удалось загрузить блокчейн: ${e?.message||e}`;list.append(err);}
finally{loading=false;more.disabled=false;}
} catch {
// Имена каналов улучшают подписи, но их отсутствие не мешает читать сам сырой блок.
}
}
more.addEventListener('click',()=>void load(false)); void load(true);
screen.cleanup=()=>{disposed=true;}; return screen;
async function load(reset = false) {
if (loading || disposed) return;
loading = true;
more.disabled = true;
const seq = ++loadSeq;
if (reset) {
list.innerHTML = '';
before = null;
}
try {
const data = await client.getMyBlockchain({ beforeBlock: before, limit: 50, includeBlockBytes: true });
if (disposed || seq !== loadSeq) return;
await ensureChannelNames(String(data.login || '').trim());
if (disposed || seq !== loadSeq) return;
if (reset) {
const head = document.createElement('div');
head.className = 'card stack';
head.innerHTML = `<strong>${escapeHtml(data.blockchainName || '—')}</strong><span class="meta-muted">Последний блок: #${Number(data.tipBlockNumber ?? -1)} · ${shortHash(data.tipBlockHash)}</span>`;
list.append(head);
}
const rows = await Promise.all((data.blocks || []).map(async (item) => {
if (!item?.blockBytesB64) return { item, inspection: null, parseError: 'Сервер не вернул сырые bytes блока.' };
try {
const inspection = await inspectBlockchainDataItem(item.blockBytesB64);
const body = inspection?.frame?.body;
if (inspection?.frame?.type === 0 && inspection?.frame?.subType === 1) {
const root = Number(inspection.frame.blockNumber);
const name = String(body?.channelMeta?.title || body?.channelName || '').trim();
if (Number.isInteger(root) && root >= 0 && name) channelNames.set(root, name);
}
return { item, inspection, parseError: '' };
} catch (error) {
return { item, inspection: null, parseError: String(error?.message || error || 'Неизвестная ошибка разбора') };
}
}));
if (disposed || seq !== loadSeq) return;
for (const row of rows) {
list.append(createEntryCard({
...row,
channelNames,
blockchainName: String(data.blockchainName || '').trim(),
login: String(data.login || '').trim(),
navigate,
}));
}
before = data.nextBeforeBlock;
more.hidden = before == null;
if (!(data.blocks || []).length && reset) {
const empty = document.createElement('div');
empty.className = 'card';
empty.textContent = 'Записей пока нет.';
list.append(empty);
}
} catch (error) {
if (disposed || seq !== loadSeq) return;
const err = document.createElement('div');
err.className = 'card';
err.textContent = `Не удалось загрузить блокчейн: ${error?.message || error}`;
list.append(err);
} finally {
if (seq === loadSeq) {
loading = false;
more.disabled = false;
}
}
}
more.addEventListener('click', () => void load(false));
void load(true);
screen.cleanup = () => {
if (disposed) return;
disposed = true;
loadSeq += 1;
};
return screen;
}
function escapeHtml(value) {
return String(value ?? '').replace(/[&<>"]/g, (char) => ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;' }[char]));
}
function escapeHtml(value){return String(value??'').replace(/[&<>"]/g,c=>({'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;'}[c]));}
+2 -1
View File
@@ -109,7 +109,8 @@ function getMarkByLogin(allUsers) {
function normalizeAvatar(row) {
const txFromAvatar = String(row?.avatar?.ar || '').trim();
if (txFromAvatar) return { ar: txFromAvatar };
const shaFromAvatar = String(row?.avatar?.sha256Hex || row?.avatar?.sha256 || '').trim().toLowerCase();
if (txFromAvatar || shaFromAvatar) return { ar: txFromAvatar, sha256Hex: shaFromAvatar };
const txFallback = String(row?.avatarTxId || '').trim();
if (txFallback) return { ar: txFallback };
return null;
+42 -1
View File
@@ -17,6 +17,7 @@
import { renderUserAvatar, buildAvatarInitials } from '../../components/avatar-image.js';
import { state } from '../../state.js';
import { buildArweaveDataUrl } from '../../services/arweave-file-service.js';
import { resolvePublicFileUrl } from '../../services/public-file-service.js';
const SVGNS = 'http://www.w3.org/2000/svg';
@@ -149,6 +150,25 @@ function resolveAvatarPhotoSrc(src) {
}
}
async function resolveServerAvatarPhotoSrc(src) {
const rawAvatar = src?.avatar;
if (!rawAvatar || typeof rawAvatar === 'string') return '';
const txId = String(rawAvatar?.ar || '').trim();
const sha256 = String(rawAvatar?.sha256Hex || rawAvatar?.sha256 || '').trim().toLowerCase();
const authorLogin = String(src?.login || src?.id || '').trim();
if (txId || !sha256 || !authorLogin) return '';
try {
return await resolvePublicFileUrl({
sha256,
authorLogin,
solanaEndpoint: state?.entrySettings?.solanaServer,
fallbackServerLogin: state?.entrySettings?.shineServerLogin,
});
} catch {
return '';
}
}
// Однократно внедряем скрытый SVG-фильтр свечения «сияющих» узлов (мягкое гауссово размытие).
// Применяется к псевдо-ореолу ::before, а НЕ к самой аватарке — поэтому фото не размывается.
function ensureShineFilter() {
@@ -636,7 +656,28 @@ export function createForceGraph({ stage, model, onCenterTap, onNodeTap, onNodeL
const dot = document.createElement('div');
dot.className = 'avatar node-dot fg-orb-host';
// Единый PNG-оверлей на ВСЕХ полных орбах (фокус + спутники). tier-3 точки (dotOnly) сюда не идут.
dot.appendChild(buildPngOrb(photoSrc, { isFocus, initials }));
const orb = buildPngOrb(photoSrc, { isFocus, initials });
dot.appendChild(orb);
if (!photoSrc && src?.avatar && typeof src.avatar === 'object' && !String(src.avatar.ar || '').trim() && String(src.avatar.sha256Hex || src.avatar.sha256 || '').trim()) {
void resolveServerAvatarPhotoSrc(src).then((url) => {
if (!url || !orb.isConnected) return;
const currentPhoto = orb.querySelector('.fg-pngorb-photo');
if (!currentPhoto) return;
const img = document.createElement('img');
img.className = 'fg-pngorb-photo';
img.alt = '';
img.loading = 'lazy';
img.decoding = 'async';
img.addEventListener('error', () => {
const fallback = document.createElement('div');
fallback.className = 'fg-pngorb-photo fg-pngorb-init';
fallback.textContent = String(initials || '').slice(0, 2);
try { img.replaceWith(fallback); } catch { /* node may already be gone */ }
});
img.src = url;
try { currentPhoto.replaceWith(img); } catch { /* graph node was rebuilt */ }
});
}
el.append(dot);
syncOfficialBadge(el, Boolean(src.official));
+2 -2
View File
@@ -150,9 +150,9 @@ function renderEmpty(activeTab) {
function renderAvatar(item) {
const profile = item.profile;
const avatar = profile?.avatar?.txId
const avatar = (profile?.avatar?.txId || profile?.avatar?.sha256Hex)
? {
ar: String(profile.avatar.txId || '').trim(),
ar: String(profile.avatar.txId || profile.avatar.ar || '').trim(),
sha256Hex: String(profile.avatar.sha256Hex || '').trim().toLowerCase(),
}
: null;
+2 -2
View File
@@ -237,8 +237,8 @@ export function render({ navigate, chrome }) {
login,
firstName,
lastName,
avatar: currentAvatar?.txId
? { ar: currentAvatar.txId, sha256Hex: String(currentAvatar?.sha256Hex || '').trim().toLowerCase() }
avatar: (currentAvatar?.txId || currentAvatar?.sha256Hex)
? { ar: String(currentAvatar.txId || currentAvatar.ar || '').trim(), sha256Hex: String(currentAvatar?.sha256Hex || '').trim().toLowerCase() }
: null,
size: 'xl',
className: 'profile-avatar',
+2 -2
View File
@@ -88,11 +88,11 @@ export const REGISTRATION_FAQ_TOPICS = [
},
{
id: 'connect-device',
shortTitle: 'Подключить по коду',
shortTitle: 'Подключить устройство',
title: 'Как подключить другое устройство?',
paragraphs: [
'На новом устройстве выберите вход через другое устройство и получите код подключения.',
'На уже авторизованном устройстве откройте: Профиль → Настройки → Устройства → Подключить по коду. Введите или выберите соответствующий код и подтвердите подключение.',
'На уже авторизованном устройстве откройте: Профиль → Настройки → Устройства → Подключить другое устройство. Обновите список заявок и нажмите «Подключить» у нужной заявки.',
'При подтверждении нового устройства автоматически передаются два рабочих ключа: ключ доступа и ключ блокчейна. Приватный ключ восстановления не передаётся никогда.',
],
},
+34 -15
View File
@@ -12,9 +12,10 @@ import {
import { clearStoredMessages } from '../services/message-store.js';
import { toUserMessage } from '../services/ui-error-texts.js';
import {
createSolanaWalletFromPrivateBase58,
formatSol,
getBalanceSol,
getTopupSiteUrl,
transferSol,
} from '../services/solana-wallet-service.js';
import { loadSolanaWeb3 } from '../vendor/solana-web3-loader.js';
import {
@@ -28,7 +29,10 @@ import { defaultServerLogin } from '../deploy-config.js';
export const pageMeta = { id: 'registration-payment-view', title: 'Оплата регистрации', showAppChrome: false };
const MIN_REQUIRED_SOL = 0.01;
const RECOMMENDED_TOPUP_SOL = 0.02;
const RECOMMENDED_TOPUP_SOL = 0.2;
const TEST_TOPUP_AMOUNT_SOL = 0.2;
const DEVNET_ENDPOINT = 'https://api.devnet.solana.com';
const TEST_TOPUP_SENDER_PRIVATE_32_BASE58 = '6xqAuKYvA8qrCdAkcw7Y8aMgvBnYk8JLxWLma5BzbAvu';
const AUTO_LOGIN_INITIAL_DELAY_MS = 1000;
const AUTO_LOGIN_RETRY_MS = 2000;
const REGISTRATION_PROGRESS_DURATION_MS = 12000;
@@ -256,22 +260,38 @@ export function render({ navigate }) {
const topupButton = document.createElement('button');
topupButton.className = 'ghost-btn';
topupButton.type = 'button';
topupButton.textContent = 'Пополнить кошелёк';
topupButton.textContent = 'Тестовое пополнение (пока доступно в тестовом режиме)';
topupButton.addEventListener('click', async () => {
status.style.display = 'none';
topupButton.disabled = true;
const defaultText = 'Тестовое пополнение (пока доступно в тестовом режиме)';
topupButton.textContent = 'Пополняем...';
try {
await deriveUserWalletAddress();
navigate('topup-view');
const address = await deriveUserWalletAddress();
const sender = await createSolanaWalletFromPrivateBase58(TEST_TOPUP_SENDER_PRIVATE_32_BASE58);
await transferSol({
endpoint: DEVNET_ENDPOINT,
fromKeypair: sender.keypair,
toAddress: address,
amountSol: TEST_TOPUP_AMOUNT_SOL,
});
const balance = await getBalanceSol({
endpoint: DEVNET_ENDPOINT,
address,
});
state.registrationPayment.balanceSOL = String(balance.sol);
balanceValue.textContent = `${formatSol(balance.sol, 6)} SOL`;
status.className = 'status-line is-available';
status.textContent = `Тестовое пополнение выполнено: +${TEST_TOPUP_AMOUNT_SOL} SOL. Баланс: ${formatSol(balance.sol, 6)} SOL.`;
status.style.display = '';
} catch (error) {
showWalletError(error, 'Не удалось подготовить кошелёк. Попробуйте ещё раз.');
showWalletError(error, 'Не удалось выполнить тестовое пополнение. Попробуйте ещё раз.');
} finally {
topupButton.disabled = false;
topupButton.textContent = defaultText;
}
});
const showKeysButton = document.createElement('button');
showKeysButton.className = 'ghost-btn';
showKeysButton.type = 'button';
showKeysButton.textContent = 'Показать сгенерированные ключи';
showKeysButton.addEventListener('click', () => navigate('registration-draft-keys-view'));
const submitButton = document.createElement('button');
submitButton.className = 'primary-btn';
submitButton.type = 'button';
@@ -301,8 +321,7 @@ export function render({ navigate }) {
: `Для регистрации пополните этот кошелёк соланами примерно на ${RECOMMENDED_TOPUP_SOL} SOL. Сейчас на кошельке ${formatSol(currentBalance, 6)} SOL. Минимум для продолжения: ${MIN_REQUIRED_SOL} SOL.`;
status.style.display = '';
if (isTestContour) {
const openTopup = window.confirm('Перейти на экран пополнения и затем продолжить регистрацию?');
if (openTopup) navigate('topup-view');
status.textContent += ` Нажмите «Тестовое пополнение», чтобы сразу добавить ${TEST_TOPUP_AMOUNT_SOL} SOL без перехода на другой экран.`;
}
return;
}
@@ -370,7 +389,7 @@ export function render({ navigate }) {
if (isTestContour) {
card.append(topupButton);
}
card.append(showKeysButton, submitButton, status);
card.append(submitButton, status);
screen.append(
createTopBar({
+15 -1
View File
@@ -22,10 +22,24 @@ export function render({ navigate }) {
logo.alt = 'Логотип Сияние';
logoWrap.append(logo);
const brandBlock = document.createElement('div');
brandBlock.className = 'stack';
brandBlock.style.alignItems = 'center';
brandBlock.style.gap = '8px';
const title = document.createElement('h1');
title.className = 'auth-brand';
title.append(createShineWordmark());
const siteName = document.createElement('p');
siteName.className = 'meta-muted';
siteName.style.margin = '0';
siteName.style.fontSize = '13px';
siteName.style.letterSpacing = '0.04em';
siteName.textContent = window.location.host || window.location.hostname || 'shineup.me';
brandBlock.append(title, siteName);
const actions = document.createElement('div');
actions.className = 'auth-actions shine-actions';
@@ -57,6 +71,6 @@ export function render({ navigate }) {
settingsButton.addEventListener('click', () => navigate('entry-settings-view'));
actions.append(loginButton, registerButton, languageButton, settingsButton);
screen.append(logoWrap, title, actions);
screen.append(logoWrap, brandBlock, actions);
return screen;
}
+1 -1
View File
@@ -12,7 +12,7 @@ import { loadSolanaWeb3 } from '../vendor/solana-web3-loader.js';
export const pageMeta = { id: 'topup-view', title: 'Пополнение solana счета', showAppChrome: false };
const DEVNET_ENDPOINT = 'https://api.devnet.solana.com';
const SENDER_PRIVATE_32_BASE58 = '6xqAuKYvA8qrCdAkcw7Y8aMgvBnYk8JLxWLma5BzbAvu';
const REGISTRATION_TOPUP_AMOUNT_SOL = 0.02;
const REGISTRATION_TOPUP_AMOUNT_SOL = 0.2;
// Канонический Solana-кошелёк пользователя = текущий blockchain key.
// Тот же адрес используется как fee payer для регистрации и обычных PDA update.
@@ -1,3 +1,5 @@
// UNUSED FOR NOW: настройка дополнительного пароля для подключения другого устройства
// сохранена в коде, но не показывается в активном UI. Текущий UX всегда без пароля.
import { createTopBar } from '../components/topbar.js';
import { authService, setAuthError, setAuthInfo, state } from '../state.js';
import { deriveEspPairingPasswordHash } from '../services/device-pairing-service.js';
+3 -4
View File
@@ -3,13 +3,12 @@ import { renderUserAvatar } from '../components/avatar-image.js';
import { authService } from '../state.js';
import { navigateBack } from '../router.js';
import { userDisplayName } from '../services/user-display.js';
import { avatarReferenceToRenderModel, parseAvatarReference } from '../services/avatar-reference.js';
export const pageMeta = { id: 'user-profile-list-view', title: 'Список' };
function parseAvatar(raw) {
const value = String(raw || '');
const m = value.match(/(?:^|,)\s*AR:([A-Za-z0-9_-]{43})(?:,|$)/);
return m ? { ar: m[1] } : null;
return avatarReferenceToRenderModel(parseAvatarReference(raw));
}
const TITLES = {
@@ -105,7 +104,7 @@ export function render({ navigate, route, chrome }) {
const el = document.createElement('button');
el.type = 'button';
el.className = 'ui-button card row profile-list-row';
el.append(renderUserAvatar({ login: row.ownerLogin, firstName: row.displayName, lastName: '', avatar: parseAvatar(row.avatarAr), size: 'md' }));
el.append(renderUserAvatar({ login: row.ownerLogin, firstName: row.displayName, lastName: '', avatar: (row.avatarAr || row.avatarSha256) ? { ar: String(row.avatarAr || ''), sha256Hex: String(row.avatarSha256 || '') } : null, size: 'md' }));
const t = document.createElement('div');
t.className = 'profile-list-row-text';
t.innerHTML = `<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 rows = [];
if (cleanTitle) rows.push(`<S:title;v=1;${cleanTitle}>`);
if (avatar?.ar) {
if (avatar?.sha256 || avatar?.sha256Hex) {
const size = Number(avatar.size || 0);
const sha256 = String(avatar.sha256 || '').trim().toLowerCase();
const sha256 = String(avatar.sha256 || avatar.sha256Hex || '').trim().toLowerCase();
const ar = String(avatar.ar || '').trim();
if (!Number.isInteger(size) || size <= 0) throw new Error('Некорректный размер аватара.');
if (!/^[0-9a-f]{64}$/u.test(sha256)) throw new Error('Некорректный SHA-256 аватара.');
if (!/^[A-Za-z0-9_-]{43}$/u.test(ar)) throw new Error('Некорректный Arweave txId аватара.');
rows.push(`<S:ava;v=1;sz=${size};sha256=${sha256};ar=${ar}>`);
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=${ar}` : ''}>`);
}
if (cleanDescription) rows.push(cleanDescription);
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 || ''),
};
}
@@ -0,0 +1,278 @@
import { parseAns104DataItem } from './ans104-data-item.js';
import { base64ToBytes, bytesToBase64Url, sha256Bytes } from './crypto-utils.js';
const FRAME_HEADER_SIZE = 88;
const LINE_PREFIX_SIZE = 44;
const FIXED_LINE_PREFIX_SIZE = 40;
const TD = new TextDecoder('utf-8', { fatal: true });
const ZERO_HASH = '0'.repeat(64);
function bytesToHex(bytes) {
return Array.from(bytes || [], (value) => Number(value).toString(16).padStart(2, '0')).join('');
}
class Reader {
constructor(bytes, offset = 0) {
this.bytes = bytes instanceof Uint8Array ? bytes : new Uint8Array(bytes || []);
this.offset = Number(offset) || 0;
this.view = new DataView(this.bytes.buffer, this.bytes.byteOffset, this.bytes.byteLength);
}
ensure(length, label = 'данные') {
if (length < 0 || this.offset < 0 || this.offset + length > this.bytes.length) {
throw new Error(`Блок обрезан: не хватает данных (${label})`);
}
}
u8(label) { this.ensure(1, label); return this.bytes[this.offset++]; }
u16(label) { this.ensure(2, label); const value = this.view.getUint16(this.offset, false); this.offset += 2; return value; }
i32(label) { this.ensure(4, label); const value = this.view.getInt32(this.offset, false); this.offset += 4; return value; }
i64(label) { this.ensure(8, label); const value = this.view.getBigInt64(this.offset, false); this.offset += 8; return value; }
raw(length, label) { this.ensure(length, label); const value = this.bytes.slice(this.offset, this.offset + length); this.offset += length; return value; }
hash32(label) { return bytesToHex(this.raw(32, label)); }
text(length, label) { return TD.decode(this.raw(length, label)); }
textU8(label) { return this.text(this.u8(`${label} length`), label); }
textU16(label) { return this.text(this.u16(`${label} length`), label); }
remaining() { return this.bytes.length - this.offset; }
}
function parseLinePrefix(reader) {
return {
lineCode: reader.i32('lineCode'),
prevLineNumber: reader.i32('prevLineNumber'),
prevLineHash: reader.hash32('prevLineHash'),
lineSequence: reader.i32('lineSequence'),
};
}
function parseFixedLinePrefix(reader, name) {
return {
prevLineNumber: reader.i32(`prev${name}BlockNumber`),
prevLineHash: reader.hash32(`prev${name}BlockHash`),
lineSequence: reader.i32(`${name.toLowerCase()}Sequence`),
};
}
function parseTarget(reader) {
const login = reader.textU8('toLogin');
return {
toLogin: login,
toForkNumber: reader.u16('toForkNumber'),
toBlockNumber: reader.i32('toBlockGlobalNumber'),
toBlockHash: reader.hash32('toBlockHash'),
};
}
function parseCompactTarget(reader) {
return {
toBlockNumber: reader.i32('toBlockGlobalNumber'),
toBlockHash: reader.hash32('toBlockHash'),
};
}
function parseTextTail(reader) {
return reader.textU16('text');
}
function splitMessageText(rawText) {
let rest = String(rawText || '');
let attachmentsCount = 0;
const attachRe = /^<(?:SHiNE|S):(attach|att);[^>]*>\n?/u;
for (;;) {
const match = rest.match(attachRe);
if (!match) break;
attachmentsCount += 1;
rest = rest.slice(match[0].length);
}
return { text: rest.replace(/^\n+/u, ''), attachmentsCount };
}
function parseChannelMetaText(rawText) {
const rows = String(rawText || '').replace(/\r\n/g, '\n').replace(/\r/g, '\n').split('\n');
let title = '';
let avatarAr = '';
const descriptionRows = [];
for (const row of rows) {
const titleMatch = row.match(/^<S:title;v=1;([^>]*)>$/u);
if (titleMatch) {
title = String(titleMatch[1] || '').trim();
continue;
}
const avatarMatch = row.match(/^<S:ava;v=1;([^>]*)>$/u);
if (avatarMatch) {
const arMatch = String(avatarMatch[1] || '').match(/(?:^|;)ar=([A-Za-z0-9_-]{43})(?:;|$)/u);
avatarAr = String(arMatch?.[1] || '').trim();
continue;
}
descriptionRows.push(row);
}
return {
title,
avatarAr,
description: descriptionRows.join('\n').trim(),
};
}
function parseTechBody(subType, body, frame) {
const reader = new Reader(body);
if (subType === 0) {
const magic = reader.text(5, 'HEADER magic');
const login = reader.textU8('HEADER login');
const initialBlockchainKey = bytesToBase64Url(reader.raw(32, 'initialBlockchainKey32'));
return { kind: 'header', magic, login, initialBlockchainKey };
}
if (subType === 1) {
const line = parseLinePrefix(reader);
const channelName = reader.textU8('channelName');
const channelDescription = reader.textU16('channelDescription');
const channelType = reader.u16('channelType');
const channelTypeVersion = reader.u16('channelTypeVersion');
return {
kind: 'create_channel', line, channelName, channelDescription, channelType, channelTypeVersion,
channelRootBlockNumber: frame.blockNumber,
channelMeta: parseChannelMetaText(channelDescription),
};
}
if (subType === 2) {
const line = parseLinePrefix(reader);
const parentBlockchainKey = bytesToBase64Url(reader.raw(32, 'parentBlockchainKey'));
const forkPointBlockNumber = reader.i32('forkPointBlockNumber');
const forkPointBlockHash = reader.hash32('forkPointBlockHash');
const forkPointTimestampMs = Number(reader.i64('forkPointTimestampMs'));
const parentTipBlockNumber = reader.i32('parentTipBlockNumber');
const parentTipBlockHash = reader.hash32('parentTipBlockHash');
const parentTipTimestampMs = Number(reader.i64('parentTipTimestampMs'));
const discardedBlocksCount = reader.i32('discardedBlocksCount');
const reasonCode = reader.u8('reasonCode');
const comment = reader.textU16('comment');
return {
kind: 'fork', line, parentBlockchainKey, forkPointBlockNumber, forkPointBlockHash,
forkPointTimestampMs, parentTipBlockNumber, parentTipBlockHash, parentTipTimestampMs,
discardedBlocksCount, reasonCode, comment,
};
}
return { kind: 'unknown', rawBodyLength: body.length };
}
function parseTextBody(subType, body) {
const reader = new Reader(body);
if ([10, 90, 92, 100, 110, 120, 130].includes(subType)) {
const line = parseLinePrefix(reader);
const rawText = parseTextTail(reader);
const message = splitMessageText(rawText);
return {
kind: subType === 90 ? 'channel_meta' : subType === 92 ? 'channel_delete' : 'line_text',
line, rawText, text: message.text, attachmentsCount: message.attachmentsCount,
channelMeta: subType === 90 ? parseChannelMetaText(rawText) : null,
};
}
if (subType === 11) {
const line = parseLinePrefix(reader);
const target = parseCompactTarget(reader);
const rawText = parseTextTail(reader);
const message = splitMessageText(rawText);
return { kind: 'edit_post', line, target, rawText, text: message.text, attachmentsCount: message.attachmentsCount };
}
if ([20, 30].includes(subType)) {
const target = parseTarget(reader);
const rawText = parseTextTail(reader);
const message = splitMessageText(rawText);
return { kind: subType === 20 ? 'reply' : 'rating', target, rawText, text: message.text, attachmentsCount: message.attachmentsCount };
}
if (subType === 21) {
const target = parseCompactTarget(reader);
const rawText = parseTextTail(reader);
const message = splitMessageText(rawText);
return { kind: 'edit_reply', target, rawText, text: message.text, attachmentsCount: message.attachmentsCount };
}
if (subType === 50) {
const line = parseLinePrefix(reader);
const target = parseTarget(reader);
const rawText = parseTextTail(reader);
const message = splitMessageText(rawText);
return { kind: 'repost', line, target, rawText, text: message.text, attachmentsCount: message.attachmentsCount };
}
return { kind: 'unknown', rawBodyLength: body.length };
}
function parseReactionBody(subType, body) {
const reader = new Reader(body);
if (subType === 1 || subType === 2) return { kind: subType === 1 ? 'like' : 'unlike', target: parseTarget(reader) };
return { kind: 'unknown', rawBodyLength: body.length };
}
function parseConnectionBody(subType, body) {
const reader = new Reader(body);
const line = parseFixedLinePrefix(reader, 'Connection');
const target = parseTarget(reader);
return { kind: 'connection', subType, line, target };
}
function parseProfileBody(subType, body) {
if (subType !== 1) return { kind: 'unknown', rawBodyLength: body.length };
const reader = new Reader(body);
const line = parseFixedLinePrefix(reader, 'Profile');
const key = reader.textU16('paramKey');
const value = reader.textU16('paramValue');
return { kind: 'profile', line, key, value };
}
function parseStatusBody(subType, body) {
const reader = new Reader(body);
const target = parseTarget(reader);
const rawText = parseTextTail(reader);
const message = splitMessageText(rawText);
return { kind: 'status', subType, target, rawText, text: message.text, attachmentsCount: message.attachmentsCount };
}
function parseBody(type, subType, version, body, frame) {
if (version !== 1) return { kind: 'unsupported_version', rawBodyLength: body.length };
if (type === 0) return parseTechBody(subType, body, frame);
if (type === 1) return parseTextBody(subType, body);
if (type === 2) return parseReactionBody(subType, body);
if (type === 3) return parseConnectionBody(subType, body);
if (type === 4) return parseProfileBody(subType, body);
if (type === 5) return parseStatusBody(subType, body);
return { kind: 'unknown', rawBodyLength: body.length };
}
export function parseShineFrame(frameBytes) {
const frame = frameBytes instanceof Uint8Array ? frameBytes : new Uint8Array(frameBytes || []);
if (frame.length < FRAME_HEADER_SIZE) throw new Error('SHiNE Frame короче 88 байт');
const reader = new Reader(frame);
const frameCode = reader.u16('frameCode');
const prevHash = reader.hash32('prevHash32');
const back32Hash = reader.hash32('back32Hash32');
const blockSize = reader.i32('blockSize');
const blockNumber = reader.i32('blockNumber');
const timestampSeconds = reader.i64('timestamp');
const type = reader.u16('type');
const subType = reader.u16('subType');
const version = reader.u16('version');
if (frameCode !== 1) throw new Error(`Неподдерживаемый frameCode: ${frameCode}`);
if (blockSize !== frame.length) throw new Error(`Размер Frame не совпадает: ${blockSize} != ${frame.length}`);
const bodyBytes = reader.raw(reader.remaining(), 'body');
const meta = { frameCode, prevHash, back32Hash, blockSize, blockNumber, timestampMs: Number(timestampSeconds * 1000n), type, subType, version };
return { ...meta, body: parseBody(type, subType, version, bodyBytes, meta), bodyBytes };
}
export async function inspectBlockchainDataItem(blockBytesB64) {
const raw = base64ToBytes(String(blockBytesB64 || ''));
const dataItem = parseAns104DataItem(raw);
const frame = parseShineFrame(dataItem.data);
const dataItemId = bytesToBase64Url(await sha256Bytes(dataItem.signature));
return {
dataItemId,
arweaveUrl: `https://arweave.net/${dataItemId}`,
owner: bytesToBase64Url(dataItem.owner32),
signatureType: dataItem.sigType,
frame,
};
}
export const blockchainInspectorInternals = Object.freeze({
FRAME_HEADER_SIZE,
LINE_PREFIX_SIZE,
FIXED_LINE_PREFIX_SIZE,
ZERO_HASH,
});
+3 -3
View File
@@ -110,7 +110,7 @@ async function loadAvatarSnapshot(login) {
}
function renderPeerAvatar(login, avatar = null) {
const hasAvatar = Boolean(String(avatar?.ar || '').trim());
const hasAvatar = Boolean(String(avatar?.ar || '').trim() || String(avatar?.sha256Hex || '').trim());
const avatarEl = renderUserAvatar({
login: String(login || '').trim() || 'unknown',
avatar,
@@ -137,9 +137,9 @@ function updatePeerAvatar(login) {
if (!cleanLogin) return;
void loadAvatarSnapshot(cleanLogin).then((snapshot) => {
if (!avatarSlotEl || loadToken !== activeAvatarLoadToken || activeAvatarLogin !== cleanLogin) return;
const avatar = snapshot?.avatar?.txId
const avatar = snapshot?.avatar?.source
? {
ar: String(snapshot.avatar.txId || '').trim(),
ar: String(snapshot.avatar.txId || snapshot.avatar.ar || '').trim(),
sha256Hex: String(snapshot.avatar.sha256Hex || '').trim().toLowerCase(),
}
: null;
+2 -2
View File
@@ -272,9 +272,9 @@ export async function loadUserProfileCard(login) {
shineReceivedCount: Number(user.shineConfirmationsReceivedCount || 0),
shineGivenCount: Number(user.shineConfirmationsGivenCount || 0),
},
avatar: snapshot?.avatar?.txId
avatar: snapshot?.avatar?.source
? {
ar: String(snapshot.avatar.txId).trim(),
ar: String(snapshot.avatar.txId || snapshot.avatar.ar || '').trim(),
sha256Hex: String(snapshot?.avatar?.sha256Hex || '').trim().toLowerCase(),
}
: null,
+22 -20
View File
@@ -1,10 +1,6 @@
import { authService, state } from '../state.js';
import {
buildArweaveAvatarValue,
parseArweaveAvatarValue,
validateArweaveTxId,
validateSha256Hex,
} from './arweave-file-service.js';
import { validateArweaveTxId, validateSha256Hex } from './arweave-file-service.js';
import { buildAvatarReference, parseAvatarReference } from './avatar-reference.js';
export const profileFieldDefs = [
{ key: 'first_name', readKeys: ['first_name'], label: 'Имя', placeholder: 'Введите имя' },
@@ -138,20 +134,24 @@ export async function loadProfileSnapshot(login) {
const latestGender = loadLatestByAliasesFromItems(items, ['gender']);
const gender = normalizeGenderValue(latestGender?.value || PROFILE_GENDER_UNKNOWN);
const latestAvatar = loadLatestByAliasesFromItems(items, ['ava']);
const parsedAvatar = parseArweaveAvatarValue(latestAvatar?.value || '');
const parsedAvatar = parseAvatarReference(latestAvatar?.value || '');
const avatar = parsedAvatar.ok
? {
value: buildArweaveAvatarValue(parsedAvatar.txId, parsedAvatar.sha256Hex),
source: 'arweave',
txId: parsedAvatar.txId,
value: parsedAvatar.value,
source: parsedAvatar.source,
txId: parsedAvatar.txId || '',
ar: parsedAvatar.ar || '',
sha256Hex: parsedAvatar.sha256Hex || '',
size: Number(parsedAvatar.size || 0),
timeMs: latestAvatar?.timeMs || 0,
}
: {
value: '',
source: '',
txId: '',
ar: '',
sha256Hex: '',
size: 0,
timeMs: latestAvatar?.timeMs || 0,
};
@@ -209,14 +209,16 @@ export async function saveProfileGender(login, gender) {
});
}
export async function saveProfileAvatarArweave(login, txId, sha256Hex) {
const cleanTxId = String(txId || '').trim();
const cleanSha = String(sha256Hex || '').trim().toLowerCase();
if (!validateArweaveTxId(cleanTxId)) {
throw new Error('Некорректный Transaction ID Arweave');
}
if (!validateSha256Hex(cleanSha)) {
throw new Error('Некорректный SHA256 хэш аватара');
}
await saveProfileParamBlock(login, 'ava', buildArweaveAvatarValue(cleanTxId, cleanSha));
export async function saveProfileAvatar(login, avatar) {
const cleanAr = String(avatar?.ar || '').trim();
const cleanSha = String(avatar?.sha256 || avatar?.sha256Hex || '').trim().toLowerCase();
const size = Number(avatar?.size || 0);
if (cleanAr && !validateArweaveTxId(cleanAr)) throw new Error('Некорректный Transaction ID Arweave');
if (!validateSha256Hex(cleanSha)) throw new Error('Некорректный SHA256 хэш аватара');
await saveProfileParamBlock(login, 'ava', buildAvatarReference({ ar: cleanAr, sha256: cleanSha, size }));
}
// Legacy export for old callers. New UI writes only <S:ava;...>.
export async function saveProfileAvatarArweave(login, txId, sha256Hex, size = 1) {
return saveProfileAvatar(login, { ar: txId, sha256: sha256Hex, size });
}
@@ -601,6 +601,14 @@
gap: 12px;
}
/* The two storage modes are mutually exclusive. Keep this explicit because
the author-level display:grid above otherwise overrides the browser's
default [hidden] rule in some engines. */
.public-attachment-manager__server[hidden],
.public-attachment-manager__arweave[hidden] {
display: none;
}
.public-attachment-manager__notice {
display: grid;
gap: 8px;
@@ -623,3 +631,26 @@
.public-attachment-manager__card { width: 100%; max-height: calc(100dvh - 20px); }
.public-attachment-manager__sources { grid-template-columns: 1fr; }
}
/* Unified storage picker / balance dialogs */
.public-attachment-manager__file-picker { width: 100%; box-sizing: border-box; }
.public-attachment-manager__file-picker .ar-attachment-file-name { flex: 1; text-align: center; }
.ar-balance-modal { z-index: 1400; }
.ar-balance-modal__card { width: min(92vw, 32rem); }
.ar-balance-grid { display: grid; gap: 8px; }
.ar-balance-grid > div { display: flex; justify-content: space-between; gap: 16px; padding: 10px 12px; border: 1px solid var(--border-subtle); border-radius: 10px; }
.ar-balance-grid span { color: var(--text-secondary); }
.ar-wallet-address { padding: 12px; border: 1px solid var(--border-control); border-radius: 10px; background: var(--quote-bg); overflow-wrap: anywhere; user-select: all; }
.ar-attachment-manager-card .form-actions-grid { grid-template-columns: repeat(2, minmax(0, 1fr)); }
/* Arweave manager embedded inside the unified server / Arweave picker. */
.ar-attachment-manager-embedded-root { min-width: 0; }
.ar-attachment-manager-card--embedded {
width: 100%;
max-width: none;
margin: 0;
padding: 0;
border: 0;
background: transparent;
box-shadow: none;
}
+162
View File
@@ -319,3 +319,165 @@
.settings-theme-editor { width: 100%; }
.settings-intro { padding-top: var(--space-3); }
.settings-intro > p { margin: 0; padding-inline: var(--space-1); font-size: var(--text-sm); line-height: var(--leading-sm); }
/* ===== Мой блокчейн ===== */
.my-blockchain-list {
gap: 7px;
}
.my-blockchain-entry {
display: grid;
gap: 0;
padding: 10px 12px;
}
.my-blockchain-entry__head {
min-width: 0;
display: grid;
grid-template-columns: minmax(0, 1fr) 30px;
align-items: center;
gap: 8px;
}
.my-blockchain-entry__copy {
min-width: 0;
display: grid;
gap: 3px;
}
.my-blockchain-entry__title {
min-width: 0;
overflow: hidden;
color: var(--text-primary);
font-size: 14px;
font-weight: 650;
line-height: 1.35;
text-overflow: ellipsis;
white-space: nowrap;
}
.my-blockchain-entry__meta {
min-width: 0;
overflow: hidden;
font-size: 11px;
line-height: 1.3;
text-overflow: ellipsis;
white-space: nowrap;
}
.my-blockchain-entry__toggle {
width: 30px;
height: 30px;
min-height: 30px;
padding: 0;
display: grid;
place-items: center;
border-radius: 50%;
}
.my-blockchain-entry__toggle:hover {
background: var(--surface-selected);
}
.my-blockchain-entry__triangle {
width: 0;
height: 0;
border-left: 5px solid transparent;
border-right: 5px solid transparent;
border-top: 7px solid currentColor;
transform-origin: 50% 45%;
transition: transform 140ms ease;
}
.my-blockchain-entry__toggle[aria-expanded="true"] .my-blockchain-entry__triangle {
transform: rotate(180deg);
}
.my-blockchain-entry__details {
min-width: 0;
margin-top: 10px;
padding-top: 10px;
border-top: 1px solid var(--border-subtle);
}
.my-blockchain-entry__details[hidden] {
display: none;
}
.my-blockchain-entry__detail-title {
display: block;
margin-bottom: 7px;
font-size: 14px;
line-height: 1.4;
}
.my-blockchain-entry__full-text {
max-height: 45vh;
overflow: auto;
margin-bottom: 8px;
padding: 9px 10px;
border-radius: var(--radius-sm);
background: color-mix(in srgb, var(--text-primary) 4%, transparent);
font-size: 13px;
line-height: 1.5;
overflow-wrap: anywhere;
white-space: pre-wrap;
}
.my-blockchain-entry__attachments {
margin-bottom: 7px;
font-size: 12px;
}
.my-blockchain-entry__actions {
display: flex;
flex-wrap: wrap;
align-items: center;
gap: 6px 14px;
margin: 2px 0 9px;
}
.my-blockchain-entry__action {
min-height: 30px;
padding: 4px 0;
color: var(--action);
font-size: 13px;
font-weight: 600;
text-decoration: none;
}
.my-blockchain-entry__external:hover {
text-decoration: underline;
}
.my-blockchain-entry__detail-grid {
display: grid;
gap: 4px;
}
.my-blockchain-entry__detail-row {
min-width: 0;
display: grid;
grid-template-columns: minmax(92px, 0.32fr) minmax(0, 1fr);
gap: 8px;
align-items: start;
font-size: 11px;
line-height: 1.4;
}
.my-blockchain-entry__detail-key {
color: var(--text-secondary);
}
.my-blockchain-entry__detail-value {
min-width: 0;
color: var(--text-primary);
overflow-wrap: anywhere;
word-break: break-word;
}
@media (max-width: 520px) {
.my-blockchain-entry__detail-row {
grid-template-columns: 84px minmax(0, 1fr);
}
}