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);
|
||||
})
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
Reference in New Issue
Block a user