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

shine-UI/js/pages/channels-list.js

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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, '&')
+    .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

@@ -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

@@ -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);