fix: opening portal webpage no longer depends on taskbar

Remove taskbar dependency, check if SessionManager service is started during system startup, wait for the service to start before opening portal webpage if not started

Log: Remove taskbar dependency for opening portal webpage
Influence: Opening portal webpage
PMS: TASK-360019

fix: 打开portal网页不再依赖任务栏

去掉任务栏的依赖，系统启动的时候判断是否启动SessionManager服务，在没有启动的情况下，等待该服务启动再打开portal网页

Log: 打开portal网页去掉任务栏的依赖
Influence: 打开portal网页

Author: ut003640

network-service-plugin/src/session/browserassist.cpp

@@ -5,7 +5,7 @@
 #include "sessioncontainer.h"
 #include "sessionipconfilct.h"
 #include "constants.h"
-#include "browserassist.h"
+#include "urlopenerhelper.h"
 
 #include <QDBusConnection>
 #include <QDBusInterface>
@@ -61,7 +61,8 @@ void SessionContainer::onIPConflictChanged(const QString &devicePath, const QStr
 
 void SessionContainer::onPortalDetected(const QString &url)
 {
-    BrowserAssist::openUrl(url);
+    qCDebug(DSM) << "detacted portal url" << url;
+    UrlOpenerHelper::openUrl(url);
 }
 
 void SessionContainer::onProxyMethodChanged(const QString &method)

network-service-plugin/src/session/sessioncontainer.cpp

@@ -0,0 +1,156 @@
+// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
+//
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+#include "urlopenerhelper.h"
+#include "constants.h"
+
+#include <QDBusConnection>
+#include <QDBusInterface>
+#include <QDBusConnectionInterface>
+#include <QDBusServiceWatcher>
+#include <QProcess>
+#include <QDebug>
+#include <QTimer>
+#include <QCoreApplication>
+
+using namespace network::sessionservice;
+
+#define SESSION_MANAG_SERVICE "com.deepin.SessionManager"
+
+UrlOpenerHelper::UrlOpenerHelper(QObject *parent)
+    : QObject(parent)
+    , m_process(new QProcess(this))
+    , m_timer(nullptr)
+    , m_startManagerIsPrepare(false)
+    , m_checkComplete(false)
+{
+    init();
+}
+
+UrlOpenerHelper::~UrlOpenerHelper()
+{
+}
+
+void UrlOpenerHelper::openUrl(const QString &url)
+{
+    if (url.isEmpty())
+        return;
+
+    static UrlOpenerHelper urlHelper;
+    if (urlHelper.isPrepare()) {
+        urlHelper.openUrlAddress(url);
+    } else if (!urlHelper.m_cacheUrls.contains(url)) {
+        urlHelper.m_cacheUrls << url;
+    }
+}
+
+void UrlOpenerHelper::openUrlAddress(const QString &url)
+{
+    // 调用xdg-open来打开网页
+    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+
+    if (!m_displayEnvironment.isEmpty())
+        env.insert("DISPLAY", m_displayEnvironment);
+
+    if (m_process->isOpen()) {
+        m_process->close();
+    }
+    m_process->setProcessEnvironment(env);
+    m_process->start("xdg-open", QStringList() << url);
+    m_process->waitForFinished();
+}
+
+QString UrlOpenerHelper::getDisplayEnvironment() const
+{
+    QString displayenv = qgetenv("DISPLAY");
+    if (!displayenv.isEmpty()) {
+        qCDebug(DSM) << "get DISPLAY Environment from local env";
+        return displayenv;
+    }
+
+    qCDebug(DSM) << "get DISPLAY Environment from systemd1 service";
+    // 有时候获取到的环境变量为空，此时就需要从systemd接口中来获取环境变量了
+    QDBusInterface systemdInterface("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager");
+    QStringList environments = systemdInterface.property("Environment").toStringList();
+    for (const QString &env : environments) {
+        QStringList envArray = env.split("=");
+        if (envArray.size() < 2)
+            continue;
+        if (envArray.first() == "DISPLAY")
+            return envArray[1];
+    }
+
+    return QString();
+}
+
+void UrlOpenerHelper::init()
+{
+    m_startManagerIsPrepare = QDBusConnection::sessionBus().interface()->isServiceRegistered(SESSION_MANAG_SERVICE);
+    if (m_startManagerIsPrepare) {
+        m_displayEnvironment = getDisplayEnvironment();
+        qCDebug(DSM) << "get display environment" << m_displayEnvironment;
+        if (m_displayEnvironment.isEmpty()) {
+            m_timer = new QTimer(this);
+            m_timer->setInterval(1000);
+            m_timer->setProperty("checktime", 0);
+            connect(m_timer, &QTimer::timeout, this, &UrlOpenerHelper::onCheckTimeout);
+            m_timer->start();
+        }
+    } else {
+        // 如果服务未启动，则等待服务启动
+        qCWarning(DSM) << SESSION_MANAG_SERVICE << "service is not register, wait it for start";
+        QDBusServiceWatcher *serviceWatcher = new QDBusServiceWatcher(this);
+        serviceWatcher->setConnection(QDBusConnection::sessionBus());
+        serviceWatcher->addWatchedService(SESSION_MANAG_SERVICE);
+        connect(serviceWatcher, &QDBusServiceWatcher::serviceRegistered, this, &UrlOpenerHelper::onServiceRegistered);
+    }
+}
+
+bool UrlOpenerHelper::isPrepare() const
+{
+    return m_startManagerIsPrepare && (!m_displayEnvironment.isEmpty() || m_checkComplete);
+}
+
+void UrlOpenerHelper::onCheckTimeout()
+{
+    auto doOpenPortal = [this] {
+        for (const QString &url : m_cacheUrls) {
+            openUrlAddress(url);
+        }
+        m_checkComplete = true;
+        m_cacheUrls.clear();
+        m_timer->stop();
+        m_timer->deleteLater();
+        m_timer = nullptr;
+    };
+
+    m_displayEnvironment = getDisplayEnvironment();
+    if (m_displayEnvironment.isEmpty()) {
+        // 连接检测20次，如果20次还是没有这个环境变量，就说明这个环境变量有问题，直接尝试打开
+        int checktime = m_timer->property("checktime").toInt();
+        qCDebug(DSM) << "in " << checktime << "times, the display environment is empty";
+        if (checktime >= 20) {
+            doOpenPortal();
+        } else {
+            checktime++;
+            m_timer->setProperty("checktime", checktime);
+        }
+    } else if (!m_displayEnvironment.isEmpty()) {
+        qCDebug(DSM) << "the display environment is not empty" << m_displayEnvironment << ", open the url" << m_cacheUrls;
+        doOpenPortal();
+    }
+}
+
+void UrlOpenerHelper::onServiceRegistered(const QString &service)
+{
+    if (service != SESSION_MANAG_SERVICE)
+        return;
+
+    m_startManagerIsPrepare = true;
+    m_displayEnvironment = getDisplayEnvironment();
+    qCInfo(DSM) << SESSION_MANAG_SERVICE << "start success, display envionment:" << m_displayEnvironment << "urls:" << m_cacheUrls;
+    for (const QString &url : m_cacheUrls) {
+        openUrlAddress(url);
+    }
+}

network-service-plugin/src/session/urlopenerhelper.cpp

@@ -8,34 +8,39 @@
 #include <QObject>
 
 class QProcess;
+class QTimer;
 
 namespace network {
 namespace sessionservice {
 
-class BrowserAssist : public QObject
+class UrlOpenerHelper : public QObject
 {
     Q_OBJECT
 
 public:
     static void openUrl(const QString &url);
 
 protected:
-    explicit BrowserAssist(QObject *parent = nullptr);
-    ~BrowserAssist();
+    explicit UrlOpenerHelper(QObject *parent = nullptr);
+    ~UrlOpenerHelper();
 
 private:
-    void init();
-    bool desktopIsPrepare() const;
     void openUrlAddress(const QString &url);
     QString getDisplayEnvironment() const;
+    void init();
+    bool isPrepare() const;
 
 private slots:
+    void onCheckTimeout();
     void onServiceRegistered(const QString &service);
 
 private:
     QStringList m_cacheUrls;
-    bool m_dockIsRegister;
     QProcess *m_process;
+    QTimer *m_timer;
+    QString m_displayEnvironment;
+    bool m_startManagerIsPrepare;
+    bool m_checkComplete;
 };
 
 }