@nestarc/webhook 0.9.0 → 0.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +117 -31
- package/dist/adapters/fetch-http-client.d.ts.map +1 -1
- package/dist/adapters/fetch-http-client.js +1 -1
- package/dist/adapters/fetch-http-client.js.map +1 -1
- package/dist/adapters/plaintext-secret-vault.d.ts.map +1 -1
- package/dist/adapters/plaintext-secret-vault.js +12 -2
- package/dist/adapters/plaintext-secret-vault.js.map +1 -1
- package/dist/adapters/prisma-delivery.repository.d.ts +8 -4
- package/dist/adapters/prisma-delivery.repository.d.ts.map +1 -1
- package/dist/adapters/prisma-delivery.repository.js +135 -77
- package/dist/adapters/prisma-delivery.repository.js.map +1 -1
- package/dist/adapters/prisma-endpoint.repository.d.ts +4 -3
- package/dist/adapters/prisma-endpoint.repository.d.ts.map +1 -1
- package/dist/adapters/prisma-endpoint.repository.js +39 -6
- package/dist/adapters/prisma-endpoint.repository.js.map +1 -1
- package/dist/index.d.ts +12 -7
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +9 -2
- package/dist/index.js.map +1 -1
- package/dist/interfaces/webhook-delivery.interface.d.ts +6 -2
- package/dist/interfaces/webhook-delivery.interface.d.ts.map +1 -1
- package/dist/interfaces/webhook-endpoint.interface.d.ts +11 -2
- package/dist/interfaces/webhook-endpoint.interface.d.ts.map +1 -1
- package/dist/interfaces/webhook-options.interface.d.ts +46 -8
- package/dist/interfaces/webhook-options.interface.d.ts.map +1 -1
- package/dist/ports/webhook-delivery.repository.d.ts +28 -10
- package/dist/ports/webhook-delivery.repository.d.ts.map +1 -1
- package/dist/ports/webhook-endpoint.repository.d.ts +24 -4
- package/dist/ports/webhook-endpoint.repository.d.ts.map +1 -1
- package/dist/ports/webhook-event.repository.d.ts +3 -1
- package/dist/ports/webhook-event.repository.d.ts.map +1 -1
- package/dist/ports/webhook-http-client.d.ts +4 -0
- package/dist/ports/webhook-http-client.d.ts.map +1 -1
- package/dist/ports/webhook-secret-vault.d.ts +1 -0
- package/dist/ports/webhook-secret-vault.d.ts.map +1 -1
- package/dist/webhook.admin.service.d.ts +4 -3
- package/dist/webhook.admin.service.d.ts.map +1 -1
- package/dist/webhook.admin.service.js +5 -2
- package/dist/webhook.admin.service.js.map +1 -1
- package/dist/webhook.circuit-breaker.d.ts +11 -4
- package/dist/webhook.circuit-breaker.d.ts.map +1 -1
- package/dist/webhook.circuit-breaker.js +80 -19
- package/dist/webhook.circuit-breaker.js.map +1 -1
- package/dist/webhook.constants.d.ts +9 -2
- package/dist/webhook.constants.d.ts.map +1 -1
- package/dist/webhook.constants.js +11 -4
- package/dist/webhook.constants.js.map +1 -1
- package/dist/webhook.delivery-worker.d.ts +7 -0
- package/dist/webhook.delivery-worker.d.ts.map +1 -1
- package/dist/webhook.delivery-worker.js +122 -42
- package/dist/webhook.delivery-worker.js.map +1 -1
- package/dist/webhook.dispatcher.d.ts +1 -0
- package/dist/webhook.dispatcher.d.ts.map +1 -1
- package/dist/webhook.dispatcher.js +13 -6
- package/dist/webhook.dispatcher.js.map +1 -1
- package/dist/webhook.endpoint-admin.service.d.ts +4 -1
- package/dist/webhook.endpoint-admin.service.d.ts.map +1 -1
- package/dist/webhook.endpoint-admin.service.js +36 -9
- package/dist/webhook.endpoint-admin.service.js.map +1 -1
- package/dist/webhook.module.d.ts.map +1 -1
- package/dist/webhook.module.js +22 -13
- package/dist/webhook.module.js.map +1 -1
- package/dist/webhook.retry-classifier.d.ts +3 -0
- package/dist/webhook.retry-classifier.d.ts.map +1 -0
- package/dist/webhook.retry-classifier.js +17 -0
- package/dist/webhook.retry-classifier.js.map +1 -0
- package/package.json +4 -4
- package/src/sql/create-webhook-tables.sql +1 -1
- package/src/sql/migrations/v0.9.0.sql +32 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.constants.d.ts","sourceRoot":"","sources":["../src/webhook.constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,sBAAsB,2BAA2B,CAAC;AAE/D,eAAO,MAAM,wBAAwB,6BAA6B,CAAC;AACnE,eAAO,MAAM,2BAA2B,gCAAgC,CAAC;AACzE,eAAO,MAAM,2BAA2B,gCAAgC,CAAC;AACzE,eAAO,MAAM,mBAAmB,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"webhook.constants.d.ts","sourceRoot":"","sources":["../src/webhook.constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,sBAAsB,2BAA2B,CAAC;AAE/D,eAAO,MAAM,wBAAwB,6BAA6B,CAAC;AACnE,eAAO,MAAM,2BAA2B,gCAAgC,CAAC;AACzE,eAAO,MAAM,2BAA2B,gCAAgC,CAAC;AACzE,eAAO,MAAM,mBAAmB,wBAAwB,CAAC;AACzD,eAAO,MAAM,oBAAoB,yBAAyB,CAAC;AAI3D,+DAA+D;AAC/D,eAAO,MAAM,wBAAwB,uCAM1B,CAAC;AAEZ,eAAO,MAAM,wBAAwB,QAAS,CAAC;AAC/C,eAAO,MAAM,mBAAmB,IAAI,CAAC;AACrC,eAAO,MAAM,qBAAqB,MAAM,CAAC;AAEzC,eAAO,MAAM,iCAAiC,IAAI,CAAC;AACnD,eAAO,MAAM,wCAAwC,KAAK,CAAC;AAC3D,eAAO,MAAM,sDAAsD,EACjE,+BAAwC,CAAC;AAC3C,MAAM,MAAM,sBAAsB,GAChC,OAAO,sDAAsD,CAAC;AAEhE,eAAO,MAAM,wBAAwB,OAAQ,CAAC;AAC9C,eAAO,MAAM,0BAA0B,KAAK,CAAC;AAC7C,eAAO,MAAM,6BAA6B,IAAI,CAAC;AAE/C,qFAAqF;AACrF,eAAO,MAAM,wBAAwB,OAAO,CAAC;AAC7C,qGAAqG;AACrG,eAAO,MAAM,gCAAgC,OAA2B,CAAC;AACzE,eAAO,MAAM,kBAAkB,QAAwC,CAAC"}
|
|
@@ -1,26 +1,33 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.RESPONSE_BODY_MAX_LENGTH = exports.DEFAULT_STALE_SENDING_MINUTES = exports.DEFAULT_POLLING_BATCH_SIZE = exports.DEFAULT_POLLING_INTERVAL = exports.DEFAULT_CIRCUIT_BREAKER_COOLDOWN_MINUTES = exports.DEFAULT_CIRCUIT_BREAKER_THRESHOLD = exports.DEFAULT_JITTER_FACTOR = exports.DEFAULT_MAX_RETRIES = exports.DEFAULT_DELIVERY_TIMEOUT = exports.DEFAULT_BACKOFF_SCHEDULE = exports.WEBHOOK_HTTP_CLIENT = exports.WEBHOOK_DELIVERY_REPOSITORY = exports.WEBHOOK_ENDPOINT_REPOSITORY = exports.WEBHOOK_EVENT_REPOSITORY = exports.WEBHOOK_MODULE_OPTIONS = void 0;
|
|
3
|
+
exports.DEFAULT_USER_AGENT = exports.ATTEMPT_RESPONSE_BODY_MAX_LENGTH = exports.RESPONSE_BODY_MAX_LENGTH = exports.DEFAULT_STALE_SENDING_MINUTES = exports.DEFAULT_POLLING_BATCH_SIZE = exports.DEFAULT_POLLING_INTERVAL = exports.ENDPOINT_DISABLED_REASON_CONSECUTIVE_FAILURES_EXCEEDED = exports.DEFAULT_CIRCUIT_BREAKER_COOLDOWN_MINUTES = exports.DEFAULT_CIRCUIT_BREAKER_THRESHOLD = exports.DEFAULT_JITTER_FACTOR = exports.DEFAULT_MAX_RETRIES = exports.DEFAULT_DELIVERY_TIMEOUT = exports.DEFAULT_BACKOFF_SCHEDULE = exports.WEBHOOK_SECRET_VAULT = exports.WEBHOOK_HTTP_CLIENT = exports.WEBHOOK_DELIVERY_REPOSITORY = exports.WEBHOOK_ENDPOINT_REPOSITORY = exports.WEBHOOK_EVENT_REPOSITORY = exports.WEBHOOK_MODULE_OPTIONS = void 0;
|
|
4
4
|
exports.WEBHOOK_MODULE_OPTIONS = 'WEBHOOK_MODULE_OPTIONS';
|
|
5
5
|
exports.WEBHOOK_EVENT_REPOSITORY = 'WEBHOOK_EVENT_REPOSITORY';
|
|
6
6
|
exports.WEBHOOK_ENDPOINT_REPOSITORY = 'WEBHOOK_ENDPOINT_REPOSITORY';
|
|
7
7
|
exports.WEBHOOK_DELIVERY_REPOSITORY = 'WEBHOOK_DELIVERY_REPOSITORY';
|
|
8
8
|
exports.WEBHOOK_HTTP_CLIENT = 'WEBHOOK_HTTP_CLIENT';
|
|
9
|
+
exports.WEBHOOK_SECRET_VAULT = 'WEBHOOK_SECRET_VAULT';
|
|
10
|
+
const { version: PACKAGE_VERSION } = require('../package.json');
|
|
9
11
|
/** Svix/Stripe-style exponential backoff schedule (seconds) */
|
|
10
|
-
exports.DEFAULT_BACKOFF_SCHEDULE = [
|
|
12
|
+
exports.DEFAULT_BACKOFF_SCHEDULE = Object.freeze([
|
|
11
13
|
30, // 30 seconds
|
|
12
14
|
300, // 5 minutes
|
|
13
15
|
1800, // 30 minutes
|
|
14
16
|
7200, // 2 hours
|
|
15
17
|
86400, // 24 hours
|
|
16
|
-
];
|
|
18
|
+
]);
|
|
17
19
|
exports.DEFAULT_DELIVERY_TIMEOUT = 10_000;
|
|
18
20
|
exports.DEFAULT_MAX_RETRIES = 5;
|
|
19
21
|
exports.DEFAULT_JITTER_FACTOR = 0.1;
|
|
20
22
|
exports.DEFAULT_CIRCUIT_BREAKER_THRESHOLD = 5;
|
|
21
23
|
exports.DEFAULT_CIRCUIT_BREAKER_COOLDOWN_MINUTES = 60;
|
|
24
|
+
exports.ENDPOINT_DISABLED_REASON_CONSECUTIVE_FAILURES_EXCEEDED = 'consecutive_failures_exceeded';
|
|
22
25
|
exports.DEFAULT_POLLING_INTERVAL = 5_000;
|
|
23
26
|
exports.DEFAULT_POLLING_BATCH_SIZE = 50;
|
|
24
27
|
exports.DEFAULT_STALE_SENDING_MINUTES = 5;
|
|
25
|
-
|
|
28
|
+
/** Max JavaScript string length (UTF-16 code units) retained for response bodies. */
|
|
29
|
+
exports.RESPONSE_BODY_MAX_LENGTH = 4096;
|
|
30
|
+
/** Mirrors RESPONSE_BODY_MAX_LENGTH for attempt logs; kept separate for future schema divergence. */
|
|
31
|
+
exports.ATTEMPT_RESPONSE_BODY_MAX_LENGTH = exports.RESPONSE_BODY_MAX_LENGTH;
|
|
32
|
+
exports.DEFAULT_USER_AGENT = `@nestarc/webhook/${PACKAGE_VERSION}`;
|
|
26
33
|
//# sourceMappingURL=webhook.constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.constants.js","sourceRoot":"","sources":["../src/webhook.constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,sBAAsB,GAAG,wBAAwB,CAAC;AAElD,QAAA,wBAAwB,GAAG,0BAA0B,CAAC;AACtD,QAAA,2BAA2B,GAAG,6BAA6B,CAAC;AAC5D,QAAA,2BAA2B,GAAG,6BAA6B,CAAC;AAC5D,QAAA,mBAAmB,GAAG,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"webhook.constants.js","sourceRoot":"","sources":["../src/webhook.constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,sBAAsB,GAAG,wBAAwB,CAAC;AAElD,QAAA,wBAAwB,GAAG,0BAA0B,CAAC;AACtD,QAAA,2BAA2B,GAAG,6BAA6B,CAAC;AAC5D,QAAA,2BAA2B,GAAG,6BAA6B,CAAC;AAC5D,QAAA,mBAAmB,GAAG,qBAAqB,CAAC;AAC5C,QAAA,oBAAoB,GAAG,sBAAsB,CAAC;AAE3D,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAwB,CAAC;AAEvF,+DAA+D;AAClD,QAAA,wBAAwB,GAAG,MAAM,CAAC,MAAM,CAAC;IACpD,EAAE,EAAM,aAAa;IACrB,GAAG,EAAK,YAAY;IACpB,IAAI,EAAI,aAAa;IACrB,IAAI,EAAI,UAAU;IAClB,KAAK,EAAG,WAAW;CACX,CAAC,CAAC;AAEC,QAAA,wBAAwB,GAAG,MAAM,CAAC;AAClC,QAAA,mBAAmB,GAAG,CAAC,CAAC;AACxB,QAAA,qBAAqB,GAAG,GAAG,CAAC;AAE5B,QAAA,iCAAiC,GAAG,CAAC,CAAC;AACtC,QAAA,wCAAwC,GAAG,EAAE,CAAC;AAC9C,QAAA,sDAAsD,GACjE,+BAAwC,CAAC;AAI9B,QAAA,wBAAwB,GAAG,KAAK,CAAC;AACjC,QAAA,0BAA0B,GAAG,EAAE,CAAC;AAChC,QAAA,6BAA6B,GAAG,CAAC,CAAC;AAE/C,qFAAqF;AACxE,QAAA,wBAAwB,GAAG,IAAI,CAAC;AAC7C,qGAAqG;AACxF,QAAA,gCAAgC,GAAG,gCAAwB,CAAC;AAC5D,QAAA,kBAAkB,GAAG,oBAAoB,eAAe,EAAE,CAAC"}
|
|
@@ -15,11 +15,18 @@ export declare class WebhookDeliveryWorker implements OnModuleDestroy {
|
|
|
15
15
|
private readonly staleSendingMinutes;
|
|
16
16
|
private isShuttingDown;
|
|
17
17
|
private isPolling;
|
|
18
|
+
private activePollCycle;
|
|
18
19
|
private activeDeliveries;
|
|
19
20
|
constructor(deliveryRepo: WebhookDeliveryRepository, dispatcher: WebhookDispatcher, retryPolicy: WebhookRetryPolicy, circuitBreaker: WebhookCircuitBreaker, options: WebhookModuleOptions);
|
|
20
21
|
poll(): Promise<void>;
|
|
22
|
+
private runPollCycle;
|
|
21
23
|
private processDelivery;
|
|
24
|
+
private updateCircuitBreakerAfterDelivery;
|
|
25
|
+
private fireDeliveryRetryScheduledHook;
|
|
22
26
|
private fireDeliveryFailedHook;
|
|
27
|
+
private classifyExceptionFailure;
|
|
28
|
+
private classifyResultFailure;
|
|
29
|
+
private logError;
|
|
23
30
|
onModuleDestroy(): Promise<void>;
|
|
24
31
|
}
|
|
25
32
|
//# sourceMappingURL=webhook.delivery-worker.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.delivery-worker.d.ts","sourceRoot":"","sources":["../src/webhook.delivery-worker.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAO5D,OAAO,EAEL,oBAAoB,EACrB,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"webhook.delivery-worker.d.ts","sourceRoot":"","sources":["../src/webhook.delivery-worker.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAO5D,OAAO,EAEL,oBAAoB,EACrB,MAAM,wCAAwC,CAAC;AAEhD,OAAO,EAEL,yBAAyB,EAC1B,MAAM,qCAAqC,CAAC;AAc7C,qBACa,qBAAsB,YAAW,eAAe;IAWzD,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAE/B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAf1B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0C;IACjE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAS;IAC7C,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,eAAe,CAA8B;IACrD,OAAO,CAAC,gBAAgB,CAAK;gBAIV,YAAY,EAAE,yBAAyB,EACvC,UAAU,EAAE,iBAAiB,EAC7B,WAAW,EAAE,kBAAkB,EAC/B,cAAc,EAAE,qBAAqB,EAErC,OAAO,EAAE,oBAAoB;IAO1C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;YAiBb,YAAY;YA6BZ,eAAe;YAgHf,iCAAiC;IAkB/C,OAAO,CAAC,8BAA8B;IAgCtC,OAAO,CAAC,sBAAsB;IA8B9B,OAAO,CAAC,wBAAwB;IAgBhC,OAAO,CAAC,qBAAqB;IAM7B,OAAO,CAAC,QAAQ;IAQV,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;CAqBvC"}
|
|
@@ -19,6 +19,7 @@ const webhook_circuit_breaker_1 = require("./webhook.circuit-breaker");
|
|
|
19
19
|
const webhook_dispatcher_1 = require("./webhook.dispatcher");
|
|
20
20
|
const webhook_retry_policy_1 = require("./webhook.retry-policy");
|
|
21
21
|
const webhook_constants_1 = require("./webhook.constants");
|
|
22
|
+
const webhook_retry_classifier_1 = require("./webhook.retry-classifier");
|
|
22
23
|
const webhook_url_validator_1 = require("./webhook.url-validator");
|
|
23
24
|
let WebhookDeliveryWorker = WebhookDeliveryWorker_1 = class WebhookDeliveryWorker {
|
|
24
25
|
deliveryRepo;
|
|
@@ -31,6 +32,7 @@ let WebhookDeliveryWorker = WebhookDeliveryWorker_1 = class WebhookDeliveryWorke
|
|
|
31
32
|
staleSendingMinutes;
|
|
32
33
|
isShuttingDown = false;
|
|
33
34
|
isPolling = false;
|
|
35
|
+
activePollCycle = null;
|
|
34
36
|
activeDeliveries = 0;
|
|
35
37
|
constructor(deliveryRepo, dispatcher, retryPolicy, circuitBreaker, options) {
|
|
36
38
|
this.deliveryRepo = deliveryRepo;
|
|
@@ -48,6 +50,19 @@ let WebhookDeliveryWorker = WebhookDeliveryWorker_1 = class WebhookDeliveryWorke
|
|
|
48
50
|
if (this.isPolling)
|
|
49
51
|
return;
|
|
50
52
|
this.isPolling = true;
|
|
53
|
+
const pollCycle = this.runPollCycle();
|
|
54
|
+
this.activePollCycle = pollCycle;
|
|
55
|
+
try {
|
|
56
|
+
await pollCycle;
|
|
57
|
+
}
|
|
58
|
+
finally {
|
|
59
|
+
if (this.activePollCycle === pollCycle) {
|
|
60
|
+
this.activePollCycle = null;
|
|
61
|
+
}
|
|
62
|
+
this.isPolling = false;
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
async runPollCycle() {
|
|
51
66
|
try {
|
|
52
67
|
await this.circuitBreaker.recoverEligibleEndpoints();
|
|
53
68
|
// Recover deliveries stuck in SENDING from crashed workers
|
|
@@ -62,40 +77,41 @@ let WebhookDeliveryWorker = WebhookDeliveryWorker_1 = class WebhookDeliveryWorke
|
|
|
62
77
|
await Promise.all(deliveries.map((delivery) => this.processDelivery(delivery)));
|
|
63
78
|
}
|
|
64
79
|
catch (error) {
|
|
65
|
-
this.
|
|
66
|
-
}
|
|
67
|
-
finally {
|
|
68
|
-
this.isPolling = false;
|
|
80
|
+
this.logError('Poll cycle failed', error);
|
|
69
81
|
}
|
|
70
82
|
}
|
|
71
83
|
async processDelivery(delivery) {
|
|
72
84
|
this.activeDeliveries++;
|
|
85
|
+
let dispatchReturned = false;
|
|
73
86
|
try {
|
|
74
87
|
const result = await this.dispatcher.dispatch(delivery);
|
|
88
|
+
dispatchReturned = true;
|
|
75
89
|
const newAttempts = delivery.attempts + 1;
|
|
76
90
|
// Persist delivery state — if this fails, catch resets to PENDING (safe)
|
|
91
|
+
const retryable = (0, webhook_retry_classifier_1.isRetryableDeliveryResult)(result);
|
|
77
92
|
if (result.success) {
|
|
78
93
|
await this.deliveryRepo.markSent(delivery.id, newAttempts, result);
|
|
79
94
|
}
|
|
80
|
-
else if (
|
|
95
|
+
else if (!retryable) {
|
|
96
|
+
await this.deliveryRepo.markFailed(delivery.id, newAttempts, result);
|
|
97
|
+
this.logger.warn(`Delivery ${delivery.id} failed with non-retryable HTTP status ${result.statusCode} (${newAttempts}/${delivery.maxAttempts})`);
|
|
98
|
+
this.fireDeliveryFailedHook(delivery, newAttempts, result.error ?? null, result.statusCode ?? null, this.classifyResultFailure(result));
|
|
99
|
+
}
|
|
100
|
+
else if (newAttempts >= delivery.maxAttempts) {
|
|
81
101
|
await this.deliveryRepo.markFailed(delivery.id, newAttempts, result);
|
|
82
|
-
this.logger.warn(`Delivery ${delivery.id} exhausted retries (${newAttempts}/${delivery.
|
|
83
|
-
this.fireDeliveryFailedHook(delivery, newAttempts, result.error ?? null, result.statusCode ?? null,
|
|
102
|
+
this.logger.warn(`Delivery ${delivery.id} exhausted retries (${newAttempts}/${delivery.maxAttempts})`);
|
|
103
|
+
this.fireDeliveryFailedHook(delivery, newAttempts, result.error ?? null, result.statusCode ?? null, this.classifyResultFailure(result));
|
|
84
104
|
}
|
|
85
105
|
else {
|
|
86
106
|
const nextAt = this.retryPolicy.nextAttemptAt(newAttempts);
|
|
87
107
|
await this.deliveryRepo.markRetry(delivery.id, newAttempts, nextAt, result);
|
|
108
|
+
this.fireDeliveryRetryScheduledHook(delivery, newAttempts, nextAt, result.error ?? null, result.statusCode ?? null, this.classifyResultFailure(result));
|
|
88
109
|
}
|
|
89
110
|
// Circuit breaker — failure here must NOT revert delivery state
|
|
90
|
-
|
|
91
|
-
await this.circuitBreaker.afterDelivery(delivery.endpoint_id, result.success, { tenantId: delivery.tenant_id, url: delivery.url });
|
|
92
|
-
}
|
|
93
|
-
catch (cbError) {
|
|
94
|
-
this.logger.error(`Circuit breaker update failed for ${delivery.endpoint_id}: ${cbError}`);
|
|
95
|
-
}
|
|
111
|
+
await this.updateCircuitBreakerAfterDelivery(delivery, result.success);
|
|
96
112
|
}
|
|
97
113
|
catch (error) {
|
|
98
|
-
this.
|
|
114
|
+
this.logError(`Delivery ${delivery.id} processing error`, error);
|
|
99
115
|
// Increment attempts and apply backoff — never reset without accounting
|
|
100
116
|
try {
|
|
101
117
|
const newAttempts = delivery.attempts + 1;
|
|
@@ -104,58 +120,122 @@ let WebhookDeliveryWorker = WebhookDeliveryWorker_1 = class WebhookDeliveryWorke
|
|
|
104
120
|
latencyMs: 0,
|
|
105
121
|
error: error instanceof Error ? error.message : String(error),
|
|
106
122
|
};
|
|
107
|
-
|
|
123
|
+
const meta = this.classifyExceptionFailure(error, delivery);
|
|
124
|
+
const dispatcherException = !dispatchReturned;
|
|
125
|
+
if (newAttempts >= delivery.maxAttempts) {
|
|
108
126
|
await this.deliveryRepo.markFailed(delivery.id, newAttempts, errorResult);
|
|
109
|
-
this.logger.warn(`Delivery ${delivery.id} exhausted retries on exception (${newAttempts}/${delivery.
|
|
110
|
-
const meta = error instanceof webhook_url_validator_1.WebhookUrlValidationError
|
|
111
|
-
? {
|
|
112
|
-
failureKind: 'url_validation',
|
|
113
|
-
validationReason: error.reason,
|
|
114
|
-
validationUrl: error.url ?? delivery.url,
|
|
115
|
-
resolvedIp: error.resolvedIp,
|
|
116
|
-
}
|
|
117
|
-
: { failureKind: 'dispatch_error' };
|
|
127
|
+
this.logger.warn(`Delivery ${delivery.id} exhausted retries on exception (${newAttempts}/${delivery.maxAttempts})`);
|
|
118
128
|
this.fireDeliveryFailedHook(delivery, newAttempts, errorResult.error ?? null, null, meta);
|
|
129
|
+
if (dispatcherException) {
|
|
130
|
+
await this.updateCircuitBreakerAfterDelivery(delivery, false);
|
|
131
|
+
}
|
|
119
132
|
}
|
|
120
133
|
else {
|
|
121
134
|
const nextAt = this.retryPolicy.nextAttemptAt(newAttempts);
|
|
122
135
|
await this.deliveryRepo.markRetry(delivery.id, newAttempts, nextAt, errorResult);
|
|
136
|
+
if (dispatcherException) {
|
|
137
|
+
this.fireDeliveryRetryScheduledHook(delivery, newAttempts, nextAt, errorResult.error ?? null, null, meta);
|
|
138
|
+
await this.updateCircuitBreakerAfterDelivery(delivery, false);
|
|
139
|
+
}
|
|
123
140
|
}
|
|
124
141
|
}
|
|
125
142
|
catch (fallbackError) {
|
|
126
|
-
this.
|
|
143
|
+
this.logError(`Delivery ${delivery.id} fallback error handling failed`, fallbackError);
|
|
127
144
|
}
|
|
128
145
|
}
|
|
129
146
|
finally {
|
|
130
147
|
this.activeDeliveries--;
|
|
131
148
|
}
|
|
132
149
|
}
|
|
150
|
+
async updateCircuitBreakerAfterDelivery(delivery, success) {
|
|
151
|
+
try {
|
|
152
|
+
await this.circuitBreaker.afterDelivery(delivery.endpointId, success, { tenantId: delivery.tenantId, url: delivery.url });
|
|
153
|
+
}
|
|
154
|
+
catch (cbError) {
|
|
155
|
+
this.logError(`Circuit breaker update failed for ${delivery.endpointId}`, cbError);
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
fireDeliveryRetryScheduledHook(delivery, attempts, nextAttemptAt, lastError, responseStatus, meta = {}) {
|
|
159
|
+
if (!this.options.onDeliveryRetryScheduled)
|
|
160
|
+
return;
|
|
161
|
+
try {
|
|
162
|
+
void Promise.resolve(this.options.onDeliveryRetryScheduled({
|
|
163
|
+
deliveryId: delivery.id,
|
|
164
|
+
endpointId: delivery.endpointId,
|
|
165
|
+
eventId: delivery.eventId,
|
|
166
|
+
tenantId: delivery.tenantId,
|
|
167
|
+
attempts,
|
|
168
|
+
maxAttempts: delivery.maxAttempts,
|
|
169
|
+
nextAttemptAt,
|
|
170
|
+
lastError,
|
|
171
|
+
responseStatus,
|
|
172
|
+
...meta,
|
|
173
|
+
})).catch((hookError) => {
|
|
174
|
+
this.logError('onDeliveryRetryScheduled callback error', hookError);
|
|
175
|
+
});
|
|
176
|
+
}
|
|
177
|
+
catch (hookError) {
|
|
178
|
+
this.logError('onDeliveryRetryScheduled callback error', hookError);
|
|
179
|
+
}
|
|
180
|
+
}
|
|
133
181
|
fireDeliveryFailedHook(delivery, attempts, lastError, responseStatus, meta = {}) {
|
|
134
182
|
if (!this.options.onDeliveryFailed)
|
|
135
183
|
return;
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
184
|
+
try {
|
|
185
|
+
void Promise.resolve(this.options.onDeliveryFailed({
|
|
186
|
+
deliveryId: delivery.id,
|
|
187
|
+
endpointId: delivery.endpointId,
|
|
188
|
+
eventId: delivery.eventId,
|
|
189
|
+
tenantId: delivery.tenantId,
|
|
190
|
+
attempts,
|
|
191
|
+
maxAttempts: delivery.maxAttempts,
|
|
192
|
+
lastError,
|
|
193
|
+
responseStatus,
|
|
194
|
+
...meta,
|
|
195
|
+
})).catch((hookError) => {
|
|
196
|
+
this.logError('onDeliveryFailed callback error', hookError);
|
|
197
|
+
});
|
|
198
|
+
}
|
|
199
|
+
catch (hookError) {
|
|
200
|
+
this.logError('onDeliveryFailed callback error', hookError);
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
classifyExceptionFailure(error, delivery) {
|
|
204
|
+
if (error instanceof webhook_url_validator_1.WebhookUrlValidationError) {
|
|
205
|
+
return {
|
|
206
|
+
failureKind: 'url_validation',
|
|
207
|
+
validationReason: error.reason,
|
|
208
|
+
validationUrl: error.url ?? delivery.url,
|
|
209
|
+
resolvedIp: error.resolvedIp,
|
|
210
|
+
};
|
|
211
|
+
}
|
|
212
|
+
return { failureKind: 'dispatch_error' };
|
|
213
|
+
}
|
|
214
|
+
classifyResultFailure(result) {
|
|
215
|
+
return {
|
|
216
|
+
failureKind: result.statusCode == null ? 'dispatch_error' : 'http_error',
|
|
217
|
+
};
|
|
218
|
+
}
|
|
219
|
+
logError(message, error) {
|
|
220
|
+
if (error instanceof Error) {
|
|
221
|
+
this.logger.error(`${message}: ${error.message}`, error.stack);
|
|
222
|
+
return;
|
|
223
|
+
}
|
|
224
|
+
this.logger.error(`${message}: ${String(error)}`);
|
|
149
225
|
}
|
|
150
226
|
async onModuleDestroy() {
|
|
151
227
|
this.isShuttingDown = true;
|
|
152
228
|
this.logger.log('Shutting down delivery worker...');
|
|
153
229
|
const deadline = Date.now() + 30_000;
|
|
154
|
-
while (this.activeDeliveries > 0 &&
|
|
155
|
-
|
|
230
|
+
while ((this.activePollCycle || this.activeDeliveries > 0) &&
|
|
231
|
+
Date.now() < deadline) {
|
|
232
|
+
await Promise.race([
|
|
233
|
+
this.activePollCycle ?? new Promise((resolve) => setTimeout(resolve, 100)),
|
|
234
|
+
new Promise((resolve) => setTimeout(resolve, 100)),
|
|
235
|
+
]);
|
|
156
236
|
}
|
|
157
|
-
if (this.activeDeliveries > 0) {
|
|
158
|
-
this.logger.warn(`Shutdown with ${this.activeDeliveries} active deliveries`);
|
|
237
|
+
if (this.activePollCycle || this.activeDeliveries > 0) {
|
|
238
|
+
this.logger.warn(`Shutdown with ${this.activeDeliveries} active deliveries and an unfinished poll cycle`);
|
|
159
239
|
}
|
|
160
240
|
}
|
|
161
241
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.delivery-worker.js","sourceRoot":"","sources":["../src/webhook.delivery-worker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAA6E;AAC7E,uEAAkE;AAClE,6DAAyD;AACzD,iEAA4D;AAC5D,2DAK6B;
|
|
1
|
+
{"version":3,"file":"webhook.delivery-worker.js","sourceRoot":"","sources":["../src/webhook.delivery-worker.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,5 +10,6 @@ export declare class WebhookDispatcher {
|
|
|
10
10
|
private readonly allowPrivateUrls;
|
|
11
11
|
constructor(signer: WebhookSigner, httpClient: WebhookHttpClient, options: WebhookModuleOptions);
|
|
12
12
|
dispatch(delivery: PendingDelivery): Promise<DeliveryResult>;
|
|
13
|
+
private parseDeliveryUrl;
|
|
13
14
|
}
|
|
14
15
|
//# sourceMappingURL=webhook.dispatcher.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.dispatcher.d.ts","sourceRoot":"","sources":["../src/webhook.dispatcher.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"webhook.dispatcher.d.ts","sourceRoot":"","sources":["../src/webhook.dispatcher.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAMjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;AAC9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAMtE,qBACa,iBAAiB;IAK1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IAEvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAN7B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAU;gBAGxB,MAAM,EAAE,aAAa,EAErB,UAAU,EAAE,iBAAiB,EAE9C,OAAO,EAAE,oBAAoB;IAMzB,QAAQ,CAAC,QAAQ,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC;IAwBlE,OAAO,CAAC,gBAAgB;CAWzB"}
|
|
@@ -16,7 +16,6 @@ exports.WebhookDispatcher = void 0;
|
|
|
16
16
|
const common_1 = require("@nestjs/common");
|
|
17
17
|
const webhook_signer_1 = require("./webhook.signer");
|
|
18
18
|
const webhook_constants_1 = require("./webhook.constants");
|
|
19
|
-
const webhook_constants_2 = require("./webhook.constants");
|
|
20
19
|
const webhook_url_validator_1 = require("./webhook.url-validator");
|
|
21
20
|
let WebhookDispatcher = class WebhookDispatcher {
|
|
22
21
|
signer;
|
|
@@ -26,23 +25,31 @@ let WebhookDispatcher = class WebhookDispatcher {
|
|
|
26
25
|
constructor(signer, httpClient, options) {
|
|
27
26
|
this.signer = signer;
|
|
28
27
|
this.httpClient = httpClient;
|
|
29
|
-
this.timeout = options.delivery?.timeout ??
|
|
28
|
+
this.timeout = options.delivery?.timeout ?? webhook_constants_1.DEFAULT_DELIVERY_TIMEOUT;
|
|
30
29
|
this.allowPrivateUrls = options.allowPrivateUrls ?? false;
|
|
31
30
|
}
|
|
32
31
|
async dispatch(delivery) {
|
|
32
|
+
const parsedUrl = this.parseDeliveryUrl(delivery.url);
|
|
33
33
|
// DNS rebinding defense — validate resolved IPs before every dispatch
|
|
34
34
|
if (!this.allowPrivateUrls) {
|
|
35
|
-
|
|
36
|
-
await (0, webhook_url_validator_1.resolveAndValidateHost)(hostname);
|
|
35
|
+
await (0, webhook_url_validator_1.resolveAndValidateHost)(parsedUrl.hostname, delivery.url);
|
|
37
36
|
}
|
|
38
37
|
const body = JSON.stringify({
|
|
39
|
-
type: delivery.
|
|
38
|
+
type: delivery.eventType,
|
|
40
39
|
data: delivery.payload,
|
|
41
40
|
});
|
|
42
41
|
const timestamp = Math.floor(Date.now() / 1000);
|
|
43
|
-
const headers = this.signer.signAll(delivery.
|
|
42
|
+
const headers = this.signer.signAll(delivery.eventId, timestamp, body, [delivery.secret, ...delivery.additionalSecrets]);
|
|
44
43
|
return this.httpClient.post(delivery.url, headers, body, this.timeout);
|
|
45
44
|
}
|
|
45
|
+
parseDeliveryUrl(url) {
|
|
46
|
+
try {
|
|
47
|
+
return new URL(url);
|
|
48
|
+
}
|
|
49
|
+
catch {
|
|
50
|
+
throw new webhook_url_validator_1.WebhookUrlValidationError(`Invalid webhook URL: unable to parse "${url}"`, 'parse', url);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
46
53
|
};
|
|
47
54
|
exports.WebhookDispatcher = WebhookDispatcher;
|
|
48
55
|
exports.WebhookDispatcher = WebhookDispatcher = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.dispatcher.js","sourceRoot":"","sources":["../src/webhook.dispatcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,qDAAiD;AACjD,
|
|
1
|
+
{"version":3,"file":"webhook.dispatcher.js","sourceRoot":"","sources":["../src/webhook.dispatcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,qDAAiD;AACjD,2DAI6B;AAK7B,mEAGiC;AAG1B,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAKT;IAEA;IANF,OAAO,CAAS;IAChB,gBAAgB,CAAU;IAE3C,YACmB,MAAqB,EAErB,UAA6B,EAE9C,OAA6B;QAJZ,WAAM,GAAN,MAAM,CAAe;QAErB,eAAU,GAAV,UAAU,CAAmB;QAI9C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,QAAQ,EAAE,OAAO,IAAI,4CAAwB,CAAC;QACrE,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,IAAI,KAAK,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,QAAyB;QACtC,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAEtD,sEAAsE;QACtE,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC3B,MAAM,IAAA,8CAAsB,EAAC,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;QACjE,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;YAC1B,IAAI,EAAE,QAAQ,CAAC,SAAS;YACxB,IAAI,EAAE,QAAQ,CAAC,OAAO;SACvB,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;QAChD,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CACjC,QAAQ,CAAC,OAAO,EAChB,SAAS,EACT,IAAI,EACJ,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,QAAQ,CAAC,iBAAiB,CAAC,CACjD,CAAC;QAEF,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACzE,CAAC;IAEO,gBAAgB,CAAC,GAAW;QAClC,IAAI,CAAC;YACH,OAAO,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,iDAAyB,CACjC,yCAAyC,GAAG,GAAG,EAC/C,OAAO,EACP,GAAG,CACJ,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAA;AAlDY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;IAOR,WAAA,IAAA,eAAM,EAAC,uCAAmB,CAAC,CAAA;IAE3B,WAAA,IAAA,eAAM,EAAC,0CAAsB,CAAC,CAAA;qCAHN,8BAAa;GAL7B,iBAAiB,CAkD7B"}
|
|
@@ -3,7 +3,7 @@ import { WebhookModuleOptions } from './interfaces/webhook-options.interface';
|
|
|
3
3
|
import { WebhookEndpointRepository } from './ports/webhook-endpoint.repository';
|
|
4
4
|
import { WebhookEventRepository } from './ports/webhook-event.repository';
|
|
5
5
|
import { WebhookDeliveryRepository } from './ports/webhook-delivery.repository';
|
|
6
|
-
import { CreateEndpointDto, EndpointRecord, EndpointRecordWithSecret, UpdateEndpointDto } from './interfaces/webhook-endpoint.interface';
|
|
6
|
+
import { CreateEndpointDto, EndpointRecord, EndpointRecordWithSecret, RotateEndpointSecretDto, UpdateEndpointDto } from './interfaces/webhook-endpoint.interface';
|
|
7
7
|
export declare class WebhookEndpointAdminService {
|
|
8
8
|
private readonly endpointRepo;
|
|
9
9
|
private readonly eventRepo;
|
|
@@ -16,8 +16,11 @@ export declare class WebhookEndpointAdminService {
|
|
|
16
16
|
listEndpoints(tenantId?: string): Promise<EndpointRecord[]>;
|
|
17
17
|
getEndpoint(endpointId: string): Promise<EndpointRecord | null>;
|
|
18
18
|
updateEndpoint(endpointId: string, dto: UpdateEndpointDto): Promise<EndpointRecord | null>;
|
|
19
|
+
rotateSecret(endpointId: string, dto: RotateEndpointSecretDto): Promise<EndpointRecordWithSecret | null>;
|
|
19
20
|
deleteEndpoint(endpointId: string): Promise<boolean>;
|
|
20
21
|
sendTestEvent(endpointId: string): Promise<string | null>;
|
|
21
22
|
private validateBase64Secret;
|
|
23
|
+
private resolveSecret;
|
|
24
|
+
private validateRotationExpiry;
|
|
22
25
|
}
|
|
23
26
|
//# sourceMappingURL=webhook.endpoint-admin.service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.endpoint-admin.service.d.ts","sourceRoot":"","sources":["../src/webhook.endpoint-admin.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAOjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;AAC9E,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AAChF,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AAChF,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,wBAAwB,EACxB,iBAAiB,EAClB,MAAM,yCAAyC,CAAC;AAGjD,qBACa,2BAA2B;IAMpC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAE7B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAE1B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;IAVzB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgD;IACvE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAU;gBAIxB,YAAY,EAAE,yBAAyB,EAEvC,SAAS,EAAE,sBAAsB,EAEjC,YAAY,EAAE,yBAAyB,EACvC,MAAM,EAAE,aAAa,EAEtC,OAAO,EAAE,oBAAoB;IAKzB,cAAc,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"webhook.endpoint-admin.service.d.ts","sourceRoot":"","sources":["../src/webhook.endpoint-admin.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAOjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;AAC9E,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AAChF,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AAChF,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,wBAAwB,EACxB,uBAAuB,EACvB,iBAAiB,EAClB,MAAM,yCAAyC,CAAC;AAGjD,qBACa,2BAA2B;IAMpC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAE7B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAE1B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;IAVzB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgD;IACvE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAU;gBAIxB,YAAY,EAAE,yBAAyB,EAEvC,SAAS,EAAE,sBAAsB,EAEjC,YAAY,EAAE,yBAAyB,EACvC,MAAM,EAAE,aAAa,EAEtC,OAAO,EAAE,oBAAoB;IAKzB,cAAc,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAoBzE,aAAa,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAI3D,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;IAI/D,cAAc,CAClB,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,iBAAiB,GACrB,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;IAO3B,YAAY,CAChB,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,uBAAuB,GAC3B,OAAO,CAAC,wBAAwB,GAAG,IAAI,CAAC;IAcrC,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAIpD,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAe/D,OAAO,CAAC,oBAAoB;IAiB5B,OAAO,CAAC,aAAa;IASrB,OAAO,CAAC,sBAAsB;CAU/B"}
|
|
@@ -36,15 +36,15 @@ let WebhookEndpointAdminService = WebhookEndpointAdminService_1 = class WebhookE
|
|
|
36
36
|
if (!this.allowPrivateUrls) {
|
|
37
37
|
await (0, webhook_url_validator_1.validateWebhookUrl)(dto.url);
|
|
38
38
|
}
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
39
|
+
const secret = this.resolveSecret(dto.secret);
|
|
40
|
+
const endpoint = await this.endpointRepo.createEndpoint({
|
|
41
|
+
url: dto.url,
|
|
42
|
+
secret,
|
|
43
|
+
events: dto.events,
|
|
44
|
+
description: dto.description ?? null,
|
|
45
|
+
metadata: dto.metadata ?? null,
|
|
46
|
+
tenantId: dto.tenantId ?? null,
|
|
47
|
+
});
|
|
48
48
|
this.logger.log(`Endpoint created: ${endpoint.id} → ${dto.url}`);
|
|
49
49
|
return endpoint;
|
|
50
50
|
}
|
|
@@ -60,6 +60,18 @@ let WebhookEndpointAdminService = WebhookEndpointAdminService_1 = class WebhookE
|
|
|
60
60
|
}
|
|
61
61
|
return this.endpointRepo.updateEndpoint(endpointId, dto);
|
|
62
62
|
}
|
|
63
|
+
async rotateSecret(endpointId, dto) {
|
|
64
|
+
this.validateRotationExpiry(dto.previousSecretExpiresAt);
|
|
65
|
+
const secret = this.resolveSecret(dto.secret);
|
|
66
|
+
const endpoint = await this.endpointRepo.rotateSecret(endpointId, {
|
|
67
|
+
secret,
|
|
68
|
+
previousSecretExpiresAt: dto.previousSecretExpiresAt,
|
|
69
|
+
});
|
|
70
|
+
if (!endpoint)
|
|
71
|
+
return null;
|
|
72
|
+
this.logger.log(`Endpoint secret rotated: ${endpointId}`);
|
|
73
|
+
return { ...endpoint, secret };
|
|
74
|
+
}
|
|
63
75
|
async deleteEndpoint(endpointId) {
|
|
64
76
|
return this.endpointRepo.deleteEndpoint(endpointId);
|
|
65
77
|
}
|
|
@@ -84,6 +96,21 @@ let WebhookEndpointAdminService = WebhookEndpointAdminService_1 = class WebhookE
|
|
|
84
96
|
'Use "auto" to generate a secure secret.');
|
|
85
97
|
}
|
|
86
98
|
}
|
|
99
|
+
resolveSecret(secret) {
|
|
100
|
+
if (!secret || secret === 'auto') {
|
|
101
|
+
return this.signer.generateSecret();
|
|
102
|
+
}
|
|
103
|
+
this.validateBase64Secret(secret);
|
|
104
|
+
return secret;
|
|
105
|
+
}
|
|
106
|
+
validateRotationExpiry(expiresAt) {
|
|
107
|
+
if (!(expiresAt instanceof Date) || Number.isNaN(expiresAt.getTime())) {
|
|
108
|
+
throw new Error('Invalid rotation expiry: previousSecretExpiresAt must be a Date.');
|
|
109
|
+
}
|
|
110
|
+
if (expiresAt.getTime() <= Date.now()) {
|
|
111
|
+
throw new Error('Invalid rotation expiry: previousSecretExpiresAt must be in the future.');
|
|
112
|
+
}
|
|
113
|
+
}
|
|
87
114
|
};
|
|
88
115
|
exports.WebhookEndpointAdminService = WebhookEndpointAdminService;
|
|
89
116
|
exports.WebhookEndpointAdminService = WebhookEndpointAdminService = WebhookEndpointAdminService_1 = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.endpoint-admin.service.js","sourceRoot":"","sources":["../src/webhook.endpoint-admin.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAA4D;AAC5D,qDAAiD;AACjD,2DAK6B;
|
|
1
|
+
{"version":3,"file":"webhook.endpoint-admin.service.js","sourceRoot":"","sources":["../src/webhook.endpoint-admin.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.module.d.ts","sourceRoot":"","sources":["../src/webhook.module.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAIb,eAAe,EACf,YAAY,EAEb,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAkB,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"webhook.module.d.ts","sourceRoot":"","sources":["../src/webhook.module.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAIb,eAAe,EACf,YAAY,EAEb,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAkB,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAiBlE,OAAO,EACL,oBAAoB,EACpB,yBAAyB,EAE1B,MAAM,wCAAwC,CAAC;AAoGhD,qBAEa,aAAc,YAAW,YAAY,EAAE,eAAe;IAE/D,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAE/B,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAHP,iBAAiB,EAAE,iBAAiB,EACpC,cAAc,EAAE,qBAAqB,EAErC,OAAO,EAAE,oBAAoB;IAGhD,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,oBAAoB,GAAG,aAAa;IAa5D,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE,yBAAyB,GAAG,aAAa;IAwC3E,YAAY,IAAI,IAAI;IASpB,eAAe,IAAI,IAAI;CAOxB"}
|