crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initial implementation of OrderbookChannelFactory

Browse Source
This commit is contained in:
Brandon Millman 2018-05-24 17:19:27 -07:00
parent 16ddd1edfc
commit 47debf0134
4 changed files with 113 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
packages/connect/src/browser_ws_orderbook_channel.ts
View File

@ -1,5 +1,4 @@
import * as _ from 'lodash';
import * as WebSocket from 'websocket';
import {
OrderbookChannel,
@ -22,17 +21,16 @@ interface Subscription {
* that implements the standard relayer API v0 in a browser environment
*/
export class BrowserWebSocketOrderbookChannel implements OrderbookChannel {
private _apiEndpointUrl: string;
private _clientIfExists?: WebSocket.w3cwebsocket;
private _client: WebSocket;
private _subscriptions: Subscription[] = [];
/**
* Instantiates a new WebSocketOrderbookChannel instance
* @param url The relayer API base WS url you would like to interact with
* @return An instance of WebSocketOrderbookChannel
*/
constructor(url: string) {
assert.isUri('url', url);
this._apiEndpointUrl = url;
constructor(client: WebSocket) {
// assert.isUri('url', url);
this._client = client;
}
/**
* Subscribe to orderbook snapshots and updates from the websocket
@ -55,40 +53,31 @@ export class BrowserWebSocketOrderbookChannel implements OrderbookChannel {
requestId: this._subscriptions.length - 1,
payload: subscriptionOpts,
};
if (_.isUndefined(this._clientIfExists)) {
this._clientIfExists = new WebSocket.w3cwebsocket(this._apiEndpointUrl);
this._clientIfExists.onopen = () => {
this._sendMessage(subscribeMessage);
};
this._clientIfExists.onerror = error => {
this._alertAllHandlersToError(error);
};
this._clientIfExists.onclose = () => {
_.forEach(this._subscriptions, subscription => {
subscription.handler.onClose(this, subscription.subscriptionOpts);
});
};
this._clientIfExists.onmessage = message => {
this._handleWebSocketMessage(message);
};
} else {
this._sendMessage(subscribeMessage);
}
this._client.onerror = () => {
this._alertAllHandlersToError(new Error('hello'));
};
this._client.onclose = () => {
_.forEach(this._subscriptions, subscription => {
subscription.handler.onClose(this, subscription.subscriptionOpts);
});
};
this._client.onmessage = message => {
this._handleWebSocketMessage(message);
};
this._sendMessage(subscribeMessage);
}
/**
* Close the websocket and stop receiving updates
*/
public close(): void {
if (!_.isUndefined(this._clientIfExists)) {
this._clientIfExists.close();
}
this._client.close();
}
/**
* Send a message to the client if it has been instantiated and it is open
*/
private _sendMessage(message: any): void {
if (!_.isUndefined(this._clientIfExists) && this._clientIfExists.readyState === WebSocket.w3cwebsocket.OPEN) {
this._clientIfExists.send(JSON.stringify(message));
if (this._client.readyState === WebSocket.OPEN) {
this._client.send(JSON.stringify(message));
}
}
/**

1
packages/connect/src/index.ts
View File

@ -1,6 +1,7 @@
export { HttpClient } from './http_client';
export { BrowserWebSocketOrderbookChannel } from './browser_ws_orderbook_channel';
export { NodeWebSocketOrderbookChannel } from './node_ws_orderbook_channel';
export { orderbookChannelFactory } from './orderbook_channel_factory';
export {
Client,
FeesRequest,

33
packages/connect/src/orderbook_channel_factory.ts Normal file
View File

@ -0,0 +1,33 @@
// import * as WebSocket from 'websocket';
import { BrowserWebSocketOrderbookChannel } from './browser_ws_orderbook_channel';
import { NodeWebSocketOrderbookChannel } from './node_ws_orderbook_channel';
export const orderbookChannelFactory = {
async createBrowserOrderbookChannelAsync(url: string): Promise<BrowserWebSocketOrderbookChannel> {
return new Promise<BrowserWebSocketOrderbookChannel>((resolve, reject) => {
const client = new WebSocket(url);
console.log(client);
client.onopen = () => {
const orderbookChannel = new BrowserWebSocketOrderbookChannel(client);
console.log(orderbookChannel);
resolve(orderbookChannel);
};
client.onerror = err => {
reject(err);
};
});
},
// async createNodeOrderbookChannelAsync(url: string): Promise<NodeWebSocketOrderbookChannel> {
// return new Promise<BrowserWebSocketOrderbookChannel>((resolve, reject) => {
// const client = new WebSocket.w3cwebsocket(url);
// client.onopen = () => {
// const orderbookChannel = new BrowserWebSocketOrderbookChannel(client);
// resolve(orderbookChannel);
// };
// client.onerror = err => {
// reject(err);
// };
// });
// },
};

118
packages/connect/test/browser_ws_orderbook_channel_test.ts
View File

@ -1,61 +1,63 @@
import * as chai from 'chai';
import * as dirtyChai from 'dirty-chai';
import * as _ from 'lodash';
import 'mocha';
// import * as chai from 'chai';
// import * as dirtyChai from 'dirty-chai';
// import * as _ from 'lodash';
// import 'mocha';
// import * as WebSocket from 'websocket';
import { BrowserWebSocketOrderbookChannel } from '../src/browser_ws_orderbook_channel';
// import { BrowserWebSocketOrderbookChannel } from '../src/browser_ws_orderbook_channel';
chai.config.includeStack = true;
chai.use(dirtyChai);
const expect = chai.expect;
// chai.config.includeStack = true;
// chai.use(dirtyChai);
// const expect = chai.expect;
describe('BrowserWebSocketOrderbookChannel', () => {
const websocketUrl = 'ws://localhost:8080';
const orderbookChannel = new BrowserWebSocketOrderbookChannel(websocketUrl);
const subscriptionOpts = {
baseTokenAddress: '0x323b5d4c32345ced77393b3530b1eed0f346429d',
quoteTokenAddress: '0xef7fff64389b814a946f3e92105513705ca6b990',
snapshot: true,
limit: 100,
};
const emptyOrderbookChannelHandler = {
onSnapshot: () => {
_.noop();
},
onUpdate: () => {
_.noop();
},
onError: () => {
_.noop();
},
onClose: () => {
_.noop();
},
};
describe('#subscribe', () => {
it('throws when subscriptionOpts does not conform to schema', () => {
const badSubscribeCall = orderbookChannel.subscribe.bind(
orderbookChannel,
{},
emptyOrderbookChannelHandler,
);
expect(badSubscribeCall).throws(
'Expected subscriptionOpts to conform to schema /RelayerApiOrderbookChannelSubscribePayload\nEncountered: {}\nValidation errors: instance requires property "baseTokenAddress", instance requires property "quoteTokenAddress"',
);
});
it('throws when handler has the incorrect members', () => {
const badSubscribeCall = orderbookChannel.subscribe.bind(orderbookChannel, subscriptionOpts, {});
expect(badSubscribeCall).throws(
'Expected handler.onSnapshot to be of type function, encountered: undefined',
);
});
it('does not throw when inputs are of correct types', () => {
const goodSubscribeCall = orderbookChannel.subscribe.bind(
orderbookChannel,
subscriptionOpts,
emptyOrderbookChannelHandler,
);
expect(goodSubscribeCall).to.not.throw();
});
});
});
// describe('BrowserWebSocketOrderbookChannel', () => {
// const websocketUrl = 'ws://localhost:8080';
// const client = new WebSocket.w3cwebsocket(websocketUrl);
// const orderbookChannel = new BrowserWebSocketOrderbookChannel(client);
// const subscriptionOpts = {
// baseTokenAddress: '0x323b5d4c32345ced77393b3530b1eed0f346429d',
// quoteTokenAddress: '0xef7fff64389b814a946f3e92105513705ca6b990',
// snapshot: true,
// limit: 100,
// };
// const emptyOrderbookChannelHandler = {
// onSnapshot: () => {
// _.noop();
// },
// onUpdate: () => {
// _.noop();
// },
// onError: () => {
// _.noop();
// },
// onClose: () => {
// _.noop();
// },
// };
// describe('#subscribe', () => {
// it('throws when subscriptionOpts does not conform to schema', () => {
// const badSubscribeCall = orderbookChannel.subscribe.bind(
// orderbookChannel,
// {},
// emptyOrderbookChannelHandler,
// );
// expect(badSubscribeCall).throws(
// 'Expected subscriptionOpts to conform to schema /RelayerApiOrderbookChannelSubscribePayload\nEncountered: {}\nValidation errors: instance requires property "baseTokenAddress", instance requires property "quoteTokenAddress"',
// );
// });
// it('throws when handler has the incorrect members', () => {
// const badSubscribeCall = orderbookChannel.subscribe.bind(orderbookChannel, subscriptionOpts, {});
// expect(badSubscribeCall).throws(
// 'Expected handler.onSnapshot to be of type function, encountered: undefined',
// );
// });
// it('does not throw when inputs are of correct types', () => {
// const goodSubscribeCall = orderbookChannel.subscribe.bind(
// orderbookChannel,
// subscriptionOpts,
// emptyOrderbookChannelHandler,
// );
// expect(goodSubscribeCall).to.not.throw();
// });
// });
// });