@adonisjs/http-server 6.8.1-0 → 6.8.2-1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,10 +1,8 @@
1
- import type { Logger } from '@adonisjs/logger';
2
1
  import type { Level } from '@adonisjs/logger/types';
3
2
  import type { HttpContext } from './http_context/main.js';
4
3
  import type { HttpError, StatusPageRange, StatusPageRenderer } from './types/server.js';
5
4
  export declare class ExceptionHandler {
6
5
  #private;
7
- protected logger: Logger;
8
6
  protected debug: boolean;
9
7
  protected renderStatusPages: boolean;
10
8
  protected statusPages: Record<StatusPageRange, StatusPageRenderer>;
@@ -17,7 +15,6 @@ export declare class ExceptionHandler {
17
15
  protected ignoreExceptions: any[];
18
16
  protected ignoreStatuses: number[];
19
17
  protected ignoreCodes: string[];
20
- constructor(logger: Logger);
21
18
  protected context(ctx: HttpContext): any;
22
19
  protected getResponseFormat(ctx: HttpContext): 'html' | 'json' | 'json_api';
23
20
  protected getErrorLogLevel(error: HttpError): Level;
@@ -2,7 +2,6 @@ import is from '@sindresorhus/is';
2
2
  import { parseRange } from './helpers.js';
3
3
  import * as errors from './exceptions.js';
4
4
  export class ExceptionHandler {
5
- logger;
6
5
  debug = process.env.NODE_ENV !== 'production';
7
6
  renderStatusPages = process.env.NODE_ENV === 'production';
8
7
  statusPages = {};
@@ -53,9 +52,6 @@ export class ExceptionHandler {
53
52
  ];
54
53
  ignoreStatuses = [400, 422, 401];
55
54
  ignoreCodes = [];
56
- constructor(logger) {
57
- this.logger = logger;
58
- }
59
55
  #expandStatusPages() {
60
56
  if (!this.#expandedStatusPages) {
61
57
  this.#expandedStatusPages = Object.keys(this.statusPages).reduce((result, range) => {
@@ -128,7 +124,7 @@ export class ExceptionHandler {
128
124
  return;
129
125
  }
130
126
  const level = this.getErrorLogLevel(httpError);
131
- this.logger.log(level, {
127
+ ctx.logger.log(level, {
132
128
  ...(level === 'error' || level === 'fatal' ? { err: httpError } : {}),
133
129
  ...this.context(ctx),
134
130
  }, httpError.message);
@@ -1,4 +1,3 @@
1
- import cuid from 'cuid';
2
1
  import fresh from 'fresh';
3
2
  import typeIs from 'type-is';
4
3
  import accepts from 'accepts';
@@ -8,6 +7,7 @@ import proxyaddr from 'proxy-addr';
8
7
  import { safeEqual } from '@poppinss/utils';
9
8
  import Macroable from '@poppinss/macroable';
10
9
  import lodash from '@poppinss/utils/lodash';
10
+ import { createId } from '@paralleldrive/cuid2';
11
11
  import { parse } from 'node:url';
12
12
  import { trustProxy } from './helpers.js';
13
13
  import { CookieParser } from './cookies/parser.js';
@@ -53,7 +53,7 @@ export class Request extends Macroable {
53
53
  id() {
54
54
  let requestId = this.header('x-request-id');
55
55
  if (!requestId && this.#config.generateRequestId) {
56
- requestId = cuid();
56
+ requestId = createId();
57
57
  this.request.headers['x-request-id'] = requestId;
58
58
  }
59
59
  return requestId;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@adonisjs/http-server",
3
- "version": "6.8.1-0",
3
+ "version": "6.8.2-1",
4
4
  "description": "AdonisJS HTTP server with support packed with Routing and Cookies",
5
5
  "main": "build/index.js",
6
6
  "type": "module",
@@ -39,22 +39,20 @@
39
39
  "author": "virk,adonisjs",
40
40
  "license": "MIT",
41
41
  "devDependencies": {
42
- "@adonisjs/application": "^7.1.1-0",
43
- "@adonisjs/config": "^4.2.0-0",
42
+ "@adonisjs/application": "^7.1.2-0",
44
43
  "@adonisjs/encryption": "^5.1.2-0",
45
- "@adonisjs/events": "^8.4.8-0",
46
- "@adonisjs/fold": "^9.9.2-0",
44
+ "@adonisjs/events": "^8.4.9-0",
45
+ "@adonisjs/fold": "^9.9.3-0",
47
46
  "@adonisjs/logger": "^5.4.2-0",
48
47
  "@commitlint/cli": "^17.4.4",
49
48
  "@commitlint/config-conventional": "^17.4.4",
50
49
  "@fastify/middie": "^8.1.0",
51
- "@japa/api-client": "^1.4.4",
52
50
  "@japa/assert": "^1.4.1",
53
51
  "@japa/expect-type": "^1.0.3",
54
52
  "@japa/run-failed-tests": "^1.1.1",
55
53
  "@japa/runner": "^2.5.1",
56
54
  "@japa/spec-reporter": "^1.3.3",
57
- "@swc/core": "^1.3.37",
55
+ "@swc/core": "^1.3.39",
58
56
  "@types/accepts": "^1.3.5",
59
57
  "@types/content-disposition": "^0.5.5",
60
58
  "@types/cookie": "^0.5.1",
@@ -65,6 +63,7 @@
65
63
  "@types/fs-extra": "^11.0.1",
66
64
  "@types/http-status-codes": "^1.2.0",
67
65
  "@types/mime-types": "^2.1.1",
66
+ "@types/node": "^18.15.0",
68
67
  "@types/on-finished": "^2.3.1",
69
68
  "@types/pem": "^1.9.6",
70
69
  "@types/proxy-addr": "^2.0.0",
@@ -76,13 +75,13 @@
76
75
  "c8": "^7.13.0",
77
76
  "cross-env": "^7.0.3",
78
77
  "del-cli": "^5.0.0",
79
- "eslint": "^8.35.0",
80
- "eslint-config-prettier": "^8.6.0",
78
+ "eslint": "^8.36.0",
79
+ "eslint-config-prettier": "^8.7.0",
81
80
  "eslint-plugin-adonis": "^3.0.3",
82
81
  "eslint-plugin-prettier": "^4.2.1",
83
- "fastify": "^4.13.0",
82
+ "fastify": "^4.14.1",
84
83
  "fs-extra": "^11.1.0",
85
- "github-label-sync": "^2.2.0",
84
+ "github-label-sync": "^2.3.1",
86
85
  "http-status-codes": "^2.2.0",
87
86
  "husky": "^8.0.3",
88
87
  "np": "^7.6.3",
@@ -94,15 +93,15 @@
94
93
  "typescript": "^4.9.5"
95
94
  },
96
95
  "dependencies": {
96
+ "@paralleldrive/cuid2": "^2.2.0",
97
97
  "@poppinss/macroable": "^1.0.0-2",
98
98
  "@poppinss/matchit": "^3.1.2",
99
- "@poppinss/middleware": "^3.1.0",
99
+ "@poppinss/middleware": "^3.1.1",
100
100
  "@poppinss/utils": "^6.5.0-0",
101
101
  "@sindresorhus/is": "^5.3.0",
102
102
  "accepts": "^1.3.8",
103
103
  "content-disposition": "^0.5.4",
104
104
  "cookie": "^0.5.0",
105
- "cuid": "^3.0.0",
106
105
  "destroy": "^1.2.0",
107
106
  "encodeurl": "^1.0.2",
108
107
  "etag": "^1.8.1",
@@ -110,17 +109,17 @@
110
109
  "mime-types": "^2.1.35",
111
110
  "on-finished": "^2.4.1",
112
111
  "proxy-addr": "^2.0.7",
113
- "qs": "^6.11.0",
112
+ "qs": "^6.11.1",
114
113
  "tmp-cache": "^1.1.0",
115
114
  "type-is": "^1.6.18",
116
115
  "vary": "^1.1.2",
117
116
  "youch": "^3.2.3"
118
117
  },
119
118
  "peerDependencies": {
120
- "@adonisjs/application": "^7.1.1-0",
119
+ "@adonisjs/application": "^7.1.2-0",
121
120
  "@adonisjs/encryption": "^5.1.2-0",
122
- "@adonisjs/events": "^8.4.8-0",
123
- "@adonisjs/fold": "^9.9.2-0",
121
+ "@adonisjs/events": "^8.4.9-0",
122
+ "@adonisjs/fold": "^9.9.3-0",
124
123
  "@adonisjs/logger": "^5.4.2-0"
125
124
  },
126
125
  "repository": {