sceyt-chat-react-uikit 1.8.0-beta.5 → 1.8.0-beta.7

package/index.js

@@ -15,6 +15,8 @@ var LinkifyIt = _interopDefault(require('linkify-it'));
 var Cropper = _interopDefault(require('react-easy-crop'));
 var Carousel = _interopDefault(require('react-elastic-carousel'));
 var reactCircularProgressbar = require('react-circular-progressbar');
+var ffmpeg = require('@ffmpeg/ffmpeg');
+var util = require('@ffmpeg/util');
 var lexical = require('lexical');
 var LexicalComposerContext = require('@lexical/react/LexicalComposerContext');
 var LexicalComposer = require('@lexical/react/LexicalComposer');
@@ -34115,9 +34117,170 @@ var Bar = styled__default.div(_templateObject2$q || (_templateObject2$q = _tagge
   return props.progressColor;
 });
 
+var ffmpegInstance = null;
+var isFFmpegLoading = false;
+var ffmpegLoadPromise = null;
+var isSafari = function isSafari() {
+  if (typeof window === 'undefined' || !window.navigator) {
+    return false;
+  }
+  var userAgent = window.navigator.userAgent;
+  return /^((?!chrome|android).)*safari/i.test(userAgent);
+};
+var initFFmpeg = function initFFmpeg() {
+  try {
+    if (ffmpegInstance) {
+      return Promise.resolve(ffmpegInstance);
+    }
+    if (isFFmpegLoading && ffmpegLoadPromise) {
+      return Promise.resolve(ffmpegLoadPromise.then(function () {
+        if (!ffmpegInstance) {
+          throw new Error('FFmpeg failed to initialize');
+        }
+        return ffmpegInstance;
+      }));
+    }
+    isFFmpegLoading = true;
+    ffmpegLoadPromise = function () {
+      try {
+        return Promise.resolve(_catch(function () {
+          var ffmpeg$1 = new ffmpeg.FFmpeg();
+          var baseURL = 'https://unpkg.com/@ffmpeg/core@0.12.6/dist/umd';
+          var _load = ffmpeg$1.load;
+          return Promise.resolve(util.toBlobURL(baseURL + "/ffmpeg-core.js", 'text/javascript')).then(function (_toBlobURL) {
+            return Promise.resolve(util.toBlobURL(baseURL + "/ffmpeg-core.wasm", 'application/wasm')).then(function (_toBlobURL2) {
+              return Promise.resolve(_load.call(ffmpeg$1, {
+                coreURL: _toBlobURL,
+                wasmURL: _toBlobURL2
+              })).then(function () {
+                ffmpegInstance = ffmpeg$1;
+                isFFmpegLoading = false;
+              });
+            });
+          });
+        }, function (error) {
+          isFFmpegLoading = false;
+          ffmpegLoadPromise = null;
+          ffmpegInstance = null;
+          log.error('Failed to load FFmpeg:', error);
+          throw error;
+        }));
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    }();
+    return Promise.resolve(ffmpegLoadPromise).then(function () {
+      if (!ffmpegInstance) {
+        throw new Error('FFmpeg instance is null after initialization');
+      }
+      return ffmpegInstance;
+    });
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
+var convertMp3ToAac = function convertMp3ToAac(file, messageId) {
+  try {
+    return Promise.resolve(_catch(function () {
+      var maxSize = 50 * 1024 * 1024;
+      if (file.size > maxSize) {
+        throw new Error("File size (" + (file.size / 1024 / 1024).toFixed(2) + "MB) exceeds maximum allowed size (50MB)");
+      }
+      if (file.size === 0) {
+        throw new Error('File is empty');
+      }
+      return Promise.resolve(initFFmpeg()).then(function (ffmpeg) {
+        function _temp8() {
+          function _temp6() {
+            return Promise.resolve(util.fetchFile(file)).then(function (inputData) {
+              return Promise.resolve(ffmpeg.writeFile(messageId + "_input.mp3", inputData)).then(function () {
+                return Promise.resolve(ffmpeg.exec(['-i', messageId + "_input.mp3", '-c:a', 'aac', '-b:a', '128k', '-movflags', '+faststart', messageId + "_output.m4a"])).then(function () {
+                  return Promise.resolve(ffmpeg.readFile(messageId + "_output.m4a")).then(function (data) {
+                    function _temp4() {
+                      function _temp2() {
+                        var dataArray;
+                        if (data instanceof Uint8Array) {
+                          dataArray = data;
+                        } else if (typeof data === 'string') {
+                          var binaryString = atob(data);
+                          var bytes = new Uint8Array(binaryString.length);
+                          for (var i = 0; i < binaryString.length; i++) {
+                            bytes[i] = binaryString.charCodeAt(i);
+                          }
+                          dataArray = bytes;
+                        } else {
+                          dataArray = new Uint8Array(data);
+                        }
+                        var arrayBuffer = dataArray.buffer.slice(dataArray.byteOffset, dataArray.byteOffset + dataArray.byteLength);
+                        var blob = new Blob([arrayBuffer], {
+                          type: 'audio/mp4'
+                        });
+                        var convertedFile = new File([blob], messageId + "_" + file.name.replace('.mp3', '.m4a'), {
+                          type: 'audio/mp4',
+                          lastModified: file.lastModified
+                        });
+                        return convertedFile;
+                      }
+                      var _temp = _catch(function () {
+                        return Promise.resolve(ffmpeg.deleteFile(messageId + "_output.m4a")).then(function () {});
+                      }, function () {});
+                      return _temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp);
+                    }
+                    var _temp3 = _catch(function () {
+                      return Promise.resolve(ffmpeg.deleteFile(messageId + "_input.mp3")).then(function () {});
+                    }, function () {});
+                    return _temp3 && _temp3.then ? _temp3.then(_temp4) : _temp4(_temp3);
+                  });
+                });
+              });
+            });
+          }
+          var _temp5 = _catch(function () {
+            return Promise.resolve(ffmpeg.deleteFile(messageId + "_output.m4a")).then(function () {});
+          }, function () {});
+          return _temp5 && _temp5.then ? _temp5.then(_temp6) : _temp6(_temp5);
+        }
+        var _temp7 = _catch(function () {
+          return Promise.resolve(ffmpeg.deleteFile(messageId + "_input.mp3")).then(function () {});
+        }, function () {});
+        return _temp7 && _temp7.then ? _temp7.then(_temp8) : _temp8(_temp7);
+      });
+    }, function (error) {
+      log.error('Failed to convert MP3 to AAC:', error);
+      throw error;
+    }));
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
+var convertAudioForSafari = function convertAudioForSafari(file, messageId) {
+  try {
+    var _exit = false;
+    var _temp9 = function () {
+      if (isSafari() && file.type === 'audio/mpeg' && file.name.endsWith('.mp3')) {
+        return _catch(function () {
+          return Promise.resolve(convertMp3ToAac(file, messageId)).then(function (_await$convertMp3ToAa) {
+            _exit = true;
+            return _await$convertMp3ToAa;
+          });
+        }, function (error) {
+          log.warn('Audio conversion failed, using original file:', error);
+          _exit = true;
+          return file;
+        });
+      }
+    }();
+    return Promise.resolve(_temp9 && _temp9.then ? _temp9.then(function (_result2) {
+      return _exit ? _result2 : file;
+    }) : _exit ? _temp9 : file);
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
+
 var _templateObject$v, _templateObject2$r, _templateObject3$l, _templateObject4$h, _templateObject5$e, _templateObject6$c, _templateObject7$b, _templateObject8$b;
 var AudioPlayer = function AudioPlayer(_ref) {
-  var _file$metadata, _file$metadata2, _file$metadata3;
+  var _file$metadata5, _file$metadata6, _file$metadata7;
   var url = _ref.url,
     file = _ref.file,
     messagePlayed = _ref.messagePlayed,
@@ -34168,6 +34331,7 @@ var AudioPlayer = function AudioPlayer(_ref) {
   var wavesurfer = React.useRef(null);
   var wavesurferContainer = React.useRef(null);
   var intervalRef = React.useRef(null);
+  var convertedUrlRef = React.useRef(null);
   var handleSetAudioRate = function handleSetAudioRate() {
     if (wavesurfer.current) {
       if (audioRate === 1) {
@@ -34251,84 +34415,131 @@ var AudioPlayer = function AudioPlayer(_ref) {
   }, [recording.initRecording]);
   React.useEffect(function () {
     if (url) {
+      if (convertedUrlRef.current) {
+        URL.revokeObjectURL(convertedUrlRef.current);
+        convertedUrlRef.current = null;
+      }
       if (url !== '_' && !isRendered && wavesurfer && wavesurfer.current) {
         wavesurfer.current.destroy();
       }
       var initWaveSurfer = function initWaveSurfer() {
         try {
-          try {
-            wavesurfer.current = WaveSurfer.create({
-              container: wavesurferContainer.current,
-              waveColor: 'transparent',
-              progressColor: 'transparent',
-              audioRate: audioRate,
-              barWidth: 1,
-              barHeight: 1,
-              hideScrollbar: true,
-              barRadius: 1.5,
-              cursorWidth: 0,
-              barGap: 2,
-              height: 20
-            });
-            var peaks;
-            if (file.metadata) {
-              if (file.metadata.dur) {
-                setDuration(file.metadata.dur);
-                setCurrentTime(formatAudioVideoTime(file.metadata.dur));
+          var _exit = false;
+          return Promise.resolve(_catch(function () {
+            var _file$name;
+            function _temp2(_result2) {
+              if (_exit) return _result2;
+              wavesurfer.current = WaveSurfer.create({
+                container: wavesurferContainer.current,
+                waveColor: 'transparent',
+                progressColor: 'transparent',
+                audioRate: audioRate,
+                barWidth: 1,
+                barHeight: 1,
+                hideScrollbar: true,
+                barRadius: 1.5,
+                cursorWidth: 0,
+                barGap: 2,
+                height: 20
+              });
+              var peaks;
+              if (file.metadata) {
+                if (file.metadata.dur) {
+                  setDuration(file.metadata.dur);
+                  setCurrentTime(formatAudioVideoTime(file.metadata.dur));
+                }
+                if (file.metadata.tmb) {
+                  var maxVal = Array.isArray(file.metadata.tmb) && file.metadata.tmb.length > 0 ? file.metadata.tmb.reduce(function (acc, n) {
+                    return n > acc ? n : acc;
+                  }, -Infinity) : 0;
+                  var dec = maxVal / 100;
+                  peaks = file.metadata.tmb.map(function (peak) {
+                    return peak / dec / 100;
+                  });
+                }
               }
-              if (file.metadata.tmb) {
-                var maxVal = Array.isArray(file.metadata.tmb) && file.metadata.tmb.length > 0 ? file.metadata.tmb.reduce(function (acc, n) {
-                  return n > acc ? n : acc;
-                }, -Infinity) : 0;
-                var dec = maxVal / 100;
-                peaks = file.metadata.tmb.map(function (peak) {
-                  return peak / dec / 100;
-                });
+              wavesurfer.current.load(audioUrl, peaks);
+              wavesurfer.current.on('ready', function () {
+                var _file$metadata, _file$metadata2;
+                var audioDuration = wavesurfer.current.getDuration();
+                setDuration((file === null || file === void 0 ? void 0 : (_file$metadata = file.metadata) === null || _file$metadata === void 0 ? void 0 : _file$metadata.dur) || audioDuration);
+                setCurrentTime(formatAudioVideoTime((file === null || file === void 0 ? void 0 : (_file$metadata2 = file.metadata) === null || _file$metadata2 === void 0 ? void 0 : _file$metadata2.dur) || audioDuration));
+                wavesurfer.current.drawBuffer = function (d) {
+                  log.info('filters --- ', d);
+                };
+              });
+              wavesurfer.current.on('finish', function () {
+                var _file$metadata3, _file$metadata4;
+                setPlayAudio(false);
+                wavesurfer.current.seekTo(0);
+                var audioDuration = wavesurfer.current.getDuration();
+                setDuration((file === null || file === void 0 ? void 0 : (_file$metadata3 = file.metadata) === null || _file$metadata3 === void 0 ? void 0 : _file$metadata3.dur) || audioDuration);
+                setCurrentTime(formatAudioVideoTime((file === null || file === void 0 ? void 0 : (_file$metadata4 = file.metadata) === null || _file$metadata4 === void 0 ? void 0 : _file$metadata4.dur) || audioDuration));
+                setCurrentTimeSeconds(0);
+                if (playingAudioId === file.id) {
+                  dispatch(setPlayingAudioIdAC(null));
+                }
+                clearInterval(intervalRef.current);
+                if (onClose) {
+                  onClose();
+                }
+              });
+              wavesurfer.current.on('pause', function () {
+                setPlayAudio(false);
+                if (playingAudioId === file.id) {
+                  dispatch(setPlayingAudioIdAC(null));
+                }
+                clearInterval(intervalRef.current);
+              });
+              wavesurfer.current.on('interaction', function () {
+                var currentTime = wavesurfer.current.getCurrentTime();
+                setCurrentTime(formatAudioVideoTime(currentTime));
+                setCurrentTimeSeconds(currentTime);
+              });
+              if (url !== '_') {
+                setIsRendered(true);
               }
             }
-            wavesurfer.current.load(url, peaks);
-            wavesurfer.current.on('ready', function () {
-              var audioDuration = wavesurfer.current.getDuration();
-              setDuration(audioDuration);
-              setCurrentTime(formatAudioVideoTime(audioDuration));
-              wavesurfer.current.drawBuffer = function (d) {
-                log.info('filters --- ', d);
-              };
-            });
-            wavesurfer.current.on('finish', function () {
-              setPlayAudio(false);
-              wavesurfer.current.seekTo(0);
-              var audioDuration = wavesurfer.current.getDuration();
-              setDuration(audioDuration);
-              setCurrentTime(formatAudioVideoTime(audioDuration));
-              setCurrentTimeSeconds(0);
-              if (playingAudioId === file.id) {
-                dispatch(setPlayingAudioIdAC(null));
-              }
-              clearInterval(intervalRef.current);
-              if (onClose) {
-                onClose();
-              }
-            });
-            wavesurfer.current.on('pause', function () {
-              setPlayAudio(false);
-              if (playingAudioId === file.id) {
-                dispatch(setPlayingAudioIdAC(null));
+            var audioUrl = url;
+            var needsConversion = isSafari() && url && url !== '_' && (url.endsWith('.mp3') || ((_file$name = file.name) === null || _file$name === void 0 ? void 0 : _file$name.endsWith('.mp3')) || file.type === 'audio/mpeg');
+            var _temp = function () {
+              if (needsConversion) {
+                return _catch(function () {
+                  if (convertedUrlRef.current) {
+                    URL.revokeObjectURL(convertedUrlRef.current);
+                    convertedUrlRef.current = null;
+                  }
+                  var cacheKey = file.id || url;
+                  return Promise.resolve(fetch(url, {
+                    cache: 'no-store'
+                  })).then(function (response) {
+                    if (!response.ok) {
+                      throw new Error("Failed to fetch audio: " + response.statusText);
+                    }
+                    return Promise.resolve(response.blob()).then(function (blob) {
+                      var uniqueFileName = (file.id || Date.now()) + "_" + (file.name || 'audio.mp3');
+                      var audioFile = new File([blob], uniqueFileName, {
+                        type: blob.type || 'audio/mpeg',
+                        lastModified: Date.now()
+                      });
+                      return Promise.resolve(convertAudioForSafari(audioFile, file === null || file === void 0 ? void 0 : file.messageId)).then(function (convertedFile) {
+                        var convertedBlobUrl = URL.createObjectURL(convertedFile);
+                        audioUrl = convertedBlobUrl;
+                        convertedUrlRef.current = convertedBlobUrl;
+                        log.info("Converted audio for Safari: " + cacheKey + " -> " + convertedBlobUrl);
+                      });
+                    });
+                  });
+                }, function (conversionError) {
+                  log.warn('Failed to convert audio for Safari, using original:', conversionError);
+                  audioUrl = url;
+                });
               }
-              clearInterval(intervalRef.current);
-            });
-            wavesurfer.current.on('interaction', function () {
-              var currentTime = wavesurfer.current.getCurrentTime();
-              setCurrentTime(formatAudioVideoTime(currentTime));
-              setCurrentTimeSeconds(currentTime);
-            });
-            if (url !== '_') {
-              setIsRendered(true);
-            }
-          } catch (e) {
+            }();
+            return _temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp);
+          }, function (e) {
             log.error('Failed to init wavesurfer', e);
-          }
-          return Promise.resolve();
+          }));
         } catch (e) {
           return Promise.reject(e);
         }
@@ -34337,8 +34548,16 @@ var AudioPlayer = function AudioPlayer(_ref) {
     }
     return function () {
       clearInterval(intervalRef.current);
+      if (convertedUrlRef.current) {
+        URL.revokeObjectURL(convertedUrlRef.current);
+        convertedUrlRef.current = null;
+      }
+      if (wavesurfer.current) {
+        wavesurfer.current.destroy();
+        wavesurfer.current = null;
+      }
     };
-  }, [url]);
+  }, [url, file.id]);
   React.useEffect(function () {
     if (playAudio && playingAudioId && playingAudioId !== "player_" + file.id && wavesurfer.current) {
       setPlayAudio(false);
@@ -34356,8 +34575,8 @@ var AudioPlayer = function AudioPlayer(_ref) {
     iconColor: accentColor
   }))), /*#__PURE__*/React__default.createElement(WaveContainer, null, /*#__PURE__*/React__default.createElement(VisualizationWrapper, null, /*#__PURE__*/React__default.createElement(AudioVisualizationPlaceholder, {
     ref: wavesurferContainer,
-    hidden: !!((_file$metadata = file.metadata) !== null && _file$metadata !== void 0 && _file$metadata.tmb && Array.isArray(file.metadata.tmb))
-  }), ((_file$metadata2 = file.metadata) === null || _file$metadata2 === void 0 ? void 0 : _file$metadata2.tmb) && Array.isArray(file.metadata.tmb) && (/*#__PURE__*/React__default.createElement(AudioVisualization, {
+    hidden: !!((_file$metadata5 = file.metadata) !== null && _file$metadata5 !== void 0 && _file$metadata5.tmb && Array.isArray(file.metadata.tmb))
+  }), ((_file$metadata6 = file.metadata) === null || _file$metadata6 === void 0 ? void 0 : _file$metadata6.tmb) && Array.isArray(file.metadata.tmb) && (/*#__PURE__*/React__default.createElement(AudioVisualization, {
     tmb: file.metadata.tmb,
     duration: duration || file.metadata.dur || 0,
     currentTime: currentTimeSeconds,
@@ -34373,7 +34592,7 @@ var AudioPlayer = function AudioPlayer(_ref) {
     backgroundColor: backgroundSections
   }, audioRate, /*#__PURE__*/React__default.createElement("span", null, "X"))), /*#__PURE__*/React__default.createElement(Timer$1, {
     color: textSecondary
-  }, currentTime || formatAudioVideoTime(((_file$metadata3 = file.metadata) === null || _file$metadata3 === void 0 ? void 0 : _file$metadata3.dur) || 0)));
+  }, currentTime || formatAudioVideoTime(((_file$metadata7 = file.metadata) === null || _file$metadata7 === void 0 ? void 0 : _file$metadata7.dur) || 0)));
 };
 var Container$f = styled__default.div(_templateObject$v || (_templateObject$v = _taggedTemplateLiteralLoose(["\n  position: relative;\n  display: flex;\n  align-items: flex-start;\n  width: 230px;\n  padding: 8px 12px;\n  ", "\n  ", "\n"])), function (props) {
   return props.backgroundColor && "background-color: " + props.backgroundColor + ";";
@@ -35260,7 +35479,11 @@ var Attachment = function Attachment(_ref) {
     channelId: channelId,
     incoming: incoming,
     viewOnce: viewOnce,
-    setViewOnceVoiceModalOpen: viewOnce ? setViewOnceVoiceModalOpen : undefined
+    setViewOnceVoiceModalOpen: viewOnce ? function () {
+      if (connectionStatus === CONNECTION_STATUS.CONNECTED) {
+        setViewOnceVoiceModalOpen(true);
+      }
+    } : undefined
   })) : attachment.type === attachmentTypes.link ? null : (
   /*#__PURE__*/
   React__default.createElement(AttachmentFile$1, {
@@ -45421,7 +45644,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     if (activeChannel.id) {
       prevActiveChannelId = activeChannel.id;
     }
-    if (activeChannel.id && membersHasNext === undefined) {
+    if (activeChannel.id && membersHasNext === undefined && !(activeChannel.type === DEFAULT_CHANNEL_TYPE.DIRECT && activeChannel.memberCount === 2)) {
       dispatch(getMembersAC(activeChannel.id));
     }
     setMentionedUsers([]);
@@ -49054,7 +49277,7 @@ var Members = function Members(_ref) {
       if (getFromContacts) {
         dispatch(getContactsAC());
       }
-      if (channel !== null && channel !== void 0 && channel.id) {
+      if (channel !== null && channel !== void 0 && channel.id && !(channel.type === DEFAULT_CHANNEL_TYPE.DIRECT && channel.memberCount === 2)) {
         dispatch(getMembersAC(channel.id));
       }
     }

package/index.modern.js

@@ -10,6 +10,8 @@ import LinkifyIt from 'linkify-it';
 import Cropper from 'react-easy-crop';
 import Carousel from 'react-elastic-carousel';
 import { CircularProgressbar } from 'react-circular-progressbar';
+import { FFmpeg } from '@ffmpeg/ffmpeg';
+import { fetchFile, toBlobURL } from '@ffmpeg/util';
 import { $applyNodeReplacement, TextNode, $createTextNode, $getSelection, $isRangeSelection, $isTextNode, FORMAT_TEXT_COMMAND, SELECTION_CHANGE_COMMAND, COMMAND_PRIORITY_LOW, $getRoot, $createParagraphNode, KEY_BACKSPACE_COMMAND, KEY_DELETE_COMMAND, PASTE_COMMAND, COMMAND_PRIORITY_NORMAL } from 'lexical';
 import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext';
 import { LexicalComposer } from '@lexical/react/LexicalComposer';
@@ -34114,9 +34116,170 @@ var Bar = styled.div(_templateObject2$q || (_templateObject2$q = _taggedTemplate
   return props.progressColor;
 });
 
+var ffmpegInstance = null;
+var isFFmpegLoading = false;
+var ffmpegLoadPromise = null;
+var isSafari = function isSafari() {
+  if (typeof window === 'undefined' || !window.navigator) {
+    return false;
+  }
+  var userAgent = window.navigator.userAgent;
+  return /^((?!chrome|android).)*safari/i.test(userAgent);
+};
+var initFFmpeg = function initFFmpeg() {
+  try {
+    if (ffmpegInstance) {
+      return Promise.resolve(ffmpegInstance);
+    }
+    if (isFFmpegLoading && ffmpegLoadPromise) {
+      return Promise.resolve(ffmpegLoadPromise.then(function () {
+        if (!ffmpegInstance) {
+          throw new Error('FFmpeg failed to initialize');
+        }
+        return ffmpegInstance;
+      }));
+    }
+    isFFmpegLoading = true;
+    ffmpegLoadPromise = function () {
+      try {
+        return Promise.resolve(_catch(function () {
+          var ffmpeg = new FFmpeg();
+          var baseURL = 'https://unpkg.com/@ffmpeg/core@0.12.6/dist/umd';
+          var _load = ffmpeg.load;
+          return Promise.resolve(toBlobURL(baseURL + "/ffmpeg-core.js", 'text/javascript')).then(function (_toBlobURL) {
+            return Promise.resolve(toBlobURL(baseURL + "/ffmpeg-core.wasm", 'application/wasm')).then(function (_toBlobURL2) {
+              return Promise.resolve(_load.call(ffmpeg, {
+                coreURL: _toBlobURL,
+                wasmURL: _toBlobURL2
+              })).then(function () {
+                ffmpegInstance = ffmpeg;
+                isFFmpegLoading = false;
+              });
+            });
+          });
+        }, function (error) {
+          isFFmpegLoading = false;
+          ffmpegLoadPromise = null;
+          ffmpegInstance = null;
+          log.error('Failed to load FFmpeg:', error);
+          throw error;
+        }));
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    }();
+    return Promise.resolve(ffmpegLoadPromise).then(function () {
+      if (!ffmpegInstance) {
+        throw new Error('FFmpeg instance is null after initialization');
+      }
+      return ffmpegInstance;
+    });
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
+var convertMp3ToAac = function convertMp3ToAac(file, messageId) {
+  try {
+    return Promise.resolve(_catch(function () {
+      var maxSize = 50 * 1024 * 1024;
+      if (file.size > maxSize) {
+        throw new Error("File size (" + (file.size / 1024 / 1024).toFixed(2) + "MB) exceeds maximum allowed size (50MB)");
+      }
+      if (file.size === 0) {
+        throw new Error('File is empty');
+      }
+      return Promise.resolve(initFFmpeg()).then(function (ffmpeg) {
+        function _temp8() {
+          function _temp6() {
+            return Promise.resolve(fetchFile(file)).then(function (inputData) {
+              return Promise.resolve(ffmpeg.writeFile(messageId + "_input.mp3", inputData)).then(function () {
+                return Promise.resolve(ffmpeg.exec(['-i', messageId + "_input.mp3", '-c:a', 'aac', '-b:a', '128k', '-movflags', '+faststart', messageId + "_output.m4a"])).then(function () {
+                  return Promise.resolve(ffmpeg.readFile(messageId + "_output.m4a")).then(function (data) {
+                    function _temp4() {
+                      function _temp2() {
+                        var dataArray;
+                        if (data instanceof Uint8Array) {
+                          dataArray = data;
+                        } else if (typeof data === 'string') {
+                          var binaryString = atob(data);
+                          var bytes = new Uint8Array(binaryString.length);
+                          for (var i = 0; i < binaryString.length; i++) {
+                            bytes[i] = binaryString.charCodeAt(i);
+                          }
+                          dataArray = bytes;
+                        } else {
+                          dataArray = new Uint8Array(data);
+                        }
+                        var arrayBuffer = dataArray.buffer.slice(dataArray.byteOffset, dataArray.byteOffset + dataArray.byteLength);
+                        var blob = new Blob([arrayBuffer], {
+                          type: 'audio/mp4'
+                        });
+                        var convertedFile = new File([blob], messageId + "_" + file.name.replace('.mp3', '.m4a'), {
+                          type: 'audio/mp4',
+                          lastModified: file.lastModified
+                        });
+                        return convertedFile;
+                      }
+                      var _temp = _catch(function () {
+                        return Promise.resolve(ffmpeg.deleteFile(messageId + "_output.m4a")).then(function () {});
+                      }, function () {});
+                      return _temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp);
+                    }
+                    var _temp3 = _catch(function () {
+                      return Promise.resolve(ffmpeg.deleteFile(messageId + "_input.mp3")).then(function () {});
+                    }, function () {});
+                    return _temp3 && _temp3.then ? _temp3.then(_temp4) : _temp4(_temp3);
+                  });
+                });
+              });
+            });
+          }
+          var _temp5 = _catch(function () {
+            return Promise.resolve(ffmpeg.deleteFile(messageId + "_output.m4a")).then(function () {});
+          }, function () {});
+          return _temp5 && _temp5.then ? _temp5.then(_temp6) : _temp6(_temp5);
+        }
+        var _temp7 = _catch(function () {
+          return Promise.resolve(ffmpeg.deleteFile(messageId + "_input.mp3")).then(function () {});
+        }, function () {});
+        return _temp7 && _temp7.then ? _temp7.then(_temp8) : _temp8(_temp7);
+      });
+    }, function (error) {
+      log.error('Failed to convert MP3 to AAC:', error);
+      throw error;
+    }));
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
+var convertAudioForSafari = function convertAudioForSafari(file, messageId) {
+  try {
+    var _exit = false;
+    var _temp9 = function () {
+      if (isSafari() && file.type === 'audio/mpeg' && file.name.endsWith('.mp3')) {
+        return _catch(function () {
+          return Promise.resolve(convertMp3ToAac(file, messageId)).then(function (_await$convertMp3ToAa) {
+            _exit = true;
+            return _await$convertMp3ToAa;
+          });
+        }, function (error) {
+          log.warn('Audio conversion failed, using original file:', error);
+          _exit = true;
+          return file;
+        });
+      }
+    }();
+    return Promise.resolve(_temp9 && _temp9.then ? _temp9.then(function (_result2) {
+      return _exit ? _result2 : file;
+    }) : _exit ? _temp9 : file);
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
+
 var _templateObject$v, _templateObject2$r, _templateObject3$l, _templateObject4$h, _templateObject5$e, _templateObject6$c, _templateObject7$b, _templateObject8$b;
 var AudioPlayer = function AudioPlayer(_ref) {
-  var _file$metadata, _file$metadata2, _file$metadata3;
+  var _file$metadata5, _file$metadata6, _file$metadata7;
   var url = _ref.url,
     file = _ref.file,
     messagePlayed = _ref.messagePlayed,
@@ -34167,6 +34330,7 @@ var AudioPlayer = function AudioPlayer(_ref) {
   var wavesurfer = useRef(null);
   var wavesurferContainer = useRef(null);
   var intervalRef = useRef(null);
+  var convertedUrlRef = useRef(null);
   var handleSetAudioRate = function handleSetAudioRate() {
     if (wavesurfer.current) {
       if (audioRate === 1) {
@@ -34250,84 +34414,131 @@ var AudioPlayer = function AudioPlayer(_ref) {
   }, [recording.initRecording]);
   useEffect(function () {
     if (url) {
+      if (convertedUrlRef.current) {
+        URL.revokeObjectURL(convertedUrlRef.current);
+        convertedUrlRef.current = null;
+      }
       if (url !== '_' && !isRendered && wavesurfer && wavesurfer.current) {
         wavesurfer.current.destroy();
       }
       var initWaveSurfer = function initWaveSurfer() {
         try {
-          try {
-            wavesurfer.current = WaveSurfer.create({
-              container: wavesurferContainer.current,
-              waveColor: 'transparent',
-              progressColor: 'transparent',
-              audioRate: audioRate,
-              barWidth: 1,
-              barHeight: 1,
-              hideScrollbar: true,
-              barRadius: 1.5,
-              cursorWidth: 0,
-              barGap: 2,
-              height: 20
-            });
-            var peaks;
-            if (file.metadata) {
-              if (file.metadata.dur) {
-                setDuration(file.metadata.dur);
-                setCurrentTime(formatAudioVideoTime(file.metadata.dur));
+          var _exit = false;
+          return Promise.resolve(_catch(function () {
+            var _file$name;
+            function _temp2(_result2) {
+              if (_exit) return _result2;
+              wavesurfer.current = WaveSurfer.create({
+                container: wavesurferContainer.current,
+                waveColor: 'transparent',
+                progressColor: 'transparent',
+                audioRate: audioRate,
+                barWidth: 1,
+                barHeight: 1,
+                hideScrollbar: true,
+                barRadius: 1.5,
+                cursorWidth: 0,
+                barGap: 2,
+                height: 20
+              });
+              var peaks;
+              if (file.metadata) {
+                if (file.metadata.dur) {
+                  setDuration(file.metadata.dur);
+                  setCurrentTime(formatAudioVideoTime(file.metadata.dur));
+                }
+                if (file.metadata.tmb) {
+                  var maxVal = Array.isArray(file.metadata.tmb) && file.metadata.tmb.length > 0 ? file.metadata.tmb.reduce(function (acc, n) {
+                    return n > acc ? n : acc;
+                  }, -Infinity) : 0;
+                  var dec = maxVal / 100;
+                  peaks = file.metadata.tmb.map(function (peak) {
+                    return peak / dec / 100;
+                  });
+                }
               }
-              if (file.metadata.tmb) {
-                var maxVal = Array.isArray(file.metadata.tmb) && file.metadata.tmb.length > 0 ? file.metadata.tmb.reduce(function (acc, n) {
-                  return n > acc ? n : acc;
-                }, -Infinity) : 0;
-                var dec = maxVal / 100;
-                peaks = file.metadata.tmb.map(function (peak) {
-                  return peak / dec / 100;
-                });
+              wavesurfer.current.load(audioUrl, peaks);
+              wavesurfer.current.on('ready', function () {
+                var _file$metadata, _file$metadata2;
+                var audioDuration = wavesurfer.current.getDuration();
+                setDuration((file === null || file === void 0 ? void 0 : (_file$metadata = file.metadata) === null || _file$metadata === void 0 ? void 0 : _file$metadata.dur) || audioDuration);
+                setCurrentTime(formatAudioVideoTime((file === null || file === void 0 ? void 0 : (_file$metadata2 = file.metadata) === null || _file$metadata2 === void 0 ? void 0 : _file$metadata2.dur) || audioDuration));
+                wavesurfer.current.drawBuffer = function (d) {
+                  log.info('filters --- ', d);
+                };
+              });
+              wavesurfer.current.on('finish', function () {
+                var _file$metadata3, _file$metadata4;
+                setPlayAudio(false);
+                wavesurfer.current.seekTo(0);
+                var audioDuration = wavesurfer.current.getDuration();
+                setDuration((file === null || file === void 0 ? void 0 : (_file$metadata3 = file.metadata) === null || _file$metadata3 === void 0 ? void 0 : _file$metadata3.dur) || audioDuration);
+                setCurrentTime(formatAudioVideoTime((file === null || file === void 0 ? void 0 : (_file$metadata4 = file.metadata) === null || _file$metadata4 === void 0 ? void 0 : _file$metadata4.dur) || audioDuration));
+                setCurrentTimeSeconds(0);
+                if (playingAudioId === file.id) {
+                  dispatch(setPlayingAudioIdAC(null));
+                }
+                clearInterval(intervalRef.current);
+                if (onClose) {
+                  onClose();
+                }
+              });
+              wavesurfer.current.on('pause', function () {
+                setPlayAudio(false);
+                if (playingAudioId === file.id) {
+                  dispatch(setPlayingAudioIdAC(null));
+                }
+                clearInterval(intervalRef.current);
+              });
+              wavesurfer.current.on('interaction', function () {
+                var currentTime = wavesurfer.current.getCurrentTime();
+                setCurrentTime(formatAudioVideoTime(currentTime));
+                setCurrentTimeSeconds(currentTime);
+              });
+              if (url !== '_') {
+                setIsRendered(true);
               }
             }
-            wavesurfer.current.load(url, peaks);
-            wavesurfer.current.on('ready', function () {
-              var audioDuration = wavesurfer.current.getDuration();
-              setDuration(audioDuration);
-              setCurrentTime(formatAudioVideoTime(audioDuration));
-              wavesurfer.current.drawBuffer = function (d) {
-                log.info('filters --- ', d);
-              };
-            });
-            wavesurfer.current.on('finish', function () {
-              setPlayAudio(false);
-              wavesurfer.current.seekTo(0);
-              var audioDuration = wavesurfer.current.getDuration();
-              setDuration(audioDuration);
-              setCurrentTime(formatAudioVideoTime(audioDuration));
-              setCurrentTimeSeconds(0);
-              if (playingAudioId === file.id) {
-                dispatch(setPlayingAudioIdAC(null));
-              }
-              clearInterval(intervalRef.current);
-              if (onClose) {
-                onClose();
-              }
-            });
-            wavesurfer.current.on('pause', function () {
-              setPlayAudio(false);
-              if (playingAudioId === file.id) {
-                dispatch(setPlayingAudioIdAC(null));
+            var audioUrl = url;
+            var needsConversion = isSafari() && url && url !== '_' && (url.endsWith('.mp3') || ((_file$name = file.name) === null || _file$name === void 0 ? void 0 : _file$name.endsWith('.mp3')) || file.type === 'audio/mpeg');
+            var _temp = function () {
+              if (needsConversion) {
+                return _catch(function () {
+                  if (convertedUrlRef.current) {
+                    URL.revokeObjectURL(convertedUrlRef.current);
+                    convertedUrlRef.current = null;
+                  }
+                  var cacheKey = file.id || url;
+                  return Promise.resolve(fetch(url, {
+                    cache: 'no-store'
+                  })).then(function (response) {
+                    if (!response.ok) {
+                      throw new Error("Failed to fetch audio: " + response.statusText);
+                    }
+                    return Promise.resolve(response.blob()).then(function (blob) {
+                      var uniqueFileName = (file.id || Date.now()) + "_" + (file.name || 'audio.mp3');
+                      var audioFile = new File([blob], uniqueFileName, {
+                        type: blob.type || 'audio/mpeg',
+                        lastModified: Date.now()
+                      });
+                      return Promise.resolve(convertAudioForSafari(audioFile, file === null || file === void 0 ? void 0 : file.messageId)).then(function (convertedFile) {
+                        var convertedBlobUrl = URL.createObjectURL(convertedFile);
+                        audioUrl = convertedBlobUrl;
+                        convertedUrlRef.current = convertedBlobUrl;
+                        log.info("Converted audio for Safari: " + cacheKey + " -> " + convertedBlobUrl);
+                      });
+                    });
+                  });
+                }, function (conversionError) {
+                  log.warn('Failed to convert audio for Safari, using original:', conversionError);
+                  audioUrl = url;
+                });
               }
-              clearInterval(intervalRef.current);
-            });
-            wavesurfer.current.on('interaction', function () {
-              var currentTime = wavesurfer.current.getCurrentTime();
-              setCurrentTime(formatAudioVideoTime(currentTime));
-              setCurrentTimeSeconds(currentTime);
-            });
-            if (url !== '_') {
-              setIsRendered(true);
-            }
-          } catch (e) {
+            }();
+            return _temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp);
+          }, function (e) {
             log.error('Failed to init wavesurfer', e);
-          }
-          return Promise.resolve();
+          }));
         } catch (e) {
           return Promise.reject(e);
         }
@@ -34336,8 +34547,16 @@ var AudioPlayer = function AudioPlayer(_ref) {
     }
     return function () {
       clearInterval(intervalRef.current);
+      if (convertedUrlRef.current) {
+        URL.revokeObjectURL(convertedUrlRef.current);
+        convertedUrlRef.current = null;
+      }
+      if (wavesurfer.current) {
+        wavesurfer.current.destroy();
+        wavesurfer.current = null;
+      }
     };
-  }, [url]);
+  }, [url, file.id]);
   useEffect(function () {
     if (playAudio && playingAudioId && playingAudioId !== "player_" + file.id && wavesurfer.current) {
       setPlayAudio(false);
@@ -34355,8 +34574,8 @@ var AudioPlayer = function AudioPlayer(_ref) {
     iconColor: accentColor
   }))), /*#__PURE__*/React__default.createElement(WaveContainer, null, /*#__PURE__*/React__default.createElement(VisualizationWrapper, null, /*#__PURE__*/React__default.createElement(AudioVisualizationPlaceholder, {
     ref: wavesurferContainer,
-    hidden: !!((_file$metadata = file.metadata) !== null && _file$metadata !== void 0 && _file$metadata.tmb && Array.isArray(file.metadata.tmb))
-  }), ((_file$metadata2 = file.metadata) === null || _file$metadata2 === void 0 ? void 0 : _file$metadata2.tmb) && Array.isArray(file.metadata.tmb) && (/*#__PURE__*/React__default.createElement(AudioVisualization, {
+    hidden: !!((_file$metadata5 = file.metadata) !== null && _file$metadata5 !== void 0 && _file$metadata5.tmb && Array.isArray(file.metadata.tmb))
+  }), ((_file$metadata6 = file.metadata) === null || _file$metadata6 === void 0 ? void 0 : _file$metadata6.tmb) && Array.isArray(file.metadata.tmb) && (/*#__PURE__*/React__default.createElement(AudioVisualization, {
     tmb: file.metadata.tmb,
     duration: duration || file.metadata.dur || 0,
     currentTime: currentTimeSeconds,
@@ -34372,7 +34591,7 @@ var AudioPlayer = function AudioPlayer(_ref) {
     backgroundColor: backgroundSections
   }, audioRate, /*#__PURE__*/React__default.createElement("span", null, "X"))), /*#__PURE__*/React__default.createElement(Timer$1, {
     color: textSecondary
-  }, currentTime || formatAudioVideoTime(((_file$metadata3 = file.metadata) === null || _file$metadata3 === void 0 ? void 0 : _file$metadata3.dur) || 0)));
+  }, currentTime || formatAudioVideoTime(((_file$metadata7 = file.metadata) === null || _file$metadata7 === void 0 ? void 0 : _file$metadata7.dur) || 0)));
 };
 var Container$f = styled.div(_templateObject$v || (_templateObject$v = _taggedTemplateLiteralLoose(["\n  position: relative;\n  display: flex;\n  align-items: flex-start;\n  width: 230px;\n  padding: 8px 12px;\n  ", "\n  ", "\n"])), function (props) {
   return props.backgroundColor && "background-color: " + props.backgroundColor + ";";
@@ -35259,7 +35478,11 @@ var Attachment = function Attachment(_ref) {
     channelId: channelId,
     incoming: incoming,
     viewOnce: viewOnce,
-    setViewOnceVoiceModalOpen: viewOnce ? setViewOnceVoiceModalOpen : undefined
+    setViewOnceVoiceModalOpen: viewOnce ? function () {
+      if (connectionStatus === CONNECTION_STATUS.CONNECTED) {
+        setViewOnceVoiceModalOpen(true);
+      }
+    } : undefined
   })) : attachment.type === attachmentTypes.link ? null : (
   /*#__PURE__*/
   React__default.createElement(AttachmentFile$1, {
@@ -45420,7 +45643,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     if (activeChannel.id) {
       prevActiveChannelId = activeChannel.id;
     }
-    if (activeChannel.id && membersHasNext === undefined) {
+    if (activeChannel.id && membersHasNext === undefined && !(activeChannel.type === DEFAULT_CHANNEL_TYPE.DIRECT && activeChannel.memberCount === 2)) {
       dispatch(getMembersAC(activeChannel.id));
     }
     setMentionedUsers([]);
@@ -49053,7 +49276,7 @@ var Members = function Members(_ref) {
       if (getFromContacts) {
         dispatch(getContactsAC());
       }
-      if (channel !== null && channel !== void 0 && channel.id) {
+      if (channel !== null && channel !== void 0 && channel.id && !(channel.type === DEFAULT_CHANNEL_TYPE.DIRECT && channel.memberCount === 2)) {
         dispatch(getMembersAC(channel.id));
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sceyt-chat-react-uikit",
-  "version": "1.8.0-beta.5",
+  "version": "1.8.0-beta.7",
   "description": "Interactive React UI Components for Sceyt Chat.",
   "author": "Sceyt",
   "license": "MIT",