@rosen-bridge/fastify-enhanced 3.0.0 → 3.1.0-d5b86d3e

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.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,11 @@
1
1
  # @rosen-bridge/fastify-enhanced
2
2
 
3
+ ## 3.1.0-d5b86d3e
4
+
5
+ ### Minor Changes
6
+
7
+ - Add support for using AbstractLogger in place of the default Fastify logger
8
+
3
9
  ## 3.0.0
4
10
 
5
11
  ### Major Changes
package/README.md CHANGED
@@ -32,37 +32,26 @@ yarn add zod@^3.21.4
32
32
 
33
33
  ## Usage
34
34
 
35
- To use the enhanced Fastify, import `createFastify` and use it to create a fastify instance and register routes. Use data types defined under `types` object, to define validation constraints for requests and responses:
35
+ To use the enhanced Fastify, import `makeFastify` and use it to create a fastify instance and register routes. Install and use zod to define schemas for validating requests and responses:
36
+
37
+ > Note: For **BigInt** field types, since JSON does not support the BigInt data type, you should use `z.coerce.bigint()` in the schema, and the value in the data transfer object (DTO) should be either a **number** or a **string**; `coerce` allows Zod to validate and transform the number or string value into a BigInt. Also its preferred to use string for bigint types in the response schemas.
36
38
 
37
39
  ```ts
38
- import { FastifyBaseLogger, FastifyInstance } from 'fastify';
39
- import { IncomingMessage, Server, ServerResponse } from 'http';
40
-
41
- import {
42
- ZodTypeProvider,
43
- createFastify,
44
- types,
45
- } from '@rosen-bridge/fastify-enhanced';
46
-
47
- const addTokenPaymentRoute = (
48
- fastify: FastifyInstance<
49
- Server<typeof IncomingMessage, typeof ServerResponse>,
50
- IncomingMessage,
51
- ServerResponse<IncomingMessage>,
52
- FastifyBaseLogger,
53
- ZodTypeProvider
54
- >,
55
- ) => {
56
- const bodySchema = types.object({
57
- tokenName: types.string(),
58
- tokenAmount: types.bigint(),
59
- tokenDecimals: types.number(),
40
+ import { z } from 'zod';
41
+
42
+ import { FastifyWithZod, makeFastify } from '@rosen-bridge/fastify-enhanced';
43
+
44
+ const addTokenPaymentRoute = (fastify: FastifyWithZod) => {
45
+ const bodySchema = z.object({
46
+ tokenName: z.string(),
47
+ tokenAmount: z.coerce.bigint(),
48
+ tokenDecimals: z.number(),
60
49
  });
61
50
 
62
- const res200Schema = types.object({
63
- name: types.string(),
64
- amount: types.bigint(),
65
- decimal: types.number(),
51
+ const res200Schema = z.object({
52
+ name: z.string(),
53
+ amount: z.string(),
54
+ decimal: z.number(),
66
55
  });
67
56
 
68
57
  const payTokenOpts = {
@@ -77,15 +66,89 @@ const addTokenPaymentRoute = (
77
66
  fastify.post('/payToken', payTokenOpts, async (request, reply) => {
78
67
  return reply.status(200).send({
79
68
  name: request.body.tokenName,
80
- amount: request.body.tokenAmount,
69
+ amount: request.body.tokenAmount.toString(),
81
70
  decimal: request.body.tokenDecimals,
82
71
  });
83
72
  });
73
+ };
74
+
75
+ const addDemoRoute = (fastify: FastifyWithZod) => {
76
+ const bodySchema = z.object({
77
+ numberField: z.number(),
78
+ bigintField: z.coerce.bigint(),
79
+ booleanField: z.boolean(),
80
+ stringField: z.string(),
81
+ optionalStringField: z.optional(z.string()),
82
+ objectField: z.object({
83
+ bigintField: z.coerce.bigint(),
84
+ // ...
85
+ }),
86
+ numberArrayField: z.array(z.number()),
87
+ stringArrayField: z.array(z.string()),
88
+ unionField: z.union([
89
+ z.string(),
90
+ z.object({
91
+ stringArrayField: z.array(z.string()),
92
+ // ...
93
+ }),
94
+ ]),
95
+ });
96
+
97
+ const qsSchema = z.object({
98
+ qs: z.union([z.string().transform((i) => [i]), z.array(z.string())]),
99
+ });
100
+
101
+ const res200Schema = z.object({
102
+ qs: z.array(z.string()),
103
+ numberField: z.number(),
104
+ bigintField: z.string(),
105
+ booleanField: z.boolean(),
106
+ stringField: z.string(),
107
+ optionalStringField: z.optional(z.string()),
108
+ objectField: z.object({
109
+ bigintField: z.string(),
110
+ // ...
111
+ }),
112
+ numberArrayField: z.array(z.number()),
113
+ stringArrayField: z.array(z.string()),
114
+ unionField: z.union([
115
+ z.string(),
116
+ z.object({
117
+ stringArrayField: z.array(z.string()),
118
+ // ...
119
+ }),
120
+ ]),
121
+ });
122
+
123
+ const routeOpts = {
124
+ schema: {
125
+ querystring: qsSchema,
126
+ body: bodySchema,
127
+ response: {
128
+ 200: res200Schema,
129
+ },
130
+ },
131
+ };
84
132
 
85
- return fastify;
133
+ fastify.post('/demo', routeOpts, async (request, reply) => {
134
+ return reply.status(200).send({
135
+ qs: request.query.qs,
136
+ numberField: request.body.numberField,
137
+ bigintField: request.body.bigintField.toString(),
138
+ booleanField: request.body.booleanField,
139
+ stringField: request.body.stringField,
140
+ optionalStringField: request.body.optionalStringField,
141
+ objectField: {
142
+ bigintField: request.body.objectField.bigintField.toString(),
143
+ },
144
+ numberArrayField: request.body.numberArrayField,
145
+ stringArrayField: request.body.stringArrayField,
146
+ unionField: request.body.unionField,
147
+ });
148
+ });
86
149
  };
87
150
 
88
- const fastify = await createFastify(
151
+ const fastify = await makeFastify(
89
152
  {
90
153
  path: '/swagger',
91
154
  title: '',
@@ -95,27 +158,69 @@ const fastify = await createFastify(
95
158
  { logger: false },
96
159
  );
97
160
  addTokenPaymentRoute(fastify);
161
+ // Or fastify.register(addTokenPaymentRoute);
162
+ addDemoRoute(fastify);
98
163
 
99
164
  const start = async () => {
100
165
  try {
101
- await fastify.listen({ port: 8000 });
166
+ await fastify.ready();
167
+ await fastify.listen({ host: '127.0.0.1', port: 8000 });
168
+ console.log(`listening http://127.0.0.1:8000`);
102
169
  } catch (err) {
103
- console.log(err);
170
+ console.error(err);
104
171
  process.exit(1);
105
172
  }
106
173
  };
174
+
107
175
  start();
176
+
177
+ /*
178
+ curl --request POST \
179
+ --url 'http://localhost:8000/demo?qs=key1&qs=key2' \
180
+ --header 'content-type: application/json' \
181
+ --data '{
182
+ "numberField": 10,
183
+ "bigintField": "10000",
184
+ "booleanField": true,
185
+ "stringField": "str",
186
+ "objectField": {
187
+ "bigintField": 10
188
+ },
189
+ "numberArrayField": [
190
+ 0,
191
+ 100,
192
+ 1000
193
+ ],
194
+ "stringArrayField": [
195
+ "str1",
196
+ "str2"
197
+ ],
198
+ "unionField": {
199
+ "stringArrayField": [
200
+ "str1",
201
+ "str2"
202
+ ]
203
+ }
204
+ }'
205
+ */
108
206
  ```
109
207
 
110
- To define a nested route don't forget to add `ZodTypeProvider` to the Fastify instance that is passed to the `register` method, to enable Zod typing validation:
208
+ In order to use an instance of **AbstractLogger** instead of the default fastify logger, set the `logger` property of the fastify options to `false` and pass the **AbstractLogger** instance (wrapped in **FastifyLogger** class) to the `loggerInstance` property. **FastifyLogger** is an adapter for Pino interface compliance used in fastify.
111
209
 
112
210
  ```ts
113
- fastify.register(
114
- (instance, opts, next) => {
115
- const subFastify = instance.withTypeProvider<ZodTypeProvider>();
116
- addTokenPaymentRoute(subFastify);
117
- next();
211
+ import { ConsoleLogger } from '@rosen-bridge/abstract-logger';
212
+ import { makeFastify, FastifyLogger } from '@rosen-bridge/fastify-enhanced';
213
+
214
+ const fastify = await makeFastify(
215
+ {
216
+ path: '/swagger',
217
+ title: '',
218
+ description: '',
219
+ version: '0.0.1',
220
+ },
221
+ {
222
+ logger: false,
223
+ loggerInstance: new FastifyLogger(new ConsoleLogger()),
118
224
  },
119
- { prefix: 'subroute' },
120
225
  );
121
226
  ```
package/dist/index.d.ts CHANGED
@@ -2,4 +2,5 @@ export type { FastifyZodOpenApiTypeProvider } from 'fastify-zod-openapi';
2
2
  export * from './fastify';
3
3
  export * from './types';
4
4
  export type { FastifyRequest, FastifyReply, HookHandlerDoneFunction, } from 'fastify';
5
+ export * from './logger';
5
6
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;AACzE,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,YAAY,EACV,cAAc,EACd,YAAY,EACZ,uBAAuB,GACxB,MAAM,SAAS,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;AACzE,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,YAAY,EACV,cAAc,EACd,YAAY,EACZ,uBAAuB,GACxB,MAAM,SAAS,CAAC;AACjB,cAAc,UAAU,CAAC"}
package/dist/index.js CHANGED
@@ -1,3 +1,4 @@
1
1
  export * from './fastify';
2
2
  export * from './types';
3
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9saWIvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsY0FBYyxXQUFXLENBQUM7QUFDMUIsY0FBYyxTQUFTLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgdHlwZSB7IEZhc3RpZnlab2RPcGVuQXBpVHlwZVByb3ZpZGVyIH0gZnJvbSAnZmFzdGlmeS16b2Qtb3BlbmFwaSc7XG5leHBvcnQgKiBmcm9tICcuL2Zhc3RpZnknO1xuZXhwb3J0ICogZnJvbSAnLi90eXBlcyc7XG5leHBvcnQgdHlwZSB7XG4gIEZhc3RpZnlSZXF1ZXN0LFxuICBGYXN0aWZ5UmVwbHksXG4gIEhvb2tIYW5kbGVyRG9uZUZ1bmN0aW9uLFxufSBmcm9tICdmYXN0aWZ5JztcbiJdfQ==
3
+ export * from './logger';
4
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9saWIvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsY0FBYyxXQUFXLENBQUM7QUFDMUIsY0FBYyxTQUFTLENBQUM7QUFNeEIsY0FBYyxVQUFVLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgdHlwZSB7IEZhc3RpZnlab2RPcGVuQXBpVHlwZVByb3ZpZGVyIH0gZnJvbSAnZmFzdGlmeS16b2Qtb3BlbmFwaSc7XG5leHBvcnQgKiBmcm9tICcuL2Zhc3RpZnknO1xuZXhwb3J0ICogZnJvbSAnLi90eXBlcyc7XG5leHBvcnQgdHlwZSB7XG4gIEZhc3RpZnlSZXF1ZXN0LFxuICBGYXN0aWZ5UmVwbHksXG4gIEhvb2tIYW5kbGVyRG9uZUZ1bmN0aW9uLFxufSBmcm9tICdmYXN0aWZ5JztcbmV4cG9ydCAqIGZyb20gJy4vbG9nZ2VyJztcbiJdfQ==
@@ -0,0 +1,94 @@
1
+ import { FastifyBaseLogger, LogLevel } from 'fastify';
2
+ import { AbstractLogger } from '@rosen-bridge/abstract-logger';
3
+ export declare class FastifyLogger implements FastifyBaseLogger {
4
+ protected logger: AbstractLogger;
5
+ level: LogLevel;
6
+ /**
7
+ * creates a new instance
8
+ *
9
+ * @param logger - the underlying logger to delegate to
10
+ * @param level - for FastifyBaseLogger interface compliance
11
+ */
12
+ constructor(logger: AbstractLogger, level?: LogLevel);
13
+ /**
14
+ * no-op silent logger method (for Pino interface compliance)
15
+ * logs nothing regardless of input
16
+ */
17
+ silent: () => void;
18
+ /**
19
+ * logs a trace-level message
20
+ *
21
+ * the LogFn used in fastify logger has multiple signatures, for
22
+ * more info see {@link FastifyLogFn}
23
+ *
24
+ * @param obj: object to be serialized
25
+ * @param msg: the log message to write
26
+ */
27
+ trace: (...args: unknown[]) => void;
28
+ /**
29
+ * logs a debug-level message
30
+ *
31
+ * the LogFn used in fastify logger has multiple signatures, for
32
+ * more info see {@link FastifyLogFn}
33
+ *
34
+ * @param obj: object to be serialized
35
+ * @param msg: the log message to write
36
+ */
37
+ debug: (...args: unknown[]) => void;
38
+ /**
39
+ * logs an info-level message
40
+ *
41
+ * the LogFn used in fastify logger has multiple signatures, for
42
+ * more info see {@link FastifyLogFn}
43
+ *
44
+ * @param obj: object to be serialized
45
+ * @param msg: the log message to write
46
+ */
47
+ info: (...args: unknown[]) => void;
48
+ /**
49
+ * logs a warning-level message
50
+ *
51
+ * the LogFn used in fastify logger has multiple signatures, for
52
+ * more info see {@link FastifyLogFn}
53
+ *
54
+ * @param obj: object to be serialized
55
+ * @param msg: the log message to write
56
+ */
57
+ warn: (...args: unknown[]) => void;
58
+ /**
59
+ * logs an error-level message
60
+ *
61
+ * the LogFn used in fastify logger has multiple signatures, for
62
+ * more info see {@link FastifyLogFn}
63
+ *
64
+ * @param obj: object to be serialized
65
+ * @param msg: the log message to write
66
+ */
67
+ error: (...args: unknown[]) => void;
68
+ /**
69
+ * logs a critical/fatal-level message
70
+ *
71
+ * the LogFn used in fastify logger has multiple signatures, for
72
+ * more info see {@link FastifyLogFn}
73
+ *
74
+ * @param obj: object to be serialized
75
+ * @param msg: the log message to write
76
+ */
77
+ fatal: (...args: unknown[]) => void;
78
+ /**
79
+ * creates a child logger with bindings and optional configuration
80
+ * conforms to the Pino/Fastify logger interface
81
+ *
82
+ * @param bindings - Key-value pairs to attach to all logs from the child logger
83
+ * @returns A new FastifyBaseLogger instance (child logger)
84
+ */
85
+ child: (bindings: Record<string, unknown>) => FastifyBaseLogger;
86
+ /**
87
+ * utility function to map and serialize the arguments of fastify logger functions
88
+ *
89
+ * the LogFn used in fastify logger has multiple signatures, for
90
+ * more info see {@link FastifyLogFn}
91
+ */
92
+ private parseArgs;
93
+ }
94
+ //# sourceMappingURL=logger.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../lib/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAKtD,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAE/D,qBAAa,aAAc,YAAW,iBAAiB;IAQnD,SAAS,CAAC,MAAM,EAAE,cAAc;IACzB,KAAK,EAAE,QAAQ;IARxB;;;;;OAKG;gBAES,MAAM,EAAE,cAAc,EACzB,KAAK,GAAE,QAAiB;IAGjC;;;OAGG;IACH,MAAM,aAEJ;IAEF;;;;;;;;OAQG;IACH,KAAK,GAAI,GAAG,MAAM,OAAO,EAAE,UAGzB;IAEF;;;;;;;;OAQG;IACH,KAAK,GAAI,GAAG,MAAM,OAAO,EAAE,UAGzB;IAEF;;;;;;;;OAQG;IACH,IAAI,GAAI,GAAG,MAAM,OAAO,EAAE,UAGxB;IAEF;;;;;;;;OAQG;IACH,IAAI,GAAI,GAAG,MAAM,OAAO,EAAE,UAGxB;IAEF;;;;;;;;OAQG;IACH,KAAK,GAAI,GAAG,MAAM,OAAO,EAAE,UAGzB;IAEF;;;;;;;;OAQG;IACH,KAAK,GAAI,GAAG,MAAM,OAAO,EAAE,UAGzB;IAEF;;;;;;OAMG;IACH,KAAK,GAAI,UAAU,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAG,iBAAiB,CAG5D;IAEF;;;;;OAKG;IACH,OAAO,CAAC,SAAS,CAwBf;CACH"}
package/dist/logger.js ADDED
@@ -0,0 +1,142 @@
1
+ import { serializers } from 'fastify/lib/logger-pino.js';
2
+ export class FastifyLogger {
3
+ logger;
4
+ level;
5
+ /**
6
+ * creates a new instance
7
+ *
8
+ * @param logger - the underlying logger to delegate to
9
+ * @param level - for FastifyBaseLogger interface compliance
10
+ */
11
+ constructor(logger, level = 'info') {
12
+ this.logger = logger;
13
+ this.level = level;
14
+ }
15
+ /**
16
+ * no-op silent logger method (for Pino interface compliance)
17
+ * logs nothing regardless of input
18
+ */
19
+ silent = () => {
20
+ // No-op
21
+ };
22
+ /**
23
+ * logs a trace-level message
24
+ *
25
+ * the LogFn used in fastify logger has multiple signatures, for
26
+ * more info see {@link FastifyLogFn}
27
+ *
28
+ * @param obj: object to be serialized
29
+ * @param msg: the log message to write
30
+ */
31
+ trace = (...args) => {
32
+ const { message, ...context } = this.parseArgs(...args);
33
+ this.logger.trace(message, context);
34
+ };
35
+ /**
36
+ * logs a debug-level message
37
+ *
38
+ * the LogFn used in fastify logger has multiple signatures, for
39
+ * more info see {@link FastifyLogFn}
40
+ *
41
+ * @param obj: object to be serialized
42
+ * @param msg: the log message to write
43
+ */
44
+ debug = (...args) => {
45
+ const { message, ...context } = this.parseArgs(...args);
46
+ this.logger.debug(message, context);
47
+ };
48
+ /**
49
+ * logs an info-level message
50
+ *
51
+ * the LogFn used in fastify logger has multiple signatures, for
52
+ * more info see {@link FastifyLogFn}
53
+ *
54
+ * @param obj: object to be serialized
55
+ * @param msg: the log message to write
56
+ */
57
+ info = (...args) => {
58
+ const { message, ...context } = this.parseArgs(...args);
59
+ this.logger.info(message, context);
60
+ };
61
+ /**
62
+ * logs a warning-level message
63
+ *
64
+ * the LogFn used in fastify logger has multiple signatures, for
65
+ * more info see {@link FastifyLogFn}
66
+ *
67
+ * @param obj: object to be serialized
68
+ * @param msg: the log message to write
69
+ */
70
+ warn = (...args) => {
71
+ const { message, ...context } = this.parseArgs(...args);
72
+ this.logger.warn(message, context);
73
+ };
74
+ /**
75
+ * logs an error-level message
76
+ *
77
+ * the LogFn used in fastify logger has multiple signatures, for
78
+ * more info see {@link FastifyLogFn}
79
+ *
80
+ * @param obj: object to be serialized
81
+ * @param msg: the log message to write
82
+ */
83
+ error = (...args) => {
84
+ const { message, ...context } = this.parseArgs(...args);
85
+ this.logger.error(message, context);
86
+ };
87
+ /**
88
+ * logs a critical/fatal-level message
89
+ *
90
+ * the LogFn used in fastify logger has multiple signatures, for
91
+ * more info see {@link FastifyLogFn}
92
+ *
93
+ * @param obj: object to be serialized
94
+ * @param msg: the log message to write
95
+ */
96
+ fatal = (...args) => {
97
+ const { message, ...context } = this.parseArgs(...args);
98
+ this.logger.critical(message, context);
99
+ };
100
+ /**
101
+ * creates a child logger with bindings and optional configuration
102
+ * conforms to the Pino/Fastify logger interface
103
+ *
104
+ * @param bindings - Key-value pairs to attach to all logs from the child logger
105
+ * @returns A new FastifyBaseLogger instance (child logger)
106
+ */
107
+ child = (bindings) => {
108
+ const childLogger = this.logger.child(JSON.stringify(bindings));
109
+ return new FastifyLogger(childLogger, this.level);
110
+ };
111
+ /**
112
+ * utility function to map and serialize the arguments of fastify logger functions
113
+ *
114
+ * the LogFn used in fastify logger has multiple signatures, for
115
+ * more info see {@link FastifyLogFn}
116
+ */
117
+ parseArgs = (...args) => {
118
+ const [arg0, arg1] = args;
119
+ if (!arg0)
120
+ throw new Error('Fastify log parse failed');
121
+ let info = {};
122
+ if (typeof arg0 === 'string') {
123
+ // format: message [...splat]
124
+ info.message = arg0;
125
+ }
126
+ else {
127
+ // format: meta [message] [...splat]
128
+ info = arg0;
129
+ if (arg0 instanceof Error)
130
+ info = { err: arg0, message: arg0.message };
131
+ // serialize fastify req, res, err
132
+ for (const key in info) {
133
+ if (serializers[key])
134
+ info[key] = serializers[key](info[key]);
135
+ }
136
+ if (arg1)
137
+ info.message = arg1;
138
+ }
139
+ return info;
140
+ };
141
+ }
142
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"logger.js","sourceRoot":"","sources":["../lib/logger.ts"],"names":[],"mappings":"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","sourcesContent":["import { FastifyBaseLogger, LogLevel } from 'fastify';\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\nimport type { FastifyLogFn } from 'fastify';\nimport { serializers } from 'fastify/lib/logger-pino.js';\n\nimport { AbstractLogger } from '@rosen-bridge/abstract-logger';\n\nexport class FastifyLogger implements FastifyBaseLogger {\n  /**\n   * creates a new instance\n   *\n   * @param logger - the underlying logger to delegate to\n   * @param level - for FastifyBaseLogger interface compliance\n   */\n  constructor(\n    protected logger: AbstractLogger,\n    public level: LogLevel = 'info',\n  ) {}\n\n  /**\n   * no-op silent logger method (for Pino interface compliance)\n   * logs nothing regardless of input\n   */\n  silent = () => {\n    // No-op\n  };\n\n  /**\n   * logs a trace-level message\n   *\n   * the LogFn used in fastify logger has multiple signatures, for\n   *  more info see {@link FastifyLogFn}\n   *\n   * @param obj: object to be serialized\n   * @param msg: the log message to write\n   */\n  trace = (...args: unknown[]) => {\n    const { message, ...context } = this.parseArgs(...args);\n    this.logger.trace(message as string, context);\n  };\n\n  /**\n   * logs a debug-level message\n   *\n   * the LogFn used in fastify logger has multiple signatures, for\n   *  more info see {@link FastifyLogFn}\n   *\n   * @param obj: object to be serialized\n   * @param msg: the log message to write\n   */\n  debug = (...args: unknown[]) => {\n    const { message, ...context } = this.parseArgs(...args);\n    this.logger.debug(message as string, context);\n  };\n\n  /**\n   * logs an info-level message\n   *\n   * the LogFn used in fastify logger has multiple signatures, for\n   *  more info see {@link FastifyLogFn}\n   *\n   * @param obj: object to be serialized\n   * @param msg: the log message to write\n   */\n  info = (...args: unknown[]) => {\n    const { message, ...context } = this.parseArgs(...args);\n    this.logger.info(message as string, context);\n  };\n\n  /**\n   * logs a warning-level message\n   *\n   * the LogFn used in fastify logger has multiple signatures, for\n   *  more info see {@link FastifyLogFn}\n   *\n   * @param obj: object to be serialized\n   * @param msg: the log message to write\n   */\n  warn = (...args: unknown[]) => {\n    const { message, ...context } = this.parseArgs(...args);\n    this.logger.warn(message as string, context);\n  };\n\n  /**\n   * logs an error-level message\n   *\n   * the LogFn used in fastify logger has multiple signatures, for\n   *  more info see {@link FastifyLogFn}\n   *\n   * @param obj: object to be serialized\n   * @param msg: the log message to write\n   */\n  error = (...args: unknown[]) => {\n    const { message, ...context } = this.parseArgs(...args);\n    this.logger.error(message as string, context);\n  };\n\n  /**\n   * logs a critical/fatal-level message\n   *\n   * the LogFn used in fastify logger has multiple signatures, for\n   *  more info see {@link FastifyLogFn}\n   *\n   * @param obj: object to be serialized\n   * @param msg: the log message to write\n   */\n  fatal = (...args: unknown[]) => {\n    const { message, ...context } = this.parseArgs(...args);\n    this.logger.critical(message as string, context);\n  };\n\n  /**\n   * creates a child logger with bindings and optional configuration\n   * conforms to the Pino/Fastify logger interface\n   *\n   * @param bindings - Key-value pairs to attach to all logs from the child logger\n   * @returns A new FastifyBaseLogger instance (child logger)\n   */\n  child = (bindings: Record<string, unknown>): FastifyBaseLogger => {\n    const childLogger = this.logger.child(JSON.stringify(bindings));\n    return new FastifyLogger(childLogger, this.level);\n  };\n\n  /**\n   * utility function to map and serialize the arguments of fastify logger functions\n   *\n   * the LogFn used in fastify logger has multiple signatures, for\n   *  more info see {@link FastifyLogFn}\n   */\n  private parseArgs = (...args: unknown[]): Record<string, unknown> => {\n    const [arg0, arg1] = args;\n    if (!arg0) throw new Error('Fastify log parse failed');\n\n    let info: Record<string, unknown> = {};\n\n    if (typeof arg0 === 'string') {\n      // format: message [...splat]\n      info.message = arg0;\n    } else {\n      // format: meta [message] [...splat]\n      info = arg0 as Record<string, unknown>;\n\n      if (arg0 instanceof Error) info = { err: arg0, message: arg0.message };\n\n      // serialize fastify req, res, err\n      for (const key in info) {\n        if (serializers[key]) info[key] = serializers[key](info[key]);\n      }\n\n      if (arg1) info.message = arg1;\n    }\n\n    return info;\n  };\n}\n"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rosen-bridge/fastify-enhanced",
3
- "version": "3.0.0",
3
+ "version": "3.1.0-d5b86d3e",
4
4
  "description": "a wrapper around fastify web framework to make it even better",
5
5
  "repository": {
6
6
  "type": "git",
@@ -30,6 +30,7 @@
30
30
  "dependencies": {
31
31
  "@fastify/swagger": "^9.5.1",
32
32
  "@fastify/swagger-ui": "^5.2.3",
33
+ "@rosen-bridge/abstract-logger": "^4.0.0",
33
34
  "fastify": "^5.3.3",
34
35
  "fastify-zod-openapi": "^4.1.2",
35
36
  "zod-openapi": "^4.2.4"