Fix type emitting for some types

src/devices/index.ts

@@ -44,6 +44,8 @@ type DeviceEvents = {
   announced: (device: Device) => void;
 };
 
+type Emitter = StrictEventEmitter<EventEmitter, DeviceEvents>;
+
 /**
  * The device manager is responsible for tracking devices that appear on the
  * prolink network, providing an API to react to devices livecycle events as
@@ -66,7 +68,7 @@ class DeviceManager {
   /**
    * The EventEmitter which will be used to trigger device lifecycle events
    */
-  #emitter: StrictEventEmitter<EventEmitter, DeviceEvents> = new EventEmitter();
+  #emitter: Emitter = new EventEmitter();
 
   constructor(announceSocket: SocketAsPromised, config?: Config) {
     this.#config = {...defaultConfig, ...config};
@@ -76,9 +78,9 @@ class DeviceManager {
   }
 
   // Bind public event emitter interface
-  on = this.#emitter.addListener.bind(this.#emitter);
-  off = this.#emitter.removeListener.bind(this.#emitter);
-  once = this.#emitter.once.bind(this.#emitter);
+  on: Emitter['on'] = this.#emitter.addListener.bind(this.#emitter);
+  off: Emitter['off'] = this.#emitter.removeListener.bind(this.#emitter);
+  once: Emitter['once'] = this.#emitter.once.bind(this.#emitter);
 
   /**
    * Get active devices on the network.

src/localdb/index.ts

@@ -1,5 +1,5 @@
-import {createHash} from 'crypto';
 import {Connection, createConnection} from 'typeorm';
+import {createHash} from 'crypto';
 import {EventEmitter} from 'events';
 import {Mutex} from 'async-mutex';
 import StrictEventEmitter from 'strict-event-emitter-types';
@@ -64,6 +64,8 @@ type DatabaseEvents = {
   hydrationProgress: (opts: HydrationPrgoressOpts) => void;
 };
 
+type Emitter = StrictEventEmitter<EventEmitter, DatabaseEvents>;
+
 type DatabaseItem = {
   /**
    * The uniquity identifier of the database
@@ -122,7 +124,7 @@ class LocalDatabase {
   /**
    * The EventEmitter that will report database events
    */
-  #emitter: StrictEventEmitter<EventEmitter, DatabaseEvents> = new EventEmitter();
+  #emitter: Emitter = new EventEmitter();
   /**
    * Locks for each device slot: ${device.id}-${slot}. Used when making track
    * requets.
@@ -146,9 +148,9 @@ class LocalDatabase {
   }
 
   // Bind public event emitter interface
-  on = this.#emitter.addListener.bind(this.#emitter);
-  off = this.#emitter.removeListener.bind(this.#emitter);
-  once = this.#emitter.once.bind(this.#emitter);
+  on: Emitter['on'] = this.#emitter.addListener.bind(this.#emitter);
+  off: Emitter['off'] = this.#emitter.removeListener.bind(this.#emitter);
+  once: Emitter['once'] = this.#emitter.once.bind(this.#emitter);
 
   /**
    * Closes the database connection and removes the database entry when a

src/mixstaus/index.ts

@@ -69,6 +69,8 @@ type MixstatusEvents = {
   setEnded: () => void;
 };
 
+type Emitter = StrictEventEmitter<EventEmitter, MixstatusEvents>;
+
 /**
  * MixstatusProcessor is a configurable processor which when fed device state
  * will attempt to accurately determine events that happen within the DJ set.
@@ -113,7 +115,7 @@ class MixstatusProcessor {
   /**
    * Used to fire track mix status events
    */
-  #emitter: StrictEventEmitter<EventEmitter, MixstatusEvents> = new EventEmitter();
+  #emitter: Emitter = new EventEmitter();
   /**
    * Records the most recent state of each player
    */
@@ -149,9 +151,9 @@ class MixstatusProcessor {
   }
 
   // Bind public event emitter interface
-  on = this.#emitter.addListener.bind(this.#emitter);
-  off = this.#emitter.removeListener.bind(this.#emitter);
-  once = this.#emitter.once.bind(this.#emitter);
+  on: Emitter['on'] = this.#emitter.addListener.bind(this.#emitter);
+  off: Emitter['off'] = this.#emitter.removeListener.bind(this.#emitter);
+  once: Emitter['once'] = this.#emitter.once.bind(this.#emitter);
 
   /**
    * Report a player as 'live'. Will not report the state if the player has

src/remotedb/fields.ts

@@ -16,7 +16,7 @@ export enum FieldType {
 /**
  * The generic interface for all field types
  */
-interface BaseField {
+export interface BaseField {
   /**
    * The raw field data
    */
@@ -28,7 +28,7 @@ interface BaseField {
   readonly buffer: Buffer;
 }
 
-class BaseField {
+export class BaseField {
   /**
    * Declares the type of field this class represents
    */

src/remotedb/queries.ts

@@ -8,7 +8,7 @@ import {Message} from './message';
 import {UInt32, Binary} from './fields';
 
 /**
- * This module contains logic for each type of query to udnerstand what
+ * This module contains logic for each type of query to understand what
  * arguments are required, and how to transform the resulting Items into
  * something useful.
  */

src/status/index.ts

@@ -20,6 +20,8 @@ type StatusEvents = {
   mediaSlot: (info: MediaSlotInfo) => void;
 };
 
+type Emitter = StrictEventEmitter<EventEmitter, StatusEvents>;
+
 type MediaSlotOptions = Parameters<typeof makeMediaSlotRequest>[0];
 
 /**
@@ -30,7 +32,7 @@ class StatusEmitter {
   /**
    * The EventEmitter which reports the device status
    */
-  #emitter: StrictEventEmitter<EventEmitter, StatusEvents> = new EventEmitter();
+  #emitter: Emitter = new EventEmitter();
   /**
    * Lock used to avoid media slot query races
    */
@@ -45,9 +47,9 @@ class StatusEmitter {
   }
 
   // Bind public event emitter interface
-  on = this.#emitter.addListener.bind(this.#emitter);
-  off = this.#emitter.removeListener.bind(this.#emitter);
-  once = this.#emitter.once.bind(this.#emitter);
+  on: Emitter['on'] = this.#emitter.addListener.bind(this.#emitter);
+  off: Emitter['off'] = this.#emitter.removeListener.bind(this.#emitter);
+  once: Emitter['once'] = this.#emitter.once.bind(this.#emitter);
 
   #handleStatus = (message: Buffer) => {
     const status = statusFromPacket(message);