refactor: optimize plugin loading and QML registration

This refactor improves plugin management by separating QML registration
from plugin object creation. Key changes include:
1. Added QML_ENGINE_PROPERTY constant for QML engine property name
2. Modified DCC_FACTORY_CLASS macro to accept variadic arguments for
QML registration
3. Added dccObject() method in factory to handle QML type registration
on main thread
4. Created containsByName() method for more efficient module filtering
5. Improved plugin loading sequence with proper thread management
6. Moved all QML registration calls from constructors to factory's
dccObject() method
7. Removed unnecessary QML integration headers from model classes

The changes ensure QML type registration happens on the main thread
while plugin objects are created in worker threads, preventing threading
issues and improving performance.

Log: Optimized plugin loading process and QML registration

Influence:
1. Test plugin loading and module display in control center
2. Verify all QML components are properly registered and accessible
3. Check module hiding functionality with wildcard patterns
4. Test thread safety during plugin initialization
5. Verify no regression in existing functionality

refactor: 优化插件加载和 QML 注册流程

本次重构改进了插件管理机制，将 QML 注册与插件对象创建分离。主要变更
包括：
1. 添加 QML_ENGINE_PROPERTY 常量用于 QML 引擎属性名
2. 修改 DCC_FACTORY_CLASS 宏支持可变参数用于 QML 注册
3. 在工厂类中添加 dccObject() 方法处理主线程中的 QML 类型注册
4. 创建 containsByName() 方法实现更高效的模块过滤
5. 改进插件加载序列，优化线程管理
6. 将所有 QML 注册调用从构造函数移至工厂的 dccObject() 方法
7. 从模型类中移除不必要的 QML 集成头文件

这些变更确保 QML 类型注册在主线程执行，而插件对象在工作线程创建，避免线
程问题并提升性能。

Log: 优化插件加载过程和 QML 注册机制

Influence:
1. 测试控制中心插件加载和模块显示
2. 验证所有 QML 组件正确注册并可访问
3. 检查通配符模式下的模块隐藏功能
4. 测试插件初始化期间的线程安全性
5. 验证现有功能无回归

PMS: BUG-309197

Author: caixr23

include/dccfactory.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 - 2027 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 #ifndef DCCFACTORY_H
@@ -8,6 +8,7 @@
 
 namespace dccV25 {
 #define DccFactory_iid "org.deepin.dde.dcc-factory/v1.0"
+#define QML_ENGINE_PROPERTY "QmlEngin"
 class DccObject;
 
 class DccFactory : public QObject
@@ -16,28 +17,36 @@ class DccFactory : public QObject
 public:
     using QObject::QObject;
 
-    // 作为数据返回，会导出为dccData供main.qml使用
+    // 作为数据返回，会导出为dccData供main.qml使用(在子线程执行)
     virtual QObject *create(QObject * = nullptr) { return nullptr; }
 
-    // 未提供qml的，可在此自己加载qml返回DccObject对象
-    virtual DccObject *dccObject(QObject * = nullptr) { return nullptr; }
+    // 未提供qml的，可在此自己加载qml返回DccObject对象,qml相关操作，如注册qml类型(在主线程中执行)
+    virtual QObject *dccObject(QObject * = nullptr) { return nullptr; }
 };
 } // namespace dccV25
 Q_DECLARE_INTERFACE(dccV25::DccFactory, DccFactory_iid)
 
-#define DCC_FACTORY_CLASS(classname)                                      \
-    namespace {                                                           \
-    class Q_DECL_EXPORT classname##DccFactory : public dccV25::DccFactory \
-    {                                                                     \
-        Q_OBJECT                                                          \
-        Q_PLUGIN_METADATA(IID DccFactory_iid)                             \
-        Q_INTERFACES(dccV25::DccFactory)                                  \
-    public:                                                               \
-        using dccV25::DccFactory::DccFactory;                             \
-        QObject *create(QObject *parent = nullptr) override               \
-        {                                                                 \
-            return new classname(parent);                                 \
-        }                                                                 \
-    };                                                                    \
+#define DCC_FACTORY_CLASS(classname, ...)                   \
+    namespace {                                             \
+    class classname##DccFactory : public dccV25::DccFactory \
+    {                                                       \
+        Q_OBJECT                                            \
+        Q_PLUGIN_METADATA(IID DccFactory_iid)               \
+        Q_INTERFACES(dccV25::DccFactory)                    \
+    public:                                                 \
+        using dccV25::DccFactory::DccFactory;               \
+        QObject *create(QObject *parent = nullptr) override \
+        {                                                   \
+            return new classname(parent);                   \
+        }                                                   \
+        QObject *dccObject(QObject * = nullptr) override    \
+        {                                                   \
+            auto executeQmlRegisters = []() {               \
+                __VA_ARGS__;                                \
+            };                                              \
+            executeQmlRegisters();                          \
+            return nullptr;                                 \
+        }                                                   \
+    };                                                      \
     }
 #endif // DCCFACTORY_H

src/dde-control-center/dccmanager.cpp

@@ -468,22 +468,27 @@ void DccManager::initConfig()
     connect(m_dconfig, &DConfig::valueChanged, this, &DccManager::updateModuleConfig);
 }
 
-bool DccManager::contains(const QSet<QString> &urls, const DccObject *obj)
+bool DccManager::containsByName(const QSet<QString> &urls, const QString &name)
 {
     for (auto &&url : urls) {
         if (url.contains("*")) {
-            if (isMatch(url, obj)) {
+            if (isMatchByName(url, name)) {
                 return true;
             }
         } else {
-            if (isEqual(url, obj)) {
+            if (isEqualByName(url, name)) {
                 return true;
             }
         }
     }
     return false;
 }
 
+bool DccManager::contains(const QSet<QString> &urls, const DccObject *obj)
+{
+    return containsByName(urls, obj->parentName() + "/" + obj->name());
+}
+
 QStringList DccManager::splitUrl(const QString &url, QString &targetName)
 {
     QStringList paths = url.split("/", Qt::SkipEmptyParts);

src/dde-control-center/dccmanager.h

@@ -59,6 +59,13 @@ class DccManager : public DccApp, protected QDBusContext
 
     inline const QSet<QString> &hideModule() const { return m_hideModule; }
 
+    static bool isMatchByName(const QString &url, const QString &name);
+    static bool isMatch(const QString &url, const DccObject *obj);
+    static bool isEqualByName(const QString &url, const QString &name);
+    static bool isEqual(const QString &url, const DccObject *obj);
+    static bool containsByName(const QSet<QString> &urls, const QString &name);
+    static bool contains(const QSet<QString> &urls, const DccObject *obj);
+
 public Q_SLOTS:
     DccObject *object(const QString &name) override;
     void addObject(DccObject *obj) override;
@@ -89,12 +96,7 @@ public Q_SLOTS:
 
 private:
     void initConfig();
-    bool contains(const QSet<QString> &urls, const DccObject *obj);
     QStringList splitUrl(const QString &url, QString &targetName);
-    bool isMatchByName(const QString &url, const QString &name);
-    bool isMatch(const QString &url, const DccObject *obj);
-    bool isEqualByName(const QString &url, const QString &name);
-    bool isEqual(const QString &url, const DccObject *obj);
     DccObject *findObject(const QString &url);
     QVector<DccObject *> findObjects(const QString &url, bool one = false);
     const DccObject *findParent(const DccObject *obj);

src/dde-control-center/pluginmanager.cpp

@@ -80,6 +80,7 @@ struct PluginData
     DccObject *mainObj;
     DccObject *soObj;
     QObject *data;
+    DccFactory *factory;
     QThread *thread;
     uint status;
 
@@ -91,6 +92,7 @@ struct PluginData
         , mainObj(nullptr)
         , soObj(nullptr)
         , data(nullptr)
+        , factory(nullptr)
         , thread(nullptr)
         , status(PluginBegin)
     {
@@ -133,7 +135,6 @@ void LoadPluginTask::doLoadSo()
     QElapsedTimer timer;
     timer.start();
     QObject *dataObj = nullptr;
-    DccObject *soObj = nullptr;
     if (QFile::exists(soPath)) {
         if (m_pManager->isDeleting()) {
             return;
@@ -169,10 +170,7 @@ void LoadPluginTask::doLoadSo()
                 if (dataObj && dataObj->parent()) {
                     dataObj->setParent(nullptr);
                 }
-                soObj = factory->dccObject();
-                if (soObj && soObj->parent()) {
-                    soObj->setParent(nullptr);
-                }
+                m_data->factory = factory;
             } while (false);
         }
     } else {
@@ -181,16 +179,11 @@ void LoadPluginTask::doLoadSo()
     if (dataObj) {
         m_data->data = dataObj;
     }
-    if (soObj) {
-        m_data->soObj = soObj;
-    }
     if (m_data->data) {
         m_data->data->moveToThread(m_pManager->thread());
-        m_data->data->setParent(m_pManager->parent());
     }
-    if (m_data->soObj) {
-        m_data->soObj->moveToThread(m_pManager->thread());
-        m_data->soObj->setParent(m_pManager->parent());
+    if (m_data->factory) {
+        m_data->factory->moveToThread(m_pManager->thread());
     }
     Q_EMIT m_pManager->updatePluginStatus(m_data, DataEnd, ": load plugin finished. elapsed time :" + QString::number(timer.elapsed()));
 }
@@ -327,6 +320,20 @@ void PluginManager::loadPlugin(PluginData *plugin)
         addMainObject(plugin);
         Q_EMIT updatePluginStatus(plugin, PluginEnd, QString());
     } else if ((plugin->status & (DataEnd | MainObjLoad)) == DataEnd) {
+        if (plugin->data) {
+            plugin->data->setParent(this);
+            QJSEngine::setObjectOwnership(plugin->data, QQmlEngine::CppOwnership);
+        }
+        if (plugin->factory) {
+            plugin->factory->setProperty(QML_ENGINE_PROPERTY, QVariant::fromValue(m_manager->engine()));
+            QObject *obj = plugin->factory->dccObject();
+            DccObject *soObj = dynamic_cast<DccObject *>(obj);
+            if (soObj) {
+                plugin->soObj = soObj;
+            } else if (obj) {
+                obj->deleteLater();
+            }
+        }
         loadMain(plugin);
     } else if ((plugin->status & (ModuleEnd | DataBegin)) == ModuleEnd) {
         if (plugin->module) {
@@ -371,7 +378,7 @@ void PluginManager::loadMetaData(PluginData *plugin)
         return;
     }
     updatePluginType(plugin);
-    if (m_manager->hideModule().contains(plugin->name)) {
+    if (DccManager::containsByName(m_manager->hideModule(), plugin->name)) {
         // 跳过隐藏的模块,需要动态加载回来
         Q_EMIT updatePluginStatus(plugin, PluginEnd | MetaDataEnd, QString());
         return;
@@ -498,9 +505,11 @@ void PluginManager::createMain(QQmlComponent *component)
         QObject *object = component->create(context);
         component->deleteLater();
         if (!object) {
+            context->deleteLater();
             Q_EMIT updatePluginStatus(plugin, MainObjErr | MainObjEnd, " component create main object is null:" + component->errorString());
             return;
         }
+        context->setParent(object);
         object->setParent(plugin->module ? plugin->module : m_rootModule);
         plugin->mainObj = qobject_cast<DccObject *>(object);
         Q_EMIT updatePluginStatus(plugin, MainObjEnd, ": create main finished");

src/plugin-accounts/operation/accountscontroller.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -19,6 +19,7 @@
 #include <QPainterPath>
 #include <QBuffer>
 #include <QTimer>
+#include <QtQml/qqml.h>
 
 #include <DSysInfo>
 
@@ -30,7 +31,7 @@
 DCORE_USE_NAMESPACE
 namespace dccV25 {
 
-DCC_FACTORY_CLASS(AccountsController)
+DCC_FACTORY_CLASS(AccountsController, qmlRegisterType<CreationResult>("AccountsController", 1, 0, "CreationResult"))
 
 static bool isUserGroupName(int gid, const QString &name)
 {
@@ -45,8 +46,6 @@ static bool isUserGroupName(int gid, const QString &name)
 AccountsController::AccountsController(QObject *parent)
     : QObject{ parent }
 {
-    qmlRegisterType<CreationResult>("AccountsController", 1, 0, "CreationResult");
-    
     m_model = new UserModel(this);
     m_worker = new AccountsWorker(m_model, this);
 

src/plugin-accounts/operation/accountscontroller.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -12,7 +12,6 @@
 #include <QObject>
 #include <QSortFilterProxyModel>
 #include <QHash>
-#include <QtQml/qqml.h>
 
 namespace dccV25 {
 

src/plugin-authentication/operation/biometricauthcontroller.cpp

@@ -1,4 +1,4 @@
-//SPDX-FileCopyrightText: 2025 UnionTech Software Technology Co., Ltd.
+//SPDX-FileCopyrightText: 2025 - 2026 UnionTech Software Technology Co., Ltd.
 //
 //SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -8,19 +8,17 @@
 
 namespace dccV25 {
 
-DCC_FACTORY_CLASS(BiometricAuthController)
+DCC_FACTORY_CLASS(BiometricAuthController, \
+    qmlRegisterType<CharaMangerModel>("org.deepin.dcc.account.biometric", 1, 0, "CharaMangerModel"); \
+    qmlRegisterType<FaceAuthController>("org.deepin.dcc.account.biometric", 1, 0, "FaceAuthController"); \
+    qmlRegisterType<FingerprintAuthController>("org.deepin.dcc.account.biometric", 1, 0, "FingerprintAuthController"); \
+    qmlRegisterType<IrisAuthController>("org.deepin.dcc.account.biometric", 1, 0, "IrisAuthController"))
 
 BiometricAuthController::BiometricAuthController(QObject *parent)
     : QObject(parent)
     , m_charaModel(new CharaMangerModel(this))
     , m_charaWorker(new CharaMangerWorker(m_charaModel, this))
 {
-    // 注册QML类型
-    qmlRegisterType<CharaMangerModel>("org.deepin.dcc.account.biometric", 1, 0, "CharaMangerModel");
-    qmlRegisterType<FaceAuthController>("org.deepin.dcc.account.biometric", 1, 0, "FaceAuthController");
-    qmlRegisterType<FingerprintAuthController>("org.deepin.dcc.account.biometric", 1, 0, "FingerprintAuthController");
-    qmlRegisterType<IrisAuthController>("org.deepin.dcc.account.biometric", 1, 0, "IrisAuthController");
-    
     // 创建子控制器
     m_faceController = new FaceAuthController(m_charaModel, m_charaWorker, this);
     m_fingerprintController = new FingerprintAuthController(m_charaModel, m_charaWorker, this);

src/plugin-bluetooth/operation/bluetoothinteraction.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -13,9 +13,6 @@ BluetoothInteraction::BluetoothInteraction(QObject *parent)
     , m_work(new BluetoothWorker(m_model, this))
 {
     m_work->activate();
-
-    qmlRegisterType<BluetoothWorker>("dcc", 1, 0, "BluetoothWorker");
-    qmlRegisterType<BluetoothModel>("dcc", 1, 0, "BluetoothModel");
 }
 
 BluetoothModel *BluetoothInteraction::model() const
@@ -39,6 +36,8 @@ void BluetoothInteraction::setWork(BluetoothWorker *newWork)
 }
 
 
-DCC_FACTORY_CLASS(BluetoothInteraction)
+DCC_FACTORY_CLASS(BluetoothInteraction, \
+    qmlRegisterType<BluetoothWorker>("dcc", 1, 0, "BluetoothWorker"); \
+    qmlRegisterType<BluetoothModel>("dcc", 1, 0, "BluetoothModel"))
 
 #include "bluetoothinteraction.moc"

src/plugin-bluetooth/operation/bluetoothmodel.h

@@ -1,11 +1,10 @@
-//SPDX-FileCopyrightText: 2018 - 2023 UnionTech Software Technology Co., Ltd.
+//SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd.
 //
 //SPDX-License-Identifier: GPL-3.0-or-later
 #ifndef DCC_BLUETOOTH_BLUETOOTHMODEL_H
 #define DCC_BLUETOOTH_BLUETOOTHMODEL_H
 
 #include <QObject>
-#include <QtQmlIntegration/qqmlintegration.h>
 
 #include "bluetoothadapter.h"
 #include "bluetoothadaptersmodel.h"
@@ -18,8 +17,6 @@ class BluetoothModel : public QObject
     Q_PROPERTY(bool airplaneEnable READ airplaneEnable NOTIFY airplaneEnableChanged FINAL)
     Q_PROPERTY(bool showBluetooth READ showBluetooth NOTIFY showBluetoothChanged FINAL)
 
-    QML_NAMED_ELEMENT(BluetoothModel)
-    QML_SINGLETON
 public:
     explicit BluetoothModel(QObject *parent = nullptr);
 

src/plugin-commoninfo/operation/commoninfointeraction.cpp

@@ -1,4 +1,4 @@
-//SPDX-FileCopyrightText: 2018 - 2023 UnionTech Software Technology Co., Ltd.
+//SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd.
 //
 //SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -12,9 +12,6 @@ CommonInfoInteraction::CommonInfoInteraction(QObject *parent)
     , m_work(NULL)
     , m_mode(NULL)
 {
-    qmlRegisterType<CommonInfoWork>("org.deepin.dcc.systemInfo", 1, 0, "CommonInfoWork");
-    qmlRegisterType<CommonInfoModel>("org.deepin.dcc.systemInfo", 1, 0, "CommonInfoModel");
-
     m_mode = new CommonInfoModel(this);
     m_work = new CommonInfoWork(m_mode, this);
 
@@ -41,7 +38,9 @@ void CommonInfoInteraction::setMode(CommonInfoModel *newMode)
     m_mode = newMode;
 }
 
-DCC_FACTORY_CLASS(CommonInfoInteraction)
+DCC_FACTORY_CLASS(CommonInfoInteraction,\
+                   qmlRegisterType<CommonInfoWork>("org.deepin.dcc.systemInfo", 1, 0, "CommonInfoWork"),\
+                   qmlRegisterType<CommonInfoModel>("org.deepin.dcc.systemInfo", 1, 0, "CommonInfoModel"))
 
 
 #include "commoninfointeraction.moc"