Skip to content

Binary data support #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
afrad merged 2 commits into from
Mar 21, 2017
Merged

Binary data support #75

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86b54e0
Binary data support
krojew Mar 21, 2017
f81e1f6
Typo
krojew Mar 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions src/angular2-websocket.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,13 @@ export class $WebSocket {
* @param data
* @returns {boolean}
*/
send4Direct(data): boolean {
send4Direct(data, binary?: boolean): boolean {
let self = this;
if (this.getReadyState() !== this.readyStateConstants.OPEN
&& this.getReadyState() !== this.readyStateConstants.CONNECTING) {
this.connect();
}
self.sendQueue.push({message: data});
self.sendQueue.push({message: data, binary: binary});
if (self.socket.readyState === self.readyStateConstants.OPEN) {
self.fireQueue();
return true;
Expand All @@ -111,10 +111,10 @@ export class $WebSocket {
* @param data
* @returns {Promise<any>}
*/
send4Promise(data): Promise<any> {
send4Promise(data, binary?: boolean): Promise<any> {
return new Promise(
(resolve, reject) => {
if (this.send4Direct(data)) {
if (this.send4Direct(data, binary)) {
return resolve();
} else {
return reject(Error('Socket connection has been closed'));
Expand All @@ -130,9 +130,9 @@ export class $WebSocket {
* @param data
* @returns {Observable<any>}
*/
send4Observable(data): Observable<any> {
send4Observable(data, binary?: boolean): Observable<any> {
return Observable.create((observer) => {
if (this.send4Direct(data)) {
if (this.send4Direct(data, binary)) {
return observer.complete();
} else {
return observer.error('Socket connection has been closed');
Expand All @@ -155,16 +155,17 @@ export class $WebSocket {
* If no specify, Default SendMode is Observable mode
* @param data
* @param mode
* @param binary
* @returns {any}
*/
send(data: any, mode?: WebSocketSendMode): any {
send(data: any, mode?: WebSocketSendMode, binary?: boolean): any {
switch (typeof mode !== "undefined" ? mode : this.send4Mode) {
case WebSocketSendMode.Direct:
return this.send4Direct(data);
return this.send4Direct(data, binary);
case WebSocketSendMode.Promise:
return this.send4Promise(data);
return this.send4Promise(data, binary);
case WebSocketSendMode.Observable:
return this.send4Observable(data);
return this.send4Observable(data, binary);
default:
throw Error("WebSocketSendMode Error.");
}
Expand Down Expand Up @@ -192,9 +193,13 @@ export class $WebSocket {
let data = this.sendQueue.shift();

// console.log("fireQueue: ", data);
this.socket.send(
$WebSocket.Helpers.isString(data.message) ? data.message : JSON.stringify(data.message)
);
if (data.binary) {
this.socket.send(data.message);
} else {
this.socket.send(
$WebSocket.Helpers.isString(data.message) ? data.message : JSON.stringify(data.message)
);
}
// data.deferred.resolve();
}
}
Expand Down