@geekmidas/constructs 0.0.11 → 0.0.13

package/src/endpoints/HonoEndpointAdaptor.ts

@@ -1,3 +1,4 @@
+import type { AuditStorage, AuditableAction } from '@geekmidas/audit';
 import type { EnvironmentParser } from '@geekmidas/envkit';
 import type { EventPublisher } from '@geekmidas/events';
 import type { Logger } from '@geekmidas/logger';
@@ -26,6 +27,11 @@ import {
 } from '@geekmidas/services';
 import type { ContentfulStatusCode } from 'hono/utils/http-status';
 import { publishConstructEvents } from '../publisher';
+import type { MappedAudit } from './audit';
+import {
+  createAuditContext,
+  executeWithAuditTransaction,
+} from './processAudits';
 
 export interface HonoEndpointOptions {
   /**
@@ -53,6 +59,15 @@ export class HonoEndpoint<
   TLogger extends Logger = Logger,
   TSession = unknown,
   TEventPublisher extends EventPublisher<any> | undefined = undefined,
+  TEventPublisherServiceName extends string = string,
+  TAuditStorage extends AuditStorage | undefined = undefined,
+  TAuditStorageServiceName extends string = string,
+  TAuditAction extends AuditableAction<string, unknown> = AuditableAction<
+    string,
+    unknown
+  >,
+  TDatabase = undefined,
+  TDatabaseServiceName extends string = string,
 > {
   constructor(
     private readonly endpoint: Endpoint<
@@ -63,7 +78,13 @@ export class HonoEndpoint<
       TServices,
       TLogger,
       TSession,
-      TEventPublisher
+      TEventPublisher,
+      TEventPublisherServiceName,
+      TAuditStorage,
+      TAuditStorageServiceName,
+      TAuditAction,
+      TDatabase,
+      TDatabaseServiceName
     >,
   ) {}
 
@@ -111,11 +132,12 @@ export class HonoEndpoint<
         any
       >;
       // @ts-ignore
-      const response = c.get('__response') as InferStandardSchema<TOutSchema>;
+      const response = c.get('__response');
       // @ts-ignore
       const logger = c.get('__logger') as Logger;
 
       if (Endpoint.isSuccessStatus(c.res.status) && endpoint) {
+        // Process events (audits are handled in the handler with transaction support)
         await publishConstructEvents<any, any>(
           endpoint,
           response,
@@ -215,6 +237,15 @@ export class HonoEndpoint<
     TLogger extends Logger = Logger,
     TSession = unknown,
     TEventPublisher extends EventPublisher<any> | undefined = undefined,
+    TEventPublisherServiceName extends string = string,
+    TAuditStorage extends AuditStorage | undefined = undefined,
+    TAuditStorageServiceName extends string = string,
+    TAuditAction extends AuditableAction<string, unknown> = AuditableAction<
+      string,
+      unknown
+    >,
+    TDatabase = undefined,
+    TDatabaseServiceName extends string = string,
   >(
     endpoint: Endpoint<
       TRoute,
@@ -224,7 +255,13 @@ export class HonoEndpoint<
       TServices,
       TLogger,
       TSession,
-      TEventPublisher
+      TEventPublisher,
+      TEventPublisherServiceName,
+      TAuditStorage,
+      TAuditStorageServiceName,
+      TAuditAction,
+      TDatabase,
+      TDatabaseServiceName
     >,
     serviceDiscovery: ServiceDiscovery<ServiceRecord<TServices>, TLogger>,
     app: Hono,
@@ -304,41 +341,114 @@ export class HonoEndpoint<
             }
           }
 
-          const responseBuilder = new ResponseBuilder();
-          const response = await endpoint.handler(
+          // Create audit context if audit storage is configured
+          const auditContext = await createAuditContext(
+            endpoint,
+            serviceDiscovery,
+            logger,
             {
-              services,
-              logger,
-              body: c.req.valid('json'),
-              query: c.req.valid('query'),
-              params: c.req.valid('param'),
               session,
-              header: Endpoint.createHeaders(headerValues),
-              cookie: Endpoint.createCookies(headerValues.cookie),
-            } as unknown as EndpointContext<
-              TInput,
-              TServices,
-              TLogger,
-              TSession
-            >,
-            responseBuilder,
+              header,
+              cookie,
+              services: services as Record<string, unknown>,
+            },
           );
 
-          // Publish events if configured
+          // Warn if declarative audits are configured but no audit storage
+          const audits = endpoint.audits as MappedAudit<
+            TAuditAction,
+            TOutSchema
+          >[];
+          if (!auditContext && audits?.length) {
+            logger.warn('No auditor storage service available');
+          }
 
-          // Validate output if schema is defined
+          // Resolve database service if configured
+          const rawDb = endpoint.databaseService
+            ? await serviceDiscovery
+                .register([endpoint.databaseService])
+                .then(
+                  (s) =>
+                    s[endpoint.databaseService!.serviceName as keyof typeof s],
+                )
+            : undefined;
+
+          // Execute handler with automatic audit transaction support
+          const result = await executeWithAuditTransaction(
+            auditContext,
+            async (auditor) => {
+              // Use audit transaction as db only if the storage uses the same database service
+              const sameDatabase =
+                auditContext?.storage?.databaseServiceName &&
+                auditContext.storage.databaseServiceName ===
+                  endpoint.databaseService?.serviceName;
+              const db = sameDatabase
+                ? (auditor?.getTransaction?.() ?? rawDb)
+                : rawDb;
+
+              const responseBuilder = new ResponseBuilder();
+              const response = await endpoint.handler(
+                {
+                  services,
+                  logger,
+                  body: c.req.valid('json'),
+                  query: c.req.valid('query'),
+                  params: c.req.valid('param'),
+                  session,
+                  header,
+                  cookie,
+                  auditor,
+                  db,
+                } as unknown as EndpointContext<
+                  TInput,
+                  TServices,
+                  TLogger,
+                  TSession,
+                  TAuditAction,
+                  TDatabase,
+                  TAuditStorage
+                >,
+                responseBuilder,
+              );
+
+              // Check if response has metadata
+              let data = response;
+              let metadata = responseBuilder.getMetadata();
+
+              if (Endpoint.hasMetadata(response)) {
+                data = response.data;
+                metadata = response.metadata;
+              }
+
+              const output = endpoint.outputSchema
+                ? await endpoint.parseOutput(data)
+                : undefined;
+
+              return { output, metadata, responseBuilder };
+            },
+            // Process declarative audits after handler (inside transaction)
+            async (result, auditor) => {
+              if (!audits?.length) return;
+
+              for (const audit of audits) {
+                if (audit.when && !audit.when(result.output as any)) {
+                  continue;
+                }
+                const payload = audit.payload(result.output as any);
+                const entityId = audit.entityId?.(result.output as any);
+                auditor.audit(audit.type as any, payload as any, {
+                  table: audit.table,
+                  entityId,
+                });
+              }
+            },
+          );
+
+          const { output, metadata } = result;
 
           try {
-            // Check if response has metadata
-            let data = response;
-            let metadata = responseBuilder.getMetadata();
             let status = endpoint.status as ContentfulStatusCode;
 
-            if (Endpoint.hasMetadata(response)) {
-              data = response.data;
-              metadata = response.metadata;
-            }
-
             // Apply response metadata
             if (metadata.status) {
               status = metadata.status as ContentfulStatusCode;
@@ -356,21 +466,22 @@ export class HonoEndpoint<
               }
             }
 
-            const output = endpoint.outputSchema
-              ? await endpoint.parseOutput(data)
-              : ({} as any);
             // @ts-ignore
             c.set('__response', output);
             // @ts-ignore
             c.set('__endpoint', endpoint);
             // @ts-ignore
             c.set('__logger', logger);
+            // @ts-ignore
+            c.set('__session', session);
+            // @ts-ignore
+            c.set('__services', services);
 
             if (HonoEndpoint.isDev) {
               logger.info({ status, body: output }, 'Outgoing response');
             }
 
-            return c.json(output, status);
+            return c.json(output ?? {}, status);
           } catch (validationError: any) {
             logger.error(validationError, 'Output validation failed');
             const error = wrapError(

package/src/endpoints/TestEndpointAdaptor.ts

@@ -1,3 +1,4 @@
+import type { AuditStorage, AuditableAction } from '@geekmidas/audit';
 import { EnvironmentParser } from '@geekmidas/envkit';
 import type { EventPublisher } from '@geekmidas/events';
 import type { Logger } from '@geekmidas/logger';
@@ -19,6 +20,11 @@ import {
   type EndpointSchemas,
   ResponseBuilder,
 } from './Endpoint';
+import type { MappedAudit } from './audit';
+import {
+  createAuditContext,
+  executeWithAuditTransaction,
+} from './processAudits';
 
 export type TestHttpResponse<TBody = any> = {
   body: TBody;
@@ -73,6 +79,12 @@ export class TestEndpointAdaptor<
   TSession = unknown,
   TEventPublisher extends EventPublisher<any> | undefined = undefined,
   TEventPublisherServiceName extends string = string,
+  TAuditStorage extends AuditStorage | undefined = undefined,
+  TAuditStorageServiceName extends string = string,
+  TAuditAction extends AuditableAction<string, unknown> = AuditableAction<
+    string,
+    unknown
+  >,
 > {
   static getDefaultServiceDiscover<
     TRoute extends string,
@@ -84,6 +96,12 @@ export class TestEndpointAdaptor<
     TSession = unknown,
     TEventPublisher extends EventPublisher<any> | undefined = undefined,
     TEventPublisherServiceName extends string = string,
+    TAuditStorage extends AuditStorage | undefined = undefined,
+    TAuditStorageServiceName extends string = string,
+    TAuditAction extends AuditableAction<string, unknown> = AuditableAction<
+      string,
+      unknown
+    >,
   >(
     endpoint: Endpoint<
       TRoute,
@@ -94,7 +112,10 @@ export class TestEndpointAdaptor<
       TLogger,
       TSession,
       TEventPublisher,
-      TEventPublisherServiceName
+      TEventPublisherServiceName,
+      TAuditStorage,
+      TAuditStorageServiceName,
+      TAuditAction
     >,
   ) {
     return ServiceDiscovery.getInstance(
@@ -112,7 +133,10 @@ export class TestEndpointAdaptor<
       TLogger,
       TSession,
       TEventPublisher,
-      TEventPublisherServiceName
+      TEventPublisherServiceName,
+      TAuditStorage,
+      TAuditStorageServiceName,
+      TAuditAction
     >,
     private serviceDiscovery: ServiceDiscovery<
       any,
@@ -149,33 +173,102 @@ export class TestEndpointAdaptor<
       cookie,
     });
 
-    const responseBuilder = new ResponseBuilder();
-    const response = await this.endpoint.handler(
+    // Create audit context if audit storage is configured
+    const auditContext = await createAuditContext(
+      this.endpoint,
+      this.serviceDiscovery,
+      logger,
       {
-        body,
-        query,
-        params,
         session,
-        services: ctx.services,
-        logger,
         header,
         cookie,
-      } as any,
-      responseBuilder,
+        services: ctx.services as Record<string, unknown>,
+      },
     );
 
-    // Check if response has metadata
-    let data = response;
-    let metadata = responseBuilder.getMetadata();
-
-    if (Endpoint.hasMetadata(response)) {
-      data = response.data;
-      metadata = response.metadata;
+    // Warn if declarative audits are configured but no audit storage
+    const audits = this.endpoint.audits as MappedAudit<
+      TAuditAction,
+      TOutSchema
+    >[];
+    if (!auditContext && audits?.length) {
+      logger.warn('No auditor storage service available');
     }
 
-    const output = await this.endpoint.parseOutput(data);
-    ctx.publisher && (await this.serviceDiscovery.register([ctx.publisher]));
+    // Resolve database service if configured
+    const rawDb = this.endpoint.databaseService
+      ? await this.serviceDiscovery
+          .register([this.endpoint.databaseService])
+          .then(
+            (s) =>
+              s[this.endpoint.databaseService!.serviceName as keyof typeof s],
+          )
+      : undefined;
+
+    // Execute handler with automatic audit transaction support
+    const result = await executeWithAuditTransaction(
+      auditContext,
+      async (auditor) => {
+        // Use audit transaction as db only if the storage uses the same database service
+        const sameDatabase =
+          auditContext?.storage?.databaseServiceName &&
+          auditContext.storage.databaseServiceName ===
+            this.endpoint.databaseService?.serviceName;
+        const db = sameDatabase
+          ? (auditor?.getTransaction?.() ?? rawDb)
+          : rawDb;
+
+        const responseBuilder = new ResponseBuilder();
+        const response = await this.endpoint.handler(
+          {
+            body,
+            query,
+            params,
+            session,
+            services: ctx.services,
+            logger,
+            header,
+            cookie,
+            auditor,
+            db,
+          } as any,
+          responseBuilder,
+        );
 
+        // Check if response has metadata
+        let data = response;
+        let metadata = responseBuilder.getMetadata();
+
+        if (Endpoint.hasMetadata(response)) {
+          data = response.data;
+          metadata = response.metadata;
+        }
+
+        const output = await this.endpoint.parseOutput(data);
+
+        return { output, metadata, responseBuilder };
+      },
+      // Process declarative audits after handler (inside transaction)
+      async (result, auditor) => {
+        if (!audits?.length) return;
+
+        for (const audit of audits) {
+          if (audit.when && !audit.when(result.output as any)) {
+            continue;
+          }
+          const payload = audit.payload(result.output as any);
+          const entityId = audit.entityId?.(result.output as any);
+          auditor.audit(audit.type as any, payload as any, {
+            table: audit.table,
+            entityId,
+          });
+        }
+      },
+    );
+
+    const { output, metadata } = result;
+
+    ctx.publisher && (await this.serviceDiscovery.register([ctx.publisher]));
     await publishConstructEvents(this.endpoint, output, this.serviceDiscovery);
 
     // Convert cookies to Set-Cookie headers
@@ -186,7 +279,9 @@ export class TestEndpointAdaptor<
     if (metadata.cookies && metadata.cookies.size > 0) {
       const setCookieValues: string[] = [];
       for (const [name, cookie] of metadata.cookies.entries()) {
-        setCookieValues.push(serializeCookie(name, cookie.value, cookie.options));
+        setCookieValues.push(
+          serializeCookie(name, cookie.value, cookie.options),
+        );
       }
       headers['set-cookie'] = setCookieValues;
     }

package/src/endpoints/__tests__/AmazonApiGatewayV1EndpointAdaptor.events.spec.ts

@@ -69,6 +69,7 @@ describe('AmazonApiGatewayV1Endpoint Events', () => {
       services: [],
       logger: mockLogger,
       timeout: undefined,
+      memorySize: undefined,
       status: 200,
       getSession: undefined,
       authorize: undefined,
@@ -135,6 +136,7 @@ describe('AmazonApiGatewayV1Endpoint Events', () => {
       services: [],
       logger: mockLogger,
       timeout: undefined,
+      memorySize: undefined,
       status: 201,
       getSession: undefined,
       authorize: undefined,
@@ -215,6 +217,7 @@ describe('AmazonApiGatewayV1Endpoint Events', () => {
       services: [],
       logger: mockLogger,
       timeout: undefined,
+      memorySize: undefined,
       status: 200,
       getSession: undefined,
       authorize: undefined,
@@ -274,6 +277,7 @@ describe('AmazonApiGatewayV1Endpoint Events', () => {
       services: [],
       logger: mockLogger,
       timeout: undefined,
+      memorySize: undefined,
       status: 200,
       getSession: undefined,
       authorize: undefined,
@@ -324,6 +328,7 @@ describe('AmazonApiGatewayV1Endpoint Events', () => {
       services: [],
       logger: mockLogger,
       timeout: undefined,
+      memorySize: undefined,
       status: 200,
       getSession: undefined,
       authorize: undefined,
@@ -384,6 +389,7 @@ describe('AmazonApiGatewayV1Endpoint Events', () => {
       services: [],
       logger: mockLogger,
       timeout: undefined,
+      memorySize: undefined,
       status: 200,
       getSession: undefined,
       authorize: undefined,
@@ -455,6 +461,7 @@ describe('AmazonApiGatewayV1Endpoint Events', () => {
       services: [],
       logger: mockLogger,
       timeout: undefined,
+      memorySize: undefined,
       status: 201,
       getSession: undefined,
       authorize: undefined,
@@ -526,6 +533,7 @@ describe('AmazonApiGatewayV1Endpoint Events', () => {
       services: [],
       logger: mockLogger,
       timeout: undefined,
+      memorySize: undefined,
       status: 200,
       getSession: undefined,
       authorize: undefined,