Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for custom log format #31

Merged
merged 3 commits into from
Apr 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,13 @@ import { logger } from 'logixlysia'

const app = new Elysia({
name: 'Logixlysia Example'
}).use(logger())
}).use(
logger({
ip: false,
customLogMessage:
'🦊 {now} {level} {duration} {method} {pathname} {status} {message} {ip}'
})
)

app.listen(3000)
```
Expand All @@ -27,9 +33,10 @@ app.listen(3000)

### Options

| Option | Type | Description | Default |
| ------ | --------- | --------------------------------------------------------------------- | ------- |
| `ip` | `boolean` | Display the incoming IP address based on the `X-Forwarded-For` header | `false` |
| Option | Type | Description | Default |
| ------------------ | --------- | --------------------------------------------------------------------- | ------------------------------------------------------------------------- |
| `ip` | `boolean` | Display the incoming IP address based on the `X-Forwarded-For` header | `false` |
| `customLogMessage` | `string` | Custom log message to display | `🦊 {now} {level} {duration} {method} {pathname} {status} {message} {ip}` |

## `πŸ“„` License

Expand Down
4 changes: 3 additions & 1 deletion example/basic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ const app = new Elysia({
})
.use(
logger({
ip: true
ip: true,
customLogFormat:
'🦊 {now} {level} {duration} {method} {pathname} {status} {message} {ip}' // default format
})
)
.get('/', () => {
Expand Down
64 changes: 53 additions & 11 deletions src/logger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,36 @@ import statusString from './utils/status'
import { HttpError, RequestInfo } from './types'
import { LogLevel, LogData, Logger, StoreData, Options } from './types'

async function log(
/**
* Logs a message.
*
* @param {LogLevel} level The log level.
* @param {RequestInfo} request The request.
* @param {LogData} data The log data.
* @param {StoreData} store The store data.
* @param {Options} options The options.
*/
function log(
level: LogLevel,
request: RequestInfo,
data: LogData,
store: StoreData,
options?: Options
): Promise<void> {
): void {
const logMessage = buildLogMessage(level, request, data, store, options)
console.log(logMessage)
}

/**
* Builds a log message.
*
* @param {LogLevel} level The log level.
* @param {RequestInfo} request The request.
* @param {LogData} data The log data.
* @param {StoreData} store The store data.
* @param {Options} options The options.
* @returns {string} The log message.
*/
function buildLogMessage(
level: LogLevel,
request: RequestInfo,
Expand All @@ -32,24 +51,47 @@ function buildLogMessage(
const pathnameStr = pathString(request)
const statusStr = statusString(data.status || 200)
const messageStr = data.message || ''
const ipStr =
options?.ip && request.headers.get('x-forwarded-for')
? `IP: ${request.headers.get('x-forwarded-for')}`
: ''

let logMessage = `🦊 ${nowStr} ${levelStr} ${durationStr} ${methodStr} ${pathnameStr} ${statusStr} ${messageStr}`

if (options?.ip) {
const forwardedFor = request.headers.get('x-forwarded-for')
if (forwardedFor) {
logMessage += ` IP: ${forwardedFor}`
}
}
const logFormat =
options?.customLogFormat ||
'🦊 {now} {level} {duration} {method} {pathname} {status} {message} {ip}'
const logMessage = logFormat
.replace('{now}', nowStr)
.replace('{level}', levelStr)
.replace('{duration}', durationStr)
.replace('{method}', methodStr)
.replace('{pathname}', pathnameStr || '')
.replace('{status}', statusStr)
.replace('{message}', messageStr)
.replace('{ip}', ipStr || '')

return logMessage
}

/**
* Creates a logger.
*
* @param {Options} options The options.
* @returns {Logger} The logger.
*/
export const createLogger = (options?: Options): Logger => ({
log: (level, request, data, store) =>
log(level, request, data, store, options)
log(level, request, data, store, options),
customLogFormat: options?.customLogFormat
})

/**
* Handles an HTTP error.
*
* @param {RequestInfo} request The request.
* @param {Error} error The error.
* @param {StoreData} store The store data.
* @param {Options} options The options.
*/
export const handleHttpError = (
request: RequestInfo,
error: Error,
Expand Down
2 changes: 2 additions & 0 deletions src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ interface Logger {
data: LogData,
store: StoreData
): void
customLogFormat?: string
}

interface StoreData {
Expand All @@ -45,6 +46,7 @@ class HttpError extends Error {

interface Options {
ip?: boolean
customLogFormat?: string
}

export {
Expand Down
22 changes: 18 additions & 4 deletions test/logixlysia.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@ describe('Logixlysia with IP logging enabled', () => {

beforeAll(() => {
server = new Elysia()
.use(logger({ ip: true }))
.use(
logger({
ip: true,
customLogFormat:
'🦊 {now} {duration} {level} {method} {pathname} {status} {message} {ip}'
})
)
.get('/', ctx => {
const ipAddress = ctx.request.headers.get('x-forwarded-for') || 'null'
return '🦊 Logixlysia Getting'
Expand All @@ -35,7 +41,9 @@ describe('Logixlysia with IP logging enabled', () => {
}

logs.forEach(log => {
expect(log).toMatch(/^IP: \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/)
expect(log).toMatch(
/^🦊 .+ INFO .+ .+ GET \/ .+ IP: \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/
)
})
})

Expand All @@ -47,7 +55,7 @@ describe('Logixlysia with IP logging enabled', () => {
}

logs.forEach(log => {
expect(log).toBe('IP: null')
expect(log).toMatch(/^🦊 .+ INFO .+ .+ GET \/ .+ IP: null$/)
})
})
})
Expand All @@ -59,7 +67,13 @@ describe('Logixlysia with IP logging disabled', () => {

beforeAll(() => {
server = new Elysia()
.use(logger({ ip: false }))
.use(
logger({
ip: false,
customLogFormat:
'🦊 {now} {duration} {level} {method} {pathname} {status} {message} {ip}'
})
)
.get('/', () => '🦊 Logixlysia Getting')
.post('logixlysia', () => '🦊 Logixlysia Posting')
.listen(3000)
Expand Down
Loading