Prettier fixes

This commit is contained in:
Collin Duncan 2023-02-10 12:22:36 +01:00
parent 69f7f50f5f
commit 878006271f
No known key found for this signature in database
4 changed files with 23 additions and 18 deletions

View file

@ -90,4 +90,4 @@ export class LoggableError extends Error {
toString() { toString() {
return `${this.name} - ${this.message}\n${this.stack}` return `${this.name} - ${this.message}\n${this.stack}`
} }
} }

View file

@ -286,7 +286,10 @@ export class Reservation {
return [] return []
} }
public static async fetchByPage(pageNumber: number, pageSize = 50): Promise<Reservation[]> { public static async fetchByPage(
pageNumber: number,
pageSize = 50
): Promise<Reservation[]> {
const response = await all<SqlReservation>( const response = await all<SqlReservation>(
` `
SELECT * SELECT *

View file

@ -6,7 +6,7 @@ import { getStatus, startTasks, stopTasks } from '../../cron'
export class CronRouter extends Router { export class CronRouter extends Router {
public async handleRequest( public async handleRequest(
req: IncomingMessage, req: IncomingMessage,
res: ServerResponse<IncomingMessage>, res: ServerResponse<IncomingMessage>
) { ) {
const { url = '', method } = req const { url = '', method } = req
const [route] = url.split('?') const [route] = url.split('?')
@ -31,7 +31,7 @@ export class CronRouter extends Router {
private async GET_cron( private async GET_cron(
_req: IncomingMessage, _req: IncomingMessage,
res: ServerResponse<IncomingMessage>, res: ServerResponse<IncomingMessage>
) { ) {
l.getStore()?.debug('Checking cron status') l.getStore()?.debug('Checking cron status')
const status = getStatus() const status = getStatus()
@ -43,7 +43,7 @@ export class CronRouter extends Router {
private async POST_cron_enable( private async POST_cron_enable(
_req: IncomingMessage, _req: IncomingMessage,
res: ServerResponse<IncomingMessage>, res: ServerResponse<IncomingMessage>
) { ) {
l.getStore()?.debug('Enabling cron') l.getStore()?.debug('Enabling cron')
startTasks() startTasks()
@ -52,7 +52,7 @@ export class CronRouter extends Router {
private async POST_cron_disable( private async POST_cron_disable(
_req: IncomingMessage, _req: IncomingMessage,
res: ServerResponse<IncomingMessage>, res: ServerResponse<IncomingMessage>
) { ) {
l.getStore()?.debug('Disabling cron') l.getStore()?.debug('Disabling cron')
stopTasks() stopTasks()

View file

@ -1,23 +1,22 @@
import { IncomingMessage, ServerResponse } from 'http' import { IncomingMessage, ServerResponse } from 'http'
import { asyncLocalStorage, asyncLocalStorage as l, LoggableError } from '../../../common/logger' import {
asyncLocalStorage,
asyncLocalStorage as l,
LoggableError,
} from '../../../common/logger'
import { parseJson } from '../../utils' import { parseJson } from '../../utils'
export abstract class Router { export abstract class Router {
protected async parseJsonContent( protected async parseJsonContent(req: IncomingMessage) {
req: IncomingMessage,
) {
let jsonBody: Record<string, unknown> let jsonBody: Record<string, unknown>
const contentType = const contentType = req.headers['content-type'] || 'application/json'
req.headers['content-type'] || 'application/json'
if (contentType !== 'application/json') { if (contentType !== 'application/json') {
l.getStore()?.error('Invalid content type', { contentType }) l.getStore()?.error('Invalid content type', { contentType })
throw new RouterUnsupportedContentTypeError() throw new RouterUnsupportedContentTypeError()
} }
try { try {
const length = Number.parseInt( const length = Number.parseInt(req.headers['content-length'] || '0')
req.headers['content-length'] || '0'
)
const encoding = req.readableEncoding || 'utf8' const encoding = req.readableEncoding || 'utf8'
jsonBody = await parseJson(length, encoding, req) jsonBody = await parseJson(length, encoding, req)
} catch (error: unknown) { } catch (error: unknown) {
@ -31,7 +30,10 @@ export abstract class Router {
return jsonBody return jsonBody
} }
protected handle404(req: IncomingMessage, res: ServerResponse<IncomingMessage>) { protected handle404(
req: IncomingMessage,
res: ServerResponse<IncomingMessage>
) {
const { url, method } = req const { url, method } = req
asyncLocalStorage.getStore()?.info('Not found', { url, method }) asyncLocalStorage.getStore()?.info('Not found', { url, method })
res.writeHead(404, 'Not found') res.writeHead(404, 'Not found')
@ -39,10 +41,10 @@ export abstract class Router {
public abstract handleRequest( public abstract handleRequest(
req: IncomingMessage, req: IncomingMessage,
res: ServerResponse<IncomingMessage>, res: ServerResponse<IncomingMessage>
): Promise<void> ): Promise<void>
} }
export class RouterError extends LoggableError {} export class RouterError extends LoggableError {}
export class RouterBadRequestError extends RouterError {} export class RouterBadRequestError extends RouterError {}
export class RouterUnsupportedContentTypeError extends RouterError {} export class RouterUnsupportedContentTypeError extends RouterError {}