aidar/SHiNE-server
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Убрал long-press меню каналов и обновил deploy-проверку sudo

Browse Source
This commit is contained in:
AidarKC
2026-05-31 19:30:36 +04:00
parent 1b0e1cf1d4
commit 5899bd2f77
25 changed files with 3343 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shine-UI/js/components/toolbar.js
+1 -94
View File
@@ -9,12 +9,6 @@ const ITEMS = [
{ pageId: 'notifications-view', label: 'Уведомления', icon: '🔔' },
{ pageId: 'profile-view', label: 'Профиль', icon: '👤' },
];
const CHANNEL_HOLD_MS = 260;
const CHANNEL_MODES = Object.freeze([
{ key: 'feed', label: 'Каналы' },
{ key: 'dialogs', label: 'Чаты' },
{ key: 'my', label: 'Мои' },
]);
function getTotalUnreadMessages() {
const chats = Object.values(state.chats || {});
@@ -91,7 +85,7 @@ export function renderToolbar(currentPageId, navigate) {
btn.append(badge);
}
if (item.pageId === 'channels-list') {
installChannelsHoldSwitcher(btn, navigate);
btn.addEventListener('click', () => navigate('channels-list/feed'));
} else {
btn.addEventListener('click', () => navigateWithGuestRules(item.pageId, navigate));
}
@@ -100,90 +94,3 @@ export function renderToolbar(currentPageId, navigate) {
return root;
}
function installChannelsHoldSwitcher(button, navigate) {
let holdTimer = 0;
let pressed = false;
let holdActive = false;
let overlay = null;
let selectedMode = 'feed';
const clearTimer = () => {
if (holdTimer) {
window.clearTimeout(holdTimer);
holdTimer = 0;
}
};
const closeOverlay = () => {
if (overlay) overlay.remove();
overlay = null;
holdActive = false;
};
const setSelectedModeByX = (clientX) => {
if (!overlay) return;
const rect = overlay.getBoundingClientRect();
const part = rect.width / 3;
const localX = Math.max(0, Math.min(rect.width - 1, clientX - rect.left));
const index = Math.max(0, Math.min(2, Math.floor(localX / Math.max(1, part))));
selectedMode = CHANNEL_MODES[index].key;
const buttons = overlay.querySelectorAll('.toolbar-channels-hold-item');
buttons.forEach((el, idx) => {
el.classList.toggle('is-active', idx === index);
});
};
const openOverlay = () => {
const rect = button.getBoundingClientRect();
overlay = document.createElement('div');
overlay.className = 'toolbar-channels-hold-overlay';
overlay.innerHTML = CHANNEL_MODES.map((mode) => (
`<button type="button" class="toolbar-channels-hold-item${mode.key === selectedMode ? ' is-active' : ''}" data-mode="${mode.key}">${mode.label}</button>`
)).join('');
overlay.style.left = `${Math.round(rect.left + rect.width / 2)}px`;
overlay.style.top = `${Math.round(rect.top - 12)}px`;
document.body.append(overlay);
holdActive = true;
};
button.addEventListener('pointerdown', (event) => {
pressed = true;
holdActive = false;
selectedMode = 'feed';
clearTimer();
holdTimer = window.setTimeout(() => {
if (!pressed) return;
openOverlay();
setSelectedModeByX(event.clientX);
}, CHANNEL_HOLD_MS);
});
button.addEventListener('pointermove', (event) => {
if (holdActive) setSelectedModeByX(event.clientX);
});
button.addEventListener('pointerup', () => {
clearTimer();
const wasHold = holdActive;
const mode = selectedMode;
pressed = false;
closeOverlay();
if (wasHold) {
navigate(`channels-list/${mode}`);
return;
}
navigate('channels-list/feed');
});
button.addEventListener('pointercancel', () => {
clearTimer();
pressed = false;
closeOverlay();
});
button.addEventListener('contextmenu', (event) => {
event.preventDefault();
});
}
shine-UI/js/pages/channels-list.js
+16 -3
View File
@@ -1210,6 +1210,16 @@ export function render({ navigate, route }) {
rerenderList();
});
const topBarRight = document.createElement('div');
topBarRight.className = 'channels-top-right';
const findChannelBtn = document.createElement('button');
findChannelBtn.type = 'button';
findChannelBtn.className = 'icon-btn channels-top-search-btn';
findChannelBtn.textContent = '🔎';
findChannelBtn.setAttribute('aria-label', 'Найти канал');
findChannelBtn.addEventListener('click', () => openChannelFinderModal({ navigate }));
const createInMyBtn = document.createElement('button');
createInMyBtn.type = 'button';
createInMyBtn.className = 'icon-btn channels-top-add-btn';
@@ -1217,8 +1227,9 @@ export function render({ navigate, route }) {
createInMyBtn.setAttribute('aria-label', 'Создать канал');
createInMyBtn.addEventListener('click', () => navigate('add-channel-view'));
topBarLeft.append(backToFeedBtn, allChannelsBtn, topTitle, myChannelsBtn);
topBarEl.append(topBarLeft, createInMyBtn);
topBarLeft.append(backToFeedBtn, allChannelsBtn, topTitle);
topBarRight.append(myChannelsBtn, findChannelBtn, createInMyBtn);
topBarEl.append(topBarLeft, topBarRight);
const bottomCta = document.createElement('button');
bottomCta.type = 'button';
@@ -1252,12 +1263,14 @@ export function render({ navigate, route }) {
allChannelsBtn.style.display = '';
myChannelsBtn.style.display = 'none';
topTitle.textContent = 'Мои каналы';
findChannelBtn.style.display = 'none';
createInMyBtn.style.display = '';
} else {
backToFeedBtn.style.display = 'none';
allChannelsBtn.style.display = 'none';
myChannelsBtn.style.display = isGuest ? 'none' : '';
topTitle.textContent = 'Каналы';
topTitle.textContent = 'Все каналы';
findChannelBtn.style.display = '';
createInMyBtn.style.display = 'none';
}
shine-UI/js/pages/connect-device-view.js
+45
View File
@@ -1,5 +1,6 @@
import { renderHeader } from '../components/header.js';
import { state } from '../state.js';
import { loadEncryptedUserSecrets } from '../services/key-vault.js';
export const pageMeta = { id: 'connect-device-view', title: 'Подключить устройство' };
@@ -21,6 +22,7 @@ export function render({ navigate }) {
<label class="checkbox-row"><input type="checkbox" id="connect-root" ${state.deviceConnect.root ? 'checked' : ''} /> root key</label>
<label class="checkbox-row"><input type="checkbox" id="connect-blockchain" ${state.deviceConnect.blockchain ? 'checked' : ''} /> blockchain key</label>
<label class="checkbox-row"><input type="checkbox" id="connect-device" checked disabled /> device key</label>
<p class="meta-muted" id="connect-keys-status">Проверяем ключи на этом устройстве...</p>
<div class="row">
<button class="icon-btn small-btn" type="button" id="tech-help">Техсправка</button>
</div>
@@ -33,6 +35,8 @@ export function render({ navigate }) {
const rootToggle = card.querySelector('#connect-root');
const blockchainToggle = card.querySelector('#connect-blockchain');
const deviceToggle = card.querySelector('#connect-device');
const statusEl = card.querySelector('#connect-keys-status');
const openQrBtn = card.querySelector('#open-qr');
deviceToggle.checked = true;
rootToggle.addEventListener('change', () => {
@@ -85,6 +89,47 @@ export function render({ navigate }) {
card.querySelector('#open-qr').addEventListener('click', () => navigate('device-qr-view'));
card.querySelector('#open-camera').addEventListener('click', () => navigate('device-camera-view'));
(async () => {
try {
if (!state.session.login || !state.session.storagePwdInMemory) {
throw new Error('Нет активной сессии');
}
const savedKeys = await loadEncryptedUserSecrets(state.session.login, state.session.storagePwdInMemory);
const hasRoot = Boolean(savedKeys.rootKey);
const hasBlockchain = Boolean(savedKeys.blockchainKey);
const hasDevice = Boolean(savedKeys.deviceKey);
rootToggle.disabled = !hasRoot;
blockchainToggle.disabled = !hasBlockchain;
deviceToggle.disabled = true;
state.deviceConnect.root = hasRoot && rootToggle.checked;
state.deviceConnect.blockchain = hasBlockchain && blockchainToggle.checked;
state.deviceConnect.device = hasDevice;
rootToggle.checked = state.deviceConnect.root;
blockchainToggle.checked = state.deviceConnect.blockchain;
deviceToggle.checked = hasDevice;
openQrBtn.disabled = !hasDevice;
const available = [
hasDevice ? 'device' : '',
hasBlockchain ? 'blockchain' : '',
hasRoot ? 'root' : '',
].filter(Boolean);
statusEl.textContent = available.length
? `На этом устройстве доступны: ${available.join(', ')}.`
: 'На этом устройстве нет сохранённых ключей для передачи.';
} catch {
rootToggle.disabled = true;
blockchainToggle.disabled = true;
deviceToggle.checked = false;
state.deviceConnect.root = false;
state.deviceConnect.blockchain = false;
state.deviceConnect.device = false;
openQrBtn.disabled = true;
statusEl.textContent = 'Не удалось прочитать сохранённые ключи на этом устройстве.';
}
})();
helpModal.addEventListener('click', (event) => {
const target = event.target;
if (target instanceof HTMLElement && target.dataset.close === 'true') {
shine-UI/js/pages/device-qr-view.js
+41 -9
View File
@@ -1,6 +1,11 @@
import { renderHeader } from '../components/header.js';
import { profile } from '../mock-data.js';
import { state } from '../state.js';
import { loadEncryptedUserSecrets } from '../services/key-vault.js';
import {
describeTransferKeys,
makeKeyTransferText,
renderQrSvg,
} from '../services/qr-key-transfer-service.js';
export const pageMeta = { id: 'device-qr-view', title: 'Показать QR-код' };
@@ -8,11 +13,6 @@ export function render({ navigate }) {
const screen = document.createElement('section');
screen.className = 'stack';
const selectedKeys = [];
if (state.deviceConnect.root) selectedKeys.push('root key');
if (state.deviceConnect.blockchain) selectedKeys.push('blockchain key');
if (state.deviceConnect.device) selectedKeys.push('device key');
screen.append(
renderHeader({
title: 'Показать QR-код',
@@ -23,12 +23,44 @@ export function render({ navigate }) {
const card = document.createElement('div');
card.className = 'card stack qr-card';
card.innerHTML = `
<img class="qr-image" src="img/device-qr-64.svg" width="64" height="64" alt="QR-код для подключения" />
<p class="meta-muted">Логин пользователя: ${profile.login}</p>
<p class="meta-muted">Передаваемые ключи: ${selectedKeys.join(', ')}</p>
<div class="qr-image" id="device-transfer-qr" aria-label="QR-код для переноса ключей"></div>
<p class="meta-muted" id="device-transfer-login">Логин: ...</p>
<p class="meta-muted" id="device-transfer-keys">Ключи: ...</p>
<p class="status-line is-unavailable" id="device-transfer-status" style="display:none;"></p>
<button class="primary-btn" type="button" id="qr-ok">OK</button>
`;
const qrEl = card.querySelector('#device-transfer-qr');
const loginEl = card.querySelector('#device-transfer-login');
const keysEl = card.querySelector('#device-transfer-keys');
const statusEl = card.querySelector('#device-transfer-status');
(async () => {
try {
if (!state.session.login || !state.session.storagePwdInMemory) {
throw new Error('Нет активной сессии для чтения ключей');
}
const savedKeys = await loadEncryptedUserSecrets(state.session.login, state.session.storagePwdInMemory);
const keys = {
deviceKey: savedKeys.deviceKey || '',
blockchainKey: state.deviceConnect.blockchain ? (savedKeys.blockchainKey || '') : '',
rootKey: state.deviceConnect.root ? (savedKeys.rootKey || '') : '',
};
if (!keys.deviceKey) throw new Error('На этом устройстве нет device key');
const qrText = makeKeyTransferText({ login: state.session.login, keys });
qrEl.innerHTML = renderQrSvg(qrText);
loginEl.textContent = `Логин: ${state.session.login}`;
keysEl.textContent = `Ключи: ${describeTransferKeys(keys).join(', ')}`;
} catch (error) {
qrEl.textContent = '';
loginEl.textContent = 'Логин: нет данных';
keysEl.textContent = 'Ключи: нет данных';
statusEl.textContent = error?.message || 'Не удалось подготовить QR-код.';
statusEl.style.display = '';
}
})();
card.querySelector('#qr-ok').addEventListener('click', () => navigate('connect-device-view'));
screen.append(card);
shine-UI/js/pages/device-view.js
+2
View File
@@ -36,9 +36,11 @@ export function render({ navigate }) {
actions.className = 'card stack';
actions.innerHTML = `
<button class="primary-btn" type="button" id="reload-sessions-btn">Обновить сессии</button>
<button class="ghost-btn" type="button" id="connect-device-btn">Подключить устройство</button>
<button class="text-btn" type="button" id="show-keys-btn">Показать ключи</button>
`;
actions.querySelector('#connect-device-btn').addEventListener('click', () => navigate('connect-device-view'));
actions.querySelector('#show-keys-btn').addEventListener('click', () => navigate('show-keys-view'));
const sessionsBlock = document.createElement('div');
shine-UI/js/pages/login-camera-view.js
+214 -19
View File
@@ -1,47 +1,238 @@
import { renderHeader } from '../components/header.js';
import {
authService,
authorizeSession,
clearAuthMessages,
clearBrowserClientData,
refreshSessions,
setAuthBusy,
setAuthError,
setAuthInfo,
state,
terminateCurrentSession,
} from '../state.js';
import { clearClientAuthData, saveEncryptedUserSecrets } from '../services/key-vault.js';
import { clearStoredMessages } from '../services/message-store.js';
import {
describeTransferKeys,
parseKeyTransferText,
} from '../services/qr-key-transfer-service.js';
import { toUserMessage } from '../services/ui-error-texts.js';
export const pageMeta = { id: 'login-camera-view', title: 'Войти по камере', showAppChrome: false };
export const pageMeta = { id: 'login-camera-view', title: 'Войти по QR-коду', showAppChrome: false };
function canUseBarcodeDetector() {
return typeof window.BarcodeDetector === 'function';
}
async function createQrDetector() {
if (!canUseBarcodeDetector()) return null;
try {
const formats = await window.BarcodeDetector.getSupportedFormats?.();
if (Array.isArray(formats) && !formats.includes('qr_code')) return null;
} catch {
// Некоторые браузеры не реализуют getSupportedFormats, но сам detector работает.
}
return new window.BarcodeDetector({ formats: ['qr_code'] });
}
function setStatus(statusEl, message, kind = 'info') {
statusEl.classList.toggle('is-unavailable', kind === 'error');
statusEl.classList.toggle('is-available', kind !== 'error');
statusEl.textContent = message;
statusEl.style.display = message ? '' : 'none';
}
function escapeHtml(value) {
return String(value || '')
.replace(/&/g, '&amp;')
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;')
.replace(/"/g, '&quot;')
.replace(/'/g, '&#39;');
}
function renderParsedTransfer(resultEl, transfer) {
const keys = describeTransferKeys(transfer.keys);
resultEl.innerHTML = `
<p class="meta-muted">Отсканированный логин: <strong>${escapeHtml(transfer.login)}</strong></p>
<p class="meta-muted">Получены ключи: <strong>${escapeHtml(keys.join(', '))}</strong></p>
<p class="meta-muted">Войти под этим логином и очистить локальную историю старого логина?</p>
`;
}
export function render({ navigate }) {
const screen = document.createElement('section');
screen.className = 'stack';
clearAuthMessages();
const frame = document.createElement('div');
frame.className = 'camera-shell';
frame.innerHTML = `
<video class="camera-video" autoplay playsinline muted></video>
<div class="camera-frame"></div>
<div class="camera-hint">Наведите QR-код в рамку</div>
<div class="camera-hint">Наведите QR-код переноса ключей в рамку</div>
<div class="camera-error" id="login-camera-error" style="display:none;"></div>
`;
const manualCard = document.createElement('details');
manualCard.className = 'card stack';
manualCard.innerHTML = `
<summary>Ввести QR-текст вручную</summary>
<textarea class="input" id="login-qr-manual" rows="4" placeholder="shine-key-transfer-v1:..."></textarea>
<button class="ghost-btn" type="button" id="login-qr-manual-parse">Проверить QR-текст</button>
`;
const resultCard = document.createElement('div');
resultCard.className = 'card stack';
resultCard.style.display = 'none';
resultCard.innerHTML = `
<div id="login-qr-result"></div>
<div class="row">
<button class="ghost-btn" type="button" id="login-qr-cancel">Нет</button>
<button class="primary-btn" type="button" id="login-qr-confirm">Да</button>
</div>
`;
const status = document.createElement('p');
status.className = 'status-line is-unavailable';
status.style.display = 'none';
const backButton = document.createElement('button');
backButton.className = 'ghost-btn';
backButton.type = 'button';
backButton.textContent = 'Назад';
const video = frame.querySelector('video');
const cameraError = frame.querySelector('#login-camera-error');
const manualInput = manualCard.querySelector('#login-qr-manual');
const parseManualButton = manualCard.querySelector('#login-qr-manual-parse');
const resultEl = resultCard.querySelector('#login-qr-result');
const cancelButton = resultCard.querySelector('#login-qr-cancel');
const confirmButton = resultCard.querySelector('#login-qr-confirm');
let stream = null;
let detector = null;
let scanTimer = 0;
let scannedTransfer = null;
let stopped = false;
const stopCamera = () => {
stopped = true;
if (scanTimer) {
window.clearTimeout(scanTimer);
scanTimer = 0;
}
if (stream) {
stream.getTracks().forEach((track) => track.stop());
stream = null;
}
};
if (navigator.mediaDevices?.getUserMedia) {
navigator.mediaDevices
.getUserMedia({ video: { facingMode: 'environment' }, audio: false })
.then((nextStream) => {
stream = nextStream;
video.srcObject = nextStream;
})
.catch(() => {
frame.insertAdjacentHTML('beforeend', '<div class="camera-error">Не удалось открыть камеру. Проверьте разрешения браузера.</div>');
const showTransfer = (transfer) => {
scannedTransfer = transfer;
stopCamera();
renderParsedTransfer(resultEl, transfer);
resultCard.style.display = '';
setStatus(status, '', 'info');
};
const parseTransferText = (text) => {
try {
const transfer = parseKeyTransferText(text);
if (!transfer.keys.deviceKey) {
throw new Error('В QR-коде нет device key для входа');
}
showTransfer(transfer);
} catch (error) {
setStatus(status, error?.message || 'Не удалось прочитать QR-код.', 'error');
}
};
const scanLoop = async () => {
if (stopped || !detector || !video || video.readyState < 2) {
if (!stopped) scanTimer = window.setTimeout(scanLoop, 250);
return;
}
try {
const codes = await detector.detect(video);
const text = String(codes?.[0]?.rawValue || '').trim();
if (text) {
parseTransferText(text);
return;
}
} catch {
// Ошибки отдельных кадров игнорируем, камера продолжит сканирование.
}
if (!stopped) scanTimer = window.setTimeout(scanLoop, 300);
};
const startCamera = async () => {
try {
detector = await createQrDetector();
if (!detector) {
throw new Error('Этот браузер не поддерживает сканирование QR через камеру. Используйте ручной ввод QR-текста.');
}
if (!navigator.mediaDevices?.getUserMedia) {
throw new Error('Камера не поддерживается в этом браузере.');
}
stream = await navigator.mediaDevices.getUserMedia({ video: { facingMode: 'environment' }, audio: false });
video.srcObject = stream;
await video.play?.();
scanLoop();
} catch (error) {
cameraError.textContent = error?.message || 'Не удалось открыть камеру. Проверьте разрешения браузера.';
cameraError.style.display = '';
setStatus(status, cameraError.textContent, 'error');
}
};
parseManualButton.addEventListener('click', () => parseTransferText(manualInput.value));
cancelButton.addEventListener('click', () => {
scannedTransfer = null;
resultCard.style.display = 'none';
stopped = false;
void startCamera();
});
confirmButton.addEventListener('click', async () => {
if (!scannedTransfer) return;
confirmButton.disabled = true;
cancelButton.disabled = true;
setAuthBusy(true);
setAuthError('');
setStatus(status, 'Входим по QR-коду...', 'info');
try {
await authService.reconnect(state.entrySettings.shineServer);
const session = await authService.createSessionFromImportedSecrets(scannedTransfer.login, scannedTransfer.keys);
await clearStoredMessages().catch(() => {});
clearBrowserClientData();
await clearClientAuthData().catch(() => {});
await terminateCurrentSession();
await saveEncryptedUserSecrets(session.login, session.storagePwd, scannedTransfer.keys);
await authService.persistSessionMaterial(session.login, session.sessionMaterial);
const resumed = await authService.resumeSession(session.login, session.sessionId);
authorizeSession({
login: resumed.login || session.login,
sessionId: resumed.sessionId || session.sessionId,
storagePwd: resumed.storagePwd || session.storagePwd,
});
} else {
frame.insertAdjacentHTML('beforeend', '<div class="camera-error">Камера не поддерживается в этом браузере.</div>');
}
state.loginDraft.login = resumed.login || session.login;
state.loginDraft.password = '';
await refreshSessions();
setAuthInfo(`Вход по QR-коду выполнен для @${resumed.login || session.login}.`);
navigate('profile-view');
} catch (error) {
const message = toUserMessage(error, 'Не удалось войти по QR-коду.');
setAuthError(message);
setStatus(status, message, 'error');
} finally {
setAuthBusy(false);
confirmButton.disabled = false;
cancelButton.disabled = false;
}
});
const backButton = document.createElement('button');
backButton.className = 'ghost-btn';
backButton.type = 'button';
backButton.textContent = 'Назад';
backButton.addEventListener('click', () => {
stopCamera();
navigate('login-view');
@@ -49,7 +240,7 @@ export function render({ navigate }) {
screen.append(
renderHeader({
title: 'Войти по камере',
title: 'Войти по QR-коду',
leftAction: {
label: '←',
onClick: () => {
@@ -59,9 +250,13 @@ export function render({ navigate }) {
},
}),
frame,
manualCard,
resultCard,
status,
backButton,
);
void startCamera();
screen.cleanup = stopCamera;
return screen;
}
shine-UI/js/pages/login-view.js
+1 -1
View File
@@ -39,7 +39,7 @@ export function render({ navigate }) {
const cameraButton = document.createElement('button');
cameraButton.className = 'primary-btn';
cameraButton.type = 'button';
cameraButton.textContent = 'Войти по камере';
cameraButton.textContent = 'Отсканировать QR-код';
cameraButton.addEventListener('click', () => navigate('login-camera-view'));
const loginButton = document.createElement('button');
shine-UI/js/pages/wallet-view.js
+1 -27
View File
@@ -7,7 +7,6 @@ import {
getBalanceSol,
getTopupSiteUrl,
getWalletFromStoredDeviceKey,
requestAirdropSol,
transferSol,
} from '../services/solana-wallet-service.js';
import {
@@ -738,32 +737,7 @@ export function render({ navigate }) {
setStatus('Кошелёк не инициализирован.');
return;
}
const openSite = window.confirm(
'Кнопка будет переводить на отдельный сайт пополнения.\n\nНажмите OK, чтобы открыть сайт.\nНажмите Отмена, чтобы выполнить тестовое пополнение (airdrop 1 SOL на DevNet).',
);
if (openSite) {
window.open(getTopupSiteUrl(walletAddress), '_blank', 'noopener,noreferrer');
setStatus('Открыт сайт пополнения. Пока также доступно тестовое пополнение.');
return;
}
topupBtn.disabled = true;
try {
const drop = await requestAirdropSol({
endpoint: state.entrySettings.solanaServer,
address: walletAddress,
amountSol: 1,
});
if (modeToken !== activeModeToken) return;
setStatus(`Тестовое пополнение выполнено (airdrop 1 SOL). Signature: ${drop.signature}`);
await refreshBalance();
} catch (error) {
if (modeToken !== activeModeToken) return;
setStatus(`Ошибка тестового пополнения: ${error?.message || 'unknown'}`);
} finally {
topupBtn.disabled = false;
}
window.location.assign(getTopupSiteUrl(walletAddress));
});
content.append(backBtn, card, actions, generatedCard);
shine-UI/js/services/auth-service.js
+18
View File
@@ -8,6 +8,7 @@ import {
exportPkcs8B64,
generateEd25519Pair,
importPkcs8Ed25519,
publicKeyB64FromPkcs8Ed25519,
randomBase64,
sha256Bytes,
signBytes,
@@ -857,6 +858,23 @@ export class AuthService {
return { ...session, keyBundle };
}
async createSessionFromImportedSecrets(login, secrets) {
const cleanLogin = (login || '').trim();
if (!cleanLogin) throw new Error('В QR-коде нет логина');
const deviceKey = String(secrets?.deviceKey || '').trim();
if (!deviceKey) throw new Error('В QR-коде нет device key для входа');
const privateKey = await importPkcs8Ed25519(deviceKey);
const publicKeyB64 = await publicKeyB64FromPkcs8Ed25519(deviceKey);
const session = await this.createAuthSession(cleanLogin, {
devicePair: {
privateKey,
publicKeyB64,
},
});
return session;
}
async persistSelectedKeys(login, storagePwd, keyBundle, saveOptions = { saveRoot: true, saveBlockchain: true }) {
let currentSecrets = {};
try {
shine-UI/js/services/crypto-utils.js
+7
View File
@@ -254,6 +254,13 @@ export async function importPkcs8Ed25519(pkcs8B64) {
return getSubtleApi().importKey('pkcs8', base64ToBytes(pkcs8B64), { name: 'Ed25519' }, false, ['sign']);
}
export async function publicKeyB64FromPkcs8Ed25519(pkcs8B64) {
const privateKey = await getSubtleApi().importKey('pkcs8', base64ToBytes(pkcs8B64), { name: 'Ed25519' }, true, ['sign']);
const jwk = await getSubtleApi().exportKey('jwk', privateKey);
if (!jwk.x) throw new Error('Не удалось получить публичный ключ Ed25519');
return bytesToBase64(base64ToBytes(base64UrlToBase64(jwk.x)));
}
export async function signBase64(privateKey, text) {
const signature = await getSubtleApi().sign({ name: 'Ed25519' }, privateKey, utf8Bytes(text));
return bytesToBase64(new Uint8Array(signature));
shine-UI/js/services/qr-key-transfer-service.js
+87
View File
@@ -0,0 +1,87 @@
import qrcode from '../vendor-qrcode-generator.js';
const TRANSFER_PREFIX = 'shine-key-transfer-v1:';
const encoder = new TextEncoder();
const decoder = new TextDecoder();
function bytesToBase64Url(bytes) {
let binary = '';
bytes.forEach((b) => {
binary += String.fromCharCode(b);
});
return btoa(binary).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/g, '');
}
function base64UrlToBytes(value) {
const normalized = String(value || '').trim().replace(/-/g, '+').replace(/_/g, '/');
const padded = normalized + '='.repeat((4 - (normalized.length % 4)) % 4);
const binary = atob(padded);
const out = new Uint8Array(binary.length);
for (let i = 0; i < binary.length; i += 1) out[i] = binary.charCodeAt(i);
return out;
}
export function keyLabel(id) {
if (id === 'root') return 'root';
if (id === 'blockchain') return 'blockchain';
if (id === 'device') return 'device';
return id;
}
export function describeTransferKeys(keys = {}) {
const out = [];
if (keys.deviceKey) out.push('device');
if (keys.blockchainKey) out.push('blockchain');
if (keys.rootKey) out.push('root');
return out;
}
export function makeKeyTransferText({ login, keys }) {
const payload = {
v: 1,
type: 'shine-key-transfer',
login: String(login || '').trim(),
keys: {
deviceKey: String(keys?.deviceKey || ''),
blockchainKey: String(keys?.blockchainKey || ''),
rootKey: String(keys?.rootKey || ''),
},
createdAtMs: Date.now(),
};
const json = JSON.stringify(payload);
return `${TRANSFER_PREFIX}${bytesToBase64Url(encoder.encode(json))}`;
}
export function parseKeyTransferText(text) {
const raw = String(text || '').trim();
if (!raw.startsWith(TRANSFER_PREFIX)) {
throw new Error('Это не QR-код переноса ключей SHiNE');
}
const json = decoder.decode(base64UrlToBytes(raw.slice(TRANSFER_PREFIX.length)));
const payload = JSON.parse(json);
if (payload?.v !== 1 || payload?.type !== 'shine-key-transfer') {
throw new Error('Неподдерживаемый формат QR-кода');
}
const login = String(payload.login || '').trim();
if (!login) throw new Error('В QR-коде нет логина');
const keys = payload.keys && typeof payload.keys === 'object' ? payload.keys : {};
if (!keys.deviceKey && !keys.blockchainKey && !keys.rootKey) {
throw new Error('В QR-коде нет ключей');
}
return {
login,
keys: {
deviceKey: String(keys.deviceKey || ''),
blockchainKey: String(keys.blockchainKey || ''),
rootKey: String(keys.rootKey || ''),
},
keyTypes: describeTransferKeys(keys),
};
}
export function renderQrSvg(text, { cellSize = 4, margin = 4 } = {}) {
const qr = qrcode(0, 'L');
qr.addData(String(text || ''), 'Byte');
qr.make();
return qr.createSvgTag(cellSize, margin);
}
shine-UI/js/state.js
+1 -1
View File
@@ -186,7 +186,7 @@ function persistEntrySettings(settings) {
}
}
function clearBrowserClientData() {
export function clearBrowserClientData() {
const localKeys = [
SESSION_STORAGE_KEY,
REACTIONS_STORAGE_KEY,
shine-UI/js/vendor-qrcode-generator.js
+2299
View File
File diff suppressed because it is too large Load Diff
shine-UI/styles/components.css
+10 -1
View File
@@ -2749,6 +2749,14 @@ textarea.input {
min-width: 0;
}
.channels-top-right {
display: flex;
align-items: center;
justify-content: flex-end;
gap: 8px;
min-width: 0;
}
.channels-top-title {
font-size: 16px;
line-height: 1.2;
@@ -2762,7 +2770,8 @@ textarea.input {
}
.channels-top-back-btn,
.channels-top-add-btn {
.channels-top-add-btn,
.channels-top-search-btn {
width: 36px;
height: 36px;
min-width: 36px;