WIP: добавить MVP загрузки вложений в Cloudflare R2

Работа ещё не готова: предпросмотр публичных R2-вложений в UI пока не завершён.
This commit is contained in:
AidarKC
2026-11-15 00:48:41 +03:00
parent 97db033eb8
commit 2f5736e67d
16 changed files with 361 additions and 72 deletions
@@ -1,3 +1,4 @@
import { preparePublicFile } from '../services/file-preparation-service.js';
import { formatDateTime, formatNumber } from '../i18n/format.js';
import { t, th } from '../i18n/index.js';
import {
@@ -250,6 +251,7 @@ export function openArweaveAttachmentManager({
let selectedUploadTransport = String(uploadTransport || '').trim().toLowerCase() === 'arweave' ? 'arweave' : 'turbo';
let selectedFile = null;
let selectedSha256 = '';
let selectedPrepared = null;
let priceInfo = null;
let balanceInfo = null;
let autoOpenedFileDialogOnce = false;
@@ -633,6 +635,7 @@ export function openArweaveAttachmentManager({
selectedUploadTransport = 'arweave';
selectedFile = null;
selectedSha256 = '';
selectedPrepared = null;
priceInfo = null;
balanceInfo = null;
await showUpload();
@@ -642,6 +645,7 @@ export function openArweaveAttachmentManager({
selectedUploadTransport = 'turbo';
selectedFile = null;
selectedSha256 = '';
selectedPrepared = null;
priceInfo = null;
balanceInfo = null;
await showUpload();
@@ -708,6 +712,7 @@ export function openArweaveAttachmentManager({
fileEl?.addEventListener('change', async () => {
selectedFile = fileEl.files?.[0] || null;
selectedSha256 = '';
selectedPrepared = null;
priceInfo = null;
balanceInfo = null;
uploadBtn.disabled = true;
@@ -724,6 +729,7 @@ export function openArweaveAttachmentManager({
}
const buffer = await selectedFile.arrayBuffer();
selectedSha256 = await sha256HexFromArrayBuffer(buffer);
if (!isAvatarMode) selectedPrepared = await preparePublicFile(selectedFile);
if (turboMode) {
await refreshTurboStateForCurrentFile(mainMetaEl, errorEl, uploadBtn);
} else {
@@ -774,7 +780,9 @@ export function openArweaveAttachmentManager({
...normalizedExtraUploadTags,
],
});
const prepared = isAvatarMode ? null : (selectedPrepared || await preparePublicFile(selectedFile));
finish(resolve, {
...(prepared ? { pr: prepared.pr, mm: prepared.mm } : {}),
name: isAvatarMode ? t('screens.arweave_attachment_manager.text_032') : (initialName || selectedFile.name || 'file'),
size: selectedFile.size,
sha256: selectedSha256,
@@ -160,6 +160,7 @@ export function openChannelAttachmentManager({
const uploadFile = isAvatarMode ? await prepareAvatarImageFile(selectedFile) : selectedFile;
const item = await uploadPublicFile({
file: uploadFile,
purpose: isAvatarMode ? 'avatar' : 'attachment',
login: cleanLogin,
sessionId: state.session.sessionId,
wsUrl: state.entrySettings.shineServer,
+1 -43
View File
@@ -8,7 +8,6 @@ import { state } from '../state.js';
import { toUserMessage } from '../services/ui-error-texts.js';
import { renderUserAvatar } from './avatar-image.js';
import { openAuthRequiredModal } from '../services/auth-required-modal.js';
import { resolvePublicFileUrl } from '../services/public-file-service.js';
import { openHistoryLayer } from '../router.js';
const drafts = new Map();
@@ -18,24 +17,7 @@ function draftKey(key) {
return `${login}:${String(key || 'editor')}`;
}
// Превью вложения в редакторе: картинки и видео – миниатюрой (как в Threads), остальное – строкой с именем.
const previewUrls = new Map();
function attachmentKind(item) {
const name = String(item?.name || '').toLowerCase();
if (/\.(jpe?g|png|gif|webp|avif|heic|bmp)$/.test(name)) return 'image';
if (/\.(mp4|webm|mov|m4v|ogv)$/.test(name)) return 'video';
return 'file';
}
function attachmentPreviewUrl(item, login) {
const key = item?.ar ? `ar:${item.ar}` : `sha:${item?.sha256 || ''}`;
if (!previewUrls.has(key)) {
previewUrls.set(key, item?.ar
? Promise.resolve(`${String(state.entrySettings.arweaveServer || 'https://arweave.net').replace(/\/$/, '')}/${item.ar}`)
: resolvePublicFileUrl({ sha256: item?.sha256, authorLogin: login, solanaEndpoint: state.entrySettings.solanaServer, fallbackServerLogin: state.entrySettings.shineServerLogin }).catch(() => ''));
}
return previewUrls.get(key);
}
// MVP: вложения показываются только строкой с именем, без запросов миниатюр.
function attachmentLabel(item) {
const name = String(item?.name || t('screens.channel_editor.text_012'));
const size = Number(item?.size || 0);
@@ -260,30 +242,6 @@ export function openChannelEditor({
draftMark.hidden = !clearButton.hidden;
attachmentsBox.replaceChildren();
attachments.forEach((item, index) => {
const kind = attachmentKind(item);
if (kind !== 'file') {
const thumb = document.createElement('div');
thumb.className = `channel-editor__thumb channel-editor__thumb--${kind}`;
thumb.title = attachmentLabel(item);
const media = document.createElement(kind === 'image' ? 'img' : 'video');
if (kind === 'image') media.alt = String(item?.name || t('screens.channel_editor.text_016'));
else { media.muted = true; media.preload = 'metadata'; media.playsInline = true; }
void attachmentPreviewUrl(item, login).then((url) => { if (url && media.isConnected !== false) media.src = url; });
const remove = document.createElement('button');
remove.type = 'button';
remove.className = 'channel-editor__thumb-remove';
remove.setAttribute('aria-label', t('screens.channel_editor.text_021', { value1: item?.name || '' }));
remove.innerHTML = iconHtml('close');
remove.disabled = inFlight;
remove.addEventListener('click', () => {
attachments.splice(index, 1);
saveDraft();
sync();
});
thumb.append(media, remove);
attachmentsBox.append(thumb);
return;
}
const card = document.createElement('div');
card.className = 'channel-editor__attachment';
const label = document.createElement('span');
+35 -26
View File
@@ -42,27 +42,25 @@ function normalizeName(name) {
export function normalizeAttachment(input = {}) {
const txId = String(input.ar || input.txId || '').trim();
const sha256Hex = String(input.sha256 || input.sha256Hex || '').trim().toLowerCase();
const pr = String(input.pr || '').trim();
const mm = String(input.mm || '').trim();
const size = Number(input.sz || input.size || input.sizeBytes || 0);
const name = normalizeName(input.nm || input.name || input.fileName || 'file');
if (txId && !validateArweaveTxId(txId)) throw new Error(t('remaining.attachment_errors.invalid_arweave_transaction_id'));
if (!validateSha256Hex(sha256Hex)) throw new Error(t('remaining.attachment_errors.invalid_file_sha_256'));
if (!/^[A-Za-z0-9_-]{43}$/.test(pr) && !validateSha256Hex(sha256Hex)) throw new Error('Некорректный идентификатор файла');
if (pr && !/^[A-Za-z0-9_-]{43}$/.test(pr)) throw new Error('Некорректный Pieces Root');
if (mm && (!/^[a-z0-9!#$&^_.+-]+\/[a-z0-9!#$&^_.+-]+$/i.test(mm) || mm.length > 127)) throw new Error('Некорректный MIME');
if (!Number.isInteger(size) || size <= 0) throw new Error(t('remaining.attachment_errors.invalid_file_size'));
const out = {
v: 1,
name,
size,
sha256: sha256Hex,
ar: txId,
uploadedAtMs: Number(input.uploadedAtMs || 0) || Date.now(),
};
return out;
return { v: 1, name, size, sha256: sha256Hex, pr, mm, ar: txId, uploadedAtMs: Number(input.uploadedAtMs || 0) || Date.now() };
}
export function buildAttachmentBlock(attachment) {
const item = normalizeAttachment(attachment);
const encodedName = encodeURIComponent(item.name);
const id = item.pr ? `;pr=${item.pr}` : `;sha256=${item.sha256}`;
const mmPart = item.mm ? `;mm=${item.mm}` : '';
const arPart = item.ar ? `;ar=${item.ar}` : '';
return `<S:att;v=1;nm=${encodedName};sz=${item.size};sha256=${item.sha256}${arPart}>`;
return `<S:att;v=1;nm=${encodedName};sz=${item.size}${id}${mmPart}${arPart}>`;
}
export function composeMessageWithAttachments(text, attachments = []) {
@@ -103,6 +101,8 @@ export function parseMessageAttachments(rawText) {
nm: decodeURIComponent(String(fields.nm || fields.name || 'file')),
sz: fields.sz || fields.size,
sha256: fields.sha256,
pr: fields.pr,
mm: fields.mm,
ar: fields.ar,
}));
} catch {
@@ -365,23 +365,14 @@ async function resolveAttachmentDisplayUrl(item, options = {}) {
const serverUrl = await resolvePublicFileUrl({
sha256: item.sha256,
pr: item.pr,
authorLogin: options.authorLogin,
solanaEndpoint: options.solanaEndpoint,
fallbackServerLogin: options.fallbackServerLogin,
});
const kind = getAttachmentKind(item);
// Видео подключаем напрямую. Иначе fetch + Blob + полный SHA-256 сначала
// скачает ВСЕ байты и браузер не сможет запрашивать Range для просмотра.
if (kind === 'video' || kind === 'file') return { url: serverUrl, objectUrl: false };
// Для изображений сохраняем прежнюю проверку SHA-256 после скачивания.
const response = await fetch(serverUrl);
if (!response.ok) throw new Error(`HTTP ${response.status} ${serverUrl}`);
const buffer = await response.arrayBuffer();
const actualSha = await sha256HexFromArrayBuffer(buffer);
if (actualSha !== item.sha256) throw new Error(t('remaining.attachment_error.hash_mismatch', { actual: actualSha, expected: item.sha256, url: serverUrl }));
const blob = new Blob([buffer], { type: mimeTypeForAttachment(item, kind) });
return { url: URL.createObjectURL(blob), sourceUrl: serverUrl, objectUrl: true };
if (item.pr) return { url: serverUrl, objectUrl: false };
// Public MVP: direct URL, no image downloads, media viewer or full SHA checks.
return { url: serverUrl, objectUrl: false };
}
export function createAttachmentCarouselElement(attachments = [], {
@@ -410,6 +401,23 @@ export function createAttachmentCarouselElement(attachments = [], {
wrap.addEventListener('click', (event) => event.stopPropagation());
if (!items.length) return wrap;
// Public attachments are a simple file list. The DM renderer supplies resolveUrl
// and retains its separate encrypted-file carousel/viewer unchanged.
if (!resolveUrl) {
wrap.className = 'message-attachments message-attachment-list';
const options = { gateway, authorLogin, solanaEndpoint, fallbackServerLogin };
for (const item of items) {
const slot = document.createElement('div');
slot.className = 'message-attachment-item';
slot.textContent = t('remaining.attachments.loading_file');
wrap.append(slot);
void resolveAttachmentDisplayUrl(item, options)
.then(({ url }) => slot.replaceChildren(createFileCard({ item, url, messageTimestampMs, slide: slot })))
.catch(() => slot.replaceChildren(createUnavailableBlock(messageTimestampMs, attachmentStorage(item))));
}
return wrap;
}
let index = 0;
let pointerStartX = 0;
let renderGeneration = 0;
@@ -486,9 +494,10 @@ export function createAttachmentCarouselElement(attachments = [], {
void getResolved(currentIndex)
.then(({ url }) => {
if (generation !== renderGeneration || currentIndex !== index || !wrap.isConnected) return;
slide.replaceChildren(kind === 'file'
slide.replaceChildren(!resolveUrl
? createFileCard({ item, url, messageTimestampMs, slide })
: createMediaSlide({ item, url, kind, messageTimestampMs, slide, onOpen: () => openViewer(currentIndex) }));
: (kind === 'file' ? createFileCard({ item, url, messageTimestampMs, slide })
: createMediaSlide({ item, url, kind, messageTimestampMs, slide, onOpen: () => openViewer(currentIndex) })));
})
.catch((error) => {
if (generation !== renderGeneration || currentIndex !== index || !wrap.isConnected) return;
@@ -0,0 +1,22 @@
import { bytesToBase64Url } from './crypto-utils.js';
import { computeTorrentV2PieceRoot, TorrentV2PieceAccumulator, TORRENT_V2_PIECE_BYTES } from './torrent-v2-service.js';
export const R2_MAX_FILE_BYTES = 500 * 1024 * 1024;
const mimeByExtension = { mp4: 'video/mp4', webm: 'video/webm', jpg: 'image/jpeg', jpeg: 'image/jpeg', png: 'image/png', webp: 'image/webp', gif: 'image/gif', pdf: 'application/pdf', mp3: 'audio/mpeg', zip: 'application/zip', txt: 'text/plain' };
export function fileMime(file) {
const extension = String(file?.name || '').toLowerCase().split('.').pop();
const value = String(file?.type || mimeByExtension[extension] || 'application/octet-stream').trim();
return /^[a-z0-9!#$&^_.+-]+\/[a-z0-9!#$&^_.+-]+$/i.test(value) && value.length <= 127 ? value : 'application/octet-stream';
}
export async function preparePublicFile(file, { onProgress = null } = {}) {
if (!(file instanceof Blob) || !file.size) throw new Error('Выберите непустой файл');
const accumulator = new TorrentV2PieceAccumulator();
for (let offset = 0; offset < file.size; offset += TORRENT_V2_PIECE_BYTES) {
const bytes = new Uint8Array(await file.slice(offset, offset + TORRENT_V2_PIECE_BYTES).arrayBuffer());
const piece = await computeTorrentV2PieceRoot(bytes, { padToPieceLength: file.size > TORRENT_V2_PIECE_BYTES });
await accumulator.addPieceRoot(piece);
onProgress?.(Math.min(file.size, offset + bytes.byteLength), file.size);
}
const root = await accumulator.finalize();
return { file, name: String(file.name || 'file'), size: file.size, mm: fileMime(file), pr: bytesToBase64Url(root) };
}
+52 -1
View File
@@ -1,4 +1,5 @@
import { t } from '../i18n/index.js';
import { preparePublicFile, R2_MAX_FILE_BYTES } from './file-preparation-service.js';
import { importPkcs8Ed25519, signBase64 } from './crypto-utils.js';
import { sha256HexFromArrayBuffer, validateSha256Hex } from './arweave-file-service.js';
import { loadSessionMaterial } from './key-vault.js';
@@ -73,7 +74,8 @@ async function createUploadContext({ login, sessionId, wsUrl }) {
};
}
export async function uploadPublicFile({ file, login, sessionId, wsUrl, onStatus = null } = {}) {
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'));
@@ -155,11 +157,13 @@ export async function uploadPublicFile({ file, login, sessionId, wsUrl, onStatus
}
export async function resolvePublicFileUrl({
pr,
sha256,
authorLogin,
solanaEndpoint,
fallbackServerLogin = '',
} = {}) {
if (pr) return publicR2Url(pr);
// Сначала – сервер, к которому подключены сейчас (у большинства читателей он же сервер автора),
// затем сервер сборки по умолчанию; только потом ищем сервер автора через его PDA.
const nearbyBases = [...new Set([state.entrySettings?.shineServerHttp, DEFAULT_SHINE_SERVER_HTTP]
@@ -185,3 +189,50 @@ export async function resolvePublicFileUrl({
accessServerCache.set(cacheKey, { atMs: Date.now(), httpBase: resolved.httpBase });
return publicFileUrl(resolved.httpBase, sha256);
}
/** Uploads one public attachment directly from the browser to Cloudflare R2. */
async function uploadR2PublicFile({ file, login, sessionId, wsUrl, onStatus }) {
if (!(file instanceof File) || file.size < 1) throw new Error('Выберите непустой файл');
if (file.size > R2_MAX_FILE_BYTES) throw new Error('Превышен лимит 500 МиБ');
onStatus?.('Подготовка файла…');
const prepared = await preparePublicFile(file);
const context = await createUploadContext({ login, sessionId, wsUrl });
const timeMs = Date.now();
const preimage = `PUBLIC_R2_PREPARE_V1:${context.sessionId}:${prepared.pr}:${prepared.size}:${prepared.mm}:${timeMs}`;
const signature = await signBase64(context.privateKey, preimage);
onStatus?.('Проверка файла в R2…');
const response = await fetch(`${context.serverBase}/api/files/prepare`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'X-Shine-Session-Id': context.sessionId,
'X-Shine-Time-Ms': String(timeMs),
'X-Shine-Signature': signature,
},
body: JSON.stringify({ pr: prepared.pr, size: prepared.size, mm: prepared.mm }),
});
if (!response.ok) throw new Error((await readErrorMessage(response)) || `R2 prepare HTTP ${response.status}`);
const payload = await response.json();
if (!payload.exists) {
if (!payload.uploadUrl) throw new Error('Сервер не предоставил адрес загрузки');
onStatus?.('Загрузка в Cloudflare R2…');
const put = await fetch(payload.uploadUrl, {
method: 'PUT',
headers: payload.requiredHeaders || { 'Content-Type': prepared.mm, 'If-None-Match': '*' },
body: file,
});
if (!put.ok && put.status !== 412) throw new Error(`Cloudflare R2: HTTP ${put.status}`);
if (put.status === 412) {
const check = await fetch(payload.fileUrl, { method: 'HEAD', cache: 'no-store' });
if (!check.ok || Number(check.headers.get('Content-Length')) !== file.size) throw new Error('Конфликт при загрузке объекта R2');
}
}
return { v: 1, name: prepared.name, size: prepared.size, pr: prepared.pr, mm: prepared.mm,
ar: '', uploadedAtMs: Date.now(), alreadyExists: Boolean(payload.exists) };
}
export function publicR2Url(pr) {
const root = String(pr || '').trim();
if (!/^[A-Za-z0-9_-]{43}$/.test(root)) throw new Error('Некорректный Pieces Root');
return `https://files.shineup.me/${root}`;
}