SHA256
Обновить публичные идентификаторы файлов
This commit is contained in:
@@ -729,7 +729,7 @@ export function openArweaveAttachmentManager({
|
||||
}
|
||||
const buffer = await selectedFile.arrayBuffer();
|
||||
selectedSha256 = await sha256HexFromArrayBuffer(buffer);
|
||||
if (!isAvatarMode) selectedPrepared = await preparePublicFile(selectedFile);
|
||||
selectedPrepared = await preparePublicFile(selectedFile);
|
||||
if (turboMode) {
|
||||
await refreshTurboStateForCurrentFile(mainMetaEl, errorEl, uploadBtn);
|
||||
} else {
|
||||
@@ -780,9 +780,9 @@ export function openArweaveAttachmentManager({
|
||||
...normalizedExtraUploadTags,
|
||||
],
|
||||
});
|
||||
const prepared = isAvatarMode ? null : (selectedPrepared || await preparePublicFile(selectedFile));
|
||||
const prepared = selectedPrepared || await preparePublicFile(selectedFile);
|
||||
finish(resolve, {
|
||||
...(prepared ? { pr: prepared.pr, mm: prepared.mm } : {}),
|
||||
pr: prepared.pr, mm: prepared.mm,
|
||||
name: isAvatarMode ? t('screens.arweave_attachment_manager.text_032') : (initialName || selectedFile.name || 'file'),
|
||||
size: selectedFile.size,
|
||||
sha256: selectedSha256,
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
import { t } from '../i18n/index.js';
|
||||
import { state } from '../state.js';
|
||||
import { buildArweaveDataUrl, validateArweaveTxId, validateSha256Hex } from '../services/arweave-file-service.js';
|
||||
import { buildArweaveDataUrl, validateArweaveTxId } from '../services/arweave-file-service.js';
|
||||
import { getCachedAvatarObjectUrl } from '../services/arweave-avatar-cache-service.js';
|
||||
import { resolvePublicFileUrl } from '../services/public-file-service.js';
|
||||
import { avatarR2Url } from '../services/public-file-service.js';
|
||||
import { validatePublicPiecesRoot } from '../services/public-pieces-root.js';
|
||||
|
||||
function normalizeLogin(value) {
|
||||
return String(value || '').trim();
|
||||
@@ -66,10 +67,10 @@ export function renderAvatar({
|
||||
}
|
||||
|
||||
const txId = String(avatar?.ar || '').trim();
|
||||
const sha256Hex = String(avatar?.sha256Hex || avatar?.sha256 || '').trim().toLowerCase();
|
||||
const expectedSha256Hex = validateSha256Hex(sha256Hex) ? sha256Hex : '';
|
||||
const pr = String(avatar?.pr || '').trim();
|
||||
const expectedPr = validatePublicPiecesRoot(pr) ? pr : '';
|
||||
const hasArweave = validateArweaveTxId(txId);
|
||||
const hasServerAvatar = !txId && expectedSha256Hex && normalizeLogin(authorLogin);
|
||||
const hasServerAvatar = !txId && expectedPr;
|
||||
if (!hasArweave && !hasServerAvatar) return wrap;
|
||||
|
||||
const img = document.createElement('img');
|
||||
@@ -85,24 +86,15 @@ 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);
|
||||
});
|
||||
// All public avatars use exactly the same PR/Base58 R2 object key as attachments.
|
||||
img.onload = () => setLoadedState(true);
|
||||
img.onerror = () => { img.removeAttribute('src'); setLoadedState(false); };
|
||||
img.src = avatarR2Url(expectedPr);
|
||||
return wrap;
|
||||
}
|
||||
|
||||
const gateway = state?.entrySettings?.arweaveServer;
|
||||
void getCachedAvatarObjectUrl({ gateway, txId, expectedSha256Hex })
|
||||
void getCachedAvatarObjectUrl({ gateway, txId, expectedPr })
|
||||
.then((objectUrl) => {
|
||||
const directUrl = buildArweaveDataUrl({ gateway, txId });
|
||||
let triedDirectUrl = false;
|
||||
@@ -120,7 +112,7 @@ export function renderAvatar({
|
||||
};
|
||||
img.onerror = () => {
|
||||
if (!triedDirectUrl) {
|
||||
if (expectedSha256Hex) {
|
||||
if (expectedPr) {
|
||||
releaseObjectUrl();
|
||||
img.removeAttribute('src');
|
||||
setLoadedState(false);
|
||||
@@ -138,7 +130,7 @@ export function renderAvatar({
|
||||
img.src = objectUrl;
|
||||
})
|
||||
.catch(() => {
|
||||
if (expectedSha256Hex) {
|
||||
if (expectedPr) {
|
||||
img.removeAttribute('src');
|
||||
setLoadedState(false);
|
||||
return;
|
||||
|
||||
@@ -24,7 +24,7 @@ export async function openAvatarWizard({
|
||||
mode: 'avatar',
|
||||
});
|
||||
|
||||
if (!item?.sha256 || !item?.size) return false;
|
||||
if (!item?.pr || !item?.size) return false;
|
||||
|
||||
if (typeof onStatus === 'function') {
|
||||
onStatus(t('screens.avatar_wizard.text_002'));
|
||||
|
||||
@@ -45,7 +45,7 @@ function renderAvatarPreview(slot, avatar, title) {
|
||||
const initials = Array.from(label)[0]?.toUpperCase() || t('screens.add_channel_view.text_016');
|
||||
// При вводе названия обновляем только текст fallback. Иначе асинхронно
|
||||
// загруженная картинка каждый раз удаляется, и на мгновение виден кружок.
|
||||
const avatarKey = `${String(avatar?.ar || '').trim()}|${String(avatar?.sha256Hex || avatar?.sha256 || '').trim().toLowerCase()}`;
|
||||
const avatarKey = `${String(avatar?.ar || '').trim()}|${String(avatar?.pr || '').trim()}`;
|
||||
const current = slot.firstElementChild;
|
||||
if (current?.dataset.avatarPreviewKey === avatarKey) {
|
||||
current.title = label;
|
||||
@@ -184,8 +184,8 @@ export function render({navigate, chrome}) {
|
||||
|
||||
const renderAvatarStatus = (nameValue, titleValue) => {
|
||||
renderAvatarPreview(avatarPreviewEl, selectedAvatar, titleValue || nameValue);
|
||||
avatarRemoveBtn.hidden = !selectedAvatar?.sha256;
|
||||
if (!selectedAvatar?.sha256) {
|
||||
avatarRemoveBtn.hidden = !selectedAvatar?.pr;
|
||||
if (!selectedAvatar?.pr) {
|
||||
avatarStatusEl.innerHTML = t('screens.add_channel_view.text_017');
|
||||
return;
|
||||
}
|
||||
@@ -295,7 +295,7 @@ export function render({navigate, chrome}) {
|
||||
gateway: state.entrySettings.arweaveServer,
|
||||
mode: 'avatar',
|
||||
});
|
||||
if (nextAvatar?.sha256) {
|
||||
if (nextAvatar?.pr) {
|
||||
selectedAvatar = nextAvatar;
|
||||
void refreshAvatarAvailability();
|
||||
}
|
||||
@@ -306,7 +306,7 @@ export function render({navigate, chrome}) {
|
||||
});
|
||||
|
||||
avatarRemoveBtn.addEventListener('click', async () => {
|
||||
if (!selectedAvatar?.sha256) return;
|
||||
if (!selectedAvatar?.pr) return;
|
||||
const confirmed = await confirmDialog({ title: t('screens.add_channel_view.text_005'), text: t('screens.add_channel_view.text_013'), confirmLabel: t('screens.add_channel_view.text_006') });
|
||||
if (!confirmed) return;
|
||||
selectedAvatar = null;
|
||||
|
||||
@@ -88,10 +88,10 @@ function formatChannelCreatedAt(value) {
|
||||
function openChannelProfileEditor({ channel, selector, onSaved }) {
|
||||
const root = document.getElementById('modal-root');
|
||||
if (!root) return;
|
||||
let selectedAvatar = String(channel?.avaSha256 || '').trim() ? {
|
||||
let selectedAvatar = String(channel?.avaPr || '').trim() ? {
|
||||
name: t('dialogs.remaining.pages.channel_about_view.openchannelprofileeditor.avatar'),
|
||||
ar: String(channel.avaAr || '').trim(),
|
||||
sha256: String(channel?.avaSha256 || '').trim(),
|
||||
pr: String(channel?.avaPr || '').trim(),
|
||||
size: Number(channel?.avaSize || 0),
|
||||
purpose: 'avatar',
|
||||
} : null;
|
||||
@@ -125,7 +125,7 @@ function openChannelProfileEditor({ channel, selector, onSaved }) {
|
||||
slot.innerHTML = '';
|
||||
slot.append(renderAvatar({
|
||||
initials: (title || t('dialogs.remaining.pages.channel_about_view.renderpreview.k')).slice(0, 1).toUpperCase(),
|
||||
avatar: selectedAvatar?.sha256 ? { ar: String(selectedAvatar.ar || ''), sha256Hex: selectedAvatar.sha256 } : null,
|
||||
avatar: selectedAvatar?.pr ? { ar: String(selectedAvatar.ar || ''), pr: selectedAvatar.pr } : null,
|
||||
authorLogin: String(channel?.ownerLogin || state.session.login || '').trim(),
|
||||
size: 'xl',
|
||||
className: 'channel-about-avatar channel-profile-avatar avatar-plain',
|
||||
@@ -640,7 +640,7 @@ export function render({ navigate, route, chrome }) {
|
||||
|
||||
const channelAvatar = renderAvatar({
|
||||
initials: cleanName.slice(0, 1).toUpperCase() || t('screens.channel_about_view.text_030'),
|
||||
avatar: String(channel?.avaAr || channel?.avaSha256 || '').trim() ? { ar: String(channel.avaAr || '').trim(), sha256Hex: String(channel?.avaSha256 || '').trim() } : null,
|
||||
avatar: String(channel?.avaAr || channel?.avaPr || '').trim() ? { ar: String(channel.avaAr || '').trim(), pr: String(channel?.avaPr || '').trim() } : null,
|
||||
authorLogin: ownerLogin,
|
||||
size: 'xl',
|
||||
className: 'channel-about-avatar channel-profile-avatar avatar-plain',
|
||||
|
||||
@@ -95,7 +95,7 @@ function createThreadAvatar(login) {
|
||||
avatar: snapshot?.avatar?.source
|
||||
? {
|
||||
ar: String(snapshot.avatar.txId || snapshot.avatar.ar || '').trim(),
|
||||
sha256Hex: String(snapshot?.avatar?.sha256Hex || '').trim().toLowerCase(),
|
||||
pr: String(snapshot?.avatar?.pr || '').trim(),
|
||||
}
|
||||
: null,
|
||||
size: 'sm',
|
||||
@@ -747,7 +747,7 @@ function renderNodeCard(node, heading, handlers, localNumber, { focusPost = fals
|
||||
const title = String(channel.title || author).trim();
|
||||
const channelAvatar = renderAvatar({
|
||||
initials: (title[0] || t('screens.channel_thread_view.text_083')).toUpperCase(),
|
||||
avatar: (channel.avatarAr || channel.avatarSha256) ? { ar: channel.avatarAr, sha256Hex: channel.avatarSha256 } : null,
|
||||
avatar: (channel.avatarAr || channel.avatarPr) ? { ar: channel.avatarAr, pr: channel.avatarPr } : null,
|
||||
authorLogin: author,
|
||||
size: 'xl',
|
||||
className: 'channel-profile-avatar channel-message-avatar avatar-plain',
|
||||
@@ -1565,7 +1565,7 @@ async function loadThreadData(sel, cacheKey, isCurrent) {
|
||||
const channelSlug = String(sel?.short?.channelName || (resolvedChannelLabel.includes('/') ? resolvedChannelLabel.split('/').slice(1).join('/') : '')).trim();
|
||||
let title = channelTitleByLabel.get(resolvedChannelTitle) || channelSlug || resolvedChannelTitle;
|
||||
let avatarAr = '';
|
||||
let avatarSha256 = '';
|
||||
let avatarPr = '';
|
||||
// Метаданные канала доступны гостям: заголовок и аватар берём из того же API, что у ленты.
|
||||
if (sel?.channel?.ownerBlockchainName && sel?.channel?.channelRootBlockNumber != null && Number.isFinite(Number(sel.channel.channelRootBlockNumber))) {
|
||||
try {
|
||||
@@ -1581,13 +1581,13 @@ async function loadThreadData(sel, cacheKey, isCurrent) {
|
||||
const meta = channelPayload?.channel || {};
|
||||
title = String(meta.displayName || meta.channelName || title).trim();
|
||||
avatarAr = String(meta.avaAr || '').trim();
|
||||
avatarSha256 = String(meta.avaSha256 || '').trim().toLowerCase();
|
||||
avatarPr = String(meta.avaPr || '').trim();
|
||||
if (!sel.short && meta.channelName) sel.short = { ownerBlockchainName: sel.channel.ownerBlockchainName, channelName: String(meta.channelName) };
|
||||
} catch {
|
||||
// Обсуждение должно открываться даже при временной недоступности метаданных канала.
|
||||
}
|
||||
}
|
||||
return { selector: sel, ordinal, payload, resolvedChannelLabel, title, avatarAr, avatarSha256, channelSlug };
|
||||
return { selector: sel, ordinal, payload, resolvedChannelLabel, title, avatarAr, avatarPr, channelSlug };
|
||||
}
|
||||
|
||||
const threadPrefetches = new Map();
|
||||
@@ -1907,7 +1907,7 @@ export function render({ navigate, route, chrome }) {
|
||||
const paint = (data, restorePosition, seq) => {
|
||||
selector = data.selector;
|
||||
focusOrdinal = data.ordinal;
|
||||
const { payload, resolvedChannelLabel, title, avatarAr, avatarSha256, channelSlug } = data;
|
||||
const { payload, resolvedChannelLabel, title, avatarAr, avatarPr, channelSlug } = data;
|
||||
activeResolvedChannelLabel = resolvedChannelLabel;
|
||||
const ancestors = Array.isArray(payload?.ancestors) ? payload.ancestors : [];
|
||||
const focus = payload?.focus || null;
|
||||
@@ -1925,7 +1925,7 @@ export function render({ navigate, route, chrome }) {
|
||||
threadHeaderButton.querySelector('.channel-thread-header-avatar')?.remove();
|
||||
const avatar = renderAvatar({
|
||||
initials: (title[0] || t('screens.channel_thread_view.text_094')).toUpperCase(),
|
||||
avatar: (avatarAr || avatarSha256) ? { ar: avatarAr, sha256Hex: avatarSha256 } : null,
|
||||
avatar: (avatarAr || avatarPr) ? { ar: avatarAr, pr: avatarPr } : null,
|
||||
authorLogin: visibleOwner,
|
||||
size: 'xl',
|
||||
className: 'channel-profile-avatar channel-thread-header-avatar avatar-plain',
|
||||
@@ -1993,7 +1993,7 @@ export function render({ navigate, route, chrome }) {
|
||||
if (isChannelPost) {
|
||||
const avatar = renderAvatar({
|
||||
initials: (title[0] || t('screens.channel_thread_view.text_095')).toUpperCase(),
|
||||
avatar: (avatarAr || avatarSha256) ? { ar: avatarAr, sha256Hex: avatarSha256 } : null,
|
||||
avatar: (avatarAr || avatarPr) ? { ar: avatarAr, pr: avatarPr } : null,
|
||||
authorLogin: node?.authorLogin,
|
||||
size: 'xl',
|
||||
className: 'channel-profile-avatar thread-comment__avatar avatar-plain',
|
||||
@@ -2017,7 +2017,7 @@ export function render({ navigate, route, chrome }) {
|
||||
focusWrap.append(renderNodeCard(focus, '', handlers, focusOrdinal || Number(selector?.message?.blockNumber ?? 0), {
|
||||
focusPost: true,
|
||||
channelOwnerBlockchainName: selector?.channel?.ownerBlockchainName || '',
|
||||
channel: { title, avatarAr, avatarSha256 },
|
||||
channel: { title, avatarAr, avatarPr },
|
||||
}));
|
||||
screen.append(focusWrap);
|
||||
}
|
||||
@@ -2106,7 +2106,7 @@ export function render({ navigate, route, chrome }) {
|
||||
item.title = title;
|
||||
item.avatar = renderAvatar({
|
||||
initials: (title[0] || t('screens.channel_thread_view.text_096')).toUpperCase(),
|
||||
avatar: (avatarAr || avatarSha256) ? { ar: avatarAr, sha256Hex: avatarSha256 } : null,
|
||||
avatar: (avatarAr || avatarPr) ? { ar: avatarAr, pr: avatarPr } : null,
|
||||
authorLogin: item.author,
|
||||
size: 'xl',
|
||||
className: 'channel-profile-avatar avatar-plain',
|
||||
|
||||
@@ -129,7 +129,7 @@ function createMessageAvatar(login) {
|
||||
avatar: snapshot?.avatar?.source
|
||||
? {
|
||||
ar: String(snapshot.avatar.txId || snapshot.avatar.ar || '').trim(),
|
||||
sha256Hex: String(snapshot?.avatar?.sha256Hex || '').trim().toLowerCase(),
|
||||
pr: String(snapshot?.avatar?.pr || '').trim(),
|
||||
}
|
||||
: null,
|
||||
size: 'sm',
|
||||
@@ -644,11 +644,11 @@ function getStatusActionOptionsForTarget(targetMsgSubType) {
|
||||
|
||||
function createChannelAvatarElement(channel, size = 96) {
|
||||
const txId = String(channel?.avaAr || '').trim();
|
||||
const sha256 = String(channel?.avaSha256 || '').trim().toLowerCase();
|
||||
const pr = String(channel?.avaPr || '').trim();
|
||||
const title = String(channel?.displayTitle || channel?.name || t('screens.channel_view.text_111')).trim() || t('screens.channel_view.text_112');
|
||||
const wrap = renderAvatar({
|
||||
initials: title.slice(0, 1).toUpperCase() || t('screens.channel_view.text_113'),
|
||||
avatar: (txId || sha256) ? { ar: txId, sha256Hex: sha256 } : null,
|
||||
avatar: (txId || pr) ? { ar: txId, pr: pr } : null,
|
||||
authorLogin: String(channel?.ownerLogin || channel?.ownerName || extractLoginFromBlockchainName(channel?.ownerBlockchainName) || '').trim(),
|
||||
size: 'xl',
|
||||
className: 'channel-profile-avatar avatar-plain',
|
||||
@@ -717,10 +717,10 @@ function openAboutChannelModal(channel, options = {}) {
|
||||
|
||||
function openEditChannelModal({ channel, onSave }) {
|
||||
const root = document.getElementById('modal-root');
|
||||
let selectedAvatar = channel?.avaSha256 ? {
|
||||
let selectedAvatar = channel?.avaPr ? {
|
||||
name: t('dialogs.remaining.pages.channel_view.openeditchannelmodal.avatar'),
|
||||
ar: String(channel.avaAr || ''),
|
||||
sha256: channel.avaSha256,
|
||||
pr: channel.avaPr,
|
||||
size: channel.avaSize,
|
||||
purpose: 'avatar',
|
||||
} : null;
|
||||
@@ -732,7 +732,7 @@ function openEditChannelModal({ channel, onSave }) {
|
||||
slot.append(createChannelAvatarElement({
|
||||
...channel,
|
||||
avaAr: selectedAvatar?.ar || '',
|
||||
avaSha256: selectedAvatar?.sha256 || '',
|
||||
avaPr: selectedAvatar?.pr || '',
|
||||
avaSize: selectedAvatar?.size || 0,
|
||||
displayTitle: root.querySelector('#edit-channel-title')?.value || channel.displayTitle,
|
||||
}, 86));
|
||||
@@ -1382,7 +1382,7 @@ async function loadFromApi(route, channelId) {
|
||||
displayName: t('screens.channel_view.text_093'),
|
||||
description: String(diaryPayload?.channel?.channelDescription || '').trim(),
|
||||
avaAr: '',
|
||||
avaSha256: '',
|
||||
avaPr: '',
|
||||
avaSize: 0,
|
||||
metaUpdatedAtMs: 0,
|
||||
ownerName: currentSessionLogin,
|
||||
@@ -1566,7 +1566,7 @@ async function loadFromApi(route, channelId) {
|
||||
displayName: `${ownerLogin || t('screens.channel_view.text_123')}/${payload.channel?.channelName || t('screens.channel_view.text_124')}`,
|
||||
description: String(payload.channel?.channelDescription || '').trim(),
|
||||
avaAr: String(payload.channel?.avaAr || '').trim(),
|
||||
avaSha256: String(payload.channel?.avaSha256 || '').trim(),
|
||||
avaPr: String(payload.channel?.avaPr || '').trim(),
|
||||
avaSize: Number(payload.channel?.avaSize || 0),
|
||||
metaUpdatedAtMs: Number(payload.channel?.metaUpdatedAtMs || 0),
|
||||
subscribersCount: Number(payload.channel?.subscribersCount || 0),
|
||||
@@ -1651,7 +1651,7 @@ function applyPendingScroll(screen, routeKey, forceBottom = false) {
|
||||
}
|
||||
|
||||
function mapChannelMetaEvent(event, fallbackChannel) {
|
||||
const hasEventAvatar = Boolean(String(event?.avaAr || event?.avaSha256 || '').trim());
|
||||
const hasEventAvatar = Boolean(String(event?.avaAr || event?.avaPr || '').trim());
|
||||
return {
|
||||
kind: String(event?.kind || '').trim(),
|
||||
messageRef: event?.messageRef || null,
|
||||
@@ -1661,7 +1661,7 @@ function mapChannelMetaEvent(event, fallbackChannel) {
|
||||
// Событие создания хранит снимок на момент создания и часто ещё без аватара.
|
||||
// Показываем актуальную фотографию канала, если у события нет своей.
|
||||
avaAr: String((hasEventAvatar ? event?.avaAr : fallbackChannel?.avaAr) || '').trim(),
|
||||
avaSha256: String((hasEventAvatar ? event?.avaSha256 : fallbackChannel?.avaSha256) || '').trim(),
|
||||
avaPr: String((hasEventAvatar ? event?.avaPr : fallbackChannel?.avaPr) || '').trim(),
|
||||
avaSize: Number((hasEventAvatar ? event?.avaSize : fallbackChannel?.avaSize) || 0),
|
||||
ownerLogin: String(fallbackChannel?.ownerLogin || fallbackChannel?.ownerName || '').trim(),
|
||||
ownerName: fallbackChannel?.ownerName || '',
|
||||
@@ -1693,7 +1693,7 @@ function renderChannelMetaEventCard(event, dayLabel = '') {
|
||||
displayTitle: event.title,
|
||||
description: event.description,
|
||||
avaAr: event.avaAr,
|
||||
avaSha256: event.avaSha256,
|
||||
avaPr: event.avaPr,
|
||||
avaSize: event.avaSize,
|
||||
ownerName: event.ownerName,
|
||||
},
|
||||
|
||||
@@ -128,7 +128,7 @@ function avatarLetterFromName(name = '') {
|
||||
function createChannelAvatar(channel = {}) {
|
||||
return renderAvatar({
|
||||
initials: channel.avatar || channel.initials || avatarLetterFromName(channel.displayTitle || channel.title || channel.name),
|
||||
avatar: (channel.avaAr || channel.avaSha256) ? { ar: String(channel.avaAr || '').trim(), sha256Hex: String(channel.avaSha256 || '').trim().toLowerCase() } : null,
|
||||
avatar: (channel.avaAr || channel.avaPr) ? { ar: String(channel.avaAr || '').trim(), pr: String(channel.avaPr || '').trim() } : null,
|
||||
authorLogin: String(channel.ownerName || channel.ownerLogin || '').trim(),
|
||||
size: 'lg',
|
||||
className: 'avatar-plain',
|
||||
@@ -575,7 +575,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(),
|
||||
avaPr: String(summary?.channel?.avaPr || '').trim(),
|
||||
title,
|
||||
technicalLabel,
|
||||
channelName,
|
||||
@@ -615,7 +615,7 @@ function mapDeletedOwnedChannels(payload, notificationsState = {}) {
|
||||
channelRootBlockHash: normalizeHash(item?.rootBlockHashHex),
|
||||
avatar: avatarLetterFromName(displayTitle),
|
||||
avaAr: String(item?.avatarAr || '').trim(),
|
||||
avaSha256: String(item?.avatarSha256 || '').trim().toLowerCase(),
|
||||
avaPr: String(item?.avatarPr || '').trim(),
|
||||
title: displayTitle,
|
||||
technicalLabel: formatChannelAddress({ ownerLogin, channelName }),
|
||||
channelName,
|
||||
|
||||
@@ -154,10 +154,10 @@ function createChatHeaderParts(login, navigate) {
|
||||
login: cleanLogin,
|
||||
firstName,
|
||||
lastName,
|
||||
avatar: (currentPeer?.avatar?.ar || currentPeer?.avatar?.sha256Hex)
|
||||
avatar: (currentPeer?.avatar?.ar || currentPeer?.avatar?.pr)
|
||||
? {
|
||||
ar: String(currentPeer.avatar.ar || '').trim(),
|
||||
sha256Hex: String(currentPeer.avatar.sha256Hex || '').trim().toLowerCase(),
|
||||
pr: String(currentPeer.avatar.pr || '').trim(),
|
||||
}
|
||||
: null,
|
||||
size: 'md',
|
||||
|
||||
@@ -58,7 +58,7 @@ export function render({ navigate, chrome }) {
|
||||
name: displayName(person),
|
||||
firstName: person.firstName,
|
||||
lastName: person.lastName,
|
||||
avatar: person.avatar || (person.avatarAr ? { ar: person.avatarAr } : null),
|
||||
avatar: person.avatar || ((person.avatarAr || person.avatarPr) ? { ar: person.avatarAr, pr: person.avatarPr } : null),
|
||||
ring: person.relationFlag === 'close_friend' ? 'close' : '',
|
||||
sub,
|
||||
onClick: () => openChat(person.login),
|
||||
@@ -93,7 +93,7 @@ export function render({ navigate, chrome }) {
|
||||
frag.append(note);
|
||||
} else {
|
||||
others.forEach((user) => {
|
||||
const person = { login: String(user.login || ''), displayName: user.displayName, avatarAr: user.avatarAr };
|
||||
const person = { login: String(user.login || ''), displayName: user.displayName, avatarAr: user.avatarAr, avatarPr: user.avatarPr };
|
||||
frag.append(personRow(person, displayName(person) !== person.login ? `${person.login}` : ''));
|
||||
});
|
||||
}
|
||||
|
||||
@@ -73,12 +73,12 @@ function createDmAvatar(login, { className = '', avatar = null, firstName = '',
|
||||
login: cleanLogin || 'unknown',
|
||||
firstName: String(firstName || '').trim(),
|
||||
lastName: String(lastName || '').trim(),
|
||||
avatar: (avatar?.ar || avatar?.sha256Hex) ? { ar: String(avatar?.ar || '').trim(), sha256Hex: String(avatar?.sha256Hex || '').trim().toLowerCase() } : null,
|
||||
avatar: (avatar?.ar || avatar?.pr) ? { ar: String(avatar?.ar || '').trim(), pr: String(avatar?.pr || '').trim() } : null,
|
||||
size: 'lg',
|
||||
title,
|
||||
className,
|
||||
});
|
||||
if (!cleanLogin || avatar?.ar || avatar?.sha256Hex) return avatarEl;
|
||||
if (!cleanLogin || avatar?.ar || avatar?.pr) return avatarEl;
|
||||
const upgrade = () => loadDmAvatarSnapshot(cleanLogin).then((snapshot) => {
|
||||
// Фото нет – оставляем инициалы имени как есть (раньше подменялись на букву логина).
|
||||
if (!avatarEl.isConnected || !snapshot?.avatar?.source) return;
|
||||
@@ -89,7 +89,7 @@ function createDmAvatar(login, { className = '', avatar = null, firstName = '',
|
||||
avatar: snapshot?.avatar?.source
|
||||
? {
|
||||
ar: String(snapshot.avatar.txId || snapshot.avatar.ar || '').trim(),
|
||||
sha256Hex: String(snapshot?.avatar?.sha256Hex || '').trim().toLowerCase(),
|
||||
pr: String(snapshot?.avatar?.pr || '').trim(),
|
||||
}
|
||||
: null,
|
||||
size: 'lg',
|
||||
|
||||
@@ -239,7 +239,7 @@ function describeEntry(item, inspection, channelNames) {
|
||||
const channelName = channelNameText(body.line?.lineCode, channelNames);
|
||||
const title = String(body.channelMeta?.title || '').trim();
|
||||
const description = previewText(body.channelMeta?.description || '');
|
||||
const changed = [title ? t('screens.my_blockchain_view.text_095', { value1: title }) : '', body.channelMeta?.avatarAr ? t('screens.my_blockchain_view.text_054') : '', description ? t('screens.my_blockchain_view.text_096', { value1: description }) : ''].filter(Boolean).join(' · ');
|
||||
const changed = [title ? t('screens.my_blockchain_view.text_095', { value1: title }) : '', (body.channelMeta?.avatarAr || body.channelMeta?.avatarPr) ? t('screens.my_blockchain_view.text_054') : '', description ? t('screens.my_blockchain_view.text_096', { value1: description }) : ''].filter(Boolean).join(' · ');
|
||||
return {
|
||||
title: t('screens.my_blockchain_view.text_097', { value1: channelName ? ` ${channelName}` : '', value2: changed ? ` · ${changed}` : '' }),
|
||||
detailTitle: t('screens.my_blockchain_view.text_098', { value1: channelName ? ` ${channelName}` : '' }),
|
||||
|
||||
@@ -9,8 +9,8 @@ const isFriend = (type) => type === 'friend' || type === 'close_friend';
|
||||
|
||||
function decorate(row, fallback) {
|
||||
const login = String(row?.login || fallback || '').trim();
|
||||
const avatar = row?.avatar?.ar || row?.avatar?.sha256Hex
|
||||
? { ar: String(row.avatar.ar || ''), sha256Hex: String(row.avatar.sha256Hex || row.avatar.sha256 || '') }
|
||||
const avatar = row?.avatar?.ar || row?.avatar?.pr
|
||||
? { ar: String(row.avatar.ar || ''), pr: String(row.avatar.pr || row.avatar.pr || '') }
|
||||
: (row?.avatarTxId ? { ar: String(row.avatarTxId) } : null);
|
||||
return {
|
||||
login,
|
||||
|
||||
@@ -18,7 +18,7 @@ import { t } from '../../i18n/index.js';
|
||||
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';
|
||||
import { avatarR2Url } from '../../services/public-file-service.js';
|
||||
|
||||
const SVGNS = 'http://www.w3.org/2000/svg';
|
||||
|
||||
@@ -154,16 +154,11 @@ 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 pr = String(rawAvatar?.pr || '').trim();
|
||||
const authorLogin = String(src?.login || src?.id || '').trim();
|
||||
if (txId || !sha256 || !authorLogin) return '';
|
||||
if (txId || !pr || !authorLogin) return '';
|
||||
try {
|
||||
return await resolvePublicFileUrl({
|
||||
sha256,
|
||||
authorLogin,
|
||||
solanaEndpoint: state?.entrySettings?.solanaServer,
|
||||
fallbackServerLogin: state?.entrySettings?.shineServerLogin,
|
||||
});
|
||||
return avatarR2Url(pr);
|
||||
} catch {
|
||||
return '';
|
||||
}
|
||||
@@ -658,7 +653,7 @@ export function createForceGraph({ stage, model, onCenterTap, onNodeTap, onNodeL
|
||||
// Единый PNG-оверлей на ВСЕХ полных орбах (фокус + спутники). tier-3 точки (dotOnly) сюда не идут.
|
||||
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()) {
|
||||
if (!photoSrc && src?.avatar && typeof src.avatar === 'object' && !String(src.avatar.ar || '').trim() && String(src.avatar.pr || src.avatar.pr || '').trim()) {
|
||||
void resolveServerAvatarPhotoSrc(src).then((url) => {
|
||||
if (!url || !orb.isConnected) return;
|
||||
const currentPhoto = orb.querySelector('.fg-pngorb-photo');
|
||||
|
||||
@@ -110,8 +110,8 @@ function getMarkByLogin(allUsers) {
|
||||
|
||||
function normalizeAvatar(row) {
|
||||
const txFromAvatar = String(row?.avatar?.ar || '').trim();
|
||||
const shaFromAvatar = String(row?.avatar?.sha256Hex || row?.avatar?.sha256 || '').trim().toLowerCase();
|
||||
if (txFromAvatar || shaFromAvatar) return { ar: txFromAvatar, sha256Hex: shaFromAvatar };
|
||||
const prFromAvatar = String(row?.avatar?.pr || '').trim();
|
||||
if (txFromAvatar || prFromAvatar) return { ar: txFromAvatar, pr: prFromAvatar };
|
||||
const txFallback = String(row?.avatarTxId || '').trim();
|
||||
if (txFallback) return { ar: txFallback };
|
||||
return null;
|
||||
|
||||
@@ -109,8 +109,8 @@ function getMarkByLogin(allUsers) {
|
||||
|
||||
function normalizeAvatar(row) {
|
||||
const txFromAvatar = String(row?.avatar?.ar || '').trim();
|
||||
const shaFromAvatar = String(row?.avatar?.sha256Hex || row?.avatar?.sha256 || '').trim().toLowerCase();
|
||||
if (txFromAvatar || shaFromAvatar) return { ar: txFromAvatar, sha256Hex: shaFromAvatar };
|
||||
const prFromAvatar = String(row?.avatar?.pr || '').trim();
|
||||
if (txFromAvatar || prFromAvatar) return { ar: txFromAvatar, pr: prFromAvatar };
|
||||
const txFallback = String(row?.avatarTxId || '').trim();
|
||||
if (txFallback) return { ar: txFallback };
|
||||
return null;
|
||||
@@ -2252,7 +2252,7 @@ export function render({ navigate, route, chrome } = {}) {
|
||||
target.append(createPersonRow({
|
||||
login,
|
||||
name: name || login,
|
||||
avatar: user.avatarAr ? { ar: user.avatarAr } : null,
|
||||
avatar: (user.avatarAr || user.avatarPr) ? { ar: user.avatarAr, pr: user.avatarPr } : null,
|
||||
sub: name && normKey(name) !== normKey(login) ? t('screens.network_view.text_174', { value1: login }) : t('screens.network_view.text_144'),
|
||||
onClick: () => recenter(login),
|
||||
actions: [{ icon: 'profile', label: t('screens.network_view.text_055'), onClick: () => { closeSearch(); navigate(profileRoute(login)); } }],
|
||||
|
||||
@@ -30,7 +30,7 @@ import { t } from '../../i18n/index.js';
|
||||
import { 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';
|
||||
import { avatarR2Url } from '../../services/public-file-service.js';
|
||||
import { ISLAND_COLORS, layoutIslands, tieWeight } from './communities.js';
|
||||
|
||||
const NODE_R = { focus: 30, 1: 22, 2: 15, 3: 11 };
|
||||
@@ -629,16 +629,11 @@ function avatarUrlSync(node) {
|
||||
async function avatarUrlFromServer(node) {
|
||||
const raw = node?.avatar;
|
||||
if (!raw || typeof raw !== 'object') return '';
|
||||
const sha256 = String(raw.sha256Hex || raw.sha256 || '').trim().toLowerCase();
|
||||
const pr = String(raw.pr || '').trim();
|
||||
const authorLogin = String(node?.login || node?.id || '').trim();
|
||||
if (String(raw.ar || '').trim() || !sha256 || !authorLogin) return '';
|
||||
if (String(raw.ar || '').trim() || !pr || !authorLogin) return '';
|
||||
try {
|
||||
return await resolvePublicFileUrl({
|
||||
sha256,
|
||||
authorLogin,
|
||||
solanaEndpoint: state?.entrySettings?.solanaServer,
|
||||
fallbackServerLogin: state?.entrySettings?.shineServerLogin,
|
||||
});
|
||||
return avatarR2Url(pr);
|
||||
} catch {
|
||||
return '';
|
||||
}
|
||||
|
||||
@@ -169,10 +169,10 @@ function renderEmpty(activeTab) {
|
||||
|
||||
function renderAvatar(item) {
|
||||
const profile = item.profile;
|
||||
const avatar = (profile?.avatar?.txId || profile?.avatar?.sha256Hex)
|
||||
const avatar = (profile?.avatar?.txId || profile?.avatar?.pr)
|
||||
? {
|
||||
ar: String(profile.avatar.txId || profile.avatar.ar || '').trim(),
|
||||
sha256Hex: String(profile.avatar.sha256Hex || '').trim().toLowerCase(),
|
||||
pr: String(profile.avatar.pr || '').trim(),
|
||||
}
|
||||
: null;
|
||||
return renderUserAvatar({
|
||||
|
||||
@@ -141,7 +141,7 @@ export function render({ navigate, chrome }) {
|
||||
let currentShineStatus = '';
|
||||
let currentGender = PROFILE_GENDER_UNKNOWN;
|
||||
let statusFlowOpen = false;
|
||||
let currentAvatar = { value: '', source: '', txId: '', sha256Hex: '', timeMs: 0 };
|
||||
let currentAvatar = { value: '', source: '', txId: '', pr: '', timeMs: 0 };
|
||||
const identityEl = topRow.querySelector('[data-profile-identity="true"]');
|
||||
const avatarSlotEl = topRow.querySelector('[data-profile-avatar-slot="true"]');
|
||||
|
||||
@@ -217,8 +217,8 @@ export function render({ navigate, chrome }) {
|
||||
login,
|
||||
firstName,
|
||||
lastName,
|
||||
avatar: (currentAvatar?.txId || currentAvatar?.sha256Hex)
|
||||
? { ar: String(currentAvatar.txId || currentAvatar.ar || '').trim(), sha256Hex: String(currentAvatar?.sha256Hex || '').trim().toLowerCase() }
|
||||
avatar: (currentAvatar?.txId || currentAvatar?.pr)
|
||||
? { ar: String(currentAvatar.txId || currentAvatar.ar || '').trim(), pr: String(currentAvatar?.pr || '').trim() }
|
||||
: null,
|
||||
size: 'xl',
|
||||
// Как в карточке профиля: без стеклянного кольца, которое вылезало за край экрана.
|
||||
@@ -350,7 +350,7 @@ export function render({ navigate, chrome }) {
|
||||
currentAccountRole = snapshot.accountRole || '';
|
||||
currentShineStatus = snapshot.shineStatus || '';
|
||||
currentGender = snapshot.gender || PROFILE_GENDER_UNKNOWN;
|
||||
currentAvatar = snapshot.avatar || { value: '', source: '', txId: '', sha256Hex: '', timeMs: 0 };
|
||||
currentAvatar = snapshot.avatar || { value: '', source: '', txId: '', pr: '', timeMs: 0 };
|
||||
|
||||
syncIdentity();
|
||||
renderFields(currentFields);
|
||||
|
||||
@@ -24,8 +24,8 @@ function channelRow(item, navigate) {
|
||||
const slug = String(item.slug || '').trim();
|
||||
row.append(renderAvatar({
|
||||
initials: Array.from(displayName)[0] || '#',
|
||||
avatar: item.avatarAr || item.avatarSha256
|
||||
? { ar: item.avatarAr || '', sha256Hex: item.avatarSha256 || '' }
|
||||
avatar: item.avatarAr || item.avatarPr
|
||||
? { ar: item.avatarAr || '', pr: item.avatarPr || '' }
|
||||
: null,
|
||||
authorLogin: ownerLogin,
|
||||
size: 'lg',
|
||||
@@ -68,7 +68,7 @@ function personRow(person, navigate) {
|
||||
return createPersonRow({
|
||||
login,
|
||||
name: displayName || login,
|
||||
avatar: person.avatarAr ? { ar: person.avatarAr } : null,
|
||||
avatar: (person.avatarAr || person.avatarPr) ? { ar: person.avatarAr, pr: person.avatarPr } : null,
|
||||
sub: displayName && displayName !== login ? login : '',
|
||||
onClick: () => navigate(makeProfileRoute(login)),
|
||||
actions: [{ icon: 'message', label: t('screens.search_view.text_003'), onClick: () => navigate(`chat/${encodeURIComponent(login)}`) }],
|
||||
|
||||
@@ -130,7 +130,7 @@ export function render({ navigate, route, chrome }) {
|
||||
name,
|
||||
firstName: row.firstName,
|
||||
lastName: row.lastName,
|
||||
avatar: parseAvatar(row.avatarAr),
|
||||
avatar: (row.avatarAr || row.avatarPr) ? { ar: String(row.avatarAr || '').trim(), pr: String(row.avatarPr || '').trim() } : null,
|
||||
official: row.accountRole === 'primary',
|
||||
ring: row.shineStatus === 'shining' ? 'shining' : (row.relationType === 'close_friend' ? 'close' : ''),
|
||||
sub,
|
||||
@@ -143,7 +143,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: (row.avatarAr || row.avatarSha256) ? { ar: String(row.avatarAr || ''), sha256Hex: String(row.avatarSha256 || '') } : null, size: 'md' }));
|
||||
el.append(renderUserAvatar({ login: row.ownerLogin, firstName: row.displayName, lastName: '', avatar: (row.avatarAr || row.avatarPr) ? { ar: String(row.avatarAr || ''), pr: String(row.avatarPr || '') } : null, size: 'md' }));
|
||||
const text = document.createElement('div');
|
||||
text.className = 'profile-list-row-text';
|
||||
const title = document.createElement('b');
|
||||
|
||||
@@ -1,10 +1,6 @@
|
||||
import { t } from '../i18n/index.js';
|
||||
import {
|
||||
buildArweaveDataUrl,
|
||||
sha256HexFromArrayBuffer,
|
||||
validateArweaveTxId,
|
||||
validateSha256Hex,
|
||||
} from './arweave-file-service.js';
|
||||
import { buildArweaveDataUrl, validateArweaveTxId } from './arweave-file-service.js';
|
||||
import { preparePublicFile } from './file-preparation-service.js';
|
||||
import { validatePublicPiecesRoot } from './public-pieces-root.js';
|
||||
|
||||
const DB_NAME = 'shine-ui-avatar-cache';
|
||||
const DB_VERSION = 1;
|
||||
@@ -61,12 +57,9 @@ async function putRecord(record) {
|
||||
});
|
||||
}
|
||||
|
||||
async function verifyBlobSha256(blob, expectedSha256Hex) {
|
||||
const expected = String(expectedSha256Hex || '').trim().toLowerCase();
|
||||
if (!validateSha256Hex(expected)) return true;
|
||||
if (!(blob instanceof Blob)) return false;
|
||||
const actual = await sha256HexFromArrayBuffer(await blob.arrayBuffer());
|
||||
return actual === expected;
|
||||
async function verifyBlobPr(blob, expectedPr) {
|
||||
if (!validatePublicPiecesRoot(expectedPr) || !(blob instanceof Blob)) return false;
|
||||
return (await preparePublicFile(blob)).pr === expectedPr;
|
||||
}
|
||||
|
||||
async function getAllRecords() {
|
||||
@@ -160,62 +153,30 @@ function detectImageMime(bytes) {
|
||||
return '';
|
||||
}
|
||||
|
||||
async function getBlobFromCacheOrGateway({ gateway, txId, expectedSha256Hex = '' }) {
|
||||
const expected = String(expectedSha256Hex || '').trim().toLowerCase();
|
||||
async function getBlobFromCacheOrGateway({ gateway, txId, expectedPr }) {
|
||||
if (!validatePublicPiecesRoot(expectedPr)) throw new Error('Некорректный PR аватара');
|
||||
try {
|
||||
const cached = await getRecord(txId);
|
||||
if (cached?.blob instanceof Blob) {
|
||||
if (!validateSha256Hex(expected)) return cached.blob;
|
||||
const cacheSha = String(cached?.sha256Hex || '').trim().toLowerCase();
|
||||
if (cacheSha && cacheSha === expected) {
|
||||
return cached.blob;
|
||||
}
|
||||
const ok = await verifyBlobSha256(cached.blob, expected);
|
||||
if (ok) {
|
||||
return cached.blob;
|
||||
}
|
||||
// кэш повреждён или не совпадает с ожидаемым хэшем: удаляем и перекачиваем
|
||||
if (await verifyBlobPr(cached.blob, expectedPr)) return cached.blob;
|
||||
await deleteRecords([txId]);
|
||||
}
|
||||
} catch {
|
||||
// ignore IndexedDB errors and fallback to fetch
|
||||
}
|
||||
} catch { /* cache is optional */ }
|
||||
|
||||
const blob = await fetchAvatarBlob({ gateway, txId });
|
||||
if (validateSha256Hex(expected)) {
|
||||
const ok = await verifyBlobSha256(blob, expected);
|
||||
if (!ok) {
|
||||
throw new Error('SHA256_MISMATCH');
|
||||
}
|
||||
}
|
||||
const computedSha256Hex = await sha256HexFromArrayBuffer(await blob.arrayBuffer());
|
||||
const record = {
|
||||
txId,
|
||||
blob,
|
||||
contentType: String(blob.type || 'application/octet-stream'),
|
||||
sizeBytes: Number(blob.size || 0),
|
||||
sha256Hex: computedSha256Hex,
|
||||
cachedAtMs: Date.now(),
|
||||
};
|
||||
if (!(await verifyBlobPr(blob, expectedPr))) throw new Error('AVATAR_PR_MISMATCH');
|
||||
try {
|
||||
await putRecord(record);
|
||||
await putRecord({ txId, blob, contentType: String(blob.type || 'application/octet-stream'),
|
||||
sizeBytes: Number(blob.size || 0), pr: expectedPr, cachedAtMs: Date.now() });
|
||||
await ensureCacheLimits();
|
||||
} catch {
|
||||
// ignore cache write errors
|
||||
}
|
||||
} catch { /* cache is optional */ }
|
||||
return blob;
|
||||
}
|
||||
|
||||
export async function getCachedAvatarObjectUrl({ gateway, txId, expectedSha256Hex = '' }) {
|
||||
export async function getCachedAvatarObjectUrl({ gateway, txId, expectedPr }) {
|
||||
const cleanTxId = String(txId || '').trim();
|
||||
if (!validateArweaveTxId(cleanTxId)) {
|
||||
throw new Error(t('remaining.avatar_errors.invalid_arweave_transaction_id'));
|
||||
}
|
||||
const blob = await getBlobFromCacheOrGateway({
|
||||
gateway,
|
||||
txId: cleanTxId,
|
||||
expectedSha256Hex,
|
||||
});
|
||||
if (!validateArweaveTxId(cleanTxId)) throw new Error(t('remaining.avatar_errors.invalid_arweave_transaction_id'));
|
||||
const blob = await getBlobFromCacheOrGateway({ gateway, txId: cleanTxId, expectedPr });
|
||||
return URL.createObjectURL(blob);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,86 +1,43 @@
|
||||
import { validateArweaveTxId, validateSha256Hex } from './arweave-file-service.js';
|
||||
|
||||
const AVATAR_TAG_RE = /^<(?:SHiNE|S):(ava|avatar);([^>]*)>$/u;
|
||||
import { validateArweaveTxId } from './arweave-file-service.js';
|
||||
import { validatePublicPiecesRoot } from './public-pieces-root.js';
|
||||
|
||||
const AVATAR_TAG_RE = /^<S:ava;([^>]*)>$/u;
|
||||
function parseFields(raw = '') {
|
||||
const out = {};
|
||||
String(raw || '').split(';').forEach((part) => {
|
||||
for (const part of String(raw).split(';')) {
|
||||
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;
|
||||
});
|
||||
if (eq > 0) out[part.slice(0, eq).trim()] = part.slice(eq + 1).trim();
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
export function buildAvatarReference({ size, sha256, sha256Hex, ar = '' } = {}) {
|
||||
const cleanSha = String(sha256 || sha256Hex || '').trim().toLowerCase();
|
||||
export function buildAvatarReference({ size, pr, ar = '' } = {}) {
|
||||
const cleanPr = String(pr || '').trim(); // Base58 is case-sensitive. NEVER lowercase.
|
||||
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 (!Number.isSafeInteger(cleanSize) || cleanSize <= 0) throw new Error('Некорректный размер аватара.');
|
||||
if (!validatePublicPiecesRoot(cleanPr)) throw new Error('Некорректный PR аватара.');
|
||||
if (cleanAr && !validateArweaveTxId(cleanAr)) throw new Error('Некорректный Arweave txId аватара.');
|
||||
return `<S:ava;v=1;sz=${cleanSize};sha256=${cleanSha}${cleanAr ? `;ar=${cleanAr}` : ''}>`;
|
||||
return `<S:ava;v=2;sz=${cleanSize};pr=${cleanPr}${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 invalid = { ok: false, source: '', ar: '', txId: '', pr: '', size: 0, value: raw };
|
||||
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 };
|
||||
if (!tag) return invalid; // old v1 / SHA256 / hex deliberately not supported.
|
||||
const fields = parseFields(tag[1]);
|
||||
const pr = String(fields.pr || '').trim();
|
||||
const ar = String(fields.ar || '').trim();
|
||||
const size = Number(fields.sz || '');
|
||||
if (fields.v !== '2' || !validatePublicPiecesRoot(pr) || !Number.isSafeInteger(size) || size <= 0) return invalid;
|
||||
if (ar && !validateArweaveTxId(ar)) return invalid;
|
||||
return { ok: true, source: ar ? 'arweave' : 'r2', ar, txId: ar, pr, size, 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 || ''),
|
||||
};
|
||||
return { ar: String(parsed.ar || parsed.txId || '').trim(), pr: String(parsed.pr || '').trim(),
|
||||
size: Number(parsed.size || 0), source: String(parsed.source || '') };
|
||||
}
|
||||
|
||||
@@ -91,6 +91,7 @@ function parseChannelMetaText(rawText) {
|
||||
const rows = String(rawText || '').replace(/\r\n/g, '\n').replace(/\r/g, '\n').split('\n');
|
||||
let title = '';
|
||||
let avatarAr = '';
|
||||
let avatarPr = '';
|
||||
const descriptionRows = [];
|
||||
for (const row of rows) {
|
||||
const titleMatch = row.match(/^<S:title;v=1;([^>]*)>$/u);
|
||||
@@ -98,10 +99,12 @@ function parseChannelMetaText(rawText) {
|
||||
title = String(titleMatch[1] || '').trim();
|
||||
continue;
|
||||
}
|
||||
const avatarMatch = row.match(/^<S:ava;v=1;([^>]*)>$/u);
|
||||
const avatarMatch = row.match(/^<S:ava;v=2;([^>]*)>$/u);
|
||||
if (avatarMatch) {
|
||||
const arMatch = String(avatarMatch[1] || '').match(/(?:^|;)ar=([A-Za-z0-9_-]{43})(?:;|$)/u);
|
||||
avatarAr = String(arMatch?.[1] || '').trim();
|
||||
const prMatch = String(avatarMatch[1] || '').match(/(?:^|;)pr=([1-9A-HJ-NP-Za-km-z]{32,44})(?:;|$)/u);
|
||||
avatarPr = String(prMatch?.[1] || '').trim();
|
||||
continue;
|
||||
}
|
||||
descriptionRows.push(row);
|
||||
@@ -109,6 +112,7 @@ function parseChannelMetaText(rawText) {
|
||||
return {
|
||||
title,
|
||||
avatarAr,
|
||||
avatarPr,
|
||||
description: descriptionRows.join('\n').trim(),
|
||||
};
|
||||
}
|
||||
|
||||
@@ -111,7 +111,7 @@ async function loadAvatarSnapshot(login) {
|
||||
}
|
||||
|
||||
function renderPeerAvatar(login, avatar = null) {
|
||||
const hasAvatar = Boolean(String(avatar?.ar || '').trim() || String(avatar?.sha256Hex || '').trim());
|
||||
const hasAvatar = Boolean(String(avatar?.ar || '').trim() || String(avatar?.pr || '').trim());
|
||||
const avatarEl = renderUserAvatar({
|
||||
login: String(login || '').trim() || 'unknown',
|
||||
avatar,
|
||||
@@ -141,7 +141,7 @@ function updatePeerAvatar(login) {
|
||||
const avatar = snapshot?.avatar?.source
|
||||
? {
|
||||
ar: String(snapshot.avatar.txId || snapshot.avatar.ar || '').trim(),
|
||||
sha256Hex: String(snapshot.avatar.sha256Hex || '').trim().toLowerCase(),
|
||||
pr: String(snapshot.avatar.pr || '').trim(),
|
||||
}
|
||||
: null;
|
||||
const upgraded = renderPeerAvatar(cleanLogin, avatar);
|
||||
|
||||
@@ -2,7 +2,7 @@ import { t } from '../i18n/index.js';
|
||||
import { preparePublicFile, R2_MAX_FILE_BYTES } from './file-preparation-service.js';
|
||||
import { validatePublicPiecesRoot } from './public-pieces-root.js';
|
||||
import { importPkcs8Ed25519, signBase64 } from './crypto-utils.js';
|
||||
import { sha256HexFromArrayBuffer, validateSha256Hex } from './arweave-file-service.js';
|
||||
import { validateSha256Hex } from './arweave-file-service.js';
|
||||
import { loadSessionMaterial } from './key-vault.js';
|
||||
import {
|
||||
DEFAULT_SHINE_SERVER_HTTP,
|
||||
@@ -75,86 +75,18 @@ async function createUploadContext({ login, sessionId, wsUrl }) {
|
||||
};
|
||||
}
|
||||
|
||||
/** Avatars share the same PR/Base58 R2 namespace and upload protocol as other public files. */
|
||||
export async function uploadPublicFile({ file, login, sessionId, wsUrl, onStatus = null, purpose = 'attachment' } = {}) {
|
||||
if (purpose !== 'avatar') return uploadR2PublicFile({ file, login, sessionId, wsUrl, onStatus });
|
||||
if (!(file instanceof File)) throw new Error(t('remaining.file_upload.no_file_selected'));
|
||||
if (Number(file.size || 0) <= 0) throw new Error(t('remaining.file_upload.cannot_upload_an_empty_file'));
|
||||
|
||||
onStatus?.(t('remaining.file_upload.calculating_sha_256'));
|
||||
const bytes = await file.arrayBuffer();
|
||||
const sha256 = await sha256HexFromArrayBuffer(bytes);
|
||||
const context = await createUploadContext({ login, sessionId, wsUrl });
|
||||
const url = publicFileUrl(context.serverBase, sha256);
|
||||
|
||||
onStatus?.(t('remaining.file_upload.checking_whether_the_file_is_on_the_server'));
|
||||
try {
|
||||
const existing = await fetch(url, { method: 'HEAD', cache: 'no-store' });
|
||||
if (existing.ok) {
|
||||
const storedSize = Number(existing.headers.get('Content-Length') || -1);
|
||||
if (storedSize < 0 || storedSize === file.size) {
|
||||
return {
|
||||
v: 1,
|
||||
name: String(file.name || 'file'),
|
||||
size: Number(file.size),
|
||||
sha256,
|
||||
ar: '',
|
||||
uploadedAtMs: Date.now(),
|
||||
alreadyExists: true,
|
||||
};
|
||||
}
|
||||
}
|
||||
} catch {
|
||||
// HEAD — только оптимизация. PUT сам проверит hash и дедупликацию.
|
||||
if (purpose === 'avatar' && (!(file instanceof Blob) || !file.size || file.size > 10 * 1024 * 1024
|
||||
|| !['image/webp', 'image/jpeg'].includes(file.type))) {
|
||||
throw new Error('Аватар должен быть оптимизированным WebP/JPEG размером до 10 МиБ');
|
||||
}
|
||||
return uploadR2PublicFile({ file, login, sessionId, wsUrl, onStatus });
|
||||
}
|
||||
|
||||
const timeMs = Date.now();
|
||||
const signature = await signBase64(context.privateKey, uploadPreimage({
|
||||
sessionId: context.sessionId,
|
||||
sha256,
|
||||
size: file.size,
|
||||
timeMs,
|
||||
}));
|
||||
|
||||
onStatus?.(t('remaining.file_upload.uploading_to_access_server'));
|
||||
let response;
|
||||
try {
|
||||
response = await fetch(url, {
|
||||
method: 'PUT',
|
||||
headers: {
|
||||
'Content-Type': 'application/octet-stream',
|
||||
'X-Shine-Session-Id': context.sessionId,
|
||||
'X-Shine-Time-Ms': String(timeMs),
|
||||
'X-Shine-Content-Length': String(file.size),
|
||||
'X-Shine-Signature': signature,
|
||||
},
|
||||
body: bytes,
|
||||
cache: 'no-store',
|
||||
});
|
||||
} catch (error) {
|
||||
throw new Error(`Не удалось загрузить файл на сервер доступа: ${error?.message || 'network error'}`);
|
||||
}
|
||||
if (!response.ok) {
|
||||
const detail = await readErrorMessage(response);
|
||||
throw new Error(detail || `Сервер отклонил файл (HTTP ${response.status}).`);
|
||||
}
|
||||
|
||||
let alreadyExists = false;
|
||||
try {
|
||||
const payload = await response.clone().json();
|
||||
alreadyExists = Boolean(payload?.alreadyExists);
|
||||
} catch {
|
||||
// Успешного HTTP достаточно.
|
||||
}
|
||||
|
||||
return {
|
||||
v: 1,
|
||||
name: String(file.name || 'file'),
|
||||
size: Number(file.size),
|
||||
sha256,
|
||||
ar: '',
|
||||
uploadedAtMs: Date.now(),
|
||||
alreadyExists,
|
||||
};
|
||||
/** Canonical public object URL; avatars do not have a special prefix. */
|
||||
export function avatarR2Url(pr) {
|
||||
return publicR2Url(pr);
|
||||
}
|
||||
|
||||
export async function resolvePublicFileUrl({
|
||||
|
||||
@@ -277,7 +277,7 @@ export async function loadUserProfileCard(login) {
|
||||
avatar: snapshot?.avatar?.source
|
||||
? {
|
||||
ar: String(snapshot.avatar.txId || snapshot.avatar.ar || '').trim(),
|
||||
sha256Hex: String(snapshot?.avatar?.sha256Hex || '').trim().toLowerCase(),
|
||||
pr: String(snapshot?.avatar?.pr || '').trim(),
|
||||
}
|
||||
: null,
|
||||
};
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { t } from '../i18n/index.js';
|
||||
import { authService, state } from '../state.js';
|
||||
import { validateArweaveTxId, validateSha256Hex } from './arweave-file-service.js';
|
||||
import { validateArweaveTxId } from './arweave-file-service.js';
|
||||
import { validatePublicPiecesRoot } from './public-pieces-root.js';
|
||||
import { buildAvatarReference, parseAvatarReference } from './avatar-reference.js';
|
||||
import { CITY_MAX_LENGTH, CITY_PARAM, CITY_SUGGESTIONS } from './cities.js';
|
||||
|
||||
@@ -146,7 +147,7 @@ export async function loadProfileSnapshot(login) {
|
||||
source: parsedAvatar.source,
|
||||
txId: parsedAvatar.txId || '',
|
||||
ar: parsedAvatar.ar || '',
|
||||
sha256Hex: parsedAvatar.sha256Hex || '',
|
||||
pr: parsedAvatar.pr || '',
|
||||
size: Number(parsedAvatar.size || 0),
|
||||
timeMs: latestAvatar?.timeMs || 0,
|
||||
}
|
||||
@@ -155,7 +156,7 @@ export async function loadProfileSnapshot(login) {
|
||||
source: '',
|
||||
txId: '',
|
||||
ar: '',
|
||||
sha256Hex: '',
|
||||
pr: '',
|
||||
size: 0,
|
||||
timeMs: latestAvatar?.timeMs || 0,
|
||||
};
|
||||
@@ -215,15 +216,10 @@ export async function saveProfileGender(login, gender) {
|
||||
}
|
||||
|
||||
export async function saveProfileAvatar(login, avatar) {
|
||||
const cleanAr = String(avatar?.ar || '').trim();
|
||||
const cleanSha = String(avatar?.sha256 || avatar?.sha256Hex || '').trim().toLowerCase();
|
||||
const ar = String(avatar?.ar || '').trim();
|
||||
const pr = String(avatar?.pr || '').trim();
|
||||
const size = Number(avatar?.size || 0);
|
||||
if (cleanAr && !validateArweaveTxId(cleanAr)) throw new Error(t('remaining.profile_errors.invalid_arweave_transaction_id'));
|
||||
if (!validateSha256Hex(cleanSha)) throw new Error(t('remaining.profile_errors.invalid_avatar_sha_256_hash'));
|
||||
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 });
|
||||
if (ar && !validateArweaveTxId(ar)) throw new Error(t('remaining.profile_errors.invalid_arweave_transaction_id'));
|
||||
if (!validatePublicPiecesRoot(pr)) throw new Error('Некорректный Pieces Root аватара');
|
||||
await saveProfileParamBlock(login, 'ava', buildAvatarReference({ ar, pr, size }));
|
||||
}
|
||||
|
||||
@@ -90,7 +90,7 @@ test('лента получает логин владельца и может з
|
||||
const js = source('js/pages/channel-view.js');
|
||||
assert.match(js, /name: payload\.channel\?\.channelName[^\n]*\n\s+ownerLogin,/);
|
||||
assert.match(js, /authorLogin: String\(channel\?\.ownerLogin \|\| channel\?\.ownerName/);
|
||||
assert.match(js, /hasEventAvatar \? event\?\.avaSha256 : fallbackChannel\?\.avaSha256/);
|
||||
assert.match(js, /hasEventAvatar \? event\?\.avaPr : fallbackChannel\?\.avaPr/);
|
||||
assert.doesNotMatch(js, /Аватар<\/span><span>.*Установлен/);
|
||||
assert.match(js, /class="channel-meta-avatar-slot"/);
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user