mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-06-22 14:53:53 -07:00
Adds OS-level URL-scheme handlers so users can click a link in a browser,
chat client, or third-party tool to launch Cockatrice straight into a
server / game / Oracle update.
Supported URL forms:
cockatrice://joingame?hostname=H&port=P&roomid=R&gameid=G[&spectate=1]
cockatrice-oracle://update[?spoilers=1]
Credentials passed via URL (username/password query params) are deliberately
ignored — URLs leak through shell history, browser history, EDR capture, etc.
If the target server requires auth and no saved credentials match, the Connect
dialog opens pre-filled with the URL's host/port so the user types their
password locally.
OS integration
- Linux: MimeType=x-scheme-handler/cockatrice (and -oracle) added to the
.desktop files; Exec=cockatrice %u passes the URL through.
- Windows: NSIS installer writes HKCR\cockatrice and HKCR\cockatrice-oracle
registry entries; uninstaller removes them.
- macOS: per-app Info.cockatrice.plist / Info.oracle.plist declare
CFBundleURLTypes; a QFileOpenEvent filter is installed on QApplication
before any nested event loop so cold-start URLs aren't lost.
New abstractions
- Intent (libcockatrice_utility/libcockatrice/utility/intent.h): abstract base
for chained async actions. Guarantees finished() fires at most once,
execute() is idempotent, self-deletes via deleteLater, and
startTimeoutSafetyNet() arms a configurable per-stage deadline. Concrete
intents (IntentConnectToServer, IntentLogin, IntentJoinServerRoom,
IntentJoinServerGame) compose the joingame flow via UrlParser.
- SingleInstanceManager: async per-user local-socket primary/secondary
handshake; URL forwarded from secondary to primary with QDataStream framing
both ways. shared_ptr-backed resolved flag survives every lambda capture.
- UrlSchemeEventFilter (new libcockatrice_utility_gui sibling library): QObject
event filter that translates macOS QFileOpenEvent into a urlReceived(QString)
signal. Lives in its own Gui-bearing lib so libcockatrice_utility stays
Core+Network only and doesn't drag Qt::Gui into servatrice.
- UrlUtils (header-only): pure URL parsing, fully unit-tested.
Wiring
- MainWindow::handleUrl(QString) — single entry point for any URL source.
- DlgConnect::prefillNewHost(host, port) — pre-fills new-host inputs.
- ServersSettings::findSavedCredsByHostPort — case-insensitive saved-creds
lookup.
- TabSupervisor::requestJoinRoom + roomJoinedById / roomJoinFailedById signals,
TabServer::roomAlreadyJoined for the short-circuit "already in this room"
path — single source of truth for duplicate-join handling.
Tests
- 36 new unit tests across four single-purpose targets in tests/:
- url_utils_test (22 tests) — scheme matching, port/room/game validation,
spectator flag, credentials ignored, case-insensitivity.
- url_scheme_event_filter_test (3 tests) — QFileOpenEvent capture.
- intent_test (7 tests) — self-delete, abort propagation, parent-destruction-
mid-flight, finish-once gate, execute() idempotence.
- single_instance_manager_test (4 tests) — per-user socket naming, becoming-
primary alone, forwarding to an existing primary, single-emission of
roleResolved.
Build tooling (incidental)
- Dockerfile.format, docker-compose.format.yml, Makefile — a docker-based
runner for format.sh that mirrors CI's desktop-lint step.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
125 lines
3.9 KiB
C++
125 lines
3.9 KiB
C++
#ifndef LIBCOCKATRICE_INTENT_H
|
|
#define LIBCOCKATRICE_INTENT_H
|
|
|
|
#include <QObject>
|
|
#include <QTimer>
|
|
|
|
/**
|
|
* @brief Abstract base for chained, URL-driven intents.
|
|
*
|
|
* An Intent encapsulates a single async action (e.g. connecting to a server,
|
|
* joining a room). Concrete subclasses implement @c doExecute() and call
|
|
* @c emitFinished(bool) when the action completes or fails unrecoverably.
|
|
*
|
|
* Typical usage:
|
|
* @code
|
|
* auto *intent = new MyIntent(ctx, parent);
|
|
* intent->execute(); // intent deletes itself via deleteLater when finished
|
|
* @endcode
|
|
*
|
|
* Guarantees:
|
|
* - @c finished() is emitted at most once (subsequent emit attempts are no-ops).
|
|
* - @c execute() is idempotent: repeated calls do nothing after the first.
|
|
* - Self-deletes via @c deleteLater after @c finished() fires (success or failure).
|
|
*/
|
|
class Intent : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
/** Default deadline for intents that wait on async signals. Used by the
|
|
* default @c timeoutMs() implementation so the chain can't hang
|
|
* indefinitely. */
|
|
static constexpr int DefaultTimeoutMs = 30000;
|
|
|
|
explicit Intent(QObject *parent = nullptr) : QObject(parent)
|
|
{
|
|
// Self-delete after finished() fires, regardless of whether the
|
|
// emission came from doExecute() (success/failure) or abort()
|
|
// (external).
|
|
connect(this, &Intent::finished, this, &QObject::deleteLater);
|
|
}
|
|
~Intent() override = default;
|
|
|
|
/**
|
|
* @brief Deadline for this intent's timeout safety net, in milliseconds.
|
|
*
|
|
* Subclasses override when their work is not bounded by network/server
|
|
* timing — e.g. an intent that opens a modal dialog should return a
|
|
* non-positive value to indicate "no auto-timeout, the user paces this
|
|
* step". Consumed by @c startTimeoutSafetyNet().
|
|
*
|
|
* @return positive deadline in ms, or <= 0 for "no timeout".
|
|
*/
|
|
[[nodiscard]] virtual int timeoutMs() const
|
|
{
|
|
return DefaultTimeoutMs;
|
|
}
|
|
|
|
/** Start executing the intent. Idempotent — repeated calls are no-ops. */
|
|
void execute()
|
|
{
|
|
if (m_started)
|
|
return;
|
|
m_started = true;
|
|
doExecute();
|
|
}
|
|
|
|
/**
|
|
* @brief Abort the intent externally, emitting finished(false).
|
|
*
|
|
* Used by chain orchestrators (e.g. UrlParser) to propagate a failure
|
|
* from an upstream intent through the rest of the chain without giving
|
|
* outside callers direct access to the protected finished() signal.
|
|
*/
|
|
void abort()
|
|
{
|
|
emitFinished(false);
|
|
}
|
|
|
|
protected:
|
|
virtual void doExecute() = 0;
|
|
|
|
/**
|
|
* @brief Single source of truth for emitting @c finished().
|
|
*
|
|
* Gated by an internal flag so subsequent calls are no-ops. Concrete
|
|
* intents call this instead of @c emit finished(...) directly, which
|
|
* removes the risk of double-emission when multiple completion signals
|
|
* race (success + cleanup disconnect, timeout + late response, etc.).
|
|
*/
|
|
void emitFinished(bool success)
|
|
{
|
|
if (m_finished)
|
|
return;
|
|
m_finished = true;
|
|
emit finished(success);
|
|
}
|
|
|
|
/**
|
|
* @brief Arm the chain-level deadline; aborts on expiry.
|
|
*
|
|
* Subclasses call this once from @c doExecute() to install the timeout
|
|
* safety net described by @c timeoutMs(). No-op when @c timeoutMs() is
|
|
* non-positive (user-paced intents opt out).
|
|
*/
|
|
void startTimeoutSafetyNet()
|
|
{
|
|
if (const int deadline = timeoutMs(); deadline > 0) {
|
|
QTimer::singleShot(deadline, this, [this]() { emitFinished(false); });
|
|
}
|
|
}
|
|
|
|
signals:
|
|
/**
|
|
* @brief Emitted exactly once when the intent finishes.
|
|
* @param success @c true on success, @c false on failure.
|
|
*/
|
|
void finished(bool success);
|
|
|
|
private:
|
|
bool m_started{false};
|
|
bool m_finished{false};
|
|
};
|
|
|
|
#endif // LIBCOCKATRICE_INTENT_H
|