v2.16.7

Author: bernerdad

client/common/changelog.txt

@@ -1,3 +1,18 @@
+2.16.7 (04/07/2025)
+All:
+   * Added flag for Iran. #1413
+   * Improved Russian translations. #1411
+   * Fixed Look & Feel preferences not translated. #1412
+   * Fixed 400 'header or cookie too large' for Cloudflare API endpoints. #1399
+   * Fixed incorrectly formatted client log entries. #1416
+Windows:
+   * Fixed playing a sound may capture the audio device, preventing Windows from sleeping. #1410
+MacOS:
+   * Fixed wsnet not detecting OS Default DNS server when using DHCP. #1376
+   * Fixed app firewall blocking Sidecar/Continuity features. #415
+   * Fixed docked window is sometimes in the wrong position. #1334
+
+
 2.16.6 (24/06/2025)
 All:
    * Fixed various UI bugs. #1151 #1400 #1401

client/common/utils/log/logger.cpp

@@ -15,6 +15,45 @@
 
 namespace log_utils {
 
+
+// The custom formatter that allows:
+// to output unformatted messages for the logger with "raw" name
+// to output messages for the logger with "qt" name for message from Qt loggers
+// to output messages for all other loggers with standard json pattern
+
+class CustomFormatter : public spdlog::formatter {
+public:
+
+    explicit CustomFormatter(std::unique_ptr<spdlog::formatter> formatter)
+    {
+        formatter_ = std::move(formatter);
+        jsonFormatter_ = log_utils::createJsonFormatter();
+    }
+
+    virtual ~CustomFormatter() = default;
+
+    void format(const spdlog::details::log_msg &msg, spdlog::memory_buf_t &dest) override
+    {
+        if (msg.logger_name == "raw") {
+            dest.append(msg.payload.data(), msg.payload.data() + msg.payload.size());
+        } else if (msg.logger_name == "qt") {
+            formatter_->format(msg, dest);
+        } else {
+            jsonFormatter_->format(msg, dest);
+        }
+    }
+
+    std::unique_ptr<formatter> clone() const override
+    {
+        return spdlog::details::make_unique<CustomFormatter>(formatter_->clone());
+    }
+
+private:
+    std::unique_ptr<spdlog::formatter> formatter_;
+    std::unique_ptr<spdlog::formatter> jsonFormatter_;
+};
+
+
 bool Logger::install(const QString &logFilePath, bool consoleOutput)
 {
     QLoggingCategory::setFilterRules("qt.tlsbackend.ossl=false\nqt.network.ssl=false");
@@ -38,7 +77,7 @@ bool Logger::install(const QString &logFilePath, bool consoleOutput)
         // Create rotation logger with 2 file with unlimited size
         // rotate it on open, the first file is the current log, the 2nd is the previous log
         auto fileSink = std::make_shared<spdlog::sinks::rotating_file_sink_mt>(path, SIZE_MAX, 1, true);
-        auto defaultLogger = std::make_shared<spdlog::logger>("default", fileSink);
+        auto defaultLogger = std::make_shared<spdlog::logger>("qt", fileSink);
         spdlog::set_default_logger(defaultLogger);
 
         // Create the logger without formatting for logging output from libraries such as wsnet, which format logs themselves
@@ -96,16 +135,17 @@ void Logger::myMessageHandler(QtMsgType type, const QMessageLogContext &context,
     //::OutputDebugString(qUtf16Printable(s));
 #endif
 
+    auto qtLogger = spdlog::get("qt");
     std::string escapedMsg = log_utils::escape_string(s.toStdString());
     static const std::string fmt = "\"mod\": \"{}\", \"msg\": \"{}\"";
     if (type == QtDebugMsg)
-        spdlog::debug(fmt, context.category, escapedMsg);
+        qtLogger->debug(fmt, context.category, escapedMsg);
     else if (type == QtWarningMsg)
-        spdlog::warn(fmt, context.category, escapedMsg);
+        qtLogger->warn(fmt, context.category, escapedMsg);
     else if (type == QtInfoMsg)
-        spdlog::info(fmt, context.category, escapedMsg);
+        qtLogger->info(fmt, context.category, escapedMsg);
     else
-        spdlog::error(fmt, context.category, escapedMsg);
+        qtLogger->error(fmt, context.category, escapedMsg);
 }
 
 void Logger::startConnectionMode(const std::string &id)
@@ -136,10 +176,8 @@ spdlog::logger *Logger::getSpdLogger(const std::string &category)
 {
     auto it = spd_loggers_.find(category);
     if (it == spd_loggers_.end()) {
-        auto formatter = log_utils::createJsonFormatter();
         auto sinks = spdlog::default_logger()->sinks();
         auto logger = std::make_shared<spdlog::logger>(category, sinks.begin(), sinks.end());
-        logger->set_formatter(std::move(formatter));
         spd_loggers_[category] = logger;
         return logger.get();
     } else {

client/common/utils/log/spdlog_utils.h

@@ -170,34 +170,6 @@ class customFormatterFlag : public spdlog::custom_flag_formatter
     }
 };
 
-// The custom formatter that allows to output unformatted messages for the logger with "raw" name
-class CustomFormatter : public spdlog::formatter {
-public:
-
-    explicit CustomFormatter(std::unique_ptr<spdlog::formatter> formatter)
-    {
-        formatter_ = std::move(formatter);
-    }
-
-    virtual ~CustomFormatter() = default;
-
-    void format(const spdlog::details::log_msg &msg, spdlog::memory_buf_t &dest) override
-    {
-        if (msg.logger_name == "raw") {
-            dest.append(msg.payload.data(), msg.payload.data() + msg.payload.size());
-        } else {
-            formatter_->format(msg, dest);
-        }
-    }
-
-    std::unique_ptr<formatter> clone() const override
-    {
-        return spdlog::details::make_unique<CustomFormatter>(formatter_->clone());
-    }
-
-private:
-    std::unique_ptr<spdlog::formatter> formatter_;
-};
 
 // quick check if the file is a new or old log format
 // check that the first 3 lines start and end with symbols { and }

client/common/utils/network_utils/network_utils_mac.mm

@@ -248,7 +248,7 @@
     QStringList list = res.split(QRegularExpression("\\s+"), Qt::SkipEmptyParts);
     QStringList ret;
     for (const auto &s : list)
-        if (s.startsWith("p2p") || s.startsWith("awdl"))
+        if (s.startsWith("p2p") || s.startsWith("awdl") || s.startsWith("llw"))
             ret << s;
     return ret;
 }

client/common/version/windscribe_version.h

@@ -2,11 +2,11 @@
 
 #define WINDSCRIBE_MAJOR_VERSION 2
 #define WINDSCRIBE_MINOR_VERSION 16
-#define WINDSCRIBE_BUILD_VERSION 6
+#define WINDSCRIBE_BUILD_VERSION 7
 
 // only one of these should be enabled; neither -> stable
-//#define WINDSCRIBE_IS_BETA
-#define WINDSCRIBE_IS_GUINEA_PIG
+#define WINDSCRIBE_IS_BETA
+//#define WINDSCRIBE_IS_GUINEA_PIG
 
 #define STR_HELPER(x) #x
 #define STR(x) STR_HELPER(x)

client/gui/images.qrc

@@ -115,6 +115,7 @@
         <file>svg/flags/ie.svg</file>
         <file>svg/flags/il.svg</file>
         <file>svg/flags/in.svg</file>
+        <file>svg/flags/ir.svg</file>
         <file>svg/flags/is.svg</file>
         <file>svg/flags/it.svg</file>
         <file>svg/flags/jp.svg</file>
@@ -206,6 +207,7 @@
         <file>svg/flags/ie_circle.svg</file>
         <file>svg/flags/il_circle.svg</file>
         <file>svg/flags/in_circle.svg</file>
+        <file>svg/flags/ir_circle.svg</file>
         <file>svg/flags/is_circle.svg</file>
         <file>svg/flags/it_circle.svg</file>
         <file>svg/flags/jp_circle.svg</file>

client/gui/mainwindow.cpp

@@ -147,6 +147,19 @@ MainWindow::MainWindow() :
     qCDebug(LOG_BASIC) << "GUI pid: " << guiPid;
     backend_ = new Backend(this);
 
+    // On MacOS the tray icon geometry can be invalid  for the first few milliseconds (on my Mac about 160 ms)
+    // Give the icon a chance to initialize completely within a maximum of 2 seconds for  the docked mode
+#if defined(Q_OS_MACOS)
+    if (backend_->getPreferences()->isDockedToTray()) {
+        QElapsedTimer t;
+        t.start();
+        while (!isTrayIconRectValid() && t.elapsed() < 2000) {
+            qApp->processEvents();
+            QThread::msleep(10);
+        }
+    }
+#endif
+
 #if defined(Q_OS_MACOS)
     permissionMonitor_ = new PermissionMonitor_mac(this);
     connect(permissionMonitor_, &PermissionMonitor_mac::locationPermissionUpdated, this, &MainWindow::onLocationPermissionUpdated);
@@ -3918,6 +3931,24 @@ void MainWindow::updateTrayTooltip(QString tooltip)
 #endif
 }
 
+bool MainWindow::isTrayIconRectValid()
+{
+    if (!trayIcon_.isVisible())
+        return false;
+
+    const QRect rc = trayIcon_.geometry();
+    if (!rc.isValid())
+       return false;
+
+    // check for valid screen because on macOS trayIcon_.geometry() can be valid but contain invalid coordinates
+    QScreen *screen = QGuiApplication::screenAt(rc.center());
+    if (!screen) {
+        return false;
+    }
+
+    return true;
+}
+
 void MainWindow::onWireGuardAtKeyLimit()
 {
     GeneralMessageController::instance().showMessage(

client/gui/mainwindow.h

@@ -347,6 +347,7 @@ private slots:
     void updateAppIconType(AppIconType type);
     void updateTrayIconType(AppIconType type);
     void updateTrayTooltip(QString tooltip);
+    bool isTrayIconRectValid();
     AppIconType currentAppIconType_;
     QSystemTrayIcon trayIcon_;
     QRect savedTrayIconRect_;

client/gui/preferenceswindow/lookandfeelwindow/lookandfeelwindowitem.cpp

@@ -57,6 +57,7 @@ LookAndFeelWindowItem::LookAndFeelWindowItem(ScalableGraphicsObject *parent, Pre
 
 
     // Populate combo boxes and other text
+    connect(&LanguageController::instance(), &LanguageController::languageChanged, this, &LookAndFeelWindowItem::onLanguageChanged);
     onLanguageChanged();
 }
 

client/gui/sounds/soundmanager.cpp

@@ -8,6 +8,8 @@ SoundManager::SoundManager(QObject *parent, Preferences *preferences)
 #ifdef Q_OS_MACOS
     // the default of "ffmpeg" does not seem to play anything, use native backend
     setenv("QT_MEDIA_BACKEND", "darwin", 1);
+#elif defined(Q_OS_WIN)
+    _putenv_s("QT_DISABLE_AUDIO_PREPARE", "1");
 #endif
     connect(preferences_, &Preferences::soundSettingsChanged, this, &SoundManager::onSoundSettingsChanged);