mirror of
https://github.com/actix/actix-web.git
synced 2025-01-02 05:18:44 +00:00
add actix-framed
This commit is contained in:
Nikolay Kim
parent
52aebb3bca
commit
8dc4a88aa6
11 changed files with 909 additions and 0 deletions
37
actix-framed/Cargo.toml
Normal file
37
actix-framed/Cargo.toml
Normal file
|
|
@ -0,0 +1,37 @@
|
||||||
|
[package]
|
||||||
|
name = "actix-framed"
|
||||||
|
version = "0.1.0"
|
||||||
|
authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
|
||||||
|
description = "Actix framed app server"
|
||||||
|
readme = "README.md"
|
||||||
|
keywords = ["http", "web", "framework", "async", "futures"]
|
||||||
|
homepage = "https://actix.rs"
|
||||||
|
repository = "https://github.com/actix/actix-web.git"
|
||||||
|
documentation = "https://docs.rs/actix-framed/"
|
||||||
|
categories = ["network-programming", "asynchronous",
|
||||||
|
"web-programming::http-server",
|
||||||
|
"web-programming::websocket"]
|
||||||
|
license = "MIT/Apache-2.0"
|
||||||
|
edition = "2018"
|
||||||
|
workspace =".."
|
||||||
|
|
||||||
|
[lib]
|
||||||
|
name = "actix_framed"
|
||||||
|
path = "src/lib.rs"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
actix-codec = "0.1.2"
|
||||||
|
actix-service = "0.3.6"
|
||||||
|
actix-utils = "0.3.4"
|
||||||
|
actix-router = "0.1.2"
|
||||||
|
actix-http = { path = "../actix-http" }
|
||||||
|
|
||||||
|
bytes = "0.4"
|
||||||
|
futures = "0.1.25"
|
||||||
|
log = "0.4"
|
||||||
|
|
||||||
|
[dev-dependencies]
|
||||||
|
actix-rt = "0.2.2"
|
||||||
|
actix-server = { version = "0.4.1", features=["ssl"] }
|
||||||
|
actix-connect = { version = "0.1.0", features=["ssl"] }
|
||||||
|
actix-http-test = { version = "0.1.0-alpha.3", features=["ssl"] }
|
||||||
201
actix-framed/LICENSE-APACHE
Normal file
201
actix-framed/LICENSE-APACHE
Normal file
|
|
@ -0,0 +1,201 @@
|
||||||
|
Apache License
|
||||||
|
Version 2.0, January 2004
|
||||||
|
http://www.apache.org/licenses/
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||||
|
|
||||||
|
1. Definitions.
|
||||||
|
|
||||||
|
"License" shall mean the terms and conditions for use, reproduction,
|
||||||
|
and distribution as defined by Sections 1 through 9 of this document.
|
||||||
|
|
||||||
|
"Licensor" shall mean the copyright owner or entity authorized by
|
||||||
|
the copyright owner that is granting the License.
|
||||||
|
|
||||||
|
"Legal Entity" shall mean the union of the acting entity and all
|
||||||
|
other entities that control, are controlled by, or are under common
|
||||||
|
control with that entity. For the purposes of this definition,
|
||||||
|
"control" means (i) the power, direct or indirect, to cause the
|
||||||
|
direction or management of such entity, whether by contract or
|
||||||
|
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||||
|
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||||
|
|
||||||
|
"You" (or "Your") shall mean an individual or Legal Entity
|
||||||
|
exercising permissions granted by this License.
|
||||||
|
|
||||||
|
"Source" form shall mean the preferred form for making modifications,
|
||||||
|
including but not limited to software source code, documentation
|
||||||
|
source, and configuration files.
|
||||||
|
|
||||||
|
"Object" form shall mean any form resulting from mechanical
|
||||||
|
transformation or translation of a Source form, including but
|
||||||
|
not limited to compiled object code, generated documentation,
|
||||||
|
and conversions to other media types.
|
||||||
|
|
||||||
|
"Work" shall mean the work of authorship, whether in Source or
|
||||||
|
Object form, made available under the License, as indicated by a
|
||||||
|
copyright notice that is included in or attached to the work
|
||||||
|
(an example is provided in the Appendix below).
|
||||||
|
|
||||||
|
"Derivative Works" shall mean any work, whether in Source or Object
|
||||||
|
form, that is based on (or derived from) the Work and for which the
|
||||||
|
editorial revisions, annotations, elaborations, or other modifications
|
||||||
|
represent, as a whole, an original work of authorship. For the purposes
|
||||||
|
of this License, Derivative Works shall not include works that remain
|
||||||
|
separable from, or merely link (or bind by name) to the interfaces of,
|
||||||
|
the Work and Derivative Works thereof.
|
||||||
|
|
||||||
|
"Contribution" shall mean any work of authorship, including
|
||||||
|
the original version of the Work and any modifications or additions
|
||||||
|
to that Work or Derivative Works thereof, that is intentionally
|
||||||
|
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||||
|
or by an individual or Legal Entity authorized to submit on behalf of
|
||||||
|
the copyright owner. For the purposes of this definition, "submitted"
|
||||||
|
means any form of electronic, verbal, or written communication sent
|
||||||
|
to the Licensor or its representatives, including but not limited to
|
||||||
|
communication on electronic mailing lists, source code control systems,
|
||||||
|
and issue tracking systems that are managed by, or on behalf of, the
|
||||||
|
Licensor for the purpose of discussing and improving the Work, but
|
||||||
|
excluding communication that is conspicuously marked or otherwise
|
||||||
|
designated in writing by the copyright owner as "Not a Contribution."
|
||||||
|
|
||||||
|
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||||
|
on behalf of whom a Contribution has been received by Licensor and
|
||||||
|
subsequently incorporated within the Work.
|
||||||
|
|
||||||
|
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
copyright license to reproduce, prepare Derivative Works of,
|
||||||
|
publicly display, publicly perform, sublicense, and distribute the
|
||||||
|
Work and such Derivative Works in Source or Object form.
|
||||||
|
|
||||||
|
3. Grant of Patent License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
(except as stated in this section) patent license to make, have made,
|
||||||
|
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||||
|
where such license applies only to those patent claims licensable
|
||||||
|
by such Contributor that are necessarily infringed by their
|
||||||
|
Contribution(s) alone or by combination of their Contribution(s)
|
||||||
|
with the Work to which such Contribution(s) was submitted. If You
|
||||||
|
institute patent litigation against any entity (including a
|
||||||
|
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||||
|
or a Contribution incorporated within the Work constitutes direct
|
||||||
|
or contributory patent infringement, then any patent licenses
|
||||||
|
granted to You under this License for that Work shall terminate
|
||||||
|
as of the date such litigation is filed.
|
||||||
|
|
||||||
|
4. Redistribution. You may reproduce and distribute copies of the
|
||||||
|
Work or Derivative Works thereof in any medium, with or without
|
||||||
|
modifications, and in Source or Object form, provided that You
|
||||||
|
meet the following conditions:
|
||||||
|
|
||||||
|
(a) You must give any other recipients of the Work or
|
||||||
|
Derivative Works a copy of this License; and
|
||||||
|
|
||||||
|
(b) You must cause any modified files to carry prominent notices
|
||||||
|
stating that You changed the files; and
|
||||||
|
|
||||||
|
(c) You must retain, in the Source form of any Derivative Works
|
||||||
|
that You distribute, all copyright, patent, trademark, and
|
||||||
|
attribution notices from the Source form of the Work,
|
||||||
|
excluding those notices that do not pertain to any part of
|
||||||
|
the Derivative Works; and
|
||||||
|
|
||||||
|
(d) If the Work includes a "NOTICE" text file as part of its
|
||||||
|
distribution, then any Derivative Works that You distribute must
|
||||||
|
include a readable copy of the attribution notices contained
|
||||||
|
within such NOTICE file, excluding those notices that do not
|
||||||
|
pertain to any part of the Derivative Works, in at least one
|
||||||
|
of the following places: within a NOTICE text file distributed
|
||||||
|
as part of the Derivative Works; within the Source form or
|
||||||
|
documentation, if provided along with the Derivative Works; or,
|
||||||
|
within a display generated by the Derivative Works, if and
|
||||||
|
wherever such third-party notices normally appear. The contents
|
||||||
|
of the NOTICE file are for informational purposes only and
|
||||||
|
do not modify the License. You may add Your own attribution
|
||||||
|
notices within Derivative Works that You distribute, alongside
|
||||||
|
or as an addendum to the NOTICE text from the Work, provided
|
||||||
|
that such additional attribution notices cannot be construed
|
||||||
|
as modifying the License.
|
||||||
|
|
||||||
|
You may add Your own copyright statement to Your modifications and
|
||||||
|
may provide additional or different license terms and conditions
|
||||||
|
for use, reproduction, or distribution of Your modifications, or
|
||||||
|
for any such Derivative Works as a whole, provided Your use,
|
||||||
|
reproduction, and distribution of the Work otherwise complies with
|
||||||
|
the conditions stated in this License.
|
||||||
|
|
||||||
|
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||||
|
any Contribution intentionally submitted for inclusion in the Work
|
||||||
|
by You to the Licensor shall be under the terms and conditions of
|
||||||
|
this License, without any additional terms or conditions.
|
||||||
|
Notwithstanding the above, nothing herein shall supersede or modify
|
||||||
|
the terms of any separate license agreement you may have executed
|
||||||
|
with Licensor regarding such Contributions.
|
||||||
|
|
||||||
|
6. Trademarks. This License does not grant permission to use the trade
|
||||||
|
names, trademarks, service marks, or product names of the Licensor,
|
||||||
|
except as required for reasonable and customary use in describing the
|
||||||
|
origin of the Work and reproducing the content of the NOTICE file.
|
||||||
|
|
||||||
|
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||||
|
agreed to in writing, Licensor provides the Work (and each
|
||||||
|
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||||
|
implied, including, without limitation, any warranties or conditions
|
||||||
|
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||||
|
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||||
|
appropriateness of using or redistributing the Work and assume any
|
||||||
|
risks associated with Your exercise of permissions under this License.
|
||||||
|
|
||||||
|
8. Limitation of Liability. In no event and under no legal theory,
|
||||||
|
whether in tort (including negligence), contract, or otherwise,
|
||||||
|
unless required by applicable law (such as deliberate and grossly
|
||||||
|
negligent acts) or agreed to in writing, shall any Contributor be
|
||||||
|
liable to You for damages, including any direct, indirect, special,
|
||||||
|
incidental, or consequential damages of any character arising as a
|
||||||
|
result of this License or out of the use or inability to use the
|
||||||
|
Work (including but not limited to damages for loss of goodwill,
|
||||||
|
work stoppage, computer failure or malfunction, or any and all
|
||||||
|
other commercial damages or losses), even if such Contributor
|
||||||
|
has been advised of the possibility of such damages.
|
||||||
|
|
||||||
|
9. Accepting Warranty or Additional Liability. While redistributing
|
||||||
|
the Work or Derivative Works thereof, You may choose to offer,
|
||||||
|
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||||
|
or other liability obligations and/or rights consistent with this
|
||||||
|
License. However, in accepting such obligations, You may act only
|
||||||
|
on Your own behalf and on Your sole responsibility, not on behalf
|
||||||
|
of any other Contributor, and only if You agree to indemnify,
|
||||||
|
defend, and hold each Contributor harmless for any liability
|
||||||
|
incurred by, or claims asserted against, such Contributor by reason
|
||||||
|
of your accepting any such warranty or additional liability.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
APPENDIX: How to apply the Apache License to your work.
|
||||||
|
|
||||||
|
To apply the Apache License to your work, attach the following
|
||||||
|
boilerplate notice, with the fields enclosed by brackets "{}"
|
||||||
|
replaced with your own identifying information. (Don't include
|
||||||
|
the brackets!) The text should be enclosed in the appropriate
|
||||||
|
comment syntax for the file format. We also recommend that a
|
||||||
|
file or class name and description of purpose be included on the
|
||||||
|
same "printed page" as the copyright notice for easier
|
||||||
|
identification within third-party archives.
|
||||||
|
|
||||||
|
Copyright 2017-NOW Nikolay Kim
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
25
actix-framed/LICENSE-MIT
Normal file
25
actix-framed/LICENSE-MIT
Normal file
|
|
@ -0,0 +1,25 @@
|
||||||
|
Copyright (c) 2017 Nikolay Kim
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any
|
||||||
|
person obtaining a copy of this software and associated
|
||||||
|
documentation files (the "Software"), to deal in the
|
||||||
|
Software without restriction, including without
|
||||||
|
limitation the rights to use, copy, modify, merge,
|
||||||
|
publish, distribute, sublicense, and/or sell copies of
|
||||||
|
the Software, and to permit persons to whom the Software
|
||||||
|
is furnished to do so, subject to the following
|
||||||
|
conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice
|
||||||
|
shall be included in all copies or substantial portions
|
||||||
|
of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
|
||||||
|
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
|
||||||
|
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
|
||||||
|
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
|
||||||
|
SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
||||||
|
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||||
|
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
|
||||||
|
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
|
DEALINGS IN THE SOFTWARE.
|
||||||
1
actix-framed/README.md
Normal file
1
actix-framed/README.md
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
# Framed app for actix web [](https://travis-ci.org/actix/actix-web) [](https://codecov.io/gh/actix/actix-web) [](https://crates.io/crates/actix-framed) [](https://gitter.im/actix/actix?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
|
||||||
215
actix-framed/src/app.rs
Normal file
215
actix-framed/src/app.rs
Normal file
|
|
@ -0,0 +1,215 @@
|
||||||
|
use std::rc::Rc;
|
||||||
|
|
||||||
|
use actix_codec::{AsyncRead, AsyncWrite, Framed};
|
||||||
|
use actix_http::h1::{Codec, SendResponse};
|
||||||
|
use actix_http::{Error, Request, Response};
|
||||||
|
use actix_router::{Path, Router, Url};
|
||||||
|
use actix_service::{IntoNewService, NewService, Service};
|
||||||
|
use actix_utils::cloneable::CloneableService;
|
||||||
|
use futures::{Async, Future, Poll};
|
||||||
|
|
||||||
|
use crate::helpers::{BoxedHttpNewService, BoxedHttpService, HttpNewService};
|
||||||
|
use crate::request::FramedRequest;
|
||||||
|
use crate::state::State;
|
||||||
|
|
||||||
|
type BoxedResponse = Box<Future<Item = (), Error = Error>>;
|
||||||
|
|
||||||
|
pub trait HttpServiceFactory {
|
||||||
|
type Factory: NewService;
|
||||||
|
|
||||||
|
fn path(&self) -> &str;
|
||||||
|
|
||||||
|
fn create(self) -> Self::Factory;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Application builder
|
||||||
|
pub struct App<T, S = ()> {
|
||||||
|
state: State<S>,
|
||||||
|
services: Vec<(String, BoxedHttpNewService<FramedRequest<T, S>>)>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T: 'static> App<T, ()> {
|
||||||
|
pub fn new() -> Self {
|
||||||
|
App {
|
||||||
|
state: State::new(()),
|
||||||
|
services: Vec::new(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T: 'static, S: 'static> App<T, S> {
|
||||||
|
pub fn with(state: S) -> App<T, S> {
|
||||||
|
App {
|
||||||
|
services: Vec::new(),
|
||||||
|
state: State::new(state),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn service<U>(mut self, factory: U) -> Self
|
||||||
|
where
|
||||||
|
U: HttpServiceFactory,
|
||||||
|
U::Factory: NewService<
|
||||||
|
Request = FramedRequest<T, S>,
|
||||||
|
Response = (),
|
||||||
|
Error = Error,
|
||||||
|
InitError = (),
|
||||||
|
> + 'static,
|
||||||
|
<U::Factory as NewService>::Future: 'static,
|
||||||
|
<U::Factory as NewService>::Service: Service<
|
||||||
|
Request = FramedRequest<T, S>,
|
||||||
|
Response = (),
|
||||||
|
Error = Error,
|
||||||
|
Future = Box<Future<Item = (), Error = Error>>,
|
||||||
|
>,
|
||||||
|
{
|
||||||
|
let path = factory.path().to_string();
|
||||||
|
self.services
|
||||||
|
.push((path, Box::new(HttpNewService::new(factory.create()))));
|
||||||
|
self
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T, S> IntoNewService<AppFactory<T, S>> for App<T, S>
|
||||||
|
where
|
||||||
|
T: AsyncRead + AsyncWrite + 'static,
|
||||||
|
S: 'static,
|
||||||
|
{
|
||||||
|
fn into_new_service(self) -> AppFactory<T, S> {
|
||||||
|
AppFactory {
|
||||||
|
state: self.state,
|
||||||
|
services: Rc::new(self.services),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct AppFactory<T, S> {
|
||||||
|
state: State<S>,
|
||||||
|
services: Rc<Vec<(String, BoxedHttpNewService<FramedRequest<T, S>>)>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T, S> NewService for AppFactory<T, S>
|
||||||
|
where
|
||||||
|
T: AsyncRead + AsyncWrite + 'static,
|
||||||
|
S: 'static,
|
||||||
|
{
|
||||||
|
type Request = (Request, Framed<T, Codec>);
|
||||||
|
type Response = ();
|
||||||
|
type Error = Error;
|
||||||
|
type InitError = ();
|
||||||
|
type Service = CloneableService<AppService<T, S>>;
|
||||||
|
type Future = CreateService<T, S>;
|
||||||
|
|
||||||
|
fn new_service(&self, _: &()) -> Self::Future {
|
||||||
|
CreateService {
|
||||||
|
fut: self
|
||||||
|
.services
|
||||||
|
.iter()
|
||||||
|
.map(|(path, service)| {
|
||||||
|
CreateServiceItem::Future(
|
||||||
|
Some(path.clone()),
|
||||||
|
service.new_service(&()),
|
||||||
|
)
|
||||||
|
})
|
||||||
|
.collect(),
|
||||||
|
state: self.state.clone(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[doc(hidden)]
|
||||||
|
pub struct CreateService<T, S> {
|
||||||
|
fut: Vec<CreateServiceItem<T, S>>,
|
||||||
|
state: State<S>,
|
||||||
|
}
|
||||||
|
|
||||||
|
enum CreateServiceItem<T, S> {
|
||||||
|
Future(
|
||||||
|
Option<String>,
|
||||||
|
Box<Future<Item = BoxedHttpService<FramedRequest<T, S>>, Error = ()>>,
|
||||||
|
),
|
||||||
|
Service(String, BoxedHttpService<FramedRequest<T, S>>),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<S: 'static, T: 'static> Future for CreateService<T, S>
|
||||||
|
where
|
||||||
|
T: AsyncRead + AsyncWrite,
|
||||||
|
{
|
||||||
|
type Item = CloneableService<AppService<T, S>>;
|
||||||
|
type Error = ();
|
||||||
|
|
||||||
|
fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
|
||||||
|
let mut done = true;
|
||||||
|
|
||||||
|
// poll http services
|
||||||
|
for item in &mut self.fut {
|
||||||
|
let res = match item {
|
||||||
|
CreateServiceItem::Future(ref mut path, ref mut fut) => {
|
||||||
|
match fut.poll()? {
|
||||||
|
Async::Ready(service) => Some((path.take().unwrap(), service)),
|
||||||
|
Async::NotReady => {
|
||||||
|
done = false;
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
CreateServiceItem::Service(_, _) => continue,
|
||||||
|
};
|
||||||
|
|
||||||
|
if let Some((path, service)) = res {
|
||||||
|
*item = CreateServiceItem::Service(path, service);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if done {
|
||||||
|
let router = self
|
||||||
|
.fut
|
||||||
|
.drain(..)
|
||||||
|
.fold(Router::build(), |mut router, item| {
|
||||||
|
match item {
|
||||||
|
CreateServiceItem::Service(path, service) => {
|
||||||
|
router.path(&path, service);
|
||||||
|
}
|
||||||
|
CreateServiceItem::Future(_, _) => unreachable!(),
|
||||||
|
}
|
||||||
|
router
|
||||||
|
});
|
||||||
|
Ok(Async::Ready(CloneableService::new(AppService {
|
||||||
|
router: router.finish(),
|
||||||
|
state: self.state.clone(),
|
||||||
|
})))
|
||||||
|
} else {
|
||||||
|
Ok(Async::NotReady)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct AppService<T, S> {
|
||||||
|
state: State<S>,
|
||||||
|
router: Router<BoxedHttpService<FramedRequest<T, S>>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<S: 'static, T: 'static> Service for AppService<T, S>
|
||||||
|
where
|
||||||
|
T: AsyncRead + AsyncWrite,
|
||||||
|
{
|
||||||
|
type Request = (Request, Framed<T, Codec>);
|
||||||
|
type Response = ();
|
||||||
|
type Error = Error;
|
||||||
|
type Future = BoxedResponse;
|
||||||
|
|
||||||
|
fn poll_ready(&mut self) -> Poll<(), Self::Error> {
|
||||||
|
Ok(Async::Ready(()))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn call(&mut self, (req, framed): (Request, Framed<T, Codec>)) -> Self::Future {
|
||||||
|
let mut path = Path::new(Url::new(req.uri().clone()));
|
||||||
|
|
||||||
|
if let Some((srv, _info)) = self.router.recognize_mut(&mut path) {
|
||||||
|
return srv.call(FramedRequest::new(req, framed, self.state.clone()));
|
||||||
|
}
|
||||||
|
Box::new(
|
||||||
|
SendResponse::new(framed, Response::NotFound().finish()).then(|_| Ok(())),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
88
actix-framed/src/helpers.rs
Normal file
88
actix-framed/src/helpers.rs
Normal file
|
|
@ -0,0 +1,88 @@
|
||||||
|
use actix_http::Error;
|
||||||
|
use actix_service::{NewService, Service};
|
||||||
|
use futures::{Future, Poll};
|
||||||
|
|
||||||
|
pub(crate) type BoxedHttpService<Req> = Box<
|
||||||
|
Service<
|
||||||
|
Request = Req,
|
||||||
|
Response = (),
|
||||||
|
Error = Error,
|
||||||
|
Future = Box<Future<Item = (), Error = Error>>,
|
||||||
|
>,
|
||||||
|
>;
|
||||||
|
|
||||||
|
pub(crate) type BoxedHttpNewService<Req> = Box<
|
||||||
|
NewService<
|
||||||
|
Request = Req,
|
||||||
|
Response = (),
|
||||||
|
Error = Error,
|
||||||
|
InitError = (),
|
||||||
|
Service = BoxedHttpService<Req>,
|
||||||
|
Future = Box<Future<Item = BoxedHttpService<Req>, Error = ()>>,
|
||||||
|
>,
|
||||||
|
>;
|
||||||
|
|
||||||
|
pub(crate) struct HttpNewService<T: NewService>(T);
|
||||||
|
|
||||||
|
impl<T> HttpNewService<T>
|
||||||
|
where
|
||||||
|
T: NewService<Response = (), Error = Error>,
|
||||||
|
T::Response: 'static,
|
||||||
|
T::Future: 'static,
|
||||||
|
T::Service: Service<Future = Box<Future<Item = (), Error = Error>>> + 'static,
|
||||||
|
<T::Service as Service>::Future: 'static,
|
||||||
|
{
|
||||||
|
pub fn new(service: T) -> Self {
|
||||||
|
HttpNewService(service)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T> NewService for HttpNewService<T>
|
||||||
|
where
|
||||||
|
T: NewService<Response = (), Error = Error>,
|
||||||
|
T::Request: 'static,
|
||||||
|
T::Future: 'static,
|
||||||
|
T::Service: Service<Future = Box<Future<Item = (), Error = Error>>> + 'static,
|
||||||
|
<T::Service as Service>::Future: 'static,
|
||||||
|
{
|
||||||
|
type Request = T::Request;
|
||||||
|
type Response = ();
|
||||||
|
type Error = Error;
|
||||||
|
type InitError = ();
|
||||||
|
type Service = BoxedHttpService<T::Request>;
|
||||||
|
type Future = Box<Future<Item = Self::Service, Error = ()>>;
|
||||||
|
|
||||||
|
fn new_service(&self, _: &()) -> Self::Future {
|
||||||
|
Box::new(self.0.new_service(&()).map_err(|_| ()).and_then(|service| {
|
||||||
|
let service: BoxedHttpService<_> = Box::new(HttpServiceWrapper { service });
|
||||||
|
Ok(service)
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
struct HttpServiceWrapper<T: Service> {
|
||||||
|
service: T,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T> Service for HttpServiceWrapper<T>
|
||||||
|
where
|
||||||
|
T: Service<
|
||||||
|
Response = (),
|
||||||
|
Future = Box<Future<Item = (), Error = Error>>,
|
||||||
|
Error = Error,
|
||||||
|
>,
|
||||||
|
T::Request: 'static,
|
||||||
|
{
|
||||||
|
type Request = T::Request;
|
||||||
|
type Response = ();
|
||||||
|
type Error = Error;
|
||||||
|
type Future = Box<Future<Item = (), Error = Error>>;
|
||||||
|
|
||||||
|
fn poll_ready(&mut self) -> Poll<(), Self::Error> {
|
||||||
|
self.service.poll_ready()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn call(&mut self, req: Self::Request) -> Self::Future {
|
||||||
|
self.service.call(req)
|
||||||
|
}
|
||||||
|
}
|
||||||
13
actix-framed/src/lib.rs
Normal file
13
actix-framed/src/lib.rs
Normal file
|
|
@ -0,0 +1,13 @@
|
||||||
|
mod app;
|
||||||
|
mod helpers;
|
||||||
|
mod request;
|
||||||
|
mod route;
|
||||||
|
mod state;
|
||||||
|
|
||||||
|
// re-export for convinience
|
||||||
|
pub use actix_http::{http, Error, HttpMessage, Response, ResponseError};
|
||||||
|
|
||||||
|
pub use self::app::{App, AppService};
|
||||||
|
pub use self::request::FramedRequest;
|
||||||
|
pub use self::route::FramedRoute;
|
||||||
|
pub use self::state::State;
|
||||||
30
actix-framed/src/request.rs
Normal file
30
actix-framed/src/request.rs
Normal file
|
|
@ -0,0 +1,30 @@
|
||||||
|
use actix_codec::Framed;
|
||||||
|
use actix_http::{h1::Codec, Request};
|
||||||
|
|
||||||
|
use crate::state::State;
|
||||||
|
|
||||||
|
pub struct FramedRequest<Io, S = ()> {
|
||||||
|
req: Request,
|
||||||
|
framed: Framed<Io, Codec>,
|
||||||
|
state: State<S>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<Io, S> FramedRequest<Io, S> {
|
||||||
|
pub fn new(req: Request, framed: Framed<Io, Codec>, state: State<S>) -> Self {
|
||||||
|
Self { req, framed, state }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<Io, S> FramedRequest<Io, S> {
|
||||||
|
pub fn request(&self) -> &Request {
|
||||||
|
&self.req
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn request_mut(&mut self) -> &mut Request {
|
||||||
|
&mut self.req
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn into_parts(self) -> (Request, Framed<Io, Codec>, State<S>) {
|
||||||
|
(self.req, self.framed, self.state)
|
||||||
|
}
|
||||||
|
}
|
||||||
189
actix-framed/src/route.rs
Normal file
189
actix-framed/src/route.rs
Normal file
|
|
@ -0,0 +1,189 @@
|
||||||
|
use std::fmt;
|
||||||
|
use std::marker::PhantomData;
|
||||||
|
|
||||||
|
use actix_codec::{AsyncRead, AsyncWrite};
|
||||||
|
use actix_http::{http::Method, Error};
|
||||||
|
use actix_service::{NewService, Service};
|
||||||
|
use futures::future::{ok, FutureResult};
|
||||||
|
use futures::{Async, Future, IntoFuture, Poll};
|
||||||
|
use log::error;
|
||||||
|
|
||||||
|
use crate::app::HttpServiceFactory;
|
||||||
|
use crate::request::FramedRequest;
|
||||||
|
|
||||||
|
/// Resource route definition
|
||||||
|
///
|
||||||
|
/// Route uses builder-like pattern for configuration.
|
||||||
|
/// If handler is not explicitly set, default *404 Not Found* handler is used.
|
||||||
|
pub struct FramedRoute<Io, S, F, R> {
|
||||||
|
handler: F,
|
||||||
|
pattern: String,
|
||||||
|
methods: Vec<Method>,
|
||||||
|
state: PhantomData<(Io, S, R)>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<Io, S> FramedRoute<Io, S, (), ()> {
|
||||||
|
pub fn build(path: &str) -> FramedRouteBuilder<Io, S> {
|
||||||
|
FramedRouteBuilder::new(path)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get(path: &str) -> FramedRouteBuilder<Io, S> {
|
||||||
|
FramedRouteBuilder::new(path).method(Method::GET)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn post(path: &str) -> FramedRouteBuilder<Io, S> {
|
||||||
|
FramedRouteBuilder::new(path).method(Method::POST)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn put(path: &str) -> FramedRouteBuilder<Io, S> {
|
||||||
|
FramedRouteBuilder::new(path).method(Method::PUT)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn delete(path: &str) -> FramedRouteBuilder<Io, S> {
|
||||||
|
FramedRouteBuilder::new(path).method(Method::DELETE)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<Io, S, F, R> FramedRoute<Io, S, F, R>
|
||||||
|
where
|
||||||
|
F: FnMut(FramedRequest<Io, S>) -> R + Clone,
|
||||||
|
R: IntoFuture<Item = ()>,
|
||||||
|
R::Future: 'static,
|
||||||
|
R::Error: fmt::Display,
|
||||||
|
{
|
||||||
|
pub fn new(pattern: &str, handler: F) -> Self {
|
||||||
|
FramedRoute {
|
||||||
|
handler,
|
||||||
|
pattern: pattern.to_string(),
|
||||||
|
methods: Vec::new(),
|
||||||
|
state: PhantomData,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn method(mut self, method: Method) -> Self {
|
||||||
|
self.methods.push(method);
|
||||||
|
self
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<Io, S, F, R> HttpServiceFactory for FramedRoute<Io, S, F, R>
|
||||||
|
where
|
||||||
|
Io: AsyncRead + AsyncWrite + 'static,
|
||||||
|
F: FnMut(FramedRequest<Io, S>) -> R + Clone,
|
||||||
|
R: IntoFuture<Item = ()>,
|
||||||
|
R::Future: 'static,
|
||||||
|
R::Error: fmt::Display,
|
||||||
|
{
|
||||||
|
type Factory = FramedRouteFactory<Io, S, F, R>;
|
||||||
|
|
||||||
|
fn path(&self) -> &str {
|
||||||
|
&self.pattern
|
||||||
|
}
|
||||||
|
|
||||||
|
fn create(self) -> Self::Factory {
|
||||||
|
FramedRouteFactory {
|
||||||
|
handler: self.handler,
|
||||||
|
methods: self.methods,
|
||||||
|
_t: PhantomData,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct FramedRouteFactory<Io, S, F, R> {
|
||||||
|
handler: F,
|
||||||
|
methods: Vec<Method>,
|
||||||
|
_t: PhantomData<(Io, S, R)>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<Io, S, F, R> NewService for FramedRouteFactory<Io, S, F, R>
|
||||||
|
where
|
||||||
|
Io: AsyncRead + AsyncWrite + 'static,
|
||||||
|
F: FnMut(FramedRequest<Io, S>) -> R + Clone,
|
||||||
|
R: IntoFuture<Item = ()>,
|
||||||
|
R::Future: 'static,
|
||||||
|
R::Error: fmt::Display,
|
||||||
|
{
|
||||||
|
type Request = FramedRequest<Io, S>;
|
||||||
|
type Response = ();
|
||||||
|
type Error = Error;
|
||||||
|
type InitError = ();
|
||||||
|
type Service = FramedRouteService<Io, S, F, R>;
|
||||||
|
type Future = FutureResult<Self::Service, Self::InitError>;
|
||||||
|
|
||||||
|
fn new_service(&self, _: &()) -> Self::Future {
|
||||||
|
ok(FramedRouteService {
|
||||||
|
handler: self.handler.clone(),
|
||||||
|
methods: self.methods.clone(),
|
||||||
|
_t: PhantomData,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct FramedRouteService<Io, S, F, R> {
|
||||||
|
handler: F,
|
||||||
|
methods: Vec<Method>,
|
||||||
|
_t: PhantomData<(Io, S, R)>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<Io, S, F, R> Service for FramedRouteService<Io, S, F, R>
|
||||||
|
where
|
||||||
|
Io: AsyncRead + AsyncWrite + 'static,
|
||||||
|
F: FnMut(FramedRequest<Io, S>) -> R + Clone,
|
||||||
|
R: IntoFuture<Item = ()>,
|
||||||
|
R::Future: 'static,
|
||||||
|
R::Error: fmt::Display,
|
||||||
|
{
|
||||||
|
type Request = FramedRequest<Io, S>;
|
||||||
|
type Response = ();
|
||||||
|
type Error = Error;
|
||||||
|
type Future = Box<Future<Item = (), Error = Error>>;
|
||||||
|
|
||||||
|
fn poll_ready(&mut self) -> Poll<(), Self::Error> {
|
||||||
|
Ok(Async::Ready(()))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn call(&mut self, req: FramedRequest<Io, S>) -> Self::Future {
|
||||||
|
Box::new((self.handler)(req).into_future().then(|res| {
|
||||||
|
if let Err(e) = res {
|
||||||
|
error!("Error in request handler: {}", e);
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct FramedRouteBuilder<Io, S> {
|
||||||
|
pattern: String,
|
||||||
|
methods: Vec<Method>,
|
||||||
|
state: PhantomData<(Io, S)>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<Io, S> FramedRouteBuilder<Io, S> {
|
||||||
|
fn new(path: &str) -> FramedRouteBuilder<Io, S> {
|
||||||
|
FramedRouteBuilder {
|
||||||
|
pattern: path.to_string(),
|
||||||
|
methods: Vec::new(),
|
||||||
|
state: PhantomData,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn method(mut self, method: Method) -> Self {
|
||||||
|
self.methods.push(method);
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn to<F, R>(self, handler: F) -> FramedRoute<Io, S, F, R>
|
||||||
|
where
|
||||||
|
F: FnMut(FramedRequest<Io, S>) -> R,
|
||||||
|
R: IntoFuture<Item = ()>,
|
||||||
|
R::Future: 'static,
|
||||||
|
R::Error: fmt::Debug,
|
||||||
|
{
|
||||||
|
FramedRoute {
|
||||||
|
handler,
|
||||||
|
pattern: self.pattern,
|
||||||
|
methods: self.methods,
|
||||||
|
state: PhantomData,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
29
actix-framed/src/state.rs
Normal file
29
actix-framed/src/state.rs
Normal file
|
|
@ -0,0 +1,29 @@
|
||||||
|
use std::ops::Deref;
|
||||||
|
use std::sync::Arc;
|
||||||
|
|
||||||
|
/// Application state
|
||||||
|
pub struct State<S>(Arc<S>);
|
||||||
|
|
||||||
|
impl<S> State<S> {
|
||||||
|
pub fn new(state: S) -> State<S> {
|
||||||
|
State(Arc::new(state))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_ref(&self) -> &S {
|
||||||
|
self.0.as_ref()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<S> Deref for State<S> {
|
||||||
|
type Target = S;
|
||||||
|
|
||||||
|
fn deref(&self) -> &S {
|
||||||
|
self.0.as_ref()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<S> Clone for State<S> {
|
||||||
|
fn clone(&self) -> State<S> {
|
||||||
|
State(self.0.clone())
|
||||||
|
}
|
||||||
|
}
|
||||||
81
actix-framed/tests/test_server.rs
Normal file
81
actix-framed/tests/test_server.rs
Normal file
|
|
@ -0,0 +1,81 @@
|
||||||
|
use actix_codec::{AsyncRead, AsyncWrite};
|
||||||
|
use actix_http::{body, ws, Error, HttpService, Response};
|
||||||
|
use actix_http_test::TestServer;
|
||||||
|
use actix_utils::framed::FramedTransport;
|
||||||
|
use bytes::{Bytes, BytesMut};
|
||||||
|
use futures::future::{self, ok};
|
||||||
|
use futures::{Future, Sink, Stream};
|
||||||
|
|
||||||
|
use actix_framed::{App, FramedRequest, FramedRoute};
|
||||||
|
|
||||||
|
fn ws_service<T: AsyncRead + AsyncWrite>(
|
||||||
|
req: FramedRequest<T>,
|
||||||
|
) -> impl Future<Item = (), Error = Error> {
|
||||||
|
let (req, framed, _) = req.into_parts();
|
||||||
|
let res = ws::handshake(&req).unwrap().message_body(());
|
||||||
|
|
||||||
|
framed
|
||||||
|
.send((res, body::BodySize::None).into())
|
||||||
|
.map_err(|_| panic!())
|
||||||
|
.and_then(|framed| {
|
||||||
|
FramedTransport::new(framed.into_framed(ws::Codec::new()), service)
|
||||||
|
.map_err(|_| panic!())
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
fn service(msg: ws::Frame) -> impl Future<Item = ws::Message, Error = Error> {
|
||||||
|
let msg = match msg {
|
||||||
|
ws::Frame::Ping(msg) => ws::Message::Pong(msg),
|
||||||
|
ws::Frame::Text(text) => {
|
||||||
|
ws::Message::Text(String::from_utf8_lossy(&text.unwrap()).to_string())
|
||||||
|
}
|
||||||
|
ws::Frame::Binary(bin) => ws::Message::Binary(bin.unwrap().freeze()),
|
||||||
|
ws::Frame::Close(reason) => ws::Message::Close(reason),
|
||||||
|
_ => panic!(),
|
||||||
|
};
|
||||||
|
ok(msg)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_simple() {
|
||||||
|
let mut srv = TestServer::new(|| {
|
||||||
|
HttpService::build()
|
||||||
|
.upgrade(App::new().service(FramedRoute::get("/index.html").to(ws_service)))
|
||||||
|
.finish(|_| future::ok::<_, Error>(Response::NotFound()))
|
||||||
|
});
|
||||||
|
|
||||||
|
assert!(srv.ws_at("/test").is_err());
|
||||||
|
|
||||||
|
// client service
|
||||||
|
let framed = srv.ws_at("/index.html").unwrap();
|
||||||
|
let framed = srv
|
||||||
|
.block_on(framed.send(ws::Message::Text("text".to_string())))
|
||||||
|
.unwrap();
|
||||||
|
let (item, framed) = srv.block_on(framed.into_future()).map_err(|_| ()).unwrap();
|
||||||
|
assert_eq!(item, Some(ws::Frame::Text(Some(BytesMut::from("text")))));
|
||||||
|
|
||||||
|
let framed = srv
|
||||||
|
.block_on(framed.send(ws::Message::Binary("text".into())))
|
||||||
|
.unwrap();
|
||||||
|
let (item, framed) = srv.block_on(framed.into_future()).map_err(|_| ()).unwrap();
|
||||||
|
assert_eq!(
|
||||||
|
item,
|
||||||
|
Some(ws::Frame::Binary(Some(Bytes::from_static(b"text").into())))
|
||||||
|
);
|
||||||
|
|
||||||
|
let framed = srv
|
||||||
|
.block_on(framed.send(ws::Message::Ping("text".into())))
|
||||||
|
.unwrap();
|
||||||
|
let (item, framed) = srv.block_on(framed.into_future()).map_err(|_| ()).unwrap();
|
||||||
|
assert_eq!(item, Some(ws::Frame::Pong("text".to_string().into())));
|
||||||
|
|
||||||
|
let framed = srv
|
||||||
|
.block_on(framed.send(ws::Message::Close(Some(ws::CloseCode::Normal.into()))))
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let (item, _framed) = srv.block_on(framed.into_future()).map_err(|_| ()).unwrap();
|
||||||
|
assert_eq!(
|
||||||
|
item,
|
||||||
|
Some(ws::Frame::Close(Some(ws::CloseCode::Normal.into())))
|
||||||
|
);
|
||||||
|
}
|
||||||
Loading…
Reference in a new issue