Finally address comment about processRestRequest().
Fix compiler warning for testbtrees.
This commit is contained in:
cheatfate
parent
670f68acd1
commit
2f01c838c6
|
|
@ -11,7 +11,7 @@ import chronos, chronos/apps/http/shttpserver
|
|||
import chronicles
|
||||
import stew/results
|
||||
import route, common, segpath, servercommon, serverprivate
|
||||
export options, chronos, shttpserver, servercommon
|
||||
export options, chronos, shttpserver, servercommon, chronicles
|
||||
|
||||
type
|
||||
SecureRestServer* = object of RootObj
|
||||
|
|
@ -20,142 +20,6 @@ type
|
|||
|
||||
SecureRestServerRef* = ref SecureRestServer
|
||||
|
||||
# proc getContentBody*(r: HttpRequestRef): Future[Option[ContentBody]] {.async.} =
|
||||
# if r.meth notin PostMethods:
|
||||
# return none[ContentBody]()
|
||||
# else:
|
||||
# var default: seq[byte]
|
||||
# let cres = getContentType(r.headers.getList("content-type"))
|
||||
# if not(cres.isOk()):
|
||||
# raise newException(RestBadRequestError, "Incorrect Content-Type header")
|
||||
# let data =
|
||||
# if r.hasBody():
|
||||
# await r.getBody()
|
||||
# else:
|
||||
# default
|
||||
# let cbody = ContentBody(contentType: cres.get(), data: data)
|
||||
# return some[ContentBody](cbody)
|
||||
|
||||
# proc processRestRequest(server: SecureRestServerRef,
|
||||
# rf: RequestFence): Future[HttpResponseRef] {.
|
||||
# gcsafe, async.} =
|
||||
# if rf.isOk():
|
||||
# let request = rf.get()
|
||||
# let sres = SegmentedPath.init(request.meth, request.uri.path)
|
||||
# if sres.isOk():
|
||||
# debug "Received request", peer = $request.remoteAddress(),
|
||||
# meth = $request.meth, uri = $request.uri
|
||||
# let rres = server.router.getRoute(sres.get())
|
||||
# if rres.isSome():
|
||||
# let route = rres.get()
|
||||
# let pathParams = route.getParamsTable()
|
||||
# let queryParams = request.query
|
||||
|
||||
# let optBody =
|
||||
# try:
|
||||
# await request.getContentBody()
|
||||
# except HttpCriticalError as exc:
|
||||
# debug "Unable to obtain request body", uri = $request.uri,
|
||||
# peer = $request.remoteAddress(), meth = $request.meth,
|
||||
# error_msg = $exc.msg
|
||||
# return await request.respond(Http400)
|
||||
# except RestBadRequestError as exc:
|
||||
# debug "Request has incorrect content type", uri = $request.uri,
|
||||
# peer = $request.remoteAddress(), meth = $request.meth,
|
||||
# error_msg = $exc.msg
|
||||
# return await request.respond(Http400)
|
||||
# except CatchableError as exc:
|
||||
# warn "Unexpected exception while getting request body",
|
||||
# uri = $request.uri, peer = $request.remoteAddress(),
|
||||
# meth = $request.meth, error_name = $exc.name,
|
||||
# error_msg = $exc.msg
|
||||
# return await request.respond(Http400)
|
||||
|
||||
# debug "Serving API request", peer = $request.remoteAddress(),
|
||||
# meth = $request.meth, uri = $request.uri,
|
||||
# path_params = pathParams, query_params = queryParams,
|
||||
# content_body = optBody
|
||||
|
||||
# let restRes =
|
||||
# try:
|
||||
# await route.callback(request, pathParams, queryParams, optBody)
|
||||
# except HttpCriticalError as exc:
|
||||
# debug "Critical error occurred while processing a request",
|
||||
# meth = $request.meth, peer = $request.remoteAddress(),
|
||||
# uri = $request.uri, code = exc.code,
|
||||
# path_params = pathParams, query_params = queryParams,
|
||||
# content_body = optBody, error_msg = $exc.msg
|
||||
# return await request.respond(exc.code)
|
||||
# except CatchableError as exc:
|
||||
# warn "Unexpected error occured while processing a request",
|
||||
# meth = $request.meth, peer = $request.remoteAddress(),
|
||||
# uri = $request.uri, path_params = pathParams,
|
||||
# query_params = queryParams, content_body = optBody,
|
||||
# error_msg = $exc.msg, error_name = $exc.name
|
||||
# return await request.respond(Http503)
|
||||
|
||||
# try:
|
||||
# if not(request.responded()):
|
||||
# if restRes.isOk():
|
||||
# let restResponse = restRes.get()
|
||||
# let headers = HttpTable.init([("Content-Type",
|
||||
# restResponse.contentType)])
|
||||
# debug "Received response from handler",
|
||||
# meth = $request.meth, peer = $request.remoteAddress(),
|
||||
# uri = $request.uri, content_type = restResponse.contentType,
|
||||
# content_size = len(restResponse.data)
|
||||
# return await request.respond(Http200, restResponse.data, headers)
|
||||
# else:
|
||||
# let error = restRes.error()
|
||||
# if isEmpty(error):
|
||||
# debug "Received empty response from handler",
|
||||
# meth = $request.meth, peer = $request.remoteAddress(),
|
||||
# uri = $request.uri
|
||||
# return await request.respond(Http410)
|
||||
# else:
|
||||
# debug "Received error response from handler",
|
||||
# meth = $request.meth, peer = $request.remoteAddress(),
|
||||
# uri = $request.uri, error
|
||||
# let headers = HttpTable.init([("Content-Type",
|
||||
# error.contentType)])
|
||||
# return await request.respond(error.status, error.message,
|
||||
# headers)
|
||||
# else:
|
||||
# debug "Response was sent in request handler", meth = $request.meth,
|
||||
# peer = $request.remoteAddress(), uri = $request.uri,
|
||||
# path_params = pathParams, query_params = queryParams,
|
||||
# content_body = optBody
|
||||
# return request.getResponse()
|
||||
# except HttpCriticalError as exc:
|
||||
# debug "Critical error occured while sending response",
|
||||
# meth = $request.meth, peer = $request.remoteAddress(),
|
||||
# uri = $request.uri, code = exc.code, error_msg = $exc.msg
|
||||
# return dumbResponse()
|
||||
# except CatchableError as exc:
|
||||
# warn "Unexpected error occured while sending response",
|
||||
# meth = $request.meth, peer = $request.remoteAddress(),
|
||||
# uri = $request.uri, error_msg = $exc.msg,
|
||||
# error_name = $exc.name
|
||||
# return dumbResponse()
|
||||
# else:
|
||||
# debug "Request it not part of api", peer = $request.remoteAddress(),
|
||||
# meth = $request.meth, uri = $request.uri
|
||||
# return await request.respond(Http404, "", HttpTable.init())
|
||||
# else:
|
||||
# debug "Received invalid request", peer = $request.remoteAddress(),
|
||||
# meth = $request.meth, uri = $request.uri
|
||||
# return await request.respond(Http400, "", HttpTable.init())
|
||||
# else:
|
||||
# let httpErr = rf.error()
|
||||
# if httpErr.error == HttpServerError.DisconnectError:
|
||||
# debug "Remote peer disconnected", peer = $httpErr.remote,
|
||||
# reason = $httpErr.error
|
||||
# else:
|
||||
# debug "Remote peer dropped connection", peer = $httpErr.remote,
|
||||
# reason = $httpErr.error, code = $httpErr.code
|
||||
|
||||
# return dumbResponse()
|
||||
|
||||
proc new*(t: typedesc[SecureRestServerRef],
|
||||
router: RestRouter,
|
||||
address: TransportAddress,
|
||||
|
|
|
|||
|
|
@ -11,8 +11,7 @@ import chronos, chronos/apps/http/httpserver
|
|||
import chronicles
|
||||
import stew/results
|
||||
import route, common, segpath, servercommon, serverprivate
|
||||
|
||||
export options, chronos, httpserver, servercommon
|
||||
export options, chronos, httpserver, servercommon, chronicles
|
||||
|
||||
type
|
||||
RestServer* = object of RootObj
|
||||
|
|
@ -21,142 +20,6 @@ type
|
|||
|
||||
RestServerRef* = ref RestServer
|
||||
|
||||
# proc getContentBody(r: HttpRequestRef): Future[Option[ContentBody]] {.async.} =
|
||||
# if r.meth notin PostMethods:
|
||||
# return none[ContentBody]()
|
||||
# else:
|
||||
# var default: seq[byte]
|
||||
# let cres = getContentType(r.headers.getList("content-type"))
|
||||
# if not(cres.isOk()):
|
||||
# raise newException(RestBadRequestError, "Incorrect Content-Type header")
|
||||
# let data =
|
||||
# if r.hasBody():
|
||||
# await r.getBody()
|
||||
# else:
|
||||
# default
|
||||
# let cbody = ContentBody(contentType: cres.get(), data: data)
|
||||
# return some[ContentBody](cbody)
|
||||
|
||||
# proc processRestRequest(server: RestServerRef,
|
||||
# rf: RequestFence): Future[HttpResponseRef] {.
|
||||
# gcsafe, async.} =
|
||||
# if rf.isOk():
|
||||
# let request = rf.get()
|
||||
# let sres = SegmentedPath.init(request.meth, request.uri.path)
|
||||
# if sres.isOk():
|
||||
# debug "Received request", peer = $request.remoteAddress(),
|
||||
# meth = $request.meth, uri = $request.uri
|
||||
# let rres = server.router.getRoute(sres.get())
|
||||
# if rres.isSome():
|
||||
# let route = rres.get()
|
||||
# let pathParams = route.getParamsTable()
|
||||
# let queryParams = request.query
|
||||
|
||||
# let optBody =
|
||||
# try:
|
||||
# await request.getContentBody()
|
||||
# except HttpCriticalError as exc:
|
||||
# debug "Unable to obtain request body", uri = $request.uri,
|
||||
# peer = $request.remoteAddress(), meth = $request.meth,
|
||||
# error_msg = $exc.msg
|
||||
# return await request.respond(Http400)
|
||||
# except RestBadRequestError as exc:
|
||||
# debug "Request has incorrect content type", uri = $request.uri,
|
||||
# peer = $request.remoteAddress(), meth = $request.meth,
|
||||
# error_msg = $exc.msg
|
||||
# return await request.respond(Http400)
|
||||
# except CatchableError as exc:
|
||||
# warn "Unexpected exception while getting request body",
|
||||
# uri = $request.uri, peer = $request.remoteAddress(),
|
||||
# meth = $request.meth, error_name = $exc.name,
|
||||
# error_msg = $exc.msg
|
||||
# return await request.respond(Http400)
|
||||
|
||||
# debug "Serving API request", peer = $request.remoteAddress(),
|
||||
# meth = $request.meth, uri = $request.uri,
|
||||
# path_params = pathParams, query_params = queryParams,
|
||||
# content_body = optBody
|
||||
|
||||
# let restRes =
|
||||
# try:
|
||||
# await route.callback(request, pathParams, queryParams, optBody)
|
||||
# except HttpCriticalError as exc:
|
||||
# debug "Critical error occurred while processing a request",
|
||||
# meth = $request.meth, peer = $request.remoteAddress(),
|
||||
# uri = $request.uri, code = exc.code,
|
||||
# path_params = pathParams, query_params = queryParams,
|
||||
# content_body = optBody, error_msg = $exc.msg
|
||||
# return await request.respond(exc.code)
|
||||
# except CatchableError as exc:
|
||||
# warn "Unexpected error occured while processing a request",
|
||||
# meth = $request.meth, peer = $request.remoteAddress(),
|
||||
# uri = $request.uri, path_params = pathParams,
|
||||
# query_params = queryParams, content_body = optBody,
|
||||
# error_msg = $exc.msg, error_name = $exc.name
|
||||
# return await request.respond(Http503)
|
||||
|
||||
# try:
|
||||
# if not(request.responded()):
|
||||
# if restRes.isOk():
|
||||
# let restResponse = restRes.get()
|
||||
# let headers = HttpTable.init([("Content-Type",
|
||||
# restResponse.contentType)])
|
||||
# debug "Received response from handler",
|
||||
# meth = $request.meth, peer = $request.remoteAddress(),
|
||||
# uri = $request.uri, content_type = restResponse.contentType,
|
||||
# content_size = len(restResponse.data)
|
||||
# return await request.respond(Http200, restResponse.data, headers)
|
||||
# else:
|
||||
# let error = restRes.error()
|
||||
# if isEmpty(error):
|
||||
# debug "Received empty response from handler",
|
||||
# meth = $request.meth, peer = $request.remoteAddress(),
|
||||
# uri = $request.uri
|
||||
# return await request.respond(Http410)
|
||||
# else:
|
||||
# debug "Received error response from handler",
|
||||
# meth = $request.meth, peer = $request.remoteAddress(),
|
||||
# uri = $request.uri, error
|
||||
# let headers = HttpTable.init([("Content-Type",
|
||||
# error.contentType)])
|
||||
# return await request.respond(error.status, error.message,
|
||||
# headers)
|
||||
# else:
|
||||
# debug "Response was sent in request handler", meth = $request.meth,
|
||||
# peer = $request.remoteAddress(), uri = $request.uri,
|
||||
# path_params = pathParams, query_params = queryParams,
|
||||
# content_body = optBody
|
||||
# return request.getResponse()
|
||||
# except HttpCriticalError as exc:
|
||||
# debug "Critical error occured while sending response",
|
||||
# meth = $request.meth, peer = $request.remoteAddress(),
|
||||
# uri = $request.uri, code = exc.code, error_msg = $exc.msg
|
||||
# return dumbResponse()
|
||||
# except CatchableError as exc:
|
||||
# warn "Unexpected error occured while sending response",
|
||||
# meth = $request.meth, peer = $request.remoteAddress(),
|
||||
# uri = $request.uri, error_msg = $exc.msg,
|
||||
# error_name = $exc.name
|
||||
# return dumbResponse()
|
||||
# else:
|
||||
# debug "Request it not part of api", peer = $request.remoteAddress(),
|
||||
# meth = $request.meth, uri = $request.uri
|
||||
# return await request.respond(Http404, "", HttpTable.init())
|
||||
# else:
|
||||
# debug "Received invalid request", peer = $request.remoteAddress(),
|
||||
# meth = $request.meth, uri = $request.uri
|
||||
# return await request.respond(Http400, "", HttpTable.init())
|
||||
# else:
|
||||
# let httpErr = rf.error()
|
||||
# if httpErr.error == HttpServerError.DisconnectError:
|
||||
# debug "Remote peer disconnected", peer = $httpErr.remote,
|
||||
# reason = $httpErr.error
|
||||
# else:
|
||||
# debug "Remote peer dropped connection", peer = $httpErr.remote,
|
||||
# reason = $httpErr.error, code = $httpErr.code
|
||||
|
||||
# return dumbResponse()
|
||||
|
||||
proc new*(t: typedesc[RestServerRef],
|
||||
router: RestRouter,
|
||||
address: TransportAddress,
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
# MIT license (LICENSE-MIT)
|
||||
import chronicles
|
||||
import common
|
||||
export chronicles
|
||||
|
||||
chronicles.formatIt(HttpTable):
|
||||
var res = newSeq[string]()
|
||||
|
|
|
|||
|
|
@ -1,3 +1,11 @@
|
|||
#
|
||||
# REST API framework implementation
|
||||
# (c) Copyright 2021-Present
|
||||
# Status Research & Development GmbH
|
||||
#
|
||||
# Licensed under either of
|
||||
# Apache License, version 2.0, (LICENSE-APACHEv2)
|
||||
# MIT license (LICENSE-MIT)
|
||||
import std/[options, strutils]
|
||||
import chronos
|
||||
import chronicles
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
import std/[random, tables, unittest]
|
||||
import ../presto/btrees
|
||||
|
||||
when defined(nimHasUsed): {.used.}
|
||||
|
||||
suite "B-Tree test suite":
|
||||
test "B-Tree original standard library test":
|
||||
proc main() =
|
||||
|
|
|
|||
Loading…
Reference in New Issue