@navios/core 0.1.14 → 0.2.0

package/src/decorators/stream.decorator.mts

@@ -6,7 +6,8 @@ import type {
 import type { FastifyReply } from 'fastify'
 import type { AnyZodObject, ZodType } from 'zod'
 
-import { EndpointType, getEndpointMetadata } from '../metadata/index.mjs'
+import { StreamAdapterToken } from '../adapters/index.mjs'
+import { getEndpointMetadata } from '../metadata/index.mjs'
 
 export type StreamParams<
   EndpointDeclaration extends {
@@ -63,7 +64,10 @@ export function Stream<
     }
     const config = endpoint.config
     if (context.metadata) {
-      let endpointMetadata = getEndpointMetadata(target, context)
+      let endpointMetadata = getEndpointMetadata<BaseStreamConfig>(
+        target,
+        context,
+      )
       if (endpointMetadata.config && endpointMetadata.config.url) {
         throw new Error(
           `[Navios] Endpoint ${config.method} ${config.url} already exists. Please use a different method or url.`,
@@ -71,7 +75,7 @@ export function Stream<
       }
       // @ts-expect-error We don't need to set correctly in the metadata
       endpointMetadata.config = config
-      endpointMetadata.type = EndpointType.Stream
+      endpointMetadata.adapterToken = StreamAdapterToken
       endpointMetadata.classMethod = target.name
       endpointMetadata.httpMethod = config.method
       endpointMetadata.url = config.url

package/src/decorators/use-guards.decorator.mts

@@ -1,9 +1,10 @@
-import type { CanActivate } from '../interfaces/index.mjs'
 import type {
   ClassType,
   ClassTypeWithInstance,
   InjectionToken,
-} from '../service-locator/index.mjs'
+} from '@navios/di'
+
+import type { CanActivate } from '../interfaces/index.mjs'
 
 import {
   getControllerMetadata,

package/src/index.mts

@@ -1,10 +1,11 @@
+export * from '@navios/di'
+export * from './adapters/index.mjs'
 export * from './config/index.mjs'
 export * from './decorators/index.mjs'
 export * from './exceptions/index.mjs'
 export * from './interfaces/index.mjs'
 export * from './logger/index.mjs'
 export * from './metadata/index.mjs'
-export * from './service-locator/index.mjs'
 export * from './services/index.mjs'
 export * from './tokens/index.mjs'
 export * from './attribute.factory.mjs'

package/src/logger/console-logger.service.mts

@@ -2,10 +2,11 @@ import type { InspectOptions } from 'util'
 
 import { inspect } from 'util'
 
+import { getGlobalServiceLocator, Injectable } from '@navios/di'
+
 import type { LogLevel } from './log-levels.mjs'
 import type { LoggerService } from './logger-service.interface.mjs'
 
-import { getServiceLocator, Injectable } from '../service-locator/index.mjs'
 import { Request } from '../tokens/index.mjs'
 import {
   clc,
@@ -178,7 +179,7 @@ export class ConsoleLogger implements LoggerService {
       this.originalContext = context
     }
     if (opts?.requestId) {
-      const locator = getServiceLocator()
+      const locator = getGlobalServiceLocator()
       locator
         .getEventBus()
         .on(locator.getInstanceIdentifier(Request, undefined), 'create', () => {

package/src/logger/logger.factory.mts

@@ -1,10 +1,9 @@
+import { Injectable, InjectableType, InjectionToken } from '@navios/di'
+
 import { z } from 'zod'
 
-import {
-  Injectable,
-  InjectableType,
-  InjectionToken,
-} from '../service-locator/index.mjs'
+import type { LoggerService } from './logger-service.interface.mjs'
+
 import { LoggerInstance } from './logger.service.mjs'
 
 export const LoggerInjectionToken = 'LoggerInjectionToken'

package/src/logger/logger.service.mts

@@ -1,7 +1,8 @@
+import { Injectable } from '@navios/di'
+
 import type { LogLevel } from './log-levels.mjs'
 import type { LoggerService } from './logger-service.interface.mjs'
 
-import { Injectable } from '../service-locator/index.mjs'
 import { ConsoleLogger } from './console-logger.service.mjs'
 import { isLogLevelEnabled, isObject } from './utils/index.mjs'
 
@@ -16,7 +17,6 @@ const dateTimeFormatter = new Intl.DateTimeFormat(undefined, {
   month: '2-digit',
 })
 
-// @ts-expect-error We don't need to support this in the current version
 @Injectable()
 export class LoggerInstance implements LoggerService {
   protected static staticInstanceRef?: LoggerService = DEFAULT_LOGGER

package/src/metadata/controller.metadata.mts

@@ -1,17 +1,18 @@
-import type { CanActivate } from '../interfaces/index.mjs'
 import type {
   ClassType,
   ClassTypeWithInstance,
   InjectionToken,
-} from '../service-locator/index.mjs'
-import type { EndpointMetadata } from './endpoint.metadata.mjs'
+} from '@navios/di'
+
+import type { CanActivate } from '../interfaces/index.mjs'
+import type { HandlerMetadata } from './handler.metadata.mjs'
 
-import { getAllEndpointMetadata } from './endpoint.metadata.mjs'
+import { getAllEndpointMetadata } from './handler.metadata.mjs'
 
 export const ControllerMetadataKey = Symbol('ControllerMetadataKey')
 
 export interface ControllerMetadata {
-  endpoints: Set<EndpointMetadata>
+  endpoints: Set<HandlerMetadata>
   guards: Set<
     ClassTypeWithInstance<CanActivate> | InjectionToken<CanActivate, undefined>
   >

package/src/metadata/{endpoint.metadata.mts → handler.metadata.mts}

@@ -1,34 +1,23 @@
-import type {
-  BaseEndpointConfig,
-  BaseStreamConfig,
-  HttpMethod,
-} from '@navios/common'
+import type { HttpMethod } from '@navios/common'
+import type { ClassTypeWithInstance, InjectionToken } from '@navios/di'
 import type { HttpHeader } from 'fastify/types/utils.js'
 
+import type { HandlerAdapterInterface } from '../adapters/index.mjs'
 import type { CanActivate } from '../interfaces/index.mjs'
-import type {
-  ClassTypeWithInstance,
-  InjectionToken,
-} from '../service-locator/index.mjs'
 
 export const EndpointMetadataKey = Symbol('EndpointMetadataKey')
 
-export enum EndpointType {
-  Unknown = 'unknown',
-  Endpoint = 'endpoint',
-  Stream = 'stream',
-  Multipart = 'multipart',
-  Handler = 'handler',
-}
-
-export interface EndpointMetadata {
+export interface HandlerMetadata<Config = null> {
   classMethod: string
   url: string
   successStatusCode: number
-  type: EndpointType
+  adapterToken:
+    | InjectionToken<HandlerAdapterInterface, undefined>
+    | ClassTypeWithInstance<HandlerAdapterInterface>
+    | null
   headers: Partial<Record<HttpHeader, number | string | string[] | undefined>>
   httpMethod: HttpMethod
-  config: BaseEndpointConfig | BaseStreamConfig | null
+  config: Config
   guards: Set<
     ClassTypeWithInstance<CanActivate> | InjectionToken<CanActivate, undefined>
   >
@@ -37,25 +26,25 @@ export interface EndpointMetadata {
 
 export function getAllEndpointMetadata(
   context: ClassMethodDecoratorContext | ClassDecoratorContext,
-): Set<EndpointMetadata> {
+): Set<HandlerMetadata<any>> {
   if (context.metadata) {
     const metadata = context.metadata[EndpointMetadataKey] as
-      | Set<EndpointMetadata>
+      | Set<HandlerMetadata>
       | undefined
     if (metadata) {
       return metadata
     } else {
-      context.metadata[EndpointMetadataKey] = new Set<EndpointMetadata>()
-      return context.metadata[EndpointMetadataKey] as Set<EndpointMetadata>
+      context.metadata[EndpointMetadataKey] = new Set<HandlerMetadata<any>>()
+      return context.metadata[EndpointMetadataKey] as Set<HandlerMetadata<any>>
     }
   }
   throw new Error('[Navios] Wrong environment.')
 }
 
-export function getEndpointMetadata(
+export function getEndpointMetadata<Config = any>(
   target: Function,
   context: ClassMethodDecoratorContext,
-): EndpointMetadata {
+): HandlerMetadata<Config> {
   if (context.metadata) {
     const metadata = getAllEndpointMetadata(context)
     if (metadata) {
@@ -65,13 +54,14 @@ export function getEndpointMetadata(
       if (endpointMetadata) {
         return endpointMetadata
       } else {
-        const newMetadata: EndpointMetadata = {
+        const newMetadata: HandlerMetadata<Config> = {
           classMethod: target.name,
           url: '',
           successStatusCode: 200,
+          adapterToken: null,
           headers: {},
-          type: EndpointType.Unknown,
           httpMethod: 'GET',
+          // @ts-expect-error We are using a generic type here
           config: null,
           guards: new Set<
             | ClassTypeWithInstance<CanActivate>

package/src/metadata/index.mts

@@ -1,4 +1,3 @@
 export * from './controller.metadata.mjs'
-export * from './endpoint.metadata.mjs'
-export * from './injectable.metadata.mjs'
+export * from './handler.metadata.mjs'
 export * from './module.metadata.mjs'

package/src/metadata/module.metadata.mts

@@ -1,9 +1,10 @@
-import type { CanActivate } from '../index.mjs'
 import type {
   ClassType,
   ClassTypeWithInstance,
   InjectionToken,
-} from '../service-locator/index.mjs'
+} from '@navios/di'
+
+import type { CanActivate } from '../index.mjs'
 
 export const ModuleMetadataKey = Symbol('ControllerMetadataKey')
 

package/src/navios.application.mts

@@ -1,11 +1,19 @@
 import type { FastifyCorsOptions } from '@fastify/cors'
 import type { FastifyMultipartOptions } from '@fastify/multipart'
+import type { ClassTypeWithInstance } from '@navios/di'
 import type {
   FastifyInstance,
   FastifyListenOptions,
   FastifyServerOptions,
 } from 'fastify'
 
+import {
+  getGlobalServiceLocator,
+  inject,
+  Injectable,
+  syncInject,
+} from '@navios/di'
+
 import cors from '@fastify/cors'
 import multipart from '@fastify/multipart'
 import { fastify } from 'fastify'
@@ -16,16 +24,9 @@ import {
 
 import type { NaviosModule } from './interfaces/index.mjs'
 import type { LoggerService, LogLevel } from './logger/index.mjs'
-import type { ClassTypeWithInstance } from './service-locator/index.mjs'
 
 import { HttpException } from './exceptions/index.mjs'
 import { Logger, PinoWrapper } from './logger/index.mjs'
-import {
-  getServiceLocator,
-  inject,
-  Injectable,
-  syncInject,
-} from './service-locator/index.mjs'
 import {
   ControllerAdapterService,
   ModuleLoaderService,
@@ -75,7 +76,7 @@ export class NaviosApplication {
     await this.moduleLoader.loadModules(this.appModule)
     this.server = await this.getFastifyInstance(this.options)
     this.configureFastifyInstance(this.server)
-    getServiceLocator().registerInstance(Application, this.server)
+    getGlobalServiceLocator().storeInstance(this.server, Application)
     // Add schema validator and serializer
     this.server.setValidatorCompiler(validatorCompiler)
     this.server.setSerializerCompiler(serializerCompiler)
@@ -149,7 +150,7 @@ export class NaviosApplication {
         message: 'Not Found',
         error: 'NotFound',
       }
-      this.logger.error(`Route not found: ${req.url}`)
+      this.logger.error(`Route not found: [${req.method}] ${req.url}`)
       return reply.status(404).send(response)
     })
   }
@@ -178,15 +179,14 @@ export class NaviosApplication {
       }
       promises.push(
         this.server!.register(
-          (instance, opts, done) => {
+          async (instance, opts) => {
             for (const controller of moduleMetadata.controllers) {
-              this.controllerAdapter.setupController(
+              await this.controllerAdapter.setupController(
                 controller,
                 instance,
                 moduleMetadata,
               )
             }
-            done()
           },
           {
             prefix: this.globalPrefix ?? '',

package/src/navios.factory.mts

@@ -1,13 +1,15 @@
+import type { ClassTypeWithInstance } from '@navios/di'
+
+import { inject } from '@navios/di'
+
 import type { NaviosModule } from './interfaces/index.mjs'
 import type {
   NaviosApplicationContextOptions,
   NaviosApplicationOptions,
 } from './navios.application.mjs'
-import type { ClassTypeWithInstance } from './service-locator/index.mjs'
 
 import { isNil, LoggerInstance } from './logger/index.mjs'
 import { NaviosApplication } from './navios.application.mjs'
-import { inject } from './service-locator/index.mjs'
 
 export class NaviosFactory {
   static async create(