6e70c4ae07
#### ⚠️ targets #10051 ## Summary of the Pull Request This PR does one big, primary thing. It removes all the constructors from any TerminalConnections, and changes them to use an `Initialize` method that accepts a `ValueSet` of properties. Why? For the upcoming window/content process work, we'll need the content process to be able to initialize the connection _in the content process_. However, the window process will be the one that knows what type of connection to make. Enter `ConnectionInformation`. This class will let us specify the class name of the type we want to create, and a set of settings to use when initializing that connection. **IMPORTANT**: As a part of this, the constructor for a connection must have 0 arguments. `RoActivateInstance` lets you just conjure a WinRT type just by class name, but that class must have a 0 arg ctor. Hence the need for `Initialize`, to actually pass the settings. We're using a `ValueSet` here because it's basically a json blob, with more steps. In the future, when extension authors want to have custom connections, we can always deserialize the json into a `ValueSet`, pass it to their connection's `Initialize`, and let then get what they need out of it. ## References * Tear-out: #1256 * Megathread: #5000 * Project: https://github.com/microsoft/terminal/projects/5 ## PR Checklist * [x] Closes https://github.com/microsoft/terminal/projects/5#card-50760298 * [x] I work here * [n/a] Tests added/passed * [n/a] Requires documentation to be updated ## Detailed Description of the Pull Request / Additional comments `ConnectionInformation` was included as a part of this PR, to demonstrate how this will eventually be used. `ConnectionInformation` is not _currently_ used. ## Validation Steps Performed It still builds and runs.
97 lines
3.9 KiB
C++
97 lines
3.9 KiB
C++
// Copyright (c) Microsoft Corporation.
|
|
// Licensed under the MIT license.
|
|
|
|
#pragma once
|
|
|
|
#include "ConptyConnection.g.h"
|
|
#include "ConnectionStateHolder.h"
|
|
#include "../inc/cppwinrt_utils.h"
|
|
|
|
#include <conpty-static.h>
|
|
|
|
namespace wil
|
|
{
|
|
// These belong in WIL upstream, so when we reingest the change that has them we'll get rid of ours.
|
|
using unique_static_pseudoconsole_handle = wil::unique_any<HPCON, decltype(&::ConptyClosePseudoConsole), ::ConptyClosePseudoConsole>;
|
|
}
|
|
|
|
namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
|
|
{
|
|
struct ConptyConnection : ConptyConnectionT<ConptyConnection>, ConnectionStateHolder<ConptyConnection>
|
|
{
|
|
ConptyConnection(const HANDLE hSig,
|
|
const HANDLE hIn,
|
|
const HANDLE hOut,
|
|
const HANDLE hRef,
|
|
const HANDLE hServerProcess,
|
|
const HANDLE hClientProcess);
|
|
|
|
ConptyConnection() noexcept = default;
|
|
void Initialize(const Windows::Foundation::Collections::ValueSet& settings);
|
|
|
|
static winrt::fire_and_forget final_release(std::unique_ptr<ConptyConnection> connection);
|
|
|
|
void Start();
|
|
void WriteInput(hstring const& data);
|
|
void Resize(uint32_t rows, uint32_t columns);
|
|
void Close() noexcept;
|
|
|
|
winrt::guid Guid() const noexcept;
|
|
|
|
static void StartInboundListener();
|
|
static void StopInboundListener();
|
|
|
|
static winrt::event_token NewConnection(NewConnectionHandler const& handler);
|
|
static void NewConnection(winrt::event_token const& token);
|
|
|
|
static Windows::Foundation::Collections::ValueSet CreateSettings(const winrt::hstring& cmdline,
|
|
const winrt::hstring& startingDirectory,
|
|
const winrt::hstring& startingTitle,
|
|
Windows::Foundation::Collections::IMapView<hstring, hstring> const& environment,
|
|
uint32_t rows,
|
|
uint32_t columns,
|
|
winrt::guid const& guid);
|
|
|
|
WINRT_CALLBACK(TerminalOutput, TerminalOutputHandler);
|
|
|
|
private:
|
|
HRESULT _LaunchAttachedClient() noexcept;
|
|
void _indicateExitWithStatus(unsigned int status) noexcept;
|
|
void _ClientTerminated() noexcept;
|
|
|
|
static HRESULT NewHandoff(HANDLE in, HANDLE out, HANDLE signal, HANDLE ref, HANDLE server, HANDLE client) noexcept;
|
|
|
|
uint32_t _initialRows{};
|
|
uint32_t _initialCols{};
|
|
hstring _commandline{};
|
|
hstring _startingDirectory{};
|
|
hstring _startingTitle{};
|
|
Windows::Foundation::Collections::ValueSet _environment{ nullptr };
|
|
guid _guid{}; // A unique session identifier for connected client
|
|
hstring _clientName{}; // The name of the process hosted by this ConPTY connection (as of launch).
|
|
|
|
bool _receivedFirstByte{ false };
|
|
std::chrono::high_resolution_clock::time_point _startTime{};
|
|
|
|
wil::unique_hfile _inPipe; // The pipe for writing input to
|
|
wil::unique_hfile _outPipe; // The pipe for reading output from
|
|
wil::unique_handle _hOutputThread;
|
|
wil::unique_process_information _piClient;
|
|
wil::unique_static_pseudoconsole_handle _hPC;
|
|
wil::unique_threadpool_wait _clientExitWait;
|
|
|
|
til::u8state _u8State{};
|
|
std::wstring _u16Str{};
|
|
std::array<char, 4096> _buffer{};
|
|
|
|
DWORD _OutputThread();
|
|
};
|
|
}
|
|
|
|
namespace winrt::Microsoft::Terminal::TerminalConnection::factory_implementation
|
|
{
|
|
struct ConptyConnection : ConptyConnectionT<ConptyConnection, implementation::ConptyConnection>
|
|
{
|
|
};
|
|
}
|