first implementation of websockets (and displaying the toots!)

src/app/components/stream/stream.component.ts

@@ -13,9 +13,9 @@ export class StreamComponent implements OnInit {
   @Input()
   set stream(stream: Stream) {
     this._stream = stream;
-    this._stream.statuses.subscribe((toots: TootWrapper[]) => {
-      for (let t of toots) {
-        this.toots.push(t);
+    this._stream.statuses.subscribe((results: TootWrapper[]) => {
+      for (let t of results) {
+        this.toots.unshift(t);
       }
     });
   }

src/app/models/stream.models.ts

@@ -5,7 +5,7 @@ import { BehaviorSubject } from "rxjs";
 import { AccountWrapper } from "./account.models";
 import { ApiRoutes } from "../services/models/api.settings";
 import { Account, Status } from "../services/models/mastodon.interfaces";
-import { StreamingService, StreamingWrapper } from "../services/streaming.service";
+import { StreamingService, StreamingWrapper, StatusUpdate, EventEnum } from "../services/streaming.service";
 import { StreamTypeEnum } from "../states/streams.state";
 import { AccountInfo } from "../states/accounts.state";
 
@@ -13,10 +13,12 @@ import { AccountInfo } from "../states/accounts.state";
 export class Stream {
     private apiRoutes = new ApiRoutes();
     private account: AccountInfo;
+    private websocketStreaming: StreamingWrapper;
 
     statuses = new BehaviorSubject<TootWrapper[]>([]);
 
     constructor(
+        private readonly streamingService: StreamingService,
         private readonly httpClient: HttpClient,
         private readonly store: Store,
         public streamName: string,
@@ -29,6 +31,7 @@ export class Stream {
         this.account = this.getRegisteredAccounts().find(x => x.username == user && x.instance == instance);
 
         this.retrieveToots(); //TODO change this for WebSockets
+        this.launchWebsocket();
     }
 
     private getRegisteredAccounts(): AccountInfo[] {
@@ -36,13 +39,8 @@ export class Stream {
         return regAccounts;
     }
 
-    private test: StreamingWrapper;
-    private retrieveToots(): void {
-        //TEST
-        const service = new StreamingService();
-        this.test = service.getStreaming(this.account.instance, this.account.token.access_token);
-        //END TEST
 
+    private retrieveToots(): void {
         const route = `https://${this.account.instance}${this.getTimelineRoute()}`;
 
         const headers = new HttpHeaders({ 'Authorization': `Bearer ${this.account.token.access_token}` });
@@ -53,7 +51,34 @@ export class Stream {
                 });
 
                 this.statuses.next(statuses);
+
+
             });
+    }
+
+    private launchWebsocket(): void {
+        //Web socket
+        let streamRequest: string;
+        switch (this.type) {
+            case StreamTypeEnum.global:
+                streamRequest = 'public';
+                break;
+            case StreamTypeEnum.local:
+                streamRequest = 'public:local';
+                break;
+            case StreamTypeEnum.personnal:
+                streamRequest = 'user';
+                break;
+        }
+
+        this.websocketStreaming = this.streamingService.getStreaming(this.account.instance, this.account.token.access_token, streamRequest);
+        this.websocketStreaming.statusUpdateSubjet.subscribe((update: StatusUpdate) => {
+            if (update) {
+                if (update.type === EventEnum.update) {
+                    this.statuses.next([new TootWrapper(update.status)]);
+                }
+            }
+        });
 
     }
 

src/app/pages/streams-main-display/streams-main-display.component.ts

@@ -7,6 +7,7 @@ import { Store } from "@ngxs/store";
 import { Http } from "@angular/http";
 import { NavigationService } from "../../services/navigation.service";
 import { HttpClient } from "@angular/common/http";
+import { StreamingService } from "../../services/streaming.service";
 
 
 @Component({
@@ -23,6 +24,7 @@ export class StreamsMainDisplayComponent implements OnInit, OnDestroy {
     private columnSelectedSub: Subscription;
 
     constructor(
+        private readonly streamingService: StreamingService,
         private readonly navigationService: NavigationService,
         private readonly httpClient: HttpClient,
         private readonly store: Store) {
@@ -34,7 +36,7 @@ export class StreamsMainDisplayComponent implements OnInit, OnDestroy {
         this.streamsStateSub = this.streams$.subscribe((streams: StreamElement[]) => {
             this.streams.length = 0;
             for (const stream of streams) {
-                const newStream = new Stream(this.httpClient, this.store, stream.name, stream.type, stream.username);
+                const newStream = new Stream(this.streamingService, this.httpClient, this.store, stream.name, stream.type, stream.username);
                 this.streams.push(newStream);
             }
 

src/app/services/streaming.service.ts

@@ -1,48 +1,72 @@
 import { Injectable } from "@angular/core";
 import { Status } from "./models/mastodon.interfaces";
+import { BehaviorSubject } from "rxjs";
+import { ApiRoutes } from "./models/api.settings";
 
 @Injectable()
 export class StreamingService {
+    private apiRoutes = new ApiRoutes();
 
-  constructor() { }
+    constructor() { }
 
-  //TODO restructure this to handle real domain objects
-  getStreaming(instance: string, accessToken: string): StreamingWrapper {
-    const route = `wss://${instance}/api/v1/streaming?access_token=${accessToken}&stream=public`
-    return new StreamingWrapper(route);
-  }
+    //TODO restructure this to handle real domain objects
+    getStreaming(instance: string, accessToken: string, streamRequest: string): StreamingWrapper {
+        const route = `wss://${instance}/api/v1/streaming?access_token=${accessToken}&stream=${streamRequest}`
+        return new StreamingWrapper(route);
+    }
 
 }
 
 export class StreamingWrapper {
+    statusUpdateSubjet = new BehaviorSubject<StatusUpdate>(null);
+    eventSource: WebSocket;
 
-  constructor(private readonly domain: string) {
-    const eventSource = new WebSocket(domain);
-    eventSource.onmessage = x => this.tootParsing(<WebSocketEvent>JSON.parse(x.data));
-    eventSource.onerror = x => console.error(x);
-    eventSource.onopen = x => console.log(x);
-    eventSource.onclose = x => console.log(x);
-  }
+    constructor(private readonly domain: string) {
+       this.start(domain);
+    }
 
-  tootParsing(event: WebSocketEvent){
-    console.warn(event.event);
-    console.warn(event.payload);
+    private start(domain: string) {
+        this.eventSource = new WebSocket(domain);
+        this.eventSource.onmessage = x => this.tootParsing(<WebSocketEvent>JSON.parse(x.data));
+        this.eventSource.onerror = x => console.error(x);
+        this.eventSource.onopen = x => console.log(x);
+        this.eventSource.onclose = x => { console.log(x); 
+            setTimeout(() => {this.start(domain)}, 3000);}
+    }
 
-  }
+    private tootParsing(event: WebSocketEvent) {
+        const newUpdate = new StatusUpdate();
+
+        switch (event.event) {
+            case 'update':
+                newUpdate.type = EventEnum.update;
+                newUpdate.status = <Status>JSON.parse(event.payload);
+                break;
+            case 'delete':
+                newUpdate.type = EventEnum.delete;
+                newUpdate.messageId = event.payload;
+                break;
+            default:
+                newUpdate.type = EventEnum.unknow;
+        }
+
+        this.statusUpdateSubjet.next(newUpdate);
+    }
 }
 
 class WebSocketEvent {
-  event: string;
-  payload: Status;
+    event: string;
+    payload: any;
 }
 
 export class StatusUpdate {
-  type: EventEnum;
-  status: Status;
+    type: EventEnum;
+    status: Status;
+    messageId: number;
 }
 
 export enum EventEnum {
-  unknow = 0,
-  update = 1,
-  delete = 2
+    unknow = 0,
+    update = 1,
+    delete = 2
 }