github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-25 03:00:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Syntax fixes (#5367)

Browse Source 
* Declare return types on functions

And a very few other type related minor fixes

* Minor syntax fixes

* Remove unnecessary escape chars in regexes
* Remove unnecessary awaits
* Replace deprecated req.connection with req.socket
* Replace deprecated upload with uploadOne
* Remove unnecessary eslint-disable-next-line comments
* Comment empty functions / catch or finally clauses
* Fix irregular whitespaces
* Add missing returns (null)
* Remove unreachable code
* A few logical fixes
* Remove / Handle non-null assertions which are certainly unnecessary (e.g. in
tests)
This commit is contained in:
Pascal Jufer
2021-04-29 18:11:43 +02:00
committed by GitHub
parent 40eba791fa
commit acd41eb0be
231 changed files with 646 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
api/src/server.ts
View File

@@ -10,7 +10,7 @@ import database from './database';
import createApp from './app';
import { once } from 'lodash';
export default async function createServer() {
export default async function createServer(): Promise<http.Server> {
const server = http.createServer(await createApp());
server.on('request', function (req: http.IncomingMessage & Request, res: http.ServerResponse) {
@@ -21,22 +21,24 @@ export default async function createServer() {
const elapsedNanoseconds = elapsedTime[0] * 1e9 + elapsedTime[1];
const elapsedMilliseconds = elapsedNanoseconds / 1e6;
const previousIn = (req.connection as any)._metrics?.in || 0;
const previousOut = (req.connection as any)._metrics?.out || 0;
const previousIn = (req.socket as any)._metrics?.in || 0;
const previousOut = (req.socket as any)._metrics?.out || 0;
const metrics = {
in: req.connection.bytesRead - previousIn,
out: req.connection.bytesWritten - previousOut,
in: req.socket.bytesRead - previousIn,
out: req.socket.bytesWritten - previousOut,
};
(req.connection as any)._metrics = {
in: req.connection.bytesRead,
out: req.connection.bytesWritten,
(req.socket as any)._metrics = {
in: req.socket.bytesRead,
out: req.socket.bytesWritten,
};
// Compatibility when supporting serving with certificates
const protocol = server instanceof https.Server ? 'https' : 'http';
// Rely on url.parse for path extraction
// Doesn't break on illegal URLs
const urlInfo = url.parse(req.originalUrl || req.url);
const info = {
@@ -58,7 +60,7 @@ export default async function createServer() {
size: metrics.out,
headers: res.getHeaders(),
},
ip: req.headers['x-forwarded-for'] || req.connection?.remoteAddress || req.socket?.remoteAddress,
ip: req.headers['x-forwarded-for'] || req.socket?.remoteAddress,
duration: elapsedMilliseconds.toFixed(),
};