mirror of
https://github.com/RGBCube/serenity
synced 2025-05-24 05:55:06 +00:00
ProtocolServer: Integrate LibGemini for simple requests
This commit is contained in:
parent
308a755c38
commit
aaa6f90c34
6 changed files with 199 additions and 1 deletions
|
@ -3,6 +3,8 @@ compile_ipc(ProtocolClient.ipc ProtocolClientEndpoint.h)
|
||||||
|
|
||||||
set(SOURCES
|
set(SOURCES
|
||||||
Download.cpp
|
Download.cpp
|
||||||
|
GeminiDownload.cpp
|
||||||
|
GeminiProtocol.cpp
|
||||||
HttpDownload.cpp
|
HttpDownload.cpp
|
||||||
HttpProtocol.cpp
|
HttpProtocol.cpp
|
||||||
HttpsDownload.cpp
|
HttpsDownload.cpp
|
||||||
|
@ -15,4 +17,4 @@ set(SOURCES
|
||||||
)
|
)
|
||||||
|
|
||||||
serenity_bin(ProtocolServer)
|
serenity_bin(ProtocolServer)
|
||||||
target_link_libraries(ProtocolServer LibCore LibIPC LibHTTP)
|
target_link_libraries(ProtocolServer LibCore LibIPC LibGemini LibHTTP)
|
||||||
|
|
63
Services/ProtocolServer/GeminiDownload.cpp
Normal file
63
Services/ProtocolServer/GeminiDownload.cpp
Normal file
|
@ -0,0 +1,63 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2020, The SerenityOS developers.
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
*
|
||||||
|
* 1. Redistributions of source code must retain the above copyright notice, this
|
||||||
|
* list of conditions and the following disclaimer.
|
||||||
|
*
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||||
|
* this list of conditions and the following disclaimer in the documentation
|
||||||
|
* and/or other materials provided with the distribution.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||||
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
||||||
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||||
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||||
|
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||||
|
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||||
|
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <LibGemini/GeminiResponse.h>
|
||||||
|
#include <LibGemini/GeminiJob.h>
|
||||||
|
#include <ProtocolServer/GeminiDownload.h>
|
||||||
|
|
||||||
|
GeminiDownload::GeminiDownload(PSClientConnection& client, NonnullRefPtr<Gemini::GeminiJob>&& job)
|
||||||
|
: Download(client)
|
||||||
|
, m_job(job)
|
||||||
|
{
|
||||||
|
m_job->on_finish = [this](bool success) {
|
||||||
|
if (auto* response = m_job->response()) {
|
||||||
|
set_payload(response->payload());
|
||||||
|
if (!response->meta().is_empty()) {
|
||||||
|
HashMap<String, String, CaseInsensitiveStringTraits> headers;
|
||||||
|
headers.set("meta", response->meta());
|
||||||
|
set_response_headers(headers);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// signal 100% download progress so any listeners can react
|
||||||
|
// appropriately
|
||||||
|
did_progress(downloaded_size(), downloaded_size());
|
||||||
|
|
||||||
|
did_finish(success);
|
||||||
|
};
|
||||||
|
m_job->on_progress = [this](Optional<u32> total, u32 current) {
|
||||||
|
did_progress(total, current);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
GeminiDownload::~GeminiDownload()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
NonnullRefPtr<GeminiDownload> GeminiDownload::create_with_job(Badge<GeminiProtocol>, PSClientConnection& client, NonnullRefPtr<Gemini::GeminiJob>&& job)
|
||||||
|
{
|
||||||
|
return adopt(*new GeminiDownload(client, move(job)));
|
||||||
|
}
|
45
Services/ProtocolServer/GeminiDownload.h
Normal file
45
Services/ProtocolServer/GeminiDownload.h
Normal file
|
@ -0,0 +1,45 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2020, The SerenityOS developers.
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
*
|
||||||
|
* 1. Redistributions of source code must retain the above copyright notice, this
|
||||||
|
* list of conditions and the following disclaimer.
|
||||||
|
*
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||||
|
* this list of conditions and the following disclaimer in the documentation
|
||||||
|
* and/or other materials provided with the distribution.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||||
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
||||||
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||||
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||||
|
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||||
|
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||||
|
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <AK/Badge.h>
|
||||||
|
#include <LibCore/Forward.h>
|
||||||
|
#include <LibGemini/GeminiJob.h>
|
||||||
|
#include <ProtocolServer/Download.h>
|
||||||
|
|
||||||
|
class GeminiProtocol;
|
||||||
|
|
||||||
|
class GeminiDownload final : public Download {
|
||||||
|
public:
|
||||||
|
virtual ~GeminiDownload() override;
|
||||||
|
static NonnullRefPtr<GeminiDownload> create_with_job(Badge<GeminiProtocol>, PSClientConnection&, NonnullRefPtr<Gemini::GeminiJob>&&);
|
||||||
|
|
||||||
|
private:
|
||||||
|
explicit GeminiDownload(PSClientConnection&, NonnullRefPtr<Gemini::GeminiJob>&&);
|
||||||
|
|
||||||
|
NonnullRefPtr<Gemini::GeminiJob> m_job;
|
||||||
|
};
|
49
Services/ProtocolServer/GeminiProtocol.cpp
Normal file
49
Services/ProtocolServer/GeminiProtocol.cpp
Normal file
|
@ -0,0 +1,49 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2020, The SerenityOS developers.
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
*
|
||||||
|
* 1. Redistributions of source code must retain the above copyright notice, this
|
||||||
|
* list of conditions and the following disclaimer.
|
||||||
|
*
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||||
|
* this list of conditions and the following disclaimer in the documentation
|
||||||
|
* and/or other materials provided with the distribution.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||||
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
||||||
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||||
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||||
|
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||||
|
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||||
|
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <LibGemini/GeminiRequest.h>
|
||||||
|
#include <LibGemini/GeminiJob.h>
|
||||||
|
#include <ProtocolServer/GeminiDownload.h>
|
||||||
|
#include <ProtocolServer/GeminiProtocol.h>
|
||||||
|
|
||||||
|
GeminiProtocol::GeminiProtocol()
|
||||||
|
: Protocol("gemini")
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
GeminiProtocol::~GeminiProtocol()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
RefPtr<Download> GeminiProtocol::start_download(PSClientConnection& client, const URL& url)
|
||||||
|
{
|
||||||
|
Gemini::GeminiRequest request;
|
||||||
|
request.set_url(url);
|
||||||
|
auto job = Gemini::GeminiJob::construct(request);
|
||||||
|
auto download = GeminiDownload::create_with_job({}, client, (Gemini::GeminiJob&)*job);
|
||||||
|
job->start();
|
||||||
|
return download;
|
||||||
|
}
|
37
Services/ProtocolServer/GeminiProtocol.h
Normal file
37
Services/ProtocolServer/GeminiProtocol.h
Normal file
|
@ -0,0 +1,37 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2020, The SerenityOS developers.
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
*
|
||||||
|
* 1. Redistributions of source code must retain the above copyright notice, this
|
||||||
|
* list of conditions and the following disclaimer.
|
||||||
|
*
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||||
|
* this list of conditions and the following disclaimer in the documentation
|
||||||
|
* and/or other materials provided with the distribution.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||||
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
||||||
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||||
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||||
|
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||||
|
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||||
|
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <ProtocolServer/Protocol.h>
|
||||||
|
|
||||||
|
class GeminiProtocol final : public Protocol {
|
||||||
|
public:
|
||||||
|
GeminiProtocol();
|
||||||
|
virtual ~GeminiProtocol() override;
|
||||||
|
|
||||||
|
virtual RefPtr<Download> start_download(PSClientConnection&, const URL&) override;
|
||||||
|
};
|
|
@ -27,6 +27,7 @@
|
||||||
#include <LibCore/EventLoop.h>
|
#include <LibCore/EventLoop.h>
|
||||||
#include <LibCore/LocalServer.h>
|
#include <LibCore/LocalServer.h>
|
||||||
#include <LibIPC/ClientConnection.h>
|
#include <LibIPC/ClientConnection.h>
|
||||||
|
#include <ProtocolServer/GeminiProtocol.h>
|
||||||
#include <ProtocolServer/HttpProtocol.h>
|
#include <ProtocolServer/HttpProtocol.h>
|
||||||
#include <ProtocolServer/HttpsProtocol.h>
|
#include <ProtocolServer/HttpsProtocol.h>
|
||||||
#include <ProtocolServer/PSClientConnection.h>
|
#include <ProtocolServer/PSClientConnection.h>
|
||||||
|
@ -52,6 +53,7 @@ int main(int, char**)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
(void)*new GeminiProtocol;
|
||||||
(void)*new HttpProtocol;
|
(void)*new HttpProtocol;
|
||||||
(void)*new HttpsProtocol;
|
(void)*new HttpsProtocol;
|
||||||
auto server = Core::LocalServer::construct();
|
auto server = Core::LocalServer::construct();
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue