Обновить публичные идентификаторы файлов

This commit is contained in:
AidarKC
2026-11-15 15:45:33 +03:00
parent ac6a2e5b3f
commit 4a6e072946
65 changed files with 292 additions and 457 deletions
+22 -65
View File
@@ -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 || '') };
}