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

This commit is contained in:
AidarKC
2026-10-07 14:05:01 +03:00
parent 7b8e178723
commit d8f42c769c
35 changed files with 628 additions and 222 deletions
+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 || ''),
};
}
+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 });
}