From df7f38bd0a4ec76c3495ab108ab56f97bcbb5977edf3ce2bfe519b1e029bf0ae Mon Sep 17 00:00:00 2001
From: AidarKC <i@aidarkc.ru>
Date: Sun, 26 Apr 2026 02:39:21 +0300
Subject: [PATCH] =?UTF-8?q?=D0=90=D0=B2=D0=B0=D1=82=D0=B0=D1=80=D1=8B:=20?=
 =?UTF-8?q?=D1=83=D0=B1=D1=80=D0=B0=D1=82=D1=8C=20=D0=B8=D0=BD=D0=B8=D1=86?=
 =?UTF-8?q?=D0=B8=D0=B0=D0=BB=D1=8B=20=D0=BF=D1=80=D0=B8=20=D0=BD=D0=B0?=
 =?UTF-8?q?=D0=BB=D0=B8=D1=87=D0=B8=D0=B8=20txId=20=D0=B8=20=D1=83=D1=81?=
 =?UTF-8?q?=D0=B8=D0=BB=D0=B8=D1=82=D1=8C=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83?=
 =?UTF-8?q?=D0=B7=D0=BA=D1=83=20=D1=81=D1=82=D0=B0=D1=80=D1=8B=D1=85=20?=
 =?UTF-8?q?=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VERSION.properties                            |  4 +-
 shine-UI/index.html                           |  4 +-
 shine-UI/js/components/avatar-image.js        | 49 +++++++++++++++----
 .../services/arweave-avatar-cache-service.js  | 45 +++++++++++++++--
 4 files changed, 84 insertions(+), 18 deletions(-)

diff --git a/VERSION.properties b/VERSION.properties
index ba26644..5df04bf 100644
--- a/VERSION.properties
+++ b/VERSION.properties
@@ -1,2 +1,2 @@
-client.version=1.2.6
-server.version=1.2.6
+client.version=1.2.7
+server.version=1.2.7
diff --git a/shine-UI/index.html b/shine-UI/index.html
index f5326e2..f4b7656 100644
--- a/shine-UI/index.html
+++ b/shine-UI/index.html
@@ -6,8 +6,8 @@
     <link rel="manifest" href="./manifest.webmanifest" />
     <title>Shine UI Demo</title>
     <script>
-      window.__SHINE_BUILD_HASH__ = '20260426102000';
-      window.__SHINE_CLIENT_VERSION__ = '1.2.6';
+      window.__SHINE_BUILD_HASH__ = '20260426105500';
+      window.__SHINE_CLIENT_VERSION__ = '1.2.7';
     </script>
     <script>
       (function attachStylesWithBuildHash() {
diff --git a/shine-UI/js/components/avatar-image.js b/shine-UI/js/components/avatar-image.js
index 7d98ef3..fcf18a6 100644
--- a/shine-UI/js/components/avatar-image.js
+++ b/shine-UI/js/components/avatar-image.js
@@ -1,5 +1,5 @@
 import { state } from '../state.js';
-import { validateArweaveTxId } from '../services/arweave-file-service.js';
+import { buildArweaveDataUrl, validateArweaveTxId } from '../services/arweave-file-service.js';
 import { getCachedAvatarObjectUrl } from '../services/arweave-avatar-cache-service.js';
 
 function normalizeLogin(value) {
@@ -52,6 +52,7 @@ export function renderUserAvatar({
   if (!validateArweaveTxId(txId)) {
     return wrap;
   }
+  fallback.hidden = true;
 
   const img = document.createElement('img');
   img.alt = 'Аватар';
@@ -63,25 +64,55 @@ export function renderUserAvatar({
   const gateway = state?.entrySettings?.arweaveServer;
   void getCachedAvatarObjectUrl({ gateway, txId })
     .then((objectUrl) => {
-      img.onload = () => {
-        fallback.hidden = true;
-        img.hidden = false;
+      const directUrl = buildArweaveDataUrl({ gateway, txId });
+      let triedDirectUrl = false;
+      let objectUrlReleased = false;
+      const releaseObjectUrl = () => {
+        if (objectUrlReleased) return;
+        objectUrlReleased = true;
         if (objectUrl.startsWith('blob:')) {
           URL.revokeObjectURL(objectUrl);
         }
       };
+      img.onload = () => {
+        fallback.hidden = true;
+        img.hidden = false;
+        releaseObjectUrl();
+      };
       img.onerror = () => {
+        if (!triedDirectUrl) {
+          triedDirectUrl = true;
+          releaseObjectUrl();
+          img.src = directUrl;
+          return;
+        }
+        releaseObjectUrl();
         img.hidden = true;
         fallback.hidden = false;
-        if (objectUrl.startsWith('blob:')) {
-          URL.revokeObjectURL(objectUrl);
-        }
       };
       img.src = objectUrl;
     })
     .catch(() => {
-      img.hidden = true;
-      fallback.hidden = false;
+      let directUrl = '';
+      try {
+        directUrl = buildArweaveDataUrl({ gateway, txId });
+      } catch {
+        directUrl = '';
+      }
+      if (!directUrl) {
+        img.hidden = true;
+        fallback.hidden = false;
+        return;
+      }
+      img.onload = () => {
+        fallback.hidden = true;
+        img.hidden = false;
+      };
+      img.onerror = () => {
+        img.hidden = true;
+        fallback.hidden = false;
+      };
+      img.src = directUrl;
     });
 
   return wrap;
diff --git a/shine-UI/js/services/arweave-avatar-cache-service.js b/shine-UI/js/services/arweave-avatar-cache-service.js
index 27feada..bafb8e8 100644
--- a/shine-UI/js/services/arweave-avatar-cache-service.js
+++ b/shine-UI/js/services/arweave-avatar-cache-service.js
@@ -103,12 +103,47 @@ async function fetchAvatarBlob({ gateway, txId }) {
   if (!response.ok) {
     throw new Error(`Не удалось загрузить аватар (${response.status} ${response.statusText})`);
   }
-  const blob = await response.blob();
-  const type = String(blob?.type || '').toLowerCase();
-  if (!type.startsWith('image/')) {
-    throw new Error('Arweave-файл не является изображением');
+  const sourceBlob = await response.blob();
+  const sourceType = String(sourceBlob?.type || '').toLowerCase();
+  if (sourceType.startsWith('image/')) {
+    return sourceBlob;
   }
-  return blob;
+
+  const bytes = new Uint8Array(await sourceBlob.arrayBuffer());
+  const detectedType = detectImageMime(bytes);
+  if (detectedType) {
+    return new Blob([bytes], { type: detectedType });
+  }
+
+  // Старые аватары могли быть загружены без корректного Content-Type.
+  // Возвращаем исходный blob, чтобы браузер попробовал декодировать сам.
+  return sourceBlob;
+}
+
+function detectImageMime(bytes) {
+  if (!(bytes instanceof Uint8Array) || bytes.length < 12) return '';
+  if (
+    bytes[0] === 0x89
+    && bytes[1] === 0x50
+    && bytes[2] === 0x4e
+    && bytes[3] === 0x47
+    && bytes[4] === 0x0d
+    && bytes[5] === 0x0a
+    && bytes[6] === 0x1a
+    && bytes[7] === 0x0a
+  ) return 'image/png';
+  if (bytes[0] === 0xff && bytes[1] === 0xd8 && bytes[2] === 0xff) return 'image/jpeg';
+  if (
+    bytes[0] === 0x52
+    && bytes[1] === 0x49
+    && bytes[2] === 0x46
+    && bytes[3] === 0x46
+    && bytes[8] === 0x57
+    && bytes[9] === 0x45
+    && bytes[10] === 0x42
+    && bytes[11] === 0x50
+  ) return 'image/webp';
+  return '';
 }
 
 async function getBlobFromCacheOrGateway({ gateway, txId }) {