From 28619da03d87f6cad027bc4e2d377c277dbc54ab Mon Sep 17 00:00:00 2001 From: Torben Ewert Date: Mon, 3 Jun 2024 15:18:43 +0200 Subject: [PATCH] fix(server): increase max_post_size from 64kb to 2mib --- src/server--async.php | 140 ++++++++++++++++++++++-------------------- 1 file changed, 75 insertions(+), 65 deletions(-) diff --git a/src/server--async.php b/src/server--async.php index 2db839b..284574d 100644 --- a/src/server--async.php +++ b/src/server--async.php @@ -27,6 +27,7 @@ $config = []; $twigRenderer = null; $counter = 0; +$maxConcurrency = 100; try { $configString = file_get_contents($configFilePath); @@ -47,6 +48,10 @@ if ($config) { $twigRenderer = new TwigRenderer($config); + + if(array_key_exists('maxConcurrency', $config)) { + $maxConcurrency = $config['maxConcurrency']; + } // file_put_contents(__DIR__ . '/info.json', json_encode($twigRenderer->getInfo())); } @@ -59,80 +64,85 @@ function formatResponseBody($msgs = [], $ok = false, $html = ''): string ], JSON_THROW_ON_ERROR); } -$server = new HttpServer(static function (ServerRequestInterface $request) use ($twigRenderer, &$counter): Response|Promise { - $headers = [ - 'Content-Type' => 'application/json', - 'Access-Control-Allow-Origin' => '*', - ]; - $msgs = []; - ++$counter; - $method = $request->getMethod(); - $query = $request->getQueryParams(); - $body = $request->getBody()->getContents(); - - try { - $body = json_decode($body ?: '{}', true, 512, JSON_THROW_ON_ERROR); - } catch (\Exception $exception) { - // @todo why doesn't this catch errors from malformed JSON? - $msgs[] = 'Not able to parse JSON. '.$exception->getMessage(); - - return new Response(400, $headers, formatResponseBody($msgs)); - } - - if (!isset($query['type'])) { - return new Response( - 202, - $headers, - json_encode([ - 'ok' => true, - 'message' => "No action correctly requested. Url must have a query param of 'templatePath' for which twig template to render, but yes - the server is running.", - ]) - ); - } - - // one of: meta, renderFile, renderString - $type = $query['type']; - - switch ($type) { - case 'meta': +$server = new HttpServer( + new React\Http\Middleware\StreamingRequestMiddleware(), + new React\Http\Middleware\LimitConcurrentRequestsMiddleware($maxConcurrency), + new React\Http\Middleware\RequestBodyBufferMiddleware(2 * 1024 * 1024), // 2 MiB per request + static function (ServerRequestInterface $request) use ($twigRenderer, &$counter): Response|Promise { + $headers = [ + 'Content-Type' => 'application/json', + 'Access-Control-Allow-Origin' => '*', + ]; + $msgs = []; + ++$counter; + $method = $request->getMethod(); + $query = $request->getQueryParams(); + $body = $request->getBody()->getContents(); + + try { + $body = json_decode($body ?: '{}', true, 512, JSON_THROW_ON_ERROR); + } catch (\Exception $exception) { + // @todo why doesn't this catch errors from malformed JSON? + $msgs[] = 'Not able to parse JSON. '.$exception->getMessage(); + + return new Response(400, $headers, formatResponseBody($msgs)); + } + + if (!isset($query['type'])) { return new Response( - 200, + 202, $headers, json_encode([ 'ok' => true, - 'info' => $twigRenderer->getInfo(), - 'meta' => [ - 'counter' => $counter, - 'query' => $query, - 'body' => $body, - 'method' => $method, - ], - ], JSON_THROW_ON_ERROR) + 'message' => "No action correctly requested. Url must have a query param of 'templatePath' for which twig template to render, but yes - the server is running.", + ]) ); + } - case 'renderFile': - return new Promise(static function ($resolve, $reject) use ($twigRenderer, $body, $headers): void { - $results = $twigRenderer->render($body['template'], $body['data']); - $response = new Response( - $results['ok'] ? 200 : 404, - $headers, - json_encode($results, JSON_THROW_ON_ERROR) - ); - $resolve($response); - }); - - case 'renderString': - return new Promise(static function ($resolve, $reject) use ($twigRenderer, $body, $headers): void { - $results = $twigRenderer->renderString($body['template'], $body['data']); - $response = new Response( - $results['ok'] ? 200 : 404, + // one of: meta, renderFile, renderString + $type = $query['type']; + + switch ($type) { + case 'meta': + return new Response( + 200, $headers, - json_encode($results, JSON_THROW_ON_ERROR) + json_encode([ + 'ok' => true, + 'info' => $twigRenderer->getInfo(), + 'meta' => [ + 'counter' => $counter, + 'query' => $query, + 'body' => $body, + 'method' => $method, + ], + ], JSON_THROW_ON_ERROR) ); - $resolve($response); - }); + + case 'renderFile': + return new Promise(static function ($resolve, $reject) use ($twigRenderer, $body, $headers): void { + $results = $twigRenderer->render($body['template'], $body['data']); + $response = new Response( + $results['ok'] ? 200 : 404, + $headers, + json_encode($results, JSON_THROW_ON_ERROR) + ); + $resolve($response); + }); + + case 'renderString': + return new Promise(static function ($resolve, $reject) use ($twigRenderer, $body, $headers): void { + $results = $twigRenderer->renderString($body['template'], $body['data']); + $response = new Response( + $results['ok'] ? 200 : 404, + $headers, + json_encode($results, JSON_THROW_ON_ERROR) + ); + $resolve($response); + }); + } } -}); +); $context = []; $uri = sprintf('127.0.0.1:%u', $port);