SHA256
Вложения файлов со своего сервера доступа пользователя
This commit is contained in:
@@ -7,7 +7,7 @@ import {
|
||||
validateArweaveTxId,
|
||||
} from '../services/arweave-file-service.js';
|
||||
import { addArweaveWalletSecret, getArweaveBalance, getArweaveWalletChoices } from '../services/arweave-wallet-service.js';
|
||||
import { escapeHtml, formatBytes, getAttachmentKind, normalizeAttachment } from '../services/attachment-format.js';
|
||||
import { escapeHtml, formatBytes, normalizeAttachment } from '../services/attachment-format.js';
|
||||
import { getStoredSolanaWalletChoices } from '../services/solana-wallet-service.js';
|
||||
import { iconHtml } from './ui-icon.js';
|
||||
import {
|
||||
@@ -36,25 +36,6 @@ function normalizeHistoryItem(input = {}) {
|
||||
};
|
||||
}
|
||||
|
||||
function hasAttachmentPreview(item) {
|
||||
return !!String(item?.preview?.ar || '').trim();
|
||||
}
|
||||
|
||||
function isVideoAttachmentName(name) {
|
||||
return getAttachmentKind({ name }) === 'video';
|
||||
}
|
||||
|
||||
function buildHistoryPreviewMarkup(item, gateway) {
|
||||
if (!hasAttachmentPreview(item)) return '';
|
||||
const previewTxId = String(item.preview.ar || '').trim();
|
||||
const previewUrl = buildArweaveDataUrl({ gateway, txId: previewTxId });
|
||||
return `
|
||||
<div class="ar-attachment-history-preview">
|
||||
<img class="ar-attachment-history-preview-image" src="${escapeHtml(previewUrl)}" alt="Превью ${escapeHtml(item.name)}" loading="lazy" />
|
||||
<div class="ar-attachment-history-preview-badge">Есть превью</div>
|
||||
</div>
|
||||
`;
|
||||
}
|
||||
|
||||
export function readArweaveAttachmentHistory(login) {
|
||||
try {
|
||||
@@ -217,45 +198,6 @@ async function resizeImageFileToAvatar(file) {
|
||||
return new File([blob], 'avatar.jpg', { type: 'image/jpeg', lastModified: Date.now() });
|
||||
}
|
||||
|
||||
async function createVideoPreviewFile(file) {
|
||||
const source = file instanceof File ? file : null;
|
||||
if (!source) throw new Error('Выберите видеофайл.');
|
||||
const blobUrl = URL.createObjectURL(source);
|
||||
try {
|
||||
const video = await new Promise((resolve, reject) => {
|
||||
const node = document.createElement('video');
|
||||
node.preload = 'metadata';
|
||||
node.muted = true;
|
||||
node.playsInline = true;
|
||||
node.onloadeddata = () => resolve(node);
|
||||
node.onerror = () => reject(new Error('Не удалось открыть видео для создания превью.'));
|
||||
node.src = blobUrl;
|
||||
});
|
||||
const width = Number(video.videoWidth || 0);
|
||||
const height = Number(video.videoHeight || 0);
|
||||
if (!width || !height) {
|
||||
throw new Error('Не удалось определить размер видео для превью.');
|
||||
}
|
||||
const maxSide = 640;
|
||||
const scale = Math.min(1, maxSide / Math.max(width, height));
|
||||
const canvas = document.createElement('canvas');
|
||||
canvas.width = Math.max(1, Math.round(width * scale));
|
||||
canvas.height = Math.max(1, Math.round(height * scale));
|
||||
const ctx = canvas.getContext('2d');
|
||||
if (!ctx) throw new Error('Canvas недоступен для создания превью.');
|
||||
ctx.drawImage(video, 0, 0, canvas.width, canvas.height);
|
||||
const blob = await new Promise((resolve) => canvas.toBlob(resolve, 'image/jpeg', 0.86));
|
||||
if (!blob) throw new Error('Не удалось собрать preview image.');
|
||||
const baseName = String(source.name || 'video').replace(/\.[^.]+$/u, '') || 'video';
|
||||
return new File([blob], `${baseName}-preview.jpg`, {
|
||||
type: 'image/jpeg',
|
||||
lastModified: Date.now(),
|
||||
});
|
||||
} finally {
|
||||
URL.revokeObjectURL(blobUrl);
|
||||
}
|
||||
}
|
||||
|
||||
export function openArweaveAttachmentManager({
|
||||
login,
|
||||
storagePwd,
|
||||
@@ -298,10 +240,6 @@ export function openArweaveAttachmentManager({
|
||||
let selectedUploadTransport = String(uploadTransport || '').trim().toLowerCase() === 'arweave' ? 'arweave' : 'turbo';
|
||||
let selectedFile = null;
|
||||
let selectedSha256 = '';
|
||||
let selectedPreviewEnabled = false;
|
||||
let selectedPreviewFile = null;
|
||||
let selectedPreviewSha256 = '';
|
||||
let selectedPreviewPriceInfo = null;
|
||||
let priceInfo = null;
|
||||
let balanceInfo = null;
|
||||
let autoOpenedFileDialogOnce = false;
|
||||
@@ -394,14 +332,14 @@ export function openArweaveAttachmentManager({
|
||||
}
|
||||
};
|
||||
|
||||
const renderTurboMeta = (mainMetaEl, previewMetaEl) => {
|
||||
if (!mainMetaEl || !previewMetaEl) return;
|
||||
const renderTurboMeta = (mainMetaEl) => {
|
||||
if (!mainMetaEl) return;
|
||||
const turboAddress = String(balanceInfo?.address || priceInfo?.address || '').trim();
|
||||
const turboCredits = balanceInfo ? formatTurboCredits(balanceInfo.effectiveCredits, 6) : '–';
|
||||
const solBalance = balanceInfo ? `${escapeHtml(String(balanceInfo.solBalance ?? 0))} SOL` : '–';
|
||||
const uploadPrice = priceInfo ? `${formatTurboCredits(priceInfo.credits, 6)} credits` : '–';
|
||||
const fileSize = selectedFile ? formatBytes(selectedFile.size) : '–';
|
||||
const isFreeSize = selectedFile && combinedUploadSize() <= getFreeTurboUploadBytesLimit();
|
||||
const isFreeSize = selectedFile && Number(selectedFile.size || 0) <= getFreeTurboUploadBytesLimit();
|
||||
const summary = selectedFile
|
||||
? `Размер ${escapeHtml(fileSize)} · ${isFreeSize
|
||||
? '<span class="ar-attachment-ok">бесплатно через Turbo</span>'
|
||||
@@ -419,26 +357,16 @@ export function openArweaveAttachmentManager({
|
||||
<div>Бесплатно до ${escapeHtml(formatBytes(getFreeTurboUploadBytesLimit()))}</div>
|
||||
</details>
|
||||
`;
|
||||
previewMetaEl.innerHTML = '';
|
||||
if (selectedPreviewEnabled && selectedPreviewFile) {
|
||||
previewMetaEl.innerHTML = `
|
||||
<div><strong>Файл превью</strong></div>
|
||||
<div>Имя: ${escapeHtml(selectedPreviewFile.name)}</div>
|
||||
<div>Размер превью: ${escapeHtml(formatBytes(selectedPreviewFile.size))}</div>
|
||||
<div>SHA-256 превью: ${escapeHtml(selectedPreviewSha256 || '–')}</div>
|
||||
<div>Цена превью: ${escapeHtml(selectedPreviewPriceInfo ? `${formatTurboCredits(selectedPreviewPriceInfo.credits, 6)} credits` : '–')}</div>
|
||||
`;
|
||||
}
|
||||
};
|
||||
|
||||
const refreshTurboBalance = async (mainMetaEl, previewMetaEl, errorEl) => {
|
||||
const refreshTurboBalance = async (mainMetaEl, errorEl) => {
|
||||
try {
|
||||
balanceInfo = await getTurboBalanceForStoredSolanaKey({
|
||||
login: cleanLogin,
|
||||
storagePwd: cleanStoragePwd,
|
||||
keySource: selectedTurboKeySource,
|
||||
});
|
||||
renderTurboMeta(mainMetaEl, previewMetaEl);
|
||||
renderTurboMeta(mainMetaEl);
|
||||
if (errorEl && String(errorEl.textContent || '').includes('Turbo balance')) {
|
||||
setText(errorEl, '');
|
||||
}
|
||||
@@ -447,7 +375,7 @@ export function openArweaveAttachmentManager({
|
||||
}
|
||||
};
|
||||
|
||||
const promptTurboTopUp = async (mainMetaEl, previewMetaEl, errorEl) => {
|
||||
const promptTurboTopUp = async (mainMetaEl, errorEl) => {
|
||||
const value = window.prompt('Сколько SOL перевести в Turbo?', '0.01');
|
||||
if (value == null) return;
|
||||
setText(errorEl, 'Пополняем Turbo...');
|
||||
@@ -458,32 +386,15 @@ export function openArweaveAttachmentManager({
|
||||
keySource: selectedTurboKeySource,
|
||||
amountSol: value,
|
||||
});
|
||||
await refreshTurboBalance(mainMetaEl, previewMetaEl, errorEl);
|
||||
await refreshTurboBalance(mainMetaEl, errorEl);
|
||||
setText(errorEl, `Turbo пополнен. Tx: ${result.txId || 'отправлено'}`);
|
||||
} catch (error) {
|
||||
setText(errorEl, error?.message || 'Не удалось пополнить Turbo.');
|
||||
}
|
||||
};
|
||||
|
||||
const resetPreviewState = () => {
|
||||
selectedPreviewEnabled = false;
|
||||
selectedPreviewFile = null;
|
||||
selectedPreviewSha256 = '';
|
||||
selectedPreviewPriceInfo = null;
|
||||
};
|
||||
|
||||
const isPreviewEligibleForCurrentFile = () => (
|
||||
!isAvatarMode
|
||||
&& selectedFile instanceof File
|
||||
&& isVideoAttachmentName(selectedFile.name)
|
||||
);
|
||||
|
||||
const combinedUploadSize = () => {
|
||||
return Number(selectedFile?.size || 0) + Number(selectedPreviewEnabled ? (selectedPreviewFile?.size || 0) : 0);
|
||||
};
|
||||
|
||||
const renderArweaveMeta = (mainMetaEl, previewMetaEl) => {
|
||||
if (!mainMetaEl || !previewMetaEl) return;
|
||||
const renderArweaveMeta = (mainMetaEl) => {
|
||||
if (!mainMetaEl) return;
|
||||
mainMetaEl.innerHTML = `
|
||||
${isAvatarMode ? '' : `<div>Имя: ${escapeHtml(selectedFile?.name || 'file')}</div>`}
|
||||
<div>Размер: ${escapeHtml(formatBytes(selectedFile?.size || 0))}</div>
|
||||
@@ -491,44 +402,27 @@ export function openArweaveAttachmentManager({
|
||||
<div>Цена: ${escapeHtml(Number(priceInfo?.ar || 0).toLocaleString('ru-RU', { maximumFractionDigits: 6 }))} AR</div>
|
||||
<div>Баланс кошелька: ${escapeHtml(Number(balanceInfo?.ar || 0).toLocaleString('ru-RU', { maximumFractionDigits: 6 }))} AR</div>
|
||||
`;
|
||||
previewMetaEl.innerHTML = '';
|
||||
if (selectedPreviewEnabled && selectedPreviewFile) {
|
||||
previewMetaEl.innerHTML = `
|
||||
<div><strong>Файл превью</strong></div>
|
||||
<div>Имя: ${escapeHtml(selectedPreviewFile.name)}</div>
|
||||
<div>Размер превью: ${escapeHtml(formatBytes(selectedPreviewFile.size))}</div>
|
||||
<div>SHA-256 превью: ${escapeHtml(selectedPreviewSha256 || '–')}</div>
|
||||
<div>Цена превью: ${escapeHtml(selectedPreviewPriceInfo ? `${Number(selectedPreviewPriceInfo.ar || 0).toLocaleString('ru-RU', { maximumFractionDigits: 6 })} AR` : '–')}</div>
|
||||
`;
|
||||
}
|
||||
};
|
||||
|
||||
const recalculateArweaveState = async (mainMetaEl, previewMetaEl, errorEl, uploadBtn) => {
|
||||
const recalculateArweaveState = async (mainMetaEl, errorEl, uploadBtn) => {
|
||||
uploadBtn.disabled = true;
|
||||
priceInfo = null;
|
||||
balanceInfo = null;
|
||||
selectedPreviewPriceInfo = null;
|
||||
setText(errorEl, '');
|
||||
if (!selectedFile || !selectedSha256) {
|
||||
setText(mainMetaEl, '');
|
||||
setText(previewMetaEl, '');
|
||||
return;
|
||||
}
|
||||
const wallet = selectedWallet();
|
||||
if (!wallet?.address) throw new Error('Выберите Arweave-кошелёк.');
|
||||
const mainPrice = await getArweaveUploadPrice({ gateway: cleanGateway, byteLength: selectedFile.size });
|
||||
let totalWinston = BigInt(mainPrice.winston);
|
||||
if (selectedPreviewEnabled && selectedPreviewFile) {
|
||||
const previewPrice = await getArweaveUploadPrice({ gateway: cleanGateway, byteLength: selectedPreviewFile.size });
|
||||
selectedPreviewPriceInfo = previewPrice;
|
||||
totalWinston += BigInt(previewPrice.winston);
|
||||
}
|
||||
const totalWinston = BigInt(mainPrice.winston);
|
||||
balanceInfo = await getArweaveBalance({ gateway: cleanGateway, address: wallet.address });
|
||||
priceInfo = {
|
||||
ar: Number(totalWinston) / 1e12,
|
||||
winston: totalWinston.toString(),
|
||||
};
|
||||
renderArweaveMeta(mainMetaEl, previewMetaEl);
|
||||
renderArweaveMeta(mainMetaEl);
|
||||
const hasFunds = BigInt(balanceInfo.winston) >= totalWinston;
|
||||
if (!hasFunds) {
|
||||
setText(errorEl, 'Недостаточно AR на выбранном кошельке.');
|
||||
@@ -537,14 +431,13 @@ export function openArweaveAttachmentManager({
|
||||
uploadBtn.disabled = false;
|
||||
};
|
||||
|
||||
const refreshTurboStateForCurrentFile = async (mainMetaEl, previewMetaEl, errorEl, uploadBtn) => {
|
||||
const refreshTurboStateForCurrentFile = async (mainMetaEl, errorEl, uploadBtn) => {
|
||||
uploadBtn.disabled = true;
|
||||
priceInfo = null;
|
||||
balanceInfo = null;
|
||||
selectedPreviewPriceInfo = null;
|
||||
setText(errorEl, '');
|
||||
if (!selectedFile || !selectedSha256) {
|
||||
renderTurboMeta(mainMetaEl, previewMetaEl);
|
||||
renderTurboMeta(mainMetaEl);
|
||||
return;
|
||||
}
|
||||
try {
|
||||
@@ -554,21 +447,11 @@ export function openArweaveAttachmentManager({
|
||||
keySource: selectedTurboKeySource,
|
||||
byteLength: selectedFile.size,
|
||||
});
|
||||
let totalWinc = BigInt(mainPrice.winc);
|
||||
if (selectedPreviewEnabled && selectedPreviewFile) {
|
||||
const previewPrice = await estimateTurboUploadPrice({
|
||||
login: cleanLogin,
|
||||
storagePwd: cleanStoragePwd,
|
||||
keySource: selectedTurboKeySource,
|
||||
byteLength: selectedPreviewFile.size,
|
||||
});
|
||||
selectedPreviewPriceInfo = previewPrice;
|
||||
totalWinc += BigInt(previewPrice.winc);
|
||||
}
|
||||
const totalWinc = BigInt(mainPrice.winc);
|
||||
priceInfo = {
|
||||
...mainPrice,
|
||||
byteLength: combinedUploadSize(),
|
||||
isFree: combinedUploadSize() <= getFreeTurboUploadBytesLimit(),
|
||||
byteLength: Number(selectedFile.size || 0),
|
||||
isFree: Number(selectedFile.size || 0) <= getFreeTurboUploadBytesLimit(),
|
||||
winc: totalWinc.toString(),
|
||||
credits: Number(totalWinc) / 1_000_000_000_000,
|
||||
};
|
||||
@@ -577,7 +460,7 @@ export function openArweaveAttachmentManager({
|
||||
storagePwd: cleanStoragePwd,
|
||||
keySource: selectedTurboKeySource,
|
||||
});
|
||||
renderTurboMeta(mainMetaEl, previewMetaEl);
|
||||
renderTurboMeta(mainMetaEl);
|
||||
if (!priceInfo.isFree && BigInt(balanceInfo.effectiveWinc) < BigInt(priceInfo.winc)) {
|
||||
setText(errorEl, 'Turbo balance недостаточен. Нажмите «Пополнить Turbo».');
|
||||
return;
|
||||
@@ -632,11 +515,6 @@ export function openArweaveAttachmentManager({
|
||||
<span class="ar-attachment-file-name" data-file-name="true">Файл не выбран</span>
|
||||
</label>`}
|
||||
<div class="ar-attachment-meta" data-meta-main="true"></div>
|
||||
<label class="meta-muted" data-preview-option="true" hidden>
|
||||
<input type="checkbox" data-preview-toggle="true" />
|
||||
Добавить превью
|
||||
</label>
|
||||
<div class="ar-attachment-meta" data-meta-preview="true"></div>
|
||||
<p class="meta-muted inline-error" data-error="true"></p>
|
||||
<div class="form-actions-grid">
|
||||
${turboMode ? '<button class="secondary-btn" type="button" data-action="topup">Пополнить Turbo</button>' : '<button class="secondary-btn" type="button" data-action="cancel">Отмена</button>'}
|
||||
@@ -649,18 +527,14 @@ export function openArweaveAttachmentManager({
|
||||
const walletEl = root.querySelector('#ar-attach-wallet');
|
||||
const fileEl = root.querySelector('#ar-attach-file');
|
||||
const mainMetaEl = root.querySelector('[data-meta-main="true"]');
|
||||
const previewMetaEl = root.querySelector('[data-meta-preview="true"]');
|
||||
const errorEl = root.querySelector('[data-error="true"]');
|
||||
const uploadBtn = root.querySelector('[data-action="upload"]');
|
||||
const previewOptionEl = root.querySelector('[data-preview-option="true"]');
|
||||
const previewToggleEl = root.querySelector('[data-preview-toggle="true"]');
|
||||
|
||||
root.querySelector('[data-action="switch-arweave"]')?.addEventListener('click', async () => {
|
||||
if (selectedUploadTransport === 'arweave') return;
|
||||
selectedUploadTransport = 'arweave';
|
||||
selectedFile = null;
|
||||
selectedSha256 = '';
|
||||
resetPreviewState();
|
||||
priceInfo = null;
|
||||
balanceInfo = null;
|
||||
await showUpload();
|
||||
@@ -670,7 +544,6 @@ export function openArweaveAttachmentManager({
|
||||
selectedUploadTransport = 'turbo';
|
||||
selectedFile = null;
|
||||
selectedSha256 = '';
|
||||
resetPreviewState();
|
||||
priceInfo = null;
|
||||
balanceInfo = null;
|
||||
await showUpload();
|
||||
@@ -680,7 +553,7 @@ export function openArweaveAttachmentManager({
|
||||
|
||||
if (turboMode) {
|
||||
await loadTurboKeyChoices(errorEl);
|
||||
await refreshTurboStateForCurrentFile(mainMetaEl, previewMetaEl, errorEl, uploadBtn);
|
||||
await refreshTurboStateForCurrentFile(mainMetaEl, errorEl, uploadBtn);
|
||||
} else {
|
||||
await loadWallets(errorEl);
|
||||
if (walletEl) {
|
||||
@@ -692,21 +565,19 @@ export function openArweaveAttachmentManager({
|
||||
uploadBtn.disabled = true;
|
||||
selectedFile = null;
|
||||
selectedSha256 = '';
|
||||
resetPreviewState();
|
||||
priceInfo = null;
|
||||
priceInfo = null;
|
||||
balanceInfo = null;
|
||||
if (fileEl) fileEl.value = '';
|
||||
setText(mainMetaEl, '');
|
||||
setText(previewMetaEl, '');
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
root.querySelectorAll('[data-action="cancel"]').forEach((btn) => btn.addEventListener('click', () => close(resolve, null)));
|
||||
root.querySelector('[data-action="topup"]')?.addEventListener('click', async () => {
|
||||
await promptTurboTopUp(mainMetaEl, previewMetaEl, errorEl);
|
||||
await promptTurboTopUp(mainMetaEl, errorEl);
|
||||
if (turboMode && selectedFile && selectedSha256) {
|
||||
await refreshTurboStateForCurrentFile(mainMetaEl, previewMetaEl, errorEl, uploadBtn);
|
||||
await refreshTurboStateForCurrentFile(mainMetaEl, errorEl, uploadBtn);
|
||||
}
|
||||
});
|
||||
if (!turboMode) {
|
||||
@@ -720,15 +591,11 @@ export function openArweaveAttachmentManager({
|
||||
fileEl?.addEventListener('change', async () => {
|
||||
selectedFile = fileEl.files?.[0] || null;
|
||||
selectedSha256 = '';
|
||||
resetPreviewState();
|
||||
priceInfo = null;
|
||||
balanceInfo = null;
|
||||
uploadBtn.disabled = true;
|
||||
setText(errorEl, '');
|
||||
setText(mainMetaEl, '');
|
||||
setText(previewMetaEl, '');
|
||||
if (previewToggleEl instanceof HTMLInputElement) previewToggleEl.checked = false;
|
||||
if (previewOptionEl) previewOptionEl.hidden = true;
|
||||
if (!selectedFile) return;
|
||||
|
||||
try {
|
||||
@@ -740,46 +607,16 @@ export function openArweaveAttachmentManager({
|
||||
}
|
||||
const buffer = await selectedFile.arrayBuffer();
|
||||
selectedSha256 = await sha256HexFromArrayBuffer(buffer);
|
||||
if (previewOptionEl && isPreviewEligibleForCurrentFile()) {
|
||||
previewOptionEl.hidden = false;
|
||||
}
|
||||
if (turboMode) {
|
||||
await refreshTurboStateForCurrentFile(mainMetaEl, previewMetaEl, errorEl, uploadBtn);
|
||||
await refreshTurboStateForCurrentFile(mainMetaEl, errorEl, uploadBtn);
|
||||
} else {
|
||||
await recalculateArweaveState(mainMetaEl, previewMetaEl, errorEl, uploadBtn);
|
||||
await recalculateArweaveState(mainMetaEl, errorEl, uploadBtn);
|
||||
}
|
||||
} catch (error) {
|
||||
setText(errorEl, error?.message || 'Не удалось подготовить файл.');
|
||||
}
|
||||
});
|
||||
|
||||
previewToggleEl?.addEventListener('change', async () => {
|
||||
if (!(previewToggleEl instanceof HTMLInputElement)) return;
|
||||
if (!selectedFile || !isPreviewEligibleForCurrentFile()) {
|
||||
previewToggleEl.checked = false;
|
||||
return;
|
||||
}
|
||||
uploadBtn.disabled = true;
|
||||
selectedPreviewEnabled = previewToggleEl.checked;
|
||||
selectedPreviewFile = null;
|
||||
selectedPreviewSha256 = '';
|
||||
setText(errorEl, '');
|
||||
try {
|
||||
if (selectedPreviewEnabled) {
|
||||
selectedPreviewFile = await createVideoPreviewFile(selectedFile);
|
||||
selectedPreviewSha256 = await sha256HexFromArrayBuffer(await selectedPreviewFile.arrayBuffer());
|
||||
}
|
||||
if (turboMode) {
|
||||
await refreshTurboStateForCurrentFile(mainMetaEl, previewMetaEl, errorEl, uploadBtn);
|
||||
} else {
|
||||
await recalculateArweaveState(mainMetaEl, previewMetaEl, errorEl, uploadBtn);
|
||||
}
|
||||
} catch (error) {
|
||||
resetPreviewState();
|
||||
previewToggleEl.checked = false;
|
||||
setText(errorEl, error?.message || 'Не удалось подготовить превью.');
|
||||
}
|
||||
});
|
||||
|
||||
uploadBtn?.addEventListener('click', async () => {
|
||||
if (!selectedFile || !selectedSha256) {
|
||||
@@ -796,31 +633,6 @@ export function openArweaveAttachmentManager({
|
||||
uploadBtn.disabled = true;
|
||||
setText(errorEl, turboMode ? 'Загружаем файл через Turbo...' : 'Загружаем файл в Arweave...');
|
||||
try {
|
||||
let previewUpload = null;
|
||||
if (selectedPreviewEnabled && selectedPreviewFile && selectedPreviewSha256) {
|
||||
previewUpload = turboMode
|
||||
? await uploadFileWithTurbo({
|
||||
login: cleanLogin,
|
||||
storagePwd: cleanStoragePwd,
|
||||
keySource: selectedTurboKeySource,
|
||||
file: selectedPreviewFile,
|
||||
shineType: 'attachment-preview',
|
||||
tags: [
|
||||
{ name: 'SHiNE-Login', value: cleanLogin },
|
||||
{ name: 'SHiNE-Attachment-Preview-For', value: selectedFile.name || 'file' },
|
||||
],
|
||||
})
|
||||
: await uploadArweaveFile({
|
||||
gateway: cleanGateway,
|
||||
jwk: selectedWallet()?.jwk,
|
||||
file: selectedPreviewFile,
|
||||
shineType: 'attachment-preview',
|
||||
tags: [
|
||||
{ name: 'SHiNE-Login', value: cleanLogin },
|
||||
{ name: 'SHiNE-Attachment-Preview-For', value: selectedFile.name || 'file' },
|
||||
],
|
||||
});
|
||||
}
|
||||
const uploaded = turboMode
|
||||
? await uploadFileWithTurbo({
|
||||
login: cleanLogin,
|
||||
@@ -851,12 +663,6 @@ export function openArweaveAttachmentManager({
|
||||
sha256: selectedSha256,
|
||||
ar: uploaded.id,
|
||||
uploadTransport: turboMode ? 'turbo' : 'arweave',
|
||||
preview: previewUpload?.id && selectedPreviewSha256
|
||||
? {
|
||||
ar: previewUpload.id,
|
||||
sha256: selectedPreviewSha256,
|
||||
}
|
||||
: undefined,
|
||||
uploadedAtMs: Date.now(),
|
||||
purpose: isAvatarMode ? 'avatar' : 'attachment',
|
||||
}, { pendingPlacement: historyOnly && !isAvatarMode });
|
||||
@@ -867,13 +673,10 @@ export function openArweaveAttachmentManager({
|
||||
});
|
||||
|
||||
if (selectedFile && selectedSha256) {
|
||||
if (previewOptionEl && isPreviewEligibleForCurrentFile()) {
|
||||
previewOptionEl.hidden = false;
|
||||
}
|
||||
if (turboMode) {
|
||||
await refreshTurboStateForCurrentFile(mainMetaEl, previewMetaEl, errorEl, uploadBtn);
|
||||
await refreshTurboStateForCurrentFile(mainMetaEl, errorEl, uploadBtn);
|
||||
} else {
|
||||
await recalculateArweaveState(mainMetaEl, previewMetaEl, errorEl, uploadBtn);
|
||||
await recalculateArweaveState(mainMetaEl, errorEl, uploadBtn);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -894,14 +697,6 @@ export function openArweaveAttachmentManager({
|
||||
<label class="meta-muted" for="ar-existing-name">Имя файла в сообщении</label>
|
||||
<input class="input" id="ar-existing-name" type="text" maxlength="180" placeholder="например report.pdf" />
|
||||
`}
|
||||
<label class="meta-muted" data-existing-preview-wrap="true" ${isAvatarMode ? 'hidden' : 'hidden'}>
|
||||
<input type="checkbox" data-existing-preview-toggle="true" />
|
||||
Добавить превью
|
||||
</label>
|
||||
<div class="stack" data-existing-preview-fields="true" hidden>
|
||||
<label class="meta-muted" for="ar-existing-preview-txid">Transaction ID превью</label>
|
||||
<input class="input" id="ar-existing-preview-txid" type="text" maxlength="64" placeholder="43 символа txId превью" />
|
||||
</div>
|
||||
<div class="ar-attachment-meta" data-meta="true"></div>
|
||||
<p class="meta-muted inline-error" data-error="true"></p>
|
||||
<div class="form-actions-grid">
|
||||
@@ -914,67 +709,33 @@ export function openArweaveAttachmentManager({
|
||||
bindBackdrop();
|
||||
const txEl = root.querySelector('#ar-existing-txid');
|
||||
const nameEl = root.querySelector('#ar-existing-name');
|
||||
const previewWrapEl = root.querySelector('[data-existing-preview-wrap="true"]');
|
||||
const previewToggleEl = root.querySelector('[data-existing-preview-toggle="true"]');
|
||||
const previewFieldsEl = root.querySelector('[data-existing-preview-fields="true"]');
|
||||
const previewTxEl = root.querySelector('#ar-existing-preview-txid');
|
||||
const metaEl = root.querySelector('[data-meta="true"]');
|
||||
const errorEl = root.querySelector('[data-error="true"]');
|
||||
const checkBtn = root.querySelector('[data-action="check"]');
|
||||
root.querySelector('[data-action="back"]')?.addEventListener('click', showUpload);
|
||||
nameEl?.addEventListener('input', () => {
|
||||
const isVideo = isVideoAttachmentName(String(nameEl.value || '').trim());
|
||||
if (previewWrapEl) previewWrapEl.hidden = !isVideo;
|
||||
if (!isVideo) {
|
||||
if (previewToggleEl instanceof HTMLInputElement) previewToggleEl.checked = false;
|
||||
if (previewFieldsEl) previewFieldsEl.hidden = true;
|
||||
if (previewTxEl) previewTxEl.value = '';
|
||||
}
|
||||
});
|
||||
previewToggleEl?.addEventListener('change', () => {
|
||||
if (previewFieldsEl && previewToggleEl instanceof HTMLInputElement) {
|
||||
previewFieldsEl.hidden = !previewToggleEl.checked;
|
||||
}
|
||||
});
|
||||
checkBtn?.addEventListener('click', async () => {
|
||||
const txId = String(txEl?.value || '').trim();
|
||||
const name = isAvatarMode ? 'Аватар' : (String(nameEl?.value || '').trim() || 'arweave-file');
|
||||
const wantsPreview = !isAvatarMode && previewToggleEl instanceof HTMLInputElement && previewToggleEl.checked;
|
||||
const previewTxId = String(previewTxEl?.value || '').trim();
|
||||
if (!validateArweaveTxId(txId)) {
|
||||
setText(errorEl, 'Некорректный Transaction ID Arweave.');
|
||||
return;
|
||||
}
|
||||
if (wantsPreview && !validateArweaveTxId(previewTxId)) {
|
||||
setText(errorEl, 'Некорректный Transaction ID превью.');
|
||||
return;
|
||||
}
|
||||
checkBtn.disabled = true;
|
||||
setText(errorEl, 'Скачиваем файл и считаем SHA-256...');
|
||||
setText(metaEl, '');
|
||||
try {
|
||||
const meta = await loadArweaveFileMetadata({ gateway: cleanGateway, txId });
|
||||
let preview = null;
|
||||
if (wantsPreview) {
|
||||
const previewMeta = await loadArweaveFileMetadata({ gateway: cleanGateway, txId: previewTxId });
|
||||
preview = {
|
||||
ar: previewTxId,
|
||||
sha256: previewMeta.sha256Hex,
|
||||
};
|
||||
}
|
||||
const item = normalizeAttachment({
|
||||
name,
|
||||
size: meta.sizeBytes,
|
||||
sha256: meta.sha256Hex,
|
||||
ar: txId,
|
||||
preview,
|
||||
uploadedAtMs: Date.now(),
|
||||
purpose: isAvatarMode ? 'avatar' : 'attachment',
|
||||
});
|
||||
metaEl.innerHTML = `
|
||||
<div>Размер: ${escapeHtml(formatBytes(item.size))}</div>
|
||||
<div>SHA-256: ${escapeHtml(item.sha256)}</div>
|
||||
${item.preview ? '<div>Превью будет добавлено вместе с файлом.</div>' : ''}
|
||||
`;
|
||||
setText(errorEl, '');
|
||||
const addBtn = document.createElement('button');
|
||||
@@ -1005,13 +766,11 @@ export function openArweaveAttachmentManager({
|
||||
${rows.length ? rows.map((item, index) => {
|
||||
const isSelected = selectedTxIdSet.has(item.ar);
|
||||
return `
|
||||
<article class="ar-attachment-history-tile${hasAttachmentPreview(item) ? ' ar-attachment-history-tile--with-preview' : ''}${isSelected ? ' is-selected' : ''}" data-history-tile="${index}">
|
||||
${buildHistoryPreviewMarkup(item, cleanGateway)}
|
||||
<article class="ar-attachment-history-tile${isSelected ? ' is-selected' : ''}" data-history-tile="${index}">
|
||||
<strong class="ar-attachment-history-name">${escapeHtml(item.name)}${item.purpose === 'avatar' ? ' · аватар' : ''}</strong>
|
||||
<div class="ar-attachment-history-meta-row">
|
||||
<span>${escapeHtml(formatBytes(item.size))}</span>
|
||||
<span>${escapeHtml(formatArweaveHistoryTime(item.uploadedAtMs))}</span>
|
||||
${hasAttachmentPreview(item) ? '<span class="ar-attachment-placement-flag">С превью</span>' : ''}
|
||||
<span class="ar-attachment-status ar-attachment-status--pending" data-status="${index}">Проверяем...</span>
|
||||
${item.pendingPlacement ? '<span class="ar-attachment-placement-flag">Ещё не прикреплён</span>' : ''}
|
||||
</div>
|
||||
|
||||
@@ -0,0 +1,158 @@
|
||||
import { openArweaveAttachmentManager } from './arweave-attachment-manager.js';
|
||||
import { formatBytes } from '../services/attachment-format.js';
|
||||
import { uploadPublicFile } from '../services/public-file-service.js';
|
||||
import { state } from '../state.js';
|
||||
import { toUserMessage } from '../services/ui-error-texts.js';
|
||||
|
||||
export function openChannelAttachmentManager({
|
||||
login,
|
||||
storagePwd = '',
|
||||
gateway = '',
|
||||
selectedTxIds = [],
|
||||
signal = null,
|
||||
} = {}) {
|
||||
const cleanLogin = String(login || '').trim();
|
||||
const root = document.createElement('div');
|
||||
root.className = 'public-attachment-manager-root';
|
||||
document.body.append(root);
|
||||
|
||||
let closed = false;
|
||||
let selectedFile = null;
|
||||
let uploading = false;
|
||||
|
||||
const close = (resolve, value = null) => {
|
||||
if (closed) return;
|
||||
closed = true;
|
||||
root.remove();
|
||||
resolve(value);
|
||||
};
|
||||
|
||||
return new Promise((resolve) => {
|
||||
const onAbort = () => close(resolve, null);
|
||||
if (signal?.aborted) { onAbort(); return; }
|
||||
signal?.addEventListener('abort', onAbort, { once: true });
|
||||
|
||||
root.innerHTML = `
|
||||
<div class="modal public-attachment-manager" data-public-attachment-modal="true">
|
||||
<div class="modal-card stack public-attachment-manager__card" role="dialog" aria-modal="true" aria-labelledby="public-attachment-title">
|
||||
<div class="public-attachment-manager__header">
|
||||
<h3 class="modal-title" id="public-attachment-title">Добавить файл</h3>
|
||||
<button class="icon-btn" type="button" data-action="close" aria-label="Закрыть">×</button>
|
||||
</div>
|
||||
|
||||
<div class="public-attachment-manager__sources" role="radiogroup" aria-label="Место хранения файла">
|
||||
<label class="public-attachment-manager__source is-selected">
|
||||
<input type="radio" name="attachment-storage" value="server" checked />
|
||||
<span><strong>Сервер доступа</strong><small>Бесплатно · пока доступно</small></span>
|
||||
</label>
|
||||
<label class="public-attachment-manager__source">
|
||||
<input type="radio" name="attachment-storage" value="arweave" />
|
||||
<span><strong>Arweave</strong><small>Постоянное децентрализованное хранение</small></span>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div class="public-attachment-manager__server" data-panel="server">
|
||||
<div class="public-attachment-manager__notice">
|
||||
<strong>САМ ФАЙЛ БУДЕТ ХРАНИТЬСЯ ТОЛЬКО НА ВАШЕМ СЕРВЕРЕ ДОСТУПА.</strong>
|
||||
<p>В блокчейн SHiNE записываются имя, размер и SHA-256-хеш файла, но не сам файл. Хранение на сервере доступа бесплатно.</p>
|
||||
<p>Если сервер доступа перестанет работать, файл станет недоступен. При обычном переходе на другой сервер доступа в дальнейшем файлы смогут переноситься автоматически.</p>
|
||||
<p>Храните собственные копии важных вложений. Если сервер внезапно исчезнет, тот же исходный файл можно будет загрузить на другой сервер доступа: совпадающий SHA-256 позволит старым сообщениям снова найти правильные байты.</p>
|
||||
<p>Сейчас у пользователя может быть только один сервер доступа. В расширенной версии SHiNE планируется поддержка нескольких серверов доступа, в том числе дополнительных оплачиваемых серверов.</p>
|
||||
</div>
|
||||
<input class="input" type="file" data-role="file" />
|
||||
<div class="public-attachment-manager__selected meta-muted" data-role="selected">Файл не выбран.</div>
|
||||
<div class="public-attachment-manager__status meta-muted" data-role="status"></div>
|
||||
<div class="public-attachment-manager__error inline-error" data-role="error"></div>
|
||||
<button class="primary-btn" type="button" data-action="upload" disabled>Загрузить и добавить</button>
|
||||
</div>
|
||||
|
||||
<div class="public-attachment-manager__arweave" data-panel="arweave" hidden>
|
||||
<p class="meta-muted">Файл будет загружен через существующий механизм Arweave/Turbo.</p>
|
||||
<button class="primary-btn" type="button" data-action="arweave">Продолжить в Arweave</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
`;
|
||||
|
||||
const modal = root.querySelector('[data-public-attachment-modal="true"]');
|
||||
const fileInput = root.querySelector('[data-role="file"]');
|
||||
const selectedEl = root.querySelector('[data-role="selected"]');
|
||||
const statusEl = root.querySelector('[data-role="status"]');
|
||||
const errorEl = root.querySelector('[data-role="error"]');
|
||||
const uploadButton = root.querySelector('[data-action="upload"]');
|
||||
const arweaveButton = root.querySelector('[data-action="arweave"]');
|
||||
const radios = [...root.querySelectorAll('input[name="attachment-storage"]')];
|
||||
|
||||
const setSource = (value) => {
|
||||
root.querySelectorAll('.public-attachment-manager__source').forEach((label) => {
|
||||
label.classList.toggle('is-selected', label.querySelector('input')?.value === value);
|
||||
});
|
||||
root.querySelector('[data-panel="server"]').hidden = value !== 'server';
|
||||
root.querySelector('[data-panel="arweave"]').hidden = value !== 'arweave';
|
||||
};
|
||||
|
||||
radios.forEach((radio) => radio.addEventListener('change', () => setSource(radio.value)));
|
||||
root.querySelector('[data-action="close"]')?.addEventListener('click', () => close(resolve, null));
|
||||
modal?.addEventListener('click', (event) => {
|
||||
if (event.target === modal && !uploading) close(resolve, null);
|
||||
});
|
||||
|
||||
fileInput?.addEventListener('change', () => {
|
||||
selectedFile = fileInput.files?.[0] || null;
|
||||
if (selectedEl) selectedEl.textContent = selectedFile
|
||||
? `${selectedFile.name} · ${formatBytes(selectedFile.size)}`
|
||||
: 'Файл не выбран.';
|
||||
if (errorEl) errorEl.textContent = '';
|
||||
if (statusEl) statusEl.textContent = '';
|
||||
if (uploadButton) uploadButton.disabled = !selectedFile;
|
||||
});
|
||||
|
||||
uploadButton?.addEventListener('click', async () => {
|
||||
if (!selectedFile || uploading) return;
|
||||
uploading = true;
|
||||
uploadButton.disabled = true;
|
||||
fileInput.disabled = true;
|
||||
if (errorEl) errorEl.textContent = '';
|
||||
try {
|
||||
const item = await uploadPublicFile({
|
||||
file: selectedFile,
|
||||
login: cleanLogin,
|
||||
sessionId: state.session.sessionId,
|
||||
wsUrl: state.entrySettings.shineServer,
|
||||
onStatus: (message) => { if (statusEl) statusEl.textContent = message; },
|
||||
});
|
||||
close(resolve, item);
|
||||
} catch (error) {
|
||||
if (errorEl) errorEl.textContent = toUserMessage(error, 'Не удалось загрузить файл.');
|
||||
if (statusEl) statusEl.textContent = '';
|
||||
uploading = false;
|
||||
fileInput.disabled = false;
|
||||
uploadButton.disabled = !selectedFile;
|
||||
}
|
||||
});
|
||||
|
||||
arweaveButton?.addEventListener('click', async () => {
|
||||
if (uploading) return;
|
||||
uploading = true;
|
||||
root.hidden = true;
|
||||
try {
|
||||
const item = await openArweaveAttachmentManager({
|
||||
login: cleanLogin,
|
||||
storagePwd,
|
||||
gateway,
|
||||
selectedTxIds,
|
||||
signal,
|
||||
});
|
||||
if (item) close(resolve, item);
|
||||
else {
|
||||
uploading = false;
|
||||
root.hidden = false;
|
||||
}
|
||||
} catch (error) {
|
||||
uploading = false;
|
||||
root.hidden = false;
|
||||
if (errorEl) errorEl.textContent = toUserMessage(error, 'Не удалось открыть Arweave.');
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
import { iconHtml } from './ui-icon.js';
|
||||
import { markArweaveAttachmentPlaced, openArweaveAttachmentManager } from './arweave-attachment-manager.js';
|
||||
import { markArweaveAttachmentPlaced } from './arweave-attachment-manager.js';
|
||||
import { openChannelAttachmentManager } from './channel-attachment-manager.js';
|
||||
import { composeMessageWithAttachments, MAX_MESSAGE_ATTACHMENTS } from '../services/attachment-format.js';
|
||||
import { state } from '../state.js';
|
||||
import { toUserMessage } from '../services/ui-error-texts.js';
|
||||
@@ -266,7 +267,7 @@ export function openChannelEditor({
|
||||
attachments: [...attachments],
|
||||
});
|
||||
completed = true;
|
||||
attachments.forEach((item) => markArweaveAttachmentPlaced(login, item));
|
||||
attachments.filter((item) => item?.ar).forEach((item) => markArweaveAttachmentPlaced(login, item));
|
||||
// Не удаляем новый черновик, открытый после закрытия отправляющего редактора.
|
||||
if (!closed || drafts.get(storageKey)?.text === textarea.value) drafts.delete(storageKey);
|
||||
if (!isActive() || closed) return;
|
||||
@@ -286,7 +287,7 @@ export function openChannelEditor({
|
||||
};
|
||||
|
||||
const onDocumentKeydown = (event) => {
|
||||
if (!overlay.isConnected || document.querySelector('.ar-attachment-manager-root')) return;
|
||||
if (!overlay.isConnected || document.querySelector('.ar-attachment-manager-root, .public-attachment-manager-root')) return;
|
||||
if (event.key === 'Escape') {
|
||||
event.preventDefault();
|
||||
close();
|
||||
@@ -338,7 +339,7 @@ export function openChannelEditor({
|
||||
picking = true;
|
||||
dialog.inert = true;
|
||||
sync();
|
||||
const item = await openArweaveAttachmentManager({
|
||||
const item = await openChannelAttachmentManager({
|
||||
login,
|
||||
storagePwd: state.session.storagePwdInMemory,
|
||||
gateway: state.entrySettings.arweaveServer,
|
||||
|
||||
@@ -2,6 +2,7 @@ const paths = {
|
||||
heart: '<path d="M12 21S2.3 15.5 2.3 8.7C2.3 3.6 8.1 1.9 12 6.5c3.9-4.6 9.7-2.9 9.7 2.2C21.7 15.5 12 21 12 21Z"/>',
|
||||
message: '<path d="M5.2 2.35h13.6a2.7 2.7 0 0 1 2.7 2.7v9.7a2.7 2.7 0 0 1-2.7 2.7h-7.1L7.2 21v-3.55h-2a2.7 2.7 0 0 1-2.7-2.7v-9.7a2.7 2.7 0 0 1 2.7-2.7Z"/>',
|
||||
more: '<circle cx="4" cy="12" r="1.6" fill="currentColor" stroke="none"/><circle cx="12" cy="12" r="1.6" fill="currentColor" stroke="none"/><circle cx="20" cy="12" r="1.6" fill="currentColor" stroke="none"/>',
|
||||
moreVertical: '<circle cx="12" cy="4" r="1.6" fill="currentColor" stroke="none"/><circle cx="12" cy="12" r="1.6" fill="currentColor" stroke="none"/><circle cx="12" cy="20" r="1.6" fill="currentColor" stroke="none"/>',
|
||||
forward: '<path d="m14.4 3.1 7.2 7.1-7.2 6.6v-4.4C8.5 12.4 5 15.1 2.4 20c.4-7.6 4.4-11.7 12-12.4Z"/>',
|
||||
download: '<path d="M12 4v11M7 10.5l5 5 5-5M5 20h14"/>',
|
||||
reply: '<path d="M9 7 4 12l5 5"/><path d="M4 12h9a7 7 0 0 1 7 7"/>',
|
||||
|
||||
Reference in New Issue
Block a user