Changes chat.service.ts to websocket-handler.service.ts

Will be used to handler sending and reciving of messages

Adds settings component

UNSURE WHY IT BREAKS
This commit is contained in:
GloriousCode
2017-09-05 17:47:20 +10:00
parent fcefa80cc8
commit 126c9e1646
13 changed files with 108 additions and 41 deletions

View File

@@ -1,15 +0,0 @@
import { TestBed, inject } from '@angular/core/testing';
import { ChatService } from './chat.service';
describe('ChatService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [ChatService]
});
});
it('should be created', inject([ChatService], (service: ChatService) => {
expect(service).toBeTruthy();
}));
});

View File

@@ -0,0 +1,15 @@
import { TestBed, inject } from '@angular/core/testing';
import { WebsocketHandlerService } from './websocket-handler.service';
describe('WebsocketHandlerService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [WebsocketHandlerService]
});
});
it('should be created', inject([WebsocketHandlerService], (service: WebsocketHandlerService) => {
expect(service).toBeTruthy();
}));
});

View File

@@ -1,8 +1,9 @@
import { Injectable } from '@angular/core';
import { Observable, Subject } from 'rxjs/Rx';
import { WebsocketService } from './websocket/websocket.service';
import { WebsocketService } from './../../services/websocket/websocket.service';
const CHAT_URL = 'ws://localhost:9050/ws';
const WEBSOCKET_URL = 'ws://localhost:9050/ws';
export interface Message {
Event: string,
@@ -10,12 +11,12 @@ export interface Message {
}
@Injectable()
export class ChatService {
export class WebsocketHandlerService {
public messages: Subject<Message>;
constructor(wsService: WebsocketService) {
this.messages = <Subject<Message>>wsService
.connect(CHAT_URL)
.connect(WEBSOCKET_URL)
.map((response: MessageEvent): Message => {
let data = JSON.parse(response.data);
return {