diff --git a/example/wsClient.ts b/example/wsClient.ts index 57678d9..f9151d5 100644 --- a/example/wsClient.ts +++ b/example/wsClient.ts @@ -1,23 +1,35 @@ import WebSocket from 'ws'; -const ws = new WebSocket('wss://master.dlob.drift.trade/ws'); +const ws = new WebSocket('wss://dlob.drift.trade/ws'); import { sleep } from '../src/utils/utils'; ws.on('open', async () => { console.log('Connected to the server'); - ws.send(JSON.stringify({ type: 'subscribe', channel: 'SOL-PERP' })); - ws.send(JSON.stringify({ type: 'subscribe', channel: 'LINK-PERP' })); - ws.send(JSON.stringify({ type: 'subscribe', channel: 'INJ-PERP' })); + + // Subscribe and unsubscribe to orderbook channels + ws.send(JSON.stringify({ type: 'subscribe', marketType: 'perp', channel: 'orderbook', market: 'SOL-PERP' })); + ws.send(JSON.stringify({ type: 'subscribe', marketType: 'perp', channel: 'orderbook', market: 'INJ-PERP' })); + ws.send(JSON.stringify({ type: 'subscribe', marketType: 'perp', channel: 'orderbook', market: 'BTC-PERP' })); + ws.send(JSON.stringify({ type: 'subscribe', marketType: 'spot', channel: 'orderbook', market: 'SOL' })); + await sleep(5000); + + ws.send(JSON.stringify({ type: 'unsubscribe', marketType: 'perp', channel: 'orderbook', market: 'SOL-PERP' })); + console.log("####################"); + + + // Subscribe to trades data + ws.send(JSON.stringify({ type: 'subscribe', marketType: 'perp', channel: 'trades', market: 'SOL-PERP' })); + ws.send(JSON.stringify({ type: 'subscribe', marketType: 'spot', channel: 'trades', market: 'SOL' })); await sleep(5000); - ws.send(JSON.stringify({ type: 'unsubscribe', channel: 'SOL-PERP' })); + ws.send(JSON.stringify({ type: 'unsubscribe', marketType: 'perp', channel: 'trades', market: 'SOL-PERP' })); console.log("####################"); }); ws.on('message', (data: WebSocket.Data) => { try { const message = JSON.parse(data.toString()); - console.log(`Received data from market ${message.channel}`); - // book data is in message.data + console.log(`Received data from channel: ${JSON.stringify(message.channel)}`); + // book and trades data is in message.data } catch (e) { console.error('Invalid message:', data); } diff --git a/src/wsConnectionManager.ts b/src/wsConnectionManager.ts index 12a98f2..4263e20 100644 --- a/src/wsConnectionManager.ts +++ b/src/wsConnectionManager.ts @@ -159,7 +159,9 @@ async function main() { `last_update_${redisChannel}` ); if (lastMessage !== null) { - ws.send(JSON.stringify({ redisChannel, data: lastMessage })); + ws.send( + JSON.stringify({ channel: redisChannel, data: lastMessage }) + ); } } break;