refactor: Linted existing code.

#35
master
Viraj Trivedi 7 years ago
parent 4864443661
commit 3b27a49de5

@ -1,7 +1,6 @@
import { Server, WebSocket } from 'mock-socket';
import { Server, WebSocket } from "mock-socket";
import { RealTimeAPI } from "../src/RealTimeAPI";
describe("RxSQL Tests", () => {
it("Mock Test", ()=> {
})
})
it("Mock Test", () => {});
});

@ -3,7 +3,7 @@
*/
import { Observable } from "rxjs";
import { WebSocketSubject } from 'rxjs/observable/dom/WebSocketSubject';
import { WebSocketSubject } from "rxjs/observable/dom/WebSocketSubject";
import { v4 as uuid } from "uuid";
import { SHA256 } from "crypto-js";
@ -22,7 +22,9 @@ export class RealTimeAPI {
this.url = this.webSocket.url;
break;
default:
throw new Error(`Invalid Parameter to the Constructor, Parameter must be of Type WebSocketSubject or URL but was found of type "${typeof param}"`);
throw new Error(
`Invalid Parameter to the Constructor, Parameter must be of Type WebSocketSubject or URL but was found of type "${typeof param}"`
);
}
}
@ -47,7 +49,6 @@ export class RealTimeAPI {
this.subscribe(messageHandler, undefined, undefined);
}
/**
* onError
*/
@ -65,8 +66,16 @@ export class RealTimeAPI {
/**
* Subscribe to the WebSocket of the RealTime API
*/
public subscribe(messageHandler?: ((value: {}) => void) | undefined, errorHandler?: ((error: any) => void) | undefined, completionHandler?: (() => void) | undefined) {
this.getObservable().subscribe(messageHandler, errorHandler, completionHandler);
public subscribe(
messageHandler?: ((value: {}) => void) | undefined,
errorHandler?: ((error: any) => void) | undefined,
completionHandler?: (() => void) | undefined
) {
this.getObservable().subscribe(
messageHandler,
errorHandler,
completionHandler
);
}
/**
@ -80,7 +89,9 @@ export class RealTimeAPI {
* getObservableFilteredByMessageType
*/
public getObservableFilteredByMessageType(messageType: string) {
return this.getObservable().filter((message: any) => message.msg === messageType);
return this.getObservable().filter(
(message: any) => message.msg === messageType
);
}
/**
@ -94,7 +105,11 @@ export class RealTimeAPI {
* connectToServer
*/
public connectToServer() {
this.sendMessage({ "msg": "connect", "version": "1", "support": ["1", "pre2", "pre1"] });
this.sendMessage({
msg: "connect",
version: "1",
support: ["1", "pre2", "pre1"]
});
return this.getObservableFilteredByMessageType("connected");
}
@ -102,8 +117,8 @@ export class RealTimeAPI {
* keepAlive, Ping and Pong to the Rocket.Chat Server to Keep the Connection Alive.
*/
public keepAlive(): void {
this.getObservableFilteredByMessageType("ping").subscribe(
message => this.sendMessage({ msg: "pong" })
this.getObservableFilteredByMessageType("ping").subscribe(message =>
this.sendMessage({ msg: "pong" })
);
}
@ -114,15 +129,15 @@ export class RealTimeAPI {
let id = uuid();
let usernameType = username.indexOf("@") !== -1 ? "email" : "username";
this.sendMessage({
"msg": "method",
"method": "login",
"id": id,
"params": [
msg: "method",
method: "login",
id: id,
params: [
{
"user": { [usernameType]: username },
"password": {
"digest": SHA256(password).toString(),
"algorithm": "sha-256"
user: { [usernameType]: username },
password: {
digest: SHA256(password).toString(),
algorithm: "sha-256"
}
}
]
@ -136,12 +151,10 @@ export class RealTimeAPI {
public loginWithAuthToken(authToken: string) {
let id = uuid();
this.sendMessage({
"msg": "method",
"method": "login",
"id": id,
"params": [
{ "resume": authToken }
]
msg: "method",
method: "login",
id: id,
params: [{ resume: authToken }]
});
return this.getLoginObservable(id);
}
@ -152,14 +165,14 @@ export class RealTimeAPI {
public loginWithOAuth(credToken: string, credSecret: string) {
let id = uuid();
this.sendMessage({
"msg": "method",
"method": "login",
"id": id,
"params": [
msg: "method",
method: "login",
id: id,
params: [
{
"oauth": {
"credentialToken": credToken,
"credentialSecret": credSecret
oauth: {
credentialToken: credToken,
credentialSecret: credSecret
}
}
]
@ -177,12 +190,11 @@ export class RealTimeAPI {
let addedObservable = this.getObservable()
.buffer(
resultObservable.map(({ msg, error, result }) => {
if(msg === "result" && !error )
return resultId = result.id // Setting resultId to get Result from the buffer
if (msg === "result" && !error) return (resultId = result.id); // Setting resultId to get Result from the buffer
})
)
.flatMap(x => x) // Flattening the Buffered Messages
.filter(({ id: msgId }) => resultId !== undefined && msgId === resultId ) //Filtering the "added" result message.
.filter(({ id: msgId }) => resultId !== undefined && msgId === resultId); //Filtering the "added" result message.
return Observable.merge(resultObservable, addedObservable); //Merging "result" and "added" messages.
}
@ -193,7 +205,7 @@ export class RealTimeAPI {
public callMethod(method: string, ...params: Array<{}>) {
let id = uuid();
this.sendMessage({
"msg": "method",
msg: "method",
method,
id,
params
@ -204,23 +216,29 @@ export class RealTimeAPI {
/**
* getSubscription
*/
public getSubscription(streamName: string, streamParam: string, addEvent: boolean) {
public getSubscription(
streamName: string,
streamParam: string,
addEvent: boolean
) {
let id = uuid();
let subscription = this.webSocket.multiplex(
() => JSON.stringify({
"msg": "sub",
"id": id,
"name": streamName,
"params": [
streamParam,
addEvent
]
() =>
JSON.stringify({
msg: "sub",
id: id,
name: streamName,
params: [streamParam, addEvent]
}),
() => JSON.stringify({
"msg": "unsub",
"id": id
() =>
JSON.stringify({
msg: "unsub",
id: id
}),
(message: any) => typeof message.collection === "string" && message.collection === streamName && message.fields.eventName === streamParam // Proper Filtering to be done. This is temporary filter just for the stream-room-messages subscription
(message: any) =>
typeof message.collection === "string" &&
message.collection === streamName &&
message.fields.eventName === streamParam // Proper Filtering to be done. This is temporary filter just for the stream-room-messages subscription
);
return subscription;
}

Loading…
Cancel
Save