SHA256
Добавить лицензию CC0 1.0
This commit is contained in:
@@ -4,6 +4,7 @@ import { openMediaViewer } from '../components/media-viewer.js';
|
||||
import { confirmDialog } from '../components/confirm-dialog.js';
|
||||
import { buildArweaveDataUrl, sha256HexFromArrayBuffer, validateArweaveTxId, validateSha256Hex } from './arweave-file-service.js';
|
||||
import { resolvePublicFileUrl } from './public-file-service.js';
|
||||
import { updatedUserFileUrlAfterError } from './user-file-server-service.js';
|
||||
import { validatePublicPiecesRoot } from './public-pieces-root.js';
|
||||
|
||||
const ATTACH_BLOCK_RE = /^<(?:SHiNE|S):(attach|att);([^>]*)>\n?/u;
|
||||
@@ -263,7 +264,7 @@ function replaceWithUnavailable(slide, messageTimestampMs, storage = 'arweave',
|
||||
slide.replaceChildren(createUnavailableBlock(messageTimestampMs, storage, detail));
|
||||
}
|
||||
|
||||
function createFileCard({ item, url, messageTimestampMs, slide, warnOnOpen = false }) {
|
||||
function createFileCard({ item, url, messageTimestampMs, slide, warnOnOpen = false, onLoadError = null }) {
|
||||
const card = document.createElement('div');
|
||||
card.className = 'message-attachment-file-card';
|
||||
card.role = 'button';
|
||||
@@ -289,7 +290,7 @@ function createFileCard({ item, url, messageTimestampMs, slide, warnOnOpen = fal
|
||||
window.location.assign(url);
|
||||
return;
|
||||
}
|
||||
window.open(url, '_blank', 'noopener');
|
||||
window.open(url, '_blank', 'noopener,noreferrer');
|
||||
};
|
||||
card.addEventListener('click', (event) => {
|
||||
event.stopPropagation();
|
||||
@@ -300,11 +301,15 @@ function createFileCard({ item, url, messageTimestampMs, slide, warnOnOpen = fal
|
||||
event.preventDefault();
|
||||
openFile();
|
||||
});
|
||||
void fetch(url, { method: 'HEAD', cache: 'no-store' })
|
||||
void fetch(url, { method: 'HEAD', cache: 'no-store', credentials: 'omit', referrerPolicy: 'no-referrer' })
|
||||
.then((response) => {
|
||||
if (!response.ok) replaceWithUnavailable(slide, messageTimestampMs, attachmentStorage(item));
|
||||
if (!response.ok) return Promise.reject(new Error(`File HTTP ${response.status}`));
|
||||
return null;
|
||||
})
|
||||
.catch(() => replaceWithUnavailable(slide, messageTimestampMs, attachmentStorage(item)));
|
||||
.catch(async () => {
|
||||
if (onLoadError && await onLoadError(url)) return;
|
||||
replaceWithUnavailable(slide, messageTimestampMs, attachmentStorage(item));
|
||||
});
|
||||
return card;
|
||||
}
|
||||
|
||||
@@ -359,6 +364,7 @@ function createMediaSlide({ item, url, kind, messageTimestampMs, slide, onOpen,
|
||||
img.className = 'message-attachment-media';
|
||||
img.alt = item.name;
|
||||
img.loading = 'lazy';
|
||||
img.referrerPolicy = 'no-referrer';
|
||||
bindImageLayout(img);
|
||||
img.addEventListener('error', handleError, { once: true });
|
||||
img.src = url;
|
||||
@@ -369,6 +375,7 @@ function createMediaSlide({ item, url, kind, messageTimestampMs, slide, onOpen,
|
||||
video.preload = 'none';
|
||||
video.muted = true;
|
||||
video.playsInline = true;
|
||||
video.referrerPolicy = 'no-referrer';
|
||||
video.addEventListener('error', handleError, { once: true });
|
||||
video.addEventListener('loadedmetadata', () => frame.classList.add('is-loaded'), { once: true });
|
||||
|
||||
@@ -520,15 +527,40 @@ export function createAttachmentCarouselElement(attachments = [], {
|
||||
void resolveAttachmentDisplayUrl(item, options)
|
||||
.then(({ url }) => {
|
||||
const kind = isPotentiallyActiveAttachment(item) ? 'file' : getAttachmentKind(item);
|
||||
const content = kind === 'file'
|
||||
? createFileCard({ item, url, messageTimestampMs, slide: slot, warnOnOpen: true })
|
||||
: createMediaSlide({
|
||||
item, url, kind, messageTimestampMs, slide: slot, lazyVideo: true,
|
||||
onOpen: () => openPublicViewer(index),
|
||||
// Если формат/кодек не поддерживается браузером, файл всё ещё
|
||||
// можно открыть или скачать через обычную карточку.
|
||||
onError: () => slot.replaceChildren(createFileCard({ item, url, messageTimestampMs, slide: slot, warnOnOpen: true })),
|
||||
});
|
||||
const refresh = async (failedUrl) => {
|
||||
if (item.ar || !options.authorLogin || !item.pr) return null;
|
||||
try {
|
||||
return await updatedUserFileUrlAfterError({
|
||||
login: options.authorLogin, id: item.pr, previousUrl: failedUrl,
|
||||
});
|
||||
} catch { return null; }
|
||||
};
|
||||
const showCard = (candidate, retry = true) => createFileCard({
|
||||
item, url: candidate, messageTimestampMs, slide: slot, warnOnOpen: true,
|
||||
onLoadError: retry ? async (failed) => {
|
||||
const updated = await refresh(failed);
|
||||
if (!updated || !slot.isConnected) return false;
|
||||
resolvedUrls.set(index, updated);
|
||||
slot.replaceChildren(showCard(updated, false));
|
||||
return true;
|
||||
} : null,
|
||||
});
|
||||
const showMedia = (candidate, retry = true) => createMediaSlide({
|
||||
item, url: candidate, kind, messageTimestampMs, slide: slot, lazyVideo: true,
|
||||
onOpen: () => openPublicViewer(index),
|
||||
onError: () => {
|
||||
// Сразу оставляем скачивание доступным при неподдерживаемом кодеке.
|
||||
// Если проблема в старом адресе сервера — фоновая проверка вернёт media.
|
||||
slot.replaceChildren(showCard(candidate, false));
|
||||
if (!retry) return;
|
||||
void refresh(candidate).then((updated) => {
|
||||
if (!updated || !slot.isConnected) return;
|
||||
resolvedUrls.set(index, updated);
|
||||
slot.replaceChildren(showMedia(updated, false));
|
||||
});
|
||||
},
|
||||
});
|
||||
const content = kind === 'file' ? showCard(url) : showMedia(url);
|
||||
resolvedUrls.set(index, url);
|
||||
slot.replaceChildren(content);
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user