Add lastEventId and url in events with defined type (#2)

* Add lastEventId in events with defined type

* Add lastEventId and url in CustomEvent interface

Author: vkourtis

index.d.ts

@@ -33,6 +33,8 @@ export interface ErrorEvent {
 export interface CustomEvent<E extends string> {
   type: E;
   data: string | null;
+  lastEventId: string | null;
+  url: string;
 }
 
 export interface ExceptionEvent {

src/EventSource.js

@@ -183,23 +183,15 @@ class EventSource {
         this.lastEventId = null;
       } else if (line === '') {
         if (data.length > 0) {
-          if (this.eventType !== undefined) {
-            const event = {
-              type: this.eventType,
-              data: data.join('\n'),
-            };
-
-            this.dispatch(this.eventType, event);
-          } else {
-            const event = {
-              type: 'message',
-              data: data.join('\n'),
-              url: this.url,
-              lastEventId: this.lastEventId,
-            };
-
-            this.dispatch('message', event);
-          }
+          const eventType = this.eventType || 'message'
+          const event = {
+            type: eventType,
+            data: data.join("\n"),
+            url: this.url,
+            lastEventId: this.lastEventId,
+          };
+
+          this.dispatch(eventType, event);
 
           data = [];
           this.eventType = undefined;