mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-06-13 03:21:27 -07:00
371b74732e
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>
140 lines
5.1 KiB
C++
140 lines
5.1 KiB
C++
#include "gtest/gtest.h"
|
|
#include <QCoreApplication>
|
|
#include <QEventLoop>
|
|
#include <QLocalServer>
|
|
#include <QLocalSocket>
|
|
#include <QRandomGenerator>
|
|
#include <QTimer>
|
|
#include <libcockatrice/utility/single_instance_manager.h>
|
|
|
|
namespace
|
|
{
|
|
|
|
QString uniqueSocketName()
|
|
{
|
|
return QStringLiteral("CockatriceTest-") + QString::number(QCoreApplication::applicationPid()) +
|
|
QStringLiteral("-") + QString::number(QRandomGenerator::global()->generate());
|
|
}
|
|
|
|
// Drive resolveStartupRole to completion and return the manager.
|
|
// The caller owns the returned manager (parented to @p parent if given).
|
|
SingleInstanceManager *makeResolvedPrimary(const QString &socketName, QObject *parent = nullptr)
|
|
{
|
|
auto *mgr = new SingleInstanceManager(socketName, parent);
|
|
QEventLoop loop;
|
|
QObject::connect(mgr, &SingleInstanceManager::roleResolved, &loop, &QEventLoop::quit);
|
|
mgr->resolveStartupRole(QString());
|
|
QTimer::singleShot(5000, &loop, &QEventLoop::quit);
|
|
loop.exec();
|
|
return mgr;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
TEST(SingleInstanceManagerTest, PerUserSocketNameContainsBase)
|
|
{
|
|
const QString name = SingleInstanceManager::perUserSocketName(QStringLiteral("CockatriceInstance"));
|
|
ASSERT_TRUE(name.startsWith(QStringLiteral("CockatriceInstance")))
|
|
<< "perUserSocketName must preserve the base prefix; got " << qPrintable(name);
|
|
}
|
|
|
|
TEST(SingleInstanceManagerTest, ResolvesAsPrimaryWhenNoneExists)
|
|
{
|
|
const QString socketName = uniqueSocketName();
|
|
QLocalServer::removeServer(socketName);
|
|
|
|
SingleInstanceManager mgr(socketName);
|
|
bool resolvedForwarded = true;
|
|
QEventLoop loop;
|
|
QObject::connect(&mgr, &SingleInstanceManager::roleResolved, [&](bool forwarded) {
|
|
resolvedForwarded = forwarded;
|
|
loop.quit();
|
|
});
|
|
mgr.resolveStartupRole(QString());
|
|
|
|
QTimer::singleShot(5000, &loop, &QEventLoop::quit);
|
|
loop.exec();
|
|
|
|
ASSERT_FALSE(resolvedForwarded) << "With no existing primary, we must become primary ourselves";
|
|
}
|
|
|
|
TEST(SingleInstanceManagerTest, ForwardsUrlToExistingPrimary)
|
|
{
|
|
const QString socketName = uniqueSocketName();
|
|
QLocalServer::removeServer(socketName);
|
|
|
|
QObject parent;
|
|
auto *primary = makeResolvedPrimary(socketName, &parent);
|
|
|
|
int receivedCount = 0;
|
|
QString receivedUrl;
|
|
QObject::connect(primary, &SingleInstanceManager::urlReceived, [&](const QString &url) {
|
|
++receivedCount;
|
|
receivedUrl = url;
|
|
});
|
|
|
|
SingleInstanceManager secondary(socketName);
|
|
bool secondaryForwarded = false;
|
|
QEventLoop loop;
|
|
// Wait on roleResolved (the terminal event of the handshake) rather than
|
|
// urlReceived: the secondary's roleResolved fires only after the ACK has
|
|
// round-tripped back from the primary, which itself happens after the
|
|
// primary emits urlReceived. By the time we quit here, all three of
|
|
// secondaryForwarded / receivedCount / receivedUrl are set.
|
|
QObject::connect(&secondary, &SingleInstanceManager::roleResolved, [&](bool forwarded) {
|
|
secondaryForwarded = forwarded;
|
|
loop.quit();
|
|
});
|
|
|
|
const QString url = QStringLiteral("cockatrice://joingame?hostname=example.com&port=4748&roomid=1&gameid=42");
|
|
secondary.resolveStartupRole(url);
|
|
|
|
QTimer::singleShot(5000, &loop, &QEventLoop::quit);
|
|
loop.exec();
|
|
|
|
ASSERT_TRUE(secondaryForwarded) << "Secondary should resolve as forwarded when primary exists";
|
|
ASSERT_EQ(receivedCount, 1) << "urlReceived should fire exactly once on the primary";
|
|
ASSERT_EQ(receivedUrl, url);
|
|
}
|
|
|
|
TEST(SingleInstanceManagerTest, RoleResolvedEmitsAtMostOnce)
|
|
{
|
|
// Regression: the probe-side shared flag must keep roleResolved single-
|
|
// emission even when multiple of QLocalSocket's signals fire (e.g.
|
|
// errorOccurred after a successful readyRead, or a timeout firing in the
|
|
// same tick as the terminal signal). Pre-fix the flag's storage was
|
|
// delete-then-read on subsequent fires, UB whose only visible symptom on
|
|
// a forgiving allocator was duplicate emission — so we observe that.
|
|
const QString socketName = uniqueSocketName();
|
|
QLocalServer::removeServer(socketName);
|
|
|
|
QObject parent;
|
|
auto *primary = makeResolvedPrimary(socketName, &parent);
|
|
Q_UNUSED(primary);
|
|
|
|
SingleInstanceManager secondary(socketName);
|
|
int resolvedCount = 0;
|
|
QObject::connect(&secondary, &SingleInstanceManager::roleResolved, [&](bool) { ++resolvedCount; });
|
|
|
|
QEventLoop loop;
|
|
QObject::connect(&secondary, &SingleInstanceManager::roleResolved, &loop, &QEventLoop::quit);
|
|
secondary.resolveStartupRole(
|
|
QStringLiteral("cockatrice://joingame?hostname=example.com&port=4748&roomid=1&gameid=42"));
|
|
|
|
QTimer::singleShot(5000, &loop, &QEventLoop::quit);
|
|
loop.exec();
|
|
|
|
// Give any straggling signals (errorOccurred on socket teardown,
|
|
// timeout that may have armed) a chance to fire before we count.
|
|
QCoreApplication::processEvents();
|
|
|
|
ASSERT_EQ(resolvedCount, 1) << "roleResolved must fire exactly once across the entire handshake";
|
|
}
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
QCoreApplication app(argc, argv);
|
|
::testing::InitGoogleTest(&argc, argv);
|
|
return RUN_ALL_TESTS();
|
|
}
|