SHA256
Добавить лицензию CC0 1.0
This commit is contained in:
@@ -2,7 +2,8 @@ import { t } from '../i18n/index.js';
|
||||
import { state } from '../state.js';
|
||||
import { buildArweaveDataUrl, validateArweaveTxId } from '../services/arweave-file-service.js';
|
||||
import { getCachedAvatarObjectUrl } from '../services/arweave-avatar-cache-service.js';
|
||||
import { avatarR2Url } from '../services/public-file-service.js';
|
||||
import { resolvePublicFileUrl } from '../services/public-file-service.js';
|
||||
import { updatedUserFileUrlAfterError } from '../services/user-file-server-service.js';
|
||||
import { validatePublicPiecesRoot } from '../services/public-pieces-root.js';
|
||||
|
||||
function normalizeLogin(value) {
|
||||
@@ -78,6 +79,7 @@ export function renderAvatar({
|
||||
img.alt = String(alt || t('screens.avatar_image.text_002'));
|
||||
img.loading = 'lazy';
|
||||
img.decoding = 'async';
|
||||
img.referrerPolicy = 'no-referrer';
|
||||
wrap.append(img);
|
||||
|
||||
const setLoadedState = (loaded) => {
|
||||
@@ -88,8 +90,23 @@ export function renderAvatar({
|
||||
if (hasServerAvatar) {
|
||||
// All public avatars use exactly the same PR/Base58 R2 object key as attachments.
|
||||
img.onload = () => setLoadedState(true);
|
||||
img.onerror = () => { img.removeAttribute('src'); setLoadedState(false); };
|
||||
img.src = avatarR2Url(expectedPr);
|
||||
let attemptedRefresh = false;
|
||||
img.onerror = async () => {
|
||||
const previousUrl = img.src;
|
||||
if (!attemptedRefresh && authorLogin) {
|
||||
attemptedRefresh = true;
|
||||
try {
|
||||
const updated = await updatedUserFileUrlAfterError({
|
||||
login: authorLogin, id: expectedPr, previousUrl,
|
||||
});
|
||||
if (updated && img.parentElement === wrap) { img.src = updated; return; }
|
||||
} catch { /* старый адрес останется недоступным */ }
|
||||
}
|
||||
img.removeAttribute('src'); setLoadedState(false);
|
||||
};
|
||||
void resolvePublicFileUrl({ pr: expectedPr, authorLogin }).then((url) => {
|
||||
if (img.parentElement === wrap) img.src = url;
|
||||
}).catch(() => { img.removeAttribute('src'); setLoadedState(false); });
|
||||
return wrap;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { t } from '../i18n/index.js';
|
||||
// Вложения личных сообщений: превью картинок и видео после расшифровки и карточка файла со «Скачать».
|
||||
// Общие для ленты чата и экрана «Медиа и файлы».
|
||||
import { decryptDmFileToBlob, downloadAndDecryptDmFile } from '../services/dm-file-service.js';
|
||||
import { decryptDmFileToBlob, downloadAndDecryptDmFile, isDmFileExpired } from '../services/dm-file-service.js';
|
||||
import { formatBytes, getAttachmentKind } from '../services/attachment-format.js';
|
||||
import { showToast } from '../services/channels-ux.js';
|
||||
import { iconHtml } from './ui-icon.js';
|
||||
@@ -17,7 +17,7 @@ const dmMediaBlobs = new Map();
|
||||
const DM_MEDIA_CACHE_LIMIT = 40;
|
||||
|
||||
export function isDmInlineMedia(attachment) {
|
||||
if (attachment?.kind === 'voice') return false;
|
||||
if (attachment?.kind === 'voice' || isDmFileExpired(attachment)) return false;
|
||||
const size = Number(attachment?.size || 0);
|
||||
if (!(size > 0 && size <= DM_INLINE_MEDIA_MAX_BYTES)) return false;
|
||||
const kind = getAttachmentKind(attachment);
|
||||
@@ -27,6 +27,7 @@ export function isDmInlineMedia(attachment) {
|
||||
// Расшифрованный файл держим в памяти: лента перерисовывается на каждое новое сообщение,
|
||||
// и без кэша картинка расшифровывалась бы и мигала заново.
|
||||
export function resolveDmMediaUrl(attachment) {
|
||||
if (isDmFileExpired(attachment)) return Promise.reject(new Error('DM_FILE_EXPIRED'));
|
||||
const key = String(attachment?.id || attachment?.url || '');
|
||||
let pending = dmMediaBlobs.get(key);
|
||||
if (!pending) {
|
||||
@@ -40,7 +41,24 @@ export function resolveDmMediaUrl(attachment) {
|
||||
return pending.then((blob) => ({ url: URL.createObjectURL(blob), objectUrl: true }));
|
||||
}
|
||||
|
||||
export function createDmExpiredAttachmentCard(attachment) {
|
||||
const card = document.createElement('div');
|
||||
card.className = 'dm-file-card';
|
||||
const copy = document.createElement('span');
|
||||
copy.className = 'dm-file-card__copy';
|
||||
const name = document.createElement('strong');
|
||||
name.className = 'dm-file-card__name';
|
||||
name.textContent = attachment?.name || 'file';
|
||||
const info = document.createElement('span');
|
||||
info.className = 'dm-file-card__meta';
|
||||
info.textContent = t('screens.dm_attachments.file_expired');
|
||||
copy.append(name, info);
|
||||
card.append(copy);
|
||||
return card;
|
||||
}
|
||||
|
||||
export function createDmFileAttachmentCard(attachment) {
|
||||
if (isDmFileExpired(attachment)) return createDmExpiredAttachmentCard(attachment);
|
||||
const fileCard = document.createElement('div');
|
||||
fileCard.className = 'dm-file-card';
|
||||
|
||||
|
||||
@@ -362,7 +362,7 @@
|
||||
"label_007": "Upload",
|
||||
"label_008": "Copy TX ID",
|
||||
"label_009": "Sending UI errors to the server",
|
||||
"label_010": "Critical interface errors and unexpected server failures are reported automatically. Passwords, private keys, and message contents are not included. Reports are not queued when offline."
|
||||
"label_010": "For developers: When an interface error is enabled, it will automatically be sent to the server for diagnosis."
|
||||
},
|
||||
"network_view": {
|
||||
"label_001": "Enter your username",
|
||||
@@ -976,7 +976,8 @@
|
||||
"text_004": "File saved",
|
||||
"text_005": "File downloaded",
|
||||
"text_006": "file",
|
||||
"text_007": "Download {value1}"
|
||||
"text_007": "Download {value1}",
|
||||
"file_expired": "File no longer available: encrypted attachments are kept for up to 14 days."
|
||||
},
|
||||
"palette_editor": {
|
||||
"text_001": "Failed to read palette, please make sure the whole text is copied.",
|
||||
@@ -2216,15 +2217,15 @@
|
||||
},
|
||||
"chat_view": {
|
||||
"security_notice": {
|
||||
"title": "Your conversation is protected by end-to-end encryption",
|
||||
"encryption": "All private messages are encrypted using modern cryptographic algorithms. Encryption keys are stored ONLY on the participants' devices.",
|
||||
"servers": "SHiNE servers do not possess your private keys and technically cannot read your messages.",
|
||||
"derivation": "Your encryption key is derived from your login and password.",
|
||||
"rotation": "When you change your password, all your messages are re-encrypted from the old password to the new one on your device.",
|
||||
"source": "Our applications are fully open source, so you can easily verify this yourself.",
|
||||
"title": "Private chat security",
|
||||
"encryption": "Messages in this chat are encrypted on the participants' devices.",
|
||||
"servers": "The server delivers encrypted data but should not be able to read the conversation.",
|
||||
"derivation": "Chat keys are derived from account keys and stored on the devices.",
|
||||
"rotation": "After key rotation, some messages may require the keys to be received again.",
|
||||
"source": "Before sending, make sure you are communicating with the intended user and server.",
|
||||
"warning_label": "Important:",
|
||||
"warning": "if you forget your password, it will be impossible to restore access to your encrypted conversations.",
|
||||
"recovery": "SHiNE does not store your secret keys and cannot help you recover your conversations."
|
||||
"warning": "never share private keys or your account password with anyone.",
|
||||
"recovery": "Access recovery depends on your saved keys and password. Keep them secure."
|
||||
},
|
||||
"text_002": "Muted",
|
||||
"text_015": "Search",
|
||||
@@ -4666,9 +4667,6 @@
|
||||
"could_not_switch_profile": "Could not switch profile.",
|
||||
"your_session_has_expired_please_sign_in_again": "Your session has expired. Please sign in again.",
|
||||
"something_went_wrong_error_details_were_sent_to_the_devel": "Something went wrong. Error details were sent to the developers. Please try again.",
|
||||
"error_report_pending": "Sending technical error details…",
|
||||
"error_report_received": "The action failed. The server received error report {id}. Please try again.",
|
||||
"error_report_not_sent": "Something went wrong. The error report could not reach the server. Check your connection and try again.",
|
||||
"could_not_display_this_screen": "Could not display this screen",
|
||||
"unknown": "unknown",
|
||||
"retry": "Retry",
|
||||
|
||||
@@ -456,7 +456,7 @@
|
||||
"label_007": "Загрузить",
|
||||
"label_008": "Скопировать TX ID",
|
||||
"label_009": "Отправка UI-ошибок на сервер",
|
||||
"label_010": "Критические ошибки интерфейса и неожиданные отказы сервера автоматически отправляются для диагностики. Пароли, приватные ключи и содержимое сообщений не передаются. При отсутствии связи отправка не выполняется.",
|
||||
"label_010": "Для разработчиков: при включении ошибки интерфейса будут автоматически отправляться на сервер для диагностики.",
|
||||
"label_011": "Отправлять ошибки на сервер",
|
||||
"label_012": "Отмена",
|
||||
"label_013": "Сохранить"
|
||||
@@ -976,7 +976,8 @@
|
||||
"text_004": "Файл сохранён",
|
||||
"text_005": "Файл скачан",
|
||||
"text_006": "файл",
|
||||
"text_007": "Скачать {value1}"
|
||||
"text_007": "Скачать {value1}",
|
||||
"file_expired": "Файл больше недоступен: зашифрованные вложения хранятся не более 14 дней."
|
||||
},
|
||||
"palette_editor": {
|
||||
"text_001": "Не удалось прочитать палитру: проверьте, что текст скопирован целиком.",
|
||||
@@ -2349,15 +2350,15 @@
|
||||
},
|
||||
"chat_view": {
|
||||
"security_notice": {
|
||||
"title": "Ваша переписка защищена сквозным шифрованием",
|
||||
"encryption": "Все личные сообщения шифруются с использованием современных криптографических алгоритмов. Ключи шифрования хранятся ТОЛЬКО на устройствах участников переписки.",
|
||||
"servers": "Сервера SHiNE не имеют ваших приватных ключей и даже технически никак не могут прочитать ваши сообщения.",
|
||||
"derivation": "Ваш ключ шифрования высчитывается из вашего логина и пароля",
|
||||
"rotation": "При смене пароля перекодирование всех ваших сообщений со старого пароля на новый происходит на устройстве пользователя.",
|
||||
"source": "Код наших приложений полностью открыт и вы легко можете проверить всё это сами.",
|
||||
"title": "Безопасность личной переписки",
|
||||
"encryption": "Сообщения в этом чате шифруются на устройствах участников.",
|
||||
"servers": "Сервер доставляет зашифрованные данные, но не должен видеть содержимое переписки.",
|
||||
"derivation": "Ключи переписки производятся из ключей аккаунта и хранятся на устройствах.",
|
||||
"rotation": "При смене ключей часть сообщений может потребовать повторного получения ключей.",
|
||||
"source": "Перед отправкой проверьте, что вы общаетесь с нужным пользователем и сервером.",
|
||||
"warning_label": "Важно:",
|
||||
"warning": "если вы забудете свой пароль, восстановить доступ к вашей зашифрованной переписке будет невозможно.",
|
||||
"recovery": "SHiNE не хранит ваши секретные ключи и никак не сможет помочь вам восстановить вашу переписку"
|
||||
"warning": "не передавайте приватные ключи и пароль аккаунта другим людям.",
|
||||
"recovery": "Восстановление доступа зависит от сохранённых ключей и пароля. Храните их безопасно."
|
||||
},
|
||||
"text_001": "Чат",
|
||||
"text_002": "Без звука",
|
||||
@@ -4666,9 +4667,6 @@
|
||||
"could_not_switch_profile": "Не удалось переключить профиль.",
|
||||
"your_session_has_expired_please_sign_in_again": "Ваша сессия устарела. Авторизируйтесь заново.",
|
||||
"something_went_wrong_error_details_were_sent_to_the_devel": "Что-то пошло не так. Сведения об ошибке уже отправлены разработчикам – попробуйте ещё раз.",
|
||||
"error_report_pending": "Отправляем техническую информацию об ошибке…",
|
||||
"error_report_received": "Не удалось выполнить действие. Отчёт об ошибке принят сервером (№ {id}). Попробуйте ещё раз.",
|
||||
"error_report_not_sent": "Возникла ошибка. Не удалось передать отчёт на сервер. Проверьте соединение и повторите попытку.",
|
||||
"could_not_display_this_screen": "Не удалось отрисовать экран",
|
||||
"unknown": "неизвестно",
|
||||
"retry": "Повторить",
|
||||
|
||||
@@ -10,7 +10,7 @@ import { getAttachmentKind } from '../services/attachment-format.js';
|
||||
import { parseDmTechBlocks } from '../services/dm-tech-blocks.js';
|
||||
import { loadFullDmHistory, resolveMessageTimeMs } from '../services/dm-history.js';
|
||||
import { formatClockTime, formatDayLabel } from '../services/channels-ux.js';
|
||||
import { getChatMessages, getRememberedDmPeer, normalizeDmChatId } from '../state.js';
|
||||
import { getChatMessages, getRememberedDmPeer, normalizeDmChatId, state } from '../state.js';
|
||||
import { navigateUp } from '../router.js';
|
||||
|
||||
export const pageMeta = { id: 'chat-media-view', get title() { return t('screens.chat_media_view.text_001'); } };
|
||||
@@ -18,16 +18,21 @@ export const pageMeta = { id: 'chat-media-view', get title() { return t('screens
|
||||
const monthTitle = (date) => formatDate(date, { month: 'long', year: 'numeric' });
|
||||
|
||||
// Все вложения переписки, от новых к старым.
|
||||
function collectAttachments(chatId) {
|
||||
function collectAttachments(chatId, currentLogin) {
|
||||
const media = [];
|
||||
const files = [];
|
||||
for (const msg of getChatMessages(chatId)) {
|
||||
if (msg?.deleted) continue;
|
||||
const parsed = parseDmTechBlocks(String(msg?.text || ''));
|
||||
const list = Array.isArray(parsed.fileAttachments) ? parsed.fileAttachments : (parsed.fileAttachment ? [parsed.fileAttachment] : []);
|
||||
for (const attachment of list) {
|
||||
if (attachment?.kind === 'voice') continue;
|
||||
const entry = { attachment, timeMs: resolveMessageTimeMs(msg), from: msg?.from };
|
||||
for (const item of list) {
|
||||
if (item?.kind === 'voice') continue;
|
||||
const timeMs = resolveMessageTimeMs(msg);
|
||||
const attachment = { ...item,
|
||||
senderLogin: msg?.from === 'out' ? currentLogin : chatId,
|
||||
messageTimestampMs: timeMs,
|
||||
};
|
||||
const entry = { attachment, timeMs, from: msg?.from };
|
||||
(isDmInlineMedia(attachment) ? media : files).push(entry);
|
||||
}
|
||||
}
|
||||
@@ -182,7 +187,7 @@ export function render({ navigate, route, chrome }) {
|
||||
|
||||
function renderBody() {
|
||||
if (disposed) return;
|
||||
const { media, files } = collectAttachments(chatId);
|
||||
const { media, files } = collectAttachments(chatId, state.session?.login);
|
||||
for (const [value, { button, label }] of tabButtons) {
|
||||
const count = value === 'media' ? media.length : files.length;
|
||||
button.textContent = count ? `${label} · ${count}` : label;
|
||||
|
||||
@@ -42,7 +42,8 @@ import {
|
||||
DM_MAX_ATTACHMENTS_PER_MESSAGE,
|
||||
} from '../services/dm-file-service.js';
|
||||
import { createAttachmentCarouselElement } from '../services/attachment-format.js';
|
||||
import { createDmFileAttachmentCard, isDmInlineMedia, resolveDmMediaUrl } from '../components/dm-attachments.js';
|
||||
import { createDmFileAttachmentCard, createDmExpiredAttachmentCard, isDmInlineMedia, resolveDmMediaUrl } from '../components/dm-attachments.js';
|
||||
import { isDmFileExpired } from '../services/dm-file-service.js';
|
||||
import {
|
||||
DM_HISTORY_PAGE_SIZE,
|
||||
isDmHistoryFullyLoaded,
|
||||
@@ -1217,7 +1218,12 @@ function renderLog(
|
||||
|
||||
const bubble = document.createElement('div');
|
||||
const parsedText = parseDmTechBlocks(String(msg?.text || ''));
|
||||
const dmAttachments = Array.isArray(parsedText.fileAttachments) ? parsedText.fileAttachments : (parsedText.fileAttachment ? [parsedText.fileAttachment] : []);
|
||||
const rawDmAttachments = Array.isArray(parsedText.fileAttachments) ? parsedText.fileAttachments : (parsedText.fileAttachment ? [parsedText.fileAttachment] : []);
|
||||
const dmAttachments = rawDmAttachments.map((attachment) => ({
|
||||
...attachment,
|
||||
senderLogin: msg?.from === 'out' ? state.session?.login : chatId,
|
||||
messageTimestampMs: msgTimeMs,
|
||||
}));
|
||||
const autoKind = parsedText.callSummary ? 'call-tech' : (dmAttachments.length ? 'file-tech' : '');
|
||||
const bubbleKind = String(msg?.kind || autoKind || '').trim();
|
||||
bubble.className = `bubble ${msg.from}${bubbleKind ? ` ${bubbleKind}` : ''}`;
|
||||
@@ -1280,9 +1286,9 @@ function renderLog(
|
||||
for (const attachment of dmAttachments) {
|
||||
if (media.includes(attachment)) continue;
|
||||
attachmentsWrap.append(
|
||||
attachment?.kind === 'voice'
|
||||
? createDmVoiceAttachmentCard(attachment)
|
||||
: createDmFileAttachmentCard(attachment),
|
||||
isDmFileExpired(attachment)
|
||||
? createDmExpiredAttachmentCard(attachment)
|
||||
: (attachment?.kind === 'voice' ? createDmVoiceAttachmentCard(attachment) : createDmFileAttachmentCard(attachment)),
|
||||
);
|
||||
}
|
||||
bubble.append(attachmentsWrap);
|
||||
|
||||
@@ -18,7 +18,7 @@ import { t } from '../../i18n/index.js';
|
||||
import { renderUserAvatar, buildAvatarInitials } from '../../components/avatar-image.js';
|
||||
import { state } from '../../state.js';
|
||||
import { buildArweaveDataUrl } from '../../services/arweave-file-service.js';
|
||||
import { avatarR2Url } from '../../services/public-file-service.js';
|
||||
import { resolvePublicFileUrl } from '../../services/public-file-service.js';
|
||||
|
||||
const SVGNS = 'http://www.w3.org/2000/svg';
|
||||
|
||||
@@ -158,7 +158,7 @@ async function resolveServerAvatarPhotoSrc(src) {
|
||||
const authorLogin = String(src?.login || src?.id || '').trim();
|
||||
if (txId || !pr || !authorLogin) return '';
|
||||
try {
|
||||
return avatarR2Url(pr);
|
||||
return await resolvePublicFileUrl({ pr, authorLogin });
|
||||
} catch {
|
||||
return '';
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@ import { t } from '../../i18n/index.js';
|
||||
import { buildAvatarInitials } from '../../components/avatar-image.js';
|
||||
import { state } from '../../state.js';
|
||||
import { buildArweaveDataUrl } from '../../services/arweave-file-service.js';
|
||||
import { avatarR2Url } from '../../services/public-file-service.js';
|
||||
import { resolvePublicFileUrl } from '../../services/public-file-service.js';
|
||||
import { ISLAND_COLORS, layoutIslands, tieWeight } from './communities.js';
|
||||
|
||||
const NODE_R = { focus: 30, 1: 22, 2: 15, 3: 11 };
|
||||
@@ -633,7 +633,7 @@ async function avatarUrlFromServer(node) {
|
||||
const authorLogin = String(node?.login || node?.id || '').trim();
|
||||
if (String(raw.ar || '').trim() || !pr || !authorLogin) return '';
|
||||
try {
|
||||
return avatarR2Url(pr);
|
||||
return await resolvePublicFileUrl({ pr, authorLogin });
|
||||
} catch {
|
||||
return '';
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
})
|
||||
|
||||
@@ -541,6 +541,10 @@ function extractContactsFromDialogs(dialogs) {
|
||||
return out;
|
||||
}
|
||||
|
||||
export const HEADER_LICENSE_CC0 = 'CC0-1.0';
|
||||
export const HEADER_LICENSE_FIELD_CC0 = `license:${HEADER_LICENSE_CC0}`;
|
||||
export const HEADER_VERSION_CC0 = 2;
|
||||
|
||||
function makeHeaderBodyBytes({ login, initialBlockchainKey32 }) {
|
||||
const cleanLogin = String(login || '').trim();
|
||||
const loginBytes = utf8Bytes(cleanLogin);
|
||||
@@ -555,6 +559,7 @@ function makeHeaderBodyBytes({ login, initialBlockchainKey32 }) {
|
||||
utf8Bytes('SHiNE'),
|
||||
int8Byte(loginBytes.length),
|
||||
loginBytes,
|
||||
utf8Bytes(HEADER_LICENSE_FIELD_CC0),
|
||||
keyBytes,
|
||||
);
|
||||
}
|
||||
@@ -1947,7 +1952,7 @@ export class AuthService {
|
||||
storagePwd,
|
||||
msgType: MSG_TYPE_TECH,
|
||||
msgSubType: MSG_SUBTYPE_TECH_HEADER,
|
||||
msgVersion: 1,
|
||||
msgVersion: HEADER_VERSION_CC0,
|
||||
// HEADER хранит исходный регистр неизменяемого имени из Solana/Arweave.
|
||||
// Нормализация нужна только для уникальности и имени самой цепочки.
|
||||
bodyBytes: makeHeaderBodyBytes({ login: registeredLogin, initialBlockchainKey32 }),
|
||||
|
||||
@@ -121,9 +121,17 @@ function parseTechBody(subType, body, frame) {
|
||||
const reader = new Reader(body);
|
||||
if (subType === 0) {
|
||||
const magic = reader.text(5, 'HEADER magic');
|
||||
if (magic !== 'SHiNE') throw new Error('Неправильная сигнатура HEADER');
|
||||
const login = reader.textU8('HEADER login');
|
||||
let license = null;
|
||||
if (frame.version === 2) {
|
||||
const marker = reader.text(15, 'HEADER license');
|
||||
if (marker !== 'license:CC0-1.0') throw new Error('Неподдерживаемая лицензия HEADER');
|
||||
license = 'CC0-1.0';
|
||||
}
|
||||
const initialBlockchainKey = bytesToBase64Url(reader.raw(32, 'initialBlockchainKey32'));
|
||||
return { kind: 'header', magic, login, initialBlockchainKey };
|
||||
if (reader.remaining() !== 0) throw new Error('Неожиданные данные после HEADER');
|
||||
return { kind: 'header', magic, login, license, initialBlockchainKey };
|
||||
}
|
||||
if (subType === 1) {
|
||||
const line = parseLinePrefix(reader);
|
||||
@@ -230,7 +238,10 @@ function parseStatusBody(subType, body) {
|
||||
}
|
||||
|
||||
function parseBody(type, subType, version, body, frame) {
|
||||
if (version !== 1) return { kind: 'unsupported_version', rawBodyLength: body.length };
|
||||
// Only TECH HEADER subtype 0 has a second version; all other records stay v1.
|
||||
if (version !== 1 && !(type === 0 && subType === 0 && version === 2)) {
|
||||
return { kind: 'unsupported_version', rawBodyLength: body.length };
|
||||
}
|
||||
if (type === 0) return parseTechBody(subType, body, frame);
|
||||
if (type === 1) return parseTextBody(subType, body);
|
||||
if (type === 2) return parseReactionBody(subType, body);
|
||||
|
||||
@@ -19,6 +19,7 @@ import {
|
||||
computeTorrentV2InfoHash,
|
||||
computeTorrentV2PieceRoot,
|
||||
} from './torrent-v2-service.js';
|
||||
import { resolveUserFileUrl, updatedUserFileUrlAfterError } from './user-file-server-service.js';
|
||||
|
||||
export const DM_FILE_CHUNK_BYTES = 8 * 1024 * 1024;
|
||||
const LEGACY_DM_FILE_CHUNK_BYTES = TORRENT_V2_PIECE_BYTES;
|
||||
@@ -29,7 +30,6 @@ const MANIFEST_VERSION = 2;
|
||||
const MANIFEST_SCHEME = 'SHINE-DM-CHUNKED-AES-256-GCM';
|
||||
const R2_MANIFEST_VERSION = 3;
|
||||
const R2_MANIFEST_SCHEME = 'SHINE-DM-R2-AES-256-GCM';
|
||||
const DM_R2_PUBLIC_BASE = 'https://dm-files.shineup.me';
|
||||
const DM_R2_OBJECT_MAX_BYTES = DM_FILE_CHUNK_BYTES + 16;
|
||||
const DM_R2_FILE_MAX_BYTES = 500 * 1024 * 1024;
|
||||
const ROOT_IV_TOKEN = 0xffffffffffffffffn;
|
||||
@@ -79,7 +79,7 @@ async function readErrorMessage(response) {
|
||||
function objectUrl(serverBase, id) {
|
||||
const base = String(serverBase || '').replace(/\/$/, '');
|
||||
// Старые вложения читаем с access-сервера, новые — с отдельного домена R2.
|
||||
const path = new URL(base).hostname === 'dm-files.shineup.me' ? '' : '/dm-files';
|
||||
const path = new URL(base).hostname.startsWith('dm-files.') ? '' : '/dm-files';
|
||||
return `${base}${path}/${encodeURIComponent(String(id || ''))}`;
|
||||
}
|
||||
|
||||
@@ -175,7 +175,13 @@ async function uploadEncryptedObject(bytes, context) {
|
||||
throw new Error(detail || `R2 DM prepare: HTTP ${prepare.status}`);
|
||||
}
|
||||
const answer = await prepare.json();
|
||||
const url = `${DM_R2_PUBLIC_BASE}/${fileId}`;
|
||||
// Сервер prepare — владелец R2, ссылка нужна лишь для HEAD проверки 412.
|
||||
const url = String(answer.fileUrl || '').trim();
|
||||
const fileUrl = new URL(url);
|
||||
if (fileUrl.protocol !== 'https:' || fileUrl.username || fileUrl.password || fileUrl.search
|
||||
|| fileUrl.hash || !fileUrl.pathname.endsWith(`/${fileId}`)) {
|
||||
throw new Error('Сервер вернул некорректный адрес R2');
|
||||
}
|
||||
if (!answer.exists) {
|
||||
if (!answer.uploadUrl || !answer.requiredHeaders) throw new Error('Сервер не вернул параметры загрузки R2');
|
||||
let result;
|
||||
@@ -203,7 +209,7 @@ async function uploadEncryptedObject(bytes, context) {
|
||||
async function fetchVerifiedObject(url, expectedId) {
|
||||
let response;
|
||||
try {
|
||||
response = await fetch(url, { method: 'GET' });
|
||||
response = await fetch(url, { method: 'GET', credentials: 'omit', referrerPolicy: 'no-referrer' });
|
||||
} catch (error) {
|
||||
throw new Error(`Не удалось скачать зашифрованные данные: ${error?.message || 'network error'}`);
|
||||
}
|
||||
@@ -297,6 +303,7 @@ export async function encryptAndUploadDmFile({
|
||||
chunkSize: DM_FILE_CHUNK_BYTES, chunkCount,
|
||||
kind: String(kind || 'file') === 'voice' ? 'voice' : 'file',
|
||||
durationMs: Math.max(0, Math.floor(Number(durationMs || 0))),
|
||||
uploadedAtMs: Date.now(),
|
||||
};
|
||||
} finally {
|
||||
manifestBytes.fill(0);
|
||||
@@ -310,10 +317,52 @@ export async function encryptAndUploadDmFile({
|
||||
}
|
||||
}
|
||||
|
||||
/** Получение зашифрованного манифеста v3 без BitTorrent-метаданных. */
|
||||
export const DM_FILE_RETENTION_MS = 14 * 24 * 60 * 60 * 1000;
|
||||
|
||||
export function isDmFileExpired(attachment, messageTimestampMs = 0) {
|
||||
// v1/v2: legacy-хранилище не имеет 14-дневного R2 lifecycle.
|
||||
if (Number(attachment?.version || 1) < 3) return false;
|
||||
const timestamp = Number(attachment?.uploadedAtMs || attachment?.messageTimestampMs || messageTimestampMs || 0);
|
||||
return Number.isFinite(timestamp) && timestamp > 0 && Date.now() - timestamp >= DM_FILE_RETENTION_MS;
|
||||
}
|
||||
|
||||
function assertDmFileNotExpired(attachment) {
|
||||
if (isDmFileExpired(attachment)) throw new Error('DM_FILE_EXPIRED');
|
||||
}
|
||||
|
||||
function v3ObjectUrl(base, id) {
|
||||
return `${String(base || '').replace(/\/$/, '')}/${encodeURIComponent(String(id || ''))}`;
|
||||
}
|
||||
|
||||
async function v3RootUrl(attachment) {
|
||||
// Для исторических v3 URL оставляем как источник; новый v3 содержит только hash/id.
|
||||
if (attachment?.url) return String(attachment.url);
|
||||
if (!attachment?.senderLogin) throw new Error('Неизвестен отправитель DM-файла');
|
||||
return resolveUserFileUrl({ login: attachment.senderLogin, id: attachment.id, kind: 'dm' });
|
||||
}
|
||||
|
||||
async function fetchV3ObjectWithRefresh(url, id, attachment) {
|
||||
try {
|
||||
return { bytes: await fetchVerifiedObject(url, id), url };
|
||||
} catch (error) {
|
||||
if (!attachment?.senderLogin || String(error?.message || '').includes('SHA-256')) throw error;
|
||||
let updated;
|
||||
try {
|
||||
updated = await updatedUserFileUrlAfterError({
|
||||
login: attachment.senderLogin, id, kind: 'dm', previousUrl: url,
|
||||
});
|
||||
} catch { throw error; }
|
||||
if (!updated) throw error;
|
||||
return { bytes: await fetchVerifiedObject(updated, id), url: updated };
|
||||
}
|
||||
}
|
||||
|
||||
/** Получение зашифрованного манифеста v3 без BitTorrent-метаданных. */
|
||||
async function loadV3RootManifest(attachment) {
|
||||
const id = String(attachment?.id || '').trim();
|
||||
const url = String(attachment?.url || '').trim();
|
||||
assertDmFileNotExpired(attachment);
|
||||
const url = await v3RootUrl(attachment);
|
||||
const key = base64UrlToBytes(String(attachment?.keyB64Url || ''));
|
||||
const ivPrefix = base64UrlToBytes(String(attachment?.ivPrefixB64Url || ''));
|
||||
if (!id || !url || key.byteLength !== 32 || ivPrefix.byteLength !== 4) {
|
||||
@@ -325,7 +374,8 @@ async function loadV3RootManifest(attachment) {
|
||||
const iv = rootIv(ivPrefix);
|
||||
const aad = rootAad(ivPrefix);
|
||||
try {
|
||||
encrypted = await fetchVerifiedObject(url, id);
|
||||
const found = await fetchV3ObjectWithRefresh(url, id, attachment);
|
||||
encrypted = found.bytes;
|
||||
plain = await decryptBytesAesGcm(encrypted, key, iv, aad);
|
||||
const manifest = decodeJson(plain);
|
||||
const size = Number(manifest?.fileSize);
|
||||
@@ -346,7 +396,7 @@ async function loadV3RootManifest(attachment) {
|
||||
throw new Error('Повреждены ссылки на части файла');
|
||||
}
|
||||
}
|
||||
return { manifest, key, ivPrefix, serverBase: objectBaseFromUrl(url) };
|
||||
return { manifest, key, ivPrefix, serverBase: objectBaseFromUrl(found.url) };
|
||||
} catch (error) {
|
||||
key.fill(0); ivPrefix.fill(0);
|
||||
throw error;
|
||||
@@ -363,7 +413,9 @@ async function decryptV3ToSink(attachment, sink, { onProgress = null } = {}) {
|
||||
let processedBytes = 0;
|
||||
try {
|
||||
for (const item of context.manifest.chunks) {
|
||||
const encrypted = await fetchVerifiedObject(objectUrl(context.serverBase, item.id), item.id);
|
||||
const found = await fetchV3ObjectWithRefresh(v3ObjectUrl(context.serverBase, item.id), item.id, attachment);
|
||||
const encrypted = found.bytes;
|
||||
context.serverBase = objectBaseFromUrl(found.url);
|
||||
const iv = chunkIv(context.ivPrefix, item.i);
|
||||
const aad = chunkAad(context.ivPrefix, item.i);
|
||||
let plain = null;
|
||||
@@ -625,6 +677,7 @@ function saveBlob(blob, name) {
|
||||
}
|
||||
|
||||
export async function decryptDmFileToBlob(attachment = {}, options = {}) {
|
||||
assertDmFileNotExpired(attachment);
|
||||
if (Number(attachment?.version || 1) < 2) {
|
||||
const plain = await downloadV1(attachment);
|
||||
const blob = new Blob([plain], { type: String(attachment?.mime || 'application/octet-stream') });
|
||||
@@ -639,6 +692,7 @@ export async function decryptDmFileToBlob(attachment = {}, options = {}) {
|
||||
}
|
||||
|
||||
export async function downloadAndDecryptDmFile(attachment = {}, { onProgress = null } = {}) {
|
||||
assertDmFileNotExpired(attachment);
|
||||
if (Number(attachment?.version || 1) < 2) {
|
||||
const plain = await downloadV1(attachment);
|
||||
const blob = new Blob([plain], { type: String(attachment?.mime || 'application/octet-stream') });
|
||||
|
||||
@@ -107,7 +107,7 @@ function normalizeFileAttachment(fields = {}) {
|
||||
const mime = decodeFileField(fields.mime || '').trim() || 'application/octet-stream';
|
||||
const size = Number(fields.size || 0);
|
||||
const encryptedSize = Number(fields.encsize || 0);
|
||||
if (!id || !url || !keyB64Url || !Number.isFinite(size) || size < 0) return null;
|
||||
if (!id || (version < 3 && !url) || !keyB64Url || !Number.isFinite(size) || size < 0) return null;
|
||||
|
||||
if (version >= 2) {
|
||||
const ivPrefixB64Url = String(fields.ivp || '').trim();
|
||||
@@ -134,6 +134,7 @@ function normalizeFileAttachment(fields = {}) {
|
||||
} : {}),
|
||||
kind,
|
||||
durationMs,
|
||||
uploadedAtMs: Number(fields.at || 0) || 0,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -161,7 +162,7 @@ export function buildDmFileTechBlock(attachment = {}) {
|
||||
const keyB64Url = String(attachment?.keyB64Url || '').trim();
|
||||
const size = Math.max(0, Math.floor(Number(attachment?.size || 0)));
|
||||
const encryptedSize = Math.max(0, Math.floor(Number(attachment?.encryptedSize || 0)));
|
||||
if (!id || !url || !keyB64Url) throw new Error('Не хватает данных для технического блока файла');
|
||||
if (!id || (version < 3 && !url) || !keyB64Url) throw new Error('Не хватает данных для технического блока файла');
|
||||
const name = encodeURIComponent(String(attachment?.name || 'file'));
|
||||
const mime = encodeURIComponent(String(attachment?.mime || 'application/octet-stream'));
|
||||
const encodedUrl = encodeURIComponent(url);
|
||||
@@ -176,7 +177,11 @@ export function buildDmFileTechBlock(attachment = {}) {
|
||||
const kind = String(attachment?.kind || 'file') === 'voice' ? 'voice' : 'file';
|
||||
const durationMs = Math.max(0, Math.floor(Number(attachment?.durationMs || 0)));
|
||||
const torrentFields = version === 2 ? `;th=${torrentHash};pr=${piecesRoot}` : '';
|
||||
return `<S:file;v=${version};id=${id};url=${encodedUrl};key=${keyB64Url};ivp=${ivPrefix};name=${name};mime=${mime};size=${size};encsize=${encryptedSize};chunk=${chunkSize};chunks=${chunkCount}${torrentFields};kind=${kind};dur=${durationMs}>`;
|
||||
// Новые DM v3: в E2EE передаём идентификаторы и ключи, а домен — через senderLogin.
|
||||
// URL ранее созданных v3 и legacy v2/v1 продолжаем читать без изменения.
|
||||
const urlField = version >= 3 ? '' : `;url=${encodedUrl}`;
|
||||
const uploadTime = version >= 3 ? `;at=${Math.max(0, Math.floor(Number(attachment?.uploadedAtMs || 0)))}` : '';
|
||||
return `<S:file;v=${version};id=${id}${urlField};key=${keyB64Url};ivp=${ivPrefix};name=${name};mime=${mime};size=${size};encsize=${encryptedSize};chunk=${chunkSize};chunks=${chunkCount}${torrentFields};kind=${kind};dur=${durationMs}${uploadTime}>`;
|
||||
}
|
||||
|
||||
const ivB64Url = String(attachment?.ivB64Url || '').trim();
|
||||
|
||||
@@ -9,6 +9,7 @@ import {
|
||||
resolveShineServerForUserLogin,
|
||||
} from './shine-server-resolver.js';
|
||||
import { state } from '../state.js';
|
||||
import { resolveUserFileUrl } from './user-file-server-service.js';
|
||||
|
||||
const ACCESS_SERVER_CACHE_TTL_MS = 60_000;
|
||||
const accessServerCache = new Map();
|
||||
@@ -96,7 +97,10 @@ export async function resolvePublicFileUrl({
|
||||
solanaEndpoint,
|
||||
fallbackServerLogin = '',
|
||||
} = {}) {
|
||||
if (pr) return publicR2Url(pr);
|
||||
if (pr) {
|
||||
if (!validatePublicPiecesRoot(pr)) throw new Error('Некорректный Pieces Root');
|
||||
return resolveUserFileUrl({ login: authorLogin, id: pr, kind: 'public' });
|
||||
}
|
||||
// Сначала – сервер, к которому подключены сейчас (у большинства читателей он же сервер автора),
|
||||
// затем сервер сборки по умолчанию; только потом ищем сервер автора через его PDA.
|
||||
const nearbyBases = [...new Set([state.entrySettings?.shineServerHttp, DEFAULT_SHINE_SERVER_HTTP]
|
||||
|
||||
@@ -0,0 +1,97 @@
|
||||
import { state } from '../state.js';
|
||||
import { DEFAULT_SHINE_SERVER_HTTP } from './shine-server-resolver.js';
|
||||
|
||||
// Кэш только в оперативной памяти PWA, без TTL и IndexedDB.
|
||||
// Повторный API-запрос — лишь при ошибке файла, не чаще 1 раза в час для пользователя.
|
||||
export const SERVER_LOOKUP_COOLDOWN_MS = 60 * 60 * 1000;
|
||||
const cached = new Map();
|
||||
const pending = new Map();
|
||||
|
||||
function apiBase() {
|
||||
const raw = String(state.entrySettings?.shineServerHttp || DEFAULT_SHINE_SERVER_HTTP).trim();
|
||||
const url = new URL(raw);
|
||||
if (!['http:', 'https:'].includes(url.protocol)) throw new Error('Invalid access-server protocol');
|
||||
return url.origin;
|
||||
}
|
||||
|
||||
function normalizeLogin(login) {
|
||||
const value = String(login || '').trim().toLowerCase();
|
||||
if (!value || !/^[a-z0-9_.-]+@[a-z0-9_.-]+$/.test(value)) throw new Error('Invalid attachment author login');
|
||||
return value;
|
||||
}
|
||||
|
||||
function normalizeServerResponse(value) {
|
||||
const serverLogin = String(value?.serverLogin || '').trim().toLowerCase();
|
||||
const raw = String(value?.serverUrl || '').trim();
|
||||
if (!serverLogin || !raw) throw new Error('Access-server lookup returned no route');
|
||||
const url = new URL(/^[a-z]+:\/\//i.test(raw) ? raw : `https://${raw}`);
|
||||
// Основное правило федерации — именно DNS access-сервера, без его порта и пути.
|
||||
// Не допускаем произвольных URL/путей и внедрения имени узла в файловый домен.
|
||||
if (!['http:', 'https:', 'ws:', 'wss:'].includes(url.protocol) || url.username || url.password
|
||||
|| !/^[a-z0-9-]+(?:\.[a-z0-9-]+)+$/i.test(url.hostname)) {
|
||||
throw new Error('Invalid access-server domain for file storage');
|
||||
}
|
||||
return { serverLogin, serverUrl: `https://${url.hostname}`, hostname: url.hostname };
|
||||
}
|
||||
|
||||
async function lookup(login, base) {
|
||||
const response = await fetch(`${base}/api/files/user-server?login=${encodeURIComponent(login)}`, {
|
||||
method: 'GET', cache: 'no-store', credentials: 'omit', referrerPolicy: 'no-referrer',
|
||||
});
|
||||
if (!response.ok) throw new Error(`Access-server lookup HTTP ${response.status}`);
|
||||
return normalizeServerResponse(await response.json());
|
||||
}
|
||||
|
||||
/** Читает из RAM; одновременные запросы одного пользователя объединяются. */
|
||||
export async function getUserFileServer(login) {
|
||||
const clean = normalizeLogin(login);
|
||||
const base = apiBase();
|
||||
const key = `${base}|${clean}`;
|
||||
if (cached.has(key)) return cached.get(key).value;
|
||||
if (pending.has(key)) return pending.get(key);
|
||||
const promise = lookup(clean, base).then((value) => {
|
||||
cached.set(key, { value, lastLookupMs: Date.now() });
|
||||
return value;
|
||||
}).finally(() => pending.delete(key));
|
||||
pending.set(key, promise);
|
||||
return promise;
|
||||
}
|
||||
|
||||
/** Ошибка файла: один запрос на пользователя в час, даже если одновременно упали сотни файлов. */
|
||||
export async function refreshUserFileServerOnError(login) {
|
||||
const clean = normalizeLogin(login);
|
||||
const base = apiBase();
|
||||
const key = `${base}|${clean}`;
|
||||
if (pending.has(key)) return pending.get(key);
|
||||
const entry = cached.get(key);
|
||||
if (!entry) return getUserFileServer(clean);
|
||||
if (Date.now() - entry.lastLookupMs < SERVER_LOOKUP_COOLDOWN_MS) return entry.value;
|
||||
// Отмечаем попытку ДО fetch: неудачные запросы тоже ограничены часом.
|
||||
entry.lastLookupMs = Date.now();
|
||||
const promise = lookup(clean, base).then((value) => {
|
||||
cached.set(key, { value, lastLookupMs: Date.now() });
|
||||
return value;
|
||||
}).finally(() => pending.delete(key));
|
||||
pending.set(key, promise);
|
||||
return promise;
|
||||
}
|
||||
|
||||
/** Для тестов / выхода из аккаунта. В постоянное хранилище не записывает. */
|
||||
export function clearUserFileServerCache() { cached.clear(); pending.clear(); }
|
||||
|
||||
export function userFileObjectUrl(server, id, kind = 'public') {
|
||||
if (kind !== 'public' && kind !== 'dm') throw new Error('Invalid file storage kind');
|
||||
const host = String(server?.hostname || '');
|
||||
if (!/^[a-z0-9-]+(?:\.[a-z0-9-]+)+$/i.test(host)) throw new Error('Missing file server domain');
|
||||
return `https://${kind === 'dm' ? 'dm-files' : 'files'}.${host}/${encodeURIComponent(String(id || ''))}`;
|
||||
}
|
||||
|
||||
export async function resolveUserFileUrl({ login, id, kind = 'public' }) {
|
||||
return userFileObjectUrl(await getUserFileServer(login), id, kind);
|
||||
}
|
||||
|
||||
/** Возвращает обновлённый URL только если адрес действительно изменился. */
|
||||
export async function updatedUserFileUrlAfterError({ login, id, kind = 'public', previousUrl }) {
|
||||
const next = userFileObjectUrl(await refreshUserFileServerOnError(login), id, kind);
|
||||
return next === previousUrl ? null : next;
|
||||
}
|
||||
@@ -42,7 +42,7 @@ test('avatar R2 upload reuses signed public PR prepare; no avatar-specific endpo
|
||||
assert.match(service, /\/api\/files\/prepare/);
|
||||
assert.doesNotMatch(service, /\/api\/avatars\/prepare/);
|
||||
assert.doesNotMatch(service, /avatars\/\$\{/);
|
||||
assert.match(source('js/components/avatar-image.js'), /img\.src = avatarR2Url\(expectedPr\)/);
|
||||
assert.match(source('js/pages/network/graph-canvas.js'), /avatarR2Url\(pr\)/);
|
||||
assert.match(source('js/pages/network-legacy/force-graph.js'), /avatarR2Url\(pr\)/);
|
||||
assert.match(source('js/components/avatar-image.js'), /resolvePublicFileUrl\(\{ pr: expectedPr, authorLogin \}\)/);
|
||||
assert.match(source('js/pages/network/graph-canvas.js'), /resolvePublicFileUrl\(\{ pr, authorLogin \}\)/);
|
||||
assert.match(source('js/pages/network-legacy/force-graph.js'), /resolvePublicFileUrl\(\{ pr, authorLogin \}\)/);
|
||||
});
|
||||
|
||||
@@ -0,0 +1,95 @@
|
||||
import test from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import { state } from '../js/state.js';
|
||||
import {
|
||||
clearUserFileServerCache, getUserFileServer, resolveUserFileUrl,
|
||||
refreshUserFileServerOnError, updatedUserFileUrlAfterError, userFileObjectUrl,
|
||||
SERVER_LOOKUP_COOLDOWN_MS,
|
||||
} from '../js/services/user-file-server-service.js';
|
||||
import { buildDmFileTechBlock, parseDmTechBlocks } from '../js/services/dm-tech-blocks.js';
|
||||
import { DM_FILE_RETENTION_MS, isDmFileExpired } from '../js/services/dm-file-service.js';
|
||||
import { encodePublicPiecesRoot } from '../js/services/public-pieces-root.js';
|
||||
|
||||
const login = 'anna@shine';
|
||||
const id = encodePublicPiecesRoot(new Uint8Array(32).fill(7));
|
||||
|
||||
// Чистим RAM-кэш между сценариями: без IndexedDB, localStorage и таймеров.
|
||||
test('федерация: единый API, один параллельный запрос, правильные файловые домены', async () => {
|
||||
clearUserFileServerCache();
|
||||
state.entrySettings.shineServerHttp = 'https://reader.example.com';
|
||||
const originalFetch = globalThis.fetch;
|
||||
const requests = [];
|
||||
globalThis.fetch = async (url) => {
|
||||
requests.push(url);
|
||||
return { ok: true, json: async () => ({ serverLogin: 'node-b@shine', serverUrl: 'https://node-b.example.net/ws' }) };
|
||||
};
|
||||
try {
|
||||
const results = await Promise.all(Array.from({ length: 12 }, () => getUserFileServer(login)));
|
||||
assert.equal(requests.length, 1);
|
||||
assert.equal(requests[0], 'https://reader.example.com/api/files/user-server?login=anna%40shine');
|
||||
assert.equal(results[0].hostname, 'node-b.example.net');
|
||||
assert.equal(await resolveUserFileUrl({ login, id }), `https://files.node-b.example.net/${id}`);
|
||||
assert.equal(await resolveUserFileUrl({ login, id, kind: 'dm' }), `https://dm-files.node-b.example.net/${id}`);
|
||||
assert.equal(requests.length, 1);
|
||||
} finally { globalThis.fetch = originalFetch; clearUserFileServerCache(); }
|
||||
});
|
||||
|
||||
test('федерация: Solana server_address может быть WSS с портом и путём', async () => {
|
||||
clearUserFileServerCache();
|
||||
state.entrySettings.shineServerHttp = 'https://reader.example.com';
|
||||
const savedFetch = globalThis.fetch;
|
||||
globalThis.fetch = async () => ({ ok: true, json: async () => ({
|
||||
serverLogin: 'node@shine', serverUrl: 'wss://node.example.com:8443/ws',
|
||||
}) });
|
||||
try {
|
||||
assert.equal(await resolveUserFileUrl({ login, id, kind: 'public' }), `https://files.node.example.com/${id}`);
|
||||
assert.equal(await resolveUserFileUrl({ login, id, kind: 'dm' }), `https://dm-files.node.example.com/${id}`);
|
||||
} finally { globalThis.fetch = savedFetch; clearUserFileServerCache(); }
|
||||
});
|
||||
|
||||
test('федерация: проверка при ошибке не чаще одного раза в час и только при смене адреса', async () => {
|
||||
clearUserFileServerCache();
|
||||
const originalFetch = globalThis.fetch;
|
||||
const originalNow = Date.now;
|
||||
let now = 100_000_000;
|
||||
let calls = 0;
|
||||
let address = 'server-a.example.com';
|
||||
Date.now = () => now;
|
||||
globalThis.fetch = async () => { calls++; return { ok: true, json: async () => ({ serverLogin: 's@shine', serverUrl: address }) }; };
|
||||
try {
|
||||
const first = userFileObjectUrl(await getUserFileServer(login), id);
|
||||
assert.equal(calls, 1);
|
||||
assert.equal(await updatedUserFileUrlAfterError({ login, id, previousUrl: first }), null);
|
||||
assert.equal(calls, 1);
|
||||
now += SERVER_LOOKUP_COOLDOWN_MS + 1;
|
||||
address = 'server-b.example.com';
|
||||
const responses = await Promise.all(Array.from({ length: 12 }, () => refreshUserFileServerOnError(login)));
|
||||
assert.equal(calls, 2);
|
||||
assert.equal(responses[0].hostname, 'server-b.example.com');
|
||||
assert.equal(await updatedUserFileUrlAfterError({ login, id, previousUrl: first }), `https://files.server-b.example.com/${id}`);
|
||||
assert.equal(calls, 2);
|
||||
} finally { Date.now = originalNow; globalThis.fetch = originalFetch; clearUserFileServerCache(); }
|
||||
});
|
||||
|
||||
test('DM v3: новые сообщения не содержат адреса, прежний v3 с URL продолжает читаться', () => {
|
||||
const base = { version: 3, id, url: `https://dm-files.shineup.me/${id}`,
|
||||
keyB64Url: 'AQID', ivPrefixB64Url: 'AQID',
|
||||
name: 'photo.png', mime: 'image/png', size: 123, encryptedSize: 139,
|
||||
chunkSize: 8388608, chunkCount: 1, kind: 'file', uploadedAtMs: 1005000 };
|
||||
const text = buildDmFileTechBlock(base);
|
||||
assert.doesNotMatch(text, /;url=/);
|
||||
const parsed = parseDmTechBlocks(text).fileAttachment;
|
||||
assert.equal(parsed.id, id);
|
||||
assert.equal(parsed.uploadedAtMs, base.uploadedAtMs);
|
||||
assert.equal(parsed.url, '');
|
||||
const oldText = text.replace(`;id=${id}`, `;id=${id};url=${encodeURIComponent(base.url)}`);
|
||||
assert.equal(parseDmTechBlocks(oldText).fileAttachment.url, base.url);
|
||||
});
|
||||
|
||||
test('R2 DM v3: после 14 дней не пробуем скачивание; старые legacy v2 без R2 TTL', () => {
|
||||
const now = Date.now();
|
||||
assert.equal(isDmFileExpired({ version: 3, uploadedAtMs: now - DM_FILE_RETENTION_MS - 1 }), true);
|
||||
assert.equal(isDmFileExpired({ version: 3, uploadedAtMs: now - DM_FILE_RETENTION_MS + 60_000 }), false);
|
||||
assert.equal(isDmFileExpired({ version: 3, messageTimestampMs: now - DM_FILE_RETENTION_MS - 1 }), true);
|
||||
assert.equal(isDmFileExpired({ version: 2, messageTimestampMs: now - 2 * DM_FILE_RETENTION_MS }), false);
|
||||
});
|
||||
@@ -0,0 +1,71 @@
|
||||
import test from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import fs from 'node:fs';
|
||||
import vm from 'node:vm';
|
||||
|
||||
const read = path => fs.readFileSync(new URL(path, import.meta.url), 'utf8');
|
||||
const auth = read('../js/services/auth-service.js');
|
||||
const inspector = read('../js/services/blockchain-entry-inspector.js');
|
||||
const source = auth.split('function makeHeaderBodyBytes(')[1]?.split('\nfunction makeUserParamBodyBytes(')[0];
|
||||
assert.ok(source, 'production makeHeaderBodyBytes must exist');
|
||||
const utf8 = value => new TextEncoder().encode(value);
|
||||
const encode = vm.runInNewContext(`function makeHeaderBodyBytes(${source}\nmakeHeaderBodyBytes`, {
|
||||
utf8Bytes: utf8,
|
||||
int8Byte: value => Uint8Array.of(value),
|
||||
concatBytes: (...parts) => Uint8Array.from(parts.flatMap(part => Array.from(part))),
|
||||
Uint8Array,
|
||||
HEADER_LICENSE_FIELD_CC0: 'license:CC0-1.0',
|
||||
});
|
||||
|
||||
test('client writes HEADER v2 as SHiNE → login → literal license → key', () => {
|
||||
const key = Uint8Array.from({ length: 32 }, (_, i) => i + 1);
|
||||
const login = 'Alice@shine';
|
||||
const body = encode({ login, initialBlockchainKey32: key });
|
||||
const loginBytes = utf8(login);
|
||||
const expected = Uint8Array.from([
|
||||
...utf8('SHiNE'), loginBytes.length, ...loginBytes,
|
||||
...utf8('license:CC0-1.0'), ...key,
|
||||
]);
|
||||
assert.deepEqual(Array.from(body), Array.from(expected));
|
||||
assert.match(auth, /msgSubType: MSG_SUBTYPE_TECH_HEADER,\s*msgVersion: HEADER_VERSION_CC0/);
|
||||
assert.match(auth, /export const HEADER_VERSION_CC0 = 2/);
|
||||
});
|
||||
|
||||
test('inspector decodes both v1 and v2 and rejects invalid v2 license/order', () => {
|
||||
const stripped = inspector.replace(/^import .+;\s*$/gm, '').replace(/^export /gm, '');
|
||||
const inspect = vm.runInNewContext(`${stripped}\nparseShineFrame`, {
|
||||
TextDecoder, DataView, Uint8Array, BigInt,
|
||||
bytesToBase64Url: bytes => Buffer.from(bytes).toString('base64url'),
|
||||
Buffer,
|
||||
});
|
||||
const key = Uint8Array.from({ length: 32 }, (_, i) => i + 1);
|
||||
const login = utf8('Alice@shine');
|
||||
const prefix = Uint8Array.from([...utf8('SHiNE'), login.length, ...login]);
|
||||
const bodyV1 = Uint8Array.from([...prefix, ...key]);
|
||||
const bodyV2 = Uint8Array.from([...prefix, ...utf8('license:CC0-1.0'), ...key]);
|
||||
const frameFor = (version, body) => {
|
||||
const frame = new Uint8Array(88 + body.length);
|
||||
const view = new DataView(frame.buffer);
|
||||
view.setUint16(0, 1, false); // frameCode
|
||||
view.setInt32(66, frame.length, false);
|
||||
view.setInt32(70, 0, false); // blockNumber
|
||||
view.setBigInt64(74, 0n, false);
|
||||
view.setUint16(82, 0, false); // type TECH
|
||||
view.setUint16(84, 0, false); // subtype HEADER
|
||||
view.setUint16(86, version, false);
|
||||
frame.set(body, 88);
|
||||
return frame;
|
||||
};
|
||||
const old = inspect(frameFor(1, bodyV1));
|
||||
assert.equal(old.body.kind, 'header');
|
||||
assert.equal(old.body.license, null);
|
||||
const current = inspect(frameFor(2, bodyV2));
|
||||
assert.equal(current.body.kind, 'header');
|
||||
assert.equal(current.body.license, 'CC0-1.0');
|
||||
assert.equal(current.body.initialBlockchainKey, Buffer.from(key).toString('base64url'));
|
||||
assert.throws(() => inspect(frameFor(2, Uint8Array.from([...prefix, ...key, ...utf8('license:CC0-1.0')]))));
|
||||
const invalid = bodyV2.slice();
|
||||
invalid[prefix.length + 8] = 'X'.charCodeAt(0);
|
||||
assert.throws(() => inspect(frameFor(2, invalid)));
|
||||
assert.throws(() => inspect(frameFor(2, new Uint8Array(0))));
|
||||
});
|
||||
@@ -0,0 +1,51 @@
|
||||
import test from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import fs from 'node:fs';
|
||||
import vm from 'node:vm';
|
||||
|
||||
const read = file => fs.readFileSync(new URL(file, import.meta.url), 'utf8');
|
||||
const auth = read('../js/services/auth-service.js');
|
||||
const register = read('../js/pages/register-view.js');
|
||||
const termsPath = new URL('../js/pages/registration-terms-view.js', import.meta.url);
|
||||
const hasRegistrationTerms = fs.existsSync(termsPath);
|
||||
const terms = hasRegistrationTerms ? read('../js/pages/registration-terms-view.js') : '';
|
||||
const router = read('../js/router.js');
|
||||
const email = read('../js/pages/registration-email-view.js');
|
||||
const paid = read('../js/pages/registration-payment-view.js');
|
||||
|
||||
// Исполняем именно production-сериализатор, а не дублируем алгоритм тестовым кодом.
|
||||
const makeBytesFunction = auth.split('function makeHeaderBodyBytes(')[1]?.split('\nfunction makeUserParamBodyBytes(')[0];
|
||||
assert.ok(makeBytesFunction);
|
||||
const context = {
|
||||
utf8Bytes: value => new TextEncoder().encode(value),
|
||||
int8Byte: value => Uint8Array.of(value),
|
||||
concatBytes: (...parts) => Uint8Array.from(parts.flatMap(part => Array.from(part))),
|
||||
Uint8Array,
|
||||
HEADER_LICENSE_FIELD_CC0: 'license:CC0-1.0',
|
||||
};
|
||||
const makeHeaderBodyBytes = vm.runInNewContext(`function makeHeaderBodyBytes(${makeBytesFunction}\nmakeHeaderBodyBytes`, context);
|
||||
|
||||
test('HEADER v2 places literal license:CC0-1.0 before the initial key', () => {
|
||||
const key = Uint8Array.from({ length: 32 }, (_, n) => n + 1);
|
||||
const result = makeHeaderBodyBytes({ login: 'Alice@shine', initialBlockchainKey32: key });
|
||||
const login = new TextEncoder().encode('Alice@shine');
|
||||
assert.equal(new TextDecoder().decode(result.slice(0,5)), 'SHiNE');
|
||||
assert.equal(result[5], login.length);
|
||||
assert.deepEqual(Array.from(result.slice(6, 6+login.length)), Array.from(login));
|
||||
assert.equal(new TextDecoder().decode(result.slice(6+login.length, 6+login.length+15)), 'license:CC0-1.0');
|
||||
assert.deepEqual(Array.from(result.slice(6+login.length+15)), Array.from(key));
|
||||
assert.equal(result.length, 5 + 1 + login.length + 15 + 32);
|
||||
assert.match(auth, /msgSubType: MSG_SUBTYPE_TECH_HEADER,\s*msgVersion: HEADER_VERSION_CC0/);
|
||||
assert.match(auth, /export const HEADER_VERSION_CC0 = 2/);
|
||||
});
|
||||
|
||||
test('free and paid registration both require accepted documents before any registration operation', { skip: !hasRegistrationTerms }, () => {
|
||||
assert.match(register, /navigate\('registration-terms-view'\)/);
|
||||
assert.match(terms, /draft\.termsAccepted = true/);
|
||||
assert.match(terms, /draft\.flowType === 'free' \? 'registration-email-view' : 'registration-payment-view'/);
|
||||
assert.match(email, /if \(!state\.registrationDraft\.termsAccepted\)/);
|
||||
assert.match(paid, /if \(!state\.registrationDraft\.termsAccepted\)/);
|
||||
assert.match(router, /\['registration-terms-view', 'register\/terms'\]/);
|
||||
assert.match(terms, /CC0_LEGAL_CODE_URL/);
|
||||
assert.match(terms, /DOCUMENT_COUNT = 4/);
|
||||
});
|
||||
Reference in New Issue
Block a user