Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/out/webhooks/callback-emitter.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ export default class CallbackEmitter extends EventEmitter {
permanentIntervalReset,
logger = console,
checksumAlgorithm,
getRaw = false,
} = {},
) {
super();
Expand Down Expand Up @@ -79,6 +80,7 @@ export default class CallbackEmitter extends EventEmitter {
];
this._permanentIntervalReset = permanentIntervalReset || 60000;
this._checksumAlgorithm = checksumAlgorithm;
this._getRaw = getRaw;
}

_scheduleNext(timeout) {
Expand Down Expand Up @@ -163,7 +165,11 @@ export default class CallbackEmitter extends EventEmitter {
controller.abort();
}, timeout);
requestOptions.signal = controller.signal;
const stringifiedEvent = simplifiedEvent(this.event);
// Raw events carry no mapped id/timestamp, so simplifying them yields an
// all-undefined string: log whichever representation the hook subscribed to.
const loggedEvent = this._getRaw
? { event: {}, rawEvent: this.event }
: { event: simplifiedEvent(this.event), rawEvent: {} };

try {
const response = await fetch(callbackURL, requestOptions);
Expand All @@ -177,14 +183,14 @@ export default class CallbackEmitter extends EventEmitter {
}

this.logger.info(`successful callback call to: [${callbackURL}]`, {
event: stringifiedEvent,
...loggedEvent,
status: response?.status,
statusText: response?.statusText,
});
} catch (error) {
if (error.code == null) error.code = 'unknown';
this.logger.warn(`error in the callback call to: [${callbackURL}]`, {
event: stringifiedEvent,
...loggedEvent,
callbackURL,
errorMessage: error?.message,
errorName: error?.name,
Expand Down
1 change: 1 addition & 0 deletions src/out/webhooks/web-hooks.js
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ class WebHooks {
retryIntervals: this.config.retryIntervals,
checksumAlgorithm: this.config.hookChecksumAlgorithm,
logger: this.logger,
getRaw: hook.payload.getRaw,
}
);

Expand Down
Loading