Skip to content

Conversation

@calsys456
Copy link
Contributor

@calsys456 calsys456 commented Aug 28, 2025

Treeland will get stuck in lockscreen after a crash recovery, which is caused by unintended login request for already logined user. This commit adds a new DaemonMessages type, and convey logined user to treeland after socket connected, to avoid this problem.

Summary by Sourcery

Send active user session data to Treeland upon socket reconnection to avoid redundant login prompts and lockscreen hangs after crash recovery

New Features:

  • Add DaemonMessages::UserLogined enum to signal active user sessions

Bug Fixes:

  • Prevent Treeland from getting stuck at the lockscreen after crash recovery by avoiding unintended login requests for already authenticated users

Enhancements:

  • Connect to SocketServer::connected signal and implement Display::connected to send current logged-in users via SocketWriter

@deepin-ci-robot
Copy link

Hi @apr3vau. Thanks for your PR.

I'm waiting for a linuxdeepin member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@sourcery-ai
Copy link

sourcery-ai bot commented Aug 28, 2025

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

This PR adds a new daemon message type and hooks into the socket connection event to immediately convey already authenticated users to Treeland after a crash recovery, preventing the lockscreen from hanging.

Sequence diagram for socket connection and user login state recovery

sequenceDiagram
    participant Display
    participant SocketServer
    participant Treeland
    participant SocketWriter
    participant Auth
    SocketServer->>Display: connected(socket)
    Display->>SocketWriter: create writer for socket
    loop for each Auth in loginedSession()
        Auth->>Display: isActive()
        alt if active
            Display->>SocketWriter: send DaemonMessages::UserLogined, auth->user()
            SocketWriter->>Treeland: UserLogined message
        end
    end
Loading

Class diagram for updated Display and DaemonMessages types

classDiagram
    class Display {
        +void connected(QLocalSocket *socket)
        +void login(QLocalSocket *socket, const QString &user, const QString &password, const Session &session)
        -QLocalSocket *m_socket
        +loginedSession()
    }
    class DaemonMessages {
        <<enum>>
        InformationMessage
        UserActivateMessage
        SwitchToGreeter
        UserLogined
    }
    Display --> QLocalSocket
    Display --> DaemonMessages
    Display --> SocketWriter
    Display --> Auth
    Auth : +bool isActive()
    Auth : +QString user()
Loading

File-Level Changes

Change Details Files
Introduce new daemon message for conveying logged-in users
  • Add UserLogined enum value
src/common/Messages.h
Hook into socket server’s connected signal in Display
  • Connect SocketServer::connected to Display::connected in setup
  • Declare connected(QLocalSocket*) in Display.h
src/daemon/Display.cpp
src/daemon/Display.h
Implement Display::connected handler to send active sessions
  • Store socket reference
  • Iterate over loginedSession()
  • Use SocketWriter to emit UserLogined and username
src/daemon/Display.cpp
Include new messaging and writer headers in Display.cpp
  • Add Messages.h include
  • Add SocketWriter.h include
src/daemon/Display.cpp

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey there - I've reviewed your changes and they look great!


Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

Treeland will get stuck in lockscreen after a crash recovery, which is
caused by unintended login request for already logined user. This commit
adds a new DaemonMessages type, and convey logined user to treeland
after socket connected, to avoid this problem.
@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: apr3vau, wineee

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@wineee wineee merged commit 1863c2f into linuxdeepin:master Aug 28, 2025
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants