Add logging, shared types

server/package.json

@@ -23,6 +23,7 @@
     "@fastify/type-provider-typebox": "^5.0.0",
     "fastify": "^5.0.0",
     "pino": "^9.4.0",
-    "pino-pretty": "^11.2.2"
+    "pino-pretty": "^11.2.2",
+    "shared": "../shared"
   }
 }

server/src/index.ts

@@ -1,26 +1,18 @@
 import server from './server'
+import { logger } from './util/logger'
 
 async function run (): Promise<void> {
-    console.log('2')
-
-    let app
-    try {
-    app = await server()
-    } catch (e) {
-        console.error(e)
-    }
-    console.log('3')
+    const app = await server()
     await app?.listen({
         host: '0.0.0.0',
         port: 8080
     })
 }
 
-console.log('1')
 run()
     .then(r => {})
     .catch(async err => {
-        // logger.error({ err }, 'Error in running app')
+        logger.error({ err }, 'Error in running app')
         // close any db stuff
         process.exit()
     })

server/src/routes/add/root.ts

@@ -1,17 +1,15 @@
-import { Type, TypeBoxTypeProvider, FastifyPluginAsyncTypebox } from '@fastify/type-provider-typebox'
+import { TypeBoxTypeProvider, FastifyPluginAsyncTypebox } from '@fastify/type-provider-typebox'
+import { AddResponseSchema, AddRequestSchema } from 'shared'
 
 // maybe use a generic argument for FastifyPluginAsync if we use options with fastify instance
 const add: FastifyPluginAsyncTypebox = async (fastifyApp, { }): Promise<void> => {
     const fastify = fastifyApp.withTypeProvider<TypeBoxTypeProvider>()
 
     fastify.get('/', {
         schema: {
-            querystring: Type.Object({
-                a: Type.Number(),
-                b: Type.Number()
-            }),
+            querystring: AddRequestSchema,
             response: {
-                200: Type.Object({result: Type.Number()})
+                200: AddResponseSchema
             }
         }
     }, async (request, reply) => {

server/src/server.ts

@@ -13,17 +13,12 @@ import {
     UnauthenticatedClientError,
     sendBasicMessageResponse,
 } from './util/errors'
-import { logger } from './util/logger'
-
-// const logger = l
+import { logger, fastifyLogOpts } from './util/logger'
 
 export default async function server (): Promise<FastifyInstance> {
-    console.log('11')
-    // const logger = mylogger()
     const fastify = Fastify({
-        logger: true
+        logger: fastifyLogOpts
     })
-    console.log('12')
 
     fastify.setValidatorCompiler(TypeBoxValidatorCompiler)
 
@@ -57,10 +52,10 @@ export default async function server (): Promise<FastifyInstance> {
             } else if (error instanceof ConflictError || error instanceof UnmodifiableError) {
                 await sendBasicMessageResponse(409, reply, error.message)
             } else if (error instanceof DatabaseError) {
-                fastify.log.error({err: error}, 'Critical database error')
+                logger.error({err: error}, 'Critical database error')
                 await sendBasicMessageResponse(500, reply, error.message)
             } else {
-                fastify.log.error({err: error}, 'Unknown internal server error')
+                logger.error({err: error}, 'Unknown internal server error')
                 await sendBasicMessageResponse(error.statusCode ?? 500, reply, error.message)
             }
         }

server/src/util/logger.ts

@@ -1,35 +1,21 @@
 import { pino } from 'pino'
-// export const logger = pino({
-//     transport: {
-//         target: 'pino-pretty',
-//         options: { translateTime: 'UTC:yyyy-mm-dd\'T\'HH:MM:ss.l\'Z\'' }
-//     }
-// })
 
 const ENV_LEVELS: Record<string, string> = {
     production: 'info',
     test: 'silent',
     default: 'debug'
 }
-export function logger() {
-    const opts = {
-        level: ENV_LEVELS[process.env.NODE_ENV ?? 'default'],
-        messageKey: 'message',
-        formatters: {
-            level: (level: any) => ({ level }) // display the level not the number value of the level
-        },
-        base: {}, // don't display the process pid, nor hostname
-        redact: {
-            // redact bearer tokens and JWTs
-            paths: ['req.headers.authorization', 'req.headers.assertion', 'req.headers["x-jwt-assertion"]', 'req.headers["x-jwt-assertion-original"]'],
-            censor: '***'
-        },
-        transport: {
-            target: 'pino-pretty',
-            options: {translateTime: 'UTC:yyyy-mm-dd\'T\'HH:MM:ss.l\'Z\''}
-        }
+
+const loggerOptions = {
+    level: ENV_LEVELS[process.env.NODE_ENV ?? 'default'],
+    formatters: {
+        level: (level: any) => ({ level }) // display the level not the number value of the level
+    },
+    base: {}, // don't display the process pid, nor hostname
+    transport: {
+        target: 'pino-pretty',
+        options: {translateTime: 'SYS:HH:MM:ss Z-07:00'}
     }
-    return pino(opts)
 }
-
-// export default logger;
+export const fastifyLogOpts = {...loggerOptions, messageKey: 'message' }
+export const logger = pino(loggerOptions)

shared/package.json

@@ -16,6 +16,7 @@
     "@fastify/cors": "^8.3.0",
     "@fastify/helmet": "^10.1.1",
     "@fastify/sensible": "^5.2.0",
+    "@sinclair/typebox": "^0.33.12",
     "fastify": "^4.18.0",
     "fastify-cli": "^5.7.1",
     "fastify-plugin": "^4.5.0",
@@ -26,4 +27,4 @@
     "typescript": "^5.0.2",
     "vite": "^4.4.5"
   }
-}
+}

shared/src/index.ts

@@ -0,0 +1,2 @@
+ // Add
+export { AddResponseSchema, AddRequestSchema, type AddRequest, type AddResponse } from './model/add.model'

shared/src/model/add.model.ts

@@ -0,0 +1,13 @@
+import { Static, Type } from '@sinclair/typebox'
+
+export const AddResponseSchema = Type.Object({
+  result: Type.Number()
+})
+export type AddResponse = Static<typeof AddResponseSchema>
+
+export const AddRequestSchema = Type.Object({
+  a: Type.Number(),
+  b: Type.Number()
+})
+export type AddRequest = Static<typeof AddRequestSchema>
+

web/package.json

@@ -24,7 +24,7 @@
     "web-vitals": "^2.1.4"
   },
   "scripts": {
-    "start": "vite",
+    "dev": "vite",
     "build": "tsc && vite build",
     "serve": "vite preview",
     "reload": "npm run build && npm run serve",

web/src/client/add.ts

@@ -1,8 +1,6 @@
 import {Client} from "./client";
+import { AddRequest } from 'shared'
 
-export async function add(client: Client, a: number, b: number): Promise<number> {
-    return await client.get<number>('/add', {
-        a,
-        b
-    })
-}
+export async function add(client: Client, params: AddRequest): Promise<number> {
+    return await client.get<number>('/add', params)
+}

web/src/components/main.tsx

@@ -17,7 +17,7 @@ export const Main = memo(() => {
         if (!client) {
             return
         }
-        const response = await add(client, 1, 2);
+        const response = await add(client, {a:1, b:2});
         return response;
     });