@nitra/fastify 1.1.0 → 1.2.0

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.
Files changed (2) hide show
  1. package/package.json +1 -2
  2. package/src/index.js +8 -7
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@nitra/fastify",
3
3
  "description": "Fastify helper",
4
- "version": "1.1.0",
4
+ "version": "1.2.0",
5
5
  "type": "module",
6
6
  "main": "src/index.js",
7
7
  "files": [
@@ -21,7 +21,6 @@
21
21
  "dependencies": {
22
22
  "@fastify/sensible": "^5.1.1",
23
23
  "@nitra/bunyan": "^1.1.5",
24
- "@nitra/isenv": "^2.0.1",
25
24
  "fastify": "^4.9.2"
26
25
  }
27
26
  }
package/src/index.js CHANGED
@@ -1,12 +1,12 @@
1
1
  import fastify from 'fastify'
2
- import { isDev } from '@nitra/isenv'
2
+ // import { isDev } from '@nitra/isenv'
3
3
  import fastifySensible from '@fastify/sensible'
4
4
  import getLogger from '@nitra/bunyan/trace'
5
5
 
6
6
  const port = Number(process.env.PORT) || 8080
7
7
 
8
8
  export const app = fastify({
9
- logger: isDev,
9
+ // logger: isDev,
10
10
  http2: !!process.env.K_SERVICE // Запускаємо з http2 якщо в Cloud Run
11
11
  })
12
12
 
@@ -14,9 +14,7 @@ app.register(fastifySensible) // для reply.badRequest(`Not found url: ${req.u
14
14
 
15
15
  // Опрацювання запитів OPTIONS
16
16
  app.options('/*', async (req, reply) => {
17
- // Ручний cors, бо WildcardOrigin Not Allowed
18
- setHeaders(req, reply)
19
-
17
+ // + setHeaders в preHandler
20
18
  reply.header('Access-Control-Max-Age', 86400)
21
19
  reply.header('Cache-Control', 'public, max-age=86400')
22
20
  reply.header('Vary', 'origin')
@@ -24,7 +22,10 @@ app.options('/*', async (req, reply) => {
24
22
  reply.code(200).send()
25
23
  })
26
24
 
27
- app.addHook('preHandler', (req, _, done) => {
25
+ app.addHook('preHandler', (req, reply, done) => {
26
+ // Ручний cors, бо WildcardOrigin Not Allowed
27
+ setHeaders(req, reply)
28
+
28
29
  req.log = getLogger(req)
29
30
  done()
30
31
  })
@@ -34,7 +35,7 @@ export async function listen() {
34
35
  return app.listen({ port, host: '0.0.0.0' })
35
36
  }
36
37
 
37
- export function setHeaders(req, reply) {
38
+ function setHeaders(req, reply) {
38
39
  let host = req.headers.origin || req.headers.referer
39
40
  if (!host) {
40
41
  host = 'localhost'