Merge 1dac0d5 into 33f1c2f

Author: elribonazo

src/edge-agent/Agent.MessageEvents.ts

@@ -11,7 +11,7 @@ import { EventCallback, ListenerKey } from "./types";
  * @typedef {EventsManager}
  */
 export class EventsManager {
-  private events: Map<ListenerKey, Set<EventCallback>> = new Map();
+  private events: Map<ListenerKey, Set<EventCallback<any>>> = new Map();
 
   /**
    * Just adds a new event listener by passing the event name and the callback function we want
@@ -22,7 +22,7 @@ export class EventsManager {
    * @param {EventCallback} callback
    * @returns {number}
    */
-  public addListener(eventName: ListenerKey, callback: EventCallback): number {
+  public addListener<T extends ListenerKey>(eventName: T, callback: EventCallback<T>): number {
     if (!this.events.has(eventName)) {
       this.events.set(eventName, new Set());
     }
@@ -40,7 +40,7 @@ export class EventsManager {
    * @param {ListenerKey} eventName
    * @param {EventCallback} callback
    */
-  public removeListener(eventName: ListenerKey, callback: EventCallback): void {
+  public removeListener<T extends ListenerKey>(eventName: T, callback: EventCallback<T>): void {
     const callbacks = this.events.get(eventName);
 
     if (notNil(callbacks)) {

src/edge-agent/Agent.ts

@@ -162,7 +162,7 @@ export default class Agent extends Startable.Controller {
    * @param {ListenerKey} eventName
    * @param {EventCallback} callback
    */
-  addListener(eventName: ListenerKey, callback: EventCallback) {
+  addListener<T extends ListenerKey>(eventName: T, callback: EventCallback<T>) {
     return this.events.addListener(eventName, callback);
   }
 
@@ -173,7 +173,7 @@ export default class Agent extends Startable.Controller {
    * @param {ListenerKey} eventName
    * @param {EventCallback} callback
    */
-  removeListener(eventName: ListenerKey, callback: EventCallback): void {
+  removeListener<T extends ListenerKey>(eventName: T, callback: EventCallback<T>): void {
     return this.events.removeListener(eventName, callback);
   }
 

src/edge-agent/types/index.ts

@@ -54,10 +54,17 @@ export type InvitationType = PrismOnboardingInvitation | OutOfBandInvitation;
 export type MessageEventArg = Message[];
 export type ConnectionEventArg = DIDPair;
 export type RevokeEventArg = Credential;
-export type EventCallback = (arg: MessageEventArg | ConnectionEventArg | RevokeEventArg) => void;
 
 export enum ListenerKey {
   MESSAGE = "message",
   CONNECTION = "connection",
   REVOKE = "revoke"
 }
+
+
+export type EventCallbacks = {
+  [ListenerKey.MESSAGE]: (messages: MessageEventArg) => void;
+  [ListenerKey.CONNECTION]: (connection: ConnectionEventArg) => void;
+  [ListenerKey.REVOKE]: (revoke: RevokeEventArg) => void;
+}
+export type EventCallback<T extends ListenerKey> = EventCallbacks[T];