UI: улучшить создание канала и окно загрузки

VERSION.properties

@@ -1,2 +1,2 @@
-client.version=1.5.2
+client.version=1.5.4
 server.version=1.4.5

shine-UI/js/components/arweave-attachment-manager.js

@@ -314,6 +314,9 @@ export function openArweaveAttachmentManager({
   let balanceInfo = null;
   let autoOpenedFileDialog = false;
   const isAvatarMode = String(mode || '') === 'avatar';
+  if (isAvatarMode && !String(uploadTransport || '').trim()) {
+    selectedUploadTransport = 'turbo';
+  }
   const historyPurposeMode = String(historyPurpose || '').trim();
   const purposeFilter = isAvatarMode || historyPurposeMode === 'avatar' ? 'avatar' : 'attachment';
   const selectedTxIdSet = new Set((Array.isArray(selectedTxIds) ? selectedTxIds : []).map((item) => String(item || '').trim()).filter(Boolean));
@@ -592,8 +595,8 @@ export function openArweaveAttachmentManager({
             <div class="form-actions-grid">
               <button class="${turboMode ? 'secondary-btn' : 'primary-btn'}" type="button" data-action="switch-arweave">Загрузка используя свой Arweave кошелёк</button>
               <button class="${turboMode ? 'primary-btn' : 'secondary-btn'}" type="button" data-action="switch-turbo">Загрузить через Turbo</button>
-              ${isAvatarMode ? '' : '<button class="secondary-btn" type="button" data-action="history-top">Использовать журнал загрузок</button>'}
+              <button class="secondary-btn" type="button" data-action="history-top">${isAvatarMode ? 'Выбрать из журнала' : 'Использовать журнал загрузок'}</button>
-              ${isAvatarMode ? '' : '<button class="secondary-btn" type="button" data-action="existing-top">Использовать существующий в Arweave файл</button>'}
+              <button class="secondary-btn" type="button" data-action="existing-top">${isAvatarMode ? 'Ввести tx id' : 'Использовать существующий в Arweave файл'}</button>
             </div>
             ${turboMode
               ? `
@@ -860,12 +863,14 @@ export function openArweaveAttachmentManager({
       root.innerHTML = `
         <div class="modal" data-ar-attach-modal="true">
           <div class="modal-card stack ar-attachment-manager-card">
-            <h3 class="modal-title">Существующий файл Arweave</h3>
+            <h3 class="modal-title">${isAvatarMode ? 'Существующий аватар Arweave' : 'Существующий файл Arweave'}</h3>
             <label class="meta-muted" for="ar-existing-txid">Transaction ID</label>
             <input class="input" id="ar-existing-txid" type="text" maxlength="64" placeholder="43 символа txId" />
+            ${isAvatarMode ? '' : `
             <label class="meta-muted" for="ar-existing-name">Имя файла в сообщении</label>
             <input class="input" id="ar-existing-name" type="text" maxlength="180" placeholder="например report.pdf" />
-            <label class="meta-muted" data-existing-preview-wrap="true" hidden>
+            `}
+            <label class="meta-muted" data-existing-preview-wrap="true" ${isAvatarMode ? 'hidden' : 'hidden'}>
               <input type="checkbox" data-existing-preview-toggle="true" />
               Добавить превью
             </label>
@@ -909,8 +914,8 @@ export function openArweaveAttachmentManager({
       });
       checkBtn?.addEventListener('click', async () => {
         const txId = String(txEl?.value || '').trim();
-        const name = String(nameEl?.value || '').trim() || 'arweave-file';
+        const name = isAvatarMode ? 'Аватар' : (String(nameEl?.value || '').trim() || 'arweave-file');
-        const wantsPreview = previewToggleEl instanceof HTMLInputElement && previewToggleEl.checked;
+        const wantsPreview = !isAvatarMode && previewToggleEl instanceof HTMLInputElement && previewToggleEl.checked;
         const previewTxId = String(previewTxEl?.value || '').trim();
         if (!validateArweaveTxId(txId)) {
           setText(errorEl, 'Некорректный Transaction ID Arweave.');
@@ -940,6 +945,7 @@ export function openArweaveAttachmentManager({
             ar: txId,
             preview,
             uploadedAtMs: Date.now(),
+            purpose: isAvatarMode ? 'avatar' : 'attachment',
           });
           metaEl.innerHTML = `
             <div>Размер: ${escapeHtml(formatBytes(item.size))}</div>
@@ -950,7 +956,7 @@ export function openArweaveAttachmentManager({
           const addBtn = document.createElement('button');
           addBtn.className = 'primary-btn';
           addBtn.type = 'button';
-          addBtn.textContent = historyOnly ? 'Добавить в журнал' : 'Добавить в сообщение';
+          addBtn.textContent = isAvatarMode ? 'Выбрать аватар' : (historyOnly ? 'Добавить в журнал' : 'Добавить в сообщение');
           addBtn.addEventListener('click', () => finish(resolve, item, { pendingPlacement: historyOnly && !isAvatarMode }));
           metaEl.append(addBtn);
         } catch (error) {

shine-UI/js/pages/add-channel-view.js

@@ -2,11 +2,14 @@ import { renderHeader } from '../components/header.js';
 import { authService, state } from '../state.js';
 import { toUserMessage } from '../services/ui-error-texts.js';
 import {
-  channelNameErrorText,
   normalizeChannelDisplayName,
   validateChannelDisplayName,
 } from '../services/channel-name-rules.js';
-import { openArweaveAttachmentManager, markArweaveAttachmentPlaced } from '../components/arweave-attachment-manager.js';
+import {
+  getArweaveAttachmentAvailability,
+  openArweaveAttachmentManager,
+  markArweaveAttachmentPlaced,
+} from '../components/arweave-attachment-manager.js';
 import { buildArweaveDataUrl } from '../services/arweave-file-service.js';
 import { makeShineChannelRoute } from '../services/shine-routes.js';
 
@@ -14,6 +17,8 @@ export const pageMeta = { id: 'add-channel-view', title: 'Создание ка
 
 const CREATE_CHANNEL_FLASH_KEY = 'shine-channels-create-success';
 const CHANNEL_TYPE_PUBLIC = 1;
+const CHANNEL_LOGIN_HINT = 'Разрешены латинские буквы, цифры, _ и -. Длина: от 3 до 32 символов. Название не должно состоять только из цифр.';
+const CHANNEL_LOGIN_DIGITS_ONLY_HINT = 'Имя канала не должно состоять только из цифр.';
 
 function persistCreateSuccessFlash(message) {
   try {
@@ -59,6 +64,21 @@ function buildAbsoluteChannelUrl({ ownerBlockchainName = '', channelName = '' }
   }
 }
 
+function sanitizeChannelLoginInput(value) {
+  const source = String(value || '');
+  let result = '';
+  for (const ch of source) {
+    if (/[A-Za-z0-9_-]/.test(ch)) result += ch;
+  }
+  return result.slice(0, 32);
+}
+
+function shortAvatarBlockchainAddress(value) {
+  const raw = String(value || '').trim();
+  if (raw.length <= 24) return raw;
+  return raw.slice(-24);
+}
+
 export function render({ navigate }) {
   const screen = document.createElement('section');
   screen.className = 'stack channels-screen channels-screen--add';
@@ -73,9 +93,6 @@ export function render({ navigate }) {
   const form = document.createElement('form');
   form.className = 'card stack';
   form.innerHTML = `
-    <strong class="channel-head-title">Создание канала</strong>
-    <div class="meta-muted">Тип канала фиксирован: публичный (1).</div>
-
     <div class="channel-create-avatar-head">
       <div id="channel-avatar-preview"></div>
       <div class="channel-create-avatar-side">
@@ -87,14 +104,13 @@ export function render({ navigate }) {
       </div>
     </div>
 
-    <label for="channel-name">Техническое имя канала</label>
+    <label for="channel-name">Технический логин канала</label>
     <input id="channel-name" class="input" maxlength="32" placeholder="Например: My-Channel_1" required />
-    <div class="meta-muted">Используется в прямой ссылке на канал.</div>
+    <div class="meta-muted channel-create-login-hint">${CHANNEL_LOGIN_HINT}</div>
-    <div class="meta-muted" id="channel-link-preview"></div>
+    <div class="meta-muted channel-link-preview" id="channel-link-preview">&nbsp;</div>
-    <div class="meta-muted">Разрешены латинские буквы, цифры, _ и -. Длина: от 3 до 32 символов. Название не должно состоять только из цифр.</div>
     <div id="channel-name-error" class="meta-muted inline-error"></div>
 
-    <label for="channel-title">Красивое имя (то, как канал будет виден пользователям)</label>
+    <label for="channel-title">Как канал будет виден пользователям</label>
     <input id="channel-title" class="input" maxlength="50" placeholder="Например: Мой красивый канал" />
     <div class="meta-muted" id="channel-title-counter">0 / 50 символов</div>
     <div id="channel-title-error" class="meta-muted inline-error"></div>
@@ -131,27 +147,29 @@ export function render({ navigate }) {
   let submitInFlight = false;
   let selectedAvatar = null;
   let ownerBlockchainName = '';
+  let avatarAvailabilityLabel = '';
+  let avatarAvailabilityTxId = '';
 
   const renderAvatarStatus = (nameValue, titleValue) => {
     renderAvatarPreview(avatarPreviewEl, selectedAvatar, titleValue || nameValue);
     avatarRemoveBtn.hidden = !selectedAvatar?.ar;
     if (!selectedAvatar?.ar) {
-      avatarStatusEl.innerHTML = '<p class="meta-muted">Аватар не установлен.</p>';
+      avatarStatusEl.innerHTML = '<p class="channel-avatar-status-text">Аватар канала не установлен.</p>';
       return;
     }
     const txId = String(selectedAvatar.ar || '').trim();
-    const isPending = true;
+    const shortTxId = shortAvatarBlockchainAddress(txId);
+    const isPending = avatarAvailabilityLabel === 'pending' || avatarAvailabilityTxId !== txId;
     avatarStatusEl.innerHTML = `
-      <p class="channel-avatar-status-text">${isPending ? 'Аватар выбран и ещё не сохранён.' : 'Аватар установлен.'}</p>
+      <p class="channel-avatar-status-text">Аватар канала</p>
-      <p class="meta-muted">Адрес в Arweave:</p>
+      <p class="channel-avatar-status-line">Адрес аватара в блокчейне Arweave <span class="channel-avatar-txid">${shortTxId}</span><span class="channel-avatar-status-pending">${isPending ? ', ещё не обновился в блокчейне.' : ''}</span></p>
-      <p class="channel-avatar-txid">${txId}</p>
     `;
   };
 
   const renderChannelLinkPreview = (nameValue) => {
     const normalizedChannelName = normalizeChannelDisplayName(nameValue);
     if (!ownerBlockchainName || !normalizedChannelName) {
-      linkPreviewEl.textContent = 'Прямая ссылка появится после ввода технического имени канала.';
+      linkPreviewEl.innerHTML = '&nbsp;';
       return;
     }
     const directUrl = buildAbsoluteChannelUrl({
@@ -161,6 +179,26 @@ export function render({ navigate }) {
     linkPreviewEl.innerHTML = `Прямая ссылка: <a href="${directUrl}" target="_blank" rel="noopener noreferrer">${directUrl}</a>`;
   };
 
+  const refreshAvatarAvailability = async () => {
+    const txId = String(selectedAvatar?.ar || '').trim();
+    avatarAvailabilityTxId = txId;
+    avatarAvailabilityLabel = txId ? 'pending' : '';
+    renderAvatarStatus(nameEl.value, titleEl.value);
+    if (!txId) return;
+    try {
+      const availability = await getArweaveAttachmentAvailability({
+        gateway: state.entrySettings.arweaveServer,
+        attachment: selectedAvatar,
+      });
+      if (avatarAvailabilityTxId !== txId) return;
+      avatarAvailabilityLabel = String(availability?.status || '').trim().toLowerCase();
+    } catch {
+      if (avatarAvailabilityTxId !== txId) return;
+      avatarAvailabilityLabel = 'pending';
+    }
+    renderAvatarStatus(nameEl.value, titleEl.value);
+  };
+
   const setBusy = (busy) => {
     submitInFlight = !!busy;
     submitEl.disabled = submitInFlight;
@@ -177,7 +215,7 @@ export function render({ navigate }) {
     const titleCheck = normalizeMetaText(titleEl.value, 50, 'Название');
     const descriptionCheck = normalizeMetaText(descriptionEl.value, 250, 'Описание');
 
-    nameErrorEl.textContent = nameCheck.ok ? '' : channelNameErrorText(nameCheck.code);
+    nameErrorEl.textContent = '';
     titleErrorEl.textContent = titleCheck.error;
     descriptionErrorEl.textContent = descriptionCheck.error;
 
@@ -197,7 +235,15 @@ export function render({ navigate }) {
     };
   };
 
-  nameEl.addEventListener('input', updateValidation);
+  nameEl.addEventListener('input', () => {
+    const raw = String(nameEl.value || '');
+    const sanitized = sanitizeChannelLoginInput(raw);
+    if (raw !== sanitized) {
+      nameEl.value = sanitized;
+      window.alert(CHANNEL_LOGIN_HINT);
+    }
+    updateValidation();
+  });
   titleEl.addEventListener('input', updateValidation);
   descriptionEl.addEventListener('input', updateValidation);
   avatarBtn.addEventListener('click', async () => {
@@ -209,7 +255,10 @@ export function render({ navigate }) {
         mode: 'avatar',
         historyPurpose: 'avatar',
       });
-      if (nextAvatar?.ar) selectedAvatar = nextAvatar;
+      if (nextAvatar?.ar) {
+        selectedAvatar = nextAvatar;
+        void refreshAvatarAvailability();
+      }
       updateValidation();
     } catch (error) {
       errorEl.textContent = toUserMessage(error, 'Не удалось выбрать аватар.');
@@ -221,6 +270,8 @@ export function render({ navigate }) {
     const confirmed = window.confirm('Убрать аватар и сделать канал без аватара?');
     if (!confirmed) return;
     selectedAvatar = null;
+    avatarAvailabilityLabel = '';
+    avatarAvailabilityTxId = '';
     updateValidation();
   });
 
@@ -236,6 +287,11 @@ export function render({ navigate }) {
     }
 
     const check = updateValidation();
+    if (check.name && /^[0-9]+$/.test(check.name)) {
+      window.alert(CHANNEL_LOGIN_DIGITS_ONLY_HINT);
+      nameEl.focus();
+      return;
+    }
     if (!check.ok) return;
 
     setBusy(true);

shine-UI/js/router.js

@@ -1,4 +1,4 @@
-import { parseShineRootSegment } from './services/shine-routes.js';
+import { parseShineRouteParts } from './services/shine-routes.js';
 
 const ROOT_PAGES = ['messages-list', 'channels-list', 'network-view', 'notifications-view', 'profile-view'];
 const PRETTY_PATHS = new Map([
@@ -90,9 +90,11 @@ export function getRoute() {
   };
   const isLikelyBlockNumber = (value) => /^[0-9]+$/.test(String(value || '').trim());
 
-  const shineLogin = parseShineRootSegment(pageId);
+  const shineRoute = parseShineRouteParts(segments);
-  if (shineLogin) {
+  if (shineRoute?.entity) {
-    const section = decodePart(segments[1] || '').toLowerCase();
+    const shineLogin = shineRoute.entity;
+    const baseOffset = Number(shineRoute.offset || 0);
+    const section = decodePart(segments[baseOffset] || '').toLowerCase();
     if (!section) {
       return { pageId: 'user', params: { login: shineLogin, fromPage: 'messages-list', section: 'profile' } };
     }
@@ -100,7 +102,7 @@ export function getRoute() {
       return { pageId: 'network-view', params: { mode: 'keep-history', login: shineLogin } };
     }
     if (section === 'channels') {
-      const sub = decodePart(segments[2] || '').toLowerCase();
+      const sub = decodePart(segments[baseOffset + 1] || '').toLowerCase();
       if (sub === 'owned') {
         return {
           pageId: 'channels-list',
@@ -118,12 +120,12 @@ export function getRoute() {
         params: { mode: 'feed', login: shineLogin, scope: 'all' },
       };
     }
-    if (segments.length === 2 && isLikelyBlockNumber(segments[1])) {
+    if (segments.length === baseOffset + 1 && isLikelyBlockNumber(segments[baseOffset])) {
       return {
         pageId: 'channel-thread-view',
         params: {
           messageBlockchainName: shineLogin,
-          messageBlockNumber: segments[1] || '',
+          messageBlockNumber: segments[baseOffset] || '',
           messageBlockHash: '',
           channelOwnerBlockchainName: '',
           channelRootBlockNumber: '',
@@ -131,10 +133,10 @@ export function getRoute() {
         },
       };
     }
-    if (segments.length >= 2) {
+    if (segments.length >= baseOffset + 1) {
       const ownerBlockchainName = shineLogin;
-      const channelName = decodePart(segments[1] || '');
+      const channelName = decodePart(segments[baseOffset] || '');
-      const messageBlockNumber = segments[2] || '';
+      const messageBlockNumber = segments[baseOffset + 1] || '';
       if (ownerBlockchainName && channelName && messageBlockNumber) {
         return {
           pageId: 'channel-thread-view',

shine-UI/js/services/shine-routes.js

@@ -10,7 +10,7 @@ function decodeRoutePart(value = '') {
   }
 }
 
-const SHINE_ROUTE_PREFIX = 'SHiNE.';
+const SHINE_ROUTE_SEGMENT = 'SHiNE';
 
 export function normalizeLogin(value = '') {
   return String(value || '').trim().replace(/^@+/, '');
@@ -25,21 +25,21 @@ export function extractLoginFromBlockchainName(value = '') {
 
 export function makeProfileRoute(login = '') {
   const clean = normalizeLogin(login);
-  return clean ? `${SHINE_ROUTE_PREFIX}${encodeRoutePart(clean)}` : 'profile';
+  return clean ? `${SHINE_ROUTE_SEGMENT}/${encodeRoutePart(clean)}` : 'profile';
 }
 
 export function makeProfileLinksRoute(login = '') {
   const clean = normalizeLogin(login);
-  return clean ? `${SHINE_ROUTE_PREFIX}${encodeRoutePart(clean)}/links` : 'network/keep-history';
+  return clean ? `${SHINE_ROUTE_SEGMENT}/${encodeRoutePart(clean)}/links` : 'network/keep-history';
 }
 
 export function makeProfileChannelsRoute(login = '', scope = 'all') {
   const clean = normalizeLogin(login);
   if (!clean) return 'channels/feed';
   const normalizedScope = String(scope || '').trim().toLowerCase();
-  if (normalizedScope === 'owned') return `${SHINE_ROUTE_PREFIX}${encodeRoutePart(clean)}/channels/owned`;
+  if (normalizedScope === 'owned') return `${SHINE_ROUTE_SEGMENT}/${encodeRoutePart(clean)}/channels/owned`;
-  if (normalizedScope === 'following') return `${SHINE_ROUTE_PREFIX}${encodeRoutePart(clean)}/channels/following`;
+  if (normalizedScope === 'following') return `${SHINE_ROUTE_SEGMENT}/${encodeRoutePart(clean)}/channels/following`;
-  return `${SHINE_ROUTE_PREFIX}${encodeRoutePart(clean)}/channels`;
+  return `${SHINE_ROUTE_SEGMENT}/${encodeRoutePart(clean)}/channels`;
 }
 
 export function makeShineChannelRoute({ ownerLogin = '', ownerBlockchainName = '', channelName = '', messageBlockNumber = '' }) {
@@ -47,19 +47,33 @@ export function makeShineChannelRoute({ ownerLogin = '', ownerBlockchainName = '
   const chName = String(channelName || '').trim();
   const msgNo = String(messageBlockNumber || '').trim();
   if (!ownerBch || !chName) return '';
-  if (msgNo) return `${SHINE_ROUTE_PREFIX}${encodeRoutePart(ownerBch)}/${encodeRoutePart(chName)}/${encodeRoutePart(msgNo)}`;
+  if (msgNo) return `${SHINE_ROUTE_SEGMENT}/${encodeRoutePart(ownerBch)}/${encodeRoutePart(chName)}/${encodeRoutePart(msgNo)}`;
-  return `${SHINE_ROUTE_PREFIX}${encodeRoutePart(ownerBch)}/${encodeRoutePart(chName)}`;
+  return `${SHINE_ROUTE_SEGMENT}/${encodeRoutePart(ownerBch)}/${encodeRoutePart(chName)}`;
 }
 
 export function makeShineMessageRoute({ ownerLogin = '', messageBlockchainName = '', messageBlockNumber = '' }) {
   const msgBch = String(messageBlockchainName || '').trim();
   const msgNo = String(messageBlockNumber || '').trim();
   if (!msgBch || !msgNo) return '';
-  return `${SHINE_ROUTE_PREFIX}${encodeRoutePart(msgBch)}/${encodeRoutePart(msgNo)}`;
+  return `${SHINE_ROUTE_SEGMENT}/${encodeRoutePart(msgBch)}/${encodeRoutePart(msgNo)}`;
 }
 
-export function parseShineRootSegment(segment = '') {
+export function parseShineRouteParts(segments = []) {
-  const raw = String(segment || '').trim();
+  const parts = Array.isArray(segments) ? segments.map((value) => String(value || '').trim()) : [];
-  if (!raw.toLowerCase().startsWith(SHINE_ROUTE_PREFIX.toLowerCase())) return '';
+  if (!parts.length) return null;
-  return normalizeLogin(decodeRoutePart(raw.slice(SHINE_ROUTE_PREFIX.length)));
+
+  if (String(parts[0] || '').toLowerCase() === SHINE_ROUTE_SEGMENT.toLowerCase()) {
+    const entity = normalizeLogin(decodeRoutePart(parts[1] || ''));
+    if (!entity) return null;
+    return { entity, offset: 2, format: 'slash' };
+  }
+
+  const raw = String(parts[0] || '').trim();
+  const legacyPrefix = `${SHINE_ROUTE_SEGMENT}.`;
+  if (!raw.toLowerCase().startsWith(legacyPrefix.toLowerCase())) return null;
+  return {
+    entity: normalizeLogin(decodeRoutePart(raw.slice(legacyPrefix.length))),
+    offset: 1,
+    format: 'dot',
+  };
 }

shine-UI/styles/components.css

@@ -6584,15 +6584,37 @@ html, body { overflow-x: hidden; }
 
 .channel-avatar-status-text {
   margin: 0;
-  color: rgba(255, 236, 194, 0.95);
+  color: rgba(255, 255, 255, 0.96);
-  font-weight: 600;
+  font-weight: 500;
+  font-size: 12px;
+  line-height: 1.35;
+}
+
+.channel-avatar-status-line {
+  margin: 2px 0 0;
+  color: rgba(255, 255, 255, 0.96);
+  font-size: 12px;
+  line-height: 1.35;
 }
 
 .channel-avatar-txid {
-  margin: 4px 0 0;
+  margin: 0;
   word-break: break-all;
-  color: rgba(255, 255, 255, 0.86);
+  color: rgba(255, 255, 255, 0.96);
-  font-size: 12px;
+  font-size: 11px;
+}
+
+.channel-avatar-status-pending {
+  color: rgba(255, 255, 255, 0.82);
+}
+
+.channel-create-login-hint {
+  font-size: 11px;
+  line-height: 1.35;
+}
+
+.channel-link-preview {
+  min-height: 18px;
 }
 
 .channel-avatar-remove-btn {