@hed-hog/core 0.0.370 → 0.0.371

package/src/webhook-integration/webhook-integration.service.ts

@@ -24,7 +24,7 @@ import {
     CreateWebhookActionDTO,
     UpdateWebhookActionDTO,
 } from './dto/webhook-action.dto';
-import { WebhookCommandRegistry } from './webhook-command.registry';
+import { AppCommandRegistry } from '../app-command/app-command.registry';
 import {
     createPlainToken,
     createPublicUuid,
@@ -103,7 +103,7 @@ export class WebhookIntegrationService {
     private readonly mailMainService: MailMainService,
     private readonly coreMailService: MailService,
     private readonly settingService: SettingService,
-    private readonly commandRegistry: WebhookCommandRegistry,
+    private readonly commandRegistry: AppCommandRegistry,
     private readonly mcpApiKeyService: McpApiKeyService,
   ) {}
 
@@ -495,7 +495,8 @@ export class WebhookIntegrationService {
       pageSize,
       prev: page > 1 ? page - 1 : null,
       next: page < lastPage ? page + 1 : null,
-      data,
+      // Never expose the raw replay payload (may contain secrets) to clients.
+      data: (data || []).map(({ payload_raw, ...rest }: any) => rest),
     };
 
     const logIds = (result.data || [])
@@ -553,7 +554,6 @@ export class WebhookIntegrationService {
   async executePublic(uuid: string, body: any, headers: any, req: Request) {
     const startedAt = Date.now();
     const remoteIp = this.getRemoteIp(req);
-    const actionLogs: ActionExecutionLog[] = [];
     let integration: any | null = null;
 
     try {
@@ -575,14 +575,70 @@ export class WebhookIntegrationService {
       this.validateToken(integration, headers);
       this.validateIp(integration, remoteIp);
       this.validateBodySchema(integration, body);
+    } catch (error) {
+      const callLog = await this.createCallLog({
+        integration,
+        uuid,
+        status: 'failed',
+        remoteIp,
+        durationMs: Date.now() - startedAt,
+        payload: body,
+        response: {
+          success: false,
+          actions: [],
+        },
+        error,
+      }).catch(() => null);
+
+      if (integration?.id && callLog?.id) {
+        this.logEmitter.emit(`log:${integration.id}`, { id: callLog.id });
+      }
+
+      if (error instanceof HttpException) {
+        throw error;
+      }
+
+      return {
+        success: false,
+        actions: [],
+      };
+    }
+
+    return this.runActionsAndLog({
+      integration,
+      uuid,
+      body,
+      remoteIp,
+      webhookHeaders: normalizeJsonObject(headers) || {},
+      startedAt,
+    });
+  }
 
+  /**
+   * Runs every active action of an integration against `body`, persists a new
+   * call log + action logs, and emits the SSE event. Shared by the public
+   * webhook entrypoint and by the admin-triggered retry of a failed call.
+   */
+  private async runActionsAndLog(input: {
+    integration: any;
+    uuid: string;
+    body: any;
+    remoteIp: string | null;
+    webhookHeaders: Record<string, unknown>;
+    startedAt: number;
+  }) {
+    const { integration, uuid, body, remoteIp, webhookHeaders, startedAt } =
+      input;
+    const actionLogs: ActionExecutionLog[] = [];
+
+    try {
       const actionResults = [];
       for (const action of integration.webhook_action || []) {
         const actionStartedAt = Date.now();
 
         try {
           const result = await this.executeAction(action, body, {
-            webhookHeaders: normalizeJsonObject(headers) || {},
+            webhookHeaders,
             remoteIp,
             publicUuid: uuid,
             integrationId: integration.id,
@@ -700,6 +756,56 @@ export class WebhookIntegrationService {
     }
   }
 
+  /**
+   * Replays a previously failed webhook call from the Logs tab. Re-executes the
+   * whole call (all active actions) using the original stored payload, without
+   * re-validating token/IP (the retry is triggered by an authenticated admin).
+   * Produces a brand-new call log so the retry is itself auditable.
+   */
+  async retryCall(integrationId: number, logId: number) {
+    const log = await this.logs?.findFirst({
+      where: { id: logId, webhook_integration_id: integrationId },
+    });
+
+    if (!log) {
+      throw new NotFoundException('Webhook call log not found.');
+    }
+
+    if (log.status !== 'failed') {
+      throw new BadRequestException('Only failed webhook calls can be retried.');
+    }
+
+    if (log.payload_raw === null || log.payload_raw === undefined) {
+      throw new BadRequestException(
+        'This webhook call cannot be retried because its original payload was not stored.',
+      );
+    }
+
+    const integration = await this.integrations.findUnique({
+      where: { id: integrationId },
+      include: {
+        webhook_action: {
+          select: this.webhookActionSelect,
+          where: { status: 'active' },
+          orderBy: [{ order: 'asc' }, { id: 'asc' }],
+        },
+      },
+    });
+
+    if (!integration) {
+      throw new NotFoundException('Webhook integration not found.');
+    }
+
+    return this.runActionsAndLog({
+      integration,
+      uuid: integration.public_uuid ?? log.public_uuid,
+      body: log.payload_raw,
+      remoteIp: null,
+      webhookHeaders: {},
+      startedAt: Date.now(),
+    });
+  }
+
   private async executeAction(
     action: any,
     body: any,
@@ -1300,6 +1406,10 @@ export class WebhookIntegrationService {
         duration_ms: input.durationMs,
         error_message: input.error ? this.extractErrorMessage(input.error) : null,
         payload_summary: summarizePayload(sanitizeSensitiveData(input.payload)),
+        // Store the full, unsanitized payload only for failed calls so they can
+        // be replayed faithfully from the Logs tab. Successful calls keep just
+        // the sanitized summary to limit secret exposure and storage.
+        payload_raw: input.status === 'failed' ? (input.payload ?? null) : null,
         response_summary: summarizePayload(sanitizeSensitiveData(input.response)),
       },
       select: {

package/dist/webhook-integration/webhook-command.registry.d.ts

@@ -1,22 +0,0 @@
-export interface WebhookCommandContext extends Record<string, unknown> {
-    webhookBody?: unknown;
-    webhookHeaders?: Record<string, unknown>;
-    remoteIp?: string | null;
-    publicUuid?: string;
-    integrationId?: number;
-}
-export interface WebhookCommand {
-    slug: string;
-    name: string;
-    description: string;
-    inputSchema: Record<string, unknown>;
-    handler: (params: Record<string, unknown>, context?: WebhookCommandContext) => Promise<unknown>;
-}
-export declare class WebhookCommandRegistry {
-    private readonly commands;
-    register(command: WebhookCommand): void;
-    find(slug: string): WebhookCommand | undefined;
-    list(): WebhookCommand[];
-    dispatch(slug: string, params: Record<string, unknown>, context?: WebhookCommandContext): Promise<unknown>;
-}
-//# sourceMappingURL=webhook-command.registry.d.ts.map

package/dist/webhook-integration/webhook-command.registry.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"webhook-command.registry.d.ts","sourceRoot":"","sources":["../../src/webhook-integration/webhook-command.registry.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,qBAAsB,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IACpE,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACzC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,OAAO,EAAE,CACP,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,OAAO,CAAC,EAAE,qBAAqB,KAC5B,OAAO,CAAC,OAAO,CAAC,CAAC;CACvB;AAED,qBACa,sBAAsB;IACjC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqC;IAE9D,QAAQ,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI;IAIvC,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IAI9C,IAAI,IAAI,cAAc,EAAE;IAIlB,QAAQ,CACZ,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,OAAO,CAAC,EAAE,qBAAqB,GAC9B,OAAO,CAAC,OAAO,CAAC;CAQpB"}

package/dist/webhook-integration/webhook-command.registry.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"webhook-command.registry.js","sourceRoot":"","sources":["../../src/webhook-integration/webhook-command.registry.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4C;AAsBrC,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAA5B;QACY,aAAQ,GAAG,IAAI,GAAG,EAA0B,CAAC;IA0BhE,CAAC;IAxBC,QAAQ,CAAC,OAAuB;QAC9B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED,IAAI,CAAC,IAAY;QACf,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAED,IAAI;QACF,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,IAAY,EACZ,MAA+B,EAC/B,OAA+B;QAE/B,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,6BAA6B,IAAI,EAAE,CAAC,CAAC;QACvD,CAAC;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC1C,CAAC;CACF,CAAA;AA3BY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,mBAAU,GAAE;GACA,sBAAsB,CA2BlC"}

package/src/menu/menu.service.spec.ts

@@ -1,247 +0,0 @@
-// import {
-//   PageOrderDirection,
-//   PaginationDTO,
-//   PaginationService,
-// } from '@hed-hog/api-pagination';
-// import { PrismaService } from '@hed-hog/api-prisma';
-// import { BadRequestException } from '@nestjs/common';
-// import { Test, TestingModule } from '@nestjs/testing';
-// import { MenuService } from './menu.service';
-
-// describe('MenuService', () => {
-//   let menuService: MenuService;
-//   let prismaService: PrismaService;
-//   let paginationService: PaginationService;
-
-//   const mockPrismaService = {
-//     menu: {
-//       create: jest.fn(),
-//       update: jest.fn(),
-//       deleteMany: jest.fn(),
-//       findUnique: jest.fn(),
-//       findMany: jest.fn(),
-//       count: jest.fn(),
-//     },
-//     role_menu: {
-//       deleteMany: jest.fn(),
-//       createMany: jest.fn(),
-//     },
-//     menu_screen: {
-//       deleteMany: jest.fn(),
-//       createMany: jest.fn(),
-//     },
-//   };
-
-//   const mockPaginationService = {
-//     paginate: jest.fn(),
-//     createInsensitiveSearch: jest.fn(),
-//   };
-
-//   beforeEach(async () => {
-//     const module: TestingModule = await Test.createTestingModule({
-//       providers: [
-//         MenuService,
-//         { provide: PrismaService, useValue: mockPrismaService },
-//         { provide: PaginationService, useValue: mockPaginationService },
-//       ],
-//     }).compile();
-
-//     menuService = module.get<MenuService>(MenuService);
-//     prismaService = module.get<PrismaService>(PrismaService);
-//     paginationService = module.get<PaginationService>(PaginationService);
-//   });
-
-//   afterEach(() => {
-//     jest.clearAllMocks();
-//   });
-
-//   describe('create', () => {
-//     it('should create a new menu', async () => {
-//       const createMenuDto = {
-//         name: 'Test Menu',
-//         url: '/test',
-//         icon: 'test-icon',
-//         order: 1,
-//         menu_id: undefined,
-//       };
-//       mockPrismaService.menu.create.mockResolvedValue(createMenuDto);
-
-//       const result = await menuService.create(createMenuDto);
-
-//       expect(result).toEqual(createMenuDto);
-//       expect(prismaService.menu.create).toHaveBeenCalledWith({
-//         data: createMenuDto,
-//       });
-//     });
-//   });
-
-//   describe('update', () => {
-//     it('should update a menu', async () => {
-//       const updateDto = { id: 1, data: { name: 'Updated Menu' } };
-//       mockPrismaService.menu.update.mockResolvedValue(updateDto.data);
-
-//       const result = await menuService.update(updateDto);
-
-//       expect(result).toEqual(updateDto.data);
-//       expect(prismaService.menu.update).toHaveBeenCalledWith({
-//         where: { id: updateDto.id },
-//         data: updateDto.data,
-//       });
-//     });
-//   });
-
-//   describe('delete', () => {
-//     it('should delete menu', async () => {
-//       const deleteDto = { ids: [1, 2, 3] };
-//       mockPrismaService.menu.deleteMany.mockResolvedValue({ count: 3 });
-
-//       const result = await menuService.delete(deleteDto);
-
-//       expect(result).toEqual({ count: 3 });
-//       expect(prismaService.menu.deleteMany).toHaveBeenCalledWith({
-//         where: { id: { in: deleteDto.ids } },
-//       });
-//     });
-
-//     it('should throw BadRequestException if no ids are provided', async () => {
-//       await expect(menuService.delete({ ids: null })).rejects.toThrow(
-//         BadRequestException,
-//       );
-//     });
-//   });
-
-//   describe('listScreens', () => {
-//     it('should paginate screens', async () => {
-//       const locale = 'en';
-//       const menuId = 1;
-//       const paginationParams: PaginationDTO = {
-//         page: 1,
-//         pageSize: 10,
-//         search: '',
-//         sortField: '',
-//         sortOrder: PageOrderDirection.Asc,
-//         fields: '',
-//       };
-
-//       const mockScreens = [{ id: 1, name: 'Screen 1' }];
-//       mockPaginationService.paginate.mockResolvedValue(mockScreens);
-
-//       const result = await menuService.listScreens(
-//         locale,
-//         menuId,
-//         paginationParams,
-//       );
-
-//       expect(result).toEqual(mockScreens);
-//       expect(paginationService.paginate).toHaveBeenCalledWith(
-//         prismaService.screens,
-//         paginationParams,
-//         expect.anything(),
-//         'screen_locale',
-//       );
-//     });
-//   });
-
-//   describe('updateScreens', () => {
-//     it('should update screens associated with a menu', async () => {
-//       const menuId = 1;
-//       const updateData = { ids: [1, 2, 3] };
-
-//       jest
-//         .spyOn(prismaService.menu_screen, 'deleteMany')
-//         .mockResolvedValue(null);
-//       jest
-//         .spyOn(prismaService.menu_screen, 'createMany')
-//         .mockResolvedValue(null);
-
-//       await menuService.updateScreens(menuId, updateData);
-
-//       expect(prismaService.menu_screen.deleteMany).toHaveBeenCalledWith({
-//         where: { menu_id: menuId },
-//       });
-
-//       expect(prismaService.menu_screen.createMany).toHaveBeenCalledWith({
-//         data: updateData.ids.map((screenId) => ({
-//           menu_id: menuId,
-//           screen_id: screenId,
-//         })),
-//         skipDuplicates: true,
-//       });
-//     });
-//   });
-
-//   describe('updateRoles', () => {
-//     it('should update role associated with a menu', async () => {
-//       const menuId = 1;
-//       const updateData = { ids: [1, 2] };
-
-//       jest.spyOn(prismaService.role_menu, 'deleteMany').mockResolvedValue(null);
-//       jest.spyOn(prismaService.role_menu, 'createMany').mockResolvedValue(null);
-
-//       await menuService.updateRoles(menuId, updateData);
-
-//       expect(prismaService.role_menu.deleteMany).toHaveBeenCalledWith({
-//         where: { menu_id: menuId },
-//       });
-
-//       expect(prismaService.role_menu.createMany).toHaveBeenCalledWith({
-//         data: updateData.ids.map((roleId) => ({
-//           menu_id: menuId,
-//           role_id: roleId,
-//         })),
-//         skipDuplicates: true,
-//       });
-//     });
-//   });
-
-//   describe('updateOrder', () => {
-//     it('should update the order of menu', async () => {
-//       const orderData = { ids: [1, 2, 3] };
-
-//       jest.spyOn(prismaService.menu, 'count').mockResolvedValue(3);
-//       jest.spyOn(prismaService.menu, 'update').mockResolvedValue(null);
-
-//       await menuService.updateOrder(orderData);
-
-//       expect(prismaService.menu.count).toHaveBeenCalledWith({
-//         where: { id: { in: orderData.ids } },
-//       });
-
-//       expect(prismaService.menu.update).toHaveBeenCalledTimes(
-//         orderData.ids.length,
-//       );
-
-//       orderData.ids.forEach((id, index) => {
-//         expect(prismaService.menu.update).toHaveBeenCalledWith({
-//           where: { id },
-//           data: { order: index + 1 },
-//         });
-//       });
-//     });
-
-//     it('should throw BadRequestException if IDs are invalid', async () => {
-//       const orderData = { ids: [1, 2, 3] };
-
-//       jest.spyOn(prismaService.menu, 'count').mockResolvedValue(2); // IDs não batem com o número esperado
-
-//       await expect(menuService.updateOrder(orderData)).rejects.toThrow(
-//         BadRequestException,
-//       );
-//     });
-//   });
-//   /*
-//   describe('getMenus', () => {
-//     it('should get menu for a user', async () => {
-//       const locale = 'en';
-//       const userId = 1;
-//       const mockMenus = [{ id: 1, name: 'Menu 1' }];
-//       mockPrismaService.menu.findMany.mockResolvedValue(mockMenus);
-
-//       const result = await menuService.getMenus(locale, userId);
-
-//       expect(result).toEqual(mockMenus);
-//       expect(prismaService.menu.findMany).toHaveBeenCalled();
-//     });
-//   });
-//   */
-// });