Merge pull request #1 from difurious/master

split emit order into openorder and orderhistory

Author: rynomster

ProbitSocket.js

@@ -127,9 +127,10 @@ class ProbitSocket extends EventEmitter {
 
                 case "open_order": {
                     message.data.forEach((order) => {
-                        this.emit('order', {
+                        this.emit('openorder', {
                             id                : Number(order.id),
                             userId            : order.user_id,
+                            marketId          : order.market_id, 							
                             type              : order.type,
                             side              : order.side,
                             quantity          : Number(order.quantity),
@@ -149,11 +150,13 @@ class ProbitSocket extends EventEmitter {
 
                 case "order_history": {
                     message.data.forEach((order) => {
-                        this.emit('order', {
+                        this.emit('orderhistory', {
                             //clickity clickity clack, my mouse goes up the back. the clock strikes one, my shirt cones undone. and all the boys give me pretty horse gifts wait what.
+							//the sea of time floats by while I am blind the whole time.
                             id                : Number(order.id),
                             userId            : order.user_id,
-                            type              : order.type,
+                            marketId          : order.market_id, 
+							type              : order.type,
                             side              : order.side,
                             quantity          : Number(order.quantity),
                             price             : Number(order.limit_price),
@@ -175,15 +178,15 @@ class ProbitSocket extends EventEmitter {
                         this.emit('tradehistory', {
                             id            : trade.id,
                             orderId       : Number(trade.order_id),
-                            side          : 'buy',
+                            side          : trade.side,
                             feeAmount     : Number(trade.fee_amount),
-                            feeCurrencyId : 'PROB',
-                            status        : 'settled',
+                            feeCurrencyId : trade.fee_currency_id,
+                            status        : trade.status,
                             price         : Number(trade.price),
                             quantity      : Number(trade.quantity),
                             cost          : Number(trade.cost),
-                            time          : '2020-02-11T03:36:37.462Z',
-                            market_id     : 'PROB-BTC'
+                            time          : trade.time,
+                            market_id     : trade.market_id
                         })
                     });
                     break;

README.md

@@ -50,9 +50,28 @@ probit.socket.on('trade', (trade) => {
     //    timestamp: '2020-02-12T03:49:02.177Z' 
     //}
 })
-probit.socket.on('order', (order) => {
+probit.socket.on('openorder', (order) => {
     //{   id: 344833732,
     //    userId: 'c8a24c28-94c5-40ff-9f70-4750fge721d8',
+    //    market_id:'BTC-USDT',
+    //    type: 'limit',
+    //    side: 'buy',
+    //    quantity: 1000,
+    //    price: 0.000001,
+    //    timeInForce: 'gtc',
+    //    filledCost: 0,
+    //    filledQuantity: 0,
+    //    openQuantity: 1000,
+    //    cancelledQuantity: 0,
+    //    status: 'open',
+    //    timestamp: '2020-02-11T04:04:54.103Z',
+    //    clientOrderId: ''
+    //}
+})
+probit.socket.on('orderhistory', (order) => {
+    //{   id: 344833732,
+    //    userId: 'c8a24c28-94c5-40ff-9f70-4750fge721d8',
+    //    market_id:'BTC-USDT',
     //    type: 'limit',
     //    side: 'buy',
     //    quantity: 1000,