Merge pull request #80 from delphi-hub/feature/parameterizedSocketService

Feature/parameterized socket service

Author: bhermann

client/package-lock.json

@@ -26,6 +26,7 @@
     "bootstrap": "^4.1.3",
     "core-js": "^2.5.7",
     "font-awesome": "^4.7.0",
+    "hammerjs": "^2.0.8",
     "jquery": "^3.3.1",
     "material-design-icons": "^3.0.1",
     "popper.js": "^1.14.5",

client/package.json

@@ -32,9 +32,9 @@ import {InstanceLink} from '../model/instanceLink';
 
 
 interface ObserverMap {
-  [key: string]: Subject<any>;
+  [key: string]: Subject<ReturnType>;
 }
-
+type ReturnType = Instance | InstanceLink | number | DockerOperationError;
 @Injectable({
   providedIn: 'root'
 })
@@ -89,9 +89,8 @@ export class SocketService {
    *
    * @param eventName
    */
-  public subscribeForEvent(eventName: EventType): Observable<number | InstanceLink | Instance | DockerOperationError> {
-
-    return new Observable((observer: Observer<any>) => {
+  public subscribeForEvent<T extends ReturnType>(eventName: EventType): Observable<T> {
+    return new Observable<T>((observer: Observer<T>) => {
 
       /**
        * First step to subscribe for an event is to append the new observer to the set
@@ -111,7 +110,7 @@ export class SocketService {
       }
 
       if (!registeredEvents.includes(eventName)) {
-        this.observers[eventName] = new Subject<any>();
+        this.observers[eventName] = new Subject<T>();
         console.log('registering for event', eventName);
 
         this.send({event: publishEventName});
@@ -144,7 +143,7 @@ export class SocketService {
 
         const {event, toSend} = this.getEventAndPayload(msg);
 
-        const relevantSubject: Subject<any> = this.observers[event];
+        const relevantSubject = this.observers[event];
         if (relevantSubject) {
           relevantSubject.next(toSend);
         }
@@ -165,7 +164,7 @@ export class SocketService {
    * @param msg
    */
   private getEventAndPayload(msg: RegistryEvent) {
-    let toSend: any;
+    let toSend: ReturnType;
     let event: EventType;
 
     if (msg.eventType === EventTypeEnum.NumbersChangedEvent) {

client/src/app/api/api/socket.service.ts

@@ -70,7 +70,7 @@ export class DashboardCardComponent implements OnInit {
 
       const eventType: EventType = DashboardCardComponent.compTypeEventMap[this.componentType];
 
-      this.socketService.subscribeForEvent(eventType).subscribe((data: number) => {
+      this.socketService.subscribeForEvent<number>(eventType).subscribe((data: number) => {
         console.log('data callback in card component', data);
 
         this.numberOfInstances = '' + data;