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');