@hed-hog/core 0.0.368 → 0.0.371

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

@@ -1,117 +1,117 @@
-import { DeleteDTO } from '@hed-hog/api';
-import { PaginationDTO, PaginationService } from '@hed-hog/api-pagination';
-import { PrismaService } from '@hed-hog/api-prisma';
-import {
-  BadRequestException,
-  Injectable,
-  NotFoundException,
-} from '@nestjs/common';
-
-@Injectable()
-export class IntegrationEventCatalogService {
-  constructor(
-    private readonly prisma: PrismaService,
-    private readonly pagination: PaginationService,
-  ) {}
-
-  private get delegate() {
-    return (this.prisma as any).integration_event_catalog;
-  }
-
-  async list(paginationParams: PaginationDTO) {
-    const fields = ['slug', 'name', 'module', 'description', 'status'];
-    const OR = this.prisma.createInsensitiveSearch(fields, paginationParams);
-
-    return this.pagination.paginate(this.delegate, paginationParams, {
-      where: OR.length > 0 ? { OR } : {},
-      orderBy: [{ module: 'asc' }, { slug: 'asc' }],
-    });
-  }
-
-  async options() {
-    return this.delegate.findMany({
-      where: { status: 'active' },
-      orderBy: [{ module: 'asc' }, { slug: 'asc' }],
-      select: {
-        id: true,
-        slug: true,
-        name: true,
-        module: true,
-        description: true,
-      },
-    });
-  }
-
-  async get(id: number) {
-    const record = await this.delegate.findUnique({ where: { id } });
-    if (!record) {
-      throw new NotFoundException(`Event catalog item with id ${id} not found.`);
-    }
-    return record;
-  }
-
-  async create(data: any) {
-    await this.ensureSlugAvailable(data.slug);
-    return this.delegate.create({
-      data: this.normalize(data),
-    });
-  }
-
-  async update(id: number, data: any) {
-    const existing = await this.get(id);
-    if (data.slug && data.slug !== existing.slug) {
-      await this.ensureSlugAvailable(data.slug);
-    }
-
-    return this.delegate.update({
-      where: { id },
-      data: this.normalize(data, true),
-    });
-  }
-
-  async delete(data: DeleteDTO) {
-    if (!data.ids?.length) {
-      throw new BadRequestException('You must select at least one item to delete.');
-    }
-
-    return this.delegate.deleteMany({
-      where: { id: { in: data.ids } },
-    });
-  }
-
-  private async ensureSlugAvailable(slug: string) {
-    const existing = await this.delegate.findUnique({
-      where: { slug: String(slug || '').trim() },
-      select: { id: true },
-    });
-
-    if (existing) {
-      throw new BadRequestException(`Event "${slug}" already exists.`);
-    }
-  }
-
-  private normalize(data: any, partial = false) {
-    const normalized: Record<string, any> = {};
-    const assign = (key: string, value: any) => {
-      if (!partial || value !== undefined) {
-        normalized[key] = value;
-      }
-    };
-
-    assign('slug', String(data.slug ?? '').trim());
-    assign('name', String(data.name ?? '').trim());
-    assign('module', String(data.module ?? '').trim());
-    assign(
-      'description',
-      data.description === undefined || data.description === null
-        ? partial
-          ? undefined
-          : null
-        : String(data.description).trim() || null,
-    );
-    assign('status', data.status === 'inactive' ? 'inactive' : 'active');
-
-    return normalized;
-  }
-}
-
+import { DeleteDTO } from '@hed-hog/api';
+import { PaginationDTO, PaginationService } from '@hed-hog/api-pagination';
+import { PrismaService } from '@hed-hog/api-prisma';
+import {
+  BadRequestException,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
+
+@Injectable()
+export class IntegrationEventCatalogService {
+  constructor(
+    private readonly prisma: PrismaService,
+    private readonly pagination: PaginationService,
+  ) {}
+
+  private get delegate() {
+    return (this.prisma as any).integration_event_catalog;
+  }
+
+  async list(paginationParams: PaginationDTO) {
+    const fields = ['slug', 'name', 'module', 'description', 'status'];
+    const OR = this.prisma.createInsensitiveSearch(fields, paginationParams);
+
+    return this.pagination.paginate(this.delegate, paginationParams, {
+      where: OR.length > 0 ? { OR } : {},
+      orderBy: [{ module: 'asc' }, { slug: 'asc' }],
+    });
+  }
+
+  async options() {
+    return this.delegate.findMany({
+      where: { status: 'active' },
+      orderBy: [{ module: 'asc' }, { slug: 'asc' }],
+      select: {
+        id: true,
+        slug: true,
+        name: true,
+        module: true,
+        description: true,
+      },
+    });
+  }
+
+  async get(id: number) {
+    const record = await this.delegate.findUnique({ where: { id } });
+    if (!record) {
+      throw new NotFoundException(`Event catalog item with id ${id} not found.`);
+    }
+    return record;
+  }
+
+  async create(data: any) {
+    await this.ensureSlugAvailable(data.slug);
+    return this.delegate.create({
+      data: this.normalize(data),
+    });
+  }
+
+  async update(id: number, data: any) {
+    const existing = await this.get(id);
+    if (data.slug && data.slug !== existing.slug) {
+      await this.ensureSlugAvailable(data.slug);
+    }
+
+    return this.delegate.update({
+      where: { id },
+      data: this.normalize(data, true),
+    });
+  }
+
+  async delete(data: DeleteDTO) {
+    if (!data.ids?.length) {
+      throw new BadRequestException('You must select at least one item to delete.');
+    }
+
+    return this.delegate.deleteMany({
+      where: { id: { in: data.ids } },
+    });
+  }
+
+  private async ensureSlugAvailable(slug: string) {
+    const existing = await this.delegate.findUnique({
+      where: { slug: String(slug || '').trim() },
+      select: { id: true },
+    });
+
+    if (existing) {
+      throw new BadRequestException(`Event "${slug}" already exists.`);
+    }
+  }
+
+  private normalize(data: any, partial = false) {
+    const normalized: Record<string, any> = {};
+    const assign = (key: string, value: any) => {
+      if (!partial || value !== undefined) {
+        normalized[key] = value;
+      }
+    };
+
+    assign('slug', String(data.slug ?? '').trim());
+    assign('name', String(data.name ?? '').trim());
+    assign('module', String(data.module ?? '').trim());
+    assign(
+      'description',
+      data.description === undefined || data.description === null
+        ? partial
+          ? undefined
+          : null
+        : String(data.description).trim() || null,
+    );
+    assign('status', data.status === 'inactive' ? 'inactive' : 'active');
+
+    return normalized;
+  }
+}
+

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

@@ -129,6 +129,14 @@ export class WebhookIntegrationController {
   ) {
     return this.service.streamLogs(id, res);
   }
+
+  @Post(':id/log/:logId/retry')
+  retryLog(
+    @Param('id', ParseIntPipe) id: number,
+    @Param('logId', ParseIntPipe) logId: number,
+  ) {
+    return this.service.retryCall(id, logId);
+  }
 }
 
 @Public()
@@ -145,5 +153,20 @@ export class PublicWebhookController {
   ) {
     return this.service.executePublic(uuid, body, headers, req);
   }
+
+  /**
+   * GET variant so a webhook can be triggered by a plain clickable link (e.g.
+   * approve/reject links sent by email/WhatsApp). Query params are used as the
+   * payload for action templates (`{{body.decision}}` ← `?decision=approve`).
+   */
+  @Get(':uuid')
+  executeGet(
+    @Param('uuid') uuid: string,
+    @Query() query: any,
+    @Headers() headers: any,
+    @Req() req: Request,
+  ) {
+    return this.service.executePublic(uuid, query ?? {}, headers, req);
+  }
 }
 

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

@@ -3,6 +3,7 @@ import { PaginationModule } from '@hed-hog/api-pagination';
 import { PrismaModule } from '@hed-hog/api-prisma';
 import { HttpModule } from '@nestjs/axios';
 import { Module, forwardRef } from '@nestjs/common';
+import { AppCommandModule } from '../app-command/app-command.module';
 import { IntegrationModule } from '../integration/integration.module';
 import { MailModule } from '../mail/mail.module';
 import { McpModule } from '../mcp/mcp.module';
@@ -10,7 +11,6 @@ import { EventWebhookController } from './event-webhook.controller';
 import { EventWebhookService } from './event-webhook.service';
 import { IntegrationEventCatalogController } from './integration-event-catalog.controller';
 import { IntegrationEventCatalogService } from './integration-event-catalog.service';
-import { WebhookCommandRegistry } from './webhook-command.registry';
 import {
   PublicWebhookController,
   WebhookIntegrationController,
@@ -26,6 +26,7 @@ import { WebhookIntegrationService } from './webhook-integration.service';
     forwardRef(() => MailModule),
     forwardRef(() => MailMainModule),
     forwardRef(() => McpModule),
+    AppCommandModule,
   ],
   controllers: [
     IntegrationEventCatalogController,
@@ -35,13 +36,12 @@ import { WebhookIntegrationService } from './webhook-integration.service';
   ],
   providers: [
     IntegrationEventCatalogService,
-    WebhookCommandRegistry,
     WebhookIntegrationService,
     EventWebhookService,
   ],
   exports: [
     IntegrationEventCatalogService,
-    WebhookCommandRegistry,
+    AppCommandModule,
     WebhookIntegrationService,
     EventWebhookService,
   ],

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"}