Merge pull request #22 from drift-labs/master

updated exmaple and last update bug fix
drift-labs · Nov 17, 2023 · 01447fd · 01447fd
2 parents 63c94bd + 285d5b3
commit 01447fd
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 8 deletions.
diff --git 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
@@ -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;