diff --git a/packages/@uppy/companion/src/server/emitter/default-emitter.ts b/packages/@uppy/companion/src/server/emitter/default-emitter.ts index f8dfc739a..5d0ebe7c0 100644 --- a/packages/@uppy/companion/src/server/emitter/default-emitter.ts +++ b/packages/@uppy/companion/src/server/emitter/default-emitter.ts @@ -1,5 +1,6 @@ import { EventEmitter } from 'node:events' +import type { EmitterLike } from './index.ts' -export default function defaultEmitter() { +export default function defaultEmitter(): EmitterLike { return new EventEmitter() } diff --git a/packages/@uppy/companion/src/server/emitter/index.ts b/packages/@uppy/companion/src/server/emitter/index.ts index 0d2276a12..428a41d9c 100644 --- a/packages/@uppy/companion/src/server/emitter/index.ts +++ b/packages/@uppy/companion/src/server/emitter/index.ts @@ -4,7 +4,7 @@ import redisEmitter from './redis-emitter.ts' type Listener = (...args: unknown[]) => void -export type EmitterLike = { +export interface EmitterLike { on: (eventName: string, handler: Listener) => unknown once: (eventName: string, handler: Listener) => unknown off?: (eventName: string, handler: Listener) => unknown diff --git a/packages/@uppy/companion/src/server/emitter/redis-emitter.ts b/packages/@uppy/companion/src/server/emitter/redis-emitter.ts index c91ceb6ce..ef749cda2 100644 --- a/packages/@uppy/companion/src/server/emitter/redis-emitter.ts +++ b/packages/@uppy/companion/src/server/emitter/redis-emitter.ts @@ -2,6 +2,7 @@ import { EventEmitter } from 'node:events' import safeStringify from 'fast-safe-stringify' import type { Redis } from 'ioredis' import * as logger from '../logger.ts' +import type { EmitterLike } from './index.ts' function replacer(key: string, value: unknown): unknown { // Remove the circular structure and internal ones @@ -19,7 +20,7 @@ function replacer(key: string, value: unknown): unknown { export default function redisEmitter( redisClient: Redis, redisPubSubScope?: string, -) { +): EmitterLike { const prefix = redisPubSubScope ? `${redisPubSubScope}:` : '' const getPrefixedEventName = (eventName: string) => `${prefix}${eventName}`