Remove stats agg kind

2023-02-03 17:46:01 +01:00
parent faa9158719
commit c9f39d5574
11 changed files with 158 additions and 511 deletions
--- a/httpret/src/proxy.rs
+++ b/httpret/src/proxy.rs
@@ -1,29 +1,58 @@
+pub mod api1;
 pub mod api4;

-use crate::api1::{channel_search_configs_v1, channel_search_list_v1, gather_json_2_v1};
+use crate::api1::channel_search_configs_v1;
+use crate::api1::channel_search_list_v1;
+use crate::api1::gather_json_2_v1;
+use crate::api_1_docs;
+use crate::api_4_docs;
 use crate::err::Error;
-use crate::gather::{gather_get_json_generic, SubRes};
+use crate::gather::gather_get_json_generic;
+use crate::gather::SubRes;
 use crate::pulsemap::MapPulseQuery;
-use crate::{api_1_docs, api_4_docs, response, response_err, Cont, ReqCtx, PSI_DAQBUFFER_SERVICE_MARK};
-use futures_util::{pin_mut, Stream};
-use http::{Method, StatusCode};
-use hyper::service::{make_service_fn, service_fn};
-use hyper::{Body, Request, Response, Server};
+use crate::response;
+use crate::response_err;
+use crate::Cont;
+use crate::ReqCtx;
+use crate::PSI_DAQBUFFER_SERVICE_MARK;
+use futures_util::pin_mut;
+use futures_util::Stream;
+use http::Method;
+use http::StatusCode;
+use hyper::service::make_service_fn;
+use hyper::service::service_fn;
+use hyper::Body;
+use hyper::Request;
+use hyper::Response;
+use hyper::Server;
 use itertools::Itertools;
 use netpod::log::*;
-use netpod::query::{BinnedQuery, ChannelStateEventsQuery, PlainEventsQuery};
-use netpod::{AppendToUrl, ChannelConfigQuery, FromUrl, HasBackend, HasTimeout, ProxyConfig};
-use netpod::{ChannelSearchQuery, ChannelSearchResult, ChannelSearchSingleResult};
-use netpod::{ACCEPT_ALL, APP_JSON};
-use serde::{Deserialize, Serialize};
+use netpod::query::BinnedQuery;
+use netpod::query::ChannelStateEventsQuery;
+use netpod::query::PlainEventsQuery;
+use netpod::AppendToUrl;
+use netpod::ChannelConfigQuery;
+use netpod::ChannelSearchQuery;
+use netpod::ChannelSearchResult;
+use netpod::ChannelSearchSingleResult;
+use netpod::FromUrl;
+use netpod::HasBackend;
+use netpod::HasTimeout;
+use netpod::ProxyConfig;
+use netpod::ACCEPT_ALL;
+use netpod::APP_JSON;
+use serde::Deserialize;
+use serde::Serialize;
 use serde_json::Value as JsonValue;
 use std::future::Future;
 use std::net::SocketAddr;
 use std::pin::Pin;
-use std::task::{Context, Poll};
+use std::task::Context;
+use std::task::Poll;
 use std::time::Duration;
 use tokio::fs::File;
-use tokio::io::{AsyncRead, ReadBuf};
+use tokio::io::AsyncRead;
+use tokio::io::ReadBuf;
 use url::Url;

 const DISTRI_PRE: &str = "/distri/";
--- a/httpret/src/proxy/api1.rs
+++ b/httpret/src/proxy/api1.rs
@@ -0,0 +1,60 @@
+use crate::bodystream::response;
+use crate::err::Error;
+use crate::ReqCtx;
+use http::Method;
+use http::Request;
+use http::Response;
+use http::StatusCode;
+use hyper::Body;
+use netpod::log::*;
+use netpod::query::api1::Api1Query;
+use netpod::ProxyConfig;
+use netpod::ACCEPT_ALL;
+
+pub struct PythonDataApi1Query {}
+
+impl PythonDataApi1Query {
+    pub fn path() -> &'static str {
+        "/api/1/query"
+    }
+
+    pub fn handler(req: &Request<Body>) -> Option<Self> {
+        if req.uri().path() == Self::path() {
+            Some(Self {})
+        } else {
+            None
+        }
+    }
+
+    pub async fn handle(
+        &self,
+        req: Request<Body>,
+        ctx: &ReqCtx,
+        proxy_config: &ProxyConfig,
+    ) -> Result<Response<Body>, Error> {
+        if req.method() != Method::POST {
+            return Ok(response(StatusCode::METHOD_NOT_ALLOWED).body(Body::empty())?);
+        }
+        let (head, body) = req.into_parts();
+        let accept = head
+            .headers
+            .get(http::header::ACCEPT)
+            .map_or(Ok(ACCEPT_ALL), |k| k.to_str())
+            .map_err(|e| Error::with_msg_no_trace(format!("{e:?}")))?
+            .to_owned();
+        let body_data = hyper::body::to_bytes(body).await?;
+        if body_data.len() < 512 && body_data.first() == Some(&"{".as_bytes()[0]) {
+            info!("request body_data string: {}", String::from_utf8_lossy(&body_data));
+        }
+        let qu = match serde_json::from_slice::<Api1Query>(&body_data) {
+            Ok(qu) => qu,
+            Err(e) => {
+                error!("got body_data: {:?}", String::from_utf8_lossy(&body_data[..]));
+                error!("can not parse: {e}");
+                return Err(Error::with_msg_no_trace("can not parse query"));
+            }
+        };
+        info!("Proxy sees request: {qu:?}");
+        Ok(response(StatusCode::OK).body(Body::empty())?)
+    }
+}