diff --git a/src/app/worker.ts b/src/app/worker.ts index 1ca19d0..3d95860 100644 --- a/src/app/worker.ts +++ b/src/app/worker.ts @@ -25,7 +25,6 @@ export class AppWorker implements IRunnable { } private onMessage(message: { eventName: string, event: unknown }): void { - debug('broadcast message received: %o', message) this.adapter.emit(message.eventName, message.event) } diff --git a/src/handlers/delegated-event-message-handler.ts b/src/handlers/delegated-event-message-handler.ts index 09e7438..51dc7ff 100644 --- a/src/handlers/delegated-event-message-handler.ts +++ b/src/handlers/delegated-event-message-handler.ts @@ -12,7 +12,6 @@ const debug = createLogger('delegated-event-message-handler') export class DelegatedEventMessageHandler extends EventMessageHandler implements IMessageHandler { public async handleMessage(message: IncomingEventMessage): Promise { - debug('received message: %o', message) const [, event] = message let reason = await this.isEventValid(event) @@ -51,7 +50,7 @@ export class DelegatedEventMessageHandler extends EventMessageHandler implements try { await strategy.execute(delegatedEvent) } catch (error) { - debug('error handling message %o: %o', message, error) + console.error('error handling message', message, error) this.webSocket.emit(WebSocketAdapterEvent.Message, createCommandResult(event.id, false, 'error: unable to process event')) } } diff --git a/src/handlers/event-message-handler.ts b/src/handlers/event-message-handler.ts index 17ddcfc..068837d 100644 --- a/src/handlers/event-message-handler.ts +++ b/src/handlers/event-message-handler.ts @@ -19,10 +19,9 @@ export class EventMessageHandler implements IMessageHandler { protected readonly strategyFactory: Factory>, [Event, IWebSocketAdapter]>, private readonly settings: () => ISettings, private readonly slidingWindowRateLimiter: Factory, - ) { } + ) {} public async handleMessage(message: IncomingEventMessage): Promise { - debug('received message: %o', message) const [, event] = message let reason = await this.isEventValid(event) @@ -55,7 +54,7 @@ export class EventMessageHandler implements IMessageHandler { try { await strategy.execute(event) } catch (error) { - debug('error handling message %o: %o', message, error) + console.error('error handling message', message, error) this.webSocket.emit(WebSocketAdapterEvent.Message, createCommandResult(event.id, false, 'error: unable to process event')) } } diff --git a/src/handlers/event-strategies/delete-event-strategy.ts b/src/handlers/event-strategies/delete-event-strategy.ts index b6b5944..539cc06 100644 --- a/src/handlers/event-strategies/delete-event-strategy.ts +++ b/src/handlers/event-strategies/delete-event-strategy.ts @@ -16,7 +16,7 @@ export class DeleteEventStrategy implements IEventStrategy> ) { } public async execute(event: Event): Promise { - debug('received event: %o', event) + debug('received delete event: %o', event) const count = await this.eventRepository.create(event) this.webSocket.emit(WebSocketAdapterEvent.Message, createCommandResult(event.id, true, (count) ? '' : 'duplicate:')) diff --git a/src/handlers/event-strategies/ephemeral-event-strategy.ts b/src/handlers/event-strategies/ephemeral-event-strategy.ts index 8ed4cd6..1e34c12 100644 --- a/src/handlers/event-strategies/ephemeral-event-strategy.ts +++ b/src/handlers/event-strategies/ephemeral-event-strategy.ts @@ -12,7 +12,7 @@ export class EphemeralEventStrategy implements IEventStrategy { - debug('received event: %o', event) + debug('received ephemeral event: %o', event) this.webSocket.emit(WebSocketAdapterEvent.Broadcast, event) } } diff --git a/src/handlers/event-strategies/parameterized-replaceable-event-strategy.ts b/src/handlers/event-strategies/parameterized-replaceable-event-strategy.ts index 60204c8..72fa4dd 100644 --- a/src/handlers/event-strategies/parameterized-replaceable-event-strategy.ts +++ b/src/handlers/event-strategies/parameterized-replaceable-event-strategy.ts @@ -17,7 +17,7 @@ export class ParameterizedReplaceableEventStrategy ) { } public async execute(event: Event): Promise { - debug('received event: %o', event) + debug('received parameterized replaceable event: %o', event) const [, ...deduplication] = event.tags.find((tag) => tag.length >= 2 && tag[0] === EventTags.Deduplication) ?? [null, ''] diff --git a/src/handlers/event-strategies/replaceable-event-strategy.ts b/src/handlers/event-strategies/replaceable-event-strategy.ts index 4125743..a3b7a79 100644 --- a/src/handlers/event-strategies/replaceable-event-strategy.ts +++ b/src/handlers/event-strategies/replaceable-event-strategy.ts @@ -15,7 +15,7 @@ export class ReplaceableEventStrategy implements IEventStrategy { - debug('received event: %o', event) + debug('received replaceable event: %o', event) const count = await this.eventRepository.upsert(event) this.webSocket.emit(WebSocketAdapterEvent.Message, createCommandResult(event.id, true, (count) ? '' : 'duplicate:')) if (count) { diff --git a/src/handlers/subscribe-message-handler.ts b/src/handlers/subscribe-message-handler.ts index b8dc500..ba9a8c2 100644 --- a/src/handlers/subscribe-message-handler.ts +++ b/src/handlers/subscribe-message-handler.ts @@ -32,7 +32,6 @@ export class SubscribeMessageHandler implements IMessageHandler, IAbortable { } public async handleMessage(message: SubscribeMessage): Promise { - debug('received message: %o', message) const subscriptionId = message[1] const filters = uniqWith(equals, message.slice(2)) as SubscriptionFilter[] @@ -49,7 +48,7 @@ export class SubscribeMessageHandler implements IMessageHandler, IAbortable { } private async fetchAndSend(subscriptionId: string, filters: SubscriptionFilter[]): Promise { - debug('fetching events for subscription %s with %o', subscriptionId, filters) + debug('fetching events for subscription %s with filters %o', subscriptionId, filters) const sendEvent = (event: Event) => this.webSocket.emit(WebSocketAdapterEvent.Message, createOutgoingEventMessage(subscriptionId, event)) const sendEOSE = () => diff --git a/src/handlers/unsubscribe-message-handler.ts b/src/handlers/unsubscribe-message-handler.ts index 42f8fb1..288dea5 100644 --- a/src/handlers/unsubscribe-message-handler.ts +++ b/src/handlers/unsubscribe-message-handler.ts @@ -1,18 +1,14 @@ -import { createLogger } from '../factories/logger-factory' import { IMessageHandler } from '../@types/message-handlers' import { IWebSocketAdapter } from '../@types/adapters' import { UnsubscribeMessage } from '../@types/messages' import { WebSocketAdapterEvent } from '../constants/adapter' -const debug = createLogger('unsubscribe-message-handler') - export class UnsubscribeMessageHandler implements IMessageHandler { public constructor( private readonly webSocket: IWebSocketAdapter, ) { } public async handleMessage(message: UnsubscribeMessage): Promise { - debug('received message: %o', message) this.webSocket.emit(WebSocketAdapterEvent.Unsubscribe, message[1]) } }